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-level2.sex | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

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

diff --git a/world/map/conf/magic-level2.sex b/world/map/conf/magic-level2.sex
index af805160..0f1f32b1 100644
--- a/world/map/conf/magic-level2.sex
+++ b/world/map/conf/magic-level2.sex
@@ -220,6 +220,13 @@
                 (>
                     (skill caster school)
                     level))
+            (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"))))))
             (REQUIRE
                 (if_then_else
                     (failed
@@ -354,6 +361,7 @@
                             3))
                     (COMPONENTS "IronPowder"))))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (SET damage spellpower)
             (SET damage_bonus
@@ -556,6 +564,7 @@
                             3))
                     (COMPONENTS "Beer"))))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower WAR)
             (SET str
                 (str caster))
@@ -590,16 +599,18 @@
                     40))
             (COMPONENTS "DarkCrystal" "SnakeEgg"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 3 31)
-            (CALL summon_dark_spell 1010
+            (CALL summon_spell 1010
                 (+ 1
                     (/ spellpower 300))
                 (- 4000
                     (* spellpower 9))
                 (* spellpower 80)
-                2))))
+                2
+                school))))
 
 (SPELL () toxic-dart "#phlex" ()
     (LET level 1)
@@ -625,6 +636,7 @@
                     (COMPONENTS
                         (2 "Root")))))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (SET damage
@@ -679,16 +691,18 @@
                     level))
             (COMPONENTS "SmallMushroom" "DarkCrystal"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 3 36)
-            (CALL summon_dark_spell 1106
+            (CALL summon_spell 1106
                 (+ 1
                     (/ spellpower 250))
                 (- 4000
                     (* spellpower 9))
                 (* spellpower 80)
-                2))))
+                2
+                school))))
 
 (SPELL () flying-backpack "#plugh" (PC target)
     (LET level 1)
@@ -720,6 +734,7 @@
                     (+ 2
                         (/ spellpower 30)))))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (IF (!= caster target)
@@ -768,6 +783,7 @@
                     (+ 2
                         (/ spellpower 30)))))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (sfx target 11 0)
             (IF (!= caster target)
@@ -1059,6 +1075,7 @@
                     (+ 2
                         (/ spellpower 30)))))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (sfx target SFX_BARRIER 0)
             (IF (!= caster target)
@@ -1095,6 +1112,7 @@
                     level))
             (COMPONENTS "HardSpike" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 26)
@@ -1104,7 +1122,8 @@
                 (- 5000
                     (* spellpower 9))
                 (* spellpower 400)
-                2))))
+                2
+                school))))
 
 (SPELL (LOCAL) summon-fluffies "#kalakarenk" ()
     (LET level 1)
@@ -1123,6 +1142,7 @@
                     level))
             (COMPONENTS "WhiteFur" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 1 27)
@@ -1134,7 +1154,8 @@
                 (- 5000
                     (* spellpower 8))
                 (* spellpower 350)
-                2))))
+                2
+                school))))
 
 (SPELL (LOCAL) summon-mouboo "#kalboo" ()
     (LET level 1)
@@ -1153,6 +1174,7 @@
                     level))
             (COMPONENTS "MoubooFigurine" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 2 37)
@@ -1162,7 +1184,8 @@
                 (- 4000
                     (* spellpower 9))
                 (* spellpower 100)
-                2))))
+                2
+                school))))
 
 (SPELL (LOCAL) summon-pinkie "#kalgina" ()
     (LET level 1)
@@ -1181,6 +1204,7 @@
                     level))
             (COMPONENTS "PinkAntenna" "Root"))
         (EFFECT
+            (CALL fightclub_check)
             (CALL adjust_spellpower school)
             (CALL default_effect)
             (CALL gain_xp 2 38)
@@ -1190,7 +1214,8 @@
                 (- 5000
                     (* spellpower 9))
                 (* spellpower 150)
-                2))))
+                2
+                school))))
 
 (SPELL () detect-players "#inwilt" ()
     (LET level 1)
-- 
cgit v1.2.3-70-g09d2