summaryrefslogtreecommitdiff
path: root/conf/magic.conf.template
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-05-30 12:18:30 +0000
committerFate <fate-tmw@googlemail.com>2009-05-30 12:18:30 +0000
commitf17c823d6f91ae535ebcadd8b5b369efea09b772 (patch)
treede58cdc249b70e95790f8c4eb48668d990f39e90 /conf/magic.conf.template
parentba376b018e2a05412ae037d4dc976892e61cd088 (diff)
downloadserverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.tar.gz
serverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.tar.bz2
serverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.tar.xz
serverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.zip
Misc. fixes to magic, mostly suggested/pointed out by Kess
Diffstat (limited to 'conf/magic.conf.template')
-rw-r--r--conf/magic.conf.template6
1 files changed, 4 insertions, 2 deletions
diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index 8c5ac05d..fd04a449 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -771,6 +771,7 @@ SPELL shear : "#N14" =
THEN ABORT;
status_change(target, SC_SHEARED, 1, 1, 1, 1, 600000); # 10 minutes
CALL shear-drop("Fluffy", "Fluffy", "WhiteFur", 300);
+ CALL shear-drop("EasterFluffy", "Easter Fluffy", "WhiteFur", 300);
CALL shear-drop("SpikyMushroom", "Spiky Mushroom", "HardSpike", 250);
CALL shear-drop("Mouboo", "Mouboo", "CottonCloth", 175);
CALL shear-drop("Cobalt", "CobaltPlant", "CobaltHerb", 700);
@@ -799,7 +800,7 @@ SPELL barrier (target : PC) : "#A10" =
status_change(target, SC_MBARRIER, 20 + max(30, spellpower / 8), 0, 0, 0, 2000 + (spellpower * 200));
message (target, "You are surrounded by a magical barrier.");
CALL gain_xp(3);
- ATEND message (target, "Your magical barrier disspiates.");
+ ATEND message (target, "Your magical barrier dissipates.");
sfx(target, SFX_UNBARRIER, 0);
@@ -986,7 +987,8 @@ SPELL summon-partner : "#A23" =
IN (MANA 30, CASTTIME 2000,
REQUIRE skill(caster, MAGIC) > level,
REQUIRE skill(caster, school) > level,
- REQUIRE is_married(caster))
+ REQUIRE is_married(caster),
+ REQUIRE is_equipped(caster, "WeddingRing"))
=> EFFECT CALL adjust_spellpower(school);
CALL default_effect();
IF (failed (partner (caster)))