--- deliantra/maps/wassar/government/palace.map	2010/05/08 21:26:19	1.1
+++ deliantra/maps/wassar/government/palace.map	2010/10/10 10:11:47	1.10
@@ -2938,6 +2938,10 @@
 x 9
 y 20
 end
+arch swall_1_4_half
+x 9
+y 20
+end
 arch cwall_3_4
 x 9
 y 20
@@ -3296,19 +3300,21 @@
 x 10
 y 20
 end
-arch silverround
+arch swall_2_1_2
+x 10
+y 20
+end
+arch dungeon_magic
 x 10
 y 20
-nrof 3
 end
 arch marble
 x 10
 y 21
 end
-arch silverround
+arch silvercoin
 x 10
 y 21
-nrof 3
 end
 arch marble
 x 10
@@ -3541,6 +3547,14 @@
 x 11
 y 9
 end
+arch sign_e
+name Fish
+msg
+Rocks
+endmsg
+x 11
+y 9
+end
 arch greenmarble
 x 11
 y 10
@@ -3549,6 +3563,14 @@
 x 11
 y 11
 end
+arch sign_e
+name Rocks
+msg
+Rocks
+endmsg
+x 11
+y 11
+end
 arch greenmarble
 x 11
 y 12
@@ -3557,6 +3579,14 @@
 x 11
 y 13
 end
+arch sign_e
+name Ice Blocks
+msg
+Ice Blocks
+endmsg
+x 11
+y 13
+end
 arch marble
 x 11
 y 14
@@ -3608,19 +3638,21 @@
 x 11
 y 20
 end
-arch goldround
+arch swall_2_1_2
+x 11
+y 20
+end
+arch dungeon_magic
 x 11
 y 20
-nrof 3
 end
 arch marble
 x 11
 y 21
 end
-arch goldround
+arch silvercoin
 x 11
 y 21
-nrof 3
 end
 arch marble
 x 11
@@ -3766,7 +3798,7 @@
 x 11
 y 43
 end
-arch grand_piano_black
+arch grand_piano_white
 slaying blocked
 food 100
 x 11
@@ -3910,9 +3942,11 @@
 x 12
 y 13
 end
-arch icecube
-name icecube with rock inside
-name_pl icecubes with rock inside
+arch gem
+x 12
+y 13
+end
+arch wall_glass_block
 x 12
 y 13
 end
@@ -3967,19 +4001,21 @@
 x 12
 y 20
 end
-arch platround
+arch swall_2_1_2
+x 12
+y 20
+end
+arch dungeon_magic
 x 12
 y 20
-nrof 3
 end
 arch marble
 x 12
 y 21
 end
-arch platround
+arch silvercoin
 x 12
 y 21
-nrof 3
 end
 arch marble
 x 12
@@ -4239,9 +4275,11 @@
 x 13
 y 13
 end
-arch icecube
-name icecube with rock inside
-name_pl icecubes with rock inside
+arch pretty_crystal
+x 13
+y 13
+end
+arch wall_glass_block
 x 13
 y 13
 end
@@ -4293,7 +4331,11 @@
 x 13
 y 20
 end
-arch silverbar
+arch swall_2_1_2
+x 13
+y 20
+end
+arch dungeon_magic
 x 13
 y 20
 end
@@ -4301,7 +4343,7 @@
 x 13
 y 21
 end
-arch silverbar
+arch goldcoin
 x 13
 y 21
 end
@@ -4587,9 +4629,11 @@
 x 14
 y 13
 end
-arch icecube
-name icecube with rock inside
-name_pl icecubes with rock inside
+arch mithril
+x 14
+y 13
+end
+arch wall_glass_block
 x 14
 y 13
 end
@@ -4641,7 +4685,11 @@
 x 14
 y 20
 end
-arch silverbar
+arch swall_2_1_2
+x 14
+y 20
+end
+arch dungeon_magic
 x 14
 y 20
 end
@@ -4649,7 +4697,7 @@
 x 14
 y 21
 end
-arch silverbar
+arch goldcoin
 x 14
 y 21
 end
@@ -4805,7 +4853,7 @@
 On the piano, I can play a majestic tune.
 
 Which instrument would you like me to play?
-You will need to pay 10 platinum for the service.
+You will need to pay 5 platinum for the service.
 Please note I can't take money from a bank account.
 
 @match *
@@ -4944,9 +4992,11 @@
 x 15
 y 13
 end
-arch icecube
-name icecube with rock inside
-name_pl icecubes with rock inside
+arch t_rock
+x 15
+y 13
+end
+arch wall_glass_block
 x 15
 y 13
 end
@@ -4998,7 +5048,11 @@
 x 15
 y 20
 end
-arch silverbar
+arch swall_2_1_2
+x 15
+y 20
+end
+arch dungeon_magic
 x 15
 y 20
 end
@@ -5006,7 +5060,7 @@
 x 15
 y 21
 end
-arch silverbar
+arch goldcoin
 x 15
 y 21
 end
@@ -5292,9 +5346,13 @@
 x 16
 y 13
 end
-arch icecube
-name icecube with rock inside
-name_pl icecubes with rock inside
+arch power_crystal
+name crystal
+name_pl crystals
+x 16
+y 13
+end
+arch wall_glass_block
 x 16
 y 13
 end
@@ -5346,7 +5404,11 @@
 x 16
 y 20
 end
-arch goldbar
+arch swall_2_1_2
+x 16
+y 20
+end
+arch dungeon_magic
 x 16
 y 20
 end
@@ -5354,7 +5416,7 @@
 x 16
 y 21
 end
-arch goldbar
+arch peridot
 x 16
 y 21
 end
@@ -5391,21 +5453,22 @@
 endmsg
 con 5
 pow 1
-hp 600
-maxhp 600
+hp 750
+maxhp 750
 sp 14
 maxsp 14
-dam 75
-wc 15
-ac -5
+dam 90
+wc 18
+ac -8
 x 16
 y 24
 attacktype 83
 resist_physical 25
 resist_magic 25
+resist_fire 0
+resist_cold 75
 unaggressive 1
 can_cast_spell 1
-stand_still 1
 arch spell_large_icestorm
 sp 3
 end
@@ -5516,7 +5579,7 @@
 x 16
 y 43
 end
-arch harpsichord3
+arch harpsichord4
 slaying blocked
 food 100
 x 16
@@ -5660,9 +5723,13 @@
 x 17
 y 13
 end
-arch icecube
-name icecube with rock inside
-name_pl icecubes with rock inside
+arch power_crystal_black
+name dark crystal
+name_pl dark crystals
+x 17
+y 13
+end
+arch wall_glass_block
 x 17
 y 13
 end
@@ -5714,7 +5781,11 @@
 x 17
 y 20
 end
-arch platbar
+arch swall_2_1_2
+x 17
+y 20
+end
+arch dungeon_magic
 x 17
 y 20
 end
@@ -5722,7 +5793,7 @@
 x 17
 y 21
 end
-arch platbar
+arch quartz
 x 17
 y 21
 end
@@ -6047,7 +6118,11 @@
 x 18
 y 20
 end
-arch platbar
+arch ggate_closed
+x 18
+y 20
+end
+arch dungeon_magic
 x 18
 y 20
 end
@@ -6055,7 +6130,7 @@
 x 18
 y 21
 end
-arch platbar
+arch agate
 x 18
 y 21
 end
@@ -6356,7 +6431,11 @@
 x 19
 y 20
 end
-arch goldbar
+arch swall_2_1_2
+x 19
+y 20
+end
+arch dungeon_magic
 x 19
 y 20
 end
@@ -6364,7 +6443,7 @@
 x 19
 y 21
 end
-arch goldbar
+arch onyx
 x 19
 y 21
 end
@@ -6401,21 +6480,22 @@
 endmsg
 con 5
 pow 1
-hp 600
-maxhp 600
+hp 750
+maxhp 750
 sp 14
 maxsp 14
-dam 75
-wc 15
-ac -5
+dam 90
+wc 18
+ac -8
 x 19
 y 24
 attacktype 83
 resist_physical 25
 resist_magic 25
+resist_fire 0
+resist_cold 75
 unaggressive 1
 can_cast_spell 1
-stand_still 1
 arch spell_large_icestorm
 sp 3
 end
@@ -6805,6 +6885,10 @@
 x 20
 y 20
 end
+arch swall_1_3_half
+x 20
+y 20
+end
 arch marble
 x 20
 y 21
@@ -8961,7 +9045,7 @@
 end
 arch trigger_marker
 slaying wassar_citizen
-food 23040
+food 0
 x 26
 y 12
 speed 1.0
@@ -8969,7 +9053,7 @@
 end
 arch trigger_marker
 slaying wassar_citizen
-food 34560
+food 0
 x 26
 y 12
 speed 1.0
@@ -9017,18 +9101,18 @@
 @trigger 12
 @setstate citizengranted on
 Ah, you know the password. 
-H<Your citizenship will expire after about 100 hours of gameplay. To renew it, visit the palace again.>
+H<You are now a citizen forever.>
 
 @match Sprudeleau
 @trigger 11
 @setstate citizen-granted on
 Ah, you know the password. You are now a citizen of Wassar City until expiration time.
-H<Your citizenship will expire after about 60 hours of gameplay. To renew it, visit the palace again.>
+H<You are now a citizen forever.>
 
 @match monarchy|royalty
 Ah, you want to see the monarchy?
 To be able to see them, you have to earn your place.
-However, I'm not sure of anything you can do yet.
+To earn your place, well, I'm not sure what you can do for that.
 
 @match password
 You can get the password by purchasing a residence here.
@@ -9891,26 +9975,62 @@
 x 28
 y 33
 end
+arch pretty_sapphire
+face blue_crystal.x11
+x 28
+y 33
+no_pick 1
+end
 arch marble
 x 28
 y 34
 end
+arch pretty_sapphire
+face blue_crystal.x11
+x 28
+y 34
+no_pick 1
+end
 arch marble
 x 28
 y 35
 end
+arch pretty_sapphire
+face blue_crystal.x11
+x 28
+y 35
+no_pick 1
+end
 arch marble
 x 28
 y 36
 end
+arch pretty_sapphire
+face blue_crystal.x11
+x 28
+y 36
+no_pick 1
+end
 arch marble
 x 28
 y 37
 end
+arch pretty_sapphire
+face blue_crystal.x11
+x 28
+y 37
+no_pick 1
+end
 arch marble
 x 28
 y 38
 end
+arch pretty_sapphire
+face blue_crystal.x11
+x 28
+y 38
+no_pick 1
+end
 arch marble
 x 28
 y 39
@@ -13344,6 +13464,13 @@
 x 38
 y 48
 end
+arch magic_mouth
+msg
+The stairs look long, about 50 feet down.
+endmsg
+x 38
+y 48
+end
 arch redmarble
 x 38
 y 49
@@ -14857,9 +14984,6 @@
 y 48
 end
 arch igateTrg1
-name security door
-face grate_1.x18
-animation grate_closed_1
 x 43
 y 48
 connected 2
@@ -15192,9 +15316,6 @@
 y 48
 end
 arch igateTrg1
-name security door
-face grate_1.x18
-animation grate_closed_1
 x 44
 y 48
 connected 2
@@ -16681,7 +16802,7 @@
 y 48
 end
 arch stair3_gstone_up
-name long, winding stairs going up to the military chambers
+name long stairs going up to the military chambers
 slaying /!
 msg
 layoutstyle onion
@@ -16704,6 +16825,13 @@
 x 49
 y 48
 end
+arch magic_mouth
+msg
+The stairs look long, about 60 feet upwards.
+endmsg
+x 49
+y 48
+end
 arch redmarble
 x 49
 y 49
@@ -24098,7 +24226,7 @@
 x 71
 y 31
 end
-arch marble
+arch sea_cyan
 x 71
 y 32
 end
@@ -24146,7 +24274,7 @@
 x 71
 y 38
 end
-arch marble
+arch sea_cyan
 x 71
 y 39
 end
@@ -24446,11 +24574,11 @@
 x 72
 y 31
 end
-arch marble
+arch sea_cyan
 x 72
 y 32
 end
-arch marble
+arch sea_cyan
 x 72
 y 33
 end
@@ -24478,11 +24606,11 @@
 x 72
 y 37
 end
-arch marble
+arch sea_cyan
 x 72
 y 38
 end
-arch marble
+arch sea_cyan
 x 72
 y 39
 end
@@ -24804,11 +24932,11 @@
 x 73
 y 32
 end
-arch marble
+arch sea_cyan
 x 73
 y 33
 end
-arch marble
+arch sea_cyan
 x 73
 y 34
 end
@@ -24820,11 +24948,11 @@
 x 73
 y 36
 end
-arch marble
+arch sea_cyan
 x 73
 y 37
 end
-arch marble
+arch sea_cyan
 x 73
 y 38
 end
@@ -25149,7 +25277,7 @@
 x 74
 y 33
 end
-arch marble
+arch sea_cyan
 x 74
 y 34
 end
@@ -25161,7 +25289,7 @@
 x 74
 y 36
 end
-arch marble
+arch sea_cyan
 x 74
 y 37
 end