From 2d55d5dc2aea70711c19f3d2cc2321ecdc6a132a Mon Sep 17 00:00:00 2001
From: aurhat <szyk@vivaldi.net>
Date: Tue, 23 Aug 2016 22:19:27 +0200
Subject: [PATCH] Cleanup new_content map

Fixed paths to models, adjusted map message, map saved
in format 10.
---
 packages/maps/new_content.cfg | 120 +++++++++++++++++-----------------
 packages/maps/new_content.cgz | Bin 4012 -> 4384 bytes
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/packages/maps/new_content.cfg b/packages/maps/new_content.cfg
index ee8c0cf0..9deae64c 100644
--- a/packages/maps/new_content.cfg
+++ b/packages/maps/new_content.cfg
@@ -1,7 +1,7 @@
 
 mapmodelreset
 
-mapmodel 2 2 0 0 "nothing"
+mapmodel 2 2 0 0 "makke/nothing_clip"
 
 mapmodel 0 0 0 0 "toca/pipes/industrialpipes/horz"			// 1
 mapmodel 0 0 0 0 "toca/pipes/industrialpipes/vert"			// 2
@@ -79,7 +79,7 @@ mapmodel 0 3 0 0 "cleaner/oil_drums/up" //73
 mapmodel 0 2 0 0 "cleaner/oil_drums/down" //74
 mapmodel 0 2 0 0 "cleaner/oil_drums/spill" //75
 mapmodel 2 4 0 0 "cleaner/dumpster_tag" //76 
-mapmodel 1 2 0 0 "cleaner/fire_hydrant" //77
+mapmodel 1 2 0 0 "cleaner/fire_hydrant" //77 not yet finished
 mapmodel 0 0 0 0 "cleaner/laundry" //78
 mapmodel 0 0 0 0 "cleaner/cl_window01" //79
 mapmodel 0 1 0 0 "toca/paintbucket/1"		//80
@@ -136,14 +136,14 @@ texture 0 "makke/bricks_3.jpg"
 texture 0 "makke/bricks_3.jpg"
 texture 0 "makke/brickwall.jpg"
 texture 0 "noctua/wall/brick02.jpg"
-texture 0 "sub/brick_wall_08.jpg"
-texture 0 "sub/brick_wall_09.jpg"
+texture 0 "zastrow/brick_wall_08.jpg"
+texture 0 "zastrow/brick_wall_09.jpg"
 texture 0 "makke/bricky.jpg"
 texture 0 "makke/01-CMU.jpg"
 texture 0 "makke/mauer1.jpg"
 texture 0 "makke/mauer2.jpg"
 texture 0 "makke/d_brick.jpg"
-texture 0 "mitaman/3dcafe/stone18.jpg"			// Texture #26
+texture 0 "3dcafe/stone18.jpg"			// Texture #26
 
 							// Tile textures
 texture 0 "noctua/tiles/16tile12.jpg"			// Texture #27
@@ -206,21 +206,21 @@ texture 0 "boeck/stone_014.jpg"
 texture 0 "noctua/wall/plast01.jpg"
 texture 0 "noctua/wall/plast03.jpg"
 texture 0 "noctua/wall/plast04.jpg"
-texture 0 "mitaman/various/5sqtunnelroad.jpg"
-texture 0 "mitaman/various/027metal.jpg"		// Texture #83
+texture 0 "golgotha/5sqtunnelroad.jpg"
+texture 0 "lemog/027metal.jpg"		// Texture #83
 
 							// Metal textures
 texture 0 "boeck/metal_019.jpg"				// Texture #84
 texture 0 "boeck/metal_019_b.jpg"
-texture 0 "mitaman/various/036metal.jpg"
+texture 0 "lemog/036metal.jpg"
 texture 0 "boeck/rolltor.jpg"
-texture 0 "mitaman/golgotha/hhroofgray.jpg"
-texture 0 "mitaman/golgotha/tunnel_ceiling.jpg"
-texture 0 "mitaman/golgotha/tunnel_ceiling_b.jpg"
+texture 0 "golgotha/hhroofgray.jpg"
+texture 0 "golgotha/tunnel_ceiling.jpg"
+texture 0 "golgotha/tunnel_ceiling_b.jpg"
 texture 0 "zastrow/metal_overlaps.jpg"
 texture 0 "zastrow/metal_plate_fill.jpg"
-texture 0 "mitaman/golgotha/metal_bumps2.jpg"
-texture 0 "mitaman/golgotha/metal_bumps3.jpg"
+texture 0 "golgotha/metal_bumps2.jpg"
+texture 0 "golgotha/metal_bumps3.jpg"
 texture 0 "zastrow/metal_siding_kinks.jpg"
 texture 0 "noctua/metal/zinc01.jpg"
 texture 0 "noctua/metal/copper01.jpg"
@@ -234,8 +234,8 @@ texture 0 "noctua/metal/metbgr03.jpg"
 texture 0 "noctua/metal/metbgr04.jpg"
 texture 0 "noctua/metal/verdig01.jpg"
 texture 0 "noctua/metal/brass01.jpg"
-texture 0 "mitaman/various/006metal.jpg"
-texture 0 "mitaman/various/metal020.jpg"		// Texture #109
+texture 0 "lemog/006metal.jpg"
+texture 0 "grsites/metal020.jpg"		// Texture #109
 
 							// Wood textures
 texture 0 "boeck/wood_009.jpg"				// Texture #110
@@ -247,7 +247,7 @@ texture 0 "arcitool/n_f-natur2.jpg"
 texture 0 "arcitool/Blockbohlen-natur.jpg"
 texture 0 "arcitool/Zaun.jpg"
 texture 0 "arcitool/Rundholz.jpg"
-texture 0 "mitaman/grsites/wood060.jpg"
+texture 0 "grsites/wood060.jpg"
 texture 0 "noctua/wood/blinds01.jpg"
 texture 0 "noctua/wood/fb_board.jpg"
 texture 0 "noctua/wood/planks01.jpg"
@@ -259,8 +259,8 @@ texture 0 "noctua/wood/bark01.jpg"
 texture 0 "noctua/wood/wood02.jpg"
 texture 0 "noctua/wood/wood03.jpg"
 texture 0 "noctua/wood/wood04.jpg"
-texture 0 "mitaman/various/063bois.jpg"
-texture 0 "mitaman/various/063bois_b.jpg"		// Texture #132
+texture 0 "lemog/063bois.jpg"
+texture 0 "lemog/063bois_b.jpg"		// Texture #132
 
 							// Mud/sand/grass textures
 texture 0 "craig_fortune/terrain/grass_lush1.jpg" 	// Texture #133
@@ -273,7 +273,7 @@ texture 0 "craig_fortune/terrain/mud.jpg"
 texture 0 "craig_fortune/terrain/Mud_thick.jpg"
 texture 0 "makke/cracked_mud.jpg"
 texture 0 "craig_fortune/terrain/sand_bleached.jpg"
-texture 0 "sub/sub_sand.jpg"
+texture 0 "zastrow/sub_sand.jpg"
 texture 0 "DigitalFlux/light_brown_dirt_02.jpg"
 texture 0 "DigitalFlux/dirt_pebbles_01.jpg"
 texture 0 "DigitalFlux/light_brown_dirt_01.jpg"
@@ -329,18 +329,18 @@ texture 0 "boeck/gully.jpg"
 texture 0 "boeck/aircon2.jpg"
 texture 0 "makke/aircon.jpg"
 texture 0 "makke/aircon_sm.jpg"
-texture 0 "makke/door.jpg"
+texture 0 "golgotha/door.jpg"
 texture 0 "makke/klappe.jpg"
 texture 0 "makke/klappe2.jpg"
-texture 0 "makke/klappe3.jpg"
+texture 0 "golgotha/klappe3.jpg"
 texture 0 "makke/neuklappe.jpg"
-texture 0 "makke/panel.jpg"
-texture 0 "mitaman/3dcafe/objects09_a.jpg"
-texture 0 "mitaman/golgotha/elecpanelstwo.jpg"
+texture 0 "golgotha/panel.jpg"
+texture 0 "3dcafe/objects09_a.jpg"
+texture 0 "golgotha/elecpanelstwo.jpg"
 texture 0 "mitaman/various/metal_trim_4_v.jpg"
 texture 0 "mitaman/various/metal_trim_4_h.jpg"
-texture 0 "mitaman/various/metal026.jpg"
-texture 0 "mitaman/various/vent_cap.jpg"
+texture 0 "grsites/metal026.jpg"
+texture 0 "zastrow/vent_cap.jpg"
 texture 0 "mitaman/various/rgrates0006.jpg"
 texture 0 "mitaman/various/large_plate.jpg"
 texture 0 "makke/lampe.jpg"
@@ -352,21 +352,21 @@ texture 0 "makke/stairtrim.jpg"
 texture 0 "makke/metalstair1.jpg"
 texture 0 "makke/metalstair2.jpg"
 texture 0 "zastrow/metal_siding_kinksb.jpg"
-texture 0 "makke/window.jpg"
-texture 0 "makke/windows.jpg"
+texture 0 "golgotha/window.jpg"
+texture 0 "golgotha/windows.jpg"
 texture 0 "zastrow/sub_window31.jpg"
 texture 0 "zastrow/sub_window33.jpg"
-texture 0 "mitaman/various/sub_window23.jpg"
-texture 0 "mitaman/various/sub_window38.jpg"
-texture 0 "mitaman/3dcafe/door10.jpg"
-texture 0 "mitaman/3dcafe/door12.jpg"
-texture 0 "mitaman/3dcafe/door15.jpg"
-texture 0 "mitaman/3dcafe/door07.jpg"
+texture 0 "zastrow/sub_window23.jpg"
+texture 0 "zastrow/sub_window38.jpg"
+texture 0 "3dcafe/door10.jpg"
+texture 0 "3dcafe/door12.jpg"
+texture 0 "3dcafe/door15.jpg"
+texture 0 "3dcafe/door07.jpg"
 texture 0 "zastrow/sub_doors512B05.jpg"
 texture 0 "zastrow/sub_doors512A10.jpg"
 texture 0 "zastrow/sub_doors512A16.jpg"
-texture 0 "mitaman/various/sub_doors256nf_01.jpg"
-texture 0 "mitaman/3dcafe/objects08.jpg"		// Texture #230
+texture 0 "zastrow/sub_doors256nf_01.jpg"
+texture 0 "3dcafe/objects08.jpg"		// Texture #230
 
 							// Crate/box textures
 texture 0 "craig_fortune/crates/light_weathered.jpg"	// Texture #231
@@ -386,11 +386,11 @@ texture 0 "zastrow/wood_crate_12.jpg"
 texture 0 "makke/box_2.jpg"
 texture 0 "makke/box_4.jpg"
 texture 0 "makke/box_3.jpg"
-texture 0 "makke/smallsteelbox.jpg"			// Texture #248
+texture 0 "golgotha/smallsteelbox.jpg"			// Texture #248
 
 							// Additional textures
 texture 0 "drunkenM/rock_wall1.jpg"			// Texture #249
-texture 0 "rattrap/rb_window.jpg"
+texture 0 "makke/rb_window.jpg"
 
 
 
@@ -422,14 +422,14 @@ texture 0 "rattrap/rb_window.jpg"
 // texture 0 "wotwot/urban/asphalt1_l.jpg"
 // texture 0 "wotwot/urban/metaltrim1_ver.jpg"
 // texture 0 "wotwot/urban/metaltrim1_hor.jpg"
-// texture 0 "wotwot/urban/door3.jpg"
-// texture 0 "wotwot/urban/airvent1.jpg"
+// texture 0 "mayang/door3.jpg"
+// texture 0 "mayang/airvent1.jpg"
 // texture 0 "wotwot/urban/ventilation1.jpg"
-// texture 0 "wotwot/urban/grill2_s.jpg"
+// texture 0 "mayang/grill2_s.jpg"
 // texture 0 "wotwot/urban/cableshelf1_s_hor.jpg"
 // texture 0 "wotwot/urban/cableshelf1_m_hor.jpg"
-// texture 0 "wotwot/urban/hatch1.jpg"
-// texture 0 "wotwot/urban/manhole1.jpg"
+// texture 0 "mayang/hatch1.jpg"
+// texture 0 "mayang/manhole1.jpg"
 // texture 0 "makke/door_metal.jpg"
 // texture 0 "makke/door_rust.jpg"
 // texture 0 "wotwot/urban/cableshelf1_l_hor.jpg"
@@ -446,21 +446,21 @@ texture 0 "rattrap/rb_window.jpg"
 // texture 0 "craig_fortune/crates/light_weathered_desert3.jpg"
 // texture 0 "makke/douze.jpg"
 // texture 0 "makke/clayceiling.jpg"
-// texture 0 "rattrap/rb_box_01.jpg"
-// texture 0 "rattrap/rb_box_02.jpg"
-// texture 0 "rattrap/rb_box_03.jpg"
-// texture 0 "rattrap/rb_box_04.jpg"
-// texture 0 "rattrap/rb_box_05.jpg"
-// texture 0 "rattrap/rb_box_06.jpg"
-// texture 0 "rattrap/rb_bricks_01.jpg"
-// texture 0 "rattrap/rb_bricks_02.jpg"
-// texture 0 "rattrap/rb_bricks_03.jpg"
-// texture 0 "rattrap/rb_concrete.jpg"
-// texture 0 "rattrap/rb_box_07.jpg"
-// texture 0 "rattrap/rb_trim_03.jpg"
-// texture 0 "rattrap/rb_trim_01.jpg"
-// texture 0 "rattrap/rb_trim_02.jpg"
-// texture 0 "rattrap/rb_window2.jpg"
+// texture 0 "makke/rattrap/rb_box_01.jpg"
+// texture 0 "makke/rattrap/rb_box_02.jpg"
+// texture 0 "makke/rattrap/rb_box_03.jpg"
+// texture 0 "makke/rattrap/rb_box_04.jpg"
+// texture 0 "makke/rattrap/rb_box_05.jpg"
+// texture 0 "makke/rattrap/rb_box_06.jpg"
+// texture 0 "mayang/rb_bricks_01.jpg"
+// texture 0 "mayang/rb_bricks_02.jpg"
+// texture 0 "mayang/rb_bricks_03.jpg"
+// texture 0 "makke/rattrap/rb_concrete.jpg"
+// texture 0 "zastrow/rb_box_07.jpg"
+// texture 0 "golgotha/rb_trim_03.jpg"
+// texture 0 "noctua/ground/rb_trim_01.jpg"
+// texture 0 "makke/rb_trim_02.jpg"
+// texture 0 "makke/rb_window2.jpg"
 // texture 0 "nieb/asphaltdamaged0043_1_l.jpg"		// START: Nieb's new textures...
 // texture 0 "nieb/b10woods003.jpg"
 // texture 0 "nieb/b15walls031b.jpg"
@@ -516,8 +516,8 @@ texture 0 "rattrap/rb_window.jpg"
 // texture 0 "nieb/tt7040146.jpg"
 // texture 0 "nieb/various0353.jpg"
 // texture 0 "nieb/vents0076.jpg"			// END: Nieb's new textures...
-// texture 0 "mitaman/3dcafe/door07_a.jpg"
-// texture 0 "mitaman/3dcafe/door10_a.jpg"
+// texture 0 "3dcafe/door07_a.jpg"
+// texture 0 "3dcafe/door10_a.jpg"
 
 
 mapsoundreset	// Ambient sounds. Leave this command here, or else your sounds will mess up!
diff --git a/packages/maps/new_content.cgz b/packages/maps/new_content.cgz
index d031d6f38e338357cd9b86d8cc39eff7b54382ea..601e2a11f140c1e704b938697c70bbf4c787a290 100644
GIT binary patch
literal 4384
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
a8jZ%u<W=Qo=0r08Jp6x$SirblQ2+q);`den

literal 4012
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
SKc`9m?ED|kjH`WmKmY*LS~~&&