From e8236326e16fb7e94104b69e584f55fd13ce2fe5 Mon Sep 17 00:00:00 2001 From: mekolat Date: Tue, 4 Nov 2014 09:54:56 -0500 Subject: fix lum --- world/map/conf/magic-level1.sex | 38 ++++++++++--------------------------- world/map/conf/magic-level2.sex | 24 +++++++++++------------ world/map/conf/magic-level3.sex | 2 +- world/map/conf/magic-procedures.sex | 14 ++++++++++++-- 4 files changed, 35 insertions(+), 43 deletions(-) diff --git a/world/map/conf/magic-level1.sex b/world/map/conf/magic-level1.sex index 01864666..a4aaa8a2 100644 --- a/world/map/conf/magic-level1.sex +++ b/world/map/conf/magic-level1.sex @@ -7,7 +7,7 @@ (GUARD (CASTTIME 500)) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (SCRIPT "{callfunc \"CheckWand\";}") (IF (== (script_int caster "@Wand") @@ -200,28 +200,10 @@ (pc target))) (+ 2 (/ spellpower 100))))) - (REQUIRE - (not - (|| - (&& - (is_in (location (pc target)) - (@+ - (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1")) - (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) - (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")))) - (!= (pc target) caster)) - (&& - (&& - (is_in (location (pc target)) - (@+ - (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1")) - (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) - (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")))) - (== (pc target) caster)) - (== (script_int caster "$@Duel_NoMagic") 1))))) (GUARD (COMPONENTS "Lifestone"))) (EFFECT + (CALL fightclub_check 1) (CALL adjust_spellpower school) (CALL default_effect) (IF (failed @@ -282,7 +264,7 @@ 2)) (COMPONENTS "SulphurPowder")))) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (SET damage @@ -319,7 +301,7 @@ (=> (COMPONENTS "SharpKnife") (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower WAR) (CALL default_effect) (CALL install_melee_spell @@ -335,7 +317,7 @@ (=> (COMPONENTS "Knife") (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower WAR) (CALL default_effect) (CALL install_melee_spell @@ -388,7 +370,7 @@ level)) (COMPONENTS "MauveHerb" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 1 6) @@ -418,7 +400,7 @@ level)) (COMPONENTS "AlizarinHerb" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 1 7) @@ -448,7 +430,7 @@ level)) (COMPONENTS "GambogeHerb" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 1 8) @@ -478,7 +460,7 @@ level)) (COMPONENTS "CobaltHerb" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 1 9) @@ -508,7 +490,7 @@ level)) (COMPONENTS "MaggotSlime" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL gain_xp 1 10) (CALL summon_spell 1002 diff --git a/world/map/conf/magic-level2.sex b/world/map/conf/magic-level2.sex index 0f1f32b1..827cd847 100644 --- a/world/map/conf/magic-level2.sex +++ b/world/map/conf/magic-level2.sex @@ -361,7 +361,7 @@ 3)) (COMPONENTS "IronPowder")))) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (SET damage spellpower) (SET damage_bonus @@ -564,7 +564,7 @@ 3)) (COMPONENTS "Beer")))) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower WAR) (SET str (str caster)) @@ -599,7 +599,7 @@ 40)) (COMPONENTS "DarkCrystal" "SnakeEgg")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 3 31) @@ -636,7 +636,7 @@ (COMPONENTS (2 "Root"))))) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (SET damage @@ -691,7 +691,7 @@ level)) (COMPONENTS "SmallMushroom" "DarkCrystal")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 3 36) @@ -734,7 +734,7 @@ (+ 2 (/ spellpower 30))))) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (IF (!= caster target) @@ -783,7 +783,7 @@ (+ 2 (/ spellpower 30))))) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (sfx target 11 0) (IF (!= caster target) @@ -1075,7 +1075,7 @@ (+ 2 (/ spellpower 30))))) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (sfx target SFX_BARRIER 0) (IF (!= caster target) @@ -1112,7 +1112,7 @@ level)) (COMPONENTS "HardSpike" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 1 26) @@ -1142,7 +1142,7 @@ level)) (COMPONENTS "WhiteFur" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 1 27) @@ -1174,7 +1174,7 @@ level)) (COMPONENTS "MoubooFigurine" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 2 37) @@ -1204,7 +1204,7 @@ level)) (COMPONENTS "PinkAntenna" "Root")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (CALL default_effect) (CALL gain_xp 2 38) diff --git a/world/map/conf/magic-level3.sex b/world/map/conf/magic-level3.sex index b4b3e030..21b5692f 100644 --- a/world/map/conf/magic-level3.sex +++ b/world/map/conf/magic-level3.sex @@ -53,7 +53,7 @@ level)) (COMPONENTS "PileOfAsh")) (EFFECT - (CALL fightclub_check) + (CALL fightclub_check 0) (CALL adjust_spellpower school) (SET damage (min diff --git a/world/map/conf/magic-procedures.sex b/world/map/conf/magic-procedures.sex index bce579fc..e9ec7aae 100644 --- a/world/map/conf/magic-procedures.sex +++ b/world/map/conf/magic-procedures.sex @@ -280,7 +280,7 @@ (PROCEDURE install_melee_spell (charges base_delay attack_animation) (CALL install_attack_spell charges base_delay 1 attack_animation)) -(PROCEDURE fightclub_check () +(PROCEDURE fightclub_check (healing) (IF (&& (is_in (location caster) (@+ @@ -290,7 +290,17 @@ (|| (== (script_int caster "$@Duel_NoMagic") 1) (!= (script_int caster "@Duel_Fighter") 1))) - (ABORT))) + (ABORT)) + (IF (== healing 1) + (IF (&& + (== (substr (location caster) 2 5) "009-7") + (not + (is_in (location caster) + (@+ + (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1")) + (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) + (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")))))) + (ABORT)))) (PROCEDURE summon_spell (mob_id count delay lifetime control_level school) (CALL default_effect) -- cgit v1.2.3-60-g2f50