summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authortux9th <mr.x@aon.at>2013-09-02 11:24:29 +0200
committertux9th <mr.x@aon.at>2013-09-14 17:15:46 +0200
commitc440d5908d0491f85dca43cd40bb667e50315016 (patch)
treeb3b388109c70de8d179397d223c7044ba1153675 /world
parentfea1c93cbb17fd8b55a00bc033709018fdfd1120 (diff)
downloadserverdata-c440d5908d0491f85dca43cd40bb667e50315016.tar.gz
serverdata-c440d5908d0491f85dca43cd40bb667e50315016.tar.bz2
serverdata-c440d5908d0491f85dca43cd40bb667e50315016.tar.xz
serverdata-c440d5908d0491f85dca43cd40bb667e50315016.zip
Astral Magic:
* Adding summon mouboo spell. * Adding summon pinkie spell. * Fluffies are from now on also slaves and attack. * Adding Pinkie to shear-drop list. * Killing Pinkies will now make Sagatha unhappy, shearing them will make her happy.
Diffstat (limited to 'world')
-rw-r--r--world/map/conf/magic.conf.template28
-rw-r--r--world/map/npc/functions/mob_points.txt4
2 files changed, 30 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
diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt
index e4deec13..0bdcec06 100644
--- a/world/map/npc/functions/mob_points.txt
+++ b/world/map/npc/functions/mob_points.txt
@@ -127,6 +127,10 @@ function|script|MobPoints|,
// Attitude adjustment for the witch (can we refactor this to another function? Not sure about max. recursion depth)
set @value, 0;
+// Pinkie
+ if (@mobID == 1018)
+ set @value, 3;
+
// Fluffy
if (@mobID == 1020)
set @value, 3;