make the fight club use channels

4 files changed, 0 insertions, 63 deletions

diff --git a/world/map/conf/magic-level1.sex b/world/map/conf/magic-level1.sex
index af34d27a..671ec309 100644
--- a/world/map/conf/magic-level1.sex
+++ b/world/map/conf/magic-level1.sex
@@ -7,7 +7,6 @@
         (GUARD
             (CASTTIME 500))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (SCRIPT "{callfunc \"CheckWand\";}")
             (IF (==
                     (script_int caster "@Wand")
@@ -203,7 +202,6 @@
             (GUARD
                 (COMPONENTS "Lifestone")))
         (EFFECT
-            (CALL fightclub_check 1 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (IF (failed
@@ -264,7 +262,6 @@
                             2))
                     (COMPONENTS "SulphurPowder"))))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (SET damage
@@ -301,7 +298,6 @@
             (=>
                 (COMPONENTS "SharpKnife")
                 (EFFECT
-                    (CALL fightclub_check 0 0)
                     (CALL adjust_spellpower WAR)
                     (CALL default_effect)
                     (CALL install_melee_spell
@@ -317,7 +313,6 @@
             (=>
                 (COMPONENTS "Knife")
                 (EFFECT
-                    (CALL fightclub_check 0 0)
                     (CALL adjust_spellpower WAR)
                     (CALL default_effect)
                     (CALL install_melee_spell
@@ -370,7 +365,6 @@
                     level))
             (COMPONENTS "MauveHerb" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 6)
@@ -400,7 +394,6 @@
                     level))
             (COMPONENTS "AlizarinHerb" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 7)
@@ -430,7 +423,6 @@
                     level))
             (COMPONENTS "GambogeHerb" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 8)
@@ -460,7 +452,6 @@
                     level))
             (COMPONENTS "CobaltHerb" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 9)
@@ -490,7 +481,6 @@
                     level))
             (COMPONENTS "MaggotSlime" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 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 70a37163..993f2a89 100644
--- a/world/map/conf/magic-level2.sex
+++ b/world/map/conf/magic-level2.sex
@@ -221,15 +221,6 @@
                     (skill caster school)
                     level))
             (REQUIRE
-                (== (if_then_else (failed (pc target))
-                        1
-                        (not
-                            (is_in (location (pc target))
-                                (@+
-                                    (@ "009-7" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
-                                    (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1)
-                                    (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1))))) 1))
-            (REQUIRE
                 (if_then_else
                     (failed
                         (pc target))
@@ -363,7 +354,6 @@
                             3))
                     (COMPONENTS "IronPowder"))))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (SET damage spellpower)
             (SET damage_bonus
@@ -566,7 +556,6 @@
                             3))
                     (COMPONENTS "Beer"))))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower WAR)
             (SET str
                 (str caster))
@@ -601,7 +590,6 @@
                     40))
             (COMPONENTS "DarkCrystal" "SnakeEgg"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 3 31)
@@ -638,7 +626,6 @@
                     (COMPONENTS
                         (2 "Root")))))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (SET damage
@@ -693,7 +680,6 @@
                     level))
             (COMPONENTS "SmallMushroom" "DarkCrystal"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 3 36)
@@ -736,7 +722,6 @@
                     (+ 2
                         (/ spellpower 30)))))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (IF (!= caster target)
@@ -785,7 +770,6 @@
                     (+ 2
                         (/ spellpower 30)))))
         (EFFECT
-            (CALL fightclub_check 0 1)
             (CALL adjust_spellpower school)
             (sfx target 11 0)
             (IF (!= caster target)
@@ -1077,7 +1061,6 @@
                     (+ 2
                         (/ spellpower 30)))))
         (EFFECT
-            (CALL fightclub_check 0 1)
             (CALL adjust_spellpower school)
             (sfx target SFX_BARRIER 0)
             (IF (!= caster target)
@@ -1114,7 +1097,6 @@
                     level))
             (COMPONENTS "HardSpike" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 26)
@@ -1144,7 +1126,6 @@
                     level))
             (COMPONENTS "WhiteFur" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 27)
@@ -1176,7 +1157,6 @@
                     level))
             (COMPONENTS "MoubooFigurine" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 0)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 2 37)
@@ -1206,7 +1186,6 @@
                     level))
             (COMPONENTS "PinkAntenna" "Root"))
         (EFFECT
-            (CALL fightclub_check 0 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 d53f1a19..2550da3e 100644
--- a/world/map/conf/magic-level3.sex
+++ b/world/map/conf/magic-level3.sex
@@ -53,7 +53,6 @@
                     level))
             (COMPONENTS "PileOfAsh"))
         (EFFECT
-            (CALL fightclub_check 0 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 6157765d..ea62f50f 100644
--- a/world/map/conf/magic-procedures.sex
+++ b/world/map/conf/magic-procedures.sex
@@ -280,37 +280,6 @@
 (PROCEDURE install_melee_spell (charges base_delay attack_animation)
     (CALL install_attack_spell charges base_delay 1 attack_animation))
 
-(PROCEDURE fightclub_check (onSelf onTarget)
-    (IF (&&
-            (is_in (location caster)
-                (@+
-                    (@ "009-7" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
-                    (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1)
-                    (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1)))
-            (||
-                (== (script_int caster "$@Duel_NoMagic") 1)
-                (!= (script_int caster "@Duel_Fighter") 1)))
-        (ABORT))
-    (IF (== onSelf 1)
-        (IF (&&
-                (== (substr (location caster) 2 5) "009-7")
-                (not
-                    (is_in (location caster)
-                        (@+
-                            (@ "009-7" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
-                            (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1)
-                            (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1)))))
-            (ABORT)))
-    (IF (== onTarget 1)
-        (IF (&&
-                (!= (pc target) caster)
-                (is_in (location (pc target))
-                    (@+
-                        (@ "009-7" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
-                        (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1)
-                        (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1))))
-            (ABORT))))
-
 (PROCEDURE summon_spell (mob_id count delay lifetime control_level school)
     (CALL default_effect)
     (sfx location SFX_SUMMON_START 0)