From 931217d3ba156cecb25fa647bc572630147e60fd Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Fri, 24 Apr 2015 15:17:04 -0400
Subject: clean global handler

---
 world/map/npc/functions/clear_vars.txt           |  5 +++-
 world/map/npc/functions/global_event_handler.txt | 38 +++++++-----------------
 2 files changed, 14 insertions(+), 29 deletions(-)

(limited to 'world/map/npc/functions')

diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index c894586b..0b363e31 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -257,6 +257,10 @@ L_Barber_Janitor:
     callfunc "getHeadStyles"; // this converts class, color and hair
     goto L_Return;
 
+L_Misc:
+    if(Death_Kill) set Death_Kill, 0;
+    goto L_Return;
+
 L_Return:
     return;
 }
@@ -387,6 +391,5 @@ L_EventClear:
 
 // Variable was used in Voltain's script, was renamed and turned into a temporary variable
     set $state, 0;
-
     end;
 }
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt
index 45efcaae..0b691e45 100644
--- a/world/map/npc/functions/global_event_handler.txt
+++ b/world/map/npc/functions/global_event_handler.txt
@@ -1,44 +1,26 @@
+// This is the global event dispatcher
+// Do not add code to this file. Please only add callfuncs
+//
+// Author: meko
+
 017-9,0,0,0|script|#GlobalHandler|-1
 {
     end;
 
-OnPCLoginEvent: // this does not work yet but as soon as it is implemented it will start working
+OnPCLoginEvent:
     callfunc "ClearVariables";
     end;
 
 OnPCKillEvent:
-    set Death_Kill, Death_Kill + 1; // this counts the number of players you have killed
+    callfunc "elanore_decrease_exp"; // decrease heal exp for doing bad things
     end;
 
 OnPCKilledEvent:
-    goto L_Fightclub_Killed; // this is used by the 1v1 arena
+    callfunc "fightclub_event_killed"; // this is used by the 1v1 arena
+    end;
 
 OnPCDieEvent:
     callfunc "fightclub_GoBack"; // this used by the battle master
-    goto L_Fightclub_Die; // this is used by the 1v1 arena
-
-// custom handlers below
-
-L_Fightclub_Killed:
-    set @duel_killer, 0;
-    if(@Duel_Fighter != 1) goto L_End;
-    if(getmap() != "009-7") goto L_End;
-    set $@duel_loser, getcharid(3); // grab the rid of the victim
-    set $@duel_winner, @killerrid; // grab the rid of the killer
-    set @killerrid, 0; // reset killerid
-    callfunc "fightclub_death";
-    goto L_End;
-
-L_Fightclub_Die:
-    set @duel_killer, 0;
-    if(@Duel_Fighter != 1) goto L_End;
-    if(getmap() != "009-7") goto L_End;
-    set @killerrid, 0; // since the player was not murdered, the killerrid is 0
-    set $@duel_loser, getcharid(3); // grab the rid of the victim
-    callfunc "fightclub_death";
-    goto L_End;
-
-L_End:
-    if(getpvpflag(0) == $@Duel_Channel) setpvpflag @previous_channel;
+    callfunc "fightclub_event_die"; // this is used by the 1v1 arena
     end;
 }
-- 
cgit v1.2.3-60-g2f50