287 files changed, 574 insertions, 424 deletions

diff --git a/autoexec.cfg b/autoexec.cfg
index 5558102..90eb7cb 100755
--- a/autoexec.cfg
+++ b/autoexec.cfg
@@ -18,6 +18,8 @@ bind LSHIFT [setweapon 0] // Chainsaw.
 bind m [showcustommaps] // Unofficial custom maps.
 bind n [showgui maps]   // Official maps.
 
+bind KP_PLUS screenshot
+
 bind     BACKSLASH edittoggle
 editbind BACKSLASH edittoggle
 
diff --git a/data/menus.cfg b/data/menus.cfg
index 8f27bc4..bdf9330 100644
--- a/data/menus.cfg
+++ b/data/menus.cfg
@@ -10,6 +10,27 @@ togglemainmenu = [
 
 bind ESCAPE [togglemainmenu]
 
+newgui hudhealthmenu [
+	guilist [
+		guitext "X"
+		guistrut 6
+		newhudhealthx = $hudhealthx
+		guifield newhudhealthx 8 [hudhealthx $newhudhealthx]
+	]
+	guilist [
+		guitext "Y"
+		guistrut 6
+		newhudhealthy = $hudhealthy
+		guifield newhudhealthy 8 [hudhealthy $newhudhealthy]
+	]
+	guilist [
+		guitext "Scale"
+		guistrut 6
+		newhudhealthscale = $hudhealthscale
+		guifield newhudhealthscale 8 [hudhealthscale $newhudhealthscale]
+	]
+] "HUD Health"
+
 checkrolloveraction = [
     if (>= (strstr $guirolloveraction $arg1) 0) [
         if (>= $numargs 2) [arg2] [result $guirolloveraction]
diff --git a/packages/hud/armour_bar_base.png b/packages/hud/armour_bar_base.png
new file mode 100644
index 0000000..6ba89f0
--- /dev/null
+++ b/packages/hud/armour_bar_base.png
diff --git a/packages/hud/armour_bar_over.png b/packages/hud/armour_bar_over.png
new file mode 100644
index 0000000..8f5ded4
--- /dev/null
+++ b/packages/hud/armour_bar_over.png
diff --git a/packages/hud/armour_bar_quad.png b/packages/hud/armour_bar_quad.png
new file mode 100644
index 0000000..f1bab83
--- /dev/null
+++ b/packages/hud/armour_bar_quad.png
diff --git a/packages/hud/blank_items_48.png b/packages/hud/blank_items_48.png
new file mode 100644
index 0000000..c852960
--- /dev/null
+++ b/packages/hud/blank_items_48.png
diff --git a/packages/hud/blank_items_64.png b/packages/hud/blank_items_64.png
new file mode 100644
index 0000000..afd36eb
--- /dev/null
+++ b/packages/hud/blank_items_64.png
diff --git a/packages/hud/health_bar_base.png b/packages/hud/health_bar_base.png
new file mode 100644
index 0000000..420da6e
--- /dev/null
+++ b/packages/hud/health_bar_base.png
diff --git a/packages/hud/health_bar_over.png b/packages/hud/health_bar_over.png
new file mode 100644
index 0000000..215ed29
--- /dev/null
+++ b/packages/hud/health_bar_over.png
diff --git a/packages/hud/health_bar_quad.png b/packages/hud/health_bar_quad.png
new file mode 100644
index 0000000..35f371c
--- /dev/null
+++ b/packages/hud/health_bar_quad.png
diff --git a/packages/hud/health_boost_bar_base.png b/packages/hud/health_boost_bar_base.png
new file mode 100644
index 0000000..c7343b0
--- /dev/null
+++ b/packages/hud/health_boost_bar_base.png
diff --git a/packages/hud/health_boost_bar_over.png b/packages/hud/health_boost_bar_over.png
new file mode 100644
index 0000000..a5972fa
--- /dev/null
+++ b/packages/hud/health_boost_bar_over.png
diff --git a/packages/hud/health_boost_bar_quad.png b/packages/hud/health_boost_bar_quad.png
new file mode 100644
index 0000000..1cb6929
--- /dev/null
+++ b/packages/hud/health_boost_bar_quad.png
diff --git a/packages/hud/health_boost_base.png b/packages/hud/health_boost_base.png
new file mode 100644
index 0000000..e5e4c39
--- /dev/null
+++ b/packages/hud/health_boost_base.png
diff --git a/packages/hud/health_boost_over.png b/packages/hud/health_boost_over.png
new file mode 100644
index 0000000..46591b4
--- /dev/null
+++ b/packages/hud/health_boost_over.png
diff --git a/packages/hud/health_boost_quad.png b/packages/hud/health_boost_quad.png
new file mode 100644
index 0000000..8e88c22
--- /dev/null
+++ b/packages/hud/health_boost_quad.png
diff --git a/packages/hud/hud_ammo.png b/packages/hud/hud_ammo.png
deleted file mode 100644
index b425f05..0000000
--- a/packages/hud/hud_ammo.png
+++ /dev/null
diff --git a/packages/hud/hud_health.png b/packages/hud/hud_health.png
deleted file mode 100644
index dc564d5..0000000
--- a/packages/hud/hud_health.png
+++ /dev/null
diff --git a/packages/hud/hud_left.png b/packages/hud/hud_left.png
deleted file mode 100644
index 8f426f8..0000000
--- a/packages/hud/hud_left.png
+++ /dev/null
diff --git a/packages/hud/hud_megahealth.png b/packages/hud/hud_megahealth.png
deleted file mode 100644
index a0aa584..0000000
--- a/packages/hud/hud_megahealth.png
+++ /dev/null
diff --git a/packages/hud/hud_quaddamage_left.png b/packages/hud/hud_quaddamage_left.png
deleted file mode 100644
index cbea329..0000000
--- a/packages/hud/hud_quaddamage_left.png
+++ /dev/null
diff --git a/packages/hud/hud_quaddamage_right.png b/packages/hud/hud_quaddamage_right.png
deleted file mode 100644
index f955458..0000000
--- a/packages/hud/hud_quaddamage_right.png
+++ /dev/null
diff --git a/packages/hud/hud_right.png b/packages/hud/hud_right.png
deleted file mode 100644
index 001eb54..0000000
--- a/packages/hud/hud_right.png
+++ /dev/null
diff --git a/packages/hud/speedometer.png b/packages/hud/speedometer.png
new file mode 100644
index 0000000..1ae254d
--- /dev/null
+++ b/packages/hud/speedometer.png
diff --git a/packages/maps/bloodrun.cfg b/packages/maps/bloodrun.cfg
new file mode 100644
index 0000000..b2747fc
--- /dev/null
+++ b/packages/maps/bloodrun.cfg
@@ -0,0 +1,12 @@
+// Bloodrun
+
+texturereset
+
+    setshader "stdworld"
+        texture 0 "textures/sky.png"
+        texture 0 "textures/default.png"
+
+    exec "packages/textures/ex/package.cfg"
+    exec "packages/textures/mitaman/package.cfg"
+
+    setshader "stdworld"
diff --git a/packages/maps/bloodrun.ogz b/packages/maps/bloodrun.ogz
index f242c20..e69fe5e 100644
--- a/packages/maps/bloodrun.ogz
+++ b/packages/maps/bloodrun.ogz
diff --git a/packages/maps/bloodrun.wpt b/packages/maps/bloodrun.wpt
new file mode 100644
index 0000000..b623fb8
--- /dev/null
+++ b/packages/maps/bloodrun.wpt
diff --git a/packages/textures/ex/clangfloor_01_d.png b/packages/textures/ex/clangfloor_01_c.png
index 44f40b2..44f40b2 100644
--- a/packages/textures/ex/clangfloor_01_d.png
+++ b/packages/textures/ex/clangfloor_01_c.png
diff --git a/packages/textures/ex/clangfloor_01_h.png b/packages/textures/ex/clangfloor_01_h.png
deleted file mode 100644
index e1e8509..0000000
--- a/packages/textures/ex/clangfloor_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/clangfloor_01_local.png b/packages/textures/ex/clangfloor_01_n.png
index 623e03a..623e03a 100644
--- a/packages/textures/ex/clangfloor_01_local.png
+++ b/packages/textures/ex/clangfloor_01_n.png
diff --git a/packages/textures/ex/clangfloor_01b_d.png b/packages/textures/ex/clangfloor_01b_c.png
index 84991f7..84991f7 100644
--- a/packages/textures/ex/clangfloor_01b_d.png
+++ b/packages/textures/ex/clangfloor_01b_c.png
diff --git a/packages/textures/ex/cretebase_01_d.png b/packages/textures/ex/cretebase_01_c.png
index 3a0cf7e..3a0cf7e 100644
--- a/packages/textures/ex/cretebase_01_d.png
+++ b/packages/textures/ex/cretebase_01_c.png
diff --git a/packages/textures/ex/cretebase_01_h.png b/packages/textures/ex/cretebase_01_h.png
deleted file mode 100644
index 9dec1bb..0000000
--- a/packages/textures/ex/cretebase_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/cretebase_01_local.png b/packages/textures/ex/cretebase_01_n.png
index 6ddb179..6ddb179 100644
--- a/packages/textures/ex/cretebase_01_local.png
+++ b/packages/textures/ex/cretebase_01_n.png
diff --git a/packages/textures/ex/cretebase_02_d.png b/packages/textures/ex/cretebase_02_c.png
index d8d91f4..d8d91f4 100644
--- a/packages/textures/ex/cretebase_02_d.png
+++ b/packages/textures/ex/cretebase_02_c.png
diff --git a/packages/textures/ex/cretebase_03_dark_d.png b/packages/textures/ex/cretebase_03_dark_c.png
index e11ddd0..e11ddd0 100644
--- a/packages/textures/ex/cretebase_03_dark_d.png
+++ b/packages/textures/ex/cretebase_03_dark_c.png
diff --git a/packages/textures/ex/cretefloor_01_d.png b/packages/textures/ex/cretefloor_01_c.png
index 870a11b..870a11b 100644
--- a/packages/textures/ex/cretefloor_01_d.png
+++ b/packages/textures/ex/cretefloor_01_c.png
diff --git a/packages/textures/ex/cretefloor_01_h.png b/packages/textures/ex/cretefloor_01_h.png
deleted file mode 100644
index 04bcc59..0000000
--- a/packages/textures/ex/cretefloor_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/cretefloor_01_local.png b/packages/textures/ex/cretefloor_01_n.png
index 7d13d62..7d13d62 100644
--- a/packages/textures/ex/cretefloor_01_local.png
+++ b/packages/textures/ex/cretefloor_01_n.png
diff --git a/packages/textures/ex/cretefloor_01b_d.png b/packages/textures/ex/cretefloor_01b_c.png
index 33f9d18..33f9d18 100644
--- a/packages/textures/ex/cretefloor_01b_d.png
+++ b/packages/textures/ex/cretefloor_01b_c.png
diff --git a/packages/textures/ex/cretefloor_01b_h.png b/packages/textures/ex/cretefloor_01b_h.png
deleted file mode 100644
index e40877b..0000000
--- a/packages/textures/ex/cretefloor_01b_h.png
+++ /dev/null
diff --git a/packages/textures/ex/cretefloor_01b_local.png b/packages/textures/ex/cretefloor_01b_n.png
index f19a477..f19a477 100644
--- a/packages/textures/ex/cretefloor_01b_local.png
+++ b/packages/textures/ex/cretefloor_01b_n.png
diff --git a/packages/textures/ex/cretewall_01_d.png b/packages/textures/ex/cretewall_01_c.png
index b55cb10..b55cb10 100644
--- a/packages/textures/ex/cretewall_01_d.png
+++ b/packages/textures/ex/cretewall_01_c.png
diff --git a/packages/textures/ex/cretewall_01_h.png b/packages/textures/ex/cretewall_01_h.png
deleted file mode 100644
index 02af224..0000000
--- a/packages/textures/ex/cretewall_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/cretewall_01_local.png b/packages/textures/ex/cretewall_01_n.png
index 59ea11d..59ea11d 100644
--- a/packages/textures/ex/cretewall_01_local.png
+++ b/packages/textures/ex/cretewall_01_n.png
diff --git a/packages/textures/ex/cretewall_02_d.png b/packages/textures/ex/cretewall_02_c.png
index c538e44..c538e44 100644
--- a/packages/textures/ex/cretewall_02_d.png
+++ b/packages/textures/ex/cretewall_02_c.png
diff --git a/packages/textures/ex/cretewall_02_h.png b/packages/textures/ex/cretewall_02_h.png
deleted file mode 100644
index 8f93713..0000000
--- a/packages/textures/ex/cretewall_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/cretewall_02_local.png b/packages/textures/ex/cretewall_02_n.png
index 107a322..107a322 100644
--- a/packages/textures/ex/cretewall_02_local.png
+++ b/packages/textures/ex/cretewall_02_n.png
diff --git a/packages/textures/ex/cretewall_03_d.png b/packages/textures/ex/cretewall_03_c.png
index 850baff..850baff 100644
--- a/packages/textures/ex/cretewall_03_d.png
+++ b/packages/textures/ex/cretewall_03_c.png
diff --git a/packages/textures/ex/cretewall_03_h.png b/packages/textures/ex/cretewall_03_h.png
deleted file mode 100644
index 16d02ea..0000000
--- a/packages/textures/ex/cretewall_03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/cretewall_03_local.png b/packages/textures/ex/cretewall_03_n.png
index 95710d8..95710d8 100644
--- a/packages/textures/ex/cretewall_03_local.png
+++ b/packages/textures/ex/cretewall_03_n.png
diff --git a/packages/textures/ex/cretewall_03b_d.png b/packages/textures/ex/cretewall_03b_c.png
index 7582082..7582082 100644
--- a/packages/textures/ex/cretewall_03b_d.png
+++ b/packages/textures/ex/cretewall_03b_c.png
diff --git a/packages/textures/ex/cretewall_03b_h.png b/packages/textures/ex/cretewall_03b_h.png
deleted file mode 100644
index 34aa831..0000000
--- a/packages/textures/ex/cretewall_03b_h.png
+++ /dev/null
diff --git a/packages/textures/ex/cretewall_03b_local.png b/packages/textures/ex/cretewall_03b_n.png
index 8c6d458..8c6d458 100644
--- a/packages/textures/ex/cretewall_03b_local.png
+++ b/packages/textures/ex/cretewall_03b_n.png
diff --git a/packages/textures/ex/deswall_01_d.png b/packages/textures/ex/deswall_01_c.png
index 4e7e2ca..4e7e2ca 100644
--- a/packages/textures/ex/deswall_01_d.png
+++ b/packages/textures/ex/deswall_01_c.png
diff --git a/packages/textures/ex/deswall_01_h.png b/packages/textures/ex/deswall_01_h.png
deleted file mode 100644
index d08d34f..0000000
--- a/packages/textures/ex/deswall_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/deswall_01_local.png b/packages/textures/ex/deswall_01_n.png
index 3e9aa81..3e9aa81 100644
--- a/packages/textures/ex/deswall_01_local.png
+++ b/packages/textures/ex/deswall_01_n.png
diff --git a/packages/textures/ex/floor_grate03_d.png b/packages/textures/ex/floor_grate03_c.png
index eb5dd88..eb5dd88 100644
--- a/packages/textures/ex/floor_grate03_d.png
+++ b/packages/textures/ex/floor_grate03_c.png
diff --git a/packages/textures/ex/floor_grate03_h.png b/packages/textures/ex/floor_grate03_h.png
deleted file mode 100644
index 7d7340c..0000000
--- a/packages/textures/ex/floor_grate03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_grate03_local.png b/packages/textures/ex/floor_grate03_n.png
index 86f480e..86f480e 100644
--- a/packages/textures/ex/floor_grate03_local.png
+++ b/packages/textures/ex/floor_grate03_n.png
diff --git a/packages/textures/ex/floor_grate_03_128_d.png b/packages/textures/ex/floor_grate_03_128_c.png
index 0628a41..0628a41 100644
--- a/packages/textures/ex/floor_grate_03_128_d.png
+++ b/packages/textures/ex/floor_grate_03_128_c.png
diff --git a/packages/textures/ex/floor_grate_03_128_h.png b/packages/textures/ex/floor_grate_03_128_h.png
deleted file mode 100644
index a10ca8a..0000000
--- a/packages/textures/ex/floor_grate_03_128_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_grate_03_128_local.png b/packages/textures/ex/floor_grate_03_128_n.png
index 2a97452..2a97452 100644
--- a/packages/textures/ex/floor_grate_03_128_local.png
+++ b/packages/textures/ex/floor_grate_03_128_n.png
diff --git a/packages/textures/ex/floor_grate_03_d.png b/packages/textures/ex/floor_grate_03_c.png
index b6fa9f8..b6fa9f8 100644
--- a/packages/textures/ex/floor_grate_03_d.png
+++ b/packages/textures/ex/floor_grate_03_c.png
diff --git a/packages/textures/ex/floor_grate_03_h.png b/packages/textures/ex/floor_grate_03_h.png
deleted file mode 100644
index 1295945..0000000
--- a/packages/textures/ex/floor_grate_03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_grate_03_local.png b/packages/textures/ex/floor_grate_03_n.png
index cf07a9e..cf07a9e 100644
--- a/packages/textures/ex/floor_grate_03_local.png
+++ b/packages/textures/ex/floor_grate_03_n.png
diff --git a/packages/textures/ex/floor_mtl_grate_01_d.png b/packages/textures/ex/floor_mtl_grate_01_c.png
index 9c12862..9c12862 100644
--- a/packages/textures/ex/floor_mtl_grate_01_d.png
+++ b/packages/textures/ex/floor_mtl_grate_01_c.png
diff --git a/packages/textures/ex/floor_mtl_grate_01_h.png b/packages/textures/ex/floor_mtl_grate_01_h.png
deleted file mode 100644
index 173105c..0000000
--- a/packages/textures/ex/floor_mtl_grate_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_mtl_grate_01_local.png b/packages/textures/ex/floor_mtl_grate_01_n.png
index bd7684a..bd7684a 100644
--- a/packages/textures/ex/floor_mtl_grate_01_local.png
+++ b/packages/textures/ex/floor_mtl_grate_01_n.png
diff --git a/packages/textures/ex/floor_mtl_wrn_01_d.png b/packages/textures/ex/floor_mtl_wrn_01_c.png
index 8694e5b..8694e5b 100644
--- a/packages/textures/ex/floor_mtl_wrn_01_d.png
+++ b/packages/textures/ex/floor_mtl_wrn_01_c.png
diff --git a/packages/textures/ex/floor_mtl_wrn_01_h.png b/packages/textures/ex/floor_mtl_wrn_01_h.png
deleted file mode 100644
index 63893cd..0000000
--- a/packages/textures/ex/floor_mtl_wrn_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_mtl_wrn_01_local.png b/packages/textures/ex/floor_mtl_wrn_01_n.png
index f2f7e6c..f2f7e6c 100644
--- a/packages/textures/ex/floor_mtl_wrn_01_local.png
+++ b/packages/textures/ex/floor_mtl_wrn_01_n.png
diff --git a/packages/textures/ex/floor_simple_05_d.png b/packages/textures/ex/floor_simple_05_c.png
index 5dc5f5b..5dc5f5b 100644
--- a/packages/textures/ex/floor_simple_05_d.png
+++ b/packages/textures/ex/floor_simple_05_c.png
diff --git a/packages/textures/ex/floor_simple_05_h.png b/packages/textures/ex/floor_simple_05_h.png
deleted file mode 100644
index ba102dd..0000000
--- a/packages/textures/ex/floor_simple_05_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_simple_05_local.png b/packages/textures/ex/floor_simple_05_n.png
index aa19b09..aa19b09 100644
--- a/packages/textures/ex/floor_simple_05_local.png
+++ b/packages/textures/ex/floor_simple_05_n.png
diff --git a/packages/textures/ex/floor_simplines_d.png b/packages/textures/ex/floor_simplines_c.png
index 5d33989..5d33989 100644
--- a/packages/textures/ex/floor_simplines_d.png
+++ b/packages/textures/ex/floor_simplines_c.png
diff --git a/packages/textures/ex/floor_simplines_h.png b/packages/textures/ex/floor_simplines_h.png
deleted file mode 100644
index fe96181..0000000
--- a/packages/textures/ex/floor_simplines_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_simplines_local.png b/packages/textures/ex/floor_simplines_n.png
index bcb56d6..bcb56d6 100644
--- a/packages/textures/ex/floor_simplines_local.png
+++ b/packages/textures/ex/floor_simplines_n.png
diff --git a/packages/textures/ex/floor_tile_03_d.png b/packages/textures/ex/floor_tile_03_c.png
index ae0ee6a..ae0ee6a 100644
--- a/packages/textures/ex/floor_tile_03_d.png
+++ b/packages/textures/ex/floor_tile_03_c.png
diff --git a/packages/textures/ex/floor_tile_03_h.png b/packages/textures/ex/floor_tile_03_h.png
deleted file mode 100644
index 6aba19e..0000000
--- a/packages/textures/ex/floor_tile_03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_tile_03_local.png b/packages/textures/ex/floor_tile_03_n.png
index f8ab61c..f8ab61c 100644
--- a/packages/textures/ex/floor_tile_03_local.png
+++ b/packages/textures/ex/floor_tile_03_n.png
diff --git a/packages/textures/ex/floor_tread_01_d.png b/packages/textures/ex/floor_tread_01_c.png
index 77cf3bd..77cf3bd 100644
--- a/packages/textures/ex/floor_tread_01_d.png
+++ b/packages/textures/ex/floor_tread_01_c.png
diff --git a/packages/textures/ex/floor_tread_01_h.png b/packages/textures/ex/floor_tread_01_h.png
deleted file mode 100644
index 7b4c066..0000000
--- a/packages/textures/ex/floor_tread_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floor_tread_01_local.png b/packages/textures/ex/floor_tread_01_n.png
index 1ab0e2f..1ab0e2f 100644
--- a/packages/textures/ex/floor_tread_01_local.png
+++ b/packages/textures/ex/floor_tread_01_n.png
diff --git a/packages/textures/ex/floorpanel_01_d.png b/packages/textures/ex/floorpanel_01_c.png
index 1349bed..1349bed 100644
--- a/packages/textures/ex/floorpanel_01_d.png
+++ b/packages/textures/ex/floorpanel_01_c.png
diff --git a/packages/textures/ex/floorpanel_01_h.png b/packages/textures/ex/floorpanel_01_h.png
deleted file mode 100644
index b12458f..0000000
--- a/packages/textures/ex/floorpanel_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/floorpanel_01_local.png b/packages/textures/ex/floorpanel_01_n.png
index 4bd5630..4bd5630 100644
--- a/packages/textures/ex/floorpanel_01_local.png
+++ b/packages/textures/ex/floorpanel_01_n.png
diff --git a/packages/textures/ex/light_u201_d.png b/packages/textures/ex/light_u201_c.png
index aa2a3e9..aa2a3e9 100644
--- a/packages/textures/ex/light_u201_d.png
+++ b/packages/textures/ex/light_u201_c.png
diff --git a/packages/textures/ex/light_u201_add.png b/packages/textures/ex/light_u201_g.png
index a38c064..a38c064 100644
--- a/packages/textures/ex/light_u201_add.png
+++ b/packages/textures/ex/light_u201_g.png
diff --git a/packages/textures/ex/light_u201_h.png b/packages/textures/ex/light_u201_h.png
deleted file mode 100644
index 7c6ee5d..0000000
--- a/packages/textures/ex/light_u201_h.png
+++ /dev/null
diff --git a/packages/textures/ex/light_u201_local.png b/packages/textures/ex/light_u201_n.png
index 8f426f2..8f426f2 100644
--- a/packages/textures/ex/light_u201_local.png
+++ b/packages/textures/ex/light_u201_n.png
diff --git a/packages/textures/ex/lightpanel_01_d.png b/packages/textures/ex/lightpanel_01_c.png
index 3629b93..3629b93 100644
--- a/packages/textures/ex/lightpanel_01_d.png
+++ b/packages/textures/ex/lightpanel_01_c.png
diff --git a/packages/textures/ex/lightpanel_01_add.png b/packages/textures/ex/lightpanel_01_g.png
index 251273a..251273a 100644
--- a/packages/textures/ex/lightpanel_01_add.png
+++ b/packages/textures/ex/lightpanel_01_g.png
diff --git a/packages/textures/ex/lightpanel_01_h.png b/packages/textures/ex/lightpanel_01_h.png
deleted file mode 100644
index 6b053da..0000000
--- a/packages/textures/ex/lightpanel_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/lightpanel_01_local.png b/packages/textures/ex/lightpanel_01_n.png
index 2c0c2c6..2c0c2c6 100644
--- a/packages/textures/ex/lightpanel_01_local.png
+++ b/packages/textures/ex/lightpanel_01_n.png
diff --git a/packages/textures/ex/metal_base_01_d.png b/packages/textures/ex/metal_base_01_c.png
index e4fb273..e4fb273 100644
--- a/packages/textures/ex/metal_base_01_d.png
+++ b/packages/textures/ex/metal_base_01_c.png
diff --git a/packages/textures/ex/metal_base_01_h.png b/packages/textures/ex/metal_base_01_h.png
deleted file mode 100644
index f29d5c8..0000000
--- a/packages/textures/ex/metal_base_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_base_01_local.png b/packages/textures/ex/metal_base_01_n.png
index 29ce2bd..29ce2bd 100644
--- a/packages/textures/ex/metal_base_01_local.png
+++ b/packages/textures/ex/metal_base_01_n.png
diff --git a/packages/textures/ex/metal_base_02_d.png b/packages/textures/ex/metal_base_02_c.png
index 84c9ad2..84c9ad2 100644
--- a/packages/textures/ex/metal_base_02_d.png
+++ b/packages/textures/ex/metal_base_02_c.png
diff --git a/packages/textures/ex/metal_base_02_h.png b/packages/textures/ex/metal_base_02_h.png
deleted file mode 100644
index a786397..0000000
--- a/packages/textures/ex/metal_base_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_base_02_local.png b/packages/textures/ex/metal_base_02_n.png
index 29ce2bd..29ce2bd 100644
--- a/packages/textures/ex/metal_base_02_local.png
+++ b/packages/textures/ex/metal_base_02_n.png
diff --git a/packages/textures/ex/metal_base_03_d.png b/packages/textures/ex/metal_base_03_c.png
index 691c5cd..691c5cd 100644
--- a/packages/textures/ex/metal_base_03_d.png
+++ b/packages/textures/ex/metal_base_03_c.png
diff --git a/packages/textures/ex/metal_base_03_h.png b/packages/textures/ex/metal_base_03_h.png
deleted file mode 100644
index 9fd2252..0000000
--- a/packages/textures/ex/metal_base_03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_base_03_local.png b/packages/textures/ex/metal_base_03_n.png
index 29ce2bd..29ce2bd 100644
--- a/packages/textures/ex/metal_base_03_local.png
+++ b/packages/textures/ex/metal_base_03_n.png
diff --git a/packages/textures/ex/metal_base_04_d.png b/packages/textures/ex/metal_base_04_c.png
index 488877a..488877a 100644
--- a/packages/textures/ex/metal_base_04_d.png
+++ b/packages/textures/ex/metal_base_04_c.png
diff --git a/packages/textures/ex/metal_base_05_rust_d.png b/packages/textures/ex/metal_base_05_rust_c.png
index 300b80a..300b80a 100644
--- a/packages/textures/ex/metal_base_05_rust_d.png
+++ b/packages/textures/ex/metal_base_05_rust_c.png
diff --git a/packages/textures/ex/metal_base_05_rust_h.png b/packages/textures/ex/metal_base_05_rust_h.png
deleted file mode 100644
index 5fe2e15..0000000
--- a/packages/textures/ex/metal_base_05_rust_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_base_05_rust_local.png b/packages/textures/ex/metal_base_05_rust_n.png
index 29ce2bd..29ce2bd 100644
--- a/packages/textures/ex/metal_base_05_rust_local.png
+++ b/packages/textures/ex/metal_base_05_rust_n.png
diff --git a/packages/textures/ex/metal_base_06_rust_d.png b/packages/textures/ex/metal_base_06_rust_c.png
index 6f61b50..6f61b50 100644
--- a/packages/textures/ex/metal_base_06_rust_d.png
+++ b/packages/textures/ex/metal_base_06_rust_c.png
diff --git a/packages/textures/ex/metal_base_07_rust_d.png b/packages/textures/ex/metal_base_07_rust_c.png
index 871c0a9..871c0a9 100644
--- a/packages/textures/ex/metal_base_07_rust_d.png
+++ b/packages/textures/ex/metal_base_07_rust_c.png
diff --git a/packages/textures/ex/metal_floor_02_d.png b/packages/textures/ex/metal_floor_02_c.png
index 06cab57..06cab57 100644
--- a/packages/textures/ex/metal_floor_02_d.png
+++ b/packages/textures/ex/metal_floor_02_c.png
diff --git a/packages/textures/ex/metal_floor_02_h.png b/packages/textures/ex/metal_floor_02_h.png
deleted file mode 100644
index 4f22188..0000000
--- a/packages/textures/ex/metal_floor_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_floor_02_local.png b/packages/textures/ex/metal_floor_02_n.png
index 42e9a5e..42e9a5e 100644
--- a/packages/textures/ex/metal_floor_02_local.png
+++ b/packages/textures/ex/metal_floor_02_n.png
diff --git a/packages/textures/ex/metal_plate_01_d.png b/packages/textures/ex/metal_plate_01_c.png
index f93336e..f93336e 100644
--- a/packages/textures/ex/metal_plate_01_d.png
+++ b/packages/textures/ex/metal_plate_01_c.png
diff --git a/packages/textures/ex/metal_plate_01_h.png b/packages/textures/ex/metal_plate_01_h.png
deleted file mode 100644
index c4e97f1..0000000
--- a/packages/textures/ex/metal_plate_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_plate_01_local.png b/packages/textures/ex/metal_plate_01_n.png
index 97b58b9..97b58b9 100644
--- a/packages/textures/ex/metal_plate_01_local.png
+++ b/packages/textures/ex/metal_plate_01_n.png
diff --git a/packages/textures/ex/metal_plate_01b_d.png b/packages/textures/ex/metal_plate_01b_c.png
index f534bdb..f534bdb 100644
--- a/packages/textures/ex/metal_plate_01b_d.png
+++ b/packages/textures/ex/metal_plate_01b_c.png
diff --git a/packages/textures/ex/metal_plate_01b_h.png b/packages/textures/ex/metal_plate_01b_h.png
deleted file mode 100644
index 438f207..0000000
--- a/packages/textures/ex/metal_plate_01b_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_plate_01b_local.png b/packages/textures/ex/metal_plate_01b_n.png
index 97b58b9..97b58b9 100644
--- a/packages/textures/ex/metal_plate_01b_local.png
+++ b/packages/textures/ex/metal_plate_01b_n.png
diff --git a/packages/textures/ex/metal_plate_01c_d.png b/packages/textures/ex/metal_plate_01c_c.png
index f3af579..f3af579 100644
--- a/packages/textures/ex/metal_plate_01c_d.png
+++ b/packages/textures/ex/metal_plate_01c_c.png
diff --git a/packages/textures/ex/metal_plate_01c_h.png b/packages/textures/ex/metal_plate_01c_h.png
deleted file mode 100644
index 76f8256..0000000
--- a/packages/textures/ex/metal_plate_01c_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_plate_01c_local.png b/packages/textures/ex/metal_plate_01c_n.png
index b11b68e..b11b68e 100644
--- a/packages/textures/ex/metal_plate_01c_local.png
+++ b/packages/textures/ex/metal_plate_01c_n.png
diff --git a/packages/textures/ex/metal_rib_01_d.png b/packages/textures/ex/metal_rib_01_c.png
index 6b226a6..6b226a6 100644
--- a/packages/textures/ex/metal_rib_01_d.png
+++ b/packages/textures/ex/metal_rib_01_c.png
diff --git a/packages/textures/ex/metal_rib_01_h.png b/packages/textures/ex/metal_rib_01_h.png
deleted file mode 100644
index 0550c5e..0000000
--- a/packages/textures/ex/metal_rib_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_rib_01_local.png b/packages/textures/ex/metal_rib_01_n.png
index 020c823..020c823 100644
--- a/packages/textures/ex/metal_rib_01_local.png
+++ b/packages/textures/ex/metal_rib_01_n.png
diff --git a/packages/textures/ex/metal_supp_01_d.png b/packages/textures/ex/metal_supp_01_c.png
index f50d91c..f50d91c 100644
--- a/packages/textures/ex/metal_supp_01_d.png
+++ b/packages/textures/ex/metal_supp_01_c.png
diff --git a/packages/textures/ex/metal_supp_01_h.png b/packages/textures/ex/metal_supp_01_h.png
deleted file mode 100644
index 705bae9..0000000
--- a/packages/textures/ex/metal_supp_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_supp_01_local.png b/packages/textures/ex/metal_supp_01_n.png
index 657f9cc..657f9cc 100644
--- a/packages/textures/ex/metal_supp_01_local.png
+++ b/packages/textures/ex/metal_supp_01_n.png
diff --git a/packages/textures/ex/metal_wall_02_d.png b/packages/textures/ex/metal_wall_02_c.png
index f6d2b01..f6d2b01 100644
--- a/packages/textures/ex/metal_wall_02_d.png
+++ b/packages/textures/ex/metal_wall_02_c.png
diff --git a/packages/textures/ex/metal_wall_02_h.png b/packages/textures/ex/metal_wall_02_h.png
deleted file mode 100644
index 418772b..0000000
--- a/packages/textures/ex/metal_wall_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metal_wall_02_local.png b/packages/textures/ex/metal_wall_02_n.png
index 56dae1e..56dae1e 100644
--- a/packages/textures/ex/metal_wall_02_local.png
+++ b/packages/textures/ex/metal_wall_02_n.png
diff --git a/packages/textures/ex/metalbase01_d.png b/packages/textures/ex/metalbase01_c.png
index 752494f..752494f 100644
--- a/packages/textures/ex/metalbase01_d.png
+++ b/packages/textures/ex/metalbase01_c.png
diff --git a/packages/textures/ex/metalbase01_h.png b/packages/textures/ex/metalbase01_h.png
deleted file mode 100644
index 52dc2c3..0000000
--- a/packages/textures/ex/metalbase01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metalbase01_local.png b/packages/textures/ex/metalbase01_n.png
index 534c6a8..534c6a8 100644
--- a/packages/textures/ex/metalbase01_local.png
+++ b/packages/textures/ex/metalbase01_n.png
diff --git a/packages/textures/ex/metalbase03_d.png b/packages/textures/ex/metalbase03_c.png
index 2633d96..2633d96 100644
--- a/packages/textures/ex/metalbase03_d.png
+++ b/packages/textures/ex/metalbase03_c.png
diff --git a/packages/textures/ex/metalbase03_h.png b/packages/textures/ex/metalbase03_h.png
deleted file mode 100644
index 52dc2c3..0000000
--- a/packages/textures/ex/metalbase03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metalbase03_local.png b/packages/textures/ex/metalbase03_n.png
index 534c6a8..534c6a8 100644
--- a/packages/textures/ex/metalbase03_local.png
+++ b/packages/textures/ex/metalbase03_n.png
diff --git a/packages/textures/ex/metalbase04_d.png b/packages/textures/ex/metalbase04_c.png
index bb9f383..bb9f383 100644
--- a/packages/textures/ex/metalbase04_d.png
+++ b/packages/textures/ex/metalbase04_c.png
diff --git a/packages/textures/ex/metalbase05rust_d.png b/packages/textures/ex/metalbase05rust_c.png
index 841a9e4..841a9e4 100644
--- a/packages/textures/ex/metalbase05rust_d.png
+++ b/packages/textures/ex/metalbase05rust_c.png
diff --git a/packages/textures/ex/metalbase05rust_h.png b/packages/textures/ex/metalbase05rust_h.png
deleted file mode 100644
index 9b4cf70..0000000
--- a/packages/textures/ex/metalbase05rust_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metalbase05rust_local.png b/packages/textures/ex/metalbase05rust_n.png
index e150e8e..e150e8e 100644
--- a/packages/textures/ex/metalbase05rust_local.png
+++ b/packages/textures/ex/metalbase05rust_n.png
diff --git a/packages/textures/ex/metalfloor02_d.png b/packages/textures/ex/metalfloor02_c.png
index 6118378..6118378 100644
--- a/packages/textures/ex/metalfloor02_d.png
+++ b/packages/textures/ex/metalfloor02_c.png
diff --git a/packages/textures/ex/metalfloor02_h.png b/packages/textures/ex/metalfloor02_h.png
deleted file mode 100644
index 3ebb8c9..0000000
--- a/packages/textures/ex/metalfloor02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metalfloor02_local.png b/packages/textures/ex/metalfloor02_n.png
index 9a2af85..9a2af85 100644
--- a/packages/textures/ex/metalfloor02_local.png
+++ b/packages/textures/ex/metalfloor02_n.png
diff --git a/packages/textures/ex/metalplate_01_d.png b/packages/textures/ex/metalplate_01_c.png
index 746910a..746910a 100644
--- a/packages/textures/ex/metalplate_01_d.png
+++ b/packages/textures/ex/metalplate_01_c.png
diff --git a/packages/textures/ex/metalplate_01_h.png b/packages/textures/ex/metalplate_01_h.png
deleted file mode 100644
index 20cac91..0000000
--- a/packages/textures/ex/metalplate_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metalplate_01_local.png b/packages/textures/ex/metalplate_01_n.png
index daef620..daef620 100644
--- a/packages/textures/ex/metalplate_01_local.png
+++ b/packages/textures/ex/metalplate_01_n.png
diff --git a/packages/textures/ex/metalsupp01_d.png b/packages/textures/ex/metalsupp01_c.png
index af39d80..af39d80 100644
--- a/packages/textures/ex/metalsupp01_d.png
+++ b/packages/textures/ex/metalsupp01_c.png
diff --git a/packages/textures/ex/metalsupp01_h.png b/packages/textures/ex/metalsupp01_h.png
deleted file mode 100644
index 8814746..0000000
--- a/packages/textures/ex/metalsupp01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metalsupp01_local.png b/packages/textures/ex/metalsupp01_n.png
index 52df4b2..52df4b2 100644
--- a/packages/textures/ex/metalsupp01_local.png
+++ b/packages/textures/ex/metalsupp01_n.png
diff --git a/packages/textures/ex/metalwall02_d.png b/packages/textures/ex/metalwall02_c.png
index d41c46c..d41c46c 100644
--- a/packages/textures/ex/metalwall02_d.png
+++ b/packages/textures/ex/metalwall02_c.png
diff --git a/packages/textures/ex/metalwall02_h.png b/packages/textures/ex/metalwall02_h.png
deleted file mode 100644
index e7f8ffe..0000000
--- a/packages/textures/ex/metalwall02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/metalwall02_local.png b/packages/textures/ex/metalwall02_n.png
index 870785f..870785f 100644
--- a/packages/textures/ex/metalwall02_local.png
+++ b/packages/textures/ex/metalwall02_n.png
diff --git a/packages/textures/ex/mtl_bigplate_04_d.png b/packages/textures/ex/mtl_bigplate_04_c.png
index 8119ee5..8119ee5 100644
--- a/packages/textures/ex/mtl_bigplate_04_d.png
+++ b/packages/textures/ex/mtl_bigplate_04_c.png
diff --git a/packages/textures/ex/mtl_bigplate_04_h.png b/packages/textures/ex/mtl_bigplate_04_h.png
deleted file mode 100644
index 6be525c..0000000
--- a/packages/textures/ex/mtl_bigplate_04_h.png
+++ /dev/null
diff --git a/packages/textures/ex/mtl_bigplate_04_local.png b/packages/textures/ex/mtl_bigplate_04_n.png
index 4aa1e1c..4aa1e1c 100644
--- a/packages/textures/ex/mtl_bigplate_04_local.png
+++ b/packages/textures/ex/mtl_bigplate_04_n.png
diff --git a/packages/textures/ex/mtl_bigplate_04b_d.png b/packages/textures/ex/mtl_bigplate_04b_c.png
index 4b8a7d0..4b8a7d0 100644
--- a/packages/textures/ex/mtl_bigplate_04b_d.png
+++ b/packages/textures/ex/mtl_bigplate_04b_c.png
diff --git a/packages/textures/ex/mtl_bigplate_04b_h.png b/packages/textures/ex/mtl_bigplate_04b_h.png
deleted file mode 100644
index ef26566..0000000
--- a/packages/textures/ex/mtl_bigplate_04b_h.png
+++ /dev/null
diff --git a/packages/textures/ex/mtl_bigplate_04b_local.png b/packages/textures/ex/mtl_bigplate_04b_n.png
index fcc7d1d..fcc7d1d 100644
--- a/packages/textures/ex/mtl_bigplate_04b_local.png
+++ b/packages/textures/ex/mtl_bigplate_04b_n.png
diff --git a/packages/textures/ex/mtl_panel_02_d.png b/packages/textures/ex/mtl_panel_02_c.png
index 842529d..842529d 100644
--- a/packages/textures/ex/mtl_panel_02_d.png
+++ b/packages/textures/ex/mtl_panel_02_c.png
diff --git a/packages/textures/ex/mtl_panel_02_h.png b/packages/textures/ex/mtl_panel_02_h.png
deleted file mode 100644
index 0235301..0000000
--- a/packages/textures/ex/mtl_panel_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/mtl_panel_02_local.png b/packages/textures/ex/mtl_panel_02_n.png
index 01c9493..01c9493 100644
--- a/packages/textures/ex/mtl_panel_02_local.png
+++ b/packages/textures/ex/mtl_panel_02_n.png
diff --git a/packages/textures/ex/mtl_panel_03_d.png b/packages/textures/ex/mtl_panel_03_c.png
index 0331575..0331575 100644
--- a/packages/textures/ex/mtl_panel_03_d.png
+++ b/packages/textures/ex/mtl_panel_03_c.png
diff --git a/packages/textures/ex/mtl_panel_03_h.png b/packages/textures/ex/mtl_panel_03_h.png
deleted file mode 100644
index 58c983c..0000000
--- a/packages/textures/ex/mtl_panel_03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/mtl_panel_03_local.png b/packages/textures/ex/mtl_panel_03_n.png
index 5bd95c1..5bd95c1 100644
--- a/packages/textures/ex/mtl_panel_03_local.png
+++ b/packages/textures/ex/mtl_panel_03_n.png
diff --git a/packages/textures/ex/mtl_panel_04_d.png b/packages/textures/ex/mtl_panel_04_c.png
index 817e46f..817e46f 100644
--- a/packages/textures/ex/mtl_panel_04_d.png
+++ b/packages/textures/ex/mtl_panel_04_c.png
diff --git a/packages/textures/ex/mtl_panel_04_h.png b/packages/textures/ex/mtl_panel_04_h.png
deleted file mode 100644
index 0ff54b0..0000000
--- a/packages/textures/ex/mtl_panel_04_h.png
+++ /dev/null
diff --git a/packages/textures/ex/mtl_panel_04_local.png b/packages/textures/ex/mtl_panel_04_n.png
index 954177a..954177a 100644
--- a/packages/textures/ex/mtl_panel_04_local.png
+++ b/packages/textures/ex/mtl_panel_04_n.png
diff --git a/packages/textures/ex/package.cfg b/packages/textures/ex/package.cfg
index 8f979fa..4251eef 100644
--- a/packages/textures/ex/package.cfg
+++ b/packages/textures/ex/package.cfg
@@ -1,462 +1,373 @@
-setshader bumpspecmapparallaxglowworld

+setshader bumpspecmapglowworld

 setshaderparam specscale 0.6 0.6 0.6

-setshaderparam parallaxscale 0.04 -0.02

-setshaderparam glowcolor 1 0.59 0.01

+setshaderparam glowcolor 1 0.6 0.1

 

-texture 0 "textures/ex/light_u201_d.png"

-texture n "textures/ex/light_u201_local.png"

+texture c "textures/ex/light_u201_c.png"

+texture n "textures/ex/light_u201_n.png"

 texture s "textures/ex/light_u201_s.png"

-texture z "textures/ex/light_u201_h.png"

-texture g "textures/ex/light_u201_add.png"

+texture g "textures/ex/light_u201_g.png"

 texscale 0.5

 

-texture 0 "textures/ex/lightpanel_01_d.png"

-texture n "textures/ex/lightpanel_01_local.png"

+texture c "textures/ex/lightpanel_01_c.png"

+texture n "textures/ex/lightpanel_01_n.png"

 texture s "textures/ex/lightpanel_01_s.png"

-texture z "textures/ex/lightpanel_01_h.png"

-texture g "textures/ex/lightpanel_01_add.png"

+texture g "textures/ex/lightpanel_01_g.png"

 texscale 0.5

 

-setshader bumpspecmapparallaxworld

+setshader bumpspecmapworld

 setshaderparam specscale 0.6 0.6 0.6

-setshaderparam parallaxscale 0.04 -0.02

 

-texture 0 "textures/ex/clangfloor_01_d.png"

-texture n "textures/ex/clangfloor_01_local.png"

+texture c "textures/ex/clangfloor_01_c.png"

+texture n "textures/ex/clangfloor_01_n.png"

 texture s "textures/ex/clangfloor_01_s.png"

-texture z "textures/ex/clangfloor_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/clangfloor_01b_d.png"

-texture n "textures/ex/clangfloor_01_local.png"

+texture c "textures/ex/clangfloor_01b_c.png"

+texture n "textures/ex/clangfloor_01_n.png"

 texture s "textures/ex/clangfloor_01_s.png"

-texture z "textures/ex/clangfloor_01_h.png"

 texscale 0.5

 

-setshaderparam specscale 0.3 0.3 0.3

-

-texture 0 "textures/ex/cretebase_01_d.png"

-texture n "textures/ex/cretebase_01_local.png"

+texture c "textures/ex/cretebase_01_c.png"

+texture n "textures/ex/cretebase_01_n.png"

 texture s "textures/ex/cretebase_01_s.png"

-texture z "textures/ex/cretebase_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretebase_02_d.png"

-texture n "textures/ex/cretebase_01_local.png"

+texture c "textures/ex/cretebase_02_c.png"

+texture n "textures/ex/cretebase_01_n.png"

 texture s "textures/ex/cretebase_01_s.png"

-texture z "textures/ex/cretebase_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretebase_03_dark_d.png"

-texture n "textures/ex/cretebase_01_local.png"

+texture c "textures/ex/cretebase_03_dark_c.png"

+texture n "textures/ex/cretebase_01_n.png"

 texture s "textures/ex/cretebase_01_s.png"

-texture z "textures/ex/cretebase_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretefloor_01_d.png"

-texture n "textures/ex/cretefloor_01_local.png"

+texture c "textures/ex/cretefloor_01_c.png"

+texture n "textures/ex/cretefloor_01_n.png"

 texture s "textures/ex/cretefloor_01_s.png"

-texture z "textures/ex/cretefloor_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretefloor_01b_d.png"

-texture n "textures/ex/cretefloor_01b_local.png"

+texture c "textures/ex/cretefloor_01b_c.png"

+texture n "textures/ex/cretefloor_01b_n.png"

 texture s "textures/ex/cretefloor_01b_s.png"

-texture z "textures/ex/cretefloor_01b_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretewall_01_d.png"

-texture n "textures/ex/cretewall_01_local.png"

+texture c "textures/ex/cretewall_01_c.png"

+texture n "textures/ex/cretewall_01_n.png"

 texture s "textures/ex/cretewall_01_s.png"

-texture z "textures/ex/cretewall_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretewall_02_d.png"

-texture n "textures/ex/cretewall_02_local.png"

+texture c "textures/ex/cretewall_02_c.png"

+texture n "textures/ex/cretewall_02_n.png"

 texture s "textures/ex/cretewall_02_s.png"

-texture z "textures/ex/cretewall_02_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretewall_03_d.png"

-texture n "textures/ex/cretewall_03_local.png"

+texture c "textures/ex/cretewall_03_c.png"

+texture n "textures/ex/cretewall_03_n.png"

 texture s "textures/ex/cretewall_03_s.png"

-texture z "textures/ex/cretewall_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/cretewall_03b_d.png"

-texture n "textures/ex/cretewall_03b_local.png"

+texture c "textures/ex/cretewall_03b_c.png"

+texture n "textures/ex/cretewall_03b_n.png"

 texture s "textures/ex/cretewall_03b_s.png"

-texture z "textures/ex/cretewall_03b_h.png"

 texscale 0.5

 

-setshaderparam specscale 0.6 0.6 0.6

-

-texture 0 "textures/ex/deswall_01_d.png"

-texture n "textures/ex/deswall_01_local.png"

+texture c "textures/ex/deswall_01_c.png"

+texture n "textures/ex/deswall_01_n.png"

 texture s "textures/ex/deswall_01_s.png"

-texture z "textures/ex/deswall_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_grate_03_128_d.png"

-texture n "textures/ex/floor_grate_03_128_local.png"

+texture c "textures/ex/floor_grate_03_128_c.png"

+texture n "textures/ex/floor_grate_03_128_n.png"

 texture s "textures/ex/floor_grate_03_128_s.png"

-texture z "textures/ex/floor_grate_03_128_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_grate_03_d.png"

-texture n "textures/ex/floor_grate_03_local.png"

+texture c "textures/ex/floor_grate_03_c.png"

+texture n "textures/ex/floor_grate_03_n.png"

 texture s "textures/ex/floor_grate_03_s.png"

-texture z "textures/ex/floor_grate_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_grate03_d.png"

-texture n "textures/ex/floor_grate03_local.png"

+texture c "textures/ex/floor_grate03_c.png"

+texture n "textures/ex/floor_grate03_n.png"

 texture s "textures/ex/floor_grate03_s.png"

-texture z "textures/ex/floor_grate03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_mtl_grate_01_d.png"

-texture n "textures/ex/floor_mtl_grate_01_local.png"

+texture c "textures/ex/floor_mtl_grate_01_c.png"

+texture n "textures/ex/floor_mtl_grate_01_n.png"

 texture s "textures/ex/floor_mtl_grate_01_s.png"

-texture z "textures/ex/floor_mtl_grate_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_mtl_wrn_01_d.png"

-texture n "textures/ex/floor_mtl_wrn_01_local.png"

+texture c "textures/ex/floor_mtl_wrn_01_c.png"

+texture n "textures/ex/floor_mtl_wrn_01_n.png"

 texture s "textures/ex/floor_mtl_wrn_01_s.png"

-texture z "textures/ex/floor_mtl_wrn_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_simple_05_d.png"

-texture n "textures/ex/floor_simple_05_local.png"

+texture c "textures/ex/floor_simple_05_c.png"

+texture n "textures/ex/floor_simple_05_n.png"

 texture s "textures/ex/floor_simple_05_s.png"

-texture z "textures/ex/floor_simple_05_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_simplines_d.png"

-texture n "textures/ex/floor_simplines_local.png"

+texture c "textures/ex/floor_simplines_c.png"

+texture n "textures/ex/floor_simplines_n.png"

 texture s "textures/ex/floor_simplines_s.png"

-texture z "textures/ex/floor_simplines_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_tile_03_d.png"

-texture n "textures/ex/floor_tile_03_local.png"

+texture c "textures/ex/floor_tile_03_c.png"

+texture n "textures/ex/floor_tile_03_n.png"

 texture s "textures/ex/floor_tile_03_s.png"

-texture z "textures/ex/floor_tile_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floor_tread_01_d.png"

-texture n "textures/ex/floor_tread_01_local.png"

+texture c "textures/ex/floor_tread_01_c.png"

+texture n "textures/ex/floor_tread_01_n.png"

 texture s "textures/ex/floor_tread_01_s.png"

-texture z "textures/ex/floor_tread_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/floorpanel_01_d.png"

-texture n "textures/ex/floorpanel_01_local.png"

+texture c "textures/ex/floorpanel_01_c.png"

+texture n "textures/ex/floorpanel_01_n.png"

 texture s "textures/ex/floorpanel_01_s.png"

-texture z "textures/ex/floorpanel_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metalplate_01_d.png"

-texture n "textures/ex/metalplate_01_local.png"

+texture c "textures/ex/metalplate_01_c.png"

+texture n "textures/ex/metalplate_01_n.png"

 texture s "textures/ex/metalplate_01_s.png"

-texture z "textures/ex/metalplate_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_supp_01_d.png"

-texture n "textures/ex/metal_supp_01_local.png"

+texture c "textures/ex/metal_supp_01_c.png"

+texture n "textures/ex/metal_supp_01_n.png"

 texture s "textures/ex/metal_supp_01_s.png"

-texture z "textures/ex/metal_supp_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_wall_02_d.png"

-texture n "textures/ex/metal_wall_02_local.png"

+texture c "textures/ex/metal_wall_02_c.png"

+texture n "textures/ex/metal_wall_02_n.png"

 texture s "textures/ex/metal_wall_02_s.png"

-texture z "textures/ex/metal_wall_02_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/mtl_bigplate_04_d.png"

-texture n "textures/ex/mtl_bigplate_04_local.png"

+texture c "textures/ex/mtl_bigplate_04_c.png"

+texture n "textures/ex/mtl_bigplate_04_n.png"

 texture s "textures/ex/mtl_bigplate_04_s.png"

-texture z "textures/ex/mtl_bigplate_04_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/mtl_bigplate_04b_d.png"

-texture n "textures/ex/mtl_bigplate_04b_local.png"

+texture c "textures/ex/mtl_bigplate_04b_c.png"

+texture n "textures/ex/mtl_bigplate_04b_n.png"

 texture s "textures/ex/mtl_bigplate_04b_s.png"

-texture z "textures/ex/mtl_bigplate_04b_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/mtl_panel_02_d.png"

-texture n "textures/ex/mtl_panel_02_local.png"

+texture c "textures/ex/mtl_panel_02_c.png"

+texture n "textures/ex/mtl_panel_02_n.png"

 texture s "textures/ex/mtl_panel_02_s.png"

-texture z "textures/ex/mtl_panel_02_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/mtl_panel_03_d.png"

-texture n "textures/ex/mtl_panel_03_local.png"

+texture c "textures/ex/mtl_panel_03_c.png"

+texture n "textures/ex/mtl_panel_03_n.png"

 texture s "textures/ex/mtl_panel_03_s.png"

-texture z "textures/ex/mtl_panel_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/mtl_panel_04_d.png"

-texture n "textures/ex/mtl_panel_04_local.png"

+texture c "textures/ex/mtl_panel_04_c.png"

+texture n "textures/ex/mtl_panel_04_n.png"

 texture s "textures/ex/mtl_panel_04_s.png"

-texture z "textures/ex/mtl_panel_04_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/q2_01_d.png"

-texture n "textures/ex/q2_01_local.png"

+texture c "textures/ex/q2_01_c.png"

+texture n "textures/ex/q2_01_n.png"

 texture s "textures/ex/q2_01_s.png"

-texture z "textures/ex/q2_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/q2_01b_d.png"

-texture n "textures/ex/q2_01b_local.png"

+texture c "textures/ex/q2_01b_c.png"

+texture n "textures/ex/q2_01b_n.png"

 texture s "textures/ex/q2_01b_s.png"

-texture z "textures/ex/q2_01b_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/q2_01c_d.png"

-texture n "textures/ex/q2_01c_local.png"

+texture c "textures/ex/q2_01c_c.png"

+texture n "textures/ex/q2_01c_n.png"

 texture s "textures/ex/q2_01c_s.png"

-texture z "textures/ex/q2_01c_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/q2_01d_d.png"

-texture n "textures/ex/q2_01d_local.png"

+texture c "textures/ex/q2_01d_c.png"

+texture n "textures/ex/q2_01d_n.png"

 texture s "textures/ex/q2_01d_s.png"

-texture z "textures/ex/q2_01d_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/q2_01e_d.png"

-texture n "textures/ex/q2_01e_local.png"

+texture c "textures/ex/q2_01e_c.png"

+texture n "textures/ex/q2_01e_n.png"

 texture s "textures/ex/q2_01e_s.png"

-texture z "textures/ex/q2_01e_h.png"

 texscale 0.5

 

-setshaderparam parallaxscale 0.02 -0.01

-

-texture 0 "textures/ex/rndfloor_01_d.png"

-texture n "textures/ex/rndfloor_01_local.png"

+texture c "textures/ex/rndfloor_01_c.png"

+texture n "textures/ex/rndfloor_01_n.png"

 texture s "textures/ex/rndfloor_01_s.png"

-texture z "textures/ex/rndfloor_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/rndfloor_02_d.png"

-texture n "textures/ex/rndfloor_02_local.png"

+texture c "textures/ex/rndfloor_02_c.png"

+texture n "textures/ex/rndfloor_02_n.png"

 texture s "textures/ex/rndfloor_02_s.png"

-texture z "textures/ex/rndfloor_02_h.png"

 texscale 0.5

 

-setshaderparam parallaxscale 0.04 -0.02

-

-texture 0 "textures/ex/rplates_01_d.png"

-texture n "textures/ex/rplates_01_local.png"

+texture c "textures/ex/rplates_01_c.png"

+texture n "textures/ex/rplates_01_n.png"

 texture s "textures/ex/rplates_01_s.png"

-texture z "textures/ex/rplates_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/steptop_01_d.png"

-texture n "textures/ex/steptop_01_local.png"

+texture c "textures/ex/steptop_01_c.png"

+texture n "textures/ex/steptop_01_n.png"

 texture s "textures/ex/steptop_01_s.png"

-texture z "textures/ex/steptop_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_01_d.png"

-texture n "textures/ex/trim_01_local.png"

+texture c "textures/ex/trim_01_c.png"

+texture n "textures/ex/trim_01_n.png"

 texture s "textures/ex/trim_01_s.png"

-texture z "textures/ex/trim_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_baseboard_02_d.png"

-texture n "textures/ex/trim_baseboard_02_local.png"

+texture c "textures/ex/trim_baseboard_02_c.png"

+texture n "textures/ex/trim_baseboard_02_n.png"

 texture s "textures/ex/trim_baseboard_02_s.png"

-texture z "textures/ex/trim_baseboard_02_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_baseboard_03_d.png"

-texture n "textures/ex/trim_baseboard_03_local.png"

+texture c "textures/ex/trim_baseboard_03_c.png"

+texture n "textures/ex/trim_baseboard_03_n.png"

 texture s "textures/ex/trim_baseboard_03_s.png"

-texture z "textures/ex/trim_baseboard_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_baseboard_d.png"

-texture n "textures/ex/trim_baseboard_local.png"

+texture c "textures/ex/trim_baseboard_c.png"

+texture n "textures/ex/trim_baseboard_n.png"

 texture s "textures/ex/trim_baseboard_s.png"

-texture z "textures/ex/trim_baseboard_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_psimple_04_d.png"

-texture n "textures/ex/trim_psimple_04_local.png"

+texture c "textures/ex/trim_psimple_04_c.png"

+texture n "textures/ex/trim_psimple_04_n.png"

 texture s "textures/ex/trim_psimple_04_s.png"

-texture z "textures/ex/trim_psimple_04_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_psimple_05_d.png"

-texture n "textures/ex/trim_psimple_05_local.png"

+texture c "textures/ex/trim_psimple_05_c.png"

+texture n "textures/ex/trim_psimple_05_n.png"

 texture s "textures/ex/trim_psimple_05_s.png"

-texture z "textures/ex/trim_psimple_05_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_simple_01_d.png"

-texture n "textures/ex/trim_simple_01_local.png"

+texture c "textures/ex/trim_simple_01_c.png"

+texture n "textures/ex/trim_simple_01_n.png"

 texture s "textures/ex/trim_simple_01_s.png"

-texture z "textures/ex/trim_simple_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_simple03_d.png"

-texture n "textures/ex/trim_simple03_local.png"

+texture c "textures/ex/trim_simple03_c.png"

+texture n "textures/ex/trim_simple03_n.png"

 texture s "textures/ex/trim_simple03_s.png"

-texture z "textures/ex/trim_simple03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_support_03_d.png"

-texture n "textures/ex/trim_support_03_local.png"

+texture c "textures/ex/trim_support_03_c.png"

+texture n "textures/ex/trim_support_03_n.png"

 texture s "textures/ex/trim_support_03_s.png"

-texture z "textures/ex/trim_support_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/trim_vert_01_d.png"

-texture n "textures/ex/trim_vert_01_local.png"

+texture c "textures/ex/trim_vert_01_c.png"

+texture n "textures/ex/trim_vert_01_n.png"

 texture s "textures/ex/trim_vert_01_s.png"

-texture z "textures/ex/trim_vert_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_01_d.png"

-texture n "textures/ex/wall_01_local.png"

+texture c "textures/ex/wall_01_c.png"

+texture n "textures/ex/wall_01_n.png"

 texture s "textures/ex/wall_01_s.png"

-texture z "textures/ex/wall_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_01b_d.png"

-texture n "textures/ex/wall_01_local.png"

+texture c "textures/ex/wall_01b_c.png"

+texture n "textures/ex/wall_01_n.png"

 texture s "textures/ex/wall_01_s.png"

-texture z "textures/ex/wall_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_b01_d.png"

-texture n "textures/ex/wall_b01_local.png"

+texture c "textures/ex/wall_b01_c.png"

+texture n "textures/ex/wall_b01_n.png"

 texture s "textures/ex/wall_b01_s.png"

-texture z "textures/ex/wall_b01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_bigrib_02_d.png"

-texture n "textures/ex/wall_bigrib_02_local.png"

+texture c "textures/ex/wall_bigrib_02_c.png"

+texture n "textures/ex/wall_bigrib_02_n.png"

 texture s "textures/ex/wall_bigrib_02_s.png"

-texture z "textures/ex/wall_bigrib_02_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_bplate_06_d.png"

-texture n "textures/ex/wall_bplate_06_local.png"

+texture c "textures/ex/wall_bplate_06_c.png"

+texture n "textures/ex/wall_bplate_06_n.png"

 texture s "textures/ex/wall_bplate_06_s.png"

-texture z "textures/ex/wall_bplate_06_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_panel_05_d.png"

-texture n "textures/ex/wall_panel_05_local.png"

+texture c "textures/ex/wall_panel_05_c.png"

+texture n "textures/ex/wall_panel_05_n.png"

 texture s "textures/ex/wall_panel_05_s.png"

-texture z "textures/ex/wall_panel_05_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_panels_08_d.png"

-texture n "textures/ex/wall_panels_08_local.png"

+texture c "textures/ex/wall_panels_08_c.png"

+texture n "textures/ex/wall_panels_08_n.png"

 texture s "textures/ex/wall_panels_08_s.png"

-texture z "textures/ex/wall_panels_08_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/wall_panels_08b_d.png"

-texture n "textures/ex/wall_panels_08b_local.png"

+texture c "textures/ex/wall_panels_08b_c.png"

+texture n "textures/ex/wall_panels_08b_n.png"

 texture s "textures/ex/wall_panels_08b_s.png"

-texture z "textures/ex/wall_panels_08b_h.png"

 texscale 0.5

 

-setshader bumpspecmapworld

-setshaderparam specscale 0.6 0.6 0.6

-

-texture 0 "textures/ex/wall_pipe_d.png"

-texture n "textures/ex/wall_pipe_local.png"

+texture c "textures/ex/wall_pipe_c.png"

+texture n "textures/ex/wall_pipe_n.png"

 texture s "textures/ex/wall_pipe_s.png"

 texscale 0.5

 

-setshader bumpspecmapparallaxworld

-setshaderparam specscale 0.6 0.6 0.6

-setshaderparam parallaxscale 0.04 -0.02

-

-texture 0 "textures/ex/wall_u207_d.png"

-texture n "textures/ex/wall_u207_local.png"

+texture c "textures/ex/wall_u207_c.png"

+texture n "textures/ex/wall_u207_n.png"

 texture s "textures/ex/wall_u207_s.png"

-texture z "textures/ex/wall_u207_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_plate_01_d.png"

-texture n "textures/ex/metal_plate_01_local.png"

+texture c "textures/ex/metal_plate_01_c.png"

+texture n "textures/ex/metal_plate_01_n.png"

 texture s "textures/ex/metal_plate_01_s.png"

-texture z "textures/ex/metal_plate_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_plate_01b_d.png"

-texture n "textures/ex/metal_plate_01b_local.png"

+texture c "textures/ex/metal_plate_01b_c.png"

+texture n "textures/ex/metal_plate_01b_n.png"

 texture s "textures/ex/metal_plate_01b_s.png"

-texture z "textures/ex/metal_plate_01b_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_plate_01c_d.png"

-texture n "textures/ex/metal_plate_01c_local.png"

+texture c "textures/ex/metal_plate_01c_c.png"

+texture n "textures/ex/metal_plate_01c_n.png"

 texture s "textures/ex/metal_plate_01c_s.png"

-texture z "textures/ex/metal_plate_01c_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_base_01_d.png"

-texture n "textures/ex/metal_base_01_local.png"

+texture c "textures/ex/metal_base_01_c.png"

+texture n "textures/ex/metal_base_01_n.png"

 texture s "textures/ex/metal_base_01_s.png"

-texture z "textures/ex/metal_base_01_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_base_02_d.png"

-texture n "textures/ex/metal_base_02_local.png"

+texture c "textures/ex/metal_base_02_c.png"

+texture n "textures/ex/metal_base_02_n.png"

 texture s "textures/ex/metal_base_02_s.png"

-texture z "textures/ex/metal_base_02_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_base_03_d.png"

-texture n "textures/ex/metal_base_03_local.png"

+texture c "textures/ex/metal_base_03_c.png"

+texture n "textures/ex/metal_base_03_n.png"

 texture s "textures/ex/metal_base_03_s.png"

-texture z "textures/ex/metal_base_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_base_04_d.png"

-texture n "textures/ex/metal_base_03_local.png"

+texture c "textures/ex/metal_base_04_c.png"

+texture n "textures/ex/metal_base_03_n.png"

 texture s "textures/ex/metal_base_03_s.png"

-texture z "textures/ex/metal_base_03_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_base_05_rust_d.png"

-texture n "textures/ex/metal_base_05_rust_local.png"

+texture c "textures/ex/metal_base_05_rust_c.png"

+texture n "textures/ex/metal_base_05_rust_n.png"

 texture s "textures/ex/metal_base_05_rust_s.png"

-texture z "textures/ex/metal_base_05_rust_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_base_06_rust_d.png"

-texture n "textures/ex/metal_base_05_rust_local.png"

+texture c "textures/ex/metal_base_06_rust_c.png"

+texture n "textures/ex/metal_base_05_rust_n.png"

 texture s "textures/ex/metal_base_05_rust_s.png"

-texture z "textures/ex/metal_base_05_rust_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_base_07_rust_d.png"

-texture n "textures/ex/metal_base_05_rust_local.png"

+texture c "textures/ex/metal_base_07_rust_c.png"

+texture n "textures/ex/metal_base_05_rust_n.png"

 texture s "textures/ex/metal_base_05_rust_s.png"

-texture z "textures/ex/metal_base_05_rust_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_floor_02_d.png"

-texture n "textures/ex/metal_floor_02_local.png"

+texture c "textures/ex/metal_floor_02_c.png"

+texture n "textures/ex/metal_floor_02_n.png"

 texture s "textures/ex/metal_floor_02_s.png"

-texture z "textures/ex/metal_floor_02_h.png"

 texscale 0.5

 

-texture 0 "textures/ex/metal_rib_01_d.png"

-texture n "textures/ex/metal_rib_01_local.png"

+texture c "textures/ex/metal_rib_01_c.png"

+texture n "textures/ex/metal_rib_01_n.png"

 texture s "textures/ex/metal_rib_01_s.png"

-texture z "textures/ex/metal_rib_01_h.png"

 texscale 0.5

diff --git a/packages/textures/ex/q2_01_d.png b/packages/textures/ex/q2_01_c.png
index d29e4f3..d29e4f3 100644
--- a/packages/textures/ex/q2_01_d.png
+++ b/packages/textures/ex/q2_01_c.png
diff --git a/packages/textures/ex/q2_01_h.png b/packages/textures/ex/q2_01_h.png
deleted file mode 100644
index b796795..0000000
--- a/packages/textures/ex/q2_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/q2_01_local.png b/packages/textures/ex/q2_01_n.png
index de07a2f..de07a2f 100644
--- a/packages/textures/ex/q2_01_local.png
+++ b/packages/textures/ex/q2_01_n.png
diff --git a/packages/textures/ex/q2_01b_d.png b/packages/textures/ex/q2_01b_c.png
index bf78dac..bf78dac 100644
--- a/packages/textures/ex/q2_01b_d.png
+++ b/packages/textures/ex/q2_01b_c.png
diff --git a/packages/textures/ex/q2_01b_h.png b/packages/textures/ex/q2_01b_h.png
deleted file mode 100644
index 3a515b2..0000000
--- a/packages/textures/ex/q2_01b_h.png
+++ /dev/null
diff --git a/packages/textures/ex/q2_01b_local.png b/packages/textures/ex/q2_01b_n.png
index af15c9c..af15c9c 100644
--- a/packages/textures/ex/q2_01b_local.png
+++ b/packages/textures/ex/q2_01b_n.png
diff --git a/packages/textures/ex/q2_01c_d.png b/packages/textures/ex/q2_01c_c.png
index b22b0d9..b22b0d9 100644
--- a/packages/textures/ex/q2_01c_d.png
+++ b/packages/textures/ex/q2_01c_c.png
diff --git a/packages/textures/ex/q2_01c_h.png b/packages/textures/ex/q2_01c_h.png
deleted file mode 100644
index 2a85d33..0000000
--- a/packages/textures/ex/q2_01c_h.png
+++ /dev/null
diff --git a/packages/textures/ex/q2_01c_local.png b/packages/textures/ex/q2_01c_n.png
index f8a8a20..f8a8a20 100644
--- a/packages/textures/ex/q2_01c_local.png
+++ b/packages/textures/ex/q2_01c_n.png
diff --git a/packages/textures/ex/q2_01d_d.png b/packages/textures/ex/q2_01d_c.png
index c4001b3..c4001b3 100644
--- a/packages/textures/ex/q2_01d_d.png
+++ b/packages/textures/ex/q2_01d_c.png
diff --git a/packages/textures/ex/q2_01d_h.png b/packages/textures/ex/q2_01d_h.png
deleted file mode 100644
index 6b4b895..0000000
--- a/packages/textures/ex/q2_01d_h.png
+++ /dev/null
diff --git a/packages/textures/ex/q2_01d_local.png b/packages/textures/ex/q2_01d_n.png
index 3a3cc74..3a3cc74 100644
--- a/packages/textures/ex/q2_01d_local.png
+++ b/packages/textures/ex/q2_01d_n.png
diff --git a/packages/textures/ex/q2_01e_d.png b/packages/textures/ex/q2_01e_c.png
index b317d4b..b317d4b 100644
--- a/packages/textures/ex/q2_01e_d.png
+++ b/packages/textures/ex/q2_01e_c.png
diff --git a/packages/textures/ex/q2_01e_h.png b/packages/textures/ex/q2_01e_h.png
deleted file mode 100644
index 33e3302..0000000
--- a/packages/textures/ex/q2_01e_h.png
+++ /dev/null
diff --git a/packages/textures/ex/q2_01e_local.png b/packages/textures/ex/q2_01e_n.png
index 3714bb7..3714bb7 100644
--- a/packages/textures/ex/q2_01e_local.png
+++ b/packages/textures/ex/q2_01e_n.png
diff --git a/packages/textures/ex/rndfloor_01_d.png b/packages/textures/ex/rndfloor_01_c.png
index a586d9c..a586d9c 100644
--- a/packages/textures/ex/rndfloor_01_d.png
+++ b/packages/textures/ex/rndfloor_01_c.png
diff --git a/packages/textures/ex/rndfloor_01_h.png b/packages/textures/ex/rndfloor_01_h.png
deleted file mode 100644
index 6510d30..0000000
--- a/packages/textures/ex/rndfloor_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/rndfloor_01_local.png b/packages/textures/ex/rndfloor_01_n.png
index 94020cc..94020cc 100644
--- a/packages/textures/ex/rndfloor_01_local.png
+++ b/packages/textures/ex/rndfloor_01_n.png
diff --git a/packages/textures/ex/rndfloor_02_d.png b/packages/textures/ex/rndfloor_02_c.png
index 49562ad..49562ad 100644
--- a/packages/textures/ex/rndfloor_02_d.png
+++ b/packages/textures/ex/rndfloor_02_c.png
diff --git a/packages/textures/ex/rndfloor_02_h.png b/packages/textures/ex/rndfloor_02_h.png
deleted file mode 100644
index 3b55a12..0000000
--- a/packages/textures/ex/rndfloor_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/rndfloor_02_local.png b/packages/textures/ex/rndfloor_02_n.png
index 2b1286d..2b1286d 100644
--- a/packages/textures/ex/rndfloor_02_local.png
+++ b/packages/textures/ex/rndfloor_02_n.png
diff --git a/packages/textures/ex/rplates_01_d.png b/packages/textures/ex/rplates_01_c.png
index 51aa0a4..51aa0a4 100644
--- a/packages/textures/ex/rplates_01_d.png
+++ b/packages/textures/ex/rplates_01_c.png
diff --git a/packages/textures/ex/rplates_01_h.png b/packages/textures/ex/rplates_01_h.png
deleted file mode 100644
index 55033c1..0000000
--- a/packages/textures/ex/rplates_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/rplates_01_local.png b/packages/textures/ex/rplates_01_n.png
index 3be247a..3be247a 100644
--- a/packages/textures/ex/rplates_01_local.png
+++ b/packages/textures/ex/rplates_01_n.png
diff --git a/packages/textures/ex/steptop_01_d.png b/packages/textures/ex/steptop_01_c.png
index 93ed1f8..93ed1f8 100644
--- a/packages/textures/ex/steptop_01_d.png
+++ b/packages/textures/ex/steptop_01_c.png
diff --git a/packages/textures/ex/steptop_01_h.png b/packages/textures/ex/steptop_01_h.png
deleted file mode 100644
index 4aa9403..0000000
--- a/packages/textures/ex/steptop_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/steptop_01_local.png b/packages/textures/ex/steptop_01_n.png
index 690cbeb..690cbeb 100644
--- a/packages/textures/ex/steptop_01_local.png
+++ b/packages/textures/ex/steptop_01_n.png
diff --git a/packages/textures/ex/trim_01_d.png b/packages/textures/ex/trim_01_c.png
index 900bd31..900bd31 100644
--- a/packages/textures/ex/trim_01_d.png
+++ b/packages/textures/ex/trim_01_c.png
diff --git a/packages/textures/ex/trim_01_h.png b/packages/textures/ex/trim_01_h.png
deleted file mode 100644
index 50dd19d..0000000
--- a/packages/textures/ex/trim_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_01_local.png b/packages/textures/ex/trim_01_n.png
index efc8fc8..efc8fc8 100644
--- a/packages/textures/ex/trim_01_local.png
+++ b/packages/textures/ex/trim_01_n.png
diff --git a/packages/textures/ex/trim_baseboard_02_d.png b/packages/textures/ex/trim_baseboard_02_c.png
index dd1def4..dd1def4 100644
--- a/packages/textures/ex/trim_baseboard_02_d.png
+++ b/packages/textures/ex/trim_baseboard_02_c.png
diff --git a/packages/textures/ex/trim_baseboard_02_h.png b/packages/textures/ex/trim_baseboard_02_h.png
deleted file mode 100644
index 2a69edb..0000000
--- a/packages/textures/ex/trim_baseboard_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_baseboard_02_local.png b/packages/textures/ex/trim_baseboard_02_n.png
index f9f7cf2..f9f7cf2 100644
--- a/packages/textures/ex/trim_baseboard_02_local.png
+++ b/packages/textures/ex/trim_baseboard_02_n.png
diff --git a/packages/textures/ex/trim_baseboard_03_d.png b/packages/textures/ex/trim_baseboard_03_c.png
index 4fb2a52..4fb2a52 100644
--- a/packages/textures/ex/trim_baseboard_03_d.png
+++ b/packages/textures/ex/trim_baseboard_03_c.png
diff --git a/packages/textures/ex/trim_baseboard_03_h.png b/packages/textures/ex/trim_baseboard_03_h.png
deleted file mode 100644
index a914c05..0000000
--- a/packages/textures/ex/trim_baseboard_03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_baseboard_03_local.png b/packages/textures/ex/trim_baseboard_03_n.png
index abe985f..abe985f 100644
--- a/packages/textures/ex/trim_baseboard_03_local.png
+++ b/packages/textures/ex/trim_baseboard_03_n.png
diff --git a/packages/textures/ex/trim_baseboard_d.png b/packages/textures/ex/trim_baseboard_c.png
index 369613d..369613d 100644
--- a/packages/textures/ex/trim_baseboard_d.png
+++ b/packages/textures/ex/trim_baseboard_c.png
diff --git a/packages/textures/ex/trim_baseboard_h.png b/packages/textures/ex/trim_baseboard_h.png
deleted file mode 100644
index a99f4c2..0000000
--- a/packages/textures/ex/trim_baseboard_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_baseboard_local.png b/packages/textures/ex/trim_baseboard_n.png
index 0bb5a3c..0bb5a3c 100644
--- a/packages/textures/ex/trim_baseboard_local.png
+++ b/packages/textures/ex/trim_baseboard_n.png
diff --git a/packages/textures/ex/trim_psimple_04_d.png b/packages/textures/ex/trim_psimple_04_c.png
index 6a8f1e1..6a8f1e1 100644
--- a/packages/textures/ex/trim_psimple_04_d.png
+++ b/packages/textures/ex/trim_psimple_04_c.png
diff --git a/packages/textures/ex/trim_psimple_04_h.png b/packages/textures/ex/trim_psimple_04_h.png
deleted file mode 100644
index 9a325c6..0000000
--- a/packages/textures/ex/trim_psimple_04_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_psimple_04_local.png b/packages/textures/ex/trim_psimple_04_n.png
index 412c9d4..412c9d4 100644
--- a/packages/textures/ex/trim_psimple_04_local.png
+++ b/packages/textures/ex/trim_psimple_04_n.png
diff --git a/packages/textures/ex/trim_psimple_05_d.png b/packages/textures/ex/trim_psimple_05_c.png
index fb12466..fb12466 100644
--- a/packages/textures/ex/trim_psimple_05_d.png
+++ b/packages/textures/ex/trim_psimple_05_c.png
diff --git a/packages/textures/ex/trim_psimple_05_h.png b/packages/textures/ex/trim_psimple_05_h.png
deleted file mode 100644
index a1a9b77..0000000
--- a/packages/textures/ex/trim_psimple_05_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_psimple_05_local.png b/packages/textures/ex/trim_psimple_05_n.png
index 1728797..1728797 100644
--- a/packages/textures/ex/trim_psimple_05_local.png
+++ b/packages/textures/ex/trim_psimple_05_n.png
diff --git a/packages/textures/ex/trim_simple03_d.png b/packages/textures/ex/trim_simple03_c.png
index 050dce4..050dce4 100644
--- a/packages/textures/ex/trim_simple03_d.png
+++ b/packages/textures/ex/trim_simple03_c.png
diff --git a/packages/textures/ex/trim_simple03_h.png b/packages/textures/ex/trim_simple03_h.png
deleted file mode 100644
index 067e751..0000000
--- a/packages/textures/ex/trim_simple03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_simple03_local.png b/packages/textures/ex/trim_simple03_n.png
index 691958c..691958c 100644
--- a/packages/textures/ex/trim_simple03_local.png
+++ b/packages/textures/ex/trim_simple03_n.png
diff --git a/packages/textures/ex/trim_simple_01_d.png b/packages/textures/ex/trim_simple_01_c.png
index 06a0260..06a0260 100644
--- a/packages/textures/ex/trim_simple_01_d.png
+++ b/packages/textures/ex/trim_simple_01_c.png
diff --git a/packages/textures/ex/trim_simple_01_h.png b/packages/textures/ex/trim_simple_01_h.png
deleted file mode 100644
index 93a9cc3..0000000
--- a/packages/textures/ex/trim_simple_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_simple_01_local.png b/packages/textures/ex/trim_simple_01_n.png
index 0a65d01..0a65d01 100644
--- a/packages/textures/ex/trim_simple_01_local.png
+++ b/packages/textures/ex/trim_simple_01_n.png
diff --git a/packages/textures/ex/trim_support_03_d.png b/packages/textures/ex/trim_support_03_c.png
index acab451..acab451 100644
--- a/packages/textures/ex/trim_support_03_d.png
+++ b/packages/textures/ex/trim_support_03_c.png
diff --git a/packages/textures/ex/trim_support_03_h.png b/packages/textures/ex/trim_support_03_h.png
deleted file mode 100644
index be895e9..0000000
--- a/packages/textures/ex/trim_support_03_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_support_03_local.png b/packages/textures/ex/trim_support_03_n.png
index 58cec8a..58cec8a 100644
--- a/packages/textures/ex/trim_support_03_local.png
+++ b/packages/textures/ex/trim_support_03_n.png
diff --git a/packages/textures/ex/trim_vert_01_d.png b/packages/textures/ex/trim_vert_01_c.png
index eb146b9..eb146b9 100644
--- a/packages/textures/ex/trim_vert_01_d.png
+++ b/packages/textures/ex/trim_vert_01_c.png
diff --git a/packages/textures/ex/trim_vert_01_h.png b/packages/textures/ex/trim_vert_01_h.png
deleted file mode 100644
index caaa4de..0000000
--- a/packages/textures/ex/trim_vert_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/trim_vert_01_local.png b/packages/textures/ex/trim_vert_01_n.png
index d590d44..d590d44 100644
--- a/packages/textures/ex/trim_vert_01_local.png
+++ b/packages/textures/ex/trim_vert_01_n.png
diff --git a/packages/textures/ex/wall_01_d.png b/packages/textures/ex/wall_01_c.png
index b22a0dd..b22a0dd 100644
--- a/packages/textures/ex/wall_01_d.png
+++ b/packages/textures/ex/wall_01_c.png
diff --git a/packages/textures/ex/wall_01_h.png b/packages/textures/ex/wall_01_h.png
deleted file mode 100644
index 1f7c0d5..0000000
--- a/packages/textures/ex/wall_01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_01_local.png b/packages/textures/ex/wall_01_n.png
index d192706..d192706 100644
--- a/packages/textures/ex/wall_01_local.png
+++ b/packages/textures/ex/wall_01_n.png
diff --git a/packages/textures/ex/wall_01b_d.png b/packages/textures/ex/wall_01b_c.png
index 4305ee3..4305ee3 100644
--- a/packages/textures/ex/wall_01b_d.png
+++ b/packages/textures/ex/wall_01b_c.png
diff --git a/packages/textures/ex/wall_b01_d.png b/packages/textures/ex/wall_b01_c.png
index e813890..e813890 100644
--- a/packages/textures/ex/wall_b01_d.png
+++ b/packages/textures/ex/wall_b01_c.png
diff --git a/packages/textures/ex/wall_b01_h.png b/packages/textures/ex/wall_b01_h.png
deleted file mode 100644
index 19d3096..0000000
--- a/packages/textures/ex/wall_b01_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_b01_local.png b/packages/textures/ex/wall_b01_n.png
index b0efc22..b0efc22 100644
--- a/packages/textures/ex/wall_b01_local.png
+++ b/packages/textures/ex/wall_b01_n.png
diff --git a/packages/textures/ex/wall_bigrib_02_d.png b/packages/textures/ex/wall_bigrib_02_c.png
index b43cea2..b43cea2 100644
--- a/packages/textures/ex/wall_bigrib_02_d.png
+++ b/packages/textures/ex/wall_bigrib_02_c.png
diff --git a/packages/textures/ex/wall_bigrib_02_h.png b/packages/textures/ex/wall_bigrib_02_h.png
deleted file mode 100644
index 4f03db2..0000000
--- a/packages/textures/ex/wall_bigrib_02_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_bigrib_02_local.png b/packages/textures/ex/wall_bigrib_02_n.png
index 70d1e53..70d1e53 100644
--- a/packages/textures/ex/wall_bigrib_02_local.png
+++ b/packages/textures/ex/wall_bigrib_02_n.png
diff --git a/packages/textures/ex/wall_bplate_06_d.png b/packages/textures/ex/wall_bplate_06_c.png
index 356b592..356b592 100644
--- a/packages/textures/ex/wall_bplate_06_d.png
+++ b/packages/textures/ex/wall_bplate_06_c.png
diff --git a/packages/textures/ex/wall_bplate_06_h.png b/packages/textures/ex/wall_bplate_06_h.png
deleted file mode 100644
index eee6556..0000000
--- a/packages/textures/ex/wall_bplate_06_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_bplate_06_local.png b/packages/textures/ex/wall_bplate_06_n.png
index 1079b55..1079b55 100644
--- a/packages/textures/ex/wall_bplate_06_local.png
+++ b/packages/textures/ex/wall_bplate_06_n.png
diff --git a/packages/textures/ex/wall_panel_05_d.png b/packages/textures/ex/wall_panel_05_c.png
index 716451f..716451f 100644
--- a/packages/textures/ex/wall_panel_05_d.png
+++ b/packages/textures/ex/wall_panel_05_c.png
diff --git a/packages/textures/ex/wall_panel_05_h.png b/packages/textures/ex/wall_panel_05_h.png
deleted file mode 100644
index fd2c014..0000000
--- a/packages/textures/ex/wall_panel_05_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_panel_05_local.png b/packages/textures/ex/wall_panel_05_n.png
index 7006ed1..7006ed1 100644
--- a/packages/textures/ex/wall_panel_05_local.png
+++ b/packages/textures/ex/wall_panel_05_n.png
diff --git a/packages/textures/ex/wall_panels_08_d.png b/packages/textures/ex/wall_panels_08_c.png
index fde3f0c..fde3f0c 100644
--- a/packages/textures/ex/wall_panels_08_d.png
+++ b/packages/textures/ex/wall_panels_08_c.png
diff --git a/packages/textures/ex/wall_panels_08_h.png b/packages/textures/ex/wall_panels_08_h.png
deleted file mode 100644
index c5a892e..0000000
--- a/packages/textures/ex/wall_panels_08_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_panels_08_local.png b/packages/textures/ex/wall_panels_08_n.png
index 6b1b065..6b1b065 100644
--- a/packages/textures/ex/wall_panels_08_local.png
+++ b/packages/textures/ex/wall_panels_08_n.png
diff --git a/packages/textures/ex/wall_panels_08b_d.png b/packages/textures/ex/wall_panels_08b_c.png
index bdab756..bdab756 100644
--- a/packages/textures/ex/wall_panels_08b_d.png
+++ b/packages/textures/ex/wall_panels_08b_c.png
diff --git a/packages/textures/ex/wall_panels_08b_h.png b/packages/textures/ex/wall_panels_08b_h.png
deleted file mode 100644
index be76a24..0000000
--- a/packages/textures/ex/wall_panels_08b_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_panels_08b_local.png b/packages/textures/ex/wall_panels_08b_n.png
index 6b1b065..6b1b065 100644
--- a/packages/textures/ex/wall_panels_08b_local.png
+++ b/packages/textures/ex/wall_panels_08b_n.png
diff --git a/packages/textures/ex/wall_pipe_d.png b/packages/textures/ex/wall_pipe_c.png
index 5dd0209..5dd0209 100644
--- a/packages/textures/ex/wall_pipe_d.png
+++ b/packages/textures/ex/wall_pipe_c.png
diff --git a/packages/textures/ex/wall_pipe_h.png b/packages/textures/ex/wall_pipe_h.png
deleted file mode 100644
index f564ae8..0000000
--- a/packages/textures/ex/wall_pipe_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_pipe_local.png b/packages/textures/ex/wall_pipe_n.png
index 28aff07..28aff07 100644
--- a/packages/textures/ex/wall_pipe_local.png
+++ b/packages/textures/ex/wall_pipe_n.png
diff --git a/packages/textures/ex/wall_u207_d.png b/packages/textures/ex/wall_u207_c.png
index 21fa2ea..21fa2ea 100644
--- a/packages/textures/ex/wall_u207_d.png
+++ b/packages/textures/ex/wall_u207_c.png
diff --git a/packages/textures/ex/wall_u207_h.png b/packages/textures/ex/wall_u207_h.png
deleted file mode 100644
index 9dc8806..0000000
--- a/packages/textures/ex/wall_u207_h.png
+++ /dev/null
diff --git a/packages/textures/ex/wall_u207_local.png b/packages/textures/ex/wall_u207_n.png
index 792c607..792c607 100644
--- a/packages/textures/ex/wall_u207_local.png
+++ b/packages/textures/ex/wall_u207_n.png
diff --git a/packages/textures/mitaman/brick_13_c.png b/packages/textures/mitaman/brick_13_c.png
new file mode 100644
index 0000000..a95eda3
--- /dev/null
+++ b/packages/textures/mitaman/brick_13_c.png
diff --git a/packages/textures/mitaman/brick_13_n.png b/packages/textures/mitaman/brick_13_n.png
new file mode 100644
index 0000000..42a9866
--- /dev/null
+++ b/packages/textures/mitaman/brick_13_n.png
diff --git a/packages/textures/mitaman/brick_13_s.png b/packages/textures/mitaman/brick_13_s.png
new file mode 100644
index 0000000..4366918
--- /dev/null
+++ b/packages/textures/mitaman/brick_13_s.png
diff --git a/packages/textures/mitaman/brick_56_c.png b/packages/textures/mitaman/brick_56_c.png
new file mode 100644
index 0000000..e633725
--- /dev/null
+++ b/packages/textures/mitaman/brick_56_c.png
diff --git a/packages/textures/mitaman/brick_56_n.png b/packages/textures/mitaman/brick_56_n.png
new file mode 100644
index 0000000..a5ff0bf
--- /dev/null
+++ b/packages/textures/mitaman/brick_56_n.png
diff --git a/packages/textures/mitaman/brick_56_s.png b/packages/textures/mitaman/brick_56_s.png
new file mode 100644
index 0000000..5360fef
--- /dev/null
+++ b/packages/textures/mitaman/brick_56_s.png
diff --git a/packages/textures/mitaman/floor_15_c.png b/packages/textures/mitaman/floor_15_c.png
new file mode 100644
index 0000000..6023301
--- /dev/null
+++ b/packages/textures/mitaman/floor_15_c.png
diff --git a/packages/textures/mitaman/floor_15_n.png b/packages/textures/mitaman/floor_15_n.png
new file mode 100644
index 0000000..98d4637
--- /dev/null
+++ b/packages/textures/mitaman/floor_15_n.png
diff --git a/packages/textures/mitaman/floor_15_s.png b/packages/textures/mitaman/floor_15_s.png
new file mode 100644
index 0000000..5acd20c
--- /dev/null
+++ b/packages/textures/mitaman/floor_15_s.png
diff --git a/packages/textures/mitaman/package.cfg b/packages/textures/mitaman/package.cfg
new file mode 100644
index 0000000..f904555
--- /dev/null
+++ b/packages/textures/mitaman/package.cfg
@@ -0,0 +1,54 @@
+// MitaMAN
+
+setshader "bumpspecmapworld"
+setshaderparam "specscale" 1.2 1.2 1.2
+
+	texture c "textures/mitaman/brick_13_c.png"
+	texture n "textures/mitaman/brick_13_n.png"
+	texture s "textures/mitaman/brick_13_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/brick_56_c.png"
+	texture n "textures/mitaman/brick_56_n.png"
+	texture s "textures/mitaman/brick_56_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/floor_15_c.png"
+	texture n "textures/mitaman/floor_15_n.png"
+	texture s "textures/mitaman/floor_15_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/planks_1_c.png"
+	texture n "textures/mitaman/planks_1_n.png"
+	texture s "textures/mitaman/planks_1_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/planks_2_c.png"
+	texture n "textures/mitaman/planks_2_n.png"
+	texture s "textures/mitaman/planks_2_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/tiles_16_c.png"
+	texture n "textures/mitaman/tiles_16_n.png"
+	texture s "textures/mitaman/tiles_16_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/tiles_38_c.png"
+	texture n "textures/mitaman/tiles_38_n.png"
+	texture s "textures/mitaman/tiles_38_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/tiles_126_c.png"
+	texture n "textures/mitaman/tiles_126_n.png"
+	texture s "textures/mitaman/tiles_126_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/trim_7_c.png"
+	texture n "textures/mitaman/trim_7_n.png"
+	texture s "textures/mitaman/trim_7_s.png"
+	texscale 0.5
+
+	texture c "textures/mitaman/wall_7_c.png"
+	texture n "textures/mitaman/wall_7_n.png"
+	texture s "textures/mitaman/wall_7_s.png"
+	texscale 0.5
diff --git a/packages/textures/mitaman/planks_1_c.png b/packages/textures/mitaman/planks_1_c.png
new file mode 100644
index 0000000..fafec16
--- /dev/null
+++ b/packages/textures/mitaman/planks_1_c.png
diff --git a/packages/textures/mitaman/planks_1_n.png b/packages/textures/mitaman/planks_1_n.png
new file mode 100644
index 0000000..752a307
--- /dev/null
+++ b/packages/textures/mitaman/planks_1_n.png
diff --git a/packages/textures/mitaman/planks_1_s.png b/packages/textures/mitaman/planks_1_s.png
new file mode 100644
index 0000000..0263337
--- /dev/null
+++ b/packages/textures/mitaman/planks_1_s.png
diff --git a/packages/textures/mitaman/planks_2_c.png b/packages/textures/mitaman/planks_2_c.png
new file mode 100644
index 0000000..a50e282
--- /dev/null
+++ b/packages/textures/mitaman/planks_2_c.png
diff --git a/packages/textures/mitaman/planks_2_n.png b/packages/textures/mitaman/planks_2_n.png
new file mode 100644
index 0000000..e83225d
--- /dev/null
+++ b/packages/textures/mitaman/planks_2_n.png
diff --git a/packages/textures/mitaman/planks_2_s.png b/packages/textures/mitaman/planks_2_s.png
new file mode 100644
index 0000000..0dbf649
--- /dev/null
+++ b/packages/textures/mitaman/planks_2_s.png
diff --git a/packages/textures/mitaman/readme.txt b/packages/textures/mitaman/readme.txt
new file mode 100644
index 0000000..f3f31e7
--- /dev/null
+++ b/packages/textures/mitaman/readme.txt
@@ -0,0 +1,25 @@
+mm-texture readme.txt
+
+Listed below are the various source material websites I used for creating my "mm-textures" for the SAUERBRATEN engine/game.
+
+All sources I used claimed the textures are free to use for non-commercial use. Each website has there own way of wording it, so if your interested, visit their sites.
+
+http://www.accustudio.com/
+
+http://www.3dcafe.com
+
+http://www.noctua-graphics.de/english/fraset_e.htm
+
+http://www.mayang.com/textures/
+
+http://www.mega-tex.nl/textures.php
+
+None of the textures were "just copied and renamed". All were modified / layered / enhanced / pieced together by me.
+
+Feel free to use my "mm-textures" any way you want, just please give me credit in your readme file.
+
+Enjoy!
+
+MitaMAN (Mike Poeschl)
+mitaman1-at-optonline-dot-net
+10-24-06
diff --git a/packages/textures/mitaman/tiles_126_c.png b/packages/textures/mitaman/tiles_126_c.png
new file mode 100644
index 0000000..f272ea6
--- /dev/null
+++ b/packages/textures/mitaman/tiles_126_c.png
diff --git a/packages/textures/mitaman/tiles_126_n.png b/packages/textures/mitaman/tiles_126_n.png
new file mode 100644
index 0000000..7a602b1
--- /dev/null
+++ b/packages/textures/mitaman/tiles_126_n.png
diff --git a/packages/textures/mitaman/tiles_126_s.png b/packages/textures/mitaman/tiles_126_s.png
new file mode 100644
index 0000000..b1ca451
--- /dev/null
+++ b/packages/textures/mitaman/tiles_126_s.png
diff --git a/packages/textures/mitaman/tiles_16_c.png b/packages/textures/mitaman/tiles_16_c.png
new file mode 100644
index 0000000..380b630
--- /dev/null
+++ b/packages/textures/mitaman/tiles_16_c.png
diff --git a/packages/textures/mitaman/tiles_16_n.png b/packages/textures/mitaman/tiles_16_n.png
new file mode 100644
index 0000000..953b1e2
--- /dev/null
+++ b/packages/textures/mitaman/tiles_16_n.png
diff --git a/packages/textures/mitaman/tiles_16_s.png b/packages/textures/mitaman/tiles_16_s.png
new file mode 100644
index 0000000..abe77a7
--- /dev/null
+++ b/packages/textures/mitaman/tiles_16_s.png
diff --git a/packages/textures/mitaman/tiles_38_c.png b/packages/textures/mitaman/tiles_38_c.png
new file mode 100644
index 0000000..92ba86e
--- /dev/null
+++ b/packages/textures/mitaman/tiles_38_c.png
diff --git a/packages/textures/mitaman/tiles_38_n.png b/packages/textures/mitaman/tiles_38_n.png
new file mode 100644
index 0000000..7805c50
--- /dev/null
+++ b/packages/textures/mitaman/tiles_38_n.png
diff --git a/packages/textures/mitaman/tiles_38_s.png b/packages/textures/mitaman/tiles_38_s.png
new file mode 100644
index 0000000..31f03c9
--- /dev/null
+++ b/packages/textures/mitaman/tiles_38_s.png
diff --git a/packages/textures/mitaman/trim_7_c.png b/packages/textures/mitaman/trim_7_c.png
new file mode 100644
index 0000000..ed0d603
--- /dev/null
+++ b/packages/textures/mitaman/trim_7_c.png
diff --git a/packages/textures/mitaman/trim_7_n.png b/packages/textures/mitaman/trim_7_n.png
new file mode 100644
index 0000000..0f1a7b8
--- /dev/null
+++ b/packages/textures/mitaman/trim_7_n.png
diff --git a/packages/textures/mitaman/trim_7_s.png b/packages/textures/mitaman/trim_7_s.png
new file mode 100644
index 0000000..2719e78
--- /dev/null
+++ b/packages/textures/mitaman/trim_7_s.png
diff --git a/packages/textures/mitaman/wall_7_c.png b/packages/textures/mitaman/wall_7_c.png
new file mode 100644
index 0000000..8cc6673
--- /dev/null
+++ b/packages/textures/mitaman/wall_7_c.png
diff --git a/packages/textures/mitaman/wall_7_n.png b/packages/textures/mitaman/wall_7_n.png
new file mode 100644
index 0000000..eae1a3f
--- /dev/null
+++ b/packages/textures/mitaman/wall_7_n.png
diff --git a/packages/textures/mitaman/wall_7_s.png b/packages/textures/mitaman/wall_7_s.png
new file mode 100644
index 0000000..fc17310
--- /dev/null
+++ b/packages/textures/mitaman/wall_7_s.png
diff --git a/src/fpsgame/fps.cpp b/src/fpsgame/fps.cpp
index fceb94a..37777cb 100644
--- a/src/fpsgame/fps.cpp
+++ b/src/fpsgame/fps.cpp
@@ -872,13 +872,6 @@ namespace game
         pophudmatrix();
     }
 
-    VARP(speedometer, 0, 1, 1);
-    FVARP(speedometerx, 0.0, 0.5, 1.0);
-    FVARP(speedometery, 0.0, 0.6, 1.0);
-    FVARP(speedometerscale, 0.1, 0.5, 2.0);
-    VARP(speedometercolor, 0, 1, 1);
-    FVARP(speedometeralpha, 0.0, 0.5, 1.0);
-
     //~void drawspeedometer(fpsent *d, int w, int h) {
         //~int speedforreal = (int) (sqrtf(d->vel.squaredlen()) + 1.0f);
         //~speedforreal = (speedforreal == 1) ? 0 : speedforreal;
@@ -909,43 +902,155 @@ namespace game
         //~pophudmatrix();
     //~}
 
+    void hudquad(float x, float y, float w, float h, float r = 1, float g = 1, float b = 1, float tx = 0, float ty = 0, float tw = 1, float th = 1)
+    {
+        gle::defvertex(2);
+        gle::deftexcoord0();
+        gle::colorf(r, g, b);
+        gle::begin(GL_TRIANGLE_STRIP);
+        //~gle::begin(GL_QUADS);
+        gle::attribf(x,   y);   gle::attribf(tx,      ty);
+        gle::attribf(x+w, y);   gle::attribf(tx + tw, ty);
+        gle::attribf(x,   y+h); gle::attribf(tx,      ty + th);
+        gle::attribf(x+w, y+h); gle::attribf(tx + tw, ty + th);
+        gle::end();
+    }
+
     VARP(healthcolors, 0, 1, 1);
 
-    void drawhudicons(fpsent *d)
+    VARP(hudhealth, 0, 1, 1);
+    FVARP(hudhealthx, 0, 0, 1);
+    FVARP(hudhealthy, 0, 1, 1);
+    FVARP(hudhealthscale, 0.1, 1.0, 1.0);
+
+    void drawhudhealth(fpsent *d, int w, int h)
     {
         pushhudmatrix();
-        hudmatrix.scale(2, 2, 1);
+        hudmatrix.scale(hudhealthscale, hudhealthscale, 1);
         flushhudmatrix();
-        defformatstring(health, "%d", d->state==CS_DEAD ? 0 : d->health);
-        bvec healthcolor = bvec::hexcolor(healthcolors && !m_insta ? (d->state==CS_DEAD ? 0x808080 : (d->health<=25 ? 0xFF0000 : (d->health<=50 ? 0xFF8000 : (d->health<=100 ? 0xFFFFFF : 0x40C0FF)))) : 0xFFFFFF);
-        draw_text(health, (HICON_X + HICON_SIZE + HICON_SPACE)/2, HICON_TEXTY/2, healthcolor.r, healthcolor.g, healthcolor.b);
-        if(d->state!=CS_DEAD)
-        {
-            if(d->armour) draw_textf("%d", (HICON_X + HICON_STEP + HICON_SIZE + HICON_SPACE)/2, HICON_TEXTY/2, d->armour);
-            draw_textf("%d", (HICON_X + 2*HICON_STEP + HICON_SIZE + HICON_SPACE)/2, HICON_TEXTY/2, d->ammo[d->gunselect]);
+
+        bvec healthcolor = bvec::hexcolor(healthcolors && !m_insta ?
+            (d->state==CS_DEAD ? 0x808080 :
+            (d->health<=25     ? 0xc02020 :
+            (d->health<=50     ? 0xc08020 :
+            (d->health<=75     ? 0xc0c040 :
+            (d->health<=100    ? 0xFFFFFF : 0x4080c0))))) : 0xFFFFFF);
+        const float proportion = (w/4.0f)/600.0f;
+        const float healthbarw = 600*proportion;
+        const float healthbarh = 113*proportion;
+        vec2 offset = vec2(hudhealthx, hudhealthy).mul(vec2(w-healthbarw, h-healthbarh).div(hudhealthscale));
+        settexture("packages/hud/health_bar_base.png");
+        float hp = (float)d->health/d->maxhealth;
+        hudquad(offset.x, offset.y, hp*healthbarw, healthbarh, healthcolor.r, healthcolor.g, healthcolor.b, 0, 0, hp, 1);
+        settexture("packages/hud/health_bar_over.png");
+        hudquad(offset.x, offset.y, healthbarw, healthbarh);
+        if (d->quadmillis) {
+            settexture("packages/hud/health_bar_quad.png");
+            hudquad(offset.x, offset.y, healthbarw, healthbarh);
         }
+        defformatstring(health, "%d", d->state==CS_DEAD ? 0 : d->health);
+        float tw=0, th=0; text_boundsf(health, tw, th);
+        draw_text(health, offset.x+(125*proportion-tw)/2, offset.y+(healthbarh-th)/2, healthcolor.r, healthcolor.g, healthcolor.b);
+
         pophudmatrix();
+    }
 
-        if(d->state != CS_DEAD && d->maxhealth > 100)
-        {
-            float scale = 0.66f;
-            pushhudmatrix();
-            hudmatrix.scale(scale, scale, 1);
-            flushhudmatrix();
+    VARP(hudmaxhealth, 0, 1, 1);
+    FVARP(hudmaxhealthx, 0, 0.207, 1);
+    FVARP(hudmaxhealthy, 0, 0.97, 1);
+    FVARP(hudmaxhealthscale, 0.1, 1.0, 1.0);
 
-            float width, height;
-            text_boundsf(health, width, height);
-            draw_textf("/%d", (HICON_X + HICON_SIZE + HICON_SPACE + width*2)/scale, (HICON_TEXTY + height)/scale, d->maxhealth);
+    void drawhudmaxhealth(fpsent *d, int w, int h)
+    {
+        pushhudmatrix();
+        hudmatrix.scale(hudmaxhealthscale, hudmaxhealthscale, 1);
+        flushhudmatrix();
 
-            pophudmatrix();
+        const float proportion = (w/15.0f)/160.0f;
+        const float healthboostw = 160*proportion;
+        const float healthboosth = 78*proportion;
+        float hb = (float)d->maxhealth/100.0f-1.0f;
+        vec2 offset = vec2(hudmaxhealthx, hudmaxhealthy).mul(vec2(w-healthboostw, h-healthboosth).div(hudhealthscale));
+        settexture("packages/hud/health_boost_base.png");
+        hudquad(offset.x, offset.y, hb*healthboostw, healthboosth, 0.3f, 0.6f, 0.9f, 0, 0, hb, 1);
+        settexture("packages/hud/health_boost_over.png");
+        hudquad(offset.x, offset.y, healthboostw, healthboosth);
+        if (d->quadmillis) {
+            settexture("packages/hud/health_boost_quad.png");
+            hudquad(offset.x, offset.y, healthboostw, healthboosth);
         }
 
-        drawicon(HICON_HEALTH, HICON_X, HICON_Y);
-        if(d->state!=CS_DEAD)
-        {
-            if(d->armour) drawicon(HICON_BLUE_ARMOUR+d->armourtype, HICON_X + HICON_STEP, HICON_Y);
+        pophudmatrix();
+    }
+
+    VARP(armourcolors, 0, 1, 1);
+
+    VARP(hudarmour, 0, 1, 1);
+    FVARP(hudarmourx, 0, 1, 1);
+    FVARP(hudarmoury, 0, 1, 1);
+    FVARP(hudarmourscale, 0.1, 1.0, 1.0);
+
+    void drawhudarmour(fpsent *d, int w, int h)
+    {
+        pushhudmatrix();
+        hudmatrix.scale(hudarmourscale, hudarmourscale, 1);
+        flushhudmatrix();
+
+        bvec armourcolor = bvec::hexcolor(d->armourtype == A_BLUE ? 0x83ade5 : (d->armourtype == A_GREEN ? 0x77f29e : (d->armourtype == A_YELLOW ? 0xf5f19b : 0xffffff)));
+        const float proportion = (w/4.0f)/600.0f;
+        const float armourbarw = 600*proportion;
+        const float armourbarh = 113*proportion;
+        vec2 offset = vec2(hudarmourx, hudarmoury).mul(vec2(w-armourbarw, h-armourbarh).div(hudarmourscale));
+        settexture("packages/hud/armour_bar_base.png");
+        float ap = (float)d->armour/d->maxarmour;
+        hudquad(offset.x, offset.y, ap*armourbarw, armourbarh, armourcolor.r, armourcolor.g, armourcolor.b, 0, 0, ap, 1);
+        settexture("packages/hud/armour_bar_over.png");
+        hudquad(offset.x, offset.y, armourbarw, armourbarh);
+        if (d->quadmillis) {
+            settexture("packages/hud/armour_bar_quad.png");
+            hudquad(offset.x, offset.y, armourbarw, armourbarh);
+        }
+        defformatstring(armour, "%d", d->state==CS_DEAD ? 0 : d->armour);
+        float tw=0, th=0; text_boundsf(armour, tw, th);
+        draw_text(armour, offset.x+(2*(600-63)*proportion-tw)/2, offset.y+(armourbarh-th)/2, armourcolor.r, armourcolor.g, armourcolor.b);
+
+        pophudmatrix();
+    }
+
+    void drawhudicons(fpsent *d, int w, int h)
+    {
+        //~defformatstring(health, "%d", d->state==CS_DEAD ? 0 : d->health);
+        //~bvec healthcolor = bvec::hexcolor(healthcolors && !m_insta ? (d->state==CS_DEAD ? 0x808080 : (d->health<=25 ? 0xFF0000 : (d->health<=50 ? 0xFF8000 : (d->health<=100 ? 0xFFFFFF : 0x40C0FF)))) : 0xFFFFFF);
+        //~draw_text(health, (HICON_X + HICON_SIZE + HICON_SPACE)/2, HICON_TEXTY/2, healthcolor.r, healthcolor.g, healthcolor.b);
+        //~if(d->state!=CS_DEAD)
+        //~{
+            //~if(d->armour) draw_textf("%d", (HICON_X + HICON_STEP + HICON_SIZE + HICON_SPACE)/2, HICON_TEXTY/2, d->armour);
+            //~draw_textf("%d", (HICON_X + 2*HICON_STEP + HICON_SIZE + HICON_SPACE)/2, HICON_TEXTY/2, d->ammo[d->gunselect]);
+        //~}
+
+        //~if(d->state != CS_DEAD && d->maxhealth > 100)
+        //~{
+            //~float scale = 0.66f;
+            //~pushhudmatrix();
+            //~hudmatrix.scale(scale, scale, 1);
+            //~flushhudmatrix();
+
+            //~float width, height;
+            //~text_boundsf(health, width, height);
+            //~draw_textf("/%d", (HICON_X + HICON_SIZE + HICON_SPACE + width*2)/scale, (HICON_TEXTY + height)/scale, d->maxhealth);
+
+            //~pophudmatrix();
+        //~}
+
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        glEnable(GL_BLEND);
+
+        if(hudhealth) drawhudhealth(d, w, h);
+        if(hudmaxhealth) drawhudmaxhealth(d, w, h);
+        if(hudarmour) drawhudarmour(d, w, h);
+
+        if(d->state!=CS_DEAD) {
             drawicon(HICON_FIST+d->gunselect, HICON_X + 2*HICON_STEP, HICON_Y);
-            if(d->quadmillis) drawicon(HICON_QUAD, HICON_X + 3*HICON_STEP, HICON_Y);
             if(ammohud) drawammohud(d);
         }
     }
@@ -1068,32 +1173,75 @@ namespace game
         pophudmatrix();
     }
 
-    void newhud(int w, int h) //new SauerEnhanced HUD
+    VARP(speedometer, 0, 1, 1);
+    FVARP(speedometerx, 0.0, 0.5, 1.0);
+    FVARP(speedometery, 0.0, 0.6, 1.0);
+    FVARP(speedometerscale, 0.1, 0.5, 1.0);
+    VARP(speedometercolor, 0, 1, 1);
+    FVARP(speedometeralpha, 0.0, 0.5, 1.0);
+
+    void drawspeedometer(fpsent *d, int w, int h)
     {
-        if(player1->state==CS_DEAD || player1->state==CS_SPECTATOR) return;
+        int speedforreal = (int) (sqrtf(d->vel.squaredlen()) + 1.0f);
+        speedforreal = (speedforreal == 1) ? 0 : speedforreal;
+        vec colour = vec(255, 255, 255);
+        float realw = 0;
+        float realh = 0;
+        if (speedometercolor) {
+            if (speedforreal==0)                            colour = vec(60, 60, 60);
+            else if (speedforreal>0   && speedforreal<=60)  colour = vec(240, 30, 30);
+            else if (speedforreal>60  && speedforreal<=120) colour = vec(180, 90, 60);
+            else if (speedforreal>120 && speedforreal<=180) colour = vec(180, 180, 30);
+            else if (speedforreal>180 && speedforreal<=240) colour = vec(90, 180, 60);
+            else                                            colour = vec(30, 240, 30);
+        }
+
+        defformatstring(speedstring, "%d", speedforreal);
+        text_boundsf(speedstring, realw, realh);
+        vec2 offset = vec2(speedometerx, speedometery).mul(vec2(w, h).div(speedometerscale));
+        offset.x -= realw/2.0f;
+        offset.y -= realh/2.0f;
+
+        pushhudmatrix();
+        hudmatrix.scale(speedometerscale, speedometerscale, 1);
+        flushhudmatrix();
+
+        const int speedow = 220;
+        const int speedoh = 101;
+        settexture("packages/hud/speedometer.png");
+        hudquad(offset.x+realw/2.0f-speedow/2, offset.y+realh/2.0f-speedoh/2, speedow, speedoh);
+
+        draw_text(speedstring, int(offset.x), int(offset.y), colour.x, colour.y, colour.z, (int)(speedometeralpha*255.0f));
+
+        pophudmatrix();
+    }
+
+    //~void newhud(int w, int h) //new SauerEnhanced HUD
+    //~{
+        //~if(player1->state==CS_DEAD || player1->state==CS_SPECTATOR) return;
         //~glPushMatrix();
         //~glScalef(1/1.2f, 1/1.2f, 1);
-        pushhudmatrix();
+        //~pushhudmatrix();
         //~hudmatrix.scale(w/1800.0f, h/1650.0f, 1);
-        hudmatrix.scale(1.0f/1.2f, 1.0f/1.2f, 1);
-        flushhudmatrix();
-        if(!m_insta) draw_textf("%d", 80, h*1.2f-128, player1->state==CS_DEAD ? 0 : player1->health);
-        defformatstring(ammo, "%d", player1->ammo[player1->gunselect]);
-        int wb, hb;
-        text_bounds(ammo, wb, hb);
-        draw_textf("%d", w*1.2f-wb-80, h*1.2f-128, player1->ammo[player1->gunselect]);
+        //~hudmatrix.scale(1.0f/1.2f, 1.0f/1.2f, 1);
+        //~flushhudmatrix();
+        //~if(!m_insta) draw_textf("%d", 80, h*1.2f-128, player1->state==CS_DEAD ? 0 : player1->health);
+        //~defformatstring(ammo, "%d", player1->ammo[player1->gunselect]);
+        //~int wb, hb;
+        //~text_bounds(ammo, wb, hb);
+        //~draw_textf("%d", w*1.2f-wb-80, h*1.2f-128, player1->ammo[player1->gunselect]);
 
             //~hudmatrix.ortho(0, w, h, 0, -1, 1);
             //~resethudmatrix();
 
             //~hudshader->set();
-            gle::colorf(1, 1, 1);
+            //~gle::colorf(1, 1, 1);
 
-            gle::defvertex(2);
-            gle::deftexcoord0();
+            //~gle::defvertex(2);
+            //~gle::deftexcoord0();
 
-        if(player1->quadmillis)
-        {
+        //~if(player1->quadmillis)
+        //~{
             //~gle::begin(GL_QUADS);
             //~loopj(numdecals)
             //~{
@@ -1104,132 +1252,138 @@ namespace game
                 //~gle::attribf(hx-hsz, hy+hsz); gle::attribf(side,   1);
             //~}
             //~gle::end();
-            settexture("packages/hud/hud_quaddamage_left.png");  //QuadDamage left glow
-            gle::begin(GL_QUADS);
-            gle::attribf(0,   h*1.2f-207);       gle::attribf(0.0f, 0.0f);
-            gle::attribf(539, h*1.2f-207);       gle::attribf(1.0f, 0.0f);
-            gle::attribf(539, h*1.2f);       gle::attribf(1.0f, 1.0f);
-            gle::attribf(0,   h*1.2f);       gle::attribf(0.0f, 1.0f);
-            gle::end();
-
-            settexture("packages/hud/hud_quaddamage_right.png"); //QuadDamage right glow
-            gle::begin(GL_QUADS);
-            gle::attribf(w*1.2f-135, h*1.2f-207);          gle::attribf(0.0f, 0.0f);
-            gle::attribf(w*1.2f,     h*1.2f-207);          gle::attribf(1.0f, 0.0f);
-            gle::attribf(w*1.2f,     h*1.2f);          gle::attribf(1.0f, 1.0f);
-            gle::attribf(w*1.2f-135, h*1.2f);          gle::attribf(0.0f, 1.0f);
-            gle::end();
-        }
+            //~settexture("packages/hud/hud_quaddamage_left.png");  //QuadDamage left glow
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(0,   h*1.2f-207);       gle::attribf(0.0f, 0.0f);
+            //~gle::attribf(539, h*1.2f-207);       gle::attribf(1.0f, 0.0f);
+            //~gle::attribf(539, h*1.2f);       gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(0,   h*1.2f);       gle::attribf(0.0f, 1.0f);
+            //~gle::end();
 
-        if(player1->maxhealth > 100)
-        {
-            settexture("packages/hud/hud_megahealth.png");  //HealthBoost indicator
-            gle::begin(GL_QUADS);
-            gle::attribf(0,   h*1.2f-207);           gle::attribf(0.0f, 0.0f);
-            gle::attribf(539, h*1.2f-207);           gle::attribf(1.0f, 0.0f);
-            gle::attribf(539, h*1.2f);           gle::attribf(1.0f, 1.0f);
-            gle::attribf(0,   h*1.2f);           gle::attribf(0.0f, 1.0f);
-            gle::end();
-        }
+            //~settexture("packages/hud/hud_quaddamage_right.png"); //QuadDamage right glow
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(w*1.2f-135, h*1.2f-207);          gle::attribf(0.0f, 0.0f);
+            //~gle::attribf(w*1.2f,     h*1.2f-207);          gle::attribf(1.0f, 0.0f);
+            //~gle::attribf(w*1.2f,     h*1.2f);          gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(w*1.2f-135, h*1.2f);          gle::attribf(0.0f, 1.0f);
+            //~gle::end();
+        //~}
 
-        int health = (player1->health*100)/player1->maxhealth,
-            armour = (player1->armour*100)/200,
-            hh = (health*101)/100,
-            ah = (armour*167)/100;
+        //~if(player1->maxhealth > 100)
+        //~{
+            //~settexture("packages/hud/hud_megahealth.png");  //HealthBoost indicator
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(0,   h*1.2f-207);           gle::attribf(0.0f, 0.0f);
+            //~gle::attribf(539, h*1.2f-207);           gle::attribf(1.0f, 0.0f);
+            //~gle::attribf(539, h*1.2f);           gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(0,   h*1.2f);           gle::attribf(0.0f, 1.0f);
+            //~gle::end();
+        //~}
 
-        float hs = (health*1.0f)/100,
-              as = (armour*1.0f)/100;
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(w/2-speedow/2, h/2-speedoh/2); gle::attribf(0.0f, 1.0f);
+            //~gle::attribf(w/2,           h/2-speedoh/2); gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(w/2,           h/2);           gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(w/2-speedow/2, h/2);           gle::attribf(0.0f, 1.0f);
+            //~gle::end();
 
-        if(player1->health > 0 && !m_insta)
-        {
-            settexture("packages/hud/hud_health.png");  //Health bar
-            gle::begin(GL_QUADS);
-            gle::attribf(47, h*1.2f-hh-56);            gle::attribf(0.0f, 1.0f-hs);
-            gle::attribf(97, h*1.2f-hh-56);            gle::attribf(1.0f, 1.0f-hs);
-            gle::attribf(97, h*1.2f-57);            gle::attribf(1.0f, 1.0f);
-            gle::attribf(47, h*1.2f-57);            gle::attribf(0.0f, 1.0f);
-            gle::end();
-        }
+        //~int health = (player1->health*100)/player1->maxhealth,
+            //~armour = (player1->armour*100)/200,
+            //~hh = (health*101)/100;
 
-        if(player1->armour > 0)
-        {
-            settexture("packages/hud/hud_armour.png");  //Armour bar
-            gle::begin(GL_QUADS);
-            gle::attribf(130,    h*1.2f-62);gle::attribf(0.0f,    0.0f);
-            gle::attribf(130+ah, h*1.2f-62);gle::attribf(as,      0.0f);
-            gle::attribf(130+ah, h*1.2f-44);gle::attribf(as,      1.0f);
-            gle::attribf(130,    h*1.2f-44);gle::attribf(0.0f,    1.0f);
-            gle::end();
-        }
+        //~float hs = (health*1.0f)/100;
 
-        if(!m_insta)
-        {
-            settexture("packages/hud/hud_left.png"); //left HUD
-            gle::begin(GL_QUADS);
-            gle::attribf(0,   h*1.2f-207);gle::attribf(0.0f, 0.0f);
-            gle::attribf(539, h*1.2f-207);gle::attribf(1.0f, 0.0f);
-            gle::attribf(539, h*1.2f    );gle::attribf(1.0f, 1.0f);
-            gle::attribf(0,   h*1.2f    );gle::attribf(0.0f, 1.0f);
-            gle::end();
-        }
+        //~if(player1->health > 0 && !m_insta)
+        //~{
+            //~settexture("packages/hud/hud_health.png");  //Health bar
+            //~hudquad(4000, 600, 97, 56);
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(47, h*1.2f-hh-56);            gle::attribf(0.0f, 1.0f-hs);
+            //~gle::attribf(97, h*1.2f-hh-56);            gle::attribf(1.0f, 1.0f-hs);
+            //~gle::attribf(97, h*1.2f-57);            gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(47, h*1.2f-57);            gle::attribf(0.0f, 1.0f);
+            //~gle::end();
+        //~}
 
-        settexture("packages/hud/hud_right.png"); //right HUD
-            gle::begin(GL_QUADS);
-        gle::attribf(w*1.2f-135, h*1.2f-207);gle::attribf(0.0f, 0.0f);
-        gle::attribf(w*1.2f,     h*1.2f-207);gle::attribf(1.0f, 0.0f);
-        gle::attribf(w*1.2f,     h*1.2f    );gle::attribf(1.0f, 1.0f);
-        gle::attribf(w*1.2f-135, h*1.2f    );gle::attribf(0.0f, 1.0f);
-            gle::end();
+        //~if(player1->armour > 0)
+        //~{
+            //~settexture("packages/hud/hud_armour.png");  //Armour bar
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(130,    h*1.2f-62);gle::attribf(0.0f,    0.0f);
+            //~gle::attribf(130+ah, h*1.2f-62);gle::attribf(as,      0.0f);
+            //~gle::attribf(130+ah, h*1.2f-44);gle::attribf(as,      1.0f);
+            //~gle::attribf(130,    h*1.2f-44);gle::attribf(0.0f,    1.0f);
+            //~gle::end();
+        //~}
 
-        int maxammo = 0;
+        //~if(!m_insta)
+        //~{
+            //~settexture("packages/hud/hud_left.png"); //left HUD
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(0,   h*1.2f-207);gle::attribf(0.0f, 0.0f);
+            //~gle::attribf(539, h*1.2f-207);gle::attribf(1.0f, 0.0f);
+            //~gle::attribf(539, h*1.2f    );gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(0,   h*1.2f    );gle::attribf(0.0f, 1.0f);
+            //~gle::end();
+        //~}
 
-        switch(player1->gunselect)
-        {
-            case GUN_FIST:
-                maxammo = 1;
-                break;
+        //~settexture("packages/hud/hud_right.png"); //right HUD
+            //~gle::begin(GL_QUADS);
+        //~gle::attribf(w*1.2f-135, h*1.2f-207);gle::attribf(0.0f, 0.0f);
+        //~gle::attribf(w*1.2f,     h*1.2f-207);gle::attribf(1.0f, 0.0f);
+        //~gle::attribf(w*1.2f,     h*1.2f    );gle::attribf(1.0f, 1.0f);
+        //~gle::attribf(w*1.2f-135, h*1.2f    );gle::attribf(0.0f, 1.0f);
+            //~gle::end();
 
-            case GUN_RL:
-            case GUN_RIFLE:
-                maxammo = m_insta ? 100 : 15;
-                break;
+        //~int maxammo = 0;
 
-            case GUN_SG:
-            case GUN_GL:
-                maxammo = 30;
-                break;
+        //~switch(player1->gunselect)
+        //~{
+            //~case GUN_FIST:
+                //~maxammo = 1;
+                //~break;
 
-            case GUN_CG:
-                maxammo = 60;
-                break;
+            //~case GUN_RL:
+            //~case GUN_RIFLE:
+                //~maxammo = m_insta ? 100 : 15;
+                //~break;
 
-            case GUN_PISTOL:
-                maxammo = 120;
-                break;
-        }
+            //~case GUN_SG:
+            //~case GUN_GL:
+                //~maxammo = 30;
+                //~break;
 
-        int curammo = (player1->ammo[player1->gunselect]*100)/maxammo,
-            amh = (curammo*101)/100;
+            //~case GUN_CG:
+                //~maxammo = 60;
+                //~break;
 
-        float ams = (curammo*1.0f)/100;
+            //~case GUN_PISTOL:
+                //~maxammo = 120;
+                //~break;
+        //~}
 
-        if(player1->ammo[player1->gunselect] > 0)
-        {
-            settexture("packages/hud/hud_health.png");  //Ammo bar
-            gle::begin(GL_QUADS);
-            gle::attribf(w*1.2f-47, h*1.2f-amh-56);gle::attribf(0.0f, 1.0f-ams);
-            gle::attribf(w*1.2f-97, h*1.2f-amh-56);gle::attribf(1.0f, 1.0f-ams);
-            gle::attribf(w*1.2f-97, h*1.2f-57    );gle::attribf(1.0f, 1.0f);
-            gle::attribf(w*1.2f-47, h*1.2f-57    );gle::attribf(0.0f, 1.0f);
-            gle::end();
-        }
+        //~int curammo = (player1->ammo[player1->gunselect]*100)/maxammo,
+            //~amh = (curammo*101)/100;
+
+        //~float ams = (curammo*1.0f)/100;
+
+        //~if(player1->ammo[player1->gunselect] > 0)
+        //~{
+            //~settexture("packages/hud/hud_health.png");  //Ammo bar
+            //~gle::begin(GL_QUADS);
+            //~gle::attribf(w*1.2f-47, h*1.2f-amh-56);gle::attribf(0.0f, 1.0f-ams);
+            //~gle::attribf(w*1.2f-97, h*1.2f-amh-56);gle::attribf(1.0f, 1.0f-ams);
+            //~gle::attribf(w*1.2f-97, h*1.2f-57    );gle::attribf(1.0f, 1.0f);
+            //~gle::attribf(w*1.2f-47, h*1.2f-57    );gle::attribf(0.0f, 1.0f);
+            //~gle::end();
+        //~}
         //~glPopMatrix();
-        pophudmatrix();
-    }
+        //~pophudmatrix();
+    //~}
 
     void gameplayhud(int w, int h)
     {
-        newhud(w, h);
+        //~newhud(w, h);
 
         pushhudmatrix();
         hudmatrix.scale(h/1800.0f, h/1800.0f, 1);
@@ -1255,15 +1409,17 @@ namespace game
         fpsent *d = hudplayer();
         if(d->state!=CS_EDITING)
         {
-            if(d->state!=CS_SPECTATOR) drawhudicons(d);
             if(cmode) cmode->drawhud(d, w, h);
         }
 
         pophudmatrix();
 
+        if(d->state!=CS_EDITING && d->state!=CS_SPECTATOR) drawhudicons(d, w, h);
+
         if(d->state!=CS_EDITING && d->state!=CS_SPECTATOR && d->state!=CS_DEAD)
         {
             if(ammobar) drawammobar(w, h, d);
+            if(speedometer) drawspeedometer(d, w, h);
         }
 
 
@@ -1271,39 +1427,8 @@ namespace game
         {
             if(gameclock) drawgameclock(w, h);
             if(hudscore) drawhudscore(w, h);
-            //~if(speedometer) drawspeedometer(d, w, h);
-        }
-
-        /// Speedometer.
-
-        int speedforreal = (int) (sqrtf(d->vel.squaredlen()) + 1.0f);
-        speedforreal = (speedforreal == 1) ? 0 : speedforreal;
-        vec colour = vec(255, 255, 255);
-        float realw = 0;
-        float realh = 0;
-        if (speedometercolor) {
-            if (speedforreal==0)                            colour = vec(60, 60, 60);
-            else if (speedforreal>0   && speedforreal<=60)  colour = vec(240, 30, 30);
-            else if (speedforreal>60  && speedforreal<=120) colour = vec(180, 90, 60);
-            else if (speedforreal>120 && speedforreal<=180) colour = vec(180, 180, 30);
-            else if (speedforreal>180 && speedforreal<=240) colour = vec(90, 180, 60);
-            else                                            colour = vec(30, 240, 30);
         }
 
-        defformatstring(speedstring, "%d", speedforreal);
-        text_boundsf(speedstring, realw, realh);
-        vec2 offset = vec2(speedometerx, speedometery).mul(vec2(w, h).div(speedometerscale));
-        offset.x -= realw/2.0f;
-        offset.y -= realh/2.0f;
-
-        pushhudmatrix();
-        hudmatrix.scale(speedometerscale, speedometerscale, 1);
-        flushhudmatrix();
-
-        draw_text(speedstring, int(offset.x), int(offset.y), colour.x, colour.y, colour.z, (int)(speedometeralpha*255.0f));
-
-        pophudmatrix();
-
         /// Frag message.
 
         if((hudfragmillis+fragmessageduration > lastmillis) && (lastmillis>fragmessageduration))