summaryrefslogtreecommitdiff
path: root/world/map/conf
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/conf')
-rw-r--r--world/map/conf/magic-anchors.sex18
-rw-r--r--world/map/conf/magic-level2.sex4
-rw-r--r--world/map/conf/magic-misc.sex4
-rw-r--r--world/map/conf/magic-procedures.sex8
4 files changed, 17 insertions, 17 deletions
diff --git a/world/map/conf/magic-anchors.sex b/world/map/conf/magic-anchors.sex
index 7d7dd340..40bd7de5 100644
--- a/world/map/conf/magic-anchors.sex
+++ b/world/map/conf/magic-anchors.sex
@@ -3,54 +3,54 @@
"--------------------------------------------------------------------------------"
(TELEPORT-ANCHOR tulimshar "tulimshar"
(@+
- (@ "001-1.gat" 43 66)
+ (@ "001-1" 43 66)
3
3))
(TELEPORT-ANCHOR hurnscald "hurnscald"
(@+
- (@ "009-1.gat" 55 37)
+ (@ "009-1" 55 37)
3
3))
(TELEPORT-ANCHOR nivalis "nivalis"
(@+
- (@ "020-1.gat" 75 63)
+ (@ "020-1" 75 63)
19
12))
(TELEPORT-ANCHOR wizardhut "##00"
(@+
- (@ "013-1.gat" 41 92)
+ (@ "013-1" 41 92)
3
3))
(TELEPORT-ANCHOR pachua "##01"
(@+
- (@ "006-1.gat" 22 101)
+ (@ "006-1" 22 101)
3
3))
(TELEPORT-ANCHOR desert "##02"
(@+
- (@ "005-1.gat" 160 64)
+ (@ "005-1" 160 64)
5
5))
(TELEPORT-ANCHOR forest "##03"
(@+
- (@ "015-1.gat" 35 35)
+ (@ "015-1" 35 35)
40
40))
(TELEPORT-ANCHOR snakecave "##04"
(@+
- (@ "011-4.gat" 50 75)
+ (@ "011-4" 50 75)
3
3))
(TELEPORT-ANCHOR dimondscove "##05"
(@+
- (@ "010-2.gat" 23 79)
+ (@ "010-2" 23 79)
3
3))
diff --git a/world/map/conf/magic-level2.sex b/world/map/conf/magic-level2.sex
index 8d905209..70a37163 100644
--- a/world/map/conf/magic-level2.sex
+++ b/world/map/conf/magic-level2.sex
@@ -226,7 +226,7 @@
(not
(is_in (location (pc target))
(@+
- (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
+ (@ "009-7" (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
@@ -919,7 +919,7 @@
(IF (is_in
(location caster)
(@+
- (@ "011-1.gat" 94 38)
+ (@ "011-1" 94 38)
9
7))
(SCRIPT "{
diff --git a/world/map/conf/magic-misc.sex b/world/map/conf/magic-misc.sex
index faec0acb..2e4942b7 100644
--- a/world/map/conf/magic-misc.sex
+++ b/world/map/conf/magic-misc.sex
@@ -72,13 +72,13 @@
(is_in
(location caster)
(@+
- (@ "014-1.gat" 28 39)
+ (@ "014-1" 28 39)
8
6))
(is_in
(location caster)
(@+
- (@ "001-2.gat" 21 27)
+ (@ "001-2" 21 27)
4
4)))))
(EFFECT
diff --git a/world/map/conf/magic-procedures.sex b/world/map/conf/magic-procedures.sex
index e510ec3f..6157765d 100644
--- a/world/map/conf/magic-procedures.sex
+++ b/world/map/conf/magic-procedures.sex
@@ -284,7 +284,7 @@
(IF (&&
(is_in (location caster)
(@+
- (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
+ (@ "009-7" (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)))
(||
@@ -297,7 +297,7 @@
(not
(is_in (location caster)
(@+
- (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
+ (@ "009-7" (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)))))
(ABORT)))
@@ -306,7 +306,7 @@
(!= (pc target) caster)
(is_in (location (pc target))
(@+
- (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1"))
+ (@ "009-7" (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))))
(ABORT))))
@@ -320,7 +320,7 @@
(rbox location (if_then_else
(is_in (location caster)
(@+
- (@ "009-7.gat" (- (script_int caster "$@fightclub_x1") 2) (- (script_int caster "$@fightclub_y1") 2))
+ (@ "009-7" (- (script_int caster "$@fightclub_x1") 2) (- (script_int caster "$@fightclub_y1") 2))
(+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 5)
(+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 5))) 1 2))
caster