summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:09:52 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:23 -0600
commitfc31b21732038e1dfeec9de851c23c71ef5b2863 (patch)
tree0cdfff11af32788df70af6df47374b22897722d0
parentb0ec65369e8144d745e38057b8b103e4bf516a40 (diff)
downloadserverdata-fc31b21732038e1dfeec9de851c23c71ef5b2863.tar.gz
serverdata-fc31b21732038e1dfeec9de851c23c71ef5b2863.tar.bz2
serverdata-fc31b21732038e1dfeec9de851c23c71ef5b2863.tar.xz
serverdata-fc31b21732038e1dfeec9de851c23c71ef5b2863.zip
NPCs on 012-* fixed
-rw-r--r--world/map/npc/012-1/amrak.txt2
-rw-r--r--world/map/npc/012-1/flowerpentagram2.txt2
-rw-r--r--world/map/npc/012-1/injured-mouboo.txt4
-rw-r--r--world/map/npc/012-3/mana-seed.txt2
-rw-r--r--world/map/npc/012-3/traveler.txt2
-rw-r--r--world/map/npc/012-3/warningsigns.txt4
6 files changed, 8 insertions, 8 deletions
diff --git a/world/map/npc/012-1/amrak.txt b/world/map/npc/012-1/amrak.txt
index 8997631f..1305b9dd 100644
--- a/world/map/npc/012-1/amrak.txt
+++ b/world/map/npc/012-1/amrak.txt
@@ -1,6 +1,6 @@
//
-012-1.gat,137,104,0|script|Amrak|103,
+012-1.gat,137,104,0|script|Amrak|103
{
mes "[Amrak]";
mes "\"I'm studying this waterfall. The water seems to flow from it like magic.\"";
diff --git a/world/map/npc/012-1/flowerpentagram2.txt b/world/map/npc/012-1/flowerpentagram2.txt
index e002ec8a..35a9a21e 100644
--- a/world/map/npc/012-1/flowerpentagram2.txt
+++ b/world/map/npc/012-1/flowerpentagram2.txt
@@ -1,6 +1,6 @@
// Author: Jenalya
-012-1.gat,143,70,0|script|#FlowerPentagram2|400,
+012-1.gat,143,70,0|script|#FlowerPentagram2|400
{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt
index 4fe62ce5..03a5bb70 100644
--- a/world/map/npc/012-1/injured-mouboo.txt
+++ b/world/map/npc/012-1/injured-mouboo.txt
@@ -1,6 +1,6 @@
// The following auxiliary function is used both by appropriate magic and within the regular script:
-function|script|QuestMoubooHeal|,
+function|script|QuestMoubooHeal
{
set @Q_MASK, NIBBLE_2_MASK;
set @Q_SHIFT, NIBBLE_2_SHIFT;
@@ -43,7 +43,7 @@ S_update_var:
return;
}
-012-1.gat,57,153,0|script|Mouboo|171,
+012-1.gat,57,153,0|script|Mouboo|171
{
set @Q_MASK, NIBBLE_2_MASK;
set @Q_SHIFT, NIBBLE_2_SHIFT;
diff --git a/world/map/npc/012-3/mana-seed.txt b/world/map/npc/012-3/mana-seed.txt
index 3fd46393..7f4dcb5c 100644
--- a/world/map/npc/012-3/mana-seed.txt
+++ b/world/map/npc/012-3/mana-seed.txt
@@ -1,4 +1,4 @@
-012-3.gat,62,130,0|script|Forest Mana Seed#_M|166,
+012-3.gat,62,130,0|script|Forest Mana Seed#_M|166
{
setarray @magic_exp_needed,
0, // level 0
diff --git a/world/map/npc/012-3/traveler.txt b/world/map/npc/012-3/traveler.txt
index ef77b88a..958fdec9 100644
--- a/world/map/npc/012-3/traveler.txt
+++ b/world/map/npc/012-3/traveler.txt
@@ -2,7 +2,7 @@
// Author: Wombat, wushin
// cost depending on level and adapted to new scripting guidelines: Jenalya
-012-3.gat,439,62,0|script|Meridith the Traveler|103,
+012-3.gat,439,62,0|script|Meridith the Traveler|103
{
set @NpcName$, "Meridith";
set @NpcTravelBit, $@terranite_cave_bit;
diff --git a/world/map/npc/012-3/warningsigns.txt b/world/map/npc/012-3/warningsigns.txt
index bb92d1fe..0c84a895 100644
--- a/world/map/npc/012-3/warningsigns.txt
+++ b/world/map/npc/012-3/warningsigns.txt
@@ -1,6 +1,6 @@
//warning signs at pvp entrance!
-012-3.gat,445,61,0|script|sign#pvp-1|187,
+012-3.gat,445,61,0|script|sign#pvp-1|187
{
mes "You are about to enter a dangerous area!";
next;
@@ -9,7 +9,7 @@
close;
}
-012-3.gat,451,61,0|script|sign#pvp-2|186,
+012-3.gat,451,61,0|script|sign#pvp-2|186
{
mes "You are about to enter a dangerous area!";
next;