summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-04 19:53:00 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-04 19:53:00 +0300
commitb5ba5b06918d5b6a48aed7929d8107c052c5bf25 (patch)
tree8f9ec7e15d5bb6733dff5c3cc9fb8dad9622b95e /npc
parent3e1aae83d7ca2599d44d746569cb7bbf4b0a8c66 (diff)
downloadserverdata-b5ba5b06918d5b6a48aed7929d8107c052c5bf25.tar.gz
serverdata-b5ba5b06918d5b6a48aed7929d8107c052c5bf25.tar.bz2
serverdata-b5ba5b06918d5b6a48aed7929d8107c052c5bf25.tar.xz
serverdata-b5ba5b06918d5b6a48aed7929d8107c052c5bf25.zip
Fix code style.
Add missing spaces, remove useless empty lines.
Diffstat (limited to 'npc')
-rw-r--r--npc/000-0-0/q'onan.txt2
-rw-r--r--npc/000-0-0/sailors.txt5
-rw-r--r--npc/000-0/sailors.txt31
-rw-r--r--npc/000-1/ale.txt2
-rw-r--r--npc/000-1/astapolos.txt2
-rw-r--r--npc/000-1/couwan.txt2
-rw-r--r--npc/000-1/darlin.txt2
-rw-r--r--npc/000-1/fexil.txt2
-rw-r--r--npc/000-1/gugli.txt2
-rw-r--r--npc/000-1/gulukan.txt4
-rw-r--r--npc/000-1/jalad.txt2
-rw-r--r--npc/000-1/lean.txt2
-rw-r--r--npc/000-1/max.txt2
-rw-r--r--npc/000-1/muller.txt2
-rw-r--r--npc/000-1/sapartan.txt2
-rw-r--r--npc/000-1/silvio.txt4
-rw-r--r--npc/000-1/tarlan.txt4
-rw-r--r--npc/000-1/tibbo.txt2
-rw-r--r--npc/000-2-0/billybons.txt4
-rw-r--r--npc/000-2-0/doors.txt2
-rw-r--r--npc/000-2-0/julia.txt22
-rw-r--r--npc/000-2-0/note.txt2
-rw-r--r--npc/000-2-1/alige.txt5
-rw-r--r--npc/000-2-1/arpan.txt6
-rw-r--r--npc/000-2-1/chefgado.txt4
-rw-r--r--npc/000-2-1/chest.txt2
-rw-r--r--npc/000-2-1/dan.txt2
-rw-r--r--npc/000-2-1/devis.txt1
-rw-r--r--npc/000-2-1/hammock.txt8
-rw-r--r--npc/000-2-1/knife.txt2
-rw-r--r--npc/000-2-1/peter.txt23
-rw-r--r--npc/000-2-1/q'onan.txt2
-rw-r--r--npc/000-2-1/savepoint.txt8
-rw-r--r--npc/000-2-2/doors.txt2
-rw-r--r--npc/000-2-2/ratto.txt28
-rw-r--r--npc/000-2-3/box.txt2
-rw-r--r--npc/000-2-3/elmo.txt2
-rw-r--r--npc/000-2-3/hammock.txt1
-rw-r--r--npc/000-2-3/nard.txt2
-rw-r--r--npc/000-2-3/piourocket.txt4
-rw-r--r--npc/functions/inventoryplace.txt3
-rw-r--r--npc/functions/sailordialogue.txt3
-rw-r--r--npc/items/croconut.txt1
-rw-r--r--npc/items/oldbook.txt1
44 files changed, 54 insertions, 162 deletions
diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt
index dc39d9d6..f0c8ae1f 100644
--- a/npc/000-0-0/q'onan.txt
+++ b/npc/000-0-0/q'onan.txt
@@ -5,7 +5,6 @@
// Sleeping and snoring NPC.
000-0-0.gat,29,28,0,1 script Q'Onan 302,{
-
mesn;
set @q, rand(2);
@@ -21,5 +20,4 @@ l_Snoring:
setcamnpc;
mesq l("Rrrr... Pchhhh...");
close;
-
}
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index e5c6d49b..684f5968 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -69,15 +69,12 @@ OnTalk:
restorecam;
warp "000-2-1.gat", 50, 38;
- savepoint "000-2-1.gat",50,38;
+ savepoint "000-2-1.gat", 50, 38;
setskill 1, 1; // Add Emote skill.
close;
-
}
000-0-0.gat,25,23,0,1 script Magic Arpan 307,{
doevent "Elmo::OnTalk";
-
close;
-
}
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index f99c33c3..4b65018a 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -25,17 +25,17 @@ OnTouch:
mes col(l("Aboard stand sailors trying to communicate with you."), 9);
next;
- setcamnpc "Sailors",-64,-32;
+ setcamnpc "Sailors", -64, -32;
mesn "Orc Voice";
mesq lg("Hey Frenchy!");
next;
- setcamnpc "Sailors",0,-32;
+ setcamnpc "Sailors", 0, -32;
mesn "Elven Voice";
mesq lg("Why Frenchy? It's a Russian!");
next;
- setcamnpc "Sailors",144,-80;
+ setcamnpc "Sailors", 144, -80;
mesn "Tritan Voice";
mesq lg("What are you guys saying ? It's a Yoiis!");
next;
@@ -50,16 +50,16 @@ OnTouch:
restorecam;
menu
- menuimage("flags/en","I hear you... (English)"), -,
- menuimage("flags/fr","Je vous entends... (Français)"), -,
- menuimage("flags/ru","Да я вас слышу... (Русский)"), -,
- menuimage("flags/es","Te oigo... (Español)"), -,
- menuimage("flags/pt_BR","Eu te ouço... (Português)"), -,
- menuimage("flags/de","Ich höre euch... (Deutsch)"), -,
- menuimage("flags/vls","'k hoar ui wel... (Vlaams)"), -,
- menuimage("flags/pl","Słyszę cię... (Polski)"), -,
- menuimage("flags/it","Vi sento... (Italiano)"), -,
- menuimage("flags/nl_BE","Ik kan je horen... (Nederlands)"), -;
+ menuimage("flags/en", "I hear you... (English)"), -,
+ menuimage("flags/fr", "Je vous entends... (Français)"), -,
+ menuimage("flags/ru", "Да я вас слышу... (Русский)"), -,
+ menuimage("flags/es", "Te oigo... (Español)"), -,
+ menuimage("flags/pt_BR", "Eu te ouço... (Português)"), -,
+ menuimage("flags/de", "Ich höre euch... (Deutsch)"), -,
+ menuimage("flags/vls", "'k hoar ui wel... (Vlaams)"), -,
+ menuimage("flags/pl", "Słyszę cię... (Polski)"), -,
+ menuimage("flags/it", "Vi sento... (Italiano)"), -,
+ menuimage("flags/nl_BE", "Ik kan je horen... (Nederlands)"), -;
set @lang, @menu-1;
if (@lang < 0 || @lang > 9) close;
setlang @lang;
@@ -70,7 +70,7 @@ OnTouch:
mesq g(l("Oh, she's still alive!"),
l("Oh, he's still alive!"));
next;
- setcamnpc "Sailors",144,-80;
+ setcamnpc "Sailors", 144, -80;
mesq g(l("This girl needs help, we need to rescue her!"),
l("This guy needs help, we need to rescue him!"));
next;
@@ -82,8 +82,7 @@ OnTouch:
mes col(l("Click on the NPCs around you to continue the introduction."), 9);
next;
- warp "000-0-0.gat",26,28;
+ warp "000-0-0.gat", 26, 28;
close;
-
}
diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index d9083136..f2e2642c 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -6,7 +6,6 @@
// Aquada box.
000-1.gat,55,23,0,1 script Ale 105;2,{
-
set @g, getq(ShipQuests_Gugli);
if (@g == 0) goto l_NoTask;
@@ -111,5 +110,4 @@ l_TaskDone:
l_Quit:
close;
-
}
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 70c9f161..bd0ef812 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -7,7 +7,6 @@
// Croconut box.
000-1.gat,22,50,0,1 script Astapolos 107;2,{
-
set @g, getq(ShipQuests_Gugli);
if (@g == 0) goto l_NoTask;
@@ -156,5 +155,4 @@ l_TaskDone:
mesq l("Perfect!");
close;
-
}
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
index c074362d..624d54af 100644
--- a/npc/000-1/couwan.txt
+++ b/npc/000-1/couwan.txt
@@ -12,7 +12,6 @@
// 2 Done quest scam.
000-1.gat,89,36,0,1 script Couwan 111;2,{
-
set @q, getq(ShipQuests_Couwan);
if (@q == 1) goto l_QuestGiven;
if (@q > 1) goto l_QuestDone;
@@ -87,5 +86,4 @@ l_QuestDone:
mesq l("Yeye gave my box to Gugli? Nice, nice yeye!");
close;
-
}
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index 60980ef3..72458daa 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -12,7 +12,6 @@
000-1.gat,89,95,0,1 script Darlin 103;14,{
-
set @q, getq(ShipQuests_TreasureChest);
mesn;
@@ -140,5 +139,4 @@ l_DangerAround:
l_Quit:
close;
-
}
diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt
index 21e31f13..b55997e3 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -5,7 +5,6 @@
// Newbie merchant.
000-1.gat,83,98,0,1 script Fexil 108;2,{
-
mesn;
mesq lg("Greetings traveler.");
next;
@@ -32,5 +31,4 @@ l_Accepted:
shop "Bag";
close;
-
}
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index c923c2d1..22fb0363 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -22,6 +22,7 @@
// 22 Gave all of the box to Gugli.
000-1.gat,85,108,0,1 script Gugli 313;2,{
+
OnTalk:
mesn;
set @nard, getq(ShipQuests_Nard);
@@ -229,5 +230,4 @@ l_Quit:
if (@gugli > 0) close;
doevent "Gugli::OnTalk";
close;
-
}
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index 1ec1c94c..6a90afe5 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -7,7 +7,6 @@
// Croconut box.
000-1.gat,54,90,0,1 script Gulukan 111;2,{
-
set @g, getq(ShipQuests_Gugli);
if (@g == 0) goto l_NoTask;
@@ -68,7 +67,7 @@ l_Continue2:
l_Func:
mesn;
- set @q, rand(0,400)/100;
+ set @q, rand(0, 400) / 100;
if (@q == 0) goto l_RandomA;
if (@q == 1) goto l_RandomB;
if (@q > 1) goto l_RandomC;
@@ -158,5 +157,4 @@ l_TaskDone:
l_Quit:
close;
-
}
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index b57500f9..869735e4 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -7,7 +7,6 @@
// Plushroom box.
000-1.gat,46,35,0,1 script Jalad 112;2,{
-
set @g, getq(ShipQuests_Gugli);
if (@g == 0) goto l_NoTask;
@@ -118,5 +117,4 @@ l_TaskDone:
mesq l("Perfect!");
close;
-
}
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index 8844416b..4d29ffe6 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -5,7 +5,6 @@
// Sailor who gives some informations to the player.
000-1.gat,79,108,0,1 script Lean 106;2,{
-
set @gugli, getq(ShipQuests_Gugli);
mesn;
@@ -59,5 +58,4 @@ l_Sailors:
l_Quit:
close;
-
}
diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 2f3916b8..342f487a 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -5,7 +5,6 @@
// Friend of Sapartan, he gives some information on how to find Gulukan, Astapolos and Q-Muller.
000-1.gat,72,110,0,1 script Max 105;2,{
-
set @gugli, getq(ShipQuests_Gugli);
set @knife, getq(ShipQuests_Knife);
@@ -98,5 +97,4 @@ l_Secrets:
l_Quit:
close;
-
}
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index a6da67b4..0b48723c 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -7,7 +7,6 @@
// Plushroom box.
000-1.gat,35,69,0,1 script Q'Muller 104;2,{
-
set @g, getq(ShipQuests_Gugli);
if (@g == 0) goto l_NoTask;
@@ -120,5 +119,4 @@ l_TaskDone:
l_Quit:
close;
-
}
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 0f5b8461..090ea509 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -5,7 +5,6 @@
// Friend of Max, he gives some information on combat system.
000-1.gat,74,111,0,1 script Sapartan 314;2,{
-
mesn;
mesq l("Hey Max, it's @@!", strcharinfo(0));
next;
@@ -96,5 +95,4 @@
l_Quit:
close;
-
}
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 3706623b..ccae2ec6 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -5,7 +5,6 @@
// Pervert and arrogant sailor.
000-1.gat,86,99,0,1 script Silvio 312;2,{
-
mesn;
mesq l("Hey!");
next;
@@ -183,6 +182,5 @@ l_Quit:
mesn;
mesq l("Give me a kiss before you say goodbye!");
-close;
-
+ close;
}
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index acc3abd3..26137301 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -5,10 +5,9 @@
// Sailor hitting a crocotree, then being struck by a falling croconut.
000-1.gat,33,37,0,1 script Tarlan 315;2,{
+ setnpcdir 2;
mesn;
-
- setnpcdir 2;
set @a, rand(4);
if (@a == 0) goto l_HardToHit;
if (@a == 1) goto l_Aouch;
@@ -60,5 +59,4 @@ l_DoYou:
l_Quit:
setnpcdir 4;
close;
-
}
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index dbef8ec0..8ca6cff2 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -7,7 +7,6 @@
// Aquada box.
000-1.gat,34,111,0,1 script Tibbo 110;2,{
-
set @g, getq(ShipQuests_Gugli);
if (@g == 0) goto l_NoTask;
@@ -107,5 +106,4 @@ l_TaskDone:
mesq l("Awesome!");
close;
-
}
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 922dfcab..e8703920 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -5,9 +5,8 @@
// Drunk easteregg telling about the player's past.
000-2-0.gat,20,23,0,1 script Billy Bons 311;3,{
-
mesn;
- if (rand(5)==2) goto l_Hic;
+ if (rand(5) == 2) goto l_Hic;
mesq l("You? Here?");
mesq l("How is *hic* it possible?");
@@ -87,5 +86,4 @@ l_Quit:
mes col(l("The sailor turns his back to you."), 9);
close;
-
}
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index abd0bb20..ce4ad031 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -52,7 +52,6 @@ l_End:
mesn "Narrator";
mes col(l("The door is locked."), 9);
close;
-
}
000-2-0.gat,33,28,0,1 script AreaNPC 0,0,0,{
@@ -65,5 +64,4 @@ OnTouch:
l_Warp:
warp "000-2-3", 20, 27;
close;
-
}
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index e8c49ac3..6966daa8 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -32,7 +32,6 @@
// 25 Reward taken from the box.
000-2-0.gat,27,24,0,0 script Julia 304,2,10;5,{
-
setskill 1, 1; // Add Emote skill.
mesn;
@@ -80,16 +79,16 @@ l_First:
l_ChooseLang:
menu
- menuimage("flags/en",l("I speak English.") + " (English)"), -,
- menuimage("flags/fr",l("I speak French.") + " (Français)"), -,
- menuimage("flags/ru",l("I speak Russian.") + " (Русский)"), -,
- menuimage("flags/es",l("I speak Spanish.") + " (Español)"), -,
- menuimage("flags/pt_BR",l("I speak Portuguese.") + " (Português)"), -,
- menuimage("flags/de",l("I speak German.") + " (Deutsch)"), -,
- menuimage("flags/vls",l("I speak Flemish.") + " (Vlaams)"), -,
- menuimage("flags/pl",l("I speak Polish.") + " (Polski)"), -,
- menuimage("flags/it",l("I speak Italian.") + " (Italiano)"), -,
- menuimage("flags/nl_BE",l("I speak Dutch.") + " (Nederlands)"), -,
+ menuimage("flags/en", l("I speak English.") + " (English)"), -,
+ menuimage("flags/fr", l("I speak French.") + " (Français)"), -,
+ menuimage("flags/ru", l("I speak Russian.") + " (Русский)"), -,
+ menuimage("flags/es", l("I speak Spanish.") + " (Español)"), -,
+ menuimage("flags/pt_BR", l("I speak Portuguese.") + " (Português)"), -,
+ menuimage("flags/de", l("I speak German.") + " (Deutsch)"), -,
+ menuimage("flags/vls", l("I speak Flemish.") + " (Vlaams)"), -,
+ menuimage("flags/pl", l("I speak Polish.") + " (Polski)"), -,
+ menuimage("flags/it", l("I speak Italian.") + " (Italiano)"), -,
+ menuimage("flags/nl_BE", l("I speak Dutch.") + " (Nederlands)"), -,
@s$, l_NoChanges;
set @lang, @menu-1;
if (@lang < 0 || @lang > 9) close;
@@ -269,5 +268,4 @@ l_Quit:
mesq l("Bye!");
close;
-
}
diff --git a/npc/000-2-0/note.txt b/npc/000-2-0/note.txt
index a893c54f..65d87fbd 100644
--- a/npc/000-2-0/note.txt
+++ b/npc/000-2-0/note.txt
@@ -6,7 +6,6 @@
// A small note presenting the 6 main rules of Evol Online.
000-2-0.gat,29,25,0 script Note 999;2,{
-
mesn "Narrator";
mes col(l("There is a paper with some rules written on it."), 9);
next;
@@ -31,5 +30,4 @@
mes col(l("Other things are written but are not legible anymore."), 9);
close;
-
}
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 733528a2..26fdd830 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -44,11 +44,9 @@ OnTimer190:
stopnpctimer;
end;
-
}
000-2-1.gat,43,31,0,1 script Alige 301;2,{
-
set @q, getq(ShipQuests_Alige);
if (@q > 1) goto l_AskForFood;
@@ -201,7 +199,7 @@ l_GiveFood:
mesq l("Thank you so much! Here, have some of my berries.");
setq ShipQuests_Alige, 3;
- getitem "Piberries", rand(1,3);
+ getitem "Piberries", rand(1, 3);
next;
goto l_ReturnMenu;
@@ -295,5 +293,4 @@ l_Quit:
mesq l("Too bad... Come back when you'll have some fine food for me.");
close;
-
}
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 874becca..433242c5 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -20,7 +20,6 @@
if (@q == 0) doevent "Magic Arpan::OnTalk";
close;
-
}
000-2-1.gat,54,36,0,1 script RightDoorCheck 0,0,0,{
@@ -28,7 +27,6 @@
if (@q == 0) doevent "Magic Arpan::OnTalk";
close;
-
}
000-2-1.gat,47,32,0,1 script LeftBarrierCheck 0,0,2,{
@@ -56,7 +54,6 @@ l_EquipDone:
setq ShipQuests_Arpan, 3;
close;
-
}
000-2-1.gat,56,32,0,1 script RightBarrierCheck 0,0,2,{
@@ -84,11 +81,9 @@ l_EquipDone:
setq ShipQuests_Arpan, 3;
close;
-
}
000-2-1.gat,49,33,0,1 script Magic Arpan 307;5,{
-
set @q, getq(ShipQuests_Arpan);
set @q_julia, getq(ShipQuests_Julia);
if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone;
@@ -228,5 +223,4 @@ l_EquipDone:
l_Quit:
close;
-
}
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index 2047f7bf..97f42d4d 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -16,7 +16,6 @@
// 6 Quest complete. Julia wins.
000-2-1.gat,27,28,0,1 script Chef Gado 318;2,{
-
set @q, getq(ShipQuests_ChefGado);
set @n, getq(ShipQuests_Nard);
if (@q == 1) goto l_QuestAccepted;
@@ -104,7 +103,7 @@ l_QuestAccepted:
menu
rif(countitem("PiouLegs") > 1 && countitem("HalfCroconut") > 0 && countitem("Aquada") > 0 && countitem("SeaDrops") > 0, l("All your... Fresh ingredients are ready to be cooked.")), l_GotAll,
l("What are your needs?"), l_Need,
- l("Where can I find a @@?",getitemlink("HalfCroconut")), l_OpenCroconut,
+ l("Where can I find a @@?", getitemlink("HalfCroconut")), l_OpenCroconut,
l("Not yet. I will be back soon."), l_Quit;
l_OpenCroconut:
@@ -208,5 +207,4 @@ l_QuestAborted:
l_Quit:
close;
-
}
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index e379ee76..a9d6f229 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -11,7 +11,6 @@
// 2 Has the clothes.
000-2-1.gat,51,37,0 script Chest 317;2,{
-
set @q, getq(ShipQuests_Arpan);
if (@q == 0) goto l_Talk;
@@ -50,5 +49,4 @@ l_Quit:
initnpctimer;
startnpctimer;
close;
-
}
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index 3cebb9cc..23724e31 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -6,7 +6,6 @@
// Dan will randomly choose between a useless sentence, and a quest in Artis.
000-2-1.gat, 32,31,0,1 script Dan 101;2,{
-
mesn;
set @q, rand(3);
if (@q == 0) goto l_QuestStory;
@@ -81,5 +80,4 @@ l_Quit2:
mes col(l("Dan ends the conversation and resumes to write his letter."), 9);
close;
-
}
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index cd04cab3..f6d872a0 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -21,5 +21,4 @@ l_Grm:
mes l("Ggrmm... Grmmmm...");
close;
-
}
diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt
index ad28764b..60463916 100644
--- a/npc/000-2-1/hammock.txt
+++ b/npc/000-2-1/hammock.txt
@@ -19,7 +19,6 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
000-2-1.gat,32,25,0 script #hammock2 904,1,0{
@@ -37,7 +36,6 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
000-2-1.gat,37,25,0 script #hammock3 905,1,0{
@@ -55,7 +53,6 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
000-2-1.gat,37,27,0 script #hammock4 905,1,0{
@@ -73,7 +70,6 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
000-2-1.gat,37,29,0 script #hammock5 905,1,0{
@@ -91,7 +87,6 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
000-2-1.gat,37,34,0 script #hammock6 905,1,0{
@@ -109,7 +104,6 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
000-2-1.gat,37,36,0 script #hammock7 905,1,0{
@@ -127,7 +121,6 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
000-2-1.gat,37,38,0 script #hammock8 905,1,0{
@@ -145,5 +138,4 @@ OnTimer5440:
setnpcdir 0;
stopnpctimer;
end;
-
}
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index 21c9bfd9..ac3717c3 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -10,7 +10,6 @@
// 1 Knife taken.
000-2-1.gat,50,24,0,2 script #knife 100;2,{
-
set @q, getq(ShipQuests_Knife);
if (@q) close;
@@ -41,5 +40,4 @@ l_Give:
mes col(l("Items have different effects. Some will heal you, some can be used as weapons or armor, and some can be sold for gold."), 9);
close;
-
}
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index f1030dd2..36ead6bf 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -84,11 +84,9 @@ l_NoGoodTick:
doevent "Peter::OnNoGoodTick";
close;
-
}
000-2-1.gat,70,35,0,1 script Peter 303;3,{
-
if (BaseLevel < 5) goto OnTooWeak;
if ($@RAT_SAILOR_COUNTDOWN == "") goto l_NoCountDown;
if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick;
@@ -128,7 +126,7 @@ OnTooWeak:
goto l_Quit;
OnStop:
- warp "000-2-1",72,36;
+ warp "000-2-1", 72, 36;
mesn;
mesq l("You can't go there!");
@@ -157,17 +155,15 @@ OnReturnWin:
next;
if (@peter == 3 || @peter == 4)
-
- menu
- l("Did you say reward? I want it!"), l_BonusTask,
- l("I am not worried about rewards. I just want to help."), l_Task,
- l("Sorry, I am not in the mood for another fight with these rattos."), -;
+ menu
+ l("Did you say reward? I want it!"), l_BonusTask,
+ l("I am not worried about rewards. I just want to help."), l_Task,
+ l("Sorry, I am not in the mood for another fight with these rattos."), -;
if (@peter == 5)
-
- menu
- l("No problem, I can help you anyway."), l_Task,
- l("Sorry, I am not in the mood for another fight with these rattos."), -;
+ menu
+ l("No problem, I can help you anyway."), l_Task,
+ l("Sorry, I am not in the mood for another fight with these rattos."), -;
mes "";
mesn;
@@ -212,7 +208,7 @@ OnStartOutside:
goto l_Quit;
OnTimer2000:
- if (attachrid(getcharid(3,$@RAT_SAILOR_HELPER$)) == 0) goto l_Logoff;
+ if (attachrid(getcharid(3, $@RAT_SAILOR_HELPER$)) == 0) goto l_Logoff;
set $@RAT_SAILOR_CONTROL[9], $@RAT_SAILOR_CONTROL[9] + 2;
if ($@RAT_SAILOR_CONTROL[9] > 100) goto l_Timeout;
if (PC_DIE_COUNTER > $@RAT_SAILOR_DEATHS) goto l_Dead;
@@ -326,5 +322,4 @@ OnNoGoodTick:
mesn;
mesq l("I don't need your help right now, come back later.");
close;
-
} \ No newline at end of file
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index 6827f0f1..94e38cd2 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -5,7 +5,6 @@
// Sleeping and snoring NPC.
000-2-1.gat,53,38,0,1 script Q'Onan 302;2,{
-
mesn;
set @q, rand(2);
@@ -18,5 +17,4 @@
l_Zzz:
mesq l("Zzzzzzzzzz");
close;
-
}
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
index 33db808d..4eec9298 100644
--- a/npc/000-2-1/savepoint.txt
+++ b/npc/000-2-1/savepoint.txt
@@ -5,41 +5,33 @@
// Saves locations in 000-2-1 map.
000-2-1.gat,40,37,0,2 script #name 900;2,{
-
set @map$, "000-2-1.gat";
set @x, 40;
set @y, 37;
callfunc "SavePoint";
close;
-
}
000-2-1.gat,46,37,0,2 script #name 900;2,{
-
set @map$, "000-2-1.gat";
set @x, 46;
set @y, 37;
callfunc "SavePoint";
close;
-
}
000-2-1.gat,50,38,0,2 script #name 900;2,{
-
set @map$, "000-2-1.gat";
set @x, 50;
set @y, 38;
callfunc "SavePoint";
close;
-
}
000-2-1.gat,55,40,0,2 script #name 900;2,{
-
set @map$, "000-2-1.gat";
set @x, 55;
set @y, 40;
callfunc "SavePoint";
close;
-
}
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index a33a8c75..76f0cbf5 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -31,7 +31,6 @@ l_Warn:
l_Warp:
warp "000-2-1", 72, 36;
close;
-
}
000-2-2.gat,24,31,0,1 script LeftDoor 0,0,0,{
@@ -60,5 +59,4 @@ l_Warp:
mes col(l("Wait, it seems someone is blocking the door from the other side!"), 9);
close;
-
}
diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt
index b3cd5abd..c950f28b 100644
--- a/npc/000-2-2/ratto.txt
+++ b/npc/000-2-2/ratto.txt
@@ -6,7 +6,6 @@
// Description:
// Ratto killer.
-000-2-2.gat,47,30,0,1 script RattosControl 32767,{
// $@RAT_SAILOR_CONTROL array explanation:
// [1] = Shows status of ratto number 1 (1 is dead and 0 is alive).
// [2] = Shows status of ratto number 2 (1 is dead and 0 is alive).
@@ -18,59 +17,52 @@
// [8] = Shows how many seconds passed since ratto number 4 died.
// [9] = Shows how many seconds passed since the player started the quest.
-OnSpawn:
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto1Death";
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto2Death";
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto3Death";
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto4Death";
+000-2-2.gat,47,30,0,1 script RattosControl 32767,{
+OnSpawn:
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
close;
OnRatto1Respawn:
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto1Death";
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
set $@RAT_SAILOR_CONTROL[1], 0;
set $@RAT_SAILOR_CONTROL[5], 0;
-
end;
OnRatto2Respawn:
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto2Death";
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
set $@RAT_SAILOR_CONTROL[2], 0;
set $@RAT_SAILOR_CONTROL[6], 0;
-
end;
OnRatto3Respawn:
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto3Death";
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
set $@RAT_SAILOR_CONTROL[3], 0;
set $@RAT_SAILOR_CONTROL[7], 0;
-
end;
OnRatto4Respawn:
- areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto4Death";
+ areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
set $@RAT_SAILOR_CONTROL[4], 0;
set $@RAT_SAILOR_CONTROL[8], 0;
end;
OnRatto1Death:
set $@RAT_SAILOR_CONTROL[1], 1;
-
end;
OnRatto2Death:
set $@RAT_SAILOR_CONTROL[2], 1;
-
end;
OnRatto3Death:
set $@RAT_SAILOR_CONTROL[3], 1;
-
end;
OnRatto4Death:
set $@RAT_SAILOR_CONTROL[4], 1;
-
end;
-
}
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index 0712158f..5cba5446 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -18,7 +18,6 @@
// 5 Reward taken from the box.
000-2-3.gat,25,24,0 script Box 102;1,{
-
set @q, getq(ShipQuests_Nard);
mesn "Narrator";
@@ -109,5 +108,4 @@ l_Already:
l_Quit:
close;
-
}
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index 52be3941..39e79e65 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -5,7 +5,6 @@
// Elmo's second dialog.
000-2-3.gat,27,27,0,1 script Elmo 309;5,{
-
set @q, getq(ShipQuests_ArpanMoney);
if (@q == 1) goto l_GotMoney;
@@ -61,5 +60,4 @@ l_GotMoney:
mesq l("Other than that, I don't know much about what else is going on, so directly asking the Cap'tain about it could be a good idea.");
close;
-
}
diff --git a/npc/000-2-3/hammock.txt b/npc/000-2-3/hammock.txt
index f5d214e4..7a3bdbed 100644
--- a/npc/000-2-3/hammock.txt
+++ b/npc/000-2-3/hammock.txt
@@ -19,5 +19,4 @@ OnTimer5440:
setnpcdir 4;
stopnpctimer;
end;
-
}
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index adb9426c..f67f89cb 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -23,7 +23,6 @@
// 12 Gave all of the boxes to Gugli.
000-2-3.gat,25,26,0,1 script Nard 306;5,{
-
set @nard, getq(ShipQuests_Nard);
set @gugli, getq(ShipQuests_Gugli);
set @gado, getq(ShipQuests_ChefGado);
@@ -219,5 +218,4 @@ l_Already:
mesq l("Sorry, I don't need any help right now. Come back later.");
close;
-
}
diff --git a/npc/000-2-3/piourocket.txt b/npc/000-2-3/piourocket.txt
index cf5bbcff..97e183e2 100644
--- a/npc/000-2-3/piourocket.txt
+++ b/npc/000-2-3/piourocket.txt
@@ -5,17 +5,13 @@
// Jumping piou.
000-2-3.gat,27,23,4,2 script #piourocket 308;3,{
-
setnpcdir 2;
stopnpctimer;
initnpctimer;
-
close;
OnTimer1420:
setnpcdir 4;
stopnpctimer;
-
end;
-
}
diff --git a/npc/functions/inventoryplace.txt b/npc/functions/inventoryplace.txt
index 4b3990b7..2a78ccfe 100644
--- a/npc/functions/inventoryplace.txt
+++ b/npc/functions/inventoryplace.txt
@@ -10,9 +10,8 @@
// @countitem = Count item's number.
function script InventoryPlace {
-
getinventorylist;
- set @iteminfo, getiteminfo(@item,2);
+ set @iteminfo, getiteminfo(@item, 2);
set @countitem, countitem(@item);
if (checkweight(@item, @count) == 0) goto l_Warn;
diff --git a/npc/functions/sailordialogue.txt b/npc/functions/sailordialogue.txt
index 33d86ac6..4eb132bb 100644
--- a/npc/functions/sailordialogue.txt
+++ b/npc/functions/sailordialogue.txt
@@ -7,7 +7,7 @@
function script SailorFood {
mesn;
- set @q, rand(0,400)/100;
+ set @q, rand(0, 400) / 100;
if (@q == 0) goto l_RandomA;
if (@q == 1) goto l_RandomB;
if (@q > 1) goto l_RandomC;
@@ -49,5 +49,4 @@ l_RandomC:
next;
return;
-
} \ No newline at end of file
diff --git a/npc/items/croconut.txt b/npc/items/croconut.txt
index 30a04d46..1273976c 100644
--- a/npc/items/croconut.txt
+++ b/npc/items/croconut.txt
@@ -66,5 +66,4 @@ L_Good:
getitem "HalfCroconut", 2;
close;
-
}
diff --git a/npc/items/oldbook.txt b/npc/items/oldbook.txt
index 27bdcac7..46fd51a1 100644
--- a/npc/items/oldbook.txt
+++ b/npc/items/oldbook.txt
@@ -58,5 +58,4 @@ l_Read:
mes col(l("The end of the story got erased, probably because of the sea water. Some pages are still missing thus you don't know the author's name."), 9);
close;
-
}