summaryrefslogtreecommitdiff
path: root/world/map/npc/011-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/011-1')
-rw-r--r--world/map/npc/011-1/auldsbel.txt4
-rw-r--r--world/map/npc/011-1/oscar.txt24
2 files changed, 14 insertions, 14 deletions
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 4344b9ce..8fb16e2c 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -944,10 +944,10 @@ L_component_quest_5:
mes "\"I suggest that you run.\"";
next;
misceffect sfx_magic_transmute;
- monster "this", 50, 68, "Grass Snake", 1034, 4, "Auldsbel#_M::onSnakeDeath";
+ monster "this", 50, 68, "Grass Snake", 1034, 4, "Auldsbel#_M::OnSnakeDeath";
close;
-onSnakeDeath:
+OnSnakeDeath:
set BOSS_POINTS, BOSS_POINTS + 5;
message strcharinfo(0), "You gain 5 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 66f817c1..c9ee88da 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -299,7 +299,7 @@ L_QuestAlreadyDone:
mes "That was interesting, but really, fruits are more quiet!\"";
goto L_End;
-onInit:
+OnInit:
set $@halloween_num_seeds, 12;
set $@halloween_num_water_bottles, 15;
set $@halloween_num_pumpkins, $@halloween_num_seeds * 4;
@@ -312,8 +312,8 @@ OnTimer3000:
end;
callsub S_CheckPlayer;
set $@HalloweenQuest_PumpkinsTimer, $@HalloweenQuest_PumpkinsTimer + 1;
- if (mobcount("011-1.gat", "Oscar::onPD") < 0 &&
- mobcount("011-1.gat", "Oscar::onPDP") < 0 &&
+ if (mobcount("011-1.gat", "Oscar::OnPD") < 0 &&
+ mobcount("011-1.gat", "Oscar::OnPDP") < 0 &&
$@HalloweenQuest_PumpkinsCount <= 0)
goto L_AllPumpkinsDead;
// A quick "cheer up"
@@ -329,14 +329,14 @@ OnTimer3000:
L_TrySpawnPumpkin:
if ($@HalloweenQuest_PumpkinsCount > 0)
- areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 1, "Oscar::onPD";
+ areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD";
setnpctimer 0;
end;
OnTimer2500:
if ($@HalloweenQuest_PumpkinsState != 0)
end;
- areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 2, "Oscar::onPD";
+ areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD";
end;
OnTimer6000:
@@ -348,7 +348,7 @@ OnTimer6000:
setnpctimer 0;
end;
-onPD:
+OnPD:
if (strcharinfo(0) != $@HalloweenQuest_PumpkinHunter$)
goto L_KillBadHunter;
set $@HalloweenQuest_PumpkinsCount, $@HalloweenQuest_PumpkinsCount - 1;
@@ -369,18 +369,18 @@ onPD:
getitem "PumpkinHelmet", 1;
// huntsman spider x1
if (@halloween_rand < (15*BaseLevel)/100)
- areamonster "011-1.gat", 97, 40, 101, 44, "", 1083, 1, "Oscar::onPDP";
+ areamonster "011-1.gat", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP";
// Or spider x1
if (@halloween_rand >= (15*BaseLevel)/100 && @halloween_rand < (75*BaseLevel)/100)
- areamonster "011-1.gat", 97, 40, 101, 44, "", 1012, 1, "Oscar::onPDP";
+ areamonster "011-1.gat", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP";
// Or archant x2
if (@halloween_rand >= (75*BaseLevel)/100)
- areamonster "011-1.gat", 97, 40, 101, 44, "", 1060, 2, "Oscar::onPDP";
+ areamonster "011-1.gat", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP";
set @halloween_rand, 0;
end;
-onPDP:
+OnPDP:
end;
L_KillBadHunter:
@@ -435,8 +435,8 @@ L_Success:
goto L_Clean;
L_Clean:
- killmonster "011-1.gat", "Oscar::onPD";
- killmonster "011-1.gat", "Oscar::onPDP";
+ killmonster "011-1.gat", "Oscar::OnPD";
+ killmonster "011-1.gat", "Oscar::OnPDP";
set $@HalloweenQuest_PumpkinHunter$, "";
set $@HalloweenQuest_PumpkinsCount, 0;
set $@HalloweenQuest_PumpkinsState, 0;