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-1/arpan.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'npc/000-2-1/arpan.txt') diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 9207e03df..54f626028 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -16,38 +16,38 @@ // 11 Need to see Julia // 12 Has been registered by Julia -000-2-1,49,36,0 script LeftDoorCheck NPC_HIDDEN,0,0,{ +000-2-1,49,36,0 script LeftDoorCheck#000-2-1 NPC_HIDDEN,0,0,{ .@q = getq(ShipQuests_Arpan); - if (.@q == 0) doevent "Magic Arpan::OnTalk"; + if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk"; close; } -000-2-1,54,36,0 script RightDoorCheck NPC_HIDDEN,0,0,{ +000-2-1,54,36,0 script RightDoorCheck#000-2-1 NPC_HIDDEN,0,0,{ .@q = getq(ShipQuests_Arpan); - if (.@q == 0) doevent "Magic Arpan::OnTalk"; + if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk"; close; } -000-2-1,47,32,0 script LeftBarrierCheck NPC_HIDDEN,0,2,{ +000-2-1,47,32,0 script LeftBarrierCheck#000-2-1 NPC_HIDDEN,0,2,{ .@q = getq(ShipQuests_Arpan); if (.@q > 2) close; if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; if (.@q == 2) goto L_Equip; if (.@q == 1) goto L_GetCloth; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; L_Equip: warp "000-2-1", 49, 32; - doevent "Magic Arpan::OnEquip"; + doevent "Magic Arpan#000-2-1::OnEquip"; close; L_GetCloth: warp "000-2-1", 49, 32; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; close; @@ -57,24 +57,24 @@ L_EquipDone: close; } -000-2-1,56,32,0 script RightBarrierCheck NPC_HIDDEN,0,2,{ +000-2-1,56,32,0 script RightBarrierCheck#000-2-1 NPC_HIDDEN,0,2,{ .@q = getq(ShipQuests_Arpan); if (.@q > 2) close; if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; if (.@q == 2) goto L_Equip; if (.@q == 1) goto L_GetCloth; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; L_Equip: warp "000-2-1", 55, 32; - doevent "Magic Arpan::OnEquip"; + doevent "Magic Arpan#000-2-1::OnEquip"; close; L_GetCloth: warp "000-2-1", 55, 32; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; close; @@ -84,7 +84,7 @@ L_EquipDone: close; } -000-2-1,49,33,0 script Magic Arpan NPC_MAGIC_ARPAN,{ +000-2-1,49,33,0 script Magic Arpan#000-2-1 NPC_MAGIC_ARPAN,{ .@q = getq(ShipQuests_Arpan); .@q_nard = getq(ShipQuests_Nard); .@q_julia = getq(ShipQuests_Julia); -- cgit v1.2.3-70-g09d2