summaryrefslogtreecommitdiff
path: root/world/map/conf
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/conf')
-rw-r--r--world/map/conf/magic.conf.template12
1 files changed, 12 insertions, 0 deletions
diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template
index cf3094c7..c9e0de6c 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(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(target, "MagicGMTopHat")),
(REQUIRE skill(caster, school) > 3 OR COMPONENTS ["HardSpike"]),
REQUIRE rdistance(location(target), location(caster)) < 2 + spellpower / 30)
=> EFFECT CALL adjust_spellpower(school);
@@ -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(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";
+ };