summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/011-1/alchemist.txt2
-rw-r--r--world/map/npc/011-1/auldsbel.txt2
-rw-r--r--world/map/npc/011-1/oscar.txt6
-rw-r--r--world/map/npc/011-3/hermit.txt2
-rw-r--r--world/map/npc/011-4/bl_barrier.txt2
-rw-r--r--world/map/npc/011-6/barrier.txt2
-rw-r--r--world/map/npc/011-6/bryant.txt2
-rw-r--r--world/map/npc/011-6/crastur.txt2
8 files changed, 10 insertions, 10 deletions
diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index fd8ec7a8..6e78a408 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -1,5 +1,5 @@
// This NPC makes potions and dyes
-011-1.gat,117,77,0|script|Rauk|103,
+011-1.gat,117,77,0|script|Rauk|103
{
// Setzer quest/monster oil quest participation
set @SETZER_INITIAL, 0;
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 1fe5c285..9790e8ef 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -1,7 +1,7 @@
// Auldsbel the Wizard
// Transmutation Magic expert
-011-1.gat,50,68,0|script|Auldsbel#_M|168,
+011-1.gat,50,68,0|script|Auldsbel#_M|168
{
set @mexp, MAGIC_EXPERIENCE & 65535;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 2927c5e8..3bbfa545 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -24,11 +24,11 @@
// 4: the player is asked to go refill water bottles
// 5: various possible states here: the water bottles are refilled and the pumpkin spawns will start right away.
// the player will start by kafloshing ($@HalloweenQuest_PumpkinHunter$ == "")
-// 5 + $@HalloweenQuest_PumpkinHunter$ != "" : the player watered the patches (by kaflosh, or the farmer did). Pumpkins spawn.
+// 5 + $@HalloweenQuest_PumpkinHunter$ != "":* the player watered the patches (by kaflosh, or the farmer did). Pumpkins spawn.
// 6: the player saved the farmer from the pumpkin invasion (all pumpkins / mobs killed)
// 10: the player failed to save the farmer from the pumpkin invasion (player left the map, died -- logging off is allowed however)
-function|script|HalloweenQuestWaterPumpkins|,
+function|script|HalloweenQuestWaterPumpkins
{
if (Quest_Halloween != 5 || $@HalloweenQuest_PumpkinHunter$ != "")
end;
@@ -37,7 +37,7 @@ function|script|HalloweenQuestWaterPumpkins|,
end;
}
-011-1.gat,94,38,0|script|Oscar|142,
+011-1.gat,94,38,0|script|Oscar|142
{
// Check we are at the good time of the year
if (!(gettime(6) == 11 && (gettime(5) >= 4 && gettime(5) <= 30))) goto L_NoEvent;
diff --git a/world/map/npc/011-3/hermit.txt b/world/map/npc/011-3/hermit.txt
index e8c2d11a..2f758ee7 100644
--- a/world/map/npc/011-3/hermit.txt
+++ b/world/map/npc/011-3/hermit.txt
@@ -1,6 +1,6 @@
//
-011-3.gat,30,23,0|script|Arkim|116,
+011-3.gat,30,23,0|script|Arkim|116
{
mes "[Arkim the Hermit]";
mes "\"Do you want to go back outside?\"";
diff --git a/world/map/npc/011-4/bl_barrier.txt b/world/map/npc/011-4/bl_barrier.txt
index fd33b9fd..98f52d39 100644
--- a/world/map/npc/011-4/bl_barrier.txt
+++ b/world/map/npc/011-4/bl_barrier.txt
@@ -1,6 +1,6 @@
//bandit lord barrier
-011-4.gat,111,121,0|script|#BL_Barrier|45,0,0,
+011-4.gat,111,121,0|script|#BL_Barrier|45,0,0
{
set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
diff --git a/world/map/npc/011-6/barrier.txt b/world/map/npc/011-6/barrier.txt
index cf5908e4..7b4f2b25 100644
--- a/world/map/npc/011-6/barrier.txt
+++ b/world/map/npc/011-6/barrier.txt
@@ -1,4 +1,4 @@
-011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0,
+011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0
{
set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index 42b8c747..2aaa15fe 100644
--- a/world/map/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
@@ -1,7 +1,7 @@
//NPC to set the state for killing the bandit lord.
// Variables used: nibble 0 of QUEST_Hurnscald
-011-6.gat,27,200,0|script|Bryant|126,
+011-6.gat,27,200,0|script|Bryant|126
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt
index f9acb0bf..2818998b 100644
--- a/world/map/npc/011-6/crastur.txt
+++ b/world/map/npc/011-6/crastur.txt
@@ -1,4 +1,4 @@
-011-6.gat,172,250,0|script|Crastur the Ugly|418,
+011-6.gat,172,250,0|script|Crastur the Ugly|418
{
set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);