From e5190f9ddff51a2e246a7af5538909ec212e00db Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Sun, 7 Sep 2014 15:44:33 -0400
Subject: add fight club

---
 world/map/conf/magic-level1.sex | 87 ++++++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 27 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 3e673170..01864666 100644
--- a/world/map/conf/magic-level1.sex
+++ b/world/map/conf/magic-level1.sex
@@ -7,7 +7,8 @@
         (GUARD
             (CASTTIME 500))
         (EFFECT
-            (SCRIPT "{callfunc \"CheckWand\";}") 
+            (CALL fightclub_check)
+            (SCRIPT "{callfunc \"CheckWand\";}")
             (IF (==
                     (script_int caster "@Wand")
                     0)
@@ -23,7 +24,7 @@
             (CALL gain_xp 1 3)
             (ATTRIGGER
                 (CALL attack_check target)
-                (SCRIPT "{callfunc \"WandMana\";}") 
+                (SCRIPT "{callfunc \"WandMana\";}")
                 (IF (==
                         (script_int caster "@WandAttack")
                         0)
@@ -199,6 +200,25 @@
                                 (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
@@ -262,6 +282,7 @@
                             2))
                     (COMPONENTS "SulphurPowder"))))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (SET damage
@@ -298,6 +319,7 @@
             (=>
                 (COMPONENTS "SharpKnife")
                 (EFFECT
+                    (CALL fightclub_check)
                     (CALL adjust_spellpower WAR)
                     (CALL default_effect)
                     (CALL install_melee_spell
@@ -313,6 +335,7 @@
             (=>
                 (COMPONENTS "Knife")
                 (EFFECT
+                    (CALL fightclub_check)
                     (CALL adjust_spellpower WAR)
                     (CALL default_effect)
                     (CALL install_melee_spell
@@ -365,20 +388,22 @@
                     level))
             (COMPONENTS "MauveHerb" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 6)
-            (spawn
-                (rbox location 2)
-                caster
-                1029
-                1
+            (CALL summon_spell 1029
                 (+
                     (/
                         (skill caster school)
                         2)
                     1)
-                10000))))
+                (- 4000
+                    (* spellpower 9))
+                (+ 10000
+                    (* spellpower 50))
+                999999
+                school))))
 
 (SPELL () grow-alizarin "#modriphoo" ()
     (LET level 0)
@@ -393,20 +418,22 @@
                     level))
             (COMPONENTS "AlizarinHerb" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 7)
-            (spawn
-                (rbox location 2)
-                caster
-                1032
-                1
+            (CALL summon_spell 1032
                 (+
                     (/
                         (skill caster school)
                         2)
                     1)
-                10000))))
+                (- 4000
+                    (* spellpower 9))
+                (+ 10000
+                    (* spellpower 50))
+                999999
+                school))))
 
 (SPELL () grow-gamboge "#modriyikam" ()
     (LET level 0)
@@ -421,20 +448,22 @@
                     level))
             (COMPONENTS "GambogeHerb" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 8)
-            (spawn
-                (rbox location 2)
-                caster
-                1031
-                1
+            (CALL summon_spell 1031
                 (+
                     (/
                         (skill caster school)
                         2)
                     1)
-                10000))))
+                (- 4000
+                    (* spellpower 9))
+                (+ 10000
+                    (* spellpower 50))
+                999999
+                school))))
 
 (SPELL () grow-cobalt "#modrisump" ()
     (LET level 0)
@@ -449,20 +478,22 @@
                     level))
             (COMPONENTS "CobaltHerb" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 9)
-            (spawn
-                (rbox location 2)
-                caster
-                1030
-                1
+            (CALL summon_spell 1030
                 (+
                     (/
                         (skill caster school)
                         2)
                     1)
-                10000))))
+                (- 4000
+                    (* spellpower 9))
+                (+ 10000
+                    (* spellpower 50))
+                999999
+                school))))
 
 (SPELL (LOCAL) summon-maggots "#kalmurk" ()
     (LET level 0)
@@ -477,6 +508,7 @@
                     level))
             (COMPONENTS "MaggotSlime" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL gain_xp 1 10)
             (CALL summon_spell 1002
@@ -490,7 +522,8 @@
                     (* spellpower 5))
                 (+ 10000
                     (* spellpower 50))
-                1))))
+                1
+                school))))
 
 (SPELL () detect-magic "#miteyo" ()
     (LET level 0)
-- 
cgit v1.2.3-60-g2f50