From 8b13cd9fe12afe61b72f072046556e40c2d33a7a Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Sat, 25 Apr 2015 10:07:41 -0400
Subject: make magic less ambiguous

---
 world/map/conf/magic-level1.sex | 92 ++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 65 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 671ec309..9ca79f3b 100644
--- a/world/map/conf/magic-level1.sex
+++ b/world/map/conf/magic-level1.sex
@@ -1,53 +1,15 @@
 "--------------------------------------------------------------------------------"
-"Level 0 spells"
+" Level 1 spells                                                                 "
 "--------------------------------------------------------------------------------"
-(SPELL () wand "#confringo" ()
-    (LET school MAGIC)
-    (=>
-        (GUARD
-            (CASTTIME 500))
-        (EFFECT
-            (SCRIPT "{callfunc \"CheckWand\";}")
-            (IF (==
-                    (script_int caster "@Wand")
-                    0)
-                (ABORT))
-            (CALL adjust_spellpower school)
-            (CALL default_effect)
-            (CALL install_attack_spell
-                (+ (script_int caster "@Wand")
-                    (/ spellpower 10))
-                1200
-                3
-                (script_int caster "@WandID"))
-            (CALL gain_xp 1 3)
-            (ATTRIGGER
-                (CALL attack_check target)
-                (SCRIPT "{callfunc \"WandMana\";}")
-                (IF (==
-                        (script_int caster "@WandAttack")
-                        0)
-                (ABORT))
-                (SET damage
-                    (* (script_int caster "@Wand")
-                        (/ spellpower
-                            3)))
-                (SET damage_bonus
-                    (* (script_int caster "@Wand")
-                        (/ spellpower
-                            3)))
-                (CALL elt_damage target damage damage_bonus ELT_NEUTRAL ELT_NEUTRAL 5))
-)))
-
 (SPELL () ask-magic-exp "#abizit" ()
-    (LET level 0)
+    (LET level 1)
     (LET school MAGIC)
     (=>
         (GUARD
             (MANA 1)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level)))
         (EFFECT
@@ -119,14 +81,14 @@
                                                                     (message caster "You feel completely overwhelmed by your magic."))))))))))))))))))
 
 (SPELL () transmute-wood-to-figurine "#parum" (STRING name)
-    (LET level 0)
+    (LET level 1)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 5)
             (CASTTIME 4000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (COMPONENTS "RawLog"))
@@ -149,14 +111,14 @@
                     (message caster "You have no idea what a Skrytlurk looks like."))))))
 
 (SPELL () make-sulphur "#gole" ()
-    (LET level 0)
+    (LET level 1)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 4)
             (CASTTIME 4000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (COMPONENTS "PileOfAsh"))
@@ -177,14 +139,14 @@
             (CALL gain_xp 1 1))))
 
 (SPELL () lesser-heal "#lum" (STRING target)
-    (LET level 0)
+    (LET level 1)
     (LET school LIFE)
     (=>
         (GUARD
             (MANA 6)
             (CASTTIME 500)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
@@ -244,14 +206,14 @@
             (CALL gain_xp 1 2))))
 
 (SPELL () flare-dart "#flar" ()
-    (LET level 0)
+    (LET level 1)
     (LET school WAR)
     (=>
         (GUARD
             (MANA 10)
             (CASTTIME 500)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (GUARD
@@ -284,14 +246,14 @@
                 (CALL elt_damage target damage damage_bonus ELT_WATER ELT_FIRE 15)))))
 
 (SPELL () magic-blade "#chiza" ()
-    (LET level 0)
+    (LET level 1)
     (LET school WAR)
     (=>
         (GUARD
             (MANA 9)
             (CASTTIME 500)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level)))
         (|
@@ -327,14 +289,14 @@
                                 (str caster)))))))))
 
 (SPELL () aggravate "#itenplz" ()
-    (LET level 0)
+    (LET level 1)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 3)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level)))
         (EFFECT
@@ -353,14 +315,14 @@
                         (aggravate target 0 caster)))))))
 
 (SPELL () grow-mauve "#modrilax" ()
-    (LET level 0)
+    (LET level 1)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 4)
             (CASTTIME 2000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (COMPONENTS "MauveHerb" "Root"))
@@ -382,14 +344,14 @@
                 school))))
 
 (SPELL () grow-alizarin "#modriphoo" ()
-    (LET level 0)
+    (LET level 1)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 4)
             (CASTTIME 2000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (COMPONENTS "AlizarinHerb" "Root"))
@@ -411,14 +373,14 @@
                 school))))
 
 (SPELL () grow-gamboge "#modriyikam" ()
-    (LET level 0)
+    (LET level 1)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 4)
             (CASTTIME 2000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (COMPONENTS "GambogeHerb" "Root"))
@@ -440,14 +402,14 @@
                 school))))
 
 (SPELL () grow-cobalt "#modrisump" ()
-    (LET level 0)
+    (LET level 1)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 4)
             (CASTTIME 2000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (COMPONENTS "CobaltHerb" "Root"))
@@ -469,14 +431,14 @@
                 school))))
 
 (SPELL (LOCAL) summon-maggots "#kalmurk" ()
-    (LET level 0)
+    (LET level 1)
     (LET school ASTRAL)
     (=>
         (GUARD
             (MANA 21)
             (CASTTIME 20000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (COMPONENTS "MaggotSlime" "Root"))
@@ -498,14 +460,14 @@
                 school))))
 
 (SPELL () detect-magic "#miteyo" ()
-    (LET level 0)
+    (LET level 1)
     (LET school MAGIC)
     (=>
         (GUARD
             (MANA 3)
             (CASTTIME 6000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level)))
         (EFFECT
-- 
cgit v1.2.3-70-g09d2