Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

2 files changed, 24 insertions, 21 deletions

diff --git a/world/map/npc/005-4/_mobs.txt b/world/map/npc/005-4/_mobs.txt
index 2c626003..35b4adb1 100644
--- a/world/map/npc/005-4/_mobs.txt
+++ b/world/map/npc/005-4/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-005-4.gat,0,0,0|script|Mob005-4|-1,{
+005-4.gat,0,0,0|script|Mob005-4|-1,
+{
     end;
 }
diff --git a/world/map/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt
index bc196ef3..8f8ab384 100644
--- a/world/map/npc/005-4/bossfight.txt
+++ b/world/map/npc/005-4/bossfight.txt
@@ -1,6 +1,7 @@
 //Author: Kage
 
-005-4.gat,36,19,0|script|Switch#elecave|400,{
+005-4.gat,36,19,0|script|Switch#elecave|400,
+{
     if ($@ELE_CAVE_STATUS != 0) goto L_Enjoy;
 
     mes "*You see a switch, it is flipped off*";
@@ -22,11 +23,11 @@ L_Start_Level_1:
     mapannounce "005-4.gat", "Level 1 starting", 0;
 
     // Random colors for everyone!
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onChaos";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnChaos";
 
     // Two red, two blue.
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 2, "Switch#elecave::onBlueDeath";
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 2, "Switch#elecave::onRedDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 2, "Switch#elecave::OnBlueDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 2, "Switch#elecave::OnRedDeath";
     goto L_Exit; // This one is triggered on talking to the switch.
 
 L_Enjoy:
@@ -58,8 +59,8 @@ OnTimer3000:
     set $@ELE_CAVE_PLAYER_COUNT, 0; // The onTick refills this with a live count
 
     // We punish them for having a different count (Aka need kill them at the same time)
-    set $@ELE_CAVE_RED_COUNT, mobcount("005-4.gat","Switch#elecave::onRedDeath") + 1;
-    set $@ELE_CAVE_BLUE_COUNT, mobcount("005-4.gat","Switch#elecave::onBlueDeath") + 1;
+    set $@ELE_CAVE_RED_COUNT, mobcount("005-4.gat","Switch#elecave::OnRedDeath") + 1;
+    set $@ELE_CAVE_BLUE_COUNT, mobcount("005-4.gat","Switch#elecave::OnBlueDeath") + 1;
 
     set $@ELE_CAVE_DIFF, 0;
     if ($@ELE_CAVE_RED_COUNT > $@ELE_CAVE_BLUE_COUNT) goto L_More_Red;
@@ -84,7 +85,7 @@ L_More_Blue:
 
 L_Next_Step:
     // Basic per player logic
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onTick";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnTick";
 
     if ($@ELE_CAVE_RED_COUNT == 0 && $@ELE_CAVE_BLUE_COUNT == 0) goto L_Next_Level;
 
@@ -102,11 +103,11 @@ L_Start_Level_2:
     mapannounce "005-4.gat", "Level 2 starting", 0;
 
     // Random colors for everyone!
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onChaos";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnChaos";
 
     // four red, four blue.
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 4, "Switch#elecave::onBlueDeath";
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 4, "Switch#elecave::onRedDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 4, "Switch#elecave::OnBlueDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 4, "Switch#elecave::OnRedDeath";
     end;
 
 L_Start_Level_3:
@@ -115,23 +116,23 @@ L_Start_Level_3:
     mapannounce "005-4.gat", "Level 3 starting", 0;
 
     // Random colors for everyone!
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onChaos";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnChaos";
 
     // eight red, eight blue.
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 8, "Switch#elecave::onBlueDeath";
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 8, "Switch#elecave::onRedDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 8, "Switch#elecave::OnBlueDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 8, "Switch#elecave::OnRedDeath";
     end;
 
 // Being ticks
 
-onChaos:
+OnChaos:
     if (isdead()) end;
 L_Set_Color:
     message strcharinfo(0), "You feel funny.  You think your color has changed.";
     set @ELE_CAVE_COLOR, rand(1, 2);
     end;
 
-onTick:
+OnTick:
     if (isdead()) end;
 
     // Count this player as alive
@@ -174,21 +175,22 @@ L_Heal:
     end;
 
 // Death triggers
-onBlueDeath:
+OnBlueDeath:
     // Blue players have to kill blue sparks
     if (@ELE_CAVE_COLOR == 2) end;
     message strcharinfo(0), "The dying spark reacts explosively with you.  You should only kill sparks with the same color as you.";
     heal MaxHp / -2, 0;
     end;
 
-onRedDeath:
+OnRedDeath:
     // Red players have to kill red sparks
     if (@ELE_CAVE_COLOR == 1) end;
     message strcharinfo(0), "The dying spark reacts explosively with you.  You should only kill sparks with the same color as you.";
     heal MaxHp / -2, 0;
     end;
 
-onInit:
+OnInit:
+    if (debug >= 2) end;
     initnpctimer;
     stopnpctimer;
 L_CleanUp:
@@ -198,8 +200,8 @@ L_CleanUp:
     set $@ELE_CAVE_LEVEL, 0;
     set $@ELE_CAVE_ROUND_TIMER, 0;
 
-    killmonster "005-4.gat", "Switch#elecave::onBlueDeath";
-    killmonster "005-4.gat", "Switch#elecave::onRedDeath";
+    killmonster "005-4.gat", "Switch#elecave::OnBlueDeath";
+    killmonster "005-4.gat", "Switch#elecave::OnRedDeath";
 
     stopnpctimer;
     setnpctimer 0;