summaryrefslogtreecommitdiff
path: root/world/map/npc/011-1/oscar.txt
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:09:42 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:23 -0600
commitb0ec65369e8144d745e38057b8b103e4bf516a40 (patch)
treead8d0569b226e351b061c95b897ab7602aa14074 /world/map/npc/011-1/oscar.txt
parent4b98edcff75b086cf9d99aa17efb0556d16f5913 (diff)
downloadserverdata-b0ec65369e8144d745e38057b8b103e4bf516a40.tar.gz
serverdata-b0ec65369e8144d745e38057b8b103e4bf516a40.tar.bz2
serverdata-b0ec65369e8144d745e38057b8b103e4bf516a40.tar.xz
serverdata-b0ec65369e8144d745e38057b8b103e4bf516a40.zip
NPCs on 011-* fixed
Diffstat (limited to 'world/map/npc/011-1/oscar.txt')
-rw-r--r--world/map/npc/011-1/oscar.txt6
1 files changed, 3 insertions, 3 deletions
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;