summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-11-15 08:38:58 -0600
committerWushin <pasekei@gmail.com>2014-11-15 08:38:58 -0600
commit3886bc3f83cdc3ab31e4264553da8ddfa32d9320 (patch)
tree0c2f475ac33b3bdf9246d68d368080270ed197c2 /world/map
parent725904e2e20a9d9f6d14a9f24811315d58ef95b7 (diff)
parent82a4b191a1077e0b1228c2d85fff54f6e9d37b03 (diff)
downloadserverdata-3886bc3f83cdc3ab31e4264553da8ddfa32d9320.tar.gz
serverdata-3886bc3f83cdc3ab31e4264553da8ddfa32d9320.tar.bz2
serverdata-3886bc3f83cdc3ab31e4264553da8ddfa32d9320.tar.xz
serverdata-3886bc3f83cdc3ab31e4264553da8ddfa32d9320.zip
Merge pull request #211 from mekolat/inma-mouboo
make inma work with non-PC target
Diffstat (limited to 'world/map')
-rw-r--r--world/map/conf/magic-level2.sex14
1 files changed, 8 insertions, 6 deletions
diff --git a/world/map/conf/magic-level2.sex b/world/map/conf/magic-level2.sex
index c1e61bf5..8d905209 100644
--- a/world/map/conf/magic-level2.sex
+++ b/world/map/conf/magic-level2.sex
@@ -221,12 +221,14 @@
(skill caster school)
level))
(REQUIRE
- (not
- (is_in (location (pc target))
- (@+
- (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
- (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1)
- (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1)))))
+ (== (if_then_else (failed (pc target))
+ 1
+ (not
+ (is_in (location (pc target))
+ (@+
+ (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
+ (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1)
+ (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1))))) 1))
(REQUIRE
(if_then_else
(failed