Several maps updated and never committed.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3299 282e977c-c81d-0410-88c4-b93c2d0d6712

pup_land/lone_town/town

@@ -1,5 +1,4 @@
 arch map
-region lonetown
 name town
 msg
 Creator: Gnat the Gnu
@@ -1098,14 +1097,26 @@ arch grass
 x 10
 y 12
 end
+arch evergreens2
+x 10
+y 12
+end
 arch grass
 x 10
 y 13
 end
+arch evergreens2
+x 10
+y 13
+end
 arch grass
 x 10
 y 14
 end
+arch evergreens2
+x 10
+y 14
+end
 arch grass
 x 10
 y 15
@@ -1196,7 +1207,7 @@ arch grass
 x 11
 y 13
 end
-arch grass
+arch footpath_3_2
 x 11
 y 14
 end
@@ -1286,6 +1297,10 @@ arch grass
 x 12
 y 14
 end
+arch footpath_3_4
+x 12
+y 14
+end
 arch cobblestones
 x 12
 y 15
@@ -1368,14 +1383,26 @@ arch grass
 x 13
 y 12
 end
+arch evergreens2
+x 13
+y 12
+end
 arch grass
 x 13
 y 13
 end
+arch evergreens2
+x 13
+y 13
+end
 arch grass
 x 13
 y 14
 end
+arch evergreens2
+x 13
+y 14
+end
 arch cobblestones
 x 13
 y 15
@@ -2803,6 +2830,13 @@ slaying gshop
 x 10
 y 9
 end
+arch rl_house2
+name Permanent apartments
+slaying /pup_land/lone_town/apartments/apartment
+unique 1
+x 11
+y 12
+end
 arch barrack_long
 name Magic Show !
 slaying magic

scorn/shops/scorn.sale1

@@ -2,7 +2,8 @@ arch map
 region scorn
 name Scorn Sale shop
 msg
-Creator: CF Java Map Editor
+Creator: Gene Alexander
+Editor: CF Java Map Editor
 Date:    7/1/2004
 endmsg
 width 21
@@ -314,6 +315,10 @@ arch dwall_0
 x 2
 y 16
 end
+arch light4
+x 2
+y 16
+end
 arch shop_empty
 x 2
 y 17
@@ -727,7 +732,7 @@ arch shop_empty
 x 6
 y 9
 end
-arch dwall_2_1_1
+arch dwall_1_2
 x 6
 y 9
 end
@@ -735,7 +740,11 @@ arch shop_empty
 x 6
 y 10
 end
-arch dwall_1_2
+arch dwall_0
+x 6
+y 10
+end
+arch light4
 x 6
 y 10
 end
@@ -743,14 +752,6 @@ arch shop_empty
 x 6
 y 11
 end
-arch dwall_0
-x 6
-y 11
-end
-arch light4
-x 6
-y 11
-end
 arch shop_empty
 x 6
 y 12
@@ -775,7 +776,7 @@ arch shop_empty
 x 6
 y 17
 end
-arch dwall_2_1_2
+arch dwall_win2
 x 6
 y 17
 end
@@ -944,7 +945,11 @@ arch dwall_2_1_2
 x 8
 y 8
 end
-arch shop_floor
+arch shop_empty
+x 8
+y 9
+end
+arch menu
 x 8
 y 9
 end
@@ -1111,7 +1116,12 @@ arch magic_mouth
 name A tiny fairy voice
 msg
 A tiny fairy appears and says in a tiny voice:
-"The first floor is for selling your less desirables for money. The second floor is for trading, charity and pawn shop. Items dropped in the pawn shop will stay ... oh, Peter's calling me. Bye!"
+"The first floor is for selling your less desirables
+for money. The second floor is for trading,
+charity and pawn shop. There is an "identify
+items" table on the second floor. Items dropped
+in the pawn shop will stay ... oh, Peter's calling
+me. Bye!"
 The tiny fairy disappears.
 endmsg
 x 9
@@ -1181,15 +1191,6 @@ arch shop_mat
 x 10
 y 3
 end
-arch shop_empty
-x 10
-y 4
-end
-arch bench_2_1_2
-no_pass 1
-x 10
-y 4
-end
 arch magic_ear
 msg
 @match P|plants
@@ -1206,6 +1207,15 @@ y 4
 end
 arch shop_empty
 x 10
+y 4
+end
+arch bench_2_1_2
+no_pass 1
+x 10
+y 4
+end
+arch shop_empty
+x 10
 y 5
 end
 arch shop_empty
@@ -1276,7 +1286,12 @@ arch magic_mouth
 name A tiny fairy voice
 msg
 A tiny fairy appears and says in a tiny voice:
-"The first floor is for selling your less desirables for money. The second floor is for trading, charity and pawn shop. Items dropped in the pawn shop will stay ... oh, Peter's calling me. Bye!"
+"The first floor is for selling your less desirables
+for money. The second floor is for trading,
+charity and pawn shop. There is an "identify
+items" table on the second floor. Items dropped
+in the pawn shop will stay ... oh, Peter's calling
+me. Bye!"
 The tiny fairy disappears.
 endmsg
 x 10
@@ -1415,7 +1430,12 @@ arch magic_mouth
 name A tiny fairy voice
 msg
 A tiny fairy appears and says in a tiny voice:
-"The first floor is for selling your less desirables for money. The second floor is for trading, charity and pawn shop. Items dropped in the pawn shop will stay ... oh, Peter's calling me. Bye!"
+"The first floor is for selling your less desirables
+for money. The second floor is for trading,
+charity and pawn shop. There is an "identify
+items" table on the second floor. Items dropped
+in the pawn shop will stay ... oh, Peter's calling
+me. Bye!"
 The tiny fairy disappears.
 endmsg
 x 11
@@ -1508,7 +1528,7 @@ arch dwall_2_1_2
 x 12
 y 8
 end
-arch shop_empty
+arch shop_floor
 x 12
 y 9
 end
@@ -1768,7 +1788,7 @@ arch shop_empty
 x 14
 y 9
 end
-arch dwall_2_1_1
+arch dwall_1_2
 x 14
 y 9
 end
@@ -1776,7 +1796,11 @@ arch shop_empty
 x 14
 y 10
 end
-arch dwall_1_2
+arch dwall_0
+x 14
+y 10
+end
+arch light4
 x 14
 y 10
 end
@@ -1784,14 +1808,6 @@ arch shop_empty
 x 14
 y 11
 end
-arch dwall_0
-x 14
-y 11
-end
-arch light4
-x 14
-y 11
-end
 arch shop_empty
 x 14
 y 12
@@ -1816,7 +1832,7 @@ arch shop_empty
 x 14
 y 17
 end
-arch dwall_2_1_2
+arch dwall_win2
 x 14
 y 17
 end
@@ -2228,6 +2244,10 @@ arch dwall_0
 x 18
 y 16
 end
+arch light4
+x 18
+y 16
+end
 arch shop_empty
 x 18
 y 17

scorn/shops/scorn.sale2

@@ -943,7 +943,7 @@ end
 arch teleporter
 invisible 1
 hp 2
-sp 16
+sp 2
 connected 44
 speed 0.0
 x 4
@@ -975,8 +975,8 @@ y 5
 end
 arch teleporter
 invisible 1
-hp 9
-sp 15
+hp 2
+sp 5
 connected 22
 speed 0.0
 x 4
@@ -1933,9 +1933,7 @@ arch tile_white_floor
 x 8
 y 9
 end
-arch identify_table
-name Drop 25 gold to identify an item.
-food 250
+arch palm
 x 8
 y 9
 end
@@ -1947,7 +1945,7 @@ arch tile_white_floor
 x 8
 y 10
 end
-arch dwall_2_1_2
+arch dwall_1_3
 x 8
 y 10
 end
@@ -1959,6 +1957,12 @@ arch tile_white_floor
 x 8
 y 11
 end
+arch pedestal
+invisible 1
+connected 11
+x 8
+y 11
+end
 arch dungeon_magic
 x 8
 y 12
@@ -1967,7 +1971,7 @@ arch tile_white_floor
 x 8
 y 12
 end
-arch palm
+arch menu
 x 8
 y 12
 end
@@ -2162,9 +2166,13 @@ arch tile_white_floor
 x 9
 y 8
 end
-arch dwall_1_1
+arch dungeon_magic
 x 9
-y 8
+y 9
+end
+arch tile_white_floor
+x 9
+y 9
 end
 arch dungeon_magic
 x 9
@@ -2174,7 +2182,9 @@ arch tile_white_floor
 x 9
 y 9
 end
-arch dwall_2_1_1
+arch check_inv
+slaying pawn_shop1
+connected 11
 x 9
 y 9
 end
@@ -2186,7 +2196,8 @@ arch tile_white_floor
 x 9
 y 10
 end
-arch dwall_2_2_4
+arch mdoor_closed_1
+connected 11
 x 9
 y 10
 end
@@ -2198,6 +2209,12 @@ arch tile_white_floor
 x 9
 y 11
 end
+arch pedestal
+invisible 1
+connected 11
+x 9
+y 11
+end
 arch dungeon_magic
 x 9
 y 12
@@ -2206,11 +2223,15 @@ arch tile_white_floor
 x 9
 y 12
 end
+arch shop_mat
+x 9
+y 12
+end
 arch shop_empty
 x 9
 y 13
 end
-arch dwall_win2
+arch dwall_2_1_2
 x 9
 y 13
 end
@@ -2380,22 +2401,30 @@ arch tile_white_floor
 x 10
 y 8
 end
-arch check_inv
+arch dungeon_magic
+x 10
+y 9
+end
+arch tile_white_floor
+x 10
+y 9
+end
+arch trigger_marker
+msg
+You have one day's use of these facilities.
+endmsg
 slaying pawn_shop1
-connected 11
-x 10
-y 8
-end
-arch dungeon_magic
+connected 88
+speed 1.0
+food 504
 x 10
 y 9
 end
-arch tile_white_floor
-x 10
-y 9
-end
-arch mdoor_closed_1
-connected 11
+arch altar_trigger
+name Drop 500 gold for day pass
+slaying goldcoin
+food 500
+connected 88
 x 10
 y 9
 end
@@ -2407,9 +2436,7 @@ arch tile_white_floor
 x 10
 y 10
 end
-arch pedestal
-invisible 1
-connected 11
+arch dwall_2_2_3
 x 10
 y 10
 end
@@ -2421,6 +2448,10 @@ arch tile_white_floor
 x 10
 y 11
 end
+arch dwall_win1
+x 10
+y 11
+end
 arch dungeon_magic
 x 10
 y 12
@@ -2429,7 +2460,7 @@ arch tile_white_floor
 x 10
 y 12
 end
-arch shop_mat
+arch dwall_2_2_1
 x 10
 y 12
 end
@@ -2613,10 +2644,6 @@ arch tile_white_floor
 x 11
 y 8
 end
-arch dwall_2_2_2
-x 11
-y 8
-end
 arch dungeon_magic
 x 11
 y 9
@@ -2625,10 +2652,6 @@ arch tile_white_floor
 x 11
 y 9
 end
-arch dwall_2_1_1
-x 11
-y 9
-end
 arch dungeon_magic
 x 11
 y 10
@@ -2637,7 +2660,7 @@ arch tile_white_floor
 x 11
 y 10
 end
-arch dwall_1_2
+arch platinum_converter
 x 11
 y 10
 end
@@ -2649,6 +2672,10 @@ arch tile_white_floor
 x 11
 y 11
 end
+arch pearl_converter
+x 11
+y 11
+end
 arch dungeon_magic
 x 11
 y 12
@@ -2657,11 +2684,15 @@ arch tile_white_floor
 x 11
 y 12
 end
+arch dwall_2_2_3
+x 11
+y 12
+end
 arch shop_empty
 x 11
 y 13
 end
-arch dwall_win2
+arch dwall_3_1
 x 11
 y 13
 end
@@ -2829,22 +2860,9 @@ arch tile_white_floor
 x 12
 y 7
 end
-arch trigger_marker
-msg
-You have one day's use of these facilities.
-endmsg
-slaying pawn_shop1
-connected 88
-speed 1.0
-food 504
-x 12
-y 7
-end
-arch altar_trigger
-name Drop 500 gold for day pass
-slaying goldcoin
-food 500
-connected 88
+arch identify_table
+name Drop 25 gold to identify an item.
+food 250
 x 12
 y 7
 end
@@ -2856,15 +2874,15 @@ arch tile_white_floor
 x 12
 y 8
 end
-arch dwall_2_1_2
+arch dwall_1_4
 x 12
 y 8
 end
-arch tile_white_floor
+arch dungeon_magic
 x 12
 y 9
 end
-arch dungeon_magic
+arch tile_white_floor
 x 12
 y 9
 end
@@ -2880,6 +2898,10 @@ arch tile_white_floor
 x 12
 y 10
 end
+arch diamond_converter
+x 12
+y 10
+end
 arch dungeon_magic
 x 12
 y 11
@@ -2888,6 +2910,10 @@ arch tile_white_floor
 x 12
 y 11
 end
+arch ruby_converter
+x 12
+y 11
+end
 arch dungeon_magic
 x 12
 y 12
@@ -2896,7 +2922,7 @@ arch tile_white_floor
 x 12
 y 12
 end
-arch palm
+arch menu
 x 12
 y 12
 end
@@ -3767,7 +3793,7 @@ end
 arch teleporter
 invisible 1
 hp 18
-sp 16
+sp 2
 connected 55
 speed 0.0
 x 16
@@ -3799,8 +3825,8 @@ y 5
 end
 arch teleporter
 invisible 1
-hp 11
-sp 16
+hp 18
+sp 5
 connected 33
 speed 0.0
 x 16

wolfsburg/temple/ixalovh

@@ -1,6 +1,6 @@
 arch map
-region wolfsburg
 name ixalovh
+region wolfsburg
 msg
 Creator: Avion
 CF Java Map Editor
@@ -889,6 +889,7 @@ x 9
 y 8
 end
 arch altar_ixalovh
+level 120
 x 9
 y 8
 end