From 066239a3a83276b43f5bcd155780a6c10061ea57 Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Sat, 12 May 2007 20:47:58 +0000 Subject: [PATCH] Remove obsolete fields. Other changes due to editor. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6239 282e977c-c81d-0410-88c4-b93c2d0d6712 --- pup_land/barrier | 34 ++----- pup_land/hq | 202 +++++++++++++++++++++--------------------- pup_land/hq_ud | 37 ++++++-- pup_land/port_e_house | 21 ++--- pup_land/port_w | 41 ++++----- pup_land/world | 155 +++++++++++++++----------------- 6 files changed, 238 insertions(+), 252 deletions(-) diff --git a/pup_land/barrier b/pup_land/barrier index f3baede12..4b06090e0 100644 --- a/pup_land/barrier +++ b/pup_land/barrier @@ -1,12 +1,13 @@ arch map -region pupland name customhouse +region pupland +width 34 +height 16 msg Creator: Gnat the Gnu Email: gnu@foo.bar Date: Sun Jan 28 03:18:06 1996 endmsg -x 34 end arch cobblestones2 end @@ -370,8 +371,8 @@ hp 100 x 4 y 3 type 0 -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -439,14 +440,14 @@ x 4 y 14 type 0 carrying 2 -monster 1 move_type walk +monster 1 unaggressive 1 arch card name shredded Passport msg - This passport is *not* usable - anymore! +This passport is *not* usable +anymore! endmsg end end @@ -580,8 +581,8 @@ hp 100 x 6 y 2 type 0 -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -799,8 +800,8 @@ hp 100 x 8 y 8 type 0 -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -1299,7 +1300,6 @@ arch check_inv slaying regular_army x 13 y 6 -protected 1 connected 1 end arch cobblestones2 @@ -1310,7 +1310,6 @@ arch check_inv slaying regular_army x 13 y 7 -protected 1 connected 1 end arch cobblestones2 @@ -1321,7 +1320,6 @@ arch check_inv slaying regular_army x 13 y 8 -protected 1 connected 1 end arch cobblestones2 @@ -1398,7 +1396,6 @@ The huge gate is set into motion... endmsg x 14 y 4 -protected 2 connected 2 end arch cobblestones2 @@ -1442,7 +1439,6 @@ arch grate_closed_2 x 14 y 6 speed 0.500000 -protected 2 connected 2 end arch dungeon_magic @@ -1457,7 +1453,6 @@ arch grate_closed_2 x 14 y 7 speed 0.500000 -protected 2 connected 2 end arch dungeon_magic @@ -1472,7 +1467,6 @@ arch grate_closed_2 x 14 y 8 speed 0.500000 -protected 2 connected 2 end arch dungeon_magic @@ -1494,7 +1488,6 @@ The guards examine your Passport. endmsg x 14 y 10 -protected 3 connected 3 end arch cobblestones2 @@ -1610,7 +1603,6 @@ arch check_inv slaying regular_army x 15 y 6 -protected 1 connected 1 end arch cobblestones2 @@ -1621,7 +1613,6 @@ arch check_inv slaying regular_army x 15 y 7 -protected 1 connected 1 end arch cobblestones2 @@ -1632,7 +1623,6 @@ arch check_inv slaying regular_army x 15 y 8 -protected 1 connected 1 end arch cobblestones2 @@ -3193,7 +3183,6 @@ arch button_small name 2 - open gate x 33 y 1 -protected 2 weight 100000 connected 2 end @@ -3203,7 +3192,6 @@ dam 0 wc 0 x 33 y 1 -protected 1 connected 1 end arch igate_open_1 @@ -3211,7 +3199,6 @@ name 1 x 33 y 2 speed 0.500000 -protected 1 value 1 connected 1 end @@ -3264,7 +3251,6 @@ arch button_small name 3 x 33 y 13 -protected 3 weight 1000 connected 3 end @@ -3273,7 +3259,6 @@ name 1 x 33 y 13 speed 0.500000 -protected 1 connected 1 end arch block_door_open @@ -3281,7 +3266,6 @@ name 1 x 33 y 14 speed 0.500000 -protected 1 value 1 connected 1 end diff --git a/pup_land/hq b/pup_land/hq index 95839fbcb..01527097c 100644 --- a/pup_land/hq +++ b/pup_land/hq @@ -1,15 +1,15 @@ arch map -region pupland name hq +region pupland +width 20 +height 36 +enter_x 9 +enter_y 34 msg Creator: Gnat the Gnu Email: gnu@foo.bar Date: Wed Feb 14 21:25:41 1996 endmsg -hp 9 -sp 34 -x 20 -y 36 end arch pstone_1 end @@ -290,8 +290,8 @@ y 23 speed_left -1.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch pstone_1 @@ -757,7 +757,6 @@ arch gate_closed_2 x 4 y 5 speed 0.500000 -protected 2 connected 2 end arch cobblestones2 @@ -828,8 +827,8 @@ y 17 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -848,8 +847,8 @@ y 18 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -868,8 +867,8 @@ y 19 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -888,8 +887,8 @@ y 20 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -908,8 +907,8 @@ y 21 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -928,8 +927,8 @@ y 22 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -954,8 +953,8 @@ y 24 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -976,8 +975,8 @@ y 25 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -996,8 +995,8 @@ y 26 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1016,8 +1015,8 @@ y 27 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1036,8 +1035,8 @@ y 28 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1056,8 +1055,8 @@ y 29 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1143,8 +1142,8 @@ x 5 y 9 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -1304,7 +1303,6 @@ Click. endmsg x 6 y 5 -protected 2 connected 2 end arch thief @@ -1326,8 +1324,8 @@ x 6 y 5 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -1394,8 +1392,8 @@ y 17 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch pstone_1 @@ -1414,8 +1412,8 @@ y 18 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1434,8 +1432,8 @@ y 19 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1454,8 +1452,8 @@ y 20 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1474,8 +1472,8 @@ y 21 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1494,8 +1492,8 @@ y 22 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch medium_stones @@ -1520,8 +1518,8 @@ y 24 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1542,8 +1540,8 @@ y 25 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1562,8 +1560,8 @@ y 26 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1582,8 +1580,8 @@ y 27 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1602,8 +1600,8 @@ y 28 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1622,8 +1620,8 @@ y 29 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1960,8 +1958,8 @@ y 17 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -1980,8 +1978,8 @@ y 18 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2000,8 +1998,8 @@ y 19 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2020,8 +2018,8 @@ y 20 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2040,8 +2038,8 @@ y 21 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2060,8 +2058,8 @@ y 22 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2086,8 +2084,8 @@ y 24 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2108,8 +2106,8 @@ y 25 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2128,8 +2126,8 @@ y 26 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2148,8 +2146,8 @@ y 27 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2168,8 +2166,8 @@ y 28 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2188,8 +2186,8 @@ y 29 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -2252,18 +2250,18 @@ arch magic_mouth msg You hear voices from the other side of the wall... - "Voice A : They entered the castle of - Eureca. Damn it!! - Voice B : We must prevent them from - getting Eureca's treasure. - Voice C : ... I thought we should be - more concerned about - Eureca's safety... ??? - Voice A : What!? Do you think we are - a welfare-company, idiot?! - Forget Eureca, we need to - get the treasure. - Voice C : Forgive me, general... " +"Voice A : They entered the castle of +Eureca. Damn it!! +Voice B : We must prevent them from +getting Eureca's treasure. +Voice C : ... I thought we should be +more concerned about +Eureca's safety... ??? +Voice A : What!? Do you think we are +a welfare-company, idiot?! +Forget Eureca, we need to +get the treasure. +Voice C : Forgive me, general... " endmsg x 9 end @@ -2305,7 +2303,10 @@ ac -70 x 9 y 2 level 15 -immune 29 +resist_physical 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 carrying 100 is_animated 0 reflect_missile 1 @@ -2387,8 +2388,8 @@ x 9 y 8 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -2615,8 +2616,8 @@ level 0 type 0 material 0 randomitems none -alive 0 move_block 0 +alive 0 pass_thru 0 end arch pstone_1 @@ -2691,7 +2692,6 @@ arch grate_closed_1 x 10 y 31 speed 0.500000 -protected 1 connected 1 end arch magic_ear @@ -2701,7 +2701,6 @@ Click. endmsg x 10 y 32 -protected 1 connected 1 end arch dungeon_magic @@ -2724,7 +2723,6 @@ arch grate_open_1 x 10 y 33 speed 0.500000 -protected 1 value 1 connected 1 end @@ -3048,8 +3046,8 @@ y 17 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch small_stones @@ -3068,8 +3066,8 @@ y 18 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3088,8 +3086,8 @@ y 19 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3108,8 +3106,8 @@ y 20 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3128,8 +3126,8 @@ y 21 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3144,8 +3142,8 @@ y 22 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3170,8 +3168,8 @@ y 24 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3192,8 +3190,8 @@ y 25 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3208,8 +3206,8 @@ y 26 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3228,8 +3226,8 @@ y 27 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3248,8 +3246,8 @@ y 28 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3268,8 +3266,8 @@ y 29 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3415,8 +3413,8 @@ x 13 y 11 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -3636,8 +3634,8 @@ y 17 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch small_stones @@ -3656,8 +3654,8 @@ y 18 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3676,8 +3674,8 @@ y 19 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3696,8 +3694,8 @@ y 20 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3716,8 +3714,8 @@ y 21 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3732,8 +3730,8 @@ y 22 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3774,8 +3772,8 @@ y 24 speed_left -3.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3790,8 +3788,8 @@ y 25 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3806,8 +3804,8 @@ y 26 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3826,8 +3824,8 @@ y 27 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3846,8 +3844,8 @@ y 28 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -3866,8 +3864,8 @@ y 29 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch pstone_1 @@ -3940,8 +3938,8 @@ x 15 y 6 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch cobblestones2 @@ -4171,8 +4169,8 @@ y 17 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch pstone_1 @@ -4191,8 +4189,8 @@ y 18 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch pstone_1 @@ -4211,8 +4209,8 @@ y 19 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4231,8 +4229,8 @@ y 20 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4251,8 +4249,8 @@ y 21 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch small_stones @@ -4267,8 +4265,8 @@ y 22 speed_left -7.100000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4293,8 +4291,8 @@ y 24 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4315,8 +4313,8 @@ y 25 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4331,8 +4329,8 @@ y 26 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4351,8 +4349,8 @@ y 27 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4371,8 +4369,8 @@ y 28 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch grass @@ -4391,8 +4389,8 @@ y 29 speed_left -7.600000 type 0 randomitems none -monster 1 move_type walk +monster 1 friendly 1 end arch pstone_1 diff --git a/pup_land/hq_ud b/pup_land/hq_ud index b9c313134..454c3b455 100644 --- a/pup_land/hq_ud +++ b/pup_land/hq_ud @@ -1,12 +1,13 @@ arch map -region pupland name hq_ud +region pupland +width 16 +height 25 msg Creator: Gnat the Gnu Email: gnu@foo.bar Date: Thu Feb 15 01:00:24 1996 endmsg -y 25 end arch marble end @@ -152,9 +153,15 @@ maxhp 100 ac 0 x 1 y 2 -immune 254 -alive 1 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 move_block 0 +alive 1 tear_down 1 pass_thru 0 end @@ -813,9 +820,15 @@ maxhp 100 ac 0 x 5 y 2 -immune 254 -alive 1 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 move_block 0 +alive 1 tear_down 1 pass_thru 0 end @@ -1027,8 +1040,8 @@ hp 100 x 6 y 5 type 0 -monster 1 move_type walk +monster 1 friendly 1 end arch marble @@ -1483,9 +1496,15 @@ maxhp 100 ac 0 x 9 y 2 -immune 254 -alive 1 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 move_block 0 +alive 1 tear_down 1 pass_thru 0 end diff --git a/pup_land/port_e_house b/pup_land/port_e_house index 57388ee20..5bbff2a45 100644 --- a/pup_land/port_e_house +++ b/pup_land/port_e_house @@ -526,6 +526,13 @@ x 6 y 6 move_block 0 end +arch longship +slaying port_w +hp 23 +sp 13 +x 6 +y 6 +end arch pstone_1 x 6 y 7 @@ -575,9 +582,9 @@ maxhp 180 x 6 y 13 speed_left -1.750000 +pick_up 0 friendly 1 unaggressive 0 -pick_up 0 end arch woodfloor x 6 @@ -650,7 +657,6 @@ endmsg x 7 y 11 connected 1 -protected 1 end arch woodfloor x 7 @@ -669,7 +675,6 @@ x 7 y 12 speed 0.500000 connected 1 -protected 1 end arch magic_ear msg @@ -679,7 +684,6 @@ endmsg x 7 y 13 connected 1 -protected 1 end arch woodfloor x 7 @@ -803,9 +807,9 @@ maxhp 180 x 8 y 11 speed_left -1.750000 +pick_up 0 friendly 1 unaggressive 0 -pick_up 0 end arch woodfloor x 8 @@ -1335,10 +1339,3 @@ arch cobblestones2 x 14 y 15 end -arch longship -slaying port_w -hp 23 -sp 13 -x 6 -y 6 -end diff --git a/pup_land/port_w b/pup_land/port_w index a65e5e735..ac56c270b 100644 --- a/pup_land/port_w +++ b/pup_land/port_w @@ -1,13 +1,13 @@ arch map -region pupland name port_w +region pupland +width 32 +height 20 msg Creator: Gnat the Gnu Email: gnu@foo.bar Date: Mon Jan 29 00:14:36 1996 endmsg -width 32 -height 20 end arch sea end @@ -1468,10 +1468,9 @@ msg @match siegfried Click. endmsg -protected 1 -connected 1 x 10 y 9 +connected 1 end arch pstone_1 x 10 @@ -1495,12 +1494,12 @@ Go away! endmsg hp 180 maxhp 180 +x 10 +y 10 speed_left -1.750000 pick_up 0 friendly 1 unaggressive 0 -x 10 -y 10 end arch dungeon_magic x 10 @@ -1657,10 +1656,9 @@ x 11 y 9 end arch igateTrg2 -protected 1 -connected 1 x 11 y 9 +connected 1 end arch grass x 11 @@ -1835,12 +1833,12 @@ Go away! endmsg hp 180 maxhp 180 +x 12 +y 8 speed_left -1.750000 pick_up 0 friendly 1 unaggressive 0 -x 12 -y 8 end arch dungeon_magic x 12 @@ -1851,10 +1849,9 @@ msg @match siegfried Click. endmsg -protected 1 +x 12 +y 9 connected 1 -x 12 -y 9 end arch pstone_1 x 12 @@ -3210,7 +3207,14 @@ x 23 y 12 end arch sea +x 23 +y 13 move_block 0 +end +arch longship +slaying port_e_house +hp 6 +sp 6 x 23 y 13 end @@ -3302,9 +3306,9 @@ x 24 y 12 end arch sea -move_block 0 x 24 y 13 +move_block 0 end arch sea x 24 @@ -3915,10 +3919,3 @@ arch sea x 31 y 19 end -arch longship -slaying port_e_house -hp 6 -sp 6 -x 23 -y 13 -end diff --git a/pup_land/world b/pup_land/world index a1d9c679a..b88b82d6f 100644 --- a/pup_land/world +++ b/pup_land/world @@ -1,15 +1,15 @@ arch map -region pupland name world +region pupland +width 45 +height 42 +enter_x 1 +enter_y 1 msg Creator: Gnat the Gnu Email: gnu@foo.bar Date: Thu Jan 25 20:16:45 1996 endmsg -width 45 -height 42 -enter_x 1 -enter_y 1 end arch blocked end @@ -1065,6 +1065,14 @@ arch grass x 6 y 11 end +arch fort +name Power Plant +slaying pplant/pplant1 +hp 10 +sp 22 +x 6 +y 11 +end arch grass x 6 y 12 @@ -2282,6 +2290,14 @@ arch grass x 13 y 9 end +arch city_tower +name Tower of Ordeal +slaying ordeal/tower_ordeal1 +hp 8 +sp 15 +x 13 +y 9 +end arch grass x 13 y 10 @@ -2517,13 +2533,13 @@ hp 10000 dam 0 wc 100 ac -100 +x 14 +y 16 speed_left -2.600000 attack_movement 0 friendly 1 sleep 0 random_movement 1 -x 14 -y 16 end arch brush x 14 @@ -4217,6 +4233,14 @@ arch grass x 22 y 30 end +arch stronghold +name Castle of Eureca +slaying castle_eureca/castle_eureca1 +hp 10 +sp 24 +x 22 +y 30 +end arch grass x 22 y 31 @@ -4385,9 +4409,9 @@ x 23 y 24 end arch sea -is_floor 0 x 23 y 25 +is_floor 0 end arch dungeon_magic x 23 @@ -5039,11 +5063,10 @@ x 26 y 30 end arch button_plate -protected 2 -weight 4000000 -connected 2 x 26 y 31 +weight 4000000 +connected 2 end arch grass x 26 @@ -5160,6 +5183,14 @@ arch grass x 27 y 15 end +arch town_7 +name Nurnberg +slaying nurnberg/city +hp 28 +sp 15 +x 27 +y 15 +end arch grass x 27 y 16 @@ -5234,24 +5265,23 @@ y 31 end arch button_plate face button_big.112 -protected 1 +x 27 +y 32 value 1 weight 4000000 connected 1 -x 27 -y 32 end arch grass x 27 y 32 end arch statue -material 64 -weight 4000000 -can_roll 1 -move_type 1 x 27 y 32 +material 64 +weight 4000000 +move_type 1 +can_roll 1 end arch cobblestones x 27 @@ -5456,9 +5486,9 @@ arch invis_exit slaying rainbow/islands hp 25 sp 6 -invisible 0 x 28 y 37 +invisible 0 end arch grass x 28 @@ -5655,9 +5685,9 @@ arch invis_exit slaying rainbow/islands hp 26 sp 6 -invisible 0 x 29 y 37 +invisible 0 end arch grass x 29 @@ -5846,9 +5876,9 @@ arch invis_exit slaying rainbow/islands hp 27 sp 6 -invisible 0 x 30 y 37 +invisible 0 end arch cobblestones x 30 @@ -6033,9 +6063,9 @@ arch invis_exit slaying rainbow/islands hp 28 sp 6 -invisible 0 x 31 y 37 +invisible 0 end arch grass x 31 @@ -6216,9 +6246,9 @@ arch invis_exit slaying rainbow/islands hp 29 sp 6 -invisible 0 x 32 y 37 +invisible 0 end arch grass x 32 @@ -6410,9 +6440,9 @@ arch invis_exit slaying rainbow/islands hp 30 sp 6 -invisible 0 x 33 y 37 +invisible 0 end arch grass x 33 @@ -6593,9 +6623,9 @@ arch invis_exit slaying rainbow/islands hp 31 sp 6 -invisible 0 x 34 y 37 +invisible 0 end arch brush x 34 @@ -6784,9 +6814,9 @@ arch invis_exit slaying rainbow/islands hp 32 sp 6 -invisible 0 x 35 y 37 +invisible 0 end arch grass x 35 @@ -6983,9 +7013,9 @@ arch invis_exit slaying rainbow/islands hp 33 sp 6 -invisible 0 x 36 y 37 +invisible 0 end arch brush x 36 @@ -7166,9 +7196,9 @@ arch invis_exit slaying rainbow/islands hp 34 sp 6 -invisible 0 x 37 y 37 +invisible 0 end arch grass x 37 @@ -8218,62 +8248,56 @@ end arch pit_closed hp 34 sp 29 -protected 100 -connected 100 x 44 y 5 +connected 100 end arch invis_exit -face jungle_1.111 slaying kurte/jungle +face jungle_1.111 hp 15 sp 23 -invisible 0 x 44 y 5 +invisible 0 end arch blocked x 44 y 6 end arch gate_open_1 -speed 0.500000 -protected 10 -connected 10 x 44 y 7 +speed 0.500000 +connected 10 end arch boulder x 44 y 7 end arch gate_closed_1 -speed 0.500000 -protected 1 -value 1 -connected 1 x 44 y 8 +speed 0.500000 +value 1 +connected 1 end arch gate_closed_1 -speed 0.500000 -protected 2 -connected 2 x 44 y 9 +speed 0.500000 +connected 2 end arch gate_open_1 -speed 0.500000 -protected 1 -connected 1 x 44 y 10 +speed 0.500000 +connected 1 end arch button_plate -protected 100 -connected 100 x 44 y 11 +connected 100 end arch blocked x 44 @@ -8281,11 +8305,10 @@ y 12 end arch button_small face button_sma.112 -protected 10 -value 1 -connected 10 x 44 y 13 +value 1 +connected 10 end arch scroll x 44 @@ -8403,35 +8426,3 @@ arch blocked x 44 y 41 end -arch fort -name Power Plant -slaying pplant/pplant1 -hp 10 -sp 22 -x 6 -y 11 -end -arch city_tower -name Tower of Ordeal -slaying ordeal/tower_ordeal1 -hp 8 -sp 15 -x 13 -y 9 -end -arch stronghold -name Castle of Eureca -slaying castle_eureca/castle_eureca1 -hp 10 -sp 24 -x 22 -y 30 -end -arch town_7 -name Nurnberg -slaying nurnberg/city -hp 28 -sp 15 -x 27 -y 15 -end