Fix duplicate NPC names. Check diff for details about renamings.

1 files changed, 22 insertions, 22 deletions

diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 341087a23..75f8e630a 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -39,7 +39,7 @@
 // [9] = Shows how many seconds passed since the player started the quest.
 // [10] = Shows how many seconds passed since the player done the quest.
 
-000-2-1,72,34,0	script	AreaNPC	NPC_HIDDEN,0,1,{
+000-2-1,72,34,0	script	AreaNPC#000-2-1	NPC_HIDDEN,0,1,{
 
 OnTouch:
     if (BaseLevel < 5) goto L_Stop;
@@ -55,41 +55,41 @@ L_NoCountDown:
     if (.@peter == 1 || .@peter == 2) goto L_Rfail;
     if (.@peter == 3 || .@peter == 4) goto L_Rwin;
     if (.@peter > 5) goto L_SecondTime;
-    doevent "Peter::OnReturnWin";
+    doevent "Peter#000-2-1::OnReturnWin";
     close;
 
 L_Stop:
-    doevent "Peter::OnStop";
+    doevent "Peter#000-2-1::OnStop";
 
     close;
 
 L_Occupied:
-    doevent "Peter::OnDontneedHelp";
+    doevent "Peter#000-2-1::OnDontneedHelp";
 
     close;
 
 L_Task:
-    doevent "Peter::OnGiveTask";
+    doevent "Peter#000-2-1::OnGiveTask";
 
     close;
 
 L_Rfail:
-    doevent "Peter::OnReturnFail";
+    doevent "Peter#000-2-1::OnReturnFail";
 
     close;
 
 L_Rwin:
-    doevent "Peter::OnReturnWin";
+    doevent "Peter#000-2-1::OnReturnWin";
 
     close;
 
 L_NoGoodTick:
-    doevent "Peter::OnNoGoodTick";
+    doevent "Peter#000-2-1::OnNoGoodTick";
 
     close;
 }
 
-000-2-1,70,35,0	script	Peter	NPC_RATTO_SAILOR,{
+000-2-1,70,35,0	script	Peter#000-2-1	NPC_RATTO_SAILOR,{
     if (BaseLevel < 5) goto OnTooWeak;
     if ($@RAT_SAILOR_COUNTDOWN == 0) goto L_NoCountDown;
     if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick;
@@ -212,7 +212,7 @@ OnStartOutside:
     $@RAT_SAILOR_DEATHS = PC_DIE_COUNTER;
     initnpctimer;
     warp "000-2-2", 48, 28;
-    doevent "RattosControl::OnSpawn";
+    doevent "RattosControl#000-2-2::OnSpawn";
 
     goto L_Quit;
 
@@ -232,10 +232,10 @@ L_CheckRattos:
     if ($@RAT_SAILOR_CONTROL[2]) $@RAT_SAILOR_CONTROL[6] = $@RAT_SAILOR_CONTROL[6] + 2;
     if ($@RAT_SAILOR_CONTROL[3]) $@RAT_SAILOR_CONTROL[7] = $@RAT_SAILOR_CONTROL[7] + 2;
     if ($@RAT_SAILOR_CONTROL[4]) $@RAT_SAILOR_CONTROL[8] = $@RAT_SAILOR_CONTROL[8] + 2;
-    if ($@RAT_SAILOR_CONTROL[5] > 45) doevent "RattosControl::OnRatto1Respawn";
-    if ($@RAT_SAILOR_CONTROL[6] > 45) doevent "RattosControl::OnRatto2Respawn";
-    if ($@RAT_SAILOR_CONTROL[7] > 45) doevent "RattosControl::OnRatto3Respawn";
-    if ($@RAT_SAILOR_CONTROL[8] > 45) doevent "RattosControl::OnRatto4Respawn";
+    if ($@RAT_SAILOR_CONTROL[5] > 45) doevent "RattosControl#000-2-2::OnRatto1Respawn";
+    if ($@RAT_SAILOR_CONTROL[6] > 45) doevent "RattosControl#000-2-2::OnRatto2Respawn";
+    if ($@RAT_SAILOR_CONTROL[7] > 45) doevent "RattosControl#000-2-2::OnRatto3Respawn";
+    if ($@RAT_SAILOR_CONTROL[8] > 45) doevent "RattosControl#000-2-2::OnRatto4Respawn";
 
 L_NotYet:
     setnpctimer 0;
@@ -280,10 +280,10 @@ L_CleaningEnd:
     $@RAT_SAILOR_HELPER$ = "";
     $@RAT_SAILOR_DEATHS = 0;
     cleararray $@RAT_SAILOR_CONTROL, 0, 11;
-    killmonster "000-2-2", "RattosControl::OnRatto1Death";
-    killmonster "000-2-2", "RattosControl::OnRatto2Death";
-    killmonster "000-2-2", "RattosControl::OnRatto3Death";
-    killmonster "000-2-2", "RattosControl::OnRatto4Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto1Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto2Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto3Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto4Death";
 
     end;
 
@@ -293,10 +293,10 @@ L_CleaningClose:
     $@RAT_SAILOR_HELPER$ = "";
     $@RAT_SAILOR_DEATHS = 0;
     cleararray $@RAT_SAILOR_CONTROL, 0, 11;
-    killmonster "000-2-2", "RattosControl::OnRatto1Death";
-    killmonster "000-2-2", "RattosControl::OnRatto2Death";
-    killmonster "000-2-2", "RattosControl::OnRatto3Death";
-    killmonster "000-2-2", "RattosControl::OnRatto4Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto1Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto2Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto3Death";
+    killmonster "000-2-2", "RattosControl#000-2-2::OnRatto4Death";
     $@RAT_SAILOR_COUNTDOWN = gettimetick(2);
 
     close;