summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-11-22 01:15:00 -0700
committerFate <fate-tmw@googlemail.com>2008-11-22 01:15:00 -0700
commita9cd913e17616c0b47512a3d324ca9d83c47522a (patch)
tree133c027424db3d1480f5fd38dec83b174928c233 /conf
parentd9ba7b0a71d0dfd2c7c600183b5f18ea4ea6a6ef (diff)
downloadserverdata-a9cd913e17616c0b47512a3d324ca9d83c47522a.tar.gz
serverdata-a9cd913e17616c0b47512a3d324ca9d83c47522a.tar.bz2
serverdata-a9cd913e17616c0b47512a3d324ca9d83c47522a.tar.xz
serverdata-a9cd913e17616c0b47512a3d324ca9d83c47522a.zip
Updated `marry' spell to new map location, made it NONMAGIC (cf. server update)
Diffstat (limited to 'conf')
-rw-r--r--conf/magic.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/magic.conf b/conf/magic.conf
index 7d3918b5..bfe56741 100644
--- a/conf/magic.conf
+++ b/conf/magic.conf
@@ -492,8 +492,8 @@ SPELL shroud : "#aw" =
CONST MIN_MARRY_LEVEL = 32;
-SILENT SPELL marriage (target : PC) : "marry" =
- (REQUIRE is_in(location(caster), @("new_29-1.gat", 28,39) @+ (8, 6)))=>
+NONMAGIC SILENT SPELL marriage (target : PC) : "marry" =
+ (REQUIRE is_in(location(caster), @("014-1.gat", 28,39) @+ (8, 6)))=>
EFFECT IF target == caster # no valid target or tried to marry self?
THEN ABORT;