summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/001-1/eventmaster.txt4
-rw-r--r--npc/003-10/quirino.txt2
-rw-r--r--npc/003-10/slots.txt8
-rw-r--r--npc/007-1/zarkor.txt10
-rw-r--r--npc/commands/event.txt12
-rw-r--r--npc/functions/main.txt7
6 files changed, 19 insertions, 24 deletions
diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index 8bbf2d0e0..45f329cb3 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -600,8 +600,8 @@ L_Agr:
L_EventOnly:
- mescol l("WARNING: Spawn these monsters with moderation!"), 1);
- mescol l("Some of them have FORBIDDEN DROPS, which will be DELETED when their event starts!"), 1);
+ mesc l("WARNING: Spawn these monsters with moderation!"), 1;
+ mesc l("Some of them have FORBIDDEN DROPS, which will be DELETED when their event starts!"), 1;
mes "";
select
"Abort", // 1
diff --git a/npc/003-10/quirino.txt b/npc/003-10/quirino.txt
index 8179bd228..f1c629edc 100644
--- a/npc/003-10/quirino.txt
+++ b/npc/003-10/quirino.txt
@@ -93,7 +93,7 @@ L_Hub:
// Open event? Minimum 5 connections or GM_OVERRIDE flag.
if ($EVENT$ == "" && (getusers(1) >= 5 || $@GM_OVERRIDE)) {
next;
- mescol l("Activate event?", 1);
+ mesc l("Activate event?"), 1;
if (askyesno() == ASK_YES) {
$EVENT$="Hunger";
setcells "001-8", 41, 58, 41, 43, 5, "qhubN";
diff --git a/npc/003-10/slots.txt b/npc/003-10/slots.txt
index fdb0076fc..c137a69f8 100644
--- a/npc/003-10/slots.txt
+++ b/npc/003-10/slots.txt
@@ -69,15 +69,15 @@ L_Spin:
mesn;
if (.@a == .@b && .@a == .@c && .@a == 7) {
getitem Monocle, 1;
- mescol l("Jackpot! You got the Monocle!", 3);
+ mesc l("Jackpot! You got the Monocle!"), 3;
} else if (.@a == .@b && .@a == .@c) {
getitem CasinoCoins, 30;
- mescol l("Congrats! You got thirty coins!", 3);
+ mesc l("Congrats! You got thirty coins!"), 3;
} else if (.@a == .@b || .@a == .@c || .@b == .@c) {
getitem CasinoCoins, 1;
- mescol l("Lucky! You got a coin!", 3);
+ mesc l("Lucky! You got a coin!"), 3;
} else {
- mescol l("It wasn't this time...", 3);
+ mesc l("It wasn't this time..."), 3;
}
next;
goto L_Menu;
diff --git a/npc/007-1/zarkor.txt b/npc/007-1/zarkor.txt
index e29ae57b2..a315c52d2 100644
--- a/npc/007-1/zarkor.txt
+++ b/npc/007-1/zarkor.txt
@@ -166,23 +166,23 @@ L_Ritual:
mesq l("MONSTER KING, APPEAR TO ME!");
next;
mesn "MONSTER KING";
- mescol l("...Foolish human... Do you really think I will attend your summon?"), 1;
+ mesc l("...Foolish human... Do you really think I will attend your summon?"), 1;
next;
mesn "Zarkor, the Dark Summoner";
mesq l("But... But! Where are you?! That summon ritual is equivalent to GM magic!");
next;
mesn "MONSTER KING";
- mescol l("And who do you think that created GM Magic in first place, inexperienced kid?"), 1;
+ mesc l("And who do you think that created GM Magic in first place, inexperienced kid?"), 1;
next;
mesn "Zarkor, the Dark Summoner";
mesq l("You... You killed my father during Nivalis siege! I'll make you pay for that!!");
next;
mesn "MONSTER KING";
- mescol l("You humans are so greedy... Just like me. I have more important things to do, other than waste time with you."), 1;
+ mesc l("You humans are so greedy... Just like me. I have more important things to do, other than waste time with you."), 1;
next;
mesn "MONSTER KING";
- mescol l("Zarkor, fell a small taste of my power. That is nothing. If you can't handle that, you're not even near my lowest lieutenant."), 1;
- mescol l("And you got help from a kid, Zarkor? Lucky is that kid, that I don't have time to deal with them. Farewell."), 1;
+ mesc l("Zarkor, fell a small taste of my power. That is nothing. If you can't handle that, you're not even near my lowest lieutenant."), 1;
+ mesc l("And you got help from a kid, Zarkor? Lucky is that kid, that I don't have time to deal with them. Farewell."), 1;
next;
specialeffect(312);
mesn "Zarkor, the Dark Summoner";
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index ba28a0891..c3d21b329 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -19,13 +19,13 @@ function script GlobalEventMenu {
function rateManagement {
clear;
mes l("To get the current rate:");
- mescol l(" @exprate", 7);
+ mes col(" @exprate", 7);
next;
mes l("To set the exp rate:");
- mescol l(" @exprate ##Brate##b hours", 7);
+ mes col(" @exprate ##Brate##b hours", 7);
next;
mes l("To reset back to normal:");
- mescol l(" @exprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
+ mes col(" @exprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
next;
return;
}
@@ -33,13 +33,13 @@ function script GlobalEventMenu {
function dropManagement {
clear;
mes l("To get the current rate:");
- mescol l(" @rates", 7);
+ mes col(" @rates", 7);
next;
mes l("To set the drop rate:");
- mescol l(" @droprate ##Brate##b hours", 7);
+ mes col(" @droprate ##Brate##b hours", 7);
next;
mes l("To reset back to normal:");
- mescol l(" @droprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
+ mes col(" @droprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
next;
return;
}
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 1a074e6b8..de794c0d7 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -80,13 +80,8 @@ function script addremovemapmask {
return;
}
-function script mescol {
- mes col(getarg(0),getarg(1));
- return;
-}
-
function script mesc {
- mes col(getarg(0),9);
+ mes col(getarg(0),getarg(1,9));
return;
}