From b10524face925526ebc59c07b1697a5eb038d332 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Mon, 28 Aug 2023 23:47:21 +0000 Subject: asorm betsanc plugh fix --- world/map/npc/magic/level2-barrier.txt | 13 +++++-------- world/map/npc/magic/level2-flying-backpack.txt | 11 ++++++----- world/map/npc/magic/level2-lay-on-hands.txt | 2 +- world/map/npc/magic/level2-protect.txt | 13 ++++++------- 4 files changed, 18 insertions(+), 21 deletions(-) (limited to 'world/map/npc') diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt index def8856e..2c170ae4 100644 --- a/world/map/npc/magic/level2-barrier.txt +++ b/world/map/npc/magic/level2-barrier.txt @@ -9,6 +9,7 @@ set @target_id, getcharid(3, @args$); if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1) set @target_id, BL_ID; // fallback to self + callfunc "adjust_spellpower"; if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID; if (BL_ID == @target_id) set @args$, strcharinfo(0); if (get(GM, @target_id) == 1) end; @@ -22,19 +23,15 @@ L_Pay: set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 1000, "Magic Timer::OnClear"; // set the new debuff sc_start SC_COOLDOWN, 1000, 0, BL_ID; - callfunc "adjust_spellpower"; set Sp, Sp - 15; misceffect FX_MAGIC_BARRIER_CAST, strcharinfo(0); callfunc "magic_exp"; if (BL_ID != @target_id) misceffect FX_MAGIC_BARRIER_HIT, @args$; - set .@time, (@spellpower*200)+2000; - set .@time, .@time+5000; // FIXME: Temporary Boost! - set @asorm_time, .@time, @target_id; - // FIXME: max(30,(@spellpower/8))+20 - sc_start SC_MBARRIER, .@time, max(30,(@spellpower/7))+22, @target_id; + set .@asorm_time, (@spellpower*200)+2000; + sc_start SC_MBARRIER, .@asorm_time, max(30,(@spellpower/8))+20, @target_id; message @args$, "Barrier : You are surrounded by a magical barrier."; - set @asorm_future, gettimetick(0) + @asorm_time - 100, @target_id; - addtimer @asorm_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; + set @asorm_future, gettimetick(0) + .@asorm_time - 100, @target_id; + addtimer .@asorm_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; end; OnEnd: diff --git a/world/map/npc/magic/level2-flying-backpack.txt b/world/map/npc/magic/level2-flying-backpack.txt index f8857120..c6d3c461 100644 --- a/world/map/npc/magic/level2-flying-backpack.txt +++ b/world/map/npc/magic/level2-flying-backpack.txt @@ -9,9 +9,11 @@ set @target_id, getcharid(3, @args$); if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1) set @target_id, BL_ID; // fallback to self + callfunc "adjust_spellpower"; if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID; if (BL_ID == @target_id) set @args$, strcharinfo(0); if (get(GM, @target_id) == 1) end; + if (get(Hp, @target_id) < 1) end; if (getmap() == "033-1") goto L_SpecialRules6; goto L_Pay; @@ -20,16 +22,15 @@ L_Pay: set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 1000, "Magic Timer::OnClear"; // set the new debuff sc_start SC_COOLDOWN, 1000, 0, BL_ID; - callfunc "adjust_spellpower"; set Sp, Sp - 12; misceffect FX_MAGIC_FLYING_CAST, strcharinfo(0); callfunc "magic_exp"; if (BL_ID != @target_id) misceffect FX_MAGIC_FLYING_HIT, @args$; - set @plugh_time, (@spellpower*500)+5000, @target_id; - sc_start SC_FLYING_BACKPACK, @plugh_time, 0, @target_id; + set .@plugh_time, (@spellpower*500)+5000; + sc_start SC_FLYING_BACKPACK, .@plugh_time, 0, @target_id; message @args$, "Backpack : Your backpack is lifted by a mystical force; you no longer feel it pressing on your back."; - set @plugh_future, gettimetick(0) + @plugh_time - 100, @target_id; - addtimer @plugh_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; + set @plugh_future, gettimetick(0) + .@plugh_time - 100, @target_id; + addtimer .@plugh_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; end; OnEnd: diff --git a/world/map/npc/magic/level2-lay-on-hands.txt b/world/map/npc/magic/level2-lay-on-hands.txt index ee75a0d0..744d145e 100644 --- a/world/map/npc/magic/level2-lay-on-hands.txt +++ b/world/map/npc/magic/level2-lay-on-hands.txt @@ -9,6 +9,7 @@ if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) || BL_ID == @target_id) end; if (get(GM, @target_id) == 1) end; if (Hp <= get(MaxHp, @target_id) / 20) end; // hp needs to be > 1/20 * target hp + callfunc "adjust_spellpower"; if (distance(BL_ID, @target_id) >= (((sqrt(@spellpower)*12)+@spellpower)/100)+2) end; if (sc_check(SC_HALT_REGENERATE,@target_id)) end; if (getequipid(equip_head, @args$) == 888) end; // magic gm top hat @@ -22,7 +23,6 @@ L_Pay: set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 500, "Magic Timer::OnClear"; // XXX should this be 0 ? sc_start SC_COOLDOWN, 500, 0, BL_ID; - callfunc "adjust_spellpower"; set Sp, Sp - 10; misceffect FX_MAGIC_LAY_CAST, strcharinfo(0); // on caster misceffect FX_MAGIC_LAY_HIT, @args$; // on target diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt index 98380d7b..25cb7c50 100644 --- a/world/map/npc/magic/level2-protect.txt +++ b/world/map/npc/magic/level2-protect.txt @@ -7,8 +7,9 @@ if (getskilllv(SKILL_MAGIC) < .level) end; if (.@level <= 3 && countitem("HardSpike") < 1) end; set @target_id, getcharid(3, @args$); - if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id)) + if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1) set @target_id, BL_ID; // fallback to self + callfunc "adjust_spellpower"; if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID; if (BL_ID == @target_id) set @args$, strcharinfo(0); if (get(GM, @target_id) == 1) end; @@ -23,17 +24,15 @@ L_Pay: set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 1500, "Magic Timer::OnClear"; // set the new debuff sc_start SC_COOLDOWN, 1500, 0, BL_ID; - callfunc "adjust_spellpower"; set Sp, Sp - 14; misceffect FX_MAGIC_SHIELD_CAST, strcharinfo(0); callfunc "magic_exp"; misceffect FX_MAGIC_SHIELD, @args$; - set .@time, (@spellpower*1000)+5000; - set @betsanc_time, .@time, @target_id; - sc_start SC_PHYS_SHIELD, .@time, max(15,(@spellpower/20))+5, @target_id; + set .@betsanc_time, (@spellpower*1000)+5000; + sc_start SC_PHYS_SHIELD, .@betsanc_time, max(15,(@spellpower/20))+5, @target_id; message @args$, "Shield : You feel more protected."; - set @betsanc_future, gettimetick(0) + @betsanc_time - 100, @target_id; - addtimer @betsanc_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; + set @betsanc_future, gettimetick(0) + .@betsanc_time - 100, @target_id; + addtimer .@betsanc_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; end; OnEnd: -- cgit v1.2.3-60-g2f50