diff options
| author | tux9th <mr.x@aon.at> | 2013-09-15 00:02:28 +0200 |
|---|---|---|
| committer | tux9th <mr.x@aon.at> | 2013-09-15 00:02:37 +0200 |
| commit | 1f30542a2d0a10e1834bac8d83fb210afc3d618f (patch) | |
| tree | 64eda322c7b71ba3c52ba1a09466781d663f3391 /world/map/conf | |
| parent | 4d346e92976bec82cfeb1f09fcb662f0f8a9e5a9 (diff) | |
| parent | d60cec605098461f04af621dea21c41b7c473241 (diff) | |
| download | serverdata-1f30542a2d0a10e1834bac8d83fb210afc3d618f.tar.gz serverdata-1f30542a2d0a10e1834bac8d83fb210afc3d618f.tar.bz2 serverdata-1f30542a2d0a10e1834bac8d83fb210afc3d618f.tar.xz serverdata-1f30542a2d0a10e1834bac8d83fb210afc3d618f.zip | |
Merge remote-tracking branch 'origin/unsupported'
Diffstat (limited to 'world/map/conf')
| -rw-r--r-- | world/map/conf/magic.conf.template | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template index 4933da9d..12e27946 100644 --- a/world/map/conf/magic.conf.template +++ b/world/map/conf/magic.conf.template @@ -966,7 +966,8 @@ SPELL shear : "#N14" = CALL shear-drop("Gamboge", "GambogePlant", "GambogeHerb", 700); CALL shear-drop("Mauve", "MauvePlant", "MauveHerb", 700); CALL shear-drop("SilkWorm", "Silkworm", "SilkCocoon", 300); - IF ((name = "Fluffy" || name = "Mouboo") && random(2)) + CALL shear-drop("Pinkie", "Pinkie", "PinkAntenna", 180); + IF ((name = "Fluffy" || name = "Mouboo" || name = "Pinkie") && random(2)) THEN { set @value, 1; callfunc "QuestSagathaHappy"; }; ) @@ -1014,8 +1015,31 @@ LOCAL SPELL summon-fluffies : "#A12" = => EFFECT CALL adjust_spellpower(school); CALL default_effect(); CALL gain_xp(1, 27); - CALL summon_spell(1020, 1 + spellpower / 170 + spellpower / 430, 5000 - (spellpower * 8), spellpower * 350, 3); + CALL summon_spell(1020, 1 + spellpower / 170 + spellpower / 430, 5000 - (spellpower * 8), spellpower * 350, 2); +LOCAL SPELL summon-mouboo : "#A14" = + LET level = 1 + school = ASTRAL + IN (MANA 35, CASTTIME 20000, + REQUIRE skill(caster, MAGIC) > level, + REQUIRE skill(caster, school) > level, + COMPONENTS ["MoubooFigurine", "Root"]) + => EFFECT CALL adjust_spellpower(school); + CALL default_effect(); + CALL gain_xp(2, 37); + CALL summon_dark_spell(1028, 1 + spellpower / 270 , 4000 - (spellpower * 9), spellpower * 100, 2); + +LOCAL SPELL summon-pinkie : "#A15" = + LET level = 1 + school = ASTRAL + IN (MANA 35, CASTTIME 20000, + REQUIRE skill(caster, MAGIC) > level, + REQUIRE skill(caster, school) > level, + COMPONENTS ["PinkAntenna", "Root"]) + => EFFECT CALL adjust_spellpower(school); + CALL default_effect(); + CALL gain_xp(2, 38); + CALL summon_dark_spell(1018, 1 + spellpower / 120, 5000 - (spellpower * 9), spellpower * 150, 2); SPELL detect-players : "#G10" = LET level = 1 |