From e8236326e16fb7e94104b69e584f55fd13ce2fe5 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Tue, 4 Nov 2014 09:54:56 -0500
Subject: fix lum

---
 world/map/conf/magic-level1.sex | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

(limited to 'world/map/conf/magic-level1.sex')

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
-- 
cgit v1.2.3-60-g2f50