Merge pull request #247 from mekolat/donpcevent

cmdothernpc => donpcevent

17 files changed, 56 insertions, 57 deletions

diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index 61b169fc..82057128 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -501,7 +501,7 @@ OnRealWarp:
 
 L_InitVars:
     set $@ILLIA_STATUS, 4;
-    cmdothernpc "#IlliaDaemon", "Toggle";
+    donpcevent "#IlliaDaemon::OnCommandToggle";
     // init various variables
     set $@illia_progress, 1;
     callfunc "UpdateIlliaProgress";
@@ -518,13 +518,13 @@ L_InitVars:
     set $@illia_begin_time, gettimetick(2);
 
     // Clean all levels
-    cmdothernpc "#IlliaJanitor1", "Clean";
-    cmdothernpc "#IlliaJanitor2", "Clean";
-    cmdothernpc "#IlliaJanitor3", "Clean";
-    cmdothernpc "#IlliaJanitor4", "Clean";
-    cmdothernpc "#IlliaJanitor5", "Clean";
-    cmdothernpc "#IlliaJanitor6", "Clean";
-    cmdothernpc "#IlliaJanitor7", "Clean";
+    donpcevent "#IlliaJanitor1::OnCommandClean";
+    donpcevent "#IlliaJanitor2::OnCommandClean";
+    donpcevent "#IlliaJanitor3::OnCommandClean";
+    donpcevent "#IlliaJanitor4::OnCommandClean";
+    donpcevent "#IlliaJanitor5::OnCommandClean";
+    donpcevent "#IlliaJanitor6::OnCommandClean";
+    donpcevent "#IlliaJanitor7::OnCommandClean";
 
     stopnpctimer;
     setnpctimer 0;
@@ -586,13 +586,13 @@ L_EndQuest:
     set $@illia_bp, 0;
 
     // Clean all levels
-    cmdothernpc "#IlliaJanitor1", "Clean";
-    cmdothernpc "#IlliaJanitor2", "Clean";
-    cmdothernpc "#IlliaJanitor3", "Clean";
-    cmdothernpc "#IlliaJanitor4", "Clean";
-    cmdothernpc "#IlliaJanitor5", "Clean";
-    cmdothernpc "#IlliaJanitor6", "Clean";
-    cmdothernpc "#IlliaJanitor7", "Clean";
+    donpcevent "#IlliaJanitor1::OnCommandClean";
+    donpcevent "#IlliaJanitor2::OnCommandClean";
+    donpcevent "#IlliaJanitor3::OnCommandClean";
+    donpcevent "#IlliaJanitor4::OnCommandClean";
+    donpcevent "#IlliaJanitor5::OnCommandClean";
+    donpcevent "#IlliaJanitor6::OnCommandClean";
+    donpcevent "#IlliaJanitor7::OnCommandClean";
 
     stopnpctimer;
     setnpctimer 0;
diff --git a/world/map/npc/009-7/eventHandler.txt b/world/map/npc/009-7/eventHandler.txt
index fbcec735..a310ff4c 100644
--- a/world/map/npc/009-7/eventHandler.txt
+++ b/world/map/npc/009-7/eventHandler.txt
@@ -132,7 +132,7 @@ L_BlueMissing:
     goto L_StartTimer;
 
 L_Intrusion:
-    cmdothernpc "#FightClubUtils", "Intrusion"; // we can not attach a second timer to this npc so we use another one
+    donpcevent "#FightClubUtils::OnCommandIntrusion"; // we can not attach a second timer to this npc so we use another one
     callfunc "fightclub_Intrusion";
     goto L_StartTimer;
 }
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 3bbfa545..0db51330 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -33,7 +33,7 @@ function|script|HalloweenQuestWaterPumpkins
     if (Quest_Halloween != 5 || $@HalloweenQuest_PumpkinHunter$ != "")
         end;
     set $@HalloweenQuest_PumpkinHunter$, strcharinfo(0);
-    cmdothernpc "Oscar", "Spg";
+    donpcevent "Oscar::OnCommandSpg";
     end;
 }
 
diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index 7a6b906e..6006cff3 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -97,7 +97,7 @@ L_ScratchHead:
     set $@ScorpionTimer, 0;
     set $@ScorpionFighter, getcharid(3);
     set $@ScorpDeath, PC_DIE_COUNTER;
-    cmdothernpc "#ScorpionTrigger", "HasanSpawn";
+    donpcevent "#ScorpionTrigger::OnCommandHasanSpawn";
     specialeffect 22;
     mes "While you're scratching your head, a scorpion appears.";
     close;
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index ed6101a7..6034af84 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -302,7 +302,7 @@ L_CleanUp:
     set $@SkullAmount, 0;
     killmonster "030-4.gat", "AniManOMat::OnGuardDeath";
     stopnpctimer;
-    cmdothernpc "#XmasChamberCooler", "CoolDown";
+    donpcevent "#XmasChamberCooler::OnCommandCoolDown";
     end;
 
 OnReward:
@@ -446,7 +446,7 @@ OnCommandCoolDown:
     set $@XmasBattleCoolDown, 1;
     initnpctimer;
     end;
-    
+
 OnTimer120000:
     set $@XmasBattleCoolDown, 0;
     stopnpctimer;
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index 10cf8d28..72ec3922 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -43,7 +43,7 @@ L_ShouldNotBeHere:
 
 L_MakeAmbush:
     set $@illia_level_2_progress, 1;
-    cmdothernpc "#BndtTl", "Ambush";
+    donpcevent "#BndtTl::OnCommandAmbush";
     end;
 
 L_ShouldNotBeHere:
@@ -62,9 +62,9 @@ OnCommandAmbush:
 
 OnTimer1000:
     enablenpc "Sneaky Bandit";
-    cmdothernpc "Sneaky Bandit", "Talk";
+    donpcevent "Sneaky Bandit::OnCommandTalk";
     enablenpc "Another Sneaky Bandit";
-    cmdothernpc "Another Sneaky Bandit", "Talk";
+    donpcevent "Another Sneaky Bandit::OnCommandTalk";
     end;
 
 OnTimer9000:
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 33a0aa51..d9c7b826 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -125,7 +125,7 @@ function|script|StartChannelling
     set $@illia_magic_power_status, 1;
 
     message strcharinfo(0), "Ok, let's stay focused now!";
-    cmdothernpc "#Power Circle", "St";
+    donpcevent "#Power Circle::OnCommandSt";
     close;
 
 }
@@ -174,7 +174,7 @@ OnTimer10000:
 OnTimer11000:
     setnpctimer 0;
     // Spawn monsters (demonic spirits) near the enchanted door
-    cmdothernpc "#Enchanted Door", "DS";
+    donpcevent "#Enchanted Door::OnCommandDS";
     end;
 
 S_ItemSpawn:
@@ -284,7 +284,7 @@ L_ChannellingComplete:
     // Effect to display the disenchant is cast
     misceffect FX_CHANNELLING_CAST;
     // move away the enchanted door
-    cmdothernpc "#Enchanted Door2", "Destroy";
+    donpcevent "#Enchanted Door2::OnCommandDestroy";
     disablenpc "#Enchanted Door";
     end;
 
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index fc57e654..1297e5c0 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -168,7 +168,7 @@ OnRing:
 L_ScheduleEnd:
     set $@ILLIA_STATUS, 253;
     startnpctimer "Valia";
-    cmdothernpc "#IlliaDaemon", "Toggle";
+    donpcevent "#IlliaDaemon::OnCommandToggle";
     end;
 
 L_Close:
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index 7b39233c..71dde1f7 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -42,7 +42,7 @@ L_ShouldNotBeHere:
 
 L_StartVoices:
     set $@illia_level_5_progress, 1;
-    cmdothernpc "#MysteriousVoice", "Start";
+    donpcevent "#MysteriousVoice::OnCommandStart";
     end;
 
 L_ShouldNotBeHere:
@@ -121,7 +121,7 @@ OnTimer2000:
     if ($@illia_level_5_progress != 1)
         end;
     npcwarp rand(30,42), rand(32,38), "?";
-    cmdothernpc "?", "Talk";
+    donpcevent "?::OnCommandTalk";
     end;
 
 OnTimer3000:
@@ -138,7 +138,7 @@ OnTimer3000:
     setnpctimer 0;
     set $@illia_lobby_voices_index, 0;
     set $@illia_level_5_progress, 2;
-    cmdothernpc "#LuviaShadow", "Invoke";
+    donpcevent "#LuviaShadow::OnCommandInvoke";
     end;
 
 L_Continue:
@@ -296,7 +296,7 @@ OnTimer20000:
     if ($@illia_level_5_progress != 6)
         end;
     set $@illia_level_5_progress, 7;
-    cmdothernpc "#LuviaShadow", "Escape";
+    donpcevent "#LuviaShadow::OnCommandEscape";
     setnpctimer 0;
     end;
 
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index a2857e9c..ba636c9d 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -18,7 +18,7 @@
 
 L_SpawnLuvia:
     set $@illia_level_7_progress, 1;
-    cmdothernpc "Luvia", "Start";
+    donpcevent "Luvia::OnCommandStart";
     end;
 
 L_ShouldNotBeHere:
@@ -78,7 +78,7 @@ OnTimer15000:
     npctalk "One piece of advice: get prepared!";
     stopnpctimer;
     setnpctimer 0;
-    cmdothernpc "#LuviaDaemon", "Invoke";
+    donpcevent "#LuviaDaemon::OnCommandInvoke";
     end;
 
 }
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 1951cfaf..c9cdfd0f 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -22,7 +22,7 @@ L_ShouldNotBeHere:
 
 L_StartItemInvoker:
     set $@illia_level_6_progress, 1;
-    cmdothernpc "#ItemsInvoker", "Start";
+    donpcevent "#ItemsInvoker::OnCommandStart";
     end;
 
 }
@@ -189,4 +189,3 @@ L_ShouldNotBeHere:
     end;
 
 }
-
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index d463f3b7..4bc624a8 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -15,8 +15,8 @@ L_StartTimer:
 
 OnTimer20000:
     setnpctimer 0;
-    cmdothernpc "#XmasConfig", "RestartQuest";
-    cmdothernpc "#HalloweenConfig", "RestartQuest";
+    donpcevent "#XmasConfig::OnCommandRestartQuest";
+    donpcevent "#HalloweenConfig::OnCommandRestartQuest";
     initnpctimer;
     end;
 }
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt
index 38bed87f..07717b35 100644
--- a/world/map/npc/annuals/halloween/debug.txt
+++ b/world/map/npc/annuals/halloween/debug.txt
@@ -75,7 +75,7 @@ L_HalloweenError:
 
 L_SetNewKey:
     setarray $HALLOWEEN_TIME_KEY, @halloween_time_key_smonth, @halloween_time_key_srmonth, @halloween_time_key_emonth, @halloween_time_key_rsday, @halloween_time_key_reday, @halloween_time_key_year;
-    cmdothernpc "#HalloweenConfig", "RestartQuest";
+    donpcevent "#HalloweenConfig::OnCommandRestartQuest";
     goto L_Debug;
 
 L_QuestState:
diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt
index dc49e865..394a1a1b 100644
--- a/world/map/npc/annuals/tree_beard.txt
+++ b/world/map/npc/annuals/tree_beard.txt
@@ -70,7 +70,7 @@
 
 function|script|SpawnMobs
 {
-    cmdothernpc "XmasSpawnManager", "SpawnStart";
+    donpcevent "XmasSpawnManager::OnCommandSpawnStart";
     return;
 }
 
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index fe0582e7..0e3c38a2 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -128,11 +128,11 @@ L_XmasError:
 
 L_SetNewKey:
     setarray $XMAS_TIME_KEY, @xmas_time_key_smonth, @xmas_time_key_srmonth, @xmas_time_key_emonth, @xmas_time_key_rsday, @xmas_time_key_reday, @xmas_time_key_year;
-    cmdothernpc "#XmasConfig", "RestartQuest";
+    donpcevent "#XmasConfig::OnCommandRestartQuest";
     goto L_Close;
 
 L_XmasChamberReset:
-    cmdothernpc "AniManOMat", "ChamberReset";
+    donpcevent "AniManOMat::OnCommandChamberReset";
     goto L_Close;
 
 L_XmasState:
diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt
index 897054c9..d4be46dc 100644
--- a/world/map/npc/annuals/xmas/mobmanager.txt
+++ b/world/map/npc/annuals/xmas/mobmanager.txt
@@ -59,7 +59,7 @@ L_End:
     end;
 
 OnTally:
-    cmdothernpc "XmasSpawnManager", "Tally";
+    donpcevent "XmasSpawnManager::OnCommandTally";
     end;
 }
 
@@ -68,7 +68,7 @@ OnTally:
     end;
 
 OnTally:
-    cmdothernpc "XmasSpawnManager", "Tally";
+    donpcevent "XmasSpawnManager::OnCommandTally";
     end;
 }
 
@@ -77,6 +77,6 @@ OnTally:
     end;
 
 OnTally:
-    cmdothernpc "XmasSpawnManager", "Tally";
+    donpcevent "XmasSpawnManager::OnCommandTally";
     end;
 }
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index cca5d3a0..48372f56 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -16,8 +16,8 @@ OnInit:
     set $@DockLeaveCount, 1;
     setarray $@MainDocks$, "Hurnscald North", "Nivalis", "Tulimshar";
     setarray $@CandorDocks$, "Candor", "Hurnscald South";
-    cmdothernpc "#"+$@MainDocks$[$@MainCurrentDock]+"Dock", "Arrive";
-    cmdothernpc "#"+$@CandorDocks$[$@CandorCurrentDock]+"Dock", "Arrive";
+    donpcevent "#"+$@MainDocks$[$@MainCurrentDock]+"Dock::OnCommandArrive";
+    donpcevent "#"+$@CandorDocks$[$@CandorCurrentDock]+"Dock::OnCommandArrive";
     if (debug >= 2) end;
     initnpctimer;
     end;
@@ -32,18 +32,18 @@ L_NextDock:
     if($@CandorCurrentDock == getarraysize($@CandorDocks$))
         set $@CandorCurrentDock, 0;
     set $@DockTickCount, 0;
-    cmdothernpc "#"+$@MainDocks$[$@MainLastDock]+"Dock", "Warp";
-    cmdothernpc "#"+$@MainDocks$[$@MainCurrentDock]+"Dock", "Arrive";
-    cmdothernpc "#"+$@CandorDocks$[$@CandorLastDock]+"Dock", "Warp";
-    cmdothernpc "#"+$@CandorDocks$[$@CandorCurrentDock]+"Dock", "Arrive";
-    
-    cmdothernpc "#k1sound", "Ding";
-    cmdothernpc "#k2sound", "Ding";
-  
+    donpcevent "#"+$@MainDocks$[$@MainLastDock]+"Dock::OnCommandWarp";
+    donpcevent "#"+$@MainDocks$[$@MainCurrentDock]+"Dock::OnCommandArrive";
+    donpcevent "#"+$@CandorDocks$[$@CandorLastDock]+"Dock::OnCommandWarp";
+    donpcevent "#"+$@CandorDocks$[$@CandorCurrentDock]+"Dock::OnCommandArrive";
+
+    donpcevent "#k1sound::OnCommandDing";
+    donpcevent "#k2sound::OnCommandDing";
+
     //mapannounce "035-2.tmx", " Koga - Main:* Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0;
     //mapannounce "036-2.tmx", " Koga - Candor:* Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0;
     initnpctimer;
-    
+
     if($@MainCurrentDock == 2) goto L_k1city1;
     if($@MainCurrentDock == 0) goto L_k1city2;
     if($@MainCurrentDock == 1) goto L_k1city3;
@@ -58,7 +58,7 @@ OnTimer8000:
     initnpctimer;
     end;
 
-    
+
 L_k1city1:
   enablenpc "#k1city1e"; disablenpc "#k1city2e"; disablenpc "#k1city3e";
   disablenpc "#k1city1d"; enablenpc "#k1city2d"; enablenpc "#k1city3d";
@@ -88,7 +88,7 @@ end;
 L_k2city2:
   disablenpc "#k2city1e"; enablenpc "#k2city2e";
   enablenpc "#k2city1d"; disablenpc "#k2city2d";
-end;    
+end;
 }
 
 function|script|FerryHelp