From 86977d79269408a371384e61111c3a9cf6e87b0c Mon Sep 17 00:00:00 2001 From: Asheraf Date: Sun, 28 Aug 2016 17:03:57 +0100 Subject: *strnpcinfo now uses constants - NPC_NAME for the whole npc name including hidden part - NPC_NAME_VISIBLE for the visible part of the npc name - NPC_NAME_HIDDEN for the hidden part of the npc name - NPC_NAME_UNIQUE for the npc unique name - NPC_MAP for npc map --- npc/instances/SealedShrine.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'npc/instances/SealedShrine.txt') diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 5784d52a7..cbb8d20b5 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -896,7 +896,7 @@ OnInstanceInit: specialeffect2 EF_HOLYHIT; getitem Essence_Of_Fire,1; mes "The symbol of inheritor shines. Then a small crystal falls into my hand from the torch."; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); close; } else if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) > 10)) { @@ -919,7 +919,7 @@ OnInstanceInit: } OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; } 1@cata,267,210,0 duplicate(Bobbing Torch#SS) Bobbing Torch#1 CLEAR_NPC @@ -1097,13 +1097,13 @@ OnTouch: } if (.@seal_check == 2) erasequest 3041; specialeffect EF_LEXDIVINA; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); .@map$ = instance_mapname("2@cata"); - if (strnpcinfo(2) == "0") areamobuseskill .@map$,79,81,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; - else if (strnpcinfo(2) == "2") areamobuseskill .@map$,123,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; - else if (strnpcinfo(2) == "4") areamobuseskill .@map$,123,22,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; - else if (strnpcinfo(2) == "8") areamobuseskill .@map$,35,21,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; - else if (strnpcinfo(2) == "10") areamobuseskill .@map$,35,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; + if (strnpcinfo(NPC_NAME_HIDDEN) == "0") areamobuseskill .@map$,79,81,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; + else if (strnpcinfo(NPC_NAME_HIDDEN) == "2") areamobuseskill .@map$,123,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; + else if (strnpcinfo(NPC_NAME_HIDDEN) == "4") areamobuseskill .@map$,123,22,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; + else if (strnpcinfo(NPC_NAME_HIDDEN) == "8") areamobuseskill .@map$,35,21,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; + else if (strnpcinfo(NPC_NAME_HIDDEN) == "10") areamobuseskill .@map$,35,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0; percentheal -50,0; sc_start Eff_Stone,20000,0; setquest 3041; @@ -1114,7 +1114,7 @@ OnTouch: close; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; } 2@cata,79,81,0 duplicate(Magical Seal#SS) Magical Seal#0 CLEAR_NPC -- cgit v1.2.3-70-g09d2