Renamed maps (which used the actual file name or tweaked their spelling and capitilization). Widened some of the doorways in the quests/wyvern_quest map. Other changes are due to Map Editor reformatting.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5621 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-27 04:04:07 +00:00 · 2007-02-27 04:04:07 +00:00 · fa6123c39c
parent 68eae86ca0
commit fa6123c39c
10 changed files with 387 additions and 388 deletions
--- a/quests/peterm/Nethack_in_crossfire_Yendor
+++ b/quests/peterm/Nethack_in_crossfire_Yendor
@ -1,14 +1,15 @@
 arch map
-name Nethack_in_crossfire_Yendor
+name Nethack in Crossfire -- Yendor
+difficulty 1
+width 69
+height 69
+enter_x 32
+enter_y 3
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon May  7 01:26:51 2001
 endmsg
-width 69
-height 69
-enter_x 32
-enter_y 3
 end
 arch pstone_4
 end
@ -10063,10 +10064,10 @@ x 31
 y 12
 end
 arch locked_door1
+slaying Acid_Key
 msg
 You need the Acid Key to open this door.
 endmsg
-slaying Acid_Key
 x 31
 y 12
 end
@ -10103,11 +10104,11 @@ x 31
 y 18
 end
 arch locked_door1
+slaying Steel_Key
 msg
 You need the Steel Key to pass this
 door.
 endmsg
-slaying Steel_Key
 x 31
 y 18
 end
@ -10136,10 +10137,10 @@ x 31
 y 24
 end
 arch locked_door1
+slaying The_Wiz
 msg
 You need the Wizard key to pass.
 endmsg
-slaying The_Wiz
 x 31
 y 24
 end
@ -10414,10 +10415,10 @@ x 32
 y 12
 end
 arch locked_door1
+slaying Acid_Key
 msg
 You need the Acid Key to open this door.
 endmsg
-slaying Acid_Key
 x 32
 y 12
 end
@ -10454,11 +10455,11 @@ x 32
 y 18
 end
 arch locked_door1
+slaying Steel_Key
 msg
 You need the Steel Key to pass this
 door.
 endmsg
-slaying Steel_Key
 x 32
 y 18
 end
@ -10487,10 +10488,10 @@ x 32
 y 24
 end
 arch locked_door1
+slaying The_Wiz
 msg
 You need the Wizard key to pass.
 endmsg
-slaying The_Wiz
 x 32
 y 24
 end
@ -10765,10 +10766,10 @@ x 33
 y 12
 end
 arch locked_door1
+slaying Acid_Key
 msg
 You need the Acid Key to open this door.
 endmsg
-slaying Acid_Key
 x 33
 y 12
 end
@ -10805,11 +10806,11 @@ x 33
 y 18
 end
 arch locked_door1
+slaying Steel_Key
 msg
 You need the Steel Key to pass this
 door.
 endmsg
-slaying Steel_Key
 x 33
 y 18
 end
@ -10838,10 +10839,10 @@ x 33
 y 24
 end
 arch locked_door1
+slaying The_Wiz
 msg
 You need the Wizard key to pass.
 endmsg
-slaying The_Wiz
 x 33
 y 24
 end
@ -20396,9 +20397,9 @@ x 62
 y 61
 end
 arch bolt
-nrof 4
 x 62
 y 61
+nrof 4
 end
 arch pstone_4
 x 62
@ -20731,11 +20732,11 @@ x 63
 y 62
 end
 arch axe_4
+x 63
+y 62
 weight 13000
 magic -3
 cursed 1
-x 63
-y 62
 end
 arch pstone_4
 x 63
@ -21044,9 +21045,9 @@ x 64
 y 61
 end
 arch arrow
-nrof 15
 x 64
 y 61
+nrof 15
 end
 arch pstone_4
 x 64
@ -21059,11 +21060,11 @@ end
 arch bolt
 title of inaccuracy
 wc -5
+x 64
+y 62
 nrof 7
 value 0
 cursed 1
-x 64
-y 62
 end
 arch pstone_4
 x 64
@ -21372,9 +21373,9 @@ x 65
 y 61
 end
 arch bolt
-nrof 20
 x 65
 y 61
+nrof 20
 end
 arch pstone_4
 x 65
@ -21385,9 +21386,9 @@ x 65
 y 62
 end
 arch bolt
-nrof 4
 x 65
 y 62
+nrof 4
 end
 arch pstone_4
 x 65
@ -22023,9 +22024,9 @@ x 67
 y 67
 end
 arch teleporter
-speed_left -0.200000
 x 67
 y 67
+speed_left -0.200000
 end
 arch pstone_4
 x 67
@ -22587,9 +22588,9 @@ y 68
 end
 arch g_worm
 name Purple Worm
-carrying 100
 x 14
 y 9
+carrying 100
 arch key2
 name Acid Key
 slaying Acid_Key
@ -22599,10 +22600,10 @@ arch golem_necro
 name Steel Golem
 hp 30000
 exp 200000
-carrying 100
-randomitems none
 x 27
 y 14
+carrying 100
+randomitems none
 arch key2
 name Steel Key
 slaying Steel_Key
@ -22612,10 +22613,10 @@ arch big_wiz
 name wizard of Yendor
 hp 7500
 exp 300000
-level 30
-carrying 600
 x 33
 y 30
+level 30
+carrying 600
 arch amulet_lifesave
 name Amulet of Yendor
 slaying Amulet of Yendor
@ -22624,9 +22625,9 @@ lifesave 0
 end
 end
 arch demon_lord
-carrying 100
 x 44
 y 35
+carrying 100
 arch key2
 name Wizard Key
 slaying The_Wiz
--- a/quests/peterm/Nethack_in_crossfire_entrance
+++ b/quests/peterm/Nethack_in_crossfire_entrance
@ -1,15 +1,15 @@
 arch map
-name Nethack_in_crossfire_entrance
+name Nethack in Crossfire Entrance
+difficulty 9999
+width 16
+height 16
+enter_x 1
+enter_y 1
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sun May  6 21:39:27 2001
 endmsg
-enter_x 1
-enter_y 1
-width 16
-height 16
-difficulty 9999
 end
 arch woodfloor
 end
@ -133,10 +133,10 @@ x 1
 y 3
 end
 arch grate_closed_1
-speed 0.500000
-connected 2
 x 1
 y 3
+speed 0.500000
+connected 2
 end
 arch dungeon_magic
 x 1
@ -148,9 +148,9 @@ y 4
 end
 arch check_inv
 slaying Amulet of Yendor
-connected 2
 x 1
 y 4
+connected 2
 end
 arch woodfloor
 x 1
@ -165,6 +165,7 @@ x 1
 y 6
 end
 arch stair_down_2
+slaying /!
 msg
 layoutstyle rogue
 floorstyle lightdirt
@ -180,7 +181,6 @@ orientation 1
 final_map /quests/peterm/Nethack_in_crossfire_Yendor
 treasureoptions 73
 endmsg
-slaying /!
 x 1
 y 6
 end
@ -197,6 +197,7 @@ x 1
 y 8
 end
 arch stair_down_2
+slaying /!
 msg
 layoutstyle rogue
 floorstyle lightdirt
@ -212,7 +213,6 @@ orientation 1
 final_map /quests/peterm/Nethack_in_crossfire_Yendor
 treasureoptions 73
 endmsg
-slaying /!
 x 1
 y 8
 end
@ -229,6 +229,7 @@ x 1
 y 10
 end
 arch stair_down_2
+slaying /!
 msg
 layoutstyle rogue
 floorstyle lightdirt
@ -244,7 +245,6 @@ orientation 1
 final_map /quests/peterm/Nethack_in_crossfire_Yendor
 treasureoptions 73
 endmsg
-slaying /!
 x 1
 y 10
 end
@ -261,6 +261,7 @@ x 1
 y 12
 end
 arch stair_down_2
+slaying /!
 msg
 layoutstyle rogue
 floorstyle lightdirt
@ -276,7 +277,6 @@ orientation 1
 final_map /quests/peterm/Nethack_in_crossfire_Yendor
 treasureoptions 73
 endmsg
-slaying /!
 x 1
 y 12
 end
@ -293,6 +293,7 @@ x 1
 y 14
 end
 arch stair_down_2
+slaying /!
 msg
 layoutstyle rogue
 floorstyle lightdirt
@ -308,7 +309,6 @@ orientation 1
 final_map /quests/peterm/Nethack_in_crossfire_Yendor
 treasureoptions 73
 endmsg
-slaying /!
 x 1
 y 14
 end
@ -371,10 +371,10 @@ x 2
 y 6
 end
 arch grate_closed_2
+x 2
+y 6
 speed 0.500000
 connected 3
-x 2
-y 6
 end
 arch dungeon_magic
 x 2
@ -393,10 +393,10 @@ x 2
 y 8
 end
 arch grate_closed_2
+x 2
+y 8
 speed 0.500000
 connected 4
-x 2
-y 8
 end
 arch dungeon_magic
 x 2
@ -415,10 +415,10 @@ x 2
 y 10
 end
 arch grate_closed_2
+x 2
+y 10
 speed 0.500000
 connected 5
-x 2
-y 10
 end
 arch dungeon_magic
 x 2
@ -437,10 +437,10 @@ x 2
 y 12
 end
 arch grate_closed_2
+x 2
+y 12
 speed 0.500000
 connected 6
-x 2
-y 12
 end
 arch dungeon_magic
 x 2
@ -459,10 +459,10 @@ x 2
 y 14
 end
 arch grate_closed_2
-speed 0.500000
-connected 7
 x 2
 y 14
+speed 0.500000
+connected 7
 end
 arch dungeon_magic
 x 2
@ -511,9 +511,9 @@ x 3
 y 6
 end
 arch button_handle
-connected 3
 x 3
 y 6
+connected 3
 end
 arch woodfloor
 x 3
@ -524,9 +524,9 @@ x 3
 y 8
 end
 arch button_handle
-connected 4
 x 3
 y 8
+connected 4
 end
 arch woodfloor
 x 3
@ -537,9 +537,9 @@ x 3
 y 10
 end
 arch button_handle
-connected 5
 x 3
 y 10
+connected 5
 end
 arch woodfloor
 x 3
@ -550,9 +550,9 @@ x 3
 y 12
 end
 arch button_handle
-connected 6
 x 3
 y 12
+connected 6
 end
 arch woodfloor
 x 3
@ -563,9 +563,9 @@ x 3
 y 14
 end
 arch button_handle
-connected 7
 x 3
 y 14
+connected 7
 end
 arch woodfloor
 x 3
@ -1269,11 +1269,11 @@ end
 arch teleporter
 hp 11
 sp 1
+x 9
+y 2
 speed 0.000000
 connected 1
 damned 1
-x 9
-y 2
 end
 arch woodfloor
 x 9
@ -1389,20 +1389,20 @@ arch wwall_2_1_1
 x 10
 y 1
 end
-arch woodfloor
-x 10
-y 2
-end
-arch wwall_2_1_1
-x 10
-y 2
-end
 arch magic_ear
 msg
@match Understood
 Click.
 endmsg
+x 10
+y 2
 connected 1
+end
+arch woodfloor
+x 10
+y 2
+end
+arch wwall_2_1_1
 x 10
 y 2
 end
@ -1855,9 +1855,9 @@ x 14
 y 1
 end
 arch woodfloor
-unique 1
 x 14
 y 1
+unique 1
 end
 arch bed_save
 x 14
--- a/quests/peterm/quests/TitanGate
+++ b/quests/peterm/quests/TitanGate
@ -1,12 +1,13 @@
 arch map
-name TitanGate
+name Titan Gate
+difficulty 1
+width 14
+height 16
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Jun 12 22:15:06 2000
 endmsg
-width 14
-height 16
 end
 arch dungeon_floor
 end
@ -496,10 +497,10 @@ x 6
 y 3
 end
 arch igate_open_1
-speed 0.500000
-value 1
 x 6
 y 3
+speed 0.500000
+value 1
 end
 arch magic_mouth
 msg
@ -529,19 +530,19 @@ y 6
 end
 arch altar
 slaying booze
-connected 1
 x 6
 y 6
+connected 1
 end
 arch dungeon_floor
 x 6
 y 7
 end
 arch gate_closed_1
-speed 0.500000
-connected 1
 x 6
 y 7
+speed 0.500000
+connected 1
 end
 arch dungeon_floor
 x 6
@ -568,6 +569,7 @@ x 6
 y 13
 end
 arch stair_up_3
+slaying /!
 msg
 layoutstyle onion
 symmetry 4
@ -585,7 +587,6 @@ orientation 2
 expand2x 1
 treasureoptions 1
 endmsg
-slaying /!
 x 6
 y 13
 end
@ -631,10 +632,10 @@ x 7
 y 3
 end
 arch igate_open_1
-speed 0.500000
-value 1
 x 7
 y 3
+speed 0.500000
+value 1
 end
 arch magic_mouth
 msg
@ -667,10 +668,10 @@ x 7
 y 7
 end
 arch gate_closed_1
-speed 0.500000
-connected 1
 x 7
 y 7
+speed 0.500000
+connected 1
 end
 arch dungeon_floor
 x 7
@ -1204,16 +1205,16 @@ feet, I'd be mighty obliged.  I am
 VERY thirsty!  Yes, if you bring
 enough, I'll let you in!
 endmsg
-unaggressive 1
 x 5
 y 5
+unaggressive 1
 end
 arch giant
 msg
@match *
 NONE SHALL PASS!
 endmsg
-unaggressive 1
 x 8
 y 5
+unaggressive 1
 end
--- a/quests/peterm/quests/dragon_quest
+++ b/quests/peterm/quests/dragon_quest
@ -1,13 +1,14 @@
 arch map
 name DragonQuest
+difficulty 1
+width 9
+height 9
+enter_x 3
 msg
 Creator: peterm
 Email: peterm@soda.csua.berkeley.edu
 Date: Fri Aug 19 16:41:17 1994
 endmsg
-width 9
-height 9
-enter_x 3
 end
 arch blocked
 end
--- a/quests/peterm/quests/dragonquest2
+++ b/quests/peterm/quests/dragonquest2
@ -1,14 +1,14 @@
 arch map
 name DragonQuest
+width 41
+height 41
+enter_x 2
+enter_y 2
 msg
 Creator: peterm
 Email: peterm@soda.csua.berkeley.edu
 Date: Fri Aug 19 16:41:17 1994
 endmsg
-width 41
-height 41
-enter_x 2
-enter_y 2
 end
 arch blocked
 end
@ -3331,6 +3331,7 @@ y 16
 end
 arch spear
 name Ruggilli's Whisker
+slaying dragon
 msg
 You see Ruggilli's whisker.
 It is said that to help his priests
@ -3341,7 +3342,6 @@ weapon.
 Not many may use this weapon without
 being devoured by it.
 endmsg
-slaying dragon
 Str 8
 Dex 8
 Con 8
@ -3355,6 +3355,8 @@ dam 100
 luck 5
 wc 8
 ac 8
+x 14
+y 16
 nrof 0
 level 127
 attacktype 1179904
@ -3372,8 +3374,6 @@ reflect_missile 1
 reflect_spell 1
 xrays 1
 lifesave 1
-x 14
-y 16
 end
 arch pstone_2
 x 14
@ -9475,9 +9475,9 @@ x 8
 y 28
 end
 arch big_elec
-carrying 100
 x 11
 y 32
+carrying 100
 arch key2
 slaying SecondDoor
 end
@ -9495,18 +9495,18 @@ x 30
 y 9
 end
 arch bone_drake
-carrying 100
 x 31
 y 18
+carrying 100
 arch key2
 slaying LastDoor
 end
 end
 arch dragonman
 Pow 4
-carrying 100
 x 34
 y 35
+carrying 100
 arch key2
 slaying FourthDoor
 end
--- a/quests/peterm/quests/goblin_chief
+++ b/quests/peterm/quests/goblin_chief
@ -1,15 +1,16 @@
 arch map
+name Goblin Chief
+difficulty 1
 region scorn
-name goblin_chief
+width 17
+height 24
+enter_x 14
+enter_y 9
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Jun  5 15:40:23 2000
 endmsg
-width 17
-height 24
-enter_x 14
-enter_y 9
 end
 arch pstone_4
 end
@ -212,17 +213,17 @@ x 1
 y 7
 end
 arch fountain
-speed_left -0.600000
 x 1
 y 7
+speed_left -0.600000
 end
 arch potion_heroism
 name fountain
 face fountain.111
-material 256
-no_pick 1
 x 1
 y 7
+material 256
+no_pick 1
 end
 arch pstone_4
 x 1
@ -337,9 +338,9 @@ x 1
 y 22
 end
 arch high_boots
-magic 2
 x 1
 y 22
+magic 2
 end
 arch pstone_4
 x 1
@ -500,9 +501,9 @@ x 2
 y 22
 end
 arch sword_2
-magic 3
 x 2
 y 22
+magic 3
 end
 arch pstone_4
 x 2
@ -631,9 +632,9 @@ x 3
 y 17
 end
 arch brazier
-no_pass 0
 x 3
 y 17
+no_pass 0
 end
 arch goblin
 x 3
@ -798,9 +799,9 @@ x 4
 y 15
 end
 arch barrel
-no_pass 0
 x 4
 y 15
+no_pass 0
 end
 arch generate_goblin
 x 4
@ -1572,12 +1573,12 @@ exp 500
 dam 7
 wc 3
 ac 4
+x 8
+y 22
 speed 0.200000
 level 6
 carrying 57825
 randomitems none
-x 8
-y 22
 arch gauntlets
 end
 arch round_shield
@ -1757,9 +1758,9 @@ x 9
 y 22
 end
 arch brazier
-no_pass 0
 x 9
 y 22
+no_pass 0
 end
 arch pstone_4
 x 9
@ -1804,9 +1805,9 @@ x 10
 y 6
 end
 arch brazier
-no_pass 0
 x 10
 y 6
+no_pass 0
 end
 arch pstone_4
 x 10
@ -2003,9 +2004,9 @@ x 11
 y 7
 end
 arch brazier
-no_pass 0
 x 11
 y 7
+no_pass 0
 end
 arch pstone_4
 x 11
@ -2056,9 +2057,9 @@ x 11
 y 15
 end
 arch barrel
-no_pass 0
 x 11
 y 15
+no_pass 0
 end
 arch pstone_4
 x 11
@ -2089,9 +2090,9 @@ x 11
 y 19
 end
 arch brazier
-no_pass 0
 x 11
 y 19
+no_pass 0
 end
 arch goblin
 x 11
@ -2276,9 +2277,9 @@ x 12
 y 19
 end
 arch generate_kobold
-speed_left -0.120000
 x 12
 y 19
+speed_left -0.120000
 end
 arch pstone_4
 x 12
@ -2417,9 +2418,9 @@ x 13
 y 13
 end
 arch brazier
-no_pass 0
 x 13
 y 13
+no_pass 0
 end
 arch pstone_4
 x 13
@ -2731,9 +2732,9 @@ x 15
 y 5
 end
 arch barrel
-no_pass 0
 x 15
 y 5
+no_pass 0
 end
 arch pstone_4
 x 15
@ -2748,9 +2749,9 @@ x 15
 y 7
 end
 arch barrel
-no_pass 0
 x 15
 y 7
+no_pass 0
 end
 arch pstone_4
 x 15
--- a/quests/peterm/quests/mushroom_quest
+++ b/quests/peterm/quests/mushroom_quest
@ -1,14 +1,15 @@
 arch map
-name mushroom_quest
+name Mushroom Quest
+difficulty 1
+width 16
+height 35
+enter_x 1
+enter_y 1
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Jun  5 20:55:31 2000
 endmsg
-width 16
-height 35
-enter_x 1
-enter_y 1
 end
 arch grass_only
 end
@ -169,18 +170,18 @@ x 1
 y 9
 end
 arch fountain
-speed_left -0.600000
 x 1
 y 9
+speed_left -0.600000
 end
 arch potion_generic
 name fountain
 face fountain.111
 sp 1
-material 256
-no_pick 1
 x 1
 y 9
+material 256
+no_pick 1
 end
 arch grass_only
 x 1
@ -255,9 +256,9 @@ x 1
 y 23
 end
 arch beehive
-speed -0.200000
 x 1
 y 23
+speed -0.200000
 end
 arch grass_only
 x 1
@ -375,9 +376,9 @@ x 2
 y 13
 end
 arch beehive
-speed -0.200000
 x 2
 y 13
+speed -0.200000
 end
 arch grass_only
 x 2
@ -392,9 +393,9 @@ x 2
 y 16
 end
 arch beehive
-speed -0.200000
 x 2
 y 16
+speed -0.200000
 end
 arch grass_only
 x 2
@ -1503,9 +1504,9 @@ x 8
 y 10
 end
 arch beehive
-speed -0.200000
 x 8
 y 10
+speed -0.200000
 end
 arch grass_only
 x 8
@ -1660,9 +1661,9 @@ x 9
 y 3
 end
 arch beehive
-speed -0.200000
 x 9
 y 3
+speed -0.200000
 end
 arch grass_only
 x 9
@ -2055,9 +2056,9 @@ x 11
 y 9
 end
 arch beehive
-speed -0.200000
 x 11
 y 9
+speed -0.200000
 end
 arch grass_only
 x 11
--- a/quests/peterm/quests/ogre_chief
+++ b/quests/peterm/quests/ogre_chief
--- a/quests/peterm/quests/titan_quest
+++ b/quests/peterm/quests/titan_quest
@ -1,8 +1,10 @@
 arch map
-hp 35
-sp 33
-x 37
-y 35
+name Titan Quest
+difficulty 1
+width 37
+height 35
+enter_x 35
+enter_y 33
 end
 arch woodfloor2
 end
--- a/quests/peterm/quests/wyvern_quest
+++ b/quests/peterm/quests/wyvern_quest
@ -1,5 +1,6 @@
 arch map
-name wyvern_quest
+name Wyvern Quest
+difficulty 1
 width 21
 height 37
 enter_x 1
@ -1754,18 +1755,13 @@ face mediumston.111
 x 6
 y 22
 end
-arch dun_1_1
-face dun_4.111
-x 6
-y 22
-end
 arch medium_stones
 face mediumston.111
 x 6
 y 23
 end
-arch dun_2_1_1
-face dun_5.111
+arch dun_1_1
+face dun_4.111
 x 6
 y 23
 end
@ -1804,8 +1800,8 @@ face mediumston.111
 x 6
 y 27
 end
-arch dun_2_1_1
-face dun_5.111
+arch dun_1_2
+face dun_1.111
 x 6
 y 27
 end
@ -1844,8 +1840,8 @@ face mediumston.111
 x 6
 y 34
 end
-arch dun_2_1_1
-face dun_5.111
+arch dun_1_1
+face dun_4.111
 x 6
 y 34
 end
@ -3213,18 +3209,13 @@ face mediumston.111
 x 12
 y 26
 end
-arch dun_1_1
-face dun_4.111
-x 12
-y 26
-end
 arch medium_stones
 face mediumston.111
 x 12
 y 27
 end
-arch dun_2_1_1
-face dun_5.111
+arch dun_1_1
+face dun_4.111
 x 12
 y 27
 end