diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-23 17:21:29 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-23 17:21:29 +0100 |
| commit | 63f34d9fc5c4a4f527bc55e37fd78124401033e2 (patch) | |
| tree | dc0b572912370ba0c7c3ffd372b345e6ea95d62d /conf/magic.conf | |
| parent | 781f70b09f66f177cd737e8b98c052623a5da65c (diff) | |
| parent | 175d674267356b7d6a915a9912698a9c922f2b17 (diff) | |
| download | serverdata-63f34d9fc5c4a4f527bc55e37fd78124401033e2.tar.gz serverdata-63f34d9fc5c4a4f527bc55e37fd78124401033e2.tar.bz2 serverdata-63f34d9fc5c4a4f527bc55e37fd78124401033e2.tar.xz serverdata-63f34d9fc5c4a4f527bc55e37fd78124401033e2.zip | |
Merge commit 'map-renaming/master'
Diffstat (limited to 'conf/magic.conf')
| -rw-r--r-- | conf/magic.conf | 4 |
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; |