Merge pull request #347 from mekolat/magical-phallus-of-death

make magic less ambiguous

1 files changed, 95 insertions, 95 deletions

diff --git a/world/map/conf/magic-level2.sex b/world/map/conf/magic-level2.sex
index 993f2a89..e12a58b8 100644
--- a/world/map/conf/magic-level2.sex
+++ b/world/map/conf/magic-level2.sex
@@ -1,19 +1,19 @@
 "--------------------------------------------------------------------------------"
-"Level 1 spells"
+" Level 2 spells                                                                 "
 "--------------------------------------------------------------------------------"
 (SPELL () make-arrows "#kularzufrill" ()
-    (LET level 1)
+    (LET level 2)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 8)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "RawLog"))
@@ -34,18 +34,18 @@
             (CALL gain_xp 1 11))))
 
 (SPELL () make-shirt "#patmuploo" ()
-    (LET level 1)
+    (LET level 2)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 25)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS
@@ -57,18 +57,18 @@
             (CALL gain_xp 2 12))))
 
 (SPELL () make-tanktop "#patloree" ()
-    (LET level 1)
+    (LET level 2)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 25)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS
@@ -80,18 +80,18 @@
             (CALL gain_xp 2 13))))
 
 (SPELL () make-short-tanktop "#patviloree" ()
-    (LET level 1)
+    (LET level 2)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 25)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS
@@ -103,18 +103,18 @@
             (CALL gain_xp 2 14))))
 
 (SPELL () make-iron-powder "#zukminbirf" ()
-    (LET level 1)
+    (LET level 2)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 8)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "IronOre"))
@@ -135,18 +135,18 @@
             (CALL gain_xp 3 15))))
 
 (SPELL () make-concentration-potion "#loshira" ()
-    (LET level 1)
+    (LET level 2)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 8)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "BottleOfWater"
@@ -174,18 +174,18 @@
             (CALL gain_xp 4 16))))
 
 (SPELL () merge-concentration-potions "#skrimp" ()
-    (LET level 1)
+    (LET level 2)
     (LET school TRANSMUTE)
     (=>
         (GUARD
             (MANA 8)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "DarkConcentrationPotion" "DilutedConcentrationPot"))
@@ -200,7 +200,7 @@
             (CALL gain_xp 4 17))))
 
 (SPELL () lay-on-hands "#inma" (STRING target)
-    (LET level 1)
+    (LET level 2)
     (LET school LIFE)
     (=>
         (GUARD
@@ -213,11 +213,11 @@
                         (max_hp caster)
                         20)))
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (REQUIRE
@@ -317,11 +317,11 @@
                         (max_hp caster)
                         20)
                     -1))
-            (IF (>
+            (IF (>=
                     (skill caster school)
                     level)
                 (itemheal caster h 0))
-            (IF (>
+            (IF (>=
                     (skill caster school)
                     level)
                 (SET t 10000))
@@ -332,26 +332,26 @@
                 18))))
 
 (SPELL () lightning-strike "#ingrav" ()
-    (LET level 1)
+    (LET level 2)
     (LET school WAR)
     (=>
         (GUARD
             (MANA 20)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (GUARD
                 (OR
                     (REQUIRE
-                        (>
-                            (skill caster school)
-                            3))
+                        (>=
+                            (skill caster school) "The spell is free at magic lv 4"
+                            4))
                     (COMPONENTS "IronPowder"))))
         (EFFECT
             (CALL adjust_spellpower school)
@@ -433,18 +433,18 @@
                             (random 3))))))))
 
 (SPELL (LOCAL) arrow-hail "#frillyar" ()
-    (LET level 1)
+    (LET level 2)
     (LET school WAR)
     (=>
         (GUARD
             (MANA 25)
             (CASTTIME 5000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (REQUIRE
@@ -534,18 +534,18 @@
                             (random 50))))))))
 
 (SPELL () magic-knuckles "#upmarmu" ()
-    (LET level 1)
+    (LET level 2)
     (LET school WAR)
     (=>
         (GUARD
             (MANA 20)
             (CASTTIME 500)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (GUARD
@@ -570,18 +570,18 @@
                         (* str 2)))))))
 
 (SPELL (LOCAL) summon-snakes "#halhiss" ()
-    (LET level 1)
+    (LET level 2)
     (LET school DARK)
     (=>
         (GUARD
             (MANA 40)
             (CASTTIME 15000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (REQUIRE
@@ -603,7 +603,7 @@
                 school))))
 
 (SPELL () toxic-dart "#phlex" ()
-    (LET level 1)
+    (LET level 2)
     (LET school DARK)
     (=>
         (GUARD
@@ -614,15 +614,15 @@
                     (script_int caster "OrumQuest")
                     37))
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (GUARD
                 (OR
                     (REQUIRE
-                        (>
+                        (>=
                             (skill caster school)
-                            2))
+                            3))
                     (COMPONENTS
                         (2 "Root")))))
         (EFFECT
@@ -660,14 +660,14 @@
                             (* spellpower 1200))))))))
 
 (SPELL (LOCAL) summon-wickedmushroom "#helorp" ()
-    (LET level 1)
+    (LET level 2)
     (LET school DARK)
     (=>
         (GUARD
             (MANA 35)
             (CASTTIME 15000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
@@ -675,7 +675,7 @@
                     (script_int caster "OrumQuest")
                     36))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "SmallMushroom" "DarkCrystal"))
@@ -693,18 +693,18 @@
                 school))))
 
 (SPELL () flying-backpack "#plugh" (PC target)
-    (LET level 1)
+    (LET level 2)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 12)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (GUARD
@@ -736,18 +736,18 @@
                 (sfx target 2 0)))))
 
 (SPELL () protect "#betsanc" (PC target)
-    (LET level 1)
+    (LET level 2)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 14)
             (CASTTIME 1500)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (REQUIRE
@@ -758,9 +758,9 @@
             (GUARD
                 (OR
                     (REQUIRE
-                        (>
+                        (>=
                             (skill caster school)
-                            3))
+                            4))
                     (COMPONENTS "HardSpike")))
             (REQUIRE
                 (<
@@ -790,18 +790,18 @@
                 (sfx target 111 0)))))
 
 (SPELL () happy-curse "#joyplim" (PC target)
-    (LET level 1)
+    (LET level 2)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 13)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (GUARD
@@ -837,18 +837,18 @@
             (CALL gain_xp 1 23))))
 
 (SPELL (LOCAL) rain "#kaflosh" ()
-    (LET level 1)
+    (LET level 2)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 17)
             (CASTTIME 3000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (REQUIRE
@@ -857,9 +857,9 @@
             (GUARD
                 (OR
                     (REQUIRE
-                        (>
+                        (>=
                             (skill caster school)
-                            3))
+                            4))
                     (COMPONENTS "BottleOfWater"))))
         (EFFECT
             (CALL adjust_spellpower school)
@@ -968,18 +968,18 @@
                     (+ prob3 prob))))))
 
 (SPELL () shear "#chipchip" ()
-    (LET level 1)
+    (LET level 2)
     (LET school NATURE)
     (=>
         (GUARD
             (MANA 23)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level)))
         (EFFECT
@@ -1027,18 +1027,18 @@
                             }"))))))))
 
 (SPELL () barrier "#asorm" (PC target)
-    (LET level 1)
+    (LET level 2)
     (LET school ASTRAL)
     (=>
         (GUARD
             (MANA 16)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (REQUIRE
@@ -1081,18 +1081,18 @@
                 (sfx target SFX_UNBARRIER 0)))))
 
 (SPELL (LOCAL) summon-spiky-mushrooms "#kalrenk" ()
-    (LET level 1)
+    (LET level 2)
     (LET school ASTRAL)
     (=>
         (GUARD
             (MANA 33)
             (CASTTIME 20000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "HardSpike" "Root"))
@@ -1110,18 +1110,18 @@
                 school))))
 
 (SPELL (LOCAL) summon-fluffies "#kalakarenk" ()
-    (LET level 1)
+    (LET level 2)
     (LET school ASTRAL)
     (=>
         (GUARD
             (MANA 39)
             (CASTTIME 20000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "WhiteFur" "Root"))
@@ -1141,18 +1141,18 @@
                 school))))
 
 (SPELL (LOCAL) summon-mouboo "#kalboo" ()
-    (LET level 1)
+    (LET level 2)
     (LET school ASTRAL)
     (=>
         (GUARD
             (MANA 35)
             (CASTTIME 20000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "MoubooFigurine" "Root"))
@@ -1170,18 +1170,18 @@
                 school))))
 
 (SPELL (LOCAL) summon-pinkie "#kalgina" ()
-    (LET level 1)
+    (LET level 2)
     (LET school ASTRAL)
     (=>
         (GUARD
             (MANA 35)
             (CASTTIME 20000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (COMPONENTS "PinkAntenna" "Root"))
@@ -1199,18 +1199,18 @@
                 school))))
 
 (SPELL () detect-players "#inwilt" ()
-    (LET level 1)
+    (LET level 2)
     (LET school MAGIC)
     (=>
         (GUARD
             (MANA 7)
             (CASTTIME 300)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level)))
         (EFFECT
@@ -1250,18 +1250,18 @@
                     (+ "You sense the following: " message))))))
 
 (SPELL () enchant-lifestone "#manpahil" ()
-    (LET level 1)
+    (LET level 2)
     (LET school MAGIC)
     (=>
         (GUARD
             (MANA 15)
             (CASTTIME 4000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (GUARD
@@ -1277,18 +1277,18 @@
             (CALL gain_xp 1 28))))
 
 (SPELL () sense-spouse "#inzuwilt" ()
-    (LET level 1)
+    (LET level 2)
     (LET school MAGIC)
     (=>
         (GUARD
             (MANA 7)
             (CASTTIME 400)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (REQUIRE
@@ -1409,18 +1409,18 @@
                                         "."))))))))))
 
 (SPELL () hide "#anwiltyp" (PC target)
-    (LET level 1)
+    (LET level 2)
     (LET school ASTRAL)
     (=>
         (GUARD
             (MANA 11)
             (CASTTIME 1000)
             (REQUIRE
-                (>
+                (>=
                     (skill caster MAGIC)
                     level))
             (REQUIRE
-                (>
+                (>=
                     (skill caster school)
                     level))
             (GUARD