--- deliantra/server/lib/archetypes	2006/03/15 14:04:56	1.1.1.3
+++ deliantra/server/lib/archetypes	2006/05/07 12:49:21	1.25
@@ -46,7 +46,7 @@
 resist_physical 4
 type 99
 material 8
-materialname black leather
+materialname leather
 editable 1024
 body_foot -2
 gen_sp_armour 4
@@ -67,7 +67,7 @@
 resist_physical 25
 type 99
 material 2
-materialname black steel
+materialname steel
 editable 1024
 body_foot -2
 gen_sp_armour 4
@@ -87,7 +87,7 @@
 resist_physical 4
 type 99
 material 8
-materialname white leather
+materialname leather
 editable 1024
 body_foot -2
 gen_sp_armour 4
@@ -108,7 +108,7 @@
 resist_physical 25
 type 99
 material 2
-materialname white steel
+materialname steel
 editable 1024
 body_foot -2
 gen_sp_armour 4
@@ -398,7 +398,7 @@
 nrof 1
 value 64
 material 8
-materialname black leather
+materialname leather
 weight 100
 editable 1024
 body_hand -2
@@ -416,7 +416,7 @@
 nrof 1
 value 6000
 material 8
-materialname white leather
+materialname leather
 weight 100
 editable 1024
 body_hand -2
@@ -435,7 +435,7 @@
 nrof 1
 value 42000
 material 2
-materialname white steel
+materialname steel
 weight 200
 editable 1024
 body_hand -2
@@ -760,6 +760,25 @@
 gen_sp_armour 10
 editor_folder armour/helmet
 end
+Object goldmask1
+nrof 1
+name gold mask
+name_pl gold masks
+is_blind 1
+client_type 271
+type 34
+face goldmask1.111
+ac 1
+resist_physical 12
+weight 16000
+value 16000
+material 2
+materialname gold
+editable 1024
+body_head -1
+gen_sp_armour 12
+editor_folder armour/helmet
+end
 Object helmet
 name helmet
 name_pl helmets
@@ -4007,6 +4026,28 @@
 no_pick 1
 editor_folder construct/barrack
 end
+Object barrack_long_goth
+name kaserne
+type 66
+face barrack_l_goth.x11
+animation barrack_long_goth
+speed -0.1
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/barrack
+end
+More
+Object barrack_long_2_goth
+name kaserne
+type 66
+face barrack_l_goth.x11
+animation barrack_long_2_goth
+speed -0.1
+x 1
+no_pick 1
+editor_folder construct/barrack
+end
 Object barrack_small
 name small barrack
 type 66
@@ -4016,6 +4057,15 @@
 client_type 25012
 editor_folder construct/barrack
 end
+Object barrack_small_goth
+name kleine kaserne
+type 66
+face barrack_s_goth.111
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/barrack
+end
 Object barrack_up
 name barrack
 type 66
@@ -4463,7 +4513,7 @@
 Object fort_2
 name fortress
 type 66
-face fort.211
+face fort.111
 x 1
 no_pick 1
 editor_folder construct/fort
@@ -4472,7 +4522,7 @@
 Object fort_3
 name fortress
 type 66
-face fort.311
+face fort.111
 y 1
 no_pick 1
 editor_folder construct/fort
@@ -4481,7 +4531,7 @@
 Object fort_4
 name fortress
 type 66
-face fort.411
+face fort.111
 x 1
 y 1
 no_pick 1
@@ -5041,6 +5091,97 @@
 no_pass 1
 editor_folder construct/hold
 end
+Object stronghold_greyshield
+type 66
+face stronghold_greyshield.x11
+no_pick 1
+no_pass 1
+editable 2
+editor_folder construct/hold
+end
+More
+Object stronghold_2_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+x 1
+no_pick 1
+no_pass 1
+editor_folder construct/hold
+end
+More
+Object stronghold_3_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+x 2
+no_pick 1
+no_pass 1
+editor_folder construct/hold
+end
+More
+Object stronghold_4_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+y 1
+no_pick 1
+no_pass 1
+editor_folder construct/hold
+end
+More
+Object stronghold_5_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+x 1
+y 1
+no_pick 1
+no_pass 1
+editor_folder construct/hold
+end
+More
+Object stronghold_6_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+x 2
+y 1
+no_pick 1
+no_pass 1
+editor_folder construct/hold
+end
+More
+Object stronghold_7_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+y 2
+no_pick 1
+no_pass 1
+editor_folder construct/hold
+end
+More
+Object stronghold_8_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+x 1
+y 2
+no_pick 1
+editor_folder construct/hold
+end
+More
+Object stronghold_9_greyshield
+name stronghold
+type 66
+face stronghold_greyshield.x11
+x 2
+y 2
+no_pick 1
+no_pass 1
+editor_folder construct/hold
+end
 Object stronghold_northwest
 type 66
 face stronghold_northwest.x11
@@ -5477,6 +5618,48 @@
 editor_folder construct/house
 end
 
+Object inn_goth
+name gasthaus
+face inn_goth.x11
+type 66
+blocksview 1
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/house
+end
+More
+Object inn_goth_2
+name gasthaus
+face inn_goth.x11
+type 66
+blocksview 1
+x 1
+no_pick 1
+editor_folder construct/house
+end
+
+Object inn_west
+name inn
+face inn_west.x11
+type 66
+blocksview 1
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/house
+end
+More
+Object inn_west_2
+name inn
+face inn_west.x11
+type 66
+blocksview 1
+x 1
+no_pick 1
+editor_folder construct/house
+end
+
 Object minihouse
 name small house
 type 66
@@ -5817,6 +6000,43 @@
 y 1
 editor_folder construct/keep
 end
+Object keep_goth
+name unterhalt
+type 66
+face keep_goth.x11
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/keep
+end
+More
+Object keep_goth_2
+name unterhalt
+type 66
+face keep_goth.x11
+no_pick 1
+x 1
+editor_folder construct/keep
+end
+More
+Object keep_goth_3
+name unterhalt
+type 66
+face keep_goth.x11
+no_pick 1
+y 1
+editor_folder construct/keep
+end
+More
+Object keep_goth_4
+name unterhalt
+type 66
+face keep_goth.x11
+no_pick 1
+x 1
+y 1
+editor_folder construct/keep
+end
 Object keep_sym
 name keep
 face keep_sym.111
@@ -6203,6 +6423,24 @@
 y 1
 editor_folder construct/tower
 end
+Object city_tower_goth
+name aufsatz
+type 66
+face city_tower_goth.x11
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/tower
+end
+More
+Object city_tower_goth_2
+name aufsatz
+type 66
+face city_tower_goth.x11
+no_pick 1
+y 1
+editor_folder construct/tower
+end
 Object city_tower_northwest
 name tower
 type 66
@@ -6238,6 +6476,43 @@
 y 1
 editor_folder construct/tower
 end
+Object observatory_tower
+name observatory tower
+type 66
+face observatory_tower.x11
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/tower
+end
+More
+Object observatory_tower_2
+name observatory tower
+type 66
+face observatory_tower.x11
+no_pick 1
+x 1
+editor_folder construct/tower
+end
+More
+Object observatory_tower_3
+name observatory tower
+type 66
+face observatory_tower.x11
+no_pick 1
+y 1
+editor_folder construct/tower
+end
+More
+Object observatory_tower_4
+name observatory tower
+type 66
+face observatory_tower.x11
+no_pick 1
+x 1
+y 1
+editor_folder construct/tower
+end
 Object outpost_tower
 name outpost tower
 type 66
@@ -6423,6 +6698,15 @@
 client_type 25012
 editor_folder construct/tower
 end
+Object tower_tob_goth
+name aufsatz
+type 66
+face tower_tob_goth.111
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/tower
+end
 Object tower_tob_northwest
 name tower
 type 66
@@ -6666,6 +6950,43 @@
 y 1
 editor_folder construct/town
 end
+Object barn_goth
+name stall
+type 66
+face barn_goth.x11
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/town
+end
+More
+Object barn_goth_2
+name stall
+type 66
+face barn_goth.x11
+no_pick 1
+x 1
+editor_folder construct/town
+end
+More
+Object barn_goth_3
+name stall
+type 66
+face barn_goth.x11
+no_pick 1
+y 1
+editor_folder construct/town
+end
+More
+Object barn_goth_4
+name stall
+type 66
+face barn_goth.x11
+no_pick 1
+x 1
+y 1
+editor_folder construct/town
+end
 Object barn_west
 name barn
 type 66
@@ -7166,6 +7487,43 @@
 no_pick 1
 editor_folder construct/town
 end
+Object church_goth
+name kirche
+type 66
+face church_goth.x11
+no_pick 1
+editable 2
+client_type 25012
+editor_folder construct/town
+end
+More
+Object church_2_goth
+name kirche
+type 66
+face church_goth.x11
+x 1
+no_pick 1
+editor_folder construct/town
+end
+More
+Object church_3_goth
+name kirche
+type 66
+face church_goth.x11
+y 1
+no_pick 1
+editor_folder construct/town
+end
+More
+Object church_4_goth
+name kirche
+type 66
+face church_goth.x11
+x 1
+y 1
+no_pick 1
+editor_folder construct/town
+end
 Object collesium
 name collesium
 face collesium.x11
@@ -7423,6 +7781,45 @@
 y 1
 editor_folder construct/town
 end
+Object guild_goth
+name zunft
+face guild_goth.x11
+type 66
+no_pick 1
+no_pass 1
+editable 2
+client_type 25012
+editor_folder construct/town
+end
+More
+Object guild_goth_2
+name zunft
+face guild_goth.x11
+type 66
+no_pick 1
+no_pass 1
+x 1
+editor_folder construct/town
+end
+More
+Object guild_goth_3
+name zunft
+face guild_goth.x11
+type 66
+no_pick 1
+y 1
+editor_folder construct/town
+end
+More
+Object guild_goth_4
+name zunft
+face guild_goth.x11
+type 66
+no_pick 1
+x 1
+y 1
+editor_folder construct/town
+end
 Object guild_northwest
 face guild_northwest.x11
 type 66
@@ -7498,6 +7895,44 @@
 y 1
 editor_folder construct/town
 end
+Object guildtwo_west
+face guildtwo_west.x11
+type 66
+no_pick 1
+no_pass 1
+editable 2
+client_type 25012
+editor_folder construct/town
+end
+More
+Object guildtwo_2_west
+name guild
+face guildtwo_west.x11
+type 66
+no_pick 1
+no_pass 1
+x 1
+editor_folder construct/town
+end
+More
+Object guildtwo_3_west
+name guild
+face guildtwo_west.x11
+type 66
+no_pick 1
+y 1
+editor_folder construct/town
+end
+More
+Object guildtwo_4_west
+name guild
+face guildtwo_west.x11
+type 66
+no_pick 1
+x 1
+y 1
+editor_folder construct/town
+end
 Object hovels
 name houses
 face hovels.111
@@ -7557,7 +7992,7 @@
 More
 Object l_shop1_2
 name shop
-face l_shop1.211
+face l_shop1.111
 type 66
 no_pick 1
 no_pass 1
@@ -7567,7 +8002,7 @@
 More
 Object l_shop1_3
 name shop
-face l_shop1.311
+face l_shop1.111
 type 66
 no_pick 1
 y 1
@@ -7576,7 +8011,7 @@
 More
 Object l_shop1_4
 name shop
-face l_shop1.411
+face l_shop1.111
 type 66
 no_pick 1
 x 1
@@ -7641,7 +8076,7 @@
 editor_folder construct/town
 end
 Object prison
-face prison.111
+face prison.x11
 type 66
 no_pick 1
 no_pass 1
@@ -7652,7 +8087,7 @@
 More
 Object prison_2
 name prison
-face prison.211
+face prison.x11
 type 66
 no_pick 1
 no_pass 1
@@ -7662,7 +8097,7 @@
 More
 Object prison_3
 name prison
-face prison.311
+face prison.x11
 type 66
 no_pick 1
 y 1
@@ -7671,7 +8106,7 @@
 More
 Object prison_4
 name prison
-face prison.411
+face prison.x11
 type 66
 no_pick 1
 x 1
@@ -7717,6 +8152,45 @@
 y 1
 editor_folder construct/town
 end
+Object prison_goth
+name gefangnis
+face prison_goth.111
+type 66
+no_pick 1
+no_pass 1
+editable 2
+client_type 25012
+editor_folder construct/town
+end
+More
+Object prison_2_goth
+name gefangnis
+face prison_goth.111
+type 66
+no_pick 1
+no_pass 1
+x 1
+editor_folder construct/town
+end
+More
+Object prison_3_goth
+name gefangnis
+face prison_goth.111
+type 66
+no_pick 1
+y 1
+editor_folder construct/town
+end
+More
+Object prison_4_goth
+name gefangnis
+face prison_goth.111
+type 66
+no_pick 1
+x 1
+y 1
+editor_folder construct/town
+end
 Object r_house1
 name appartments
 face r_house1.111
@@ -8782,6 +9256,7 @@
 Object leprous_skin
 name leprous flake of skin
 face skin.111
+material 32
 type 72
 food 5
 weight 7
@@ -11038,6 +11513,38 @@
 client_type 25012
 editor_folder floor/Afloor
 end
+Object afloor_black_right
+name a floor
+face afloor_black.131
+no_pick 1
+is_floor 1
+editable 8
+editor_folder floor/Afloor
+end
+Object afloor_black_left
+name a floor
+face afloor_black.171
+no_pick 1
+is_floor 1
+editable 8
+editor_folder floor/Afloor
+end
+Object ahole_black_right
+face ahole_black.131
+type 66
+no_pick 1
+editable 2
+client_type 25012
+editor_folder floor/Afloor
+end
+Object ahole_black_left
+face ahole_black.171
+type 66
+no_pick 1
+editable 2
+client_type 25012
+editor_folder floor/Afloor
+end
 Object afloor_blue_right
 name a floor
 face afloor_blue.131
@@ -11070,6 +11577,38 @@
 client_type 25012
 editor_folder floor/Afloor
 end
+Object afloor_dark_right
+name a floor
+face afloor_dark.131
+no_pick 1
+is_floor 1
+editable 8
+editor_folder floor/Afloor
+end
+Object afloor_dark_left
+name a floor
+face afloor_dark.171
+no_pick 1
+is_floor 1
+editable 8
+editor_folder floor/Afloor
+end
+Object ahole_dark_right
+face ahole_dark.131
+type 66
+no_pick 1
+editable 2
+client_type 25012
+editor_folder floor/Afloor
+end
+Object ahole_dark_left
+face ahole_dark.171
+type 66
+no_pick 1
+editable 2
+client_type 25012
+editor_folder floor/Afloor
+end
 Object afloor_magenta_right
 name a floor
 face afloor_magenta.131
@@ -11109,6 +11648,35 @@
 smoothlevel 30
 editor_folder floor
 end
+Object blacklostlabfloor5
+face blacklostlabfloor5.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object blacklostlabfloor7
+face blacklostlabfloor7.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object blacklostlabfloor8
+face blacklostlabfloor8.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
 Object blackmarble
 face blackmarble.111
 no_pick 1
@@ -11202,6 +11770,7 @@
 is_floor 1
 editable 8
 smoothlevel 29
+move_block boat swim
 editor_folder floor
 end
 Object goldfloor
@@ -12097,6 +12666,214 @@
 smoothlevel 30
 editor_folder floor
 end
+Object lostlabfloor
+face lostlabfloor.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor2
+face lostlabfloor2.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor3
+face lostlabfloor3.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor4
+face lostlabfloor4.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor5
+face lostlabfloor5.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor6
+face lostlabfloor6.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor7
+face lostlabfloor7.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor8
+face lostlabfloor8.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor9
+face lostlabfloor9.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor10
+face lostlabfloor10.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor11
+face lostlabfloor11.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor12
+face lostlabfloor12.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor13
+face lostlabfloor13.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor14
+face lostlabfloor14.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor15
+face lostlabfloor15.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabfloor16
+face lostlabfloor16.111
+name floor
+no_pick 1
+is_floor 1
+editable 8
+smoothlevel 30
+editor_folder floor
+end
+
+Object lostlabrug1
+name rug
+face lostlabrug1.111
+no_pick 1
+editable 8
+editor_folder floor
+end
+
+Object lostlabrug2
+name rug
+face lostlabrug2.111
+no_pick 1
+editable 8
+editor_folder floor
+end
+
+Object lostlabrug3
+name rug
+face lostlabrug3.111
+no_pick 1
+editable 8
+editor_folder floor
+end
+
+Object lostlabrug4
+name rug
+face lostlabrug1.112
+no_pick 1
+editable 8
+editor_folder floor
+end
+
+Object lostlabrug5
+name rug
+face lostlabrug2.112
+no_pick 1
+editable 8
+editor_folder floor
+end
+
+Object lostlabrug6
+name rug
+face lostlabrug3.112
+no_pick 1
+editable 8
+editor_folder floor
+end
+
 Object magentamarble
 face magentamarble.111
 no_pick 1
@@ -12168,6 +12945,14 @@
 editor_folder floor
 end
 
+Object redrugfloor1
+name red rug
+face redrugfloor1.111
+no_pick 1
+is_floor 1
+editable 8
+editor_folder floor
+end
 Object sewerfloor 
 name Sewer Floor
 face sewerfloor.111
@@ -12250,6 +13035,14 @@
 editable 136
 editor_folder floor
 end
+Object whiterugfloor1
+name white rug
+face whiterugfloor1.111
+no_pick 1
+is_floor 1
+editable 8
+editor_folder floor
+end
 Object woodfloor
 face woodfloor.111
 no_pick 1
@@ -12350,6 +13143,20 @@
 client_type 601
 editor_folder food
 end
+Object banana
+face banana.111
+food 50
+nrof 1
+type 6
+material 32
+value 2
+weight 100
+editable 2048
+identified 1
+name_pl bannanas
+client_type 601
+editor_folder food
+end
 Object blackroot
 name blackroot
 face blackroot.111
@@ -12437,6 +13244,21 @@
 client_type 601
 editor_folder food
 end
+Object cherry
+name cherries
+face cherry.111
+food 15
+nrof 1
+type 6
+material 32
+value 2
+weight 100
+editable 2048
+identified 1
+name_pl cherries
+client_type 601
+editor_folder food
+end
 Object chocolate
 face chocolate.111
 food 50
@@ -12541,6 +13363,21 @@
 editable 9
 editor_folder food
 end
+Object grape
+name grapes
+face grape.111
+food 25
+nrof 1
+type 6
+material 32
+value 2
+weight 100
+editable 2048
+identified 1
+name_pl grapes
+client_type 601
+editor_folder food
+end
 Object haggis
 name haggis
 face haggis.111
@@ -12571,6 +13408,22 @@
 client_type 601
 editor_folder food
 end
+Object lemon
+name lemon
+face lemon.111
+food 22
+nrof 1
+need_an 1
+type 6
+material 32
+value 2
+weight 100
+editable 2048
+identified 1
+name_pl lemons
+client_type 601
+editor_folder food
+end
 Object loaf
 name bread
 face loaf.111
@@ -12719,6 +13572,20 @@
 client_type 601
 editor_folder food
 end
+Object pineapple
+face pineapple.111
+food 100
+nrof 1
+type 6
+material 32
+value 2
+weight 100
+editable 2048
+identified 1
+name_pl pineapples
+client_type 601
+editor_folder food
+end
 Object pipeweed
 name pipeweed
 face pipeweed.111
@@ -12920,6 +13787,20 @@
 client_type 601
 editor_folder food
 end
+Object strawberry
+face strawberry.111
+food 20
+nrof 1
+type 6
+material 32
+value 2
+weight 100
+editable 2048
+identified 1
+name_pl strawberries
+client_type 601
+editor_folder food
+end
 Object tomato
 name tomato
 face tomato.111
@@ -13486,9 +14367,9 @@
 wc -1
 dam 50
 hp 500
+maxhp 500
 last_heal 2
 last_grace 3
-maxhp 500
 level 15
 speed 0.18
 can_cast_spell 1
@@ -14657,19 +15538,19 @@
 Object Valriel
 title Gorokh
 face archangel.115
-slaying demon
 race angel
+slaying demon
 animation archangle
+is_animated 1
+monster 1
+alive 1
 Str 30
 Con 30
 Dex 30
 Int 30
 Wis 30
 Pow 30
-is_animated 1
 type 50
-monster 1
-alive 1
 attacktype 4194304
 path_attuned 1025
 path_denied 393216
@@ -14678,9 +15559,9 @@
 resist_fear 100
 ac -7
 wc -1
+dam 50
 hp 350
 maxhp 350
-dam 50
 level 15
 speed 0.25
 can_cast_spell 1
@@ -15532,6 +16413,25 @@
 smoothlevel 24
 editor_folder ground/Winter
 end
+Object evil_ice
+type 102
+subtype 7
+level 1
+walk_on 1
+wc -30
+lifesave 1
+name strange looking ice
+face evil_ice.111
+animation evil_ice
+speed 0.2
+no_pick 1
+attacktype 16
+hp 1
+dam 10
+editable 8
+is_floor 1
+editor_folder ground/Winter
+end
 Object glacier
 name glacier
 face glacier.111
@@ -15598,6 +16498,25 @@
 smoothlevel 3
 editor_folder ground/Winter
 end
+Object nasty_ice
+type 102
+subtype 7
+level 1
+walk_on 1
+wc -30
+lifesave 1
+name very cold ice
+face nasty_ice.111
+animation nasty_ice
+speed 0.2
+no_pick 1
+attacktype 16
+hp 1
+dam 5
+editable 8
+is_floor 1
+editor_folder ground/Winter
+end
 Object s_tree5
 name snow covered tree
 face s_tree_5.x11
@@ -15977,6 +16896,7 @@
 is_floor 1
 editable 8
 smoothlevel 50
+move_block boat swim
 editor_folder ground
 end
 Object blood_sea
@@ -15991,6 +16911,7 @@
 is_water 1
 editable 8
 is_floor 1
+move_block all -boat
 editor_folder ground
 end
 Object brefjell
@@ -16197,6 +17118,22 @@
 move_block boat swim
 editor_folder ground
 end
+Object filth
+name stinking filth
+type 138
+face filth.111
+speed -0.07
+animation filth
+materialname feces
+no_pick 1
+is_water 1
+walk_on 1
+slow_move 5
+editable 8
+smoothlevel 8
+is_floor 1
+editor_folder ground
+end
 Object flowers_permanent
 name flower
 material 32
@@ -16390,6 +17327,133 @@
 move_block boat swim
 editor_folder ground
 end
+Object lostlabdesert
+name desert
+face lostlabdesert.111
+type 67
+race /terrain/desert
+walk_on 1
+no_pick 1
+slow_move 1
+is_wooded 1
+is_floor 1
+smoothlevel 37
+editable 8
+move_block boat swim
+editor_folder ground
+end
+
+Object lostlabdesert2
+name desert mountain
+face lostlabdesert2.111
+type 67
+race /terrain/desert
+walk_on 1
+no_pick 1
+is_wooded 1
+is_floor 1
+blocksview 1
+is_hilly 1
+slow_move 5
+smoothlevel 37
+editable 8
+move_block boat swim
+editor_folder ground
+end
+
+Object lostlabdesert3
+name desert
+face lostlabdesert3.111
+type 67
+race /terrain/desert
+walk_on 1
+no_pick 1
+slow_move 1
+is_wooded 1
+is_floor 1
+smoothlevel 37
+editable 8
+move_block boat swim
+editor_folder ground
+end
+
+Object lostlabdesert4
+name desert
+face lostlabdesert4.111
+type 67
+race /terrain/desert
+walk_on 1
+no_pick 1
+slow_move 1
+is_wooded 1
+is_floor 1
+smoothlevel 37
+editable 8
+move_block boat swim
+editor_folder ground
+end
+
+Object lostlabdesert5
+name desert
+face lostlabdesert5.111
+type 67
+race /terrain/desert
+walk_on 1
+no_pick 1
+slow_move 1
+is_wooded 1
+is_floor 1
+smoothlevel 37
+editable 8
+move_block boat swim
+editor_folder ground
+end
+
+Object lostlabgreysand
+name sand
+face lostlabgreysand.111
+type 67
+walk_on 1
+no_pick 1
+slow_move 1
+is_wooded 1
+is_floor 1
+smoothlevel 37
+editable 8
+move_block boat swim
+editor_folder ground
+end
+
+Object lostlabbluesand
+name sand
+face lostlabbluesand.111
+type 67
+walk_on 1
+no_pick 1
+slow_move 1
+is_wooded 1
+is_floor 1
+smoothlevel 37
+editable 8
+move_block boat swim
+editor_folder ground
+end
+
+Object lostlabwater
+name strange water
+face lostlabwater.111
+animation lostlabwater
+speed 0.2
+move_block all -boat
+no_pick 1
+is_water 1
+editable 8
+is_floor 1
+smoothlevel 21
+editor_folder ground
+end
+
+
 Object marsh
 face marsh.111
 type 67
@@ -16416,6 +17480,7 @@
 smoothlevel 36
 is_floor 1
 editable 8
+move_block boat swim
 editor_folder ground/new
 end
 Object earth
@@ -16429,6 +17494,7 @@
 is_wooded 1
 editable 8
 smoothlevel 11
+move_block boat swim
 editor_folder ground/new
 end
 Object fernsdense
@@ -16475,6 +17541,7 @@
 is_wooded 1
 editable 8
 smoothlevel 38
+move_block boat swim
 editor_folder ground/new
 end
 Object grassbrown
@@ -16488,6 +17555,7 @@
 is_wooded 1
 editable 8
 smoothlevel 37
+move_block boat swim
 editor_folder ground/new
 end
 Object grassdark
@@ -16501,6 +17569,7 @@
 is_wooded 1
 editable 8
 smoothlevel 39
+move_block boat swim
 editor_folder ground/new
 end
 Object grassmedium
@@ -16514,6 +17583,7 @@
 is_wooded 1
 editable 8
 smoothlevel 41
+move_block boat swim
 editor_folder ground/new
 end
 Object palm
@@ -16548,13 +17618,11 @@
 is_water 1
 editable 8
 is_floor 1
+move_block all -boat
 editor_folder ground
 end
 
 Object oil_sea_ultra_viscous
-#So thick you can almost walk on it (To be used where on needs walk-on-able/nonblocking oil)
-#(ex: some random maps). For most applications you should use the regular oil_sea
-#which will be swimable as water is (but much slower swiming ofcourse)
 face oil_sea.111
 animation oil_sea_ultra_viscous
 name ultra viscous oil
@@ -16581,6 +17649,7 @@
 is_water 1
 editable 8
 is_floor 1
+move_block all -boat
 editor_folder ground
 end
 
@@ -19250,6 +20319,984 @@
 client_type 2005
 editor_folder jewel
 end
+Object Nimdoorcl1
+name Energy barrier
+no_pass 1
+no_pick 1
+blocksview 1
+face Nimdoorcl1.111
+animation Nimdoorcl1
+is_animated 1
+is_door 1
+speed 0.2
+hp 400
+exp 1
+ac 10
+material 512
+alive 1
+level 1
+editable 16
+editor_folder julian
+end
+Object Nimdoorcl2
+name Energy barrier
+no_pass 1
+no_pick 1
+blocksview 1
+face Nimdoorcl2.111
+animation Nimdoorcl2
+is_animated 1
+is_door 1
+speed 0.2
+hp 400
+exp 1
+ac 10
+material 512
+alive 1
+level 1
+editable 16
+editor_folder julian
+end
+Object Nimdoorop1
+name Energy field
+no_pass 0
+no_pick 1
+blocksview 1
+face Nimdoorop1.111
+animation Nimdoorop1
+is_animated 1
+speed 0.2
+material 512
+editor_folder julian
+end
+Object Nimdoorop2
+name Energy field
+no_pass 0
+no_pick 1
+blocksview 1
+face Nimdoorop2.111
+animation Nimdoorop2
+is_animated 1
+speed 0.2
+material 512
+editor_folder julian
+end
+Object Nimfloor0101
+name Nimbus
+face Nimfloor0101.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0201
+name Nimbus
+face Nimfloor0201.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0301
+name Nimbus
+face Nimfloor0301.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0401
+name Nimbus
+face Nimfloor0401.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0501
+name Nimbus
+face Nimfloor0501.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0601
+name Nimbus
+face Nimfloor0601.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0701
+name Nimbus
+face Nimfloor0701.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0801
+name Nimbus
+face Nimfloor0801.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0901
+name Nimbus
+face Nimfloor0901.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1001
+name Nimbus
+face Nimfloor1001.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0102
+name Nimbus
+face Nimfloor0102.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0202
+name Nimbus
+face Nimfloor0202.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0302
+name Nimbus
+face Nimfloor0302.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0402
+name Nimbus
+face Nimfloor0402.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0502
+name Nimbus
+face Nimfloor0502.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0602
+name Nimbus
+face Nimfloor0602.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0702
+name Nimbus
+face Nimfloor0702.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0802
+name Nimbus
+face Nimfloor0802.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0902
+name Nimbus
+face Nimfloor0902.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1002
+name Nimbus
+face Nimfloor1002.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0103
+name Nimbus
+face Nimfloor0103.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0203
+name Nimbus
+face Nimfloor0203.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0303
+name Nimbus
+face Nimfloor0303.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0403
+name Nimbus
+face Nimfloor0403.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0503
+name Nimbus
+face Nimfloor0503.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0603
+name Nimbus
+face Nimfloor0603.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0703
+name Nimbus
+face Nimfloor0703.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0803
+name Nimbus
+face Nimfloor0803.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0903
+name Nimbus
+face Nimfloor0903.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1003
+name Nimbus
+face Nimfloor1003.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0104
+name Nimbus
+face Nimfloor0104.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0204
+name Nimbus
+face Nimfloor0204.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0304
+name Nimbus
+face Nimfloor0304.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0404
+name Nimbus
+face Nimfloor0404.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0504
+name Nimbus
+face Nimfloor0504.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0604
+name Nimbus
+face Nimfloor0604.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0704
+name Nimbus
+face Nimfloor0704.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0804
+name Nimbus
+face Nimfloor0804.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0904
+name Nimbus
+face Nimfloor0904.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1004
+name Nimbus
+face Nimfloor1004.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0105
+name Nimbus
+face Nimfloor0105.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0205
+name Nimbus
+face Nimfloor0205.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0305
+name Nimbus
+face Nimfloor0305.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0405
+name Nimbus
+face Nimfloor0405.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0505
+name Nimbus
+face Nimfloor0505.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0605
+name Nimbus
+face Nimfloor0605.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0705
+name Nimbus
+face Nimfloor0705.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0805
+name Nimbus
+face Nimfloor0805.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0905
+name Nimbus
+face Nimfloor0905.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1005
+name Nimbus
+face Nimfloor1005.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0106
+name Nimbus
+face Nimfloor0106.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0206
+name Nimbus
+face Nimfloor0206.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0306
+name Nimbus
+face Nimfloor0306.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0406
+name Nimbus
+face Nimfloor0406.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0506
+name Nimbus
+face Nimfloor0506.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0606
+name Nimbus
+face Nimfloor0606.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0706
+name Nimbus
+face Nimfloor0706.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0806
+name Nimbus
+face Nimfloor0806.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0906
+name Nimbus
+face Nimfloor0906.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1006
+name Nimbus
+face Nimfloor1006.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0107
+name Nimbus
+face Nimfloor0107.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0207
+name Nimbus
+face Nimfloor0207.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0307
+name Nimbus
+face Nimfloor0307.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0407
+name Nimbus
+face Nimfloor0407.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0507
+name Nimbus
+face Nimfloor0507.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0607
+name Nimbus
+face Nimfloor0607.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0707
+name Nimbus
+face Nimfloor0707.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0807
+name Nimbus
+face Nimfloor0807.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0907
+name Nimbus
+face Nimfloor0907.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1007
+name Nimbus
+face Nimfloor1007.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0108
+name Nimbus
+face Nimfloor0108.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0208
+name Nimbus
+face Nimfloor0208.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0308
+name Nimbus
+face Nimfloor0308.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0408
+name Nimbus
+face Nimfloor0408.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0508
+name Nimbus
+face Nimfloor0508.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0608
+name Nimbus
+face Nimfloor0608.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0708
+name Nimbus
+face Nimfloor0708.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0808
+name Nimbus
+face Nimfloor0808.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0908
+name Nimbus
+face Nimfloor0908.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1008
+name Nimbus
+face Nimfloor1008.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0109
+name Nimbus
+face Nimfloor0109.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0209
+name Nimbus
+face Nimfloor0209.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0309
+name Nimbus
+face Nimfloor0309.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0409
+name Nimbus
+face Nimfloor0409.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0509
+name Nimbus
+face Nimfloor0509.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0609
+name Nimbus
+face Nimfloor0609.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0709
+name Nimbus
+face Nimfloor0709.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0809
+name Nimbus
+face Nimfloor0809.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0909
+name Nimbus
+face Nimfloor0909.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1009
+name Nimbus
+face Nimfloor1009.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0110
+name Nimbus
+face Nimfloor0110.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0210
+name Nimbus
+face Nimfloor0210.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0310
+name Nimbus
+face Nimfloor0310.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0410
+name Nimbus
+face Nimfloor0410.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0510
+name Nimbus
+face Nimfloor0510.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0610
+name Nimbus
+face Nimfloor0610.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0710
+name Nimbus
+face Nimfloor0710.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0810
+name Nimbus
+face Nimfloor0810.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor0910
+name Nimbus
+face Nimfloor0910.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimfloor1010
+name Nimbus
+face Nimfloor1010.111
+no_pick 1
+is_floor 1
+editor_folder julian
+end
+Object Nimground1
+name Nexus
+face Nimground1.111
+no_pick 1
+editable 8
+is_floor 1
+editor_folder julian
+end
+Object Nimground2
+name Nexus
+face Nimground2.111
+no_pick 1
+editable 8
+is_floor 1
+editor_folder julian
+end
+Object Nimground3
+name Nexus
+face Nimground3.111
+no_pick 1
+editable 8
+is_floor 1
+editor_folder julian
+end
+Object Nimwall_0
+name Pulsating Nexus
+face Nimwall12.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_0
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_1_1
+name Pulsating Nexus
+face Nimwall13.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_1_1
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_1_2
+name Pulsating Nexus
+face Nimwall14.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_1_2
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_1_4
+name Pulsating Nexus
+face Nimwall15.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_1_4
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_1_3
+name Pulsating Nexus
+face Nimwall16.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_1_3
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_2_1_1
+name Pulsating Nexus
+face Nimwall1.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_2_1_1
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_2_2_4
+name Pulsating Nexus
+face Nimwall2.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_2_2_4
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_2_1_2
+name Pulsating Nexus
+face Nimwall3.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_2_1_2
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_2_2_2
+name Pulsating Nexus
+face Nimwall4.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_2_2_2
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_2_2_1
+name Pulsating Nexus
+face Nimwall5.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_2_2_1
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_2_2_3
+name Pulsating Nexus
+face Nimwall6.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+animation Nimwall_2_2_3
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_3_3
+name Pulsating Nexus
+face Nimwall7.111
+blocksview 1
+editable 512
+no_pass 1
+no_pick 1
+animation Nimwall_3_3
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_3_1
+name Pulsating Nexus
+face Nimwall8.111
+blocksview 1
+editable 512
+no_pass 1
+no_pick 1
+animation Nimwall_3_1
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_4
+name Pulsating Nexus
+face Nimwall9.111
+blocksview 1
+editable 512
+no_pass 1
+no_pick 1
+animation Nimwall_4
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_3_4
+name Pulsating Nexus
+face Nimwall10.111
+blocksview 1
+editable 512
+no_pass 1
+no_pick 1
+animation Nimwall_3_4
+is_animated 1
+speed 0.2
+editor_folder julian
+end
+Object Nimwall_3_2
+name Pulsating Nexus
+face Nimwall11.111
+blocksview 1
+editable 512
+no_pass 1
+no_pick 1
+animation Nimwall_3_2
+is_animated 1
+speed 0.2
+editor_folder julian
+end
 Object flint_and_steel
 face flint_and_steel.111
 name flint and steel
@@ -19460,6 +21507,7 @@
 auto_apply 1
 randomitems shop_building
 editable 64
+editor_folder arch/shop/Floors
 editor_folder mapbuilding
 end
 Object shop_building_fant
@@ -19472,6 +21520,7 @@
 auto_apply 1
 randomitems shop_building_fant
 editable 64
+editor_folder arch/shop/Floors
 editor_folder mapbuilding
 end
 Object shop_building_west
@@ -19484,6 +21533,7 @@
 auto_apply 1
 randomitems shop_building_west
 editable 64
+editor_folder arch/shop/Floors
 editor_folder mapbuilding
 end
 Object shop_building_east
@@ -19496,6 +21546,33 @@
 auto_apply 1
 randomitems shop_building_east
 editable 64
+editor_folder arch/shop/Floors
+editor_folder mapbuilding
+end
+Object shop_building_abyss
+name tiles
+is_floor 1
+face shop_building.111
+no_pick 1
+no_magic 1
+type 68
+auto_apply 1
+randomitems shop_building_abyss
+editable 64
+editor_folder arch/shop/Floors
+editor_folder mapbuilding
+end
+Object shop_building_goth
+name tiles
+is_floor 1
+face shop_building.111
+no_pick 1
+no_magic 1
+type 68
+auto_apply 1
+randomitems shop_building_goth
+editable 64
+editor_folder arch/shop/Floors
 editor_folder mapbuilding
 end
 Object building_woodfloor
@@ -19575,6 +21652,28 @@
 slaying ewall_0
 editor_folder mapbuilding
 end
+Object building_wall6
+name BurningWall material
+nrof 1
+weight 1700
+value 1650
+type 161
+subtype 2
+face mbburningwall_0.111
+slaying burningwall_0
+editor_folder mapbuilding
+end
+Object building_wall7
+name STWall material
+nrof 1
+weight 2100
+value 1850
+type 161
+subtype 2
+face mbstwall_0.111
+slaying stwall_0
+editor_folder mapbuilding
+end
 Object building_vertical_gate
 name Vertical gate material
 nrof 1
@@ -19653,6 +21752,39 @@
 face mbiron_gate_inv2.111
 editor_folder mapbuilding
 end
+Object building_magma
+name Magma floor material
+nrof 1
+weight 1500
+value 6666
+type 161
+subtype 1
+face mbmagma.111
+slaying magma
+editor_folder mapbuilding
+end
+Object building_redrugfloor1
+name Red Rug floor material
+nrof 1
+weight 500
+value 16000
+type 161
+subtype 1
+face mbredrugfloor1.111
+slaying redrugfloor1
+editor_folder mapbuilding
+end
+Object building_whiterugfloor1
+name White Rug floor material
+nrof 1
+weight 500
+value 16000
+type 161
+subtype 1
+face mbwhiterugfloor1.111
+slaying whiterugfloor1
+editor_folder mapbuilding
+end
 Object building_marble
 name White Marble floor material
 nrof 1
@@ -19730,6 +21862,17 @@
 slaying brazier
 editor_folder mapbuilding
 end
+Object building_hangingfirepot
+name Hanging Firepot material
+nrof 1
+weight 1500
+value 8500
+type 161
+subtype 3
+face mbhangingfirepot.111
+slaying hangingfirepot
+editor_folder mapbuilding
+end
 Object building_fireplace
 name Fireplace material
 nrof 1
@@ -19763,6 +21906,17 @@
 slaying sign
 editor_folder mapbuilding
 end
+Object building_altar_none
+name Altar material
+nrof 1
+weight 1500
+value 2500000
+type 161
+subtype 3
+face mbaltarnone.111
+slaying altar_none
+editor_folder mapbuilding
+end
 Object building_earbook
 name Listening book material
 nrof 1
@@ -20698,6 +22852,120 @@
 client_type 51
 editor_folder misc/Container
 end
+Object wallet1
+name wallet
+other_arch close_wallet1
+face wallet1.111
+type 122
+material 8
+value 50
+weight 75
+container 5000
+Str 10
+identified 1
+editable 128
+name_pl wallets
+client_type 60
+editor_folder misc/Container
+end
+Object close_wallet1
+name close the wallet
+face wallet1.111
+type 121
+no_drop 1
+no_pick 1
+identified 1
+editable 0
+editor_folder misc/Container
+end
+
+
+Object wallet2
+name wallet
+other_arch close_wallet2
+face wallet2.111
+type 122
+material 8
+materialname black leather
+value 100
+weight 75
+container 5000
+Str 10
+identified 1
+editable 128
+name_pl wallets
+client_type 60
+editor_folder misc/Container
+end
+Object close_wallet2
+name close the wallet
+face wallet2.111
+type 121
+no_drop 1
+no_pick 1
+identified 1
+editable 0
+editor_folder misc/Container
+end
+
+Object wallet3
+name wallet
+other_arch close_wallet3
+face wallet3.111
+type 122
+material 8
+materialname white leather
+value 100
+weight 75
+container 5000
+Str 10
+identified 1
+editable 128
+name_pl wallets
+client_type 60
+editor_folder misc/Container
+end
+Object close_wallet3
+name close the wallet
+face wallet3.111
+type 121
+no_drop 1
+no_pick 1
+identified 1
+editable 0
+editor_folder misc/Container
+end
+
+
+Object wallet4
+name wallet
+other_arch close_wallet4
+face wallet4.111
+type 122
+material 8
+materialname alligator skin
+value 500
+weight 75
+container 5000
+Str 10
+identified 1
+editable 128
+name_pl wallets
+client_type 60
+editor_folder misc/Container
+end
+Object close_wallet4
+name close the wallet
+face wallet4.111
+type 121
+no_drop 1
+no_pick 1
+identified 1
+editable 0
+editor_folder misc/Container
+end
+
+
 Object workbench
 name workbench
 face workbench.111
@@ -21342,6 +23610,173 @@
 client_type 601
 editor_folder misc
 end
+Object crashed_chandelier_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object crashed_chandelier_2_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+
+no_pick 1
+editable 128
+x 1
+editor_folder misc
+end
+More
+Object crashed_chandelier_3_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 2
+editor_folder misc
+end
+More
+Object crashed_chandelier_4_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 3
+editor_folder misc
+end
+More
+Object crashed_chandelier_5_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+y 1
+editor_folder misc
+end
+More
+Object crashed_chandelier_6_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 1
+y 1
+editor_folder misc
+end
+More
+Object crashed_chandelier_7_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 2
+y 1
+editor_folder misc
+end
+More
+Object crashed_chandelier_8_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 3
+y 1
+editor_folder misc
+end
+More
+Object crashed_chandelier_9_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+y 2
+editor_folder misc
+end
+More
+Object crashed_chandelier_10_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 1
+y 2
+editor_folder misc
+end
+More
+Object crashed_chandelier_11_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 2
+y 2
+editor_folder misc
+end
+More
+Object crashed_chandelier_12_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 3
+y 2
+editor_folder misc
+end
+More
+Object crashed_chandelier_13_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+y 3
+editor_folder misc
+end
+More
+Object crashed_chandelier_14_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 1
+y 3
+editor_folder misc
+end
+More
+Object crashed_chandelier_15_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 2
+y 3
+editor_folder misc
+end
+More
+Object crashed_chandelier_16_1
+name crashed grand chandelier
+face crashed_chandelier_1.111
+glow_radius 5
+no_pick 1
+editable 128
+x 3
+y 3
+editor_folder misc
+end
 Object d_statue
 face d_statue.111
 type 98
@@ -21351,6 +23786,46 @@
 editable 128
 editor_folder misc
 end
+Object evilpentagram
+name pentagram
+face evilpenta.111
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+Object evilpentagramgrey
+name pentagram
+face evilpentagrey.111
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+Object evilpentagramred
+name pentagram
+face evilpentared.111
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+Object evilpentagramdarkgrey
+name pentagram
+face evilpentadarkgrey.111
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+Object evilpentagramdarkred
+name pentagram
+face evilpentadarkred.111
+no_pick 1
+editable 128
+editor_folder misc
+end
+
 Object fireplace
 face fireplace.111
 animation fireplace
@@ -21588,6 +24063,66 @@
 body_arm -1
 editor_folder misc
 end
+Object minesweeper-unknown
+face minesweeper-unknown.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-0
+face minesweeper-0.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-1
+face minesweeper-1.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-2
+face minesweeper-2.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-3
+face minesweeper-3.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-4
+face minesweeper-4.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-5
+face minesweeper-5.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-6
+face minesweeper-6.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-7
+face minesweeper-7.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
+Object minesweeper-8
+face minesweeper-8.111
+no_pick 1
+editable 8
+editor_folder misc/minesweeper
+end
 Object naz_report
 name Nazgul Report
 msg
@@ -21620,6 +24155,15 @@
 editable 128
 editor_folder misc
 end
+
+Object pentaruby
+name pentagram
+face pentaruby.111
+no_pick 1
+editable 128
+editor_folder misc
+end
+
 Object pillars
 face pillars.111
 no_pick 1
@@ -21740,6 +24284,136 @@
 editor_folder misc
 end
 
+Object rescrystal
+name crystal
+face rescrystal.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal2
+name crystal
+face rescrystal2.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal3
+name crystal
+face rescrystal3.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal4
+name crystal
+face rescrystal4.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal5
+name crystal
+face rescrystal5.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal6
+name crystal
+face rescrystal6.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal7
+name crystal
+face rescrystal7.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal8
+name crystal
+face rescrystal8.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal9
+name crystal
+face rescrystal9.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal10
+name crystal
+face rescrystal10.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal11
+name crystal
+face rescrystal11.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal12
+name crystal
+face rescrystal12.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
+Object rescrystal13
+name crystal
+face rescrystal13.111
+no_pick 1
+material 0
+materialname crystal
+editable 8
+editor_folder misc
+end
+
 Object rock
 face rock.111
 material 64
@@ -21868,6 +24542,604 @@
 gen_sp_armour 1
 editor_folder misc/social
 end
+Object starofastaroth_0_0
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_1_0
+x 1
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_2_0
+x 2
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_3_0
+x 3
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_4_0
+x 4
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastaroth_0_1
+y 1
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_1_1
+x 1
+y 1
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_2_1
+x 2
+y 1
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_3_1
+x 3
+y 1
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_4_1
+x 4
+y 1
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastaroth_0_2
+y 2
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_1_2
+x 1
+y 2
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_2_2
+x 2
+y 2
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_3_2
+x 3
+y 2
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_4_2
+x 4
+y 2
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastaroth_0_3
+y 3
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_1_3
+x 1
+y 3
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_2_3
+x 2
+y 3
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_3_3
+x 3
+y 3
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_4_3
+x 4
+y 3
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+
+More
+Object starofastaroth_0_4
+y 4
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_1_4
+x 1
+y 4
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_2_4
+x 2
+y 4
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_3_4
+x 3
+y 4
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastaroth_4_4
+x 4
+y 4
+name Star of Astaroth
+face starofastaroth.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+Object starofastarothbig_0_0
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_1_0
+x 1
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_2_0
+x 2
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_3_0
+x 3
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_4_0
+x 4
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_5_0
+x 5
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastarothbig_0_1
+y 1
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_1_1
+x 1
+y 1
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_2_1
+x 2
+y 1
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_3_1
+x 3
+y 1
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_4_1
+x 4
+y 1
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_5_1
+x 5
+y 1
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastarothbig_0_2
+y 2
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_1_2
+x 1
+y 2
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_2_2
+x 2
+y 2
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_3_2
+x 3
+y 2
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_4_2
+x 4
+y 2
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_5_2
+x 5
+y 2
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastarothbig_0_3
+y 3
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_1_3
+x 1
+y 3
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_2_3
+x 2
+y 3
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_3_3
+x 3
+y 3
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_4_3
+x 4
+y 3
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_5_3
+x 5
+y 3
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastarothbig_0_4
+y 4
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_1_4
+x 1
+y 4
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_2_4
+x 2
+y 4
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_3_4
+x 3
+y 4
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_4_4
+x 4
+y 4
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_5_4
+x 5
+y 4
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
+More
+Object starofastarothbig_0_5
+y 5
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_1_5
+x 1
+y 5
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_2_5
+x 2
+y 5
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_3_5
+x 3
+y 5
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_4_5
+x 4
+y 5
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+More
+Object starofastarothbig_5_5
+x 5
+y 5
+name Star of Astaroth
+face starofastarothbig.x11
+no_pick 1
+editable 128
+editor_folder misc
+end
+
 Object statue
 face statue.111
 type 98
@@ -21985,6 +25257,43 @@
 is_thrown 1
 editor_folder misc
 end
+Object telescope1
+name telescope
+type 66
+face telescope1.x11
+no_pick 1
+editable 2
+client_type 25012
+editor_folder misc/telescope
+end
+More
+Object telescope1_2
+name telescope
+type 66
+face telescope1.x11
+no_pick 1
+x 1
+editor_folder misc/telescope
+end
+More
+Object telescope1_3
+name telescope
+type 66
+face telescope1.x11
+no_pick 1
+y 1
+editor_folder misc/telescope
+end
+More
+Object telescope1_4
+name telescope
+type 66
+face telescope1.x11
+no_pick 1
+x 1
+y 1
+editor_folder misc/telescope
+end
 Object ten_kilo
 nrof 1
 name 10 kilo
@@ -22152,6 +25461,97 @@
 editable 1
 editor_folder monster/acid
 end
+Object acidpriest
+name Acid priest
+race unnatural
+randomitems acidpriest_big
+face acidpriest.x12
+animation acidpriest
+exp 256000000
+monster 1
+alive 1
+no_pick 1
+flying 1
+see_invisible 1
+hp 80000
+maxhp 80000
+ac -120
+wc -100
+dam 95
+level 90
+speed 1.5
+weight 15000
+run_away 5
+hitback 1
+editable 1
+attack_movement 0
+movement_type 4
+attacktype 464323
+reflect_missile 1
+reflect_spell 1
+sp 500
+maxsp 800
+str 35
+dex 23
+con 40
+pow 60
+int 25
+resist_physical 98
+resist_magic 85
+resist_fire 85
+resist_electricity 60
+resist_cold 100
+resist_confusion 85
+resist_acid 100
+resist_drain 98
+resist_weaponmagic 10
+resist_death 60
+resist_chaos 85
+resist_godpower 85
+resist_holyword 85
+resist_blind 85
+path_attuned 393232
+path_repelled 589824
+can_see_in_dark 1
+can_cast_spell 1
+can_use_ring 1
+flying 1
+editor_folder monster/acid/acidpriest
+end
+More
+Object acidpriest_2
+name Acid priest
+face acidpriest.x12
+x 1
+animation acidpriest_2
+alive 1
+no_pick 1
+flying 1
+editor_folder monster/acid/acidpriest
+end
+More
+Object acidpriest_3
+name Acid priest
+face acidpriest.x12
+y 1
+animation acidpriest_3
+alive 1
+no_pick 1
+flying 1
+editor_folder monster/acid/acidpriest
+end
+More
+Object acidpriest_4
+name Acid priest
+face acidpriest.x12
+x 1
+y 1
+animation acidpriest_4
+alive 1
+no_pick 1
+flying 1
+editor_folder monster/acid/acidpriest
+end
 Object acid_sphere
 race slime
 name acid sphere
@@ -22464,7 +25864,7 @@
 body_finger 2
 body_arm 2
 body_range 1
-editor_folder monster/angel
+editor_folder monster/angel/angel
 end
 Object angel_knight
 name Angel Knight
@@ -22517,7 +25917,7 @@
 body_arm 2
 body_range 1
 randomitems all_spell_skills
-editor_folder monster/angel
+editor_folder monster/angel/angelknight
 end
 More
 Object angel_knight_2
@@ -22528,7 +25928,7 @@
 no_pick 1
 y 1
 weight 75000
-editor_folder monster/angel
+editor_folder monster/angel/angelknight
 end
 Object HighAngel
 randomitems high_angel
@@ -22600,7 +26000,7 @@
 body_finger 2
 body_arm 2
 body_range 1
-editor_folder monster/angel
+editor_folder monster/angel/archangel
 end
 Object ArchAngel
 randomitems archangel
@@ -22671,7 +26071,7 @@
 body_finger 2
 body_arm 2
 body_range 1
-editor_folder monster/angel
+editor_folder monster/angel/archangel
 end
 More
 Object ArchAngel_2
@@ -22683,7 +26083,7 @@
 no_pick 1
 x 1
 weight 75000
-editor_folder monster/angel
+editor_folder monster/angel/archangel
 end
 More
 Object ArchAngel_3
@@ -22695,7 +26095,7 @@
 no_pick 1
 y 1
 weight 75000
-editor_folder monster/angel
+editor_folder monster/angel/archangel
 end
 More
 Object ArchAngel_4
@@ -22708,7 +26108,7 @@
 y 1
 x 1
 weight 75000
-editor_folder monster/angel
+editor_folder monster/angel/archangel
 end
 More
 Object ArchAngel_5
@@ -22721,7 +26121,7 @@
 y 2
 x 0
 weight 75000
-editor_folder monster/angel
+editor_folder monster/angel/archangel
 end
 More
 Object ArchAngel_6
@@ -22734,7 +26134,7 @@
 y 2
 x 1
 weight 75000
-editor_folder monster/angel
+editor_folder monster/angel/archangel
 end
 Object cherub
 race angel
@@ -22762,6 +26162,172 @@
 editable 1
 editor_folder monster/angel
 end
+Object darkangel
+randomitems darkangel
+race angel
+name angel of darkness
+face darkangel.111
+animation darkangel
+monster 1
+sleep 1
+Wis 15
+see_invisible 1
+no_pick 1
+alive 1
+exp 60000
+ac -80
+wc -106
+dam 55
+Pow 30
+maxsp 300
+sp 300
+hp 3000
+maxhp 3000
+Int 30
+Con 30
+level 115
+resist_magic 100
+resist_turn_undead 100
+resist_paralyze 100
+resist_fear 100
+resist_confusion 100
+resist_blind 90
+resist_ghosthit 90
+resist_holyword 40
+resist_physical 25
+resist_chaos 25
+resist_electricity 25
+resist_godpower 25
+resist_slow 25
+resist_weaponmagic 25
+resist_poison 25
+resist_drain 25
+resist_acid 25
+resist_cancellation 25
+resist_cold 25
+resist_counterspell 25
+resist_deplete 25
+resist_electricity 25
+speed 0.3
+weight 75000
+flying 1
+run_away 18
+will_apply 2
+pick_up 24
+can_apply 25
+can_use_scroll 1
+can_use_skill 1
+can_use_wand 1
+can_use_rod 1
+can_cast_spell 1
+can_use_bow 1
+can_use_shield 1
+can_use_armour 1
+can_use_weapon 1
+can_use_ring 1
+attacktype 1048577
+editable 1
+body_skill 1
+body_torso 1
+body_head 1
+body_shoulder 1
+body_foot 2
+body_wrist 2
+body_hand 2
+body_waist 1
+body_finger 2
+body_arm 2
+body_range 1
+editor_folder monster/angel/darkangel
+end
+
+Object fallenangel_knight
+name fallen angel
+race angel
+face fallenangelknight.x11
+monster 1
+level 116
+hp 10616
+maxhp 10616
+sp 500
+maxsp 500
+ac -100
+wc -126
+dam 150
+speed 0.6
+attacktype 1048577
+Wis 12
+Con 60
+see_invisible 1
+no_pick 1
+alive 1
+exp 600000
+resist_fire 100
+resist_turn_undead 100
+resist_paralyze 100
+resist_fear 100
+resist_confusion 100
+resist_blind 90
+resist_ghosthit 90
+resist_magic 50
+resist_holyword 40
+resist_physical 25
+resist_chaos 25
+resist_electricity 25
+resist_godpower 25
+resist_slow 25
+resist_weaponmagic 25
+resist_poison 25
+resist_drain 25
+resist_acid 25
+resist_cancellation 25
+resist_cold 25
+resist_counterspell 25
+resist_deplete 25
+resist_electricity 25
+weight 75000
+flying 1
+run_away 18
+will_apply 2
+pick_up 24
+can_apply 25
+can_use_scroll 1
+can_use_skill 1
+can_use_wand 1
+can_use_rod 1
+can_cast_spell 1
+can_use_bow 1
+can_use_shield 1
+can_use_armour 1
+can_use_weapon 1
+can_use_ring 1
+attacktype 1048577
+editable 1
+body_skill 1
+body_torso 1
+body_head 1
+body_shoulder 1
+body_foot 2
+body_wrist 2
+body_hand 2
+body_waist 1
+body_finger 2
+body_arm 2
+body_range 1
+randomitems all_spell_skills
+editor_folder monster/angel/fallenangel
+end
+More
+Object fallenangel_knight_2
+name fallen angel
+face fallenangelknight.x11
+monster 1
+alive 1
+no_pick 1
+y 1
+weight 75000
+editor_folder monster/angel/fallenangel
+end
 Object holyghost
 race angel
 face holyghost.111
@@ -22787,7 +26353,7 @@
 flying 1
 attacktype 512
 editable 1
-editor_folder monster/angel
+editor_folder monster/angel/holyghost
 end
 Object liteangel
 name light angel
@@ -22849,7 +26415,7 @@
 body_finger 2
 body_arm 2
 body_range 1
-editor_folder monster/angel
+editor_folder monster/angel/liteangel
 end
 Object mesangel
 name messenger
@@ -23026,6 +26592,66 @@
 weight 75000
 editor_folder monster/angel
 end
+Object snitchangel
+randomitems snitchangel
+race angel
+name snitch angel
+face snitchangel.111
+animation snitchangel
+monster 1
+sleep 0
+see_invisible 1
+no_pick 1
+alive 1
+exp 12500000
+ac -120
+wc -100
+dam 105
+Pow 40
+maxsp 768
+hp 20486
+maxhp 20486
+Int 35
+Con 10
+Wis 35
+Str 30
+Dex 20
+level 120
+resist_magic 100
+resist_blind 80
+speed 1.1
+weight 75000
+flying 1
+run_away 0
+will_apply 2
+pick_up 24
+can_apply 25
+can_use_scroll 1
+can_use_skill 1
+can_use_wand 1
+can_use_rod 1
+can_cast_spell 1
+can_use_bow 1
+can_use_shield 1
+can_use_armour 1
+can_use_weapon 1
+can_use_ring 1
+attack_movement 4
+attacktype 1048577
+editable 1
+body_skill 1
+body_torso 1
+body_head 1
+body_shoulder 1
+body_foot 2
+body_wrist 2
+body_hand 2
+body_waist 1
+body_finger 2
+body_arm 2
+body_range 1
+editor_folder monster/angel/snitchangel
+end
 Object whim
 race angel
 name whim
@@ -23333,6 +26959,65 @@
 editable 1
 editor_folder monster/animal/Neko
 end
+Object nekosan
+race animal
+name neko san
+face neko.111
+animation nekosan
+attack_movement 54
+no_pick 1
+alive 1
+dam 1
+speed 0.07
+weight 30000
+run_away 90
+editable 1
+unaggressive 1
+is_identified 1
+level 1
+hp 30000
+maxhp 30000
+exp 1
+wc 120
+no_strength 1
+ac -120
+wis 100
+str 100
+dex 100
+con 100
+int 100
+pow 100
+cha 100
+hitback 0
+reflect_missile 1
+reflect_spells 1
+resist_death 100
+resist_physical 99
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_fear 100
+resist_deplete 100
+resist_turn_undead 100
+resist_death 100
+resist_chaos 100
+resist_blind 100
+resist_holyword 100
+resist_godpower 100
+resist_disease 100
+sleep 0
+randomitems nekosan
+editor_folder monster/animal/Neko
+end
 Object dire_wolf
 name dire wolf
 face dwolf.171
@@ -26106,6 +29791,7 @@
 attack_movement 5
 editor_folder monster/demon
 end
+
 Object gr_hellhound
 name greater hellhound
 randomitems gr_hellhound
@@ -29897,7 +33583,7 @@
 name goblin chief
 randomitems goblin
 race goblin
-face goblin_chief.111
+face goblin.111
 animation goblin_chief_arc
 monster 1
 sleep 1
@@ -33783,6 +37469,56 @@
 body_range 1
 editor_folder monster/humanoid/Human
 end
+Object woman19thcentury
+race human
+name woman
+randomitems man
+face woman19thcentury.111
+sp 10
+maxsp 10
+Pow 1
+Int 12
+Str 10
+Dex 10
+monster 1
+unaggressive 1
+alive 1
+ac 10
+wc 15
+dam 1
+hp 18
+maxhp 18
+exp 20
+speed -0.15
+weight 50000
+level 2
+will_apply 2
+pick_up 24
+can_apply 25
+can_use_scroll 1
+can_use_skill 1
+can_use_wand 1
+can_use_rod 1
+can_cast_spell 1
+can_use_bow 1
+can_use_ring 1
+can_use_shield 1
+can_use_armour 1
+can_use_weapon 1
+editable 1
+body_skill 1
+body_finger 2
+body_torso 1
+body_head 1
+body_shoulder 1
+body_foot 2
+body_wrist 2
+body_hand 2
+body_waist 1
+body_arm 2
+body_range 1
+editor_folder monster/humanoid/Human
+end
 Object woman2
 race human
 name woman
@@ -35079,6 +38815,344 @@
 weight 3000000
 editor_folder monster/misc/Ent
 end
+Object big_blackhydra
+name black hydra
+race hydra
+randomitems dragon
+monster 1
+sleep 1
+Wis 20
+face blackhydra.x71
+animation big_blackhydra
+level 116
+Con 100
+Pow 26
+hp 32000
+maxhp 32000
+resist_fire 100
+resist_fear 100
+resist_blind 100
+resist_confusion -100
+ac -96
+wc -116
+dam 666
+exp 120000
+see_invisible 1
+alive 1
+no_pick 1
+speed -0.5
+weight 900000
+run_away 3
+editable 1
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_2
+x 1
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_2
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_3
+x 2
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_3
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_4
+x 3
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_4
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_5
+y 1
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_5
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_6
+x 1
+y 1
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_6
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_7
+x 2
+y 1
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_7
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_8
+x 3
+y 1
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_8
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_9
+y 2
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_9
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_10
+x 1
+y 2
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_10
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_11
+x 2
+y 2
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_11
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_blackhydra_12
+x 3
+y 2
+name black hydra
+monster 1
+face blackhydra.x71
+animation big_blackhydra_12
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+Object big_hydra
+name hydra
+race hydra
+randomitems dragon
+monster 1
+sleep 1
+Wis 20
+face hydra.x71
+animation big_hydra
+level 50
+Con 100
+Pow 26
+hp 9000
+maxhp 9000
+resist_fire -100
+resist_fear 100
+resist_blind 100
+resist_confusion -100
+ac -12
+wc -20
+dam 170
+exp 90000
+see_invisible 1
+alive 1
+no_pick 1
+speed -0.4
+weight 900000
+run_away 3
+editable 1
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_2
+x 1
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_2
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_3
+x 2
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_3
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_4
+x 3
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_4
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_5
+y 1
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_5
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_6
+x 1
+y 1
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_6
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_7
+x 2
+y 1
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_7
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_8
+x 3
+y 1
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_8
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_9
+y 2
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_9
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_10
+x 1
+y 2
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_10
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_11
+x 2
+y 2
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_11
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
+More
+Object big_hydra_12
+x 3
+y 2
+name hydra
+monster 1
+face hydra.x71
+animation big_hydra_12
+alive 1
+no_pick 1
+weight 900000
+editor_folder monster/misc/Hydra
+end
 Object golem_necro
 race unnatural
 name golem of Necromancer
@@ -35787,6 +39861,32 @@
 randomitems skill_use_magic_item
 editor_folder monster/misc
 end
+Object papergolem
+name paper golem
+race unnatural
+randomitems papergolem
+face papergolem.111
+animation papergolem
+monster 1
+alive 1
+ac 5
+wc 8
+dam 100
+hp 1000
+maxhp 1000
+speed 0.5
+exp 1000
+weight 4000
+level 20
+resist_poison  100
+resist_blind 100
+resist_fear 100
+resist_confusion 100
+attacktype 1
+resist_fire -100
+editable 1
+editor_folder monster/misc
+end
 Object pixie
 race faerie
 randomitems pixie
@@ -36090,6 +40190,35 @@
 editable 1
 editor_folder monster/misc
 end
+Object stonegolem
+name stone golem
+race unnatural
+randomitems stonegolem
+face stonegolem.111
+animation stonegolem
+monster 1
+alive 1
+ac 5
+wc 8
+dam 200
+hp 2000
+maxhp 2000
+speed 0.25
+exp 2000
+weight 1000000
+level 25
+resist_poison  100
+resist_blind 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_fear 100
+resist_confusion 100
+attacktype 1
+resist_acid -100
+editable 1
+editor_folder monster/misc
+end
 Object tentacle
 name leathery tentacle
 race animal
@@ -39493,7 +43622,7 @@
 Int -2
 Pow 1
 editable 0
-editor_folder player/class/Religious
+editor_folder player/class/Religious/cleric
 end
 Object monk_class
 name monk
@@ -39509,7 +43638,7 @@
 Con 1
 Wis 1
 Int -1
-editor_folder player/class/Religious
+editor_folder player/class/Religious/monk
 end
 
 Object monk_no_use_weapon
@@ -39519,7 +43648,7 @@
 face blank.111
 neutral 1
 no_drop 1
-editor_folder player/class/Religious
+editor_folder player/class/Religious/monk
 end
 Object paladin_class
 name paladin
@@ -39536,7 +43665,7 @@
 Wis 2
 Pow 1
 Cha 1
-editor_folder player/class/Religious
+editor_folder player/class/Religious/paladin
 end
 Object paladin_holy_symbol
 name Paladin's holy symbol
@@ -39551,7 +43680,7 @@
 resist_magic 30
 body_skill -1
 client_type 451
-editor_folder player/class/Religious
+editor_folder player/class/Religious/paladin
 end
 Object priest_class
 name priest
@@ -39568,7 +43697,7 @@
 Wis 3
 Pow 2
 Cha 2
-editor_folder player/class/Religious
+editor_folder player/class/Religious/priest
 end
 Object ninja_class
 name ninja
@@ -39585,7 +43714,7 @@
 Wis -2
 Pow -2
 Cha -1
-editor_folder player/class/Thief
+editor_folder player/class/Thief/ninja
 end
 Object thief_class
 name thief
@@ -39602,7 +43731,7 @@
 Wis -1
 Pow -1
 Cha -3
-editor_folder player/class/Thief
+editor_folder player/class/Thief/thief
 end
 Object barbarian_class
 name barbarian
@@ -39619,7 +43748,7 @@
 Wis -1
 Pow -1
 Cha -2
-editor_folder player/class/Warrior
+editor_folder player/class/Warrior/barbarian
 end
 Object mage_class
 name mage
@@ -39635,7 +43764,7 @@
 Int 0
 Wis -2
 Pow 1
-editor_folder player/class/Warrior
+editor_folder player/class/Warrior/mage
 end
 Object swashbuckler_class
 name swashbuckler
@@ -39652,7 +43781,7 @@
 Wis -2
 Pow -1
 Cha 1
-editor_folder player/class/Warrior
+editor_folder player/class/Warrior/swashbuckler
 end
 Object warlock_class
 name warlock
@@ -39668,7 +43797,7 @@
 Int 0
 Wis -2
 Pow 1
-editor_folder player/class/Warrior
+editor_folder player/class/Warrior/warlock
 end
 Object warrior_class
 name Warrior
@@ -39685,7 +43814,7 @@
 Wis -1
 Pow -1
 editable 0
-editor_folder player/class/Warrior
+editor_folder player/class/Warrior/warrior
 end
 Object alchemist_class
 name alchemist
@@ -39702,7 +43831,7 @@
 Wis 0
 Pow 1
 editable 0
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/alchemist
 end
 Object talisman_alchemist
 name Alchemist's talisman
@@ -39717,7 +43846,7 @@
 client_type 451
 body_skill -1
 skill sorcery
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/alchemist
 end
 Object devotee_class
 name devotee
@@ -39734,7 +43863,7 @@
 Pow 2
 Cha 1
 editable 0
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/devotee
 end
 Object evoker_class
 name evoker
@@ -39751,7 +43880,7 @@
 Wis 0
 Pow 3
 editable 0
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/evoker
 end
 Object talisman_evoker
 name Evoker's talisman
@@ -39767,7 +43896,7 @@
 client_type 451
 body_skill -1
 skill evocation
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/evoker
 end
 Object sorcerer_class
 name sorcerer
@@ -39784,7 +43913,7 @@
 Wis -2
 Pow 3
 editable 0
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/sorcerer
 end
 Object sorcerer_hat
 name Sorcerer's hat
@@ -39799,7 +43928,7 @@
 weight 1000
 material 128
 client_type 270
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/sorcerer
 end
 Object summoner_class
 name summoner
@@ -39815,7 +43944,7 @@
 Wis 0
 Pow 1
 editable 0
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/summoner
 end
 Object talisman_summoner
 name Summoner's talisman
@@ -39831,7 +43960,7 @@
 client_type 451
 body_skill -1
 skill summoning
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/summoner
 end
 Object wizard_class
 race human
@@ -39849,7 +43978,7 @@
 Pow 3
 Cha 0
 editable 0
-editor_folder player/class/Wizardry
+editor_folder player/class/Wizardry/wizard
 end
 Object dragon_ability_xrays
 name xrays
@@ -40798,6 +44927,441 @@
 body_waist 1
 editor_folder player/old
 end
+Object pl_dragon
+name fire hatchling
+race dragon
+randomitems dragon_player_items
+face pl_dragon_r.151
+msg
+Dragons are completely different than any
+other race. Their vast size and bizarre body
+prevents them both from wearing armour and
+wielding weapons -- tools that they disdain
+in any case. Instead, they are gifted with
+the ability to evolve and grow stronger by
+eating the flesh of their defeated foes.
+
+Over the years, their dragonhide hardens and
+it can provide better protection than the
+best armour. Instead of wielding weapons,
+they use their sharp and lethal claws in
+combat.  Moreover, dragons have a natural
+talent for magic.
+
+Dragons are very interested in the lore of
+the elements and usually choose to
+specialize.  While focusing their metabolism
+on a certain element, they can gain various
+new abilities -- including new spells,
+enhanced claws and more.  Eventually, a
+dragon is able to evolve from the hatchling
+stage into a grown-up terrifying ancient
+dragon.
+endmsg
+animation pl_dragon_r
+is_animated 1
+anim_speed -1
+type 1
+level 1
+ac 5
+wc 21
+dam 10
+alive 1
+weight 70000
+food 999
+speed 1
+attacktype 1
+can_use_shield 0
+can_use_armour 0
+can_use_weapon 0
+Str 5
+Dex 0
+Con 6
+Wis -8
+Int -3
+Pow 5
+editable 0
+body_range 1
+body_arm 0
+body_neck 1
+body_skill 1
+body_finger 2
+body_shoulder 1
+body_wrist 2
+body_waist 1
+editor_folder player/race/animal_dragon
+end
+Object dragon_skin_force
+name dragon skin
+invisible 1
+type 114
+face blank.111
+applied 1
+no_drop 1
+editor_folder player/race/animal_dragon
+end
+Object dragon_ability_force
+name dragon ability
+title fire hatchling
+invisible 1
+type 114
+exp 2
+face blank.111
+neutral 1
+no_drop 1
+editor_folder player/race/animal_dragon
+end
+
+Object quetzalcoatl_player
+name Quetzalcoatl
+race reptile
+randomitems quetzalcoatl_player_items
+face quetzalcoatl.131
+msg
+Quetzalcoatls are a strange mix of snake,
+bird, human, and a dash of the divine. They
+are able to manipulate objects with their
+claws. They are amazingly strong, very quick,
+and amazingly hardy, but quite stupid and
+impious (despite the dash of divinity).
+However, they are strongly magical in nature
+and usually have a vast reservoir of mana
+with which to cast any spell they're not too
+stupid to learn. Often, they're only able to
+grasp one basic fire spell.
+
+Their strongly draconic nature makes them
+immune to fire and helps them with fire
+spells, but they are vulnerable to cold.
+They can grasp weapons, but their bizarre body
+shape prevents them from using armour,
+helmets, and other items of apparel intended
+for bipedal creatures with two arms, two legs,
+and a head. Their inability to use armour
+comes back to haunt them when they compare
+themselves with other races:  highly enchanted
+armour is usually more beneficial than
+dragonhide! The wings come in handy: they can
+use them to levitate, and their hide gets
+thicker as they gain power, compensating them
+somewhat for not being able to use armour.
+endmsg
+animation quetzalcoatl_player
+is_animated 0
+type 1
+level 1
+ac 5
+wc 21
+dam 10
+alive 1
+weight 70000
+food 999
+speed 1
+attacktype 1
+path_attuned 2
+resist_fire 100
+resist_cold -30
+can_use_shield 0
+can_use_armour 0
+can_use_weapon 1
+Str 6
+Dex 3
+Con 6
+Wis -8
+Int -8
+Pow 6
+editable 0
+body_range 1
+body_arm 2
+body_neck 1
+body_skill 1
+body_finger 2
+body_shoulder 1
+body_wrist 2
+body_waist 1
+editor_folder player/race/animal_quetzalcoatl
+end
+
+Object serpentman_player
+name Serpentman
+race reptile
+randomitems serpentman_player_items
+face serpentman.131
+msg
+The Serpentman adventurer is a rare breed.
+Few Serpentmen ever leave the swamps, as they
+are not well adjusted for human society.
+Their heads and feet are not shaped properly
+to use boots or helmets made for humanoid
+folk, but their unusual build has given rise
+to a cultural habit of wearing pieces of
+bracelet- and ring-like jewelry on their
+tails.  They possess a tough hide and strong
+legs which enable them to leap further than
+most folks.  Their nasty claws can also double
+as weapons.
+
+They are only partially warm-blooded, and are
+as a result somewhat susceptible to cold.
+endmsg
+animation serpentman_player
+is_animated 0
+type 1
+level 1
+ac 5
+wc 21
+dam 8
+can_use_shield 1
+can_use_armour 1
+can_use_weapon 1
+can_see_in_dark 1
+alive 1
+weight 70000
+food 999
+speed 1
+attacktype 1
+resist_cold -50
+resist_fire 30
+resist_electricity 30
+resist_acid 30
+resist_poison 30
+resist_physical 5
+Str 2
+Dex 2
+Con 4
+Wis -2
+Int -2
+Cha -4
+editable 0
+body_range 1
+body_arm 2
+body_torso 1
+body_hand 2
+body_neck 1
+body_shoulder 1
+body_skill 1
+body_wrist 4
+body_finger 3
+body_waist 1
+editor_folder player/race/animal_serpentman
+end
+Object elem_acidborn_player
+name acidborn
+race para_air
+randomitems acidborn_player_items
+face acidborn.111
+animation elem_acidborn_player
+is_animated 1
+msg
+Edit me.
+endmsg
+type 1
+level 1
+ac 0
+wc 21
+dam 0
+can_use_shield 0
+can_use_armour 0
+can_use_weapon 0
+path_attuned 8
+alive 1
+weight 30000
+food 999
+speed 1
+attacktype 64
+Str -5
+Dex 4
+Con 0
+Int 2
+Wis 2
+Cha -2
+Pow 7
+resist_acid 100
+resist_poison 100
+resist_fire -30
+resist_ghosthit -50
+editable 0
+body_range 1
+body_neck 1
+body_neck 2
+body_skill 1
+body_finger 4
+editor_folder arch/player/race
+editor_folder player/race/elem_acidborn
+end
+Object fireborn_player
+name fireborn
+race fire_elemental
+randomitems fireborn_player_items
+face fireborn.111
+msg
+Legends say that fireborn are sparks struck
+off the anvil of creation, with life and
+spirit, and eventually mind. Those who
+research magic think that they are relatives
+of some kind to will o' the wisps. An
+observer seeing one for the first time would
+see a strangely intelligent vortex of
+flame somehow carrying items without burning
+them.
+
+Their insubstantial nature makes them both
+very weak and very quick.  Their minds are
+agile, and they are able to commune well with
+the gods. However, their area of excellence
+is magic. They spellcast more powerfully than
+any other race, and mana flows into them
+readily. They can even cast cold spells with
+devastating effectiveness.  They all know a
+basic fire spell.
+
+They have the ability to levitate at will, and
+they can touch to burn. As they gain more
+power, they are increasingly difficult to hit
+with weapons. However, they cannot use weapons
+or armour, and thereby miss out on many benefits
+(including powerful magical enchantments) those
+items may bring.
+
+Fire does not harm them, nor poison. Cold,
+spiritual drain, and physical drain present
+great peril to them.
+endmsg
+animation fireborn_player
+is_animated 1
+type 1
+level 1
+ac 0
+wc 21
+dam 0
+can_use_shield 0
+can_use_armour 0
+can_use_weapon 0
+path_attuned 2
+alive 1
+weight 30000
+food 999
+speed 1
+attacktype 5
+Str -5
+Dex 4
+Con 0
+Int 2
+Wis 2
+Cha -2
+Pow 7
+resist_fire 100
+resist_poison 100
+resist_cold -30
+resist_ghosthit -50
+editable 0
+body_range 1
+body_neck 1
+body_neck 2
+body_skill 1
+body_finger 4
+glow_radius 4
+editor_folder player/race/elem_fireborn
+end
+Object fireborn_player_force
+name Fireborn_Force
+invisible 1
+sp 2
+applied 1
+type 114
+face blank.111
+no_drop 1
+speed 0
+editor_folder player/race/elem_fireborn
+end
+Object elem_iceborn_player
+name iceborn
+race para_ice
+randomitems iceborn_player_items
+face iceborn.111
+animation elem_iceborn_player
+is_animated 1
+msg
+Edit me.
+endmsg
+type 1
+level 1
+ac 0
+wc 21
+dam 0
+can_use_shield 0
+can_use_armour 0
+can_use_weapon 0
+path_attuned 8
+alive 1
+weight 30000
+food 999
+speed 1
+attacktype 16
+Str -5
+Dex 4
+Con 0
+Int 2
+Wis 2
+Cha -2
+Pow 7
+resist_cold 100
+resist_poison 100
+resist_electric -30
+resist_ghosthit -50
+editable 0
+body_range 1
+body_neck 1
+body_neck 2
+body_skill 1
+body_finger 4
+editor_folder arch/player/race
+editor_folder player/race/elem_iceborn
+end
+Object sparkling_player
+name sparkling
+race para_lightning
+randomitems sparkling_player_items
+face sparkling.111
+animation sparkling_player
+is_animated 1
+msg
+Edit me.
+endmsg
+type 1
+level 1
+ac 0
+wc 21
+dam 0
+can_use_shield 0
+can_use_armour 0
+can_use_weapon 0
+path_attuned 8
+alive 1
+weight 30000
+food 999
+speed 1
+attacktype 9
+Str -5
+Dex 4
+Con 0
+Int 2
+Wis 2
+Cha -2
+Pow 7
+resist_electricity 100
+resist_poison 100
+resist_acid -30
+resist_ghosthit -50
+editable 0
+body_range 1
+body_neck 1
+body_neck 2
+body_skill 1
+body_finger 4
+editor_folder arch/player/race
+editor_folder player/race/elem_sparkling
+end
 Object dwarf_player
 name dwarf
 randomitems dwarf_player_items
@@ -40860,7 +45424,7 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_dwarf
 end
 Object elf_player
 race faerie
@@ -40923,7 +45487,7 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_elf
 end
 Object elf_player_force
 name elf_force
@@ -40937,92 +45501,7 @@
 applied 1
 no_drop 1
 speed 0
-editor_folder player/race
-end
-Object fireborn_player
-name fireborn
-race fire_elemental
-randomitems fireborn_player_items
-face fireborn.111
-msg
-Legends say that fireborn are sparks struck
-off the anvil of creation, with life and
-spirit, and eventually mind. Those who
-research magic think that they are relatives
-of some kind to will o' the wisps. An
-observer seeing one for the first time would
-see a strangely intelligent vortex of
-flame somehow carrying items without burning
-them.
-
-Their insubstantial nature makes them both
-very weak and very quick.  Their minds are
-agile, and they are able to commune well with
-the gods. However, their area of excellence
-is magic. They spellcast more powerfully than
-any other race, and mana flows into them
-readily. They can even cast cold spells with
-devastating effectiveness.  They all know a
-basic fire spell.
-
-They have the ability to levitate at will, and
-they can touch to burn. As they gain more
-power, they are increasingly difficult to hit
-with weapons. However, they cannot use weapons
-or armour, and thereby miss out on many benefits
-(including powerful magical enchantments) those
-items may bring.
-
-Fire does not harm them, nor poison. Cold,
-spiritual drain, and physical drain present
-great peril to them.
-endmsg
-animation fireborn_player
-is_animated 1
-type 1
-level 1
-ac 0
-wc 21
-dam 0
-can_use_shield 0
-can_use_armour 0
-can_use_weapon 0
-path_attuned 2
-alive 1
-weight 30000
-food 999
-speed 1
-attacktype 5
-Str -5
-Dex 4
-Con 0
-Int 2
-Wis 2
-Cha -2
-Pow 7
-resist_fire 100
-resist_poison 100
-resist_cold -30
-resist_ghosthit -50
-editable 0
-body_range 1
-body_neck 1
-body_neck 2
-body_skill 1
-body_finger 4
-glow_radius 4
-editor_folder player/race
-end
-Object fireborn_player_force
-name Fireborn_Force
-invisible 1
-sp 2
-applied 1
-type 114
-face blank.111
-no_drop 1
-speed 0
-editor_folder player/race
+editor_folder player/race/humanoid_elf
 end
 Object gnome_player
 name gnome
@@ -41088,7 +45567,62 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_gnome
+end
+Object pl_half_orc
+name half orc
+randomitems half_orc_player_items
+face pl_half_orc.151
+msg
+Half-Orcs are usually the product of rape,
+slavery, or some such unpleasantness.  They
+look it too:  Half-Orcs are rather ugly.  On
+average, they're stronger, a bit quicker, and
+hardier than humans, but also stupid, impious,
+and unmagical. They're resistant to poison and
+can see in the dark, and every half-orc seems
+to know how to steal.
+endmsg
+animation pl_half_orc
+is_animated 1
+anim_speed -1
+no_pick 1
+alive 1
+level 1
+wc 21
+ac 10
+dam 1
+type 1
+speed 1
+weight 70000
+resist_poison 30
+can_use_shield 1
+can_use_armour 1
+can_use_weapon 1
+can_see_in_dark 1
+path_repelled 65536
+editable 0
+Str 2
+Dex 1
+Con 2
+Int -2
+Wis -2
+Pow -1
+Cha -3
+body_range 1
+body_arm 2
+body_torso 1
+body_head 1
+body_neck 1
+body_skill 1
+body_finger 2
+body_shoulder 1
+body_foot 2
+body_hand 2
+body_wrist 2
+body_waist 1
+can_use_shield 1
+editor_folder player/race/humanoid_half_orc
 end
 Object halfling_player
 name halfling
@@ -41141,7 +45675,7 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_halfling
 end
 Object human_player
 name human
@@ -41191,13 +45725,13 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_human
 end
 Object northman_player
 name Northman
 race human
 randomitems northman_player_items
-face viking.151
+face player_northman.151
 msg
 Northmen are simply humans who have been
 shaped by their harsh environment. They are
@@ -41246,280 +45780,7 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
-end
-Object pl_dragon
-name fire hatchling
-race dragon
-randomitems dragon_player_items
-face pl_dragon_r.151
-msg
-Dragons are completely different than any
-other race. Their vast size and bizarre body
-prevents them both from wearing armour and
-wielding weapons -- tools that they disdain
-in any case. Instead, they are gifted with
-the ability to evolve and grow stronger by
-eating the flesh of their defeated foes.
-
-Over the years, their dragonhide hardens and
-it can provide better protection than the
-best armour. Instead of wielding weapons,
-they use their sharp and lethal claws in
-combat.  Moreover, dragons have a natural
-talent for magic.
-
-Dragons are very interested in the lore of
-the elements and usually choose to
-specialize.  While focusing their metabolism
-on a certain element, they can gain various
-new abilities -- including new spells,
-enhanced claws and more.  Eventually, a
-dragon is able to evolve from the hatchling
-stage into a grown-up terrifying ancient
-dragon.
-endmsg
-animation pl_dragon_r
-is_animated 1
-anim_speed -1
-type 1
-level 1
-ac 5
-wc 21
-dam 10
-alive 1
-weight 70000
-food 999
-speed 1
-attacktype 1
-can_use_shield 0
-can_use_armour 0
-can_use_weapon 0
-Str 5
-Dex 0
-Con 6
-Wis -8
-Int -3
-Pow 5
-editable 0
-body_range 1
-body_arm 0
-body_neck 1
-body_skill 1
-body_finger 2
-body_shoulder 1
-body_wrist 2
-body_waist 1
-editor_folder player/race
-end
-Object dragon_skin_force
-name dragon skin
-invisible 1
-type 114
-face blank.111
-applied 1
-no_drop 1
-editor_folder player/race
-end
-Object dragon_ability_force
-name dragon ability
-title fire hatchling
-invisible 1
-type 114
-exp 2
-face blank.111
-neutral 1
-no_drop 1
-editor_folder player/race
-end
-
-Object pl_half_orc
-name half orc
-randomitems half_orc_player_items
-face pl_half_orc.151
-msg
-Half-Orcs are usually the product of rape,
-slavery, or some such unpleasantness.  They
-look it too:  Half-Orcs are rather ugly.  On
-average, they're stronger, a bit quicker, and
-hardier than humans, but also stupid, impious,
-and unmagical. They're resistant to poison and
-can see in the dark, and every half-orc seems
-to know how to steal.
-endmsg
-animation pl_half_orc
-is_animated 1
-anim_speed -1
-no_pick 1
-alive 1
-level 1
-wc 21
-ac 10
-dam 1
-type 1
-speed 1
-weight 70000
-resist_poison 30
-can_use_shield 1
-can_use_armour 1
-can_use_weapon 1
-can_see_in_dark 1
-path_repelled 65536
-editable 0
-Str 2
-Dex 1
-Con 2
-Int -2
-Wis -2
-Pow -1
-Cha -3
-body_range 1
-body_arm 2
-body_torso 1
-body_head 1
-body_neck 1
-body_skill 1
-body_finger 2
-body_shoulder 1
-body_foot 2
-body_hand 2
-body_wrist 2
-body_waist 1
-can_use_shield 1
-editor_folder player/race
-end
-Object quetzalcoatl_player
-name Quetzalcoatl
-race reptile
-randomitems quetzalcoatl_player_items
-face quetzalcoatl.131
-msg
-Quetzalcoatls are a strange mix of snake,
-bird, human, and a dash of the divine. They
-are able to manipulate objects with their
-claws. They are amazingly strong, very quick,
-and amazingly hardy, but quite stupid and
-impious (despite the dash of divinity).
-However, they are strongly magical in nature
-and usually have a vast reservoir of mana
-with which to cast any spell they're not too
-stupid to learn. Often, they're only able to
-grasp one basic fire spell.
-
-Their strongly draconic nature makes them
-immune to fire and helps them with fire
-spells, but they are vulnerable to cold.
-They can grasp weapons, but their bizarre body
-shape prevents them from using armour,
-helmets, and other items of apparel intended
-for bipedal creatures with two arms, two legs,
-and a head. Their inability to use armour
-comes back to haunt them when they compare
-themselves with other races:  highly enchanted
-armour is usually more beneficial than
-dragonhide! The wings come in handy: they can
-use them to levitate, and their hide gets
-thicker as they gain power, compensating them
-somewhat for not being able to use armour.
-endmsg
-animation quetzalcoatl_player
-is_animated 0
-type 1
-level 1
-ac 5
-wc 21
-dam 10
-alive 1
-weight 70000
-food 999
-speed 1
-attacktype 1
-path_attuned 2
-resist_fire 100
-resist_cold -30
-can_use_shield 0
-can_use_armour 0
-can_use_weapon 1
-Str 6
-Dex 3
-Con 6
-Wis -8
-Int -8
-Pow 6
-editable 0
-body_range 1
-body_arm 2
-body_neck 1
-body_skill 1
-body_finger 2
-body_shoulder 1
-body_wrist 2
-body_waist 1
-editor_folder player/race
-end
-
-Object serpentman_player
-name Serpentman
-race reptile
-randomitems serpentman_player_items
-face serpentman.131
-msg
-The Serpentman adventurer is a rare breed.
-Few Serpentmen ever leave the swamps, as they
-are not well adjusted for human society.
-Their heads and feet are not shaped properly
-to use boots or helmets made for humanoid
-folk, but their unusual build has given rise
-to a cultural habit of wearing pieces of
-bracelet- and ring-like jewelry on their
-tails.  They possess a tough hide and strong
-legs which enable them to leap further than
-most folks.  Their nasty claws can also double
-as weapons.
-
-They are only partially warm-blooded, and are
-as a result somewhat susceptible to cold.
-endmsg
-animation serpentman_player
-is_animated 0
-type 1
-level 1
-ac 5
-wc 21
-dam 8
-can_use_shield 1
-can_use_armour 1
-can_use_weapon 1
-can_see_in_dark 1
-alive 1
-weight 70000
-food 999
-speed 1
-attacktype 1
-resist_cold -50
-resist_fire 30
-resist_electricity 30
-resist_acid 30
-resist_poison 30
-resist_physical 5
-Str 2
-Dex 2
-Con 4
-Wis -2
-Int -2
-Cha -4
-editable 0
-body_range 1
-body_arm 2
-body_torso 1
-body_hand 2
-body_neck 1
-body_shoulder 1
-body_skill 1
-body_wrist 4
-body_finger 3
-body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_northman
 end
 Object troll_player
 name troll
@@ -41583,7 +45844,7 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_troll/troll_player
 end
 Object troll_player_force
 name troll_force
@@ -41595,7 +45856,7 @@
 face blank.111
 no_drop 1
 speed 0
-editor_folder player/race
+editor_folder player/race/humanoid_troll/troll_player
 end
 Object wraith_player
 name Wraith
@@ -41667,7 +45928,7 @@
 body_hand 2
 body_wrist 2
 body_waist 1
-editor_folder player/race
+editor_folder player/race/humanoid_wraith
 end
 Object wraith_player_force
 name Wraith_Force
@@ -41679,7 +45940,7 @@
 face blank.111
 no_drop 1
 speed 0
-editor_folder player/race
+editor_folder player/race/humanoid_wraith
 end
 Object coffee_empty
 name empty cup
@@ -43443,6 +47704,20 @@
 editor_folder shop/Floors
 end
 
+Object shop_weapon_ancient
+name tiles
+is_floor 1
+face shop_weapo.111
+no_pick 1
+no_magic 1
+type 68
+auto_apply 1
+randomitems shopweapoancient
+editable 64
+damned 1
+editor_folder shop/Floors
+end
+
 Object alchemy_diamond_converter
 name alchemy bath: create diamond
 other_arch gem
@@ -43950,6 +48225,84 @@
 no_pick 1
 editor_folder shop
 end
+Object store_armour_goth
+name geschaft
+face store_armo_goth.x11
+type 66
+no_pick 1
+no_pass 1
+editable 64
+client_type 25012
+editor_folder shop
+end
+More
+Object store_armour_2_goth
+name geschaft
+face store_armo_goth.x11
+type 66
+x 1
+no_pick 1
+no_pass 1
+editor_folder shop
+end
+More
+Object store_armour_3_goth
+name geschaft
+face store_armo_goth.x11
+type 66
+y 1
+no_pick 1
+editor_folder shop
+end
+More
+Object store_armour_4_goth
+name geschaft
+face store_armo_goth.x11
+type 66
+x 1
+y 1
+no_pick 1
+editor_folder shop
+end
+Object store_armour_west
+name shop
+face store_armo_west.x11
+type 66
+no_pick 1
+no_pass 1
+editable 64
+client_type 25012
+editor_folder shop
+end
+More
+Object store_armour_2_west
+name shop
+face store_armo_west.x11
+type 66
+x 1
+no_pick 1
+no_pass 1
+editor_folder shop
+end
+More
+Object store_armour_3_west
+name shop
+face store_armo_west.x11
+type 66
+y 1
+no_pick 1
+editor_folder shop
+end
+More
+Object store_armour_4_west
+name shop
+face store_armo_west.x11
+type 66
+x 1
+y 1
+no_pick 1
+editor_folder shop
+end
 Object store_general
 name shop
 face store_gene.x11
@@ -44028,6 +48381,45 @@
 no_pick 1
 editor_folder shop
 end
+Object store_general_goth
+name geschaft
+face store_gene_goth.x11
+type 66
+no_pick 1
+no_pass 1
+editable 64
+client_type 25012
+editor_folder shop
+end
+More
+Object store_general_2_goth
+name geschaft
+face store_gene_goth.x11
+type 66
+x 1
+no_pick 1
+no_pass 1
+editor_folder shop
+end
+More
+Object store_general_3_goth
+name geschaft
+face store_gene_goth.x11
+type 66
+y 1
+no_pick 1
+editor_folder shop
+end
+More
+Object store_general_4_goth
+name geschaft
+face store_gene_goth.x11
+type 66
+x 1
+y 1
+no_pick 1
+editor_folder shop
+end
 Object store_general_west
 name shop
 face store_gene_west.x11
@@ -44184,6 +48576,45 @@
 no_pick 1
 editor_folder shop
 end
+Object store_magic_goth
+name geschaft
+face store_magi_goth.x11
+type 66
+no_pick 1
+no_pass 1
+editable 64
+client_type 25012
+editor_folder shop
+end
+More
+Object store_magic_2_goth
+name geschaft
+face store_magi_goth.x11
+type 66
+x 1
+no_pick 1
+no_pass 1
+editor_folder shop
+end
+More
+Object store_magic_3_goth
+name geschaft
+face store_magi_goth.x11
+type 66
+y 1
+no_pick 1
+editor_folder shop
+end
+More
+Object store_magic_4_goth
+name geschaft
+face store_magi_goth.x11
+type 66
+x 1
+y 1
+no_pick 1
+editor_folder shop
+end
 Object store_magic_northwest
 name shop
 face store_magi_northwest.x11
@@ -45094,6 +49525,23 @@
 body_skill -1
 editor_folder skills/Skill_Tools
 end
+Object skill_acid_splash
+name acid splash
+skill acid splash
+type 43
+invisible 1
+dam 2
+last_sp 4
+attacktype 64
+no_drop 1
+subtype 40
+editable 0
+body_skill -1
+exp 0
+level 100
+editor_folder skills
+end
+
 Object skill_alchemy
 name alchemy
 skill alchemy
@@ -45401,6 +49849,23 @@
 editor_folder skills
 end
 
+Object skill_poison_nail
+name poison nail
+skill poison nail
+type 43
+invisible 1
+dam 2
+last_sp 4
+attacktype 1025
+no_drop 1
+subtype 41
+editable 0
+body_skill -1
+exp 0
+level 100
+editor_folder skills
+end
+
 Object skill_praying
 name praying
 skill praying
@@ -45486,6 +49951,23 @@
 editor_folder skills
 end
 
+Object skill_shiver
+name shiver
+skill shiver
+type 43
+invisible 1
+dam 2
+last_sp 4
+attacktype 16
+no_drop 1
+subtype 39
+editable 0
+body_skill -1
+exp 0
+level 100
+editor_folder skills
+end
+
 Object skill_singing
 name singing
 skill singing
@@ -45528,6 +50010,23 @@
 editor_folder skills
 end
 
+Object skill_spark_touch
+name spark touch
+skill spark touch
+type 43
+invisible 1
+dam 2
+last_sp 4
+attacktype 10
+no_drop 1
+subtype 38
+editable 0
+body_skill -1
+exp 0
+level 100
+editor_folder skills
+end
+
 Object skill_stealing
 name stealing
 skill stealing
@@ -46609,6 +51108,21 @@
 editable 0
 editor_folder spell/Bullet/Fire
 end
+Object iceball
+type 102
+subtype 6
+face iceball.111
+animation iceball
+wc -30
+speed 0.2
+speed_left -0.21
+glow_radius 1
+flying 1
+no_pick 1
+editable 0
+attacktype 16
+editor_folder spell/Bullet/Frost
+end
 Object explosion2
 type 102
 subtype 6
@@ -46639,6 +51153,22 @@
 editable 0
 editor_folder spell/Bullet/Shell
 end
+Object asteroid
+other_arch snowstorm
+face asteroid.112
+type 102
+subtype 5
+animation asteroid
+is_animated 0   
+is_turnable 1
+walk_on 1
+fly_on 1
+flying 1
+speed 1
+editable 0
+no_pick 1
+editor_folder spell/Bullet
+end
 Object bullet
 type 102
 subtype 5
@@ -46880,6 +51410,34 @@
 attacktype 16
 editor_folder spell/Bullet
 end
+Object spell_asteroid
+name asteroid
+name_pl asteroid
+face spell_evocation.111
+level 8
+value 80
+sp 15
+casting_time 10
+path_attuned 16
+other_arch asteroid
+dam 75
+dam_modifier 1
+range 12
+duration 10
+duration_modifier 4
+maxsp 18
+type 101
+subtype 5
+attacktype 256
+no_drop 1
+invisible 1
+skill evocation
+food 10
+msg
+Info.
+endmsg
+editor_folder spell/Bullet
+end
 Object spell_magic_bullet
 name magic bullet
 name_pl magic bullet
@@ -49877,6 +54435,73 @@
 skill summoning
 editor_folder spell/Golem
 end
+Object spell_summon_paper_golem
+name summon paper golem
+name_pl summon paper golem
+face spell_summoner.111
+level 30
+sp 100
+casting_time 10
+path_attuned 64
+other_arch papergolem
+dam 100
+dam_modifier 1
+duration 150
+duration_modifier 5
+range_modifier 15
+maxsp 40
+type 101
+subtype 12
+value 20
+attacktype 1
+no_drop 1
+invisible 1
+skill summoning
+msg
+Paper golem summons a magical creature that does
+the caster's wishes.  The caster can have it
+attack other creatures, bash down doors,
+detonate runes, etc.  The paper golem has a finite
+lifetime, and this life is shortened any time
+it takes damage.  This paper golem is more
+powerful than the golem.
+endmsg
+editor_folder spell/Golem
+end
+Object spell_summon_stone_golem
+name summon stone golem
+name_pl summon stone golem
+face spell_summoner.111
+level 40
+sp 120
+casting_time 10
+path_attuned 64
+other_arch stonegolem
+dam 200
+dam_modifier 1
+duration 150
+duration_modifier 5
+range_modifier 15
+maxsp 40
+type 101
+subtype 12
+value 20
+attacktype 1
+no_drop 1
+invisible 1
+skill summoning
+msg
+Stone golem summons a magical creature that does
+the caster's wishes.  The caster can have it
+attack other creatures, bash down doors,
+detonate runes, etc.  The stone golem has a finite
+lifetime, and this life is shortened any time
+it takes damage.  This stone golem is more
+powerful than the paper golem but has diffrent
+weaknesses.
+endmsg
+editor_folder spell/Golem
+end
 Object spell_summon_air_elemental
 name summon air elemental
 name_pl summon air elemental
@@ -53507,6 +58132,28 @@
 maxgrace 10
 editor_folder spell/SummonMonster
 end
+Object spell_summon_dark_angel
+name summon dark angel
+name_pl summon dark angels
+face spell_summoner.111
+type 101
+subtype 27
+level 25
+sp 30
+casting_time 40
+path_attuned 64
+skill summoning
+value 60000
+no_drop 1
+invisible 1
+attack_movement 16
+randomitems summon_dark_angel
+msg
+Forth from the abyss is called an angel of darkness...
+endmsg
+editor_folder spell/SummonMonster
+end
+
 Object spell_summon_fog
 name summon fog
 name_pl summon fog
@@ -53619,6 +58266,29 @@
 invisible 1
 editor_folder spell/Swarm
 end
+Object spell_frost_nova
+name frost nova
+name_pl frost nova
+face spell_evocation.111
+skill evocation
+type 101
+subtype 36
+level 12
+value 120
+sp 30
+casting_time 12
+path_attuned 16
+other_arch spell_asteroid
+duration 3
+duration_modifier 4
+maxsp 12
+no_drop 1
+invisible 1
+msg
+Info on Frost Nova.
+endmsg
+editor_folder spell/Swarm
+end
 Object spell_meteor_swarm
 name meteor swarm
 name_pl meteor swarm
@@ -53974,6 +58644,24 @@
 client_type 41
 editor_folder spell
 end
+Object power_crystal_black
+name Atramentous Crystal
+maxsp 0
+face power_crystal_black.111
+animation power_crystal_black
+type 156
+weight 3
+value 0
+material 64
+is_animated 1
+editable 4096
+name_pl Atramentous Crystals
+client_type 41
+editor_folder spell
+end
+#Quest item for mlabhell, please don't use elsewhere
+
+
 Object ability_spit_acid
 race spit_acid
 type 14
@@ -54102,6 +58790,11 @@
 subtype 4
 editor_folder system
 end
+Object event_move
+type 116
+subtype 28
+editor_folder system
+end
 Object event_pickup
 type 116
 subtype 5
@@ -54147,6 +58840,7 @@
 Object map
 type 22
 slaying /HallOfSelection
+race /start/HallsOfSelection
 face map.111
 x 16
 y 16
@@ -54314,6 +59008,19 @@
 editable 0
 editor_folder system
 end
+Object starchart
+type 22
+slaying /HallOfSelection
+face starchart.111
+x 16
+y 16
+hp 1
+sp 1
+value 300
+weight 7200
+editable 0
+editor_folder system
+end
 Object trigger_marker
 name triggered marker
 face creator.111
@@ -54408,6 +59115,36 @@
 body_neck -1
 editor_folder talisman
 end
+Object lostlabring
+name ring
+face lostlabring.110
+value 600
+weight 20
+type 70
+material 2
+editable 2048
+nrof 1
+name_pl rings
+client_type 391
+body_finger -1
+editor_folder talisman
+end
+
+Object lostlabring2
+name ring
+face lostlabring.111
+value 300
+weight 20
+type 70
+material 2
+editable 2048
+nrof 1
+name_pl rings
+client_type 391
+body_finger -1
+editor_folder talisman
+end
+
 Object ring
 name ring
 animation ring
@@ -54603,7 +59340,18 @@
 editor_folder transport
 end
 Object galleon
-face galleon.111
+face galleon.112
+type 66
+no_pick 1
+move_allow walk
+move_block boat
+editable 2
+client_type 25012
+editor_folder transport
+end
+Object galleonfacings
+face galleon.112
+animation galleonfacings
 type 66
 no_pick 1
 move_allow walk
@@ -55576,6 +60324,266 @@
 editable 768
 editor_folder wall/bwall
 end
+Object bwall-gray_0
+name wall
+face bwall-gray_0.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_1_2
+name wall
+face bwall-gray_1.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_1_4
+name wall
+face bwall-gray_2.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_2_2_1
+name wall
+face bwall-gray_3.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_1_1
+name wall
+face bwall-gray_4.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_2_1_1
+name wall
+face bwall-gray_5.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_2_2_2
+name wall
+face bwall-gray_6.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_3_2
+name wall
+face bwall-gray_7.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_1_3
+name wall
+face bwall-gray_8.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_2_2_4
+name wall
+face bwall-gray_9.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_2_1_2
+name wall
+face bwall-gray_A.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_3_1
+name wall
+face bwall-gray_B.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_2_2_3
+name wall
+face bwall-gray_C.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_3_4
+name wall
+face bwall-gray_D.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_3_3
+name wall
+face bwall-gray_E.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_4
+name wall
+face bwall-gray_F.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_earthwall
+race wall
+face bwall-gray_earthwall.111
+animation bwall-gray_earthwall
+is_animated 0
+tear_down 1
+hp 400
+maxhp 800
+ac 30
+type 45
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+
+no_pick 1
+blocksview 1
+alive 1
+level 1
+pass_thru 1
+editable 768
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_false_wall
+name false wall
+face bwall-gray_earthwall.111
+no_pick 1
+blocksview 1
+editable 768
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_stoneblock_door_closed
+name stone block
+type 91
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+face bwall-gray_earthwall.111
+animation bwall-gray_stoneblock_door_closed
+is_animated 0
+no_pass 1
+blocksview 1
+wc 5
+maxsp 0
+dam 5
+editable 768
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_stoneblock_door_open
+name stone block
+type 91
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+face bwall-gray_stoneblock.115
+animation bwall-gray_stoneblock_door_open
+is_animated 0
+wc 0
+dam 5
+maxsp 1
+editable 768
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_weak_wall_5
+name wall
+race wall
+face bwall-gray_w_0.111
+animation bwall-gray_weak_wall_5
+is_animated 0
+tear_down 1
+hp 1000
+maxhp 1000
+ac 30
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+
+no_pick 1
+blocksview 1
+alive 1
+level 1
+editable 768
+editor_folder wall/bwall-gray
+end
+Object bwall-gray_weak_wall_6
+name wall
+race wall
+face bwall-gray_w_1.111
+animation bwall-gray_weak_wall_6
+is_animated 0
+tear_down 1
+hp 1000
+maxhp 1000
+ac 30
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+
+no_pick 1
+blocksview 1
+alive 1
+level 1
+editable 768
+editor_folder wall/bwall-gray
+end
 Object cave1
 name wall
 face cave1.111
@@ -56263,6 +61271,66 @@
 editable 512
 editor_folder wall/cwall
 end
+Object cwall_mural_2_1
+name wall
+face cwall_mural_2_1.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/cwall
+end
+
+Object cwall_mural_2_2
+name wall
+face cwall_mural_2_1.112
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/cwall
+end
+
+Object cwall_mural_2_3
+name wall
+face cwall_mural_2_1.113
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/cwall
+end
+
+Object cwall_mural_2_4
+name wall
+face cwall_mural_2_1.114
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/cwall
+end
+
+Object cwall_mural_2_end_1_1
+name wall
+face cwall_mural_2_end_1.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/cwall
+end
+
+Object cwall_mural_2_end_1_2
+name wall
+face cwall_mural_2_end_1.112
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/cwall
+end
+
 Object weak_wall_3
 name wall
 race wall
@@ -58396,6 +63464,366 @@
 editable 512
 editor_folder wall/hedge
 end
+Object icecave1
+name ice wall
+face icecave1.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave10
+name ice wall
+face icecave10.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave11
+name ice wall
+face icecave11.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave12
+name ice wall
+face icecave12.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave13
+name ice wall
+face icecave13.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave14
+name ice wall
+face icecave14.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave15
+name ice wall
+face icecave15.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave16
+name ice wall
+face icecave16.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave17
+name ice wall
+face icecave17.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave18
+name ice wall
+face icecave18.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave19
+name ice wall
+face icecave19.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave2
+name ice wall
+face icecave2.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave20
+name ice wall
+face icecave20.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave21
+name ice wall
+face icecave21.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave22
+name ice wall
+face icecave22.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave23
+name ice wall
+face icecave23.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave24
+name ice wall
+face icecave24.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave25
+name ice wall
+face icecave25.111
+no_pass 1
+no_pick 1
+blocksview 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave3
+name ice wall
+face icecave3.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave4
+name ice wall
+face icecave4.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave5
+name ice wall
+face icecave5.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave6
+name ice wall
+face icecave6.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave7
+name ice wall
+face icecave7.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave8
+name ice wall
+face icecave8.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave9
+name ice wall
+face icecave9.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_0
+name ice wall
+face icecave_0.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_1
+name ice wall
+face icecave_1.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_10
+name ice wall
+face icecave_10.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_11
+name ice wall
+face icecave_11.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_12
+name ice wall
+face icecave_12.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_13
+name ice wall
+face icecave_13.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_14
+name ice wall
+face icecave_14.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_2
+name ice wall
+face icecave_2.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_3
+name ice wall
+face icecave_3.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_4
+name ice wall
+face icecave_4.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_5
+name ice wall
+face icecave_5.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_6
+name ice wall
+face icecave_6.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_7
+name ice wall
+face icecave_7.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_8
+name ice wall
+face icecave_8.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
+Object icecave_9
+name ice wall
+face icecave_9.111
+blocksview 1
+no_pick 1
+no_pass 1
+editable 512
+editor_folder wall/icecave
+end
 Object jcity_0
 name wall
 face jcity_0.111
@@ -62321,9 +67749,9 @@
 nrof 1
 material 16
 face crossbow.111
-dam 7
+dam 15
 weight 25000
-sp 40
+sp 19
 wc 1
 value 75
 no_strength 1
@@ -62689,6 +68117,25 @@
 skill two handed weapons
 editor_folder weapon/chained
 end
+Object whip1
+name whip
+nrof 1
+last_sp 1
+type 15
+face whip1.111
+weapontype 8
+material 18
+dam 1 
+weight 2000
+value 25
+editable 1024
+attacktype 1
+name_pl whips
+client_type 141
+body_arm -1
+skill one handed weapons
+editor_folder weapon/chained
+end
 Object big_club
 nrof 1
 name large club
@@ -62764,6 +68211,49 @@
 skill two handed weapons
 editor_folder weapon/club
 end
+Object musket
+name muskete
+name_pl musketen
+race musket balls
+type 14
+nrof 1
+material 16
+face musket.111
+dam 64
+weight 45000
+sp 10
+wc 1
+value 1500
+no_strength 1
+editable 1024
+attacktype 1
+client_type 161
+body_arm -2
+skill missile weapons
+editor_folder weapon/firearm
+end
+Object musketball
+name musketekugel
+name_pl musketekugeln
+race musket balls
+type 13
+face musketball.101
+animation musketball
+is_animated 0
+is_turnable 1
+nrof 1
+weight 200
+value 1
+material 2
+materialname lead
+food 80
+dam 40
+wc 2
+editable 1024
+attacktype 1
+client_type 165
+editor_folder weapon/firearm
+end
 Object hammer
 nrof 1
 last_sp 9
@@ -62824,6 +68314,26 @@
 skill one handed weapons
 editor_folder weapon/hammer
 end
+Object b_spikeballmace
+nrof 1
+name spike ball mace
+last_sp 10
+type 15
+face b_spikeballmace.111
+material 18
+materialname bronze
+weapontype 7
+dam 9
+weight 20500
+value 60
+editable 1024
+attacktype 1
+name_pl spike ball maces
+client_type 129
+body_arm -1
+skill one handed weapons
+editor_folder weapon/mace
+end
 Object mace
 nrof 1
 last_sp 9
@@ -62861,6 +68371,45 @@
 skill one handed weapons
 editor_folder weapon/mace
 end
+Object spikeballmace
+nrof 1
+name spike ball mace
+last_sp 10
+type 15
+face spikeballmace.111
+material 18
+weapontype 7
+dam 12
+weight 22500
+value 120
+editable 1024
+attacktype 1
+name_pl spike ball maces
+client_type 129
+body_arm -1
+skill one handed weapons
+editor_folder weapon/mace
+end
+Object chakram
+nrof 1
+name chakram
+last_sp 3
+type 15
+face chakram.111
+is_thrown 1
+material 2
+dam 6
+weight 700
+value 50
+editable 1024
+attacktype 1
+weapontype 2
+name_pl chakrams
+client_type 101
+body_arm -1
+skill one handed weapons
+editor_folder weapon/misc
+end
 Object kama1
 nrof 1
 last_sp 5