From 062f2cf4235cf07481ecaf58682f37f2ad8928f8 Mon Sep 17 00:00:00 2001 From: Asheraf Date: Sun, 9 Oct 2016 14:46:30 +0100 Subject: Change *getcharid to use constants --- npc/instances/SealedShrine.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'npc/instances/SealedShrine.txt') diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index fd33f16a0..90efe6f5c 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -105,7 +105,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ case 2: if (BaseLevel >= 75) { - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); mes "[Friar Patrick]"; mes "Do you mean you'll go to the shrine and reseal Baphomet?"; @@ -117,7 +117,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ //.@ins_bapho_check2 = questprogress(3045,PLAYTIME); if (!.@ins_bapho_check) { - if (getpartyleader(.@party_id,2) == getcharid(0) && instance_check_party(.@party_id,2,75)) { + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR) && instance_check_party(.@party_id,2,75)) { mes "[Friar Patrick]"; mes "Party name is "+getpartyname(.@party_id)+"..."; mes "Name of the leader is "+strcharinfo(PC_NAME)+"..."; @@ -491,7 +491,7 @@ OnMyMobDead: //== Soul of hero near the north grave ===================== 1@cata,141,221,0 script Gravestone# CLEAR_NPC,3,3,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); if ('ins_baphomet == 0) { mes "The gravestone is trembling..."; next; @@ -548,7 +548,7 @@ OnMyMobDead: mes "If your ^0000FFparty leader^000000 brings me the pendant, my soul can be substantialized. So, hurry up."; close; } - else if (('ins_baphomet == 2) && (getpartyleader(.@party_id,2) == getcharid(0))) { + else if (('ins_baphomet == 2) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { mes "[Voice of the Gravestone]"; mes "Did you find the pendant?"; next; @@ -598,7 +598,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. } 1@cata,176,119,4 script Ancient Hero's Soul#1F 4_M_CHAMPSOUL,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); cutin "ins_cata_champ_n",2; if ('ins_baphomet == 2) { mes "[Ancient Hero's Soul]"; @@ -660,7 +660,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. break; case 3: ++.@ins_baphomet_1f_3; - if (getpartyleader(.@party_id,2) == getcharid(0)) { + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR)) { mes "[Ancient Hero's Soul]"; mes "You look like the leader of this party. You need to go and get ^0000FF10 Essence of Fire^000000 from the torches."; next; @@ -712,7 +712,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. } if (.@exitloop) break; } - if (getpartyleader(.@party_id,2) == getcharid(0)) { + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR)) { mes "[Ancient Hero's Soul]"; mes "To remind you again, I must be substantialized within the next hour. So everyone, finish your work within that time!"; 'ins_baphomet = 3; @@ -729,7 +729,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. cutin "",255; end; } - else if (('ins_baphomet == 3) && (getpartyleader(.@party_id,2) == getcharid(0))) { + else if (('ins_baphomet == 3) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { cutin "ins_cata_champ_n",2; mes "[Ancient Hero's Soul]"; mes "Did you get 10 ^0000FFEssence of Fire^000000 and ^0000FFToken of Apostle^000000?"; @@ -766,7 +766,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. cutin "",255; end; } - else if (('ins_baphomet == 4) && (getpartyleader(.@party_id,2) == getcharid(0))) { + else if (('ins_baphomet == 4) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { cutin "ins_cata_champ_n",2; mes "[Ancient Hero's Soul]"; mes "Are you ready? I opened the sealed gate. To pass the gate, you should carry a ^0000FFToken of Apostle^000000."; @@ -886,8 +886,8 @@ OnInstanceInit: //== Bobbing Torches ======================================= - script Bobbing Torch#SS FAKE_NPC,{ - .@party_id = getcharid(1); - if (getpartyleader(.@party_id,2) == getcharid(0)) { + .@party_id = getcharid(CHAR_ID_PARTY); + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR)) { if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) < 11)) { mes "A huge torch appearing as if it can burn everything is bobbing up and down in front of me."; next; @@ -1124,8 +1124,8 @@ OnInstanceInit: 2@cata,35,109,0 duplicate(Magical Seal#SS) Magical Seal#10 CLEAR_NPC 2@cata,79,65,0 script The Main Altar#ss CLEAR_NPC,{ - .@party_id = getcharid(1); - if (('ins_baphomet == 5) && (getpartyleader(.@party_id,2) == getcharid(0))) { + .@party_id = getcharid(CHAR_ID_PARTY); + if (('ins_baphomet == 5) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { mes "An evil power, too terrible to describe, lies under the great altar radiating a violet color."; next; mes "Complicated Magical Rune letters blink rapidly, attempting to suppress the dreadful power within."; -- cgit v1.2.3-60-g2f50