--- deliantra/maps/wassar/city-a1.map	2010/05/08 21:26:18	1.1
+++ deliantra/maps/wassar/city-a1.map	2011/12/09 23:37:19	1.15
@@ -4018,7 +4018,6 @@
 arch cyangrass
 x 20
 y 20
-blocksview 1
 end
 arch cyangrass
 x 20
@@ -4223,12 +4222,6 @@
 x 21
 y 21
 end
-arch church
-name Church of Ixalovh
-slaying temples/ixalovh
-x 21
-y 21
-end
 arch cyangrass
 x 21
 y 22
@@ -4436,10 +4429,22 @@
 x 22
 y 23
 end
+arch lamppost
+x 22
+y 23
+end
 arch cyangrass
 x 22
 y 24
 end
+arch house_small
+name scientist's house
+slaying houses/scientist
+hp 8
+sp 14
+x 22
+y 24
+end
 arch cyangrass
 x 22
 y 25
@@ -4631,11 +4636,23 @@
 x 23
 y 22
 end
-arch cobblestones2
+arch lamppost
+x 23
+y 22
+end
+arch safe_ground
 x 23
 y 23
 end
-arch cobblestones2
+arch cobblestones
+x 23
+y 23
+end
+arch safe_ground
+x 23
+y 24
+end
+arch cobblestones
 x 23
 y 24
 end
@@ -4830,13 +4847,17 @@
 x 24
 y 22
 end
-arch bungalow
+arch minihouse
 name ruined house
 slaying houses/historian
 x 24
 y 22
 end
-arch cobblestones2
+arch safe_ground
+x 24
+y 23
+end
+arch cobblestones
 x 24
 y 23
 end
@@ -4852,6 +4873,12 @@
 x 24
 y 26
 end
+arch church
+name Church of Ixalovh
+slaying temples/ixalovh
+x 24
+y 26
+end
 arch cyangrass
 x 24
 y 27
@@ -4888,18 +4915,54 @@
 x 24
 y 35
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face gravestone2.x11
+hp 2
+sp 2
+x 24
+y 35
+end
 arch cyangrass
 x 24
 y 36
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face monument.x11
+hp 2
+sp 2
+x 24
+y 36
+end
 arch cyangrass
 x 24
 y 37
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face gravestone2.x11
+hp 2
+sp 2
+x 24
+y 37
+end
 arch cyangrass
 x 24
 y 38
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face monument.x11
+hp 2
+sp 2
+x 24
+y 38
+end
 arch cyangrass
 x 24
 y 39
@@ -5087,18 +5150,54 @@
 x 25
 y 35
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face monument.x11
+hp 2
+sp 2
+x 25
+y 35
+end
 arch cyangrass
 x 25
 y 36
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face gravestone2.x11
+hp 2
+sp 2
+x 25
+y 36
+end
 arch cyangrass
 x 25
 y 37
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face monument.x11
+hp 2
+sp 2
+x 25
+y 37
+end
 arch cyangrass
 x 25
 y 38
 end
+arch oakdoor
+name graveyards
+slaying temples/graveyard
+face gravestone2.x11
+hp 2
+sp 2
+x 25
+y 38
+end
 arch cyangrass
 x 25
 y 39
@@ -5246,22 +5345,50 @@
 x 26
 y 25
 end
+arch small_temple2
+name Healing of Ixalovh
+slaying shops/healing
+hp 7
+sp 14
+x 26
+y 25
+end
+arch safe_ground
+x 26
+y 26
+end
 arch cobblestones
 x 26
 y 26
 end
+arch safe_ground
+x 26
+y 27
+end
 arch cobblestones
 x 26
 y 27
 end
+arch safe_ground
+x 26
+y 28
+end
 arch cobblestones
 x 26
 y 28
 end
+arch safe_ground
+x 26
+y 29
+end
 arch cobblestones
 x 26
 y 29
 end
+arch safe_ground
+x 26
+y 30
+end
 arch cobblestones
 x 26
 y 30
@@ -5437,30 +5564,72 @@
 x 27
 y 23
 end
+arch magic_mouth
+msg
+You hear noises coming from the top of the tower.
+endmsg
+x 27
+y 24
+end
 arch cyangrass
 x 27
 y 24
 end
+arch city_tower
+name wizard's tower
+slaying dungeon/wiztower_0
+hp 8
+sp 15
+x 27
+y 24
+end
+arch magic_mouth
+msg
+You hear noises coming from the top of the tower.
+endmsg
+x 27
+y 25
+end
 arch cyangrass
 x 27
 y 25
 end
+arch safe_ground
+x 27
+y 26
+end
 arch cobblestones
 x 27
 y 26
 end
+arch safe_ground
+x 27
+y 27
+end
 arch cobblestones
 x 27
 y 27
 end
+arch safe_ground
+x 27
+y 28
+end
 arch cobblestones
 x 27
 y 28
 end
+arch safe_ground
+x 27
+y 29
+end
 arch cobblestones
 x 27
 y 29
 end
+arch safe_ground
+x 27
+y 30
+end
 arch cobblestones
 x 27
 y 30
@@ -5644,10 +5813,18 @@
 x 28
 y 25
 end
+arch safe_ground
+x 28
+y 26
+end
 arch cobblestones
 x 28
 y 26
 end
+arch safe_ground
+x 28
+y 27
+end
 arch cobblestones
 x 28
 y 27
@@ -5668,10 +5845,18 @@
 x 28
 y 28
 end
+arch safe_ground
+x 28
+y 29
+end
 arch cobblestones
 x 28
 y 29
 end
+arch safe_ground
+x 28
+y 30
+end
 arch cobblestones
 x 28
 y 30
@@ -5855,14 +6040,26 @@
 x 29
 y 25
 end
+arch safe_ground
+x 29
+y 26
+end
 arch cobblestones
 x 29
 y 26
 end
+arch safe_ground
+x 29
+y 27
+end
 arch cobblestones
 x 29
 y 27
 end
+arch safe_ground
+x 29
+y 28
+end
 arch cobblestones
 x 29
 y 28
@@ -5873,9 +6070,20 @@
 end
 arch sign
 name News
+msg
+Recently, a large number of water elementals from other parts of the Great Sea have chosen to lead a more developed livestyle and settle here. It appears that this operation is now complete.
+
+Due to the large numbers of dead water elementals, the cemetery is getting rather large.
+
+Undead have settled into a tower in Wassar.
+endmsg
 x 29
 y 29
 end
+arch safe_ground
+x 29
+y 30
+end
 arch cobblestones
 x 29
 y 30
@@ -6059,22 +6267,42 @@
 x 30
 y 25
 end
+arch safe_ground
+x 30
+y 26
+end
 arch cobblestones
 x 30
 y 26
 end
+arch safe_ground
+x 30
+y 27
+end
 arch cobblestones
 x 30
 y 27
 end
+arch safe_ground
+x 30
+y 28
+end
 arch cobblestones
 x 30
 y 28
 end
+arch safe_ground
+x 30
+y 29
+end
 arch cobblestones
 x 30
 y 29
 end
+arch safe_ground
+x 30
+y 30
+end
 arch cobblestones
 x 30
 y 30
@@ -6453,6 +6681,14 @@
 x 32
 y 24
 end
+arch city_tower
+name spirital tower
+slaying dungeon/tower_spirital_0
+hp 8
+sp 15
+x 32
+y 24
+end
 arch cyangrass
 x 32
 y 25
@@ -7448,10 +7684,50 @@
 x 37
 y 24
 end
+arch minihouse
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 6
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle stone
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 37
+y 24
+end
 arch cyangrass
 x 37
 y 25
 end
+arch minihouse
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 6
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle stone
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 37
+y 25
+end
 arch cyangrass
 x 37
 y 26
@@ -7647,10 +7923,52 @@
 x 38
 y 24
 end
+arch s_shop2
+name house
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 5
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle stone
+wallstyle marble
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 38
+y 24
+end
 arch cyangrass
 x 38
 y 25
 end
+arch house_small
+name house
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 10
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle marble
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 38
+y 25
+end
 arch cyangrass
 x 38
 y 26
@@ -8045,10 +8363,52 @@
 x 40
 y 24
 end
+arch house_small
+name house
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 10
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle marble
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 40
+y 24
+end
 arch cyangrass
 x 40
 y 25
 end
+arch house_2
+name rich house
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 11
+dungeon_depth 3
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle marble
+treasurestyle wassar_wealth
+symmetry 1
+endmsg
+x 40
+y 25
+end
 arch cyangrass
 x 40
 y 26
@@ -8244,10 +8604,51 @@
 x 41
 y 24
 end
+arch minihouse
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 6
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle stone
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 41
+y 24
+end
 arch cyangrass
 x 41
 y 25
 end
+arch house_small
+name house
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 10
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle marble
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 41
+y 25
+end
 arch cyangrass
 x 41
 y 26
@@ -8642,10 +9043,51 @@
 x 43
 y 24
 end
+arch minihouse
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 6
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle stone
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 43
+y 24
+end
 arch cyangrass
 x 43
 y 25
 end
+arch house_small
+name house
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 10
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle marble
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 43
+y 25
+end
 arch cyangrass
 x 43
 y 26
@@ -8841,10 +9283,51 @@
 x 44
 y 24
 end
+arch house_small
+name house
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 10
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle marble
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 44
+y 24
+end
 arch cyangrass
 x 44
 y 25
 end
+arch minihouse
+slaying /!
+msg
+layoutstyle castle
+monsterstyle wassar_house
+dungeon_level 6
+dungeon_depth 2
+xsize 24
+ysize 24
+exitstyle gscstair
+orientation 2
+decorstyle wassar_house_rich
+floorstyle marble
+wallstyle stone
+treasurestyle wassar_poor
+symmetry 1
+endmsg
+x 44
+y 25
+end
 arch cyangrass
 x 44
 y 26