summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <mekolat@users.noreply.github.com>2017-10-11 19:02:11 -0400
committergumi <mekolat@users.noreply.github.com>2017-10-11 19:02:20 -0400
commit6662b6f305976881c3e675241c41be7731b65aa5 (patch)
treea8ecaa074cf67cb929f4de6ed62ef7c4b49c46d1
parent03049799efdc103fdd74e77161ed6a907acb7dde (diff)
downloadserverdata-s20171023.tar.gz
serverdata-s20171023.tar.bz2
serverdata-s20171023.tar.xz
serverdata-s20171023.zip
what's up with this crazy syntax?s20171023
I blame Reid
-rw-r--r--npc/000-0/sailors.txt2
-rw-r--r--npc/000-2-0/julia.txt2
-rw-r--r--npc/000-2-1/alige.txt4
-rw-r--r--npc/000-2-1/arpan.txt2
-rw-r--r--npc/000-2-3/box.txt2
-rw-r--r--npc/000-2-3/elmo.txt6
-rw-r--r--npc/001-1/calypsan.txt2
-rw-r--r--npc/001-1/chelios.txt10
-rw-r--r--npc/001-1/devis.txt2
-rw-r--r--npc/001-1/enora.txt32
-rw-r--r--npc/001-1/fexil.txt8
-rw-r--r--npc/001-1/qonan.txt2
-rw-r--r--npc/001-1/qpid.txt18
-rw-r--r--npc/001-1/rumly.txt6
-rw-r--r--npc/001-1/salem.txt6
-rw-r--r--npc/001-2-0/resa.txt6
-rw-r--r--npc/001-2-19/lloyd.txt16
-rw-r--r--npc/001-2-21/julia.txt4
-rw-r--r--npc/001-2-22/alige.txt4
-rw-r--r--npc/001-2-26/ivan.txt10
-rw-r--r--npc/001-2-27/don.txt6
-rw-r--r--npc/001-2-27/kaylo.txt2
-rw-r--r--npc/001-2-27/lydon.txt2
-rw-r--r--npc/001-2-28/plush.txt6
-rw-r--r--npc/001-2-29/savepoint.txt8
-rw-r--r--npc/001-2-41/edouard.txt4
-rw-r--r--npc/001-2-6/books.txt2
-rw-r--r--npc/001-2-9/janus.txt18
-rw-r--r--npc/commands/debug-look.txt8
-rw-r--r--npc/functions/asklanguage.txt2
-rw-r--r--npc/functions/barber.txt24
-rw-r--r--npc/functions/fishing.txt2
-rw-r--r--npc/functions/main.txt4
-rw-r--r--npc/functions/mouboofunc.txt14
-rw-r--r--npc/functions/openbook.txt6
-rw-r--r--npc/functions/riddle.txt20
-rw-r--r--npc/items/rand_sc_heal.txt12
37 files changed, 142 insertions, 142 deletions
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index a8b9a820..d31c8439 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -51,7 +51,7 @@ OnTouch:
next;
restorecam;
- asklanguage (LANG_ON_SEA);
+ asklanguage(LANG_ON_SEA);
setcamnpc;
mes "";
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 9a9c8e57..33916d85 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -145,7 +145,7 @@
mesq l("Of course! Tell me which language you speak and I will change the note on the ship passenger list.");
next;
- asklanguage (LANG_IN_SHIP);
+ asklanguage(LANG_IN_SHIP);
mes "";
mesn;
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 500e39af..cc57c0d7 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -44,8 +44,8 @@ OnUnTouch:
OnTimer190:
stopnpctimer;
- if (getnpcdir ("Alige") == 2) setnpcdir "Alige", 6;
- if (getnpcdir ("Alige") == 4) setnpcdir "Alige", 8;
+ if (getnpcdir("Alige") == 2) setnpcdir "Alige", 6;
+ if (getnpcdir("Alige") == 4) setnpcdir "Alige", 8;
end;
}
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index e1c07bbf..9207e03d 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -244,7 +244,7 @@ L_GotoSleep:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You already did enough for us, do you want to follow Nard's advice and get some rest?");
- switch (select (l("Yes."), l("No.")))
+ switch (select(l("Yes."), l("No.")))
{
case 1:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index 7aafb9af..cc280b74 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -98,7 +98,7 @@ L_Already:
setcamnpc "Nard";
mes "";
mesn "Nard";
- mesq l("You already took a @@, please put this one back in the box.", getitemlink (Bandana));
+ mesq l("You already took a @@, please put this one back in the box.", getitemlink(Bandana));
close;
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index 8e2ef044..c623e321 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -30,13 +30,13 @@
l("Hey you, sorry for leaving your room so quickly. I needed to speak with the captain about the food reserves. You know, now that we have a new mouth to feed, we need to check what we have."),
l("So, how is it going? Did you meet any other crew members yet?");
- switch (select (l("Yes, Arpan gave me these clothes."), l("Not yet.")))
+ switch (select(l("Yes, Arpan gave me these clothes."), l("Not yet.")))
{
case 1:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Oh good! Did he give you your money back as well?");
- switch (select (l("Yes he did."), l("He told me nothing about that.")))
+ switch (select(l("Yes he did."), l("He told me nothing about that.")))
{
case 1:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
@@ -45,7 +45,7 @@
case 2:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Hehe, sometimes he gets his head in the clouds, You should go ask him about that.");
- setq ShipQuests_ArpanMoney, 1;
+ setq ShipQuests_ArpanMoney, 1;
break;
}
diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index e4195f06..7f3d6a0a 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -34,7 +34,7 @@
function sell_dye {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("For what kind of tissue?");
- .@tissue_type = select (l("Cotton"), l("Cashmere"));
+ .@tissue_type = select(l("Cotton"), l("Cashmere"));
closedialog;
switch (.@tissue_type)
diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt
index 1ee44d2f..2846f864 100644
--- a/npc/001-1/chelios.txt
+++ b/npc/001-1/chelios.txt
@@ -22,7 +22,7 @@
l("It's better to deal with the Merchant Guild than the old man, Don has this ability to hammer down your enthusiasm in sparkling fury!"),
l("If Enora wants her sword now, I need to ask for your help.");
- switch (select (l("Let's not keep her waiting."),
+ switch (select(l("Let's not keep her waiting."),
l("Not now.")))
{
case 1:
@@ -80,11 +80,11 @@
do
{
- .@enora = getq (ArtisQuests_Enora);
+ .@enora = getq(ArtisQuests_Enora);
select
- rif (.@enora == 1, lg("I came to retrieve a package for Enora.")),
- rif (.@enora == 3, l("I have your black iron.")),
- rif (.@enora >= 2, l("Where is the Merchant Guild?")),
+ rif(.@enora == 1, lg("I came to retrieve a package for Enora.")),
+ rif(.@enora == 3, l("I have your black iron.")),
+ rif(.@enora >= 2, l("Where is the Merchant Guild?")),
l("What is this building?"),
menuaction(l("Quit"));
diff --git a/npc/001-1/devis.txt b/npc/001-1/devis.txt
index 0a2a60f0..5f0d4868 100644
--- a/npc/001-1/devis.txt
+++ b/npc/001-1/devis.txt
@@ -18,7 +18,7 @@
return;
}
- .@rand = rand (5);
+ .@rand = rand(5);
if (.@rand == 0) goodbye;
else if (.@rand == 1)
{
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index 019e99aa..fea6d6e7 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -56,7 +56,7 @@
l("You need to be a member of the Merchant Guild to have a chance there."),
l("And I bet you don't know who is in charge of monitoring the security of this place?");
- switch (select (l("The Legion?"), l("I don't know.")))
+ switch (select(l("The Legion?"), l("I don't know.")))
{
case 1:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
@@ -89,7 +89,7 @@
l("Does your mind go all fuzzy or does it feel like your head is going to explode??"),
l("Try doing that now!");
- switch (select (l("Okay, but there won't be any explosions."),
+ switch (select(l("Okay, but there won't be any explosions."),
lg("Don't get too excited about it...")))
{
case 1:
@@ -101,7 +101,7 @@
speech S_LAST_NEXT,
l("So? You haven't exploded yet! Are you getting anything?");
- select (l("Not really. All I got was a headache..."));
+ select(l("Not really. All I got was a headache..."));
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("It's like your memories are locked away in your head! Cool!");
@@ -119,8 +119,8 @@
}
function enora_reward {
- .@exp_reward = getarg (0);
- .@zeny_reward = getarg (1);
+ .@exp_reward = getarg(0);
+ .@zeny_reward = getarg(1);
getexp .@exp_reward, 0;
Zeny = Zeny + .@zeny_reward;
@@ -136,7 +136,7 @@
l("You probably don't have much business in this city as you don't remember who you are."),
lg("So I was going to ask if maybe you would be interested in giving me a hand with a few errands.");
- switch (select (l("I guess so. What's in it for me?"),
+ switch (select(l("I guess so. What's in it for me?"),
l("Of course! What do you need?")))
{
case 1:
@@ -170,7 +170,7 @@
l("Poor Chelios, I don't envy him..."),
l("So, everything went fine?");
- switch (select (l("Chelios managed to do excellent work."),
+ switch (select(l("Chelios managed to do excellent work."),
l("The old man seemed to be senile.")))
{
case 1:
@@ -199,7 +199,7 @@
l("Her shop is on the west side of the city, between the Legion building and the library.");
setq ArtisQuests_Enora, 5;
- enora_reward (60, 100);
+ enora_reward(60, 100);
closedialog;
npctalk3 l("Thank you very much!");
@@ -208,7 +208,7 @@
function enora_third_quest {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Look how splendid this @@ is!", getitemlink (ArtisTankTop, CamelCottonDye)),
+ l("Look how splendid this @@ is!", getitemlink(ArtisTankTop, CamelCottonDye)),
l("It's nearly as good as one from Esperia, have you ever been there?"),
l("Ah... Sorry, I forgot, again."),
l("I mean, you forgot... Well."),
@@ -217,7 +217,7 @@
do
{
- .@q = select (l("Do you still need help?"),
+ .@q = select(l("Do you still need help?"),
l("What is this \"legion\"?"));
switch (.@q)
{
@@ -231,12 +231,12 @@
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Oh yes, I have one last errand for you, Q'Pid in the market sells potions."),
- l("It has been some days now since I asked her for a box of @@s, but she hasn't delivered anything yet.", getitemlink (PiberriesInfusion)),
+ l("It has been some days now since I asked her for a box of @@s, but she hasn't delivered anything yet.", getitemlink(PiberriesInfusion)),
l("Please try to figure out what went wrong with this order and bring me those potions."),
l("You will be able to find her in the market in the south-west of Artis.");
setq ArtisQuests_Enora, 7;
- enora_reward (40, 125);
+ enora_reward(40, 125);
closedialog;
npctalk3 l("Thank you very much!");
@@ -262,12 +262,12 @@
getitem2 ArtisTankTop, 1, 1, 0, 0, 5005, 0, 0, 0;
getitem PiberriesInfusion, 5;
setq ArtisQuests_Enora, 10;
- enora_reward (80, 175);
+ enora_reward(80, 175);
speech S_LAST_NEXT,
l("Do you know where the hill is?");
- switch (select (l("Yes I do."),
+ switch (select(l("Yes I do."),
l("Please guide me.")))
{
case 1:
@@ -310,10 +310,10 @@
l("It's a very good place if you want to make some more money.");
emotion E_WINK;
- if (getq (ArtisQuests_Enora) == 10)
+ if (getq(ArtisQuests_Enora) == 10)
{
setq ArtisQuests_Enora, 11;
- enora_reward (140, 500);
+ enora_reward(140, 500);
}
return;
diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt
index 855dda0b..55d87bc4 100644
--- a/npc/001-1/fexil.txt
+++ b/npc/001-1/fexil.txt
@@ -21,7 +21,7 @@
l("I will buy all of the fur that you will bring me at a good price, let's say, 15 E piece."),
l("Do we have a deal?");
- switch (select (l("Ok."), l("I don't want to be part of this joke.")))
+ switch (select(l("Ok."), l("I don't want to be part of this joke.")))
{
case 1:
setq ArtisQuests_Fexil, 3;
@@ -46,14 +46,14 @@
mesq lg("Interested?");
next;
- if (getq (ArtisQuests_Fexil) == 1)
+ if (getq(ArtisQuests_Fexil) == 1)
{
- select (l("I have your pass from the Merchant Guild."));
+ select(l("I have your pass from the Merchant Guild."));
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Oh! You saved me, I was too afraid to unpack my stuff without this pass."),
l("Hey, I remember you, we were on the same boat, you are the castaway.");
- switch (select (l("Yes I am."),
+ switch (select(l("Yes I am."),
l("You're confusing me with someone else.")))
{
case 1:
diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt
index f82bf78a..fe255799 100644
--- a/npc/001-1/qonan.txt
+++ b/npc/001-1/qonan.txt
@@ -23,7 +23,7 @@
l("I have a lot of work here, so I don't even have time to go to the town."),
l("Could you do a small favor for me?");
- switch (select (l("Go on."), l("I don't have the time sorry.")))
+ switch (select(l("Go on."), l("I don't have the time sorry.")))
{
case 2:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index 6a81f78a..d4194ddd 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -20,15 +20,15 @@
input .@answer$;
.@i++;
- if (riddlevalidation (.@answer$, "life", l("life")))
+ if (riddlevalidation(.@answer$, "life", l("life")))
{
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Oh..."),
l("You seem more cultivated than you look.");
- if (getq (ArtisQuests_Enora) == 7)
+ if (getq(ArtisQuests_Enora) == 7)
{
- setq (ArtisQuests_Enora, 9);
+ setq(ArtisQuests_Enora, 9);
speech S_LAST_NEXT | S_NO_NPC_NAME,
l("Fine, take these potions, I will replenish them in the next couple hours anyway.");
}
@@ -42,9 +42,9 @@
}
else
{
- if (getq (ArtisQuests_Enora) == 7)
+ if (getq(ArtisQuests_Enora) == 7)
{
- setq (ArtisQuests_Enora, 8);
+ setq(ArtisQuests_Enora, 8);
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You failed!"),
l("Ivan is the one you should look for now."),
@@ -71,7 +71,7 @@
l("I'm not a pawn of the Legion, I don't have to obey you!"),
l("Oh and guess what! I'm almost out of potions anyway.");
- switch (select (l("And where can I find these potions?"),
+ switch (select(l("And where can I find these potions?"),
l("You bored me, see you later.")))
{
case 1:
@@ -103,7 +103,7 @@
l("But rare are those that receive grants from the Legion itself. For anybody else only a hard work can pay your bills!");
emotion E_UPSET;
- switch (select (l("Sorry I didn't mean to bother you."),
+ switch (select(l("Sorry I didn't mean to bother you."),
l("You are just sitting on the shadow of your store.")))
{
case 1:
@@ -128,9 +128,9 @@
.@enora = getq(ArtisQuests_Enora);
select
- rif (.@enora == 7, l("Enora wants her potions.")),
+ rif(.@enora == 7, l("Enora wants her potions.")),
menuaction(l("Trade")),
- rif (.@enora > 7, l("What was your riddle?")),
+ rif(.@enora > 7, l("What was your riddle?")),
l("How do you do your potions?"),
l("What are you reading?"),
menuaction(l("Quit"));
diff --git a/npc/001-1/rumly.txt b/npc/001-1/rumly.txt
index f6a9126a..4a1103fb 100644
--- a/npc/001-1/rumly.txt
+++ b/npc/001-1/rumly.txt
@@ -94,7 +94,7 @@ L_Menu:
case 4:
if (.@visited < 2) goto L_Quit;
- .@rand = rand (2);
+ .@rand = rand(2);
if (.@rand)
{
@@ -215,8 +215,8 @@ L_Quit:
OnTimer1800:
stopnpctimer;
- if (getnpcdir ("Rumly#001-1") == 2) setnpcdir "Rumly#001-1", 6;
- if (getnpcdir ("Rumly#001-1") == 4) setnpcdir "Rumly#001-1", 8;
+ if (getnpcdir("Rumly#001-1") == 2) setnpcdir "Rumly#001-1", 6;
+ if (getnpcdir("Rumly#001-1") == 4) setnpcdir "Rumly#001-1", 8;
end;
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index eee2a161..b80cb76e 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -72,7 +72,7 @@
speech
l("Look who is back..."),
l("And with my piou. That's wonderful. I can only imagine how hard that little bugger was to catch!"),
- l("Great, and as I promised, I give you a 90% discount on the @@ of your choice.", getitemlink (PiouEgg));
+ l("Great, and as I promised, I give you a 90% discount on the @@ of your choice.", getitemlink(PiouEgg));
next;
@ArtisQuests_PiouPrice = 3000;
@@ -168,8 +168,8 @@ L_AboutPious:
next;
select
- rif (.@q == 0, l("Sounds like a good deal to me. I'll do it.")),
- rif (.@q == 1, l("I'm on my way! I will bring it back to you.")),
+ rif(.@q == 0, l("Sounds like a good deal to me. I'll do it.")),
+ rif(.@q == 1, l("I'm on my way! I will bring it back to you.")),
l("I don't really have time to go chasing pious, let me just buy one at the regular price (30000 E)."),
l("I don't want to buy a piou right now.");
diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt
index 4cb66bdf..1530c861 100644
--- a/npc/001-2-0/resa.txt
+++ b/npc/001-2-0/resa.txt
@@ -28,7 +28,7 @@
function enora_quest {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("I thought that she would never come to pick it up!"),
- l("Here it is, a fashionable @@.", getitemlink (ArtisTankTop, CamelCottonDye)),
+ l("Here it is, a fashionable @@.", getitemlink(ArtisTankTop, CamelCottonDye)),
l("I asked Calypsan to dye this tank top, now it has an unique look!");
narrator S_LAST_NEXT, l("You pick up the package.");
@@ -44,9 +44,9 @@
do
{
- .@enora = getq (ArtisQuests_Enora);
+ .@enora = getq(ArtisQuests_Enora);
select
- rif (.@enora == 5, lg("I came to retrieve a package for Enora.")),
+ rif(.@enora == 5, lg("I came to retrieve a package for Enora.")),
menuaction(l("Trade")),
l("How can I improve my equipment?"),
menuaction(l("Quit"));
diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt
index 6ba69ff2..9a0b2f37 100644
--- a/npc/001-2-19/lloyd.txt
+++ b/npc/001-2-19/lloyd.txt
@@ -28,7 +28,7 @@
l("Yes, I have some! \"5x Black Iron Ingots\""),
lg("Is this for you or somebody else? Because you need to be registered to obtain these materials.");
- switch (selectd (ArtisQuests_Enora,
+ switch (selectd(ArtisQuests_Enora,
l("This is for my own use."),
l("Chelios asked me to get it.")))
{
@@ -71,7 +71,7 @@
l("Welcome!"),
l("My name is Lloyd, I am a representative of the Merchant Guild of Artis.");
- selectd (l("My name is @@...", strcharinfo(0)));
+ selectd(l("My name is @@...", strcharinfo(0)));
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("\"@@\", I like this name!", strcharinfo(0)),
@@ -82,7 +82,7 @@
l("I see."),
lg("You are new around here, right?");
- if (selectd (l("How do you know?"), l("Yes I am.")) == 1)
+ if (selectd(l("How do you know?"), l("Yes I am.")) == 1)
{
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Oh, it is simple. I have on this book the names of every citizen of Artis and its surroundings."),
@@ -104,7 +104,7 @@
speech S_LAST_NEXT,
l("The fee is of @@ E. So, do you want to register?", .@price);
- switch (selectd (l("Yes."),
+ switch (selectd(l("Yes."),
l("I don't have the time now.")))
{
case 1:
@@ -139,7 +139,7 @@
do
{
- .@q = selectd (ArtisQuests_Fexil,
+ .@q = selectd(ArtisQuests_Fexil,
l("Ok, I will bring it to him."),
l("I need more information first."),
l("I don't have the time."));
@@ -163,7 +163,7 @@
} while (.@q == 2);
}
- if (getq (ArtisQuests_Lloyd) == 0)
+ if (getq(ArtisQuests_Lloyd) == 0)
{
first_visit;
@@ -178,10 +178,10 @@
do
{
- .@enora = getq (ArtisQuests_Enora);
+ .@enora = getq(ArtisQuests_Enora);
selectd
- rif (.@enora == 2, l("I'm looking for some black iron ingots.")),
+ rif(.@enora == 2, l("I'm looking for some black iron ingots.")),
l("I would like to store some items."),
l("I would like to perform money transactions."),
l("What is this guild for?"),
diff --git a/npc/001-2-21/julia.txt b/npc/001-2-21/julia.txt
index 6ebd7438..008cdb41 100644
--- a/npc/001-2-21/julia.txt
+++ b/npc/001-2-21/julia.txt
@@ -21,7 +21,7 @@ L_Menu:
menu
rif(getskilllv(1) < 6, l("Something is wrong with me, I can't smile nor sit.")), L_BasicSkill,
- rif (.@enora == 0, l("Where should I go?")), L_Enora,
+ rif(.@enora == 0, l("Where should I go?")), L_Enora,
lg("I made a mistake, I would like to change my language."), L_ChooseLang,
l("Is it possible to go back to Drasil Island?"), L_Island,
l("Could you explain to me where I am?"), L_WhereIam,
@@ -48,7 +48,7 @@ L_ChooseLang:
mesq l("Of course! Tell me which language you speak and I will change the note on the ship board list.");
next;
- asklanguage (LANG_IN_SHIP);
+ asklanguage(LANG_IN_SHIP);
mes "";
mesn;
diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt
index c381516d..70e6058e 100644
--- a/npc/001-2-22/alige.txt
+++ b/npc/001-2-22/alige.txt
@@ -44,8 +44,8 @@ OnUnTouch:
OnTimer190:
stopnpctimer;
- if (getnpcdir ("Alige#Artis") == 2) setnpcdir "Alige#Artis", 6;
- if (getnpcdir ("Alige#Artis") == 4) setnpcdir "Alige#Artis", 8;
+ if (getnpcdir("Alige#Artis") == 2) setnpcdir "Alige#Artis", 6;
+ if (getnpcdir("Alige#Artis") == 4) setnpcdir "Alige#Artis", 8;
end;
}
diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt
index 0881389f..251e1107 100644
--- a/npc/001-2-26/ivan.txt
+++ b/npc/001-2-26/ivan.txt
@@ -18,19 +18,19 @@
function enora_quest {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("How many? What kind? I can produce two dozen boxes per day.");
- select (l("5 Piberries Infusions"));
+ select(l("5 Piberries Infusions"));
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("5 boxes... Alright, @@ are my speciality!", getitemlink (PiberriesInfusion)),
+ l("5 boxes... Alright, @@ are my speciality!", getitemlink(PiberriesInfusion)),
l("I can prepare them in an hour or so!");
- select (l("You missunderstood, it's 5 potions."));
+ select(l("You missunderstood, it's 5 potions."));
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Why would the Legion request my help for only 5 potions?"),
l("Is this some kind of joke?!");
- switch (select (l("Enora needs them."),
+ switch (select(l("Enora needs them."),
l("Excuse me that was a mistake.")))
{
case 1:
@@ -50,7 +50,7 @@
return;
}
- .@enora = getq (ArtisQuests_Enora);
+ .@enora = getq(ArtisQuests_Enora);
if (.@enora < 8)
{
diff --git a/npc/001-2-27/don.txt b/npc/001-2-27/don.txt
index a87bc86c..cc62f4c1 100644
--- a/npc/001-2-27/don.txt
+++ b/npc/001-2-27/don.txt
@@ -31,7 +31,7 @@
l("I do not.");
emotion E_UPSET;
- select (l("What about Chelios?"));
+ select(l("What about Chelios?"));
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Chelios was stubborn in his youth, he never stopped annoying me with his questions while I was working at the forge."),
@@ -45,7 +45,7 @@
l("I do not like to brag about it but you won't find a better blacksmith on the whole island."),
l("If you need somebody to craft a weapon or a plate from diagrams I am the one that you need.");
- switch (select (l("Can I craft them myself?"),
+ switch (select(l("Can I craft them myself?"),
l("Ok.")))
{
case 1:
@@ -64,7 +64,7 @@
do
{
- switch (.@q = select (l("How can I improve my equipment?"),
+ switch (.@q = select(l("How can I improve my equipment?"),
l("What is a card?"),
l("Are you a good blacksmith?"),
l("Do you take apprentices?"),
diff --git a/npc/001-2-27/kaylo.txt b/npc/001-2-27/kaylo.txt
index d1ee5205..5134aa07 100644
--- a/npc/001-2-27/kaylo.txt
+++ b/npc/001-2-27/kaylo.txt
@@ -8,7 +8,7 @@
speech S_LAST_NEXT,
lg("Hi customer! What do you want today?");
- switch (select (
+ switch (select(
l("Let's make a trade."),
l("What's wrong with your clothes?"),
l("What is this place?"),
diff --git a/npc/001-2-27/lydon.txt b/npc/001-2-27/lydon.txt
index 1245a105..3dcd8005 100644
--- a/npc/001-2-27/lydon.txt
+++ b/npc/001-2-27/lydon.txt
@@ -8,7 +8,7 @@
speech S_LAST_NEXT,
lg("Hi customer! What do you want today?");
- switch (select (
+ switch (select(
l("Let's make a trade."),
l("Who is the blacksmith outside?"),
l("Bye.")))
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 1a9968e2..5600f2f2 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -19,7 +19,7 @@
}
function accepted_room {
- .@price = getarg (0);
+ .@price = getarg(0);
if (Zeny < .@price)
{
speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring @@ E.", .@price);
@@ -49,7 +49,7 @@
if (askyesno() == ASK_YES)
{
- accepted_room (.@price);
+ accepted_room(.@price);
}
else
{
@@ -91,7 +91,7 @@
do
{
- .@q = select (
+ .@q = select(
l("Could I lodge here for a while?"),
l("What service do you offer?"),
l("What is your tipiou trying to do?"),
diff --git a/npc/001-2-29/savepoint.txt b/npc/001-2-29/savepoint.txt
index a3206b12..4694e31e 100644
--- a/npc/001-2-29/savepoint.txt
+++ b/npc/001-2-29/savepoint.txt
@@ -5,7 +5,7 @@
// Saves locations in 001-2-29 map.
001-2-29,29,28,0 script #001-2-29-1 NPC_SAVE_POINT,0,0,{
- bedClic ("001-2-29", 29, 28, REDPLUSH_INN);
+ bedClic("001-2-29", 29, 28, REDPLUSH_INN);
OnInit:
.distance = 2;
@@ -20,7 +20,7 @@ OnPCDieEvent:
}
001-2-29,29,35,0 script #001-2-29-2 NPC_SAVE_POINT,0,0,{
- bedClic ("001-2-29", 29, 35, REDPLUSH_INN);
+ bedClic("001-2-29", 29, 35, REDPLUSH_INN);
OnInit:
.distance = 2;
@@ -31,7 +31,7 @@ OnTouch:
}
001-2-29,29,42,0 script #001-2-29-3 NPC_SAVE_POINT,0,0,{
- bedClic ("001-2-29", 29, 42, REDPLUSH_INN);
+ bedClic("001-2-29", 29, 42, REDPLUSH_INN);
OnInit:
.distance = 2;
@@ -42,7 +42,7 @@ OnTouch:
}
001-2-29,29,49,0 script #001-2-29-4 NPC_SAVE_POINT,0,0,{
- bedClic ("001-2-29", 29, 49, REDPLUSH_INN);
+ bedClic("001-2-29", 29, 49, REDPLUSH_INN);
OnInit:
.distance = 2;
diff --git a/npc/001-2-41/edouard.txt b/npc/001-2-41/edouard.txt
index 23d1e621..f93d2042 100644
--- a/npc/001-2-41/edouard.txt
+++ b/npc/001-2-41/edouard.txt
@@ -106,11 +106,11 @@ OnInit:
}
OnWrongPlace:
- npctalkonce ("Sit on the chair, I will come in a second!");
+ npctalkonce("Sit on the chair, I will come in a second!");
close;
OnNotSit:
- npctalkonce ("Please sit.");
+ npctalkonce("Please sit.");
close;
OnChair:
diff --git a/npc/001-2-6/books.txt b/npc/001-2-6/books.txt
index 49c77f16..53091bdf 100644
--- a/npc/001-2-6/books.txt
+++ b/npc/001-2-6/books.txt
@@ -156,7 +156,7 @@ OnInit:
}
OnUse:
- if (openoldbook ())
+ if (openoldbook())
read_book;
close;
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index 114401b6..a652a7c5 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -23,7 +23,7 @@
lg("The cost to create a party is @@ E, are you interested?",
"The cost to create a party is @@ E, are you interested?", .@party_price);
- if (askyesno () == 1)
+ if (askyesno() == 1)
{
if (Zeny < .@party_price)
{
@@ -48,11 +48,11 @@
l("Or do you want to keep your friendships and adventures in different groups?"),
l("Anyway, the guild creation is perfect for both!"),
l("You can keep your current party as it is, while leading or being part of a guild in order to talk and share different items with all of its members!"),
- l("The @@ is a one time item, you can use it as many times as you want, but you can only have one!", getitemlink (GuildCertification)),
+ l("The @@ is a one time item, you can use it as many times as you want, but you can only have one!", getitemlink(GuildCertification)),
lg("The cost to create a guild is @@ E, are you interested?",
"The cost to create a guild is @@ E, are you interested?", .@guild_price);
- if (askyesno () == 1)
+ if (askyesno() == 1)
{
if (Zeny < .@guild_price)
{
@@ -76,12 +76,12 @@
l("We offer party and guild certifications and we can also teach you how to use some basic communication skills."),
l("Do you know how to speak with people around you?");
- if (askyesno () == 2)
+ if (askyesno() == 2)
{
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You lack some very basic skills...");
- if (compareandsetq (General_Janus, 0, 1))
+ if (compareandsetq(General_Janus, 0, 1))
{
speech S_LAST_NEXT | S_NO_NPC_NAME,
l("This book contains everything you should know about it, take it!");
@@ -97,7 +97,7 @@
}
else
{
- if (compareandsetq (General_Janus, 0, 1))
+ if (compareandsetq(General_Janus, 0, 1))
{
speech S_LAST_NEXT | S_NO_NPC_NAME,
l("Anyway."),
@@ -130,14 +130,14 @@
do
{
// Beta users by-pass check.
- if (getskilllv(NV_BASIC) > 6 && getq (General_Janus) == 1)
+ if (getskilllv(NV_BASIC) > 6 && getq(General_Janus) == 1)
{
setq General_Janus, 2;
}
select
- rif (getq (General_Janus) == 1, l("I would like to create a party.")),
- rif (getq (General_Janus) == 2, l("I would like to create a guild.")),
+ rif(getq(General_Janus) == 1, l("I would like to create a party.")),
+ rif(getq(General_Janus) == 2, l("I would like to create a guild.")),
l("What service do you offer?"),
l("Your name is Ianus or Janus?"),
menuaction(l("Quit"));
diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt
index 436bdcca..4bdcf84f 100644
--- a/npc/commands/debug-look.txt
+++ b/npc/commands/debug-look.txt
@@ -21,7 +21,7 @@ function script BarberDebug {
function setStyle {
clear;
setnpcdialogtitle l("Appearance Debug - Barber");
- mes l("Hair style") + ": " + getlook (LOOK_HAIR);
+ mes l("Hair style") + ": " + getlook(LOOK_HAIR);
next;
mes l("Please enter the desired style") + " (1-255)";
input .@h, 1, 0xFF;
@@ -31,7 +31,7 @@ function script BarberDebug {
function setColor {
clear;
setnpcdialogtitle l("Appearance Debug - Barber");
- mes l("Hair color") + ": " + getlook (LOOK_HAIR_COLOR);
+ mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR);
next;
mes l("Please enter the desired color") + " (0-255)";
input .@h, 0, 0xFF;
@@ -58,8 +58,8 @@ function script BarberDebug {
mes "---";
mes l("Gender") + ": " + Sex;
- mes l("Hair style") + ": " + getlook (LOOK_HAIR);
- mes l("Hair color") + ": " + getlook (LOOK_HAIR_COLOR);
+ mes l("Hair style") + ": " + getlook(LOOK_HAIR);
+ mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR);
mes l("Race") + ": " + Class;
mes "---";
diff --git a/npc/functions/asklanguage.txt b/npc/functions/asklanguage.txt
index cc3f5275..4bea4bd1 100644
--- a/npc/functions/asklanguage.txt
+++ b/npc/functions/asklanguage.txt
@@ -67,7 +67,7 @@ function script asklanguage {
.@menustr$ = .@menustr$ + .@flags$[.@i] + "|" + .@messages$[.@i] + .@separator$;
}
- select (.@menustr$);
+ select(.@menustr$);
.@lang = @menu - 1;
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index b1e3dc38..370285b7 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -8,8 +8,8 @@
function script BarberSayStyle {
- .@get_color = getlook (LOOK_HAIR_COLOR);
- .@get_look = getlook (LOOK_HAIR);
+ .@get_color = getlook(LOOK_HAIR_COLOR);
+ .@get_look = getlook(LOOK_HAIR);
.@style_name$ = $@hairstyle$[.@get_look];
.@color_name$ = $@haircolor$[.@get_color];
@@ -32,7 +32,7 @@ function script BarberChangeStyle {
do
{
.@hairsizearray = getarraysize($@hairstyle$);
- .@get_look = getlook (LOOK_HAIR);
+ .@get_look = getlook(LOOK_HAIR);
// Here .@i starts from 1 because hairstyle 0 doesn't exist.
for (.@i = 1; .@i < .@hairsizearray; .@i++)
@@ -43,9 +43,9 @@ function script BarberChangeStyle {
}
.@menustr$ = .@menustr$ + l("I'm fine for now, thank you.");
-
+
.@idx = select(l("As you want!"),.@menustr$);
-
+
if (.@idx == .@i + 1) return; // last choice to quit dialog
switch (@menu)
@@ -55,15 +55,15 @@ function script BarberChangeStyle {
{
// here "- 1" because i don't use the 0 of array
.@rand_hair = rand(1,(.@hairsizearray - 1));
- } while (.@rand_hair == getlook (LOOK_HAIR));
+ } while (.@rand_hair == getlook(LOOK_HAIR));
setlook LOOK_HAIR, .@rand_hair;
- setlook LOOK_HAIR_COLOR, getlook (LOOK_HAIR_COLOR);
+ setlook LOOK_HAIR_COLOR, getlook(LOOK_HAIR_COLOR);
BarberSayStyle 1;
break;
default:
// and here "- 1" because the first choice is taken by the random
setlook LOOK_HAIR, (@menu - 1);
- setlook LOOK_HAIR_COLOR, getlook (LOOK_HAIR_COLOR);
+ setlook LOOK_HAIR_COLOR, getlook(LOOK_HAIR_COLOR);
break;
}
.@menustr$ = "";
@@ -73,7 +73,7 @@ function script BarberChangeStyle {
function script BarberChangeColor {
do
{
- .@get_look = getlook (LOOK_HAIR_COLOR);
+ .@get_look = getlook(LOOK_HAIR_COLOR);
.@hairsizearray = getarraysize($@haircolor$);
for (.@i = 0; .@i < .@hairsizearray; .@i++)
@@ -84,9 +84,9 @@ function script BarberChangeColor {
}
.@menustr$ = l("Surprise me!") + ":" + .@menustr$ + l("I'm fine for now, thank you.");
-
+
.@idx = select(.@menustr$);
-
+
if (.@idx == .@i + 2) return;
switch (@menu)
@@ -95,7 +95,7 @@ function script BarberChangeColor {
do
{
.@rand_color = rand(0, .@hairsizearray);
- } while (.@rand_color == getlook (LOOK_HAIR_COLOR));
+ } while (.@rand_color == getlook(LOOK_HAIR_COLOR));
setlook LOOK_HAIR_COLOR, .@rand_color;
BarberSayStyle 2;
break;
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 8eadab89..3d719ac7 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -273,7 +273,7 @@ function script fishing {
set getvariableofnpc(.account_id, .@npc$), getcharid(CHAR_ID_ACCOUNT); // record account id
set getvariableofnpc(.char_id, .@npc$), getcharid(CHAR_ID_CHAR); // record char id
set getvariableofnpc(.last_used, .@npc$), gettimetick(2);
- getmapxy (@fishing_loc$[0], @fishing_loc[0], @fishing_loc[1], 0); // record char pos
+ getmapxy(@fishing_loc$[0], @fishing_loc[0], @fishing_loc[1], 0); // record char pos
delitem .@bait, 1;
// The player uses this spot, his bait is ready, he just has to wait for the signal.
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 5f8c7aea..243ae383 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -142,7 +142,7 @@ function script npcdebug {
}
function script askyesno {
- return select (menuaction(l("Yes")),
+ return select(menuaction(l("Yes")),
menuaction(l("No")));
}
@@ -151,7 +151,7 @@ function script askyesno {
// 1 Current value
// 2 Next value
function script compareandsetq {
- if (getq (getarg(0)) == getarg(1))
+ if (getq(getarg(0)) == getarg(1))
{
setq getarg(0), getarg(2);
return true;
diff --git a/npc/functions/mouboofunc.txt b/npc/functions/mouboofunc.txt
index c0f7d96b..6129c083 100644
--- a/npc/functions/mouboofunc.txt
+++ b/npc/functions/mouboofunc.txt
@@ -5,7 +5,7 @@
// Various scripts used in walking mouboo NPCs.
function script moubootalk {
- switch (rand (4))
+ switch (rand(4))
{
case 0:
npctalkonce(l("Moooooo!"));
@@ -31,13 +31,13 @@ function script mouboocheckxy {
"Taree";
for (.@size = 0; .@size < getarraysize(.nearnpc$); .@size++)
{
- if (strcmp (.name$, .nearnpc$[.@size]) == 0)
+ if (strcmp(.name$, .nearnpc$[.@size]) == 0)
{
continue;
}
- .@npc_x = getvariableofnpc (.x, .nearnpc$[.@size]);
- .@npc_y = getvariableofnpc (.y, .nearnpc$[.@size]);
+ .@npc_x = getvariableofnpc(.x, .nearnpc$[.@size]);
+ .@npc_y = getvariableofnpc(.y, .nearnpc$[.@size]);
if (.@npc_x == .x && .@npc_y == .y)
{
@@ -49,13 +49,13 @@ function script mouboocheckxy {
}
function script moubootimer {
- if (mouboocheckxy () && !isunitwalking ())
+ if (mouboocheckxy() && !isunitwalking())
{
movetonextpoint;
}
- else if (rand (0,6) == 5)
+ else if (rand(0,6) == 5)
{
- if (!isunitwalking ())
+ if (!isunitwalking())
{
movetonextpoint;
}
diff --git a/npc/functions/openbook.txt b/npc/functions/openbook.txt
index a46d957c..0278415c 100644
--- a/npc/functions/openbook.txt
+++ b/npc/functions/openbook.txt
@@ -13,7 +13,7 @@ function script openbook {
l("You open a book named @@.", .@book_name$),
l("Do you want to read it?");
- return (select ("Yes.", "No.") == 1);
+ return (select("Yes.", "No.") == 1);
}
function script openbookshelf {
@@ -24,7 +24,7 @@ function script openbookshelf {
l("The name of the book is @@.", .@book_name$),
l("Do you want to read it?");
- return (select ("Yes.", "No.") == 1);
+ return (select("Yes.", "No.") == 1);
}
function script openoldbook {
@@ -32,5 +32,5 @@ function script openoldbook {
l("You open the book, but it looks like the sea water and time damaged it severely. Some pages are not readable anymore. Some others are simply missing."),
l("The old book seems to tell about the legend of Aemil. Would you like to read it?");
- return (select ("Yes.", "No.") == 1);
+ return (select("Yes.", "No.") == 1);
}
diff --git a/npc/functions/riddle.txt b/npc/functions/riddle.txt
index b65c115d..fb503e3b 100644
--- a/npc/functions/riddle.txt
+++ b/npc/functions/riddle.txt
@@ -12,15 +12,15 @@
// TODO: levenshtein(), similar_text(), and maybe even soundex()
function script riddlevalidation {
- .@answer$ = strtolower (getarg (0));
- .@good$ = strtolower (getarg (1));
- .@good_translated$ = strtolower (getarg (2));
+ .@answer$ = strtolower(getarg(0));
+ .@good$ = strtolower(getarg(1));
+ .@good_translated$ = strtolower(getarg(2));
- .@size_answer = getstrlen (.@answer$);
- .@size_good = getstrlen (.@good$);
- .@size_good_translated = getstrlen (.@good_translated$);
+ .@size_answer = getstrlen(.@answer$);
+ .@size_good = getstrlen(.@good$);
+ .@size_good_translated = getstrlen(.@good_translated$);
- .@max = max (.@size_answer, .@size_good_translated, .@size_good);
+ .@max = max(.@size_answer, .@size_good_translated, .@size_good);
// Input is too long.
if (.@max > 20)
@@ -38,7 +38,7 @@ function script riddlevalidation {
for (.@k = .@k_translated = .@j = .@i; .@j < .@max; .@j++)
{
- if (charat (.@answer$, .@j) == charat (.@good$, .@k))
+ if (charat(.@answer$, .@j) == charat(.@good$, .@k))
{
.@correct++;
.@k++;
@@ -48,8 +48,8 @@ function script riddlevalidation {
.@correct--;
}
- if (charat (.@answer$, .@j) ==
- charat (.@good_translated$, .@k_translated))
+ if (charat(.@answer$, .@j) ==
+ charat(.@good_translated$, .@k_translated))
{
.@correct_translated++;
.@k_translated++;
diff --git a/npc/items/rand_sc_heal.txt b/npc/items/rand_sc_heal.txt
index 4398f4e6..e4b0875a 100644
--- a/npc/items/rand_sc_heal.txt
+++ b/npc/items/rand_sc_heal.txt
@@ -18,10 +18,10 @@
// Add remaning bonus if the last one hasn't finished
function remaining_bonus
{
- if (getstatus (getarg (0)))
+ if (getstatus(getarg(0)))
{
- .@old_val1 = getstatus (getarg (0), 1);
- .@old_delay = getstatus (getarg (0), 4) * 1000;
+ .@old_val1 = getstatus(getarg(0), 1);
+ .@old_delay = getstatus(getarg(0), 4) * 1000;
// change the delay to prevent fast healing
if (.@old_delay > @delay)
@@ -45,8 +45,8 @@ OnUse:
if (@delay <= 0) close;
// minimum between @min and bVit / 2 * BaseLevel / 10
- .@vitality_bonus = min (@min, readparam (bVit) * BaseLevel / 20);
- .@rand_heal_val = rand (@min, @max);
+ .@vitality_bonus = min(@min, readparam(bVit) * BaseLevel / 20);
+ .@rand_heal_val = rand(@min, @max);
// val1 is the heal value without the vitality bonus
@val1 = .@rand_heal_val / @delay;
@@ -76,7 +76,7 @@ OnUse:
}
if (.@skill != 0)
{
- remaining_bonus (.@skill);
+ remaining_bonus(.@skill);
sc_end .@skill;
sc_start2 .@skill, @delay, @val1, 1;
}