From 32d6b24210164c8efd1fdb89a228d88b03e50914 Mon Sep 17 00:00:00 2001 From: Vincent Petithory Date: Thu, 21 Feb 2013 18:35:41 +0100 Subject: Magic GM Top Hat: fix invalid is_equipped() calls --- world/map/conf/magic.conf.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template index c9e0de6c..3835dbe5 100644 --- a/world/map/conf/magic.conf.template +++ b/world/map/conf/magic.conf.template @@ -568,7 +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")) + && not (is_equipped(pc(target), "MagicGMTopHat")) )) => EFFECT CALL adjust_spellpower(school); IF (not (target)) THEN ABORT; @@ -716,7 +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 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); @@ -838,7 +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 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); -- cgit v1.2.3-60-g2f50