Merge branch 'master' of git@gitorious.org:tmw-eathena-data/testing

2 files changed, 13 insertions, 9 deletions

diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index b11980e3..9d13492d 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -306,7 +306,8 @@ SPELL grow-mauve : "#N01" =
           COMPONENTS ["MauveHerb"])
           => EFFECT CALL adjust_spellpower(school);
                     CALL default_effect();
-                    spawn(rbox(location, 2), caster, 1029, 1, if_then_else(skill(caster, NATURE) >= 3, 3, 2), 10000);
+                    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
@@ -316,7 +317,8 @@ SPELL grow-alizarin : "#N02" =
           COMPONENTS ["AlizarinHerb"])
           => EFFECT CALL adjust_spellpower(school);
                     CALL default_effect();
-                    spawn(rbox(location, 2), caster, 1032, 1, if_then_else(skill(caster, NATURE) >= 3, 3, 2), 10000);
+                    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
@@ -326,7 +328,8 @@ SPELL grow-gamboge : "#N03" =
           COMPONENTS ["GambogeHerb"])
           => EFFECT CALL adjust_spellpower(school);
                     CALL default_effect();
-                    spawn(rbox(location, 2), caster, 1031, 1, if_then_else(skill(caster, NATURE) >= 3, 3, 2), 10000);
+                    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
@@ -336,7 +339,8 @@ SPELL grow-cobalt : "#N04" =
           COMPONENTS ["CobaltHerb"])
           => EFFECT CALL adjust_spellpower(school);
                     CALL default_effect();
-                    spawn(rbox(location, 2), caster, 1030, 1, if_then_else(skill(caster, NATURE) >= 3, 3, 2), 10000);
+                    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);
 
 
 LOCAL SPELL summon-maggots : "#A00" =
diff --git a/db/mob_db.txt b/db/mob_db.txt
index a542b43e..243e3015 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -26,10 +26,10 @@
 1026,MountainSnake,Mountain Snake,130,900,0,0,100,1,80,125,4,6,20,40,10,10,35,45,1,1,1,0,20,133,1000,1500,672,480,532,20,641,150,715,400,715,400,711,500,0,0,0,0,0,0,0,0,0,0,,,,,,,1,30
 1027,EasterFluffy,Easter Fluffy,30,500,0,0,3,1,10,12,0,5,1,1,1,0,20,25,1,1,1,3,20,129,800,1872,672,480,1208,2000,1209,2000,1210,2000,1211,1000,1212,1000,1213,200,0,0,0,0,0,0,0,0,,,,,,,1,40
 1028,Mouboo,Mouboo,85,1200,0,0,40,2,30,75,65,5,15,5,15,0,40,10,2,2,1,3,20,129,600,1872,672,480,660,200,660,100,541,750,660,10,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,30
-1029,MauvePlant,Mauve Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,680,3000,680,3000,680,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,60
-1030,CobaltPlant,Cobalt Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,681,3000,681,3000,681,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
-1031,GambogePlant,Gamboge Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,682,3000,682,3000,682,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
-1032,AlizarinPlant,Alizarin Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,683,3000,683,3000,683,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+1029,MauvePlant,Mauve Plant,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,680,3000,680,3000,680,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,60
+1030,CobaltPlant,Cobalt Plant,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,681,3000,681,3000,681,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+1031,GambogePlant,Gamboge Plant,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,682,3000,682,3000,682,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+1032,AlizarinPlant,Alizarin Plant,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,683,3000,683,3000,683,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
 1033,SeaSlime,Sea Slime,70,600,0,0,9,1,30,50,3,7,1,25,1,0,30,30,1,1,1,0,41,131,1500,1872,672,480,535,800,657,800,518,500,510,1000,700,100,1199,5000,568,100,541,50,0,0,0,0,,,,,,,0,0
 1034,GrassSnake,Grass Snake,140,1000,0,0,100,1,80,120,2,10,20,40,10,10,40,50,1,1,1,0,20,133,500,1100,672,480,716,400,716,400,712,500,676,500,660,350,0,0,0,0,0,0,0,0,0,0,,,,,,,1,40
-1035,Silkworm,Silkworm,20,1,0,0,1,1,0,0,2,10,20,11,10,10,40,10,1,1,1,0,20,129,1300,1100,672,480,718,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40
+1035,Silkworm,Silkworm,20,1,0,0,1,1,0,0,2,0,0,0,0,0,0,0,1,1,1,0,20,129,1300,1100,672,480,718,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40