diff options
Diffstat (limited to 'world/map/conf/magic.conf.template')
| -rw-r--r-- | world/map/conf/magic.conf.template | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template index cf3094c7..eb4f590d 100644 --- a/world/map/conf/magic.conf.template +++ b/world/map/conf/magic.conf.template @@ -568,6 +568,7 @@ SPELL lay-on-hands (target : STRING) : "#L10" = && (rdistance(location(caster), location(pc(target))) < 2 + (12 * sqrt(spellpower) + spellpower) / 100) && not (running_status_update(pc(target), SC_HALT_REGENERATE)) + && not (is_equipped(pc(target), "MagicGMTopHat")) )) => EFFECT CALL adjust_spellpower(school); IF (not (target)) THEN ABORT; @@ -715,6 +716,7 @@ SPELL protect (target : PC) : "#N11" = IN (MANA 14, CASTTIME 1500, REQUIRE skill(caster, MAGIC) > level, REQUIRE skill(caster, school) > level, + REQUIRE not(is_equipped(pc(target), "MagicGMTopHat")), (REQUIRE skill(caster, school) > 3 OR COMPONENTS ["HardSpike"]), REQUIRE rdistance(location(target), location(caster)) < 2 + spellpower / 30) => EFFECT CALL adjust_spellpower(school); @@ -814,7 +816,7 @@ SPELL shear : "#N14" = place = random_location(rbox(location(target), 1)); IF running_status_update(target, SC_SHEARED) THEN ABORT; - status_change(target, SC_SHEARED, 1, 1, 1, 1, 600000); # 10 minutes + status_change(target, SC_SHEARED, 0, 0, 0, 0, 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); @@ -836,6 +838,7 @@ SPELL barrier (target : PC) : "#A10" = IN (MANA 16, CASTTIME 1000, REQUIRE skill(caster, MAGIC) > level, REQUIRE skill(caster, school) > level, + REQUIRE not(is_equipped(pc(target), "MagicGMTopHat")), (REQUIRE skill(caster, school) > 3 OR COMPONENTS ["SmallMushroom"]), REQUIRE rdistance(location(target), location(caster)) < 2 + spellpower / 30) => EFFECT CALL adjust_spellpower(school); @@ -1718,3 +1721,12 @@ NONMAGIC SPELL illia0 : "#catalazuli" = REQUIRE ((rdistance(location(caster), lo => EFFECT { callfunc "StartChannelling"; }; + +#-------------------------------------------------------------------------------- +# Kill the GM event spell +#-------------------------------------------------------------------------------- + +NONMAGIC SPELL killgm0 : "#pullrabbit" = REQUIRE (is_equipped(caster, "MagicGMTopHat")) + => EFFECT { + callfunc "ActivateMagicGMTophat"; + }; |