From 00aa5d746fe7ce24b5bb491087cef53ac96b0d38 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 3 Jun 2009 09:20:13 -0600
Subject: Adjust herb spawn spells into a plant spawn spell

Still needs work, like better strings for identifying which plant to
spawn.
---
 conf/magic.conf.template | 67 +++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

(limited to 'conf')

diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index 199fa975..863d3c46 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -358,49 +358,36 @@ SPELL aggravate : "#N00" =
 			    THEN (CALL sfx_generic(target);
                                   aggravate(target, 0, caster);)
 
-SPELL grow-mauve : "#N01" =
+SPELL grow-plant (name : STRING) : "#N01" =
       LET level = 0
           school = NATURE
       IN (MANA 4, CASTTIME 2000,
-          REQUIRE skill(caster, MAGIC) > level,
-          COMPONENTS ["MauveHerb", "Root"])
-          => EFFECT CALL adjust_spellpower(school);
-                    CALL default_effect();
-                    CALL gain_xp(1);
-                    spawn(rbox(location, 2), caster, 1029, 1, if_then_else(skill(caster, NATURE) < 3, 1, if_then_else(skill(caster, NATURE) < 5, 2, 3)), 10000);
-
-SPELL grow-alizarin : "#N02" =
-      LET level = 0
-          school = NATURE
-      IN (MANA 4, CASTTIME 2000,
-          REQUIRE skill(caster, MAGIC) > level,
-          COMPONENTS ["AlizarinHerb", "Root"])
-          => EFFECT CALL adjust_spellpower(school);
-                    CALL default_effect();
-                    CALL gain_xp(1);
-                    spawn(rbox(location, 2), caster, 1032, 1, if_then_else(skill(caster, NATURE) < 3, 1, if_then_else(skill(caster, NATURE) < 5, 2, 3)), 10000);
-
-SPELL grow-gamboge : "#N03" =
-      LET level = 0
-          school = NATURE
-      IN (MANA 4, CASTTIME 2000,
-          REQUIRE skill(caster, MAGIC) > level,
-          COMPONENTS ["GambogeHerb", "Root"])
-          => EFFECT CALL adjust_spellpower(school);
-                    CALL default_effect();
-                    CALL gain_xp(1);
-                    spawn(rbox(location, 2), caster, 1031, 1, if_then_else(skill(caster, NATURE) < 3, 1, if_then_else(skill(caster, NATURE) < 5, 2, 3)), 10000);
-
-SPELL grow-cobalt : "#N04" =
-      LET level = 0
-          school = NATURE
-      IN (MANA 4, CASTTIME 2000,
-          REQUIRE skill(caster, MAGIC) > level,
-          COMPONENTS ["CobaltHerb", "Root"])
-          => EFFECT CALL adjust_spellpower(school);
-                    CALL default_effect();
-                    CALL gain_xp(1);
-                    spawn(rbox(location, 2), caster, 1030, 1, if_then_else(skill(caster, NATURE) < 3, 1, if_then_else(skill(caster, NATURE) < 5, 2, 3)), 10000);
+          REQUIRE skill(caster, MAGIC) > level)
+          => (  (REQUIRE name = "mauve",
+                COMPONENTS ["MauveHerb", "Root"]) =>
+                            EFFECT CALL adjust_spellpower(school);
+                                   CALL default_effect();
+                                   CALL gain_xp(1);
+                                   spawn(rbox(location, 2), caster, 1029, 1, skill(caster, school) / 2 + 1, 10000);
+             |  (REQUIRE name = "alizarin",
+                COMPONENTS ["AlizarinHerb", "Root"]) =>
+                            EFFECT CALL adjust_spellpower(school);
+                                   CALL default_effect();
+                                   CALL gain_xp(1);
+                                   spawn(rbox(location, 2), caster, 1032, 1, skill(caster, school) / 2 + 1, 10000);
+             |  (REQUIRE name = "gamboge",
+                COMPONENTS ["GambogeHerb", "Root"]) =>
+                            EFFECT CALL adjust_spellpower(school);
+                                   CALL default_effect();
+                                   CALL gain_xp(1);
+                                   spawn(rbox(location, 2), caster, 1031, 1, skill(caster, school) / 2 + 1, 10000);
+             |  (REQUIRE name = "cobalt",
+                COMPONENTS ["CobaltHerb", "Root"]) =>
+                            EFFECT CALL adjust_spellpower(school);
+                                   CALL default_effect();
+                                   CALL gain_xp(1);
+                                   spawn(rbox(location, 2), caster, 1030, 1, skill(caster, school) / 2 + 1, 10000);
+             )
 
 
 LOCAL SPELL summon-maggots : "#A00" =
-- 
cgit v1.2.3-70-g09d2