From 179a355d8b359ff361a82425fa5f6d022ee11dae Mon Sep 17 00:00:00 2001 From: mekolat Date: Sun, 1 May 2016 10:39:10 -0400 Subject: make spells count their charges themselves --- world/map/npc/magic/level0-wand.txt | 61 +++++++++++++------------ world/map/npc/magic/level1-flare-dart.txt | 2 +- world/map/npc/magic/level1-magic-blade.txt | 2 +- world/map/npc/magic/level2-lightning-strike.txt | 2 +- world/map/npc/magic/level2-magic-knuckles.txt | 2 +- world/map/npc/magic/level2-shear.txt | 4 +- world/map/npc/magic/level2-toxic-dart.txt | 2 +- 7 files changed, 38 insertions(+), 37 deletions(-) (limited to 'world') diff --git a/world/map/npc/magic/level0-wand.txt b/world/map/npc/magic/level0-wand.txt index 07fbb025..9c8a6825 100644 --- a/world/map/npc/magic/level0-wand.txt +++ b/world/map/npc/magic/level0-wand.txt @@ -1,62 +1,63 @@ -|script|spell-wand|32767 { if(call("magic_checks")) goto L_Failed; - callsub S_CheckWand; - if(@WandAttack != 1) goto L_Failed; + set @wandspell[0], 0; // reset state + callfunc "adjust_spellpower"; + callsub S_Loop; // set up wand + if(@wandspell[0] < 1) goto L_Failed; // here we install set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 500, "Magic Timer::OnClear"; // set the new debuff - callfunc "adjust_spellpower"; misceffect FX_MAGIC_GENERIC, strcharinfo(0); - set .@delay, (((200 - Agi) * 1200) / 200); - overrideattack (@Wand + (@spellpower / 10)), .@delay, 3, ATTACK_ICON_GENERIC, @WandID, strnpcinfo(0)+"::OnAttack"; + callfunc "magic_exp"; + goto L_FreeRecast; + +L_FreeRecast: + if (@wandspell[4] > 0) + addtimer 0, strnpcinfo(0) + "::OnSetRecast"; end; -OnAttack: - callsub S_CheckWand; - if(@WandAttack != 1) goto L_Failed; - if(target(BL_ID, @target_id, 22) != 22) goto L_Failed; // 0x02 | 0x04 | 0x10 - set Sp, (Sp - @WandCost); - set @damage, (@Wand * (@spellpower / 3)); - void call("elt_damage", @damage,@damage,ELT_NEUTRAL,ELT_NEUTRAL,FX_MAGIC_RED); +OnSetRecast: + overrideattack @wandspell[3], 3, ATTACK_ICON_GENERIC, @wandspell[0], strnpcinfo(0)+"::OnAttack"; end; -S_CheckWand: - set @Wand, 0; - set @wand_loop, 0; - goto S_Loop; +OnAttack: + if(target(BL_ID, @target_id, 22) != 22) goto L_FreeRecast; // 0x02 | 0x04 | 0x10 + if (Sp < @wandspell[1]) goto L_LowSp; + set Sp, (Sp - @wandspell[1]); + void call("elt_damage", @wandspell[2],@wandspell[2],ELT_NEUTRAL,ELT_NEUTRAL,FX_MAGIC_RED); + set @wandspell[4], @wandspell[4] - 1; + goto L_FreeRecast; S_Loop: - if ((getequipid(equip_hand1) == .Wands[@wand_loop]) || (getequipid(equip_hand2) == .Wands[@wand_loop])) + if ((getequipid(equip_hand1) == .Wands[.@wand_loop]) || (getequipid(equip_hand2) == .Wands[.@wand_loop])) goto S_SetWand; - set @wand_loop, (@wand_loop + 1); - if (@wand_loop >= getarraysize(.Wands)) + set .@wand_loop, (.@wand_loop + 1); + if (.@wand_loop >= getarraysize(.Wands)) goto S_NoWand; goto S_Loop; S_SetWand: - set @Wand, .WandsPwr[@wand_loop]; - set @WandID, .WandsAnim[@wand_loop]; + set .@pwr, .WandsPwr[.@wand_loop]; if (QL_MORGAN == 2) set QL_MORGAN, 3; - set @WandCost, (@Wand * (BaseLevel / 15) + 2); - set @WandAttack, 0; - if (Sp < @WandCost) - goto S_LowSp; - set @WandAttack, 1; // everything is fine + setarray @wandspell[0], + .WandsAnim[.@wand_loop], // wand anim/id + (.@pwr * (BaseLevel / 15) + 2), // wand cost + (.@pwr * (@spellpower / 3)), // wand dmg + (((200 - Agi) * 1200) / 200), //delay + (.@pwr + (@spellpower / 10)); // charges return; S_NoWand: message strcharinfo(0), "Wand : ##3##BYou need a wand Equipped!"; - set @WandAttack, 0; return; -S_LowSp: +L_LowSp: message strcharinfo(0), "Wand : ##3##BOut of Mana"; - set @WandAttack, 0; - return; + end; L_Failed: //misceffect FX_ELECTRICITY_RED, strcharinfo(0); // XXX: do we show an effect on fail? diff --git a/world/map/npc/magic/level1-flare-dart.txt b/world/map/npc/magic/level1-flare-dart.txt index 6c0ef303..559134e7 100644 --- a/world/map/npc/magic/level1-flare-dart.txt +++ b/world/map/npc/magic/level1-flare-dart.txt @@ -32,7 +32,7 @@ L_FreeRecast: end; OnSetRecast: - overrideattack 1, @flarspell[3], 4, ATTACK_ICON_GENERIC, 34, strnpcinfo(0)+"::OnAttack"; + overrideattack @flarspell[3], 4, ATTACK_ICON_GENERIC, 34, strnpcinfo(0)+"::OnAttack"; end; OnInit: diff --git a/world/map/npc/magic/level1-magic-blade.txt b/world/map/npc/magic/level1-magic-blade.txt index ad39c244..a1a1e1e5 100644 --- a/world/map/npc/magic/level1-magic-blade.txt +++ b/world/map/npc/magic/level1-magic-blade.txt @@ -35,7 +35,7 @@ L_FreeRecast: end; OnSetRecast: - overrideattack 1, @chizaspell[3], 1, ATTACK_ICON_GENERIC, 30, strnpcinfo(0)+"::OnAttack"; + overrideattack @chizaspell[3], 1, ATTACK_ICON_GENERIC, 30, strnpcinfo(0)+"::OnAttack"; end; OnInit: diff --git a/world/map/npc/magic/level2-lightning-strike.txt b/world/map/npc/magic/level2-lightning-strike.txt index cf30a627..69189ed4 100644 --- a/world/map/npc/magic/level2-lightning-strike.txt +++ b/world/map/npc/magic/level2-lightning-strike.txt @@ -42,7 +42,7 @@ L_FreeRecast: end; OnSetRecast: - overrideattack 1, @ingravspell[3], 8, ATTACK_ICON_GENERIC, 31, strnpcinfo(0)+"::OnAttack"; + overrideattack @ingravspell[3], 8, ATTACK_ICON_GENERIC, 31, strnpcinfo(0)+"::OnAttack"; end; OnNpc: diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt index 0984a7fd..7b6afeed 100644 --- a/world/map/npc/magic/level2-magic-knuckles.txt +++ b/world/map/npc/magic/level2-magic-knuckles.txt @@ -32,7 +32,7 @@ L_FreeRecast: end; OnSetRecast: - overrideattack 1, @upmarmuspell[2], 1, ATTACK_ICON_GENERIC, 34, strnpcinfo(0)+"::OnAttack"; + overrideattack @upmarmuspell[2], 1, ATTACK_ICON_GENERIC, 34, strnpcinfo(0)+"::OnAttack"; end; OnInit: diff --git a/world/map/npc/magic/level2-shear.txt b/world/map/npc/magic/level2-shear.txt index af825727..4c1df781 100644 --- a/world/map/npc/magic/level2-shear.txt +++ b/world/map/npc/magic/level2-shear.txt @@ -12,7 +12,7 @@ setarray @chipchipspell[0], @spellpower, (((200 - Agi) * 2000) / 200); //delay - overrideattack 1, @chipchipspell[1], 1, ATTACK_ICON_SHEARING, 30, strnpcinfo(0)+"::OnAttack"; + overrideattack @chipchipspell[1], 1, ATTACK_ICON_SHEARING, 30, strnpcinfo(0)+"::OnAttack"; callfunc "magic_exp"; end; @@ -47,7 +47,7 @@ L_FreeRecast: end; OnSetRecast: - overrideattack 1, @chipchipspell[1], 1, ATTACK_ICON_SHEARING, 30, strnpcinfo(0)+"::OnAttack"; + overrideattack @chipchipspell[1], 1, ATTACK_ICON_SHEARING, 30, strnpcinfo(0)+"::OnAttack"; end; OnInit: diff --git a/world/map/npc/magic/level2-toxic-dart.txt b/world/map/npc/magic/level2-toxic-dart.txt index 357ae32b..c72520c4 100644 --- a/world/map/npc/magic/level2-toxic-dart.txt +++ b/world/map/npc/magic/level2-toxic-dart.txt @@ -38,7 +38,7 @@ L_FreeRecast: end; OnSetRecast: - overrideattack 1, @phlexspell[2], 4, ATTACK_ICON_GENERIC, 31, strnpcinfo(0)+"::OnAttack"; + overrideattack @phlexspell[2], 4, ATTACK_ICON_GENERIC, 31, strnpcinfo(0)+"::OnAttack"; end; OnInit: -- cgit v1.2.3-60-g2f50