diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-08-20 20:30:29 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-08-20 20:30:29 -0600 |
| commit | 21b1a5c05cad84cb54d61ebf9ec5f23cfead1ea1 (patch) | |
| tree | 507c3e82640bc9193e0746966fba70fbe65586ba /conf | |
| parent | 0465d6c53f3b068a48d34177bf211cb8fcc637c2 (diff) | |
| download | serverdata-21b1a5c05cad84cb54d61ebf9ec5f23cfead1ea1.tar.gz serverdata-21b1a5c05cad84cb54d61ebf9ec5f23cfead1ea1.tar.bz2 serverdata-21b1a5c05cad84cb54d61ebf9ec5f23cfead1ea1.tar.xz serverdata-21b1a5c05cad84cb54d61ebf9ec5f23cfead1ea1.zip | |
Add another wedding location
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/magic.conf.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/magic.conf.template b/conf/magic.conf.template index 707a771c..5e243f23 100644 --- a/conf/magic.conf.template +++ b/conf/magic.conf.template @@ -1187,7 +1187,7 @@ SPELL debug-reset : "debug-reset" = CONST MIN_MARRY_LEVEL = 32; NONMAGIC SILENT SPELL marriage (target : PC) : "marry" = - (REQUIRE is_in(location(caster), @("014-1.gat", 28,39) @+ (8, 6)))=> + (REQUIRE (is_in(location(caster), @("014-1.gat", 28,39) @+ (8, 6)) || is_in(location(caster), @("021-2.gat", 20,25) @+ (4, 4)) ))=> EFFECT IF target == caster # no valid target or tried to marry self? THEN ABORT; @@ -1207,7 +1207,7 @@ NONMAGIC SILENT SPELL marriage (target : PC) : "marry" = THEN (message(caster, name_of(target) + " is already married."); ABORT;); IF distance(location(caster), location(target)) <> 1 - THEN (message(caster, "You have to stand next to each other."); ABORT;); + THEN (message(caster, "You need to stand next to each other."); ABORT;); IF (count_item(caster, "WeddingRing") == 0 || count_item(target, "WeddingRing") == 0) THEN (message(caster, "You must both be wearing your wedding rings!"); ABORT;) |