summaryrefslogtreecommitdiff
path: root/conf/magic.conf.template
diff options
context:
space:
mode:
Diffstat (limited to 'conf/magic.conf.template')
-rw-r--r--conf/magic.conf.template4
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;)