--- deliantra/maps/pup_land/terminal.map	2007/04/14 08:39:27	1.6
+++ deliantra/maps/pup_land/terminal.map	2007/10/18 23:53:31	1.7
@@ -144,9 +144,7 @@
 end
 arch dragon_exit
 name To Lone Town
-slaying lone_town/town
-hp 21
-sp 11
+slaying *pup_land_lone_town_town+21+11
 x 1
 y 8
 end
@@ -249,6 +247,11 @@
 y 8
 move_block -all
 end
+arch tag
+x 2
+y 9
+tag pup_land_terminal+2+9
+end
 arch cobblestones2
 x 2
 y 9
@@ -915,9 +918,7 @@
 y 7
 end
 arch palace
-slaying hall_of_fame
-hp 6
-sp 26
+slaying *pup_land_hall_of_fame+6+26
 x 8
 y 7
 end
@@ -1004,9 +1005,7 @@
 end
 arch dragon_exit
 name To Scorn
-slaying /world/world_104_115
-hp 43
-sp 24
+slaying *pup_land_terminal_exit+9+1
 x 9
 y 1
 end
@@ -1111,9 +1110,7 @@
 end
 arch dragon_exit
 name To Red Island
-slaying rainbow/station
-hp 7
-sp 3
+slaying *pup_land_rainbow_station+7+3
 x 9
 y 15
 end
@@ -1132,6 +1129,10 @@
 x 9
 y 17
 end
+arch tag
+x 10
+tag pup_land_terminal_entrance
+end
 arch biglake_center
 name sky
 x 10
@@ -1145,6 +1146,11 @@
 y 1
 move_block -all
 end
+arch tag
+x 10
+y 2
+tag pup_land_terminal+10+2
+end
 arch cobblestones2
 x 10
 y 2
@@ -1169,6 +1175,11 @@
 x 10
 y 7
 end
+arch tag
+x 10
+y 8
+tag pup_land_terminal+10+8
+end
 arch cobblestones2
 x 10
 y 8
@@ -1177,6 +1188,11 @@
 x 10
 y 9
 end
+arch tag
+x 10
+y 10
+tag pup_land_terminal+10+10
+end
 arch cobblestones2
 x 10
 y 10
@@ -1201,6 +1217,11 @@
 x 10
 y 15
 end
+arch tag
+x 10
+y 16
+tag pup_land_terminal+10+16
+end
 arch cobblestones2
 x 10
 y 16
@@ -1221,6 +1242,11 @@
 arch dungeon_magic
 x 11
 end
+arch tag
+x 11
+y 1
+tag pup_land_terminal+11+1
+end
 arch biglake_center
 name sky
 x 11
@@ -1517,11 +1543,10 @@
 y 11
 end
 arch stair_3_down
-slaying terminal_u1
-hp 13
-sp 10
+slaying *pup_land_terminal_u1+13+10
 x 13
 y 11
+tag pup_land_terminal+13+11
 end
 arch grass
 x 13
@@ -2030,9 +2055,7 @@
 move_block -all
 end
 arch dragon_exit
-slaying /pup_land/nurnberg/city
-hp 26
-sp 25
+slaying *pup_land_nurnberg_city+26+25
 x 17
 y 8
 end