From 17baf5eee6147c093e37c432b95ff3dab3da0b29 Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 11:00:25 -0200 Subject: Fix duplicate NPC names. Check diff for details about renamings. --- npc/000-2-2/doors.txt | 4 ++-- npc/000-2-2/ratto.txt | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'npc/000-2-2') diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt index 1dbef8328..6c50db882 100644 --- a/npc/000-2-2/doors.txt +++ b/npc/000-2-2/doors.txt @@ -6,7 +6,7 @@ // Description: // Doors NPCs. -000-2-2,48,29,0 script DoorUpwards NPC_HIDDEN,0,0,{ +000-2-2,48,29,0 script DoorUpwards#000-2-2 NPC_HIDDEN,0,0,{ OnTouch: if (mobcount("000-2-2","all") > 0) goto L_Warn; @@ -35,7 +35,7 @@ L_Warp: close; } -000-2-2,24,31,0 script LeftDoor NPC_HIDDEN,0,0,{ +000-2-2,24,31,0 script LeftDoor#000-2-2 NPC_HIDDEN,0,0,{ OnTouch: mesn "Narrator"; diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt index 1392d5716..5a6099716 100644 --- a/npc/000-2-2/ratto.txt +++ b/npc/000-2-2/ratto.txt @@ -17,35 +17,35 @@ // [8] = Shows how many seconds passed since ratto number 4 died. // [9] = Shows how many seconds passed since the player started the quest. -000-2-2,47,30,0 script RattosControl NPC_HIDDEN,{ +000-2-2,47,30,0 script RattosControl#000-2-2 NPC_HIDDEN,{ OnSpawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death"; - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death"; - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto1Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto2Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto3Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto4Death"; close; OnRatto1Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto1Death"; $@RAT_SAILOR_CONTROL[1] = 0; $@RAT_SAILOR_CONTROL[5] = 0; end; OnRatto2Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto2Death"; $@RAT_SAILOR_CONTROL[2] = 0; $@RAT_SAILOR_CONTROL[6] = 0; end; OnRatto3Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto3Death"; $@RAT_SAILOR_CONTROL[3] = 0; $@RAT_SAILOR_CONTROL[7] = 0; end; OnRatto4Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto4Death"; $@RAT_SAILOR_CONTROL[4] = 0; $@RAT_SAILOR_CONTROL[8] = 0; end; -- cgit v1.2.3-60-g2f50