diff options
| author | Wushin <pasekei@gmail.com> | 2015-02-19 23:12:02 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-02-19 23:12:02 -0600 |
| commit | 6b75d81034f0e017f4cec776f3ab00e3e08f7ac4 (patch) | |
| tree | 2819bd1a3a98a56cfa475da16be443ecaa912228 /world/map/npc/011-1/oscar.txt | |
| parent | 8452669804fc5dfca5a9143a542c11f1e8cc475f (diff) | |
| parent | f7f84b8e69075f07fae64cca3da1b1d0a6e98eef (diff) | |
| download | serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.tar.gz serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.tar.bz2 serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.tar.xz serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.zip | |
Merge pull request #281 from wushin/bug-fix
Bug fix
Diffstat (limited to 'world/map/npc/011-1/oscar.txt')
| -rw-r--r-- | world/map/npc/011-1/oscar.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt index 3cc5c1e3..5a0994cc 100644 --- a/world/map/npc/011-1/oscar.txt +++ b/world/map/npc/011-1/oscar.txt @@ -340,7 +340,7 @@ L_TimerFunction: npctalk "Hurry up " + $@HalloweenQuest_PumpkinHunter$ + "! My farm is being ruined!"; // 7 mins max if ($@HalloweenQuest_PumpkinsTimer > 420) - goto L_PumpkinsRuinedEverything; + goto L_PumpkinsRuined; if (getnpctimer(0) >= 2900) goto L_TrySpawnPumpkin; @@ -407,7 +407,7 @@ L_KillBadHunter: percentheal -100, 0; end; -L_PumpkinsRuinedEverything: +L_PumpkinsRuined: npctalk "No! " + $@HalloweenQuest_PumpkinHunter$ + " how could you let that happen? All my farm is a mess now! All my trees are infested with bugs!"; goto L_Fail; |