diff options
Diffstat (limited to 'npc')
-rw-r--r-- | npc/custom/healer.txt | 17 | ||||
-rw-r--r-- | npc/quests/quests_moscovia.txt | 12 |
2 files changed, 15 insertions, 14 deletions
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt index e11e2a647..59d67b083 100644 --- a/npc/custom/healer.txt +++ b/npc/custom/healer.txt @@ -3,34 +3,35 @@ //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Description: ========================================= //= Basic healer script. //===== Additional Comments: ================================= //= 1.0 Initial script. //= 1.1 Aligned coordinates with @go. +//= 1.2 Fix variables and character stuck at healing //============================================================ - script Healer -1,{ - set .@price,0; // Zeny required for heal - set .@Buffs,0; // Also buff players? (1: yes / 0: no) - set .@Delay,0; // Heal delay, in seconds + .@price = 0; // Zeny required for heal + .@Buffs = 0; // Also buff players? (1: yes / 0: no) + .@Delay = 0; // Heal delay, in seconds if (@HD > gettimetick(2)) end; if (.@price) { message strcharinfo(0),"Healing costs "+.@price+" Zeny."; if (Zeny < .@price) end; - if(select("^0055FFHeal^000000:^777777Cancel^000000") == 2) end; - set Zeny, Zeny-.@price; + if(select("^0055FFHeal^000000:^777777Cancel^000000") == 2) close; + Zeny -= .@price; } specialeffect2 EF_HEAL2; percentheal 100,100; if (.@Buffs) { specialeffect2 EF_INCAGILITY; sc_start SC_INC_AGI,240000,10; specialeffect2 EF_BLESSING; sc_start SC_BLESSING,240000,10; } - if (.@Delay) set @HD, gettimetick(2)+.@Delay; - end; + if (.@Delay) @HD = gettimetick(2)+.@Delay; + close; } diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index fd68f6663..a181a81d9 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -1484,7 +1484,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "This is a traditional instrument"; mes "which comes from a faraway land of"; mes "the ancestors of Moscovia."; - getitem 2707,1; + getitem GUSLI, 1; set mos_whale_edq,35; next; mes "[Aged Stranger]"; @@ -1509,7 +1509,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "Are you ready to learn the Gusli?"; mes "Please equip the Gusli."; next; - if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) { + if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) { mes "[Aged Stranger]"; mes "Hm... Very well."; mes "At first, look at me how I play,"; @@ -1552,7 +1552,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "[Aged Stranger]"; mes "Are you ready to learn the Gusli?"; next; - if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) { + if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) { mes "[Aged Stranger]"; mes "Um... You did well."; next; @@ -2123,7 +2123,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{ mes "A Gooselri? Which only exists"; mes "in the whale island? Let's see."; next; - if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707) > 0) { + if (countitem(GUSLI) > 0) { mes "[Csar Alexsay III]"; mes "Oh... Is this instrument... a Gooselri?"; next; @@ -2233,7 +2233,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{ mes "something to satisfy me"; mes "at the whale island?"; next; - if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707)) { + if (countitem(GUSLI) > 0) { mes "[Csar Alexsay III]"; mes "Oh... Is this instrument... a Gooselri?"; next; @@ -2478,7 +2478,7 @@ OnTouch: mes "Stop by the whale island?"; next; if(select("Go to Whale Island.:Stay put.") == 1) { - if (getequipid(EQI_ACC_L) == 2707 || getequipid(EQI_ACC_R) == 2707) { + if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) { soundeffect "mos_gusli2.wav",0; mes "-Slowly, your hands are on the"; mes "Gusli, and the playing starts..."; |