From f66320e70c046485a7bb4bdac9438c3357c47573 Mon Sep 17 00:00:00 2001 From: Evan Goers Date: Sun, 21 Sep 2014 03:45:18 +0000 Subject: Removed _shiny materials. Updated materials to use the new shininess setting. --- base/maps/merchant/scalar.map | 92 +++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'base/maps/merchant/scalar.map') diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map index bf3f20a..292eb36 100644 --- a/base/maps/merchant/scalar.map +++ b/base/maps/merchant/scalar.map @@ -344,10 +344,10 @@ } // brush 27 { -( -288 -48 0 ) ( -280 -48 0 ) ( -280 -32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -288 -48 0 ) ( -280 -48 0 ) ( -280 -32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -272 -32 -16 ) ( -284 -32 -8 ) ( -280 -32 -16 ) common/caulk 0 0 0 1 1 0 0 0 ( -288 -40 0 ) ( -280 -48 0 ) ( -288 -48 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -288 -48 0 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -288 -48 0 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -272 -32 -16 ) ( -280 -48 0 ) ( -284 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 28 @@ -356,7 +356,7 @@ ( -264 -40 96 ) ( -264 -16 96 ) ( -264 -40 -32 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 -32 -8 ) ( -284 -32 -8 ) ( -272 -32 -16 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 -40 0 ) ( -280 -48 0 ) ( -288 -40 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -264 -40 0 ) ( -288 -40 0 ) ( -284 -32 -8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -264 -40 0 ) ( -288 -40 0 ) ( -284 -32 -8 ) colors/grey25 0 0 0 1 1 0 0 0 ( -272 -32 -16 ) ( -284 -32 -8 ) ( -280 -48 0 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 29 @@ -365,15 +365,15 @@ ( -264 40 -32 ) ( -264 16 96 ) ( -264 40 96 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 32 -8 ) ( -272 32 -16 ) ( -284 32 -8 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 40 0 ) ( -288 40 0 ) ( -280 48 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -264 40 0 ) ( -284 32 -8 ) ( -288 40 0 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -264 40 0 ) ( -284 32 -8 ) ( -288 40 0 ) colors/grey25 0 0 0 1 1 0 0 0 ( -272 32 -16 ) ( -280 48 0 ) ( -284 32 -8 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 30 { -( -288 48 0 ) ( -280 32 -16 ) ( -280 48 0 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -288 48 0 ) ( -280 32 -16 ) ( -280 48 0 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -272 32 -16 ) ( -280 32 -16 ) ( -284 32 -8 ) common/caulk 0 0 0 1 1 0 0 0 ( -288 48 0 ) ( -280 48 0 ) ( -288 40 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -288 48 0 ) ( -284 32 -8 ) ( -280 32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -288 48 0 ) ( -284 32 -8 ) ( -280 32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -272 32 -16 ) ( -284 32 -8 ) ( -280 48 0 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 31 @@ -382,7 +382,7 @@ ( -264 40 -64 ) ( -264 16 -64 ) ( -264 40 64 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 32 48 ) ( -328 32 40 ) ( -328 32 48 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 40 32 ) ( -328 48 32 ) ( -328 40 32 ) common/caulk 0 0 0 1 1 0 0 0 -( -264 32 40 ) ( -328 40 32 ) ( -328 32 40 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -264 32 40 ) ( -328 40 32 ) ( -328 32 40 ) colors/grey25 0 0 0 1 1 0 0 0 ( -306 36 36 ) ( -296 48 32 ) ( -304 32 48 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 32 @@ -391,38 +391,38 @@ ( -264 -40 64 ) ( -264 -16 -64 ) ( -264 -40 -64 ) common/caulk 0 0 0 1 1 0 0 0 ( -328 -32 48 ) ( -328 -32 40 ) ( -264 -32 48 ) common/caulk 0 0 0 1 1 0 0 0 ( -328 -40 32 ) ( -328 -48 32 ) ( -264 -40 32 ) common/caulk 0 0 0 1 1 0 0 0 -( -328 -32 40 ) ( -328 -40 32 ) ( -264 -32 40 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -328 -32 40 ) ( -328 -40 32 ) ( -264 -32 40 ) colors/grey25 0 0 0 1 1 0 0 0 ( -304 -32 48 ) ( -296 -48 32 ) ( -306 -36 36 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 33 { -( -328 -48 32 ) ( -328 -32 48 ) ( -264 -48 32 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -328 -48 32 ) ( -328 -32 48 ) ( -264 -48 32 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -328 -32 48 ) ( -328 -32 40 ) ( -264 -32 48 ) common/caulk 0 0 0 1 1 0 0 0 ( -328 -40 32 ) ( -328 -48 32 ) ( -264 -40 32 ) common/caulk 0 0 0 1 1 0 0 0 -( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -306 -36 36 ) ( -296 -48 32 ) ( -304 -32 48 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 34 { -( -264 48 32 ) ( -328 32 48 ) ( -328 48 32 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -264 48 32 ) ( -328 32 48 ) ( -328 48 32 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -264 32 48 ) ( -328 32 40 ) ( -328 32 48 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 40 32 ) ( -328 48 32 ) ( -328 40 32 ) common/caulk 0 0 0 1 1 0 0 0 -( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -304 32 48 ) ( -296 48 32 ) ( -306 36 36 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 35 { -( -264 32 48 ) ( -328 -32 48 ) ( -328 32 48 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -264 32 48 ) ( -328 -32 48 ) ( -328 32 48 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -264 32 40 ) ( -328 32 48 ) ( -328 32 40 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 -32 48 ) ( -328 -32 40 ) ( -328 -32 48 ) common/caulk 0 0 0 1 1 0 0 0 -( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -308 -64 40 ) ( -304 64 48 ) ( -308 64 40 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 36 { ( -264 32 40 ) ( -328 32 48 ) ( -328 32 40 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 -32 48 ) ( -328 -32 40 ) ( -328 -32 48 ) common/caulk 0 0 0 1 1 0 0 0 -( -264 32 40 ) ( -328 32 40 ) ( -328 -32 40 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -264 32 40 ) ( -328 32 40 ) ( -328 -32 40 ) colors/grey25 0 0 0 1 1 0 0 0 ( -308 64 40 ) ( -304 64 48 ) ( -308 -64 40 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 32 48 ) ( -328 -32 48 ) ( -328 32 48 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0 ( -264 40 -64 ) ( -264 16 -64 ) ( -264 40 64 ) common/caulk 0 0 0 1 1 0 0 0 @@ -431,13 +431,13 @@ { ( -276 32 -8 ) ( -284 32 -8 ) ( -280 32 -16 ) common/caulk 0 0 0 1 1 0 0 0 ( -276 -32 -8 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0 -( -284 -32 -8 ) ( -280 -32 -16 ) ( -280 32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 -( -264 -32 -16 ) ( -280 32 -16 ) ( -280 -32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -284 -32 -8 ) ( -280 -32 -16 ) ( -280 32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 +( -264 -32 -16 ) ( -280 32 -16 ) ( -280 -32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -284 64 -8 ) ( -272 64 -16 ) ( -284 -64 -8 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 38 { -( -276 32 -8 ) ( -284 -32 -8 ) ( -284 32 -8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -276 32 -8 ) ( -284 -32 -8 ) ( -284 32 -8 ) colors/grey25 0 0 0 1 1 0 0 0 ( -276 32 -8 ) ( -284 32 -8 ) ( -280 32 -16 ) common/caulk 0 0 0 1 1 0 0 0 ( -276 -32 -8 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 -32 -16 ) ( -280 32 -16 ) ( -280 -32 -16 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0 @@ -446,17 +446,17 @@ } // brush 39 { -( -328 -48 0 ) ( -328 -48 32 ) ( -264 -48 0 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -328 -48 0 ) ( -328 -48 32 ) ( -264 -48 0 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -328 -48 32 ) ( -328 -40 32 ) ( -264 -48 32 ) common/caulk 0 0 0 1 1 0 0 0 ( -328 -40 0 ) ( -328 -48 0 ) ( -264 -40 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -304 -40 32 ) ( -288 -40 0 ) ( -280 -48 0 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 40 { ( -328 -48 32 ) ( -328 -40 32 ) ( -264 -48 32 ) common/caulk 0 0 0 1 1 0 0 0 ( -328 -40 0 ) ( -328 -48 0 ) ( -264 -40 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -328 -40 32 ) ( -328 -40 0 ) ( -264 -40 32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -328 -40 32 ) ( -328 -40 0 ) ( -264 -40 32 ) colors/grey25 0 0 0 1 1 0 0 0 ( -280 -48 0 ) ( -288 -40 0 ) ( -304 -40 32 ) common/caulk 0 0 0 1 1 0 0 0 ( -328 -48 0 ) ( -328 -48 32 ) ( -264 -48 0 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0 ( -264 -40 64 ) ( -264 -16 -64 ) ( -264 -40 -64 ) common/caulk 0 0 0 1 1 0 0 0 @@ -465,17 +465,17 @@ { ( -264 48 32 ) ( -328 40 32 ) ( -328 48 32 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 40 0 ) ( -328 48 0 ) ( -328 40 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -264 40 32 ) ( -328 40 0 ) ( -328 40 32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0 +( -264 40 32 ) ( -328 40 0 ) ( -328 40 32 ) colors/grey25 0 0 0 1 1 0 0 0 ( -304 40 32 ) ( -288 40 0 ) ( -280 48 0 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 48 0 ) ( -328 48 32 ) ( -328 48 0 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0 ( -264 40 -64 ) ( -264 16 -64 ) ( -264 40 64 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 42 { -( -264 48 0 ) ( -328 48 32 ) ( -328 48 0 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -264 48 0 ) ( -328 48 32 ) ( -328 48 0 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -264 48 32 ) ( -328 40 32 ) ( -328 48 32 ) common/caulk 0 0 0 1 1 0 0 0 ( -264 40 0 ) ( -328 48 0 ) ( -328 40 0 ) common/caulk 0 0 0 1 1 0 0 0 -( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0 +( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0 ( -280 48 0 ) ( -288 40 0 ) ( -304 40 32 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 43 @@ -1321,7 +1321,7 @@ common/engine { patchDef2 { -colors/grey25_shiny +metals/steel ( 9 3 0 0 0 ) ( ( ( -238 72 -12 0 -0.5 ) ( -240 72 -8 0 -0.25 ) ( -240 72 -8 0 0 ) ) @@ -1340,7 +1340,7 @@ colors/grey25_shiny { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -176 72 -40 -1.5 1.125 ) ( -176 56 -40 -1.5 1.375 ) ( -176 56 -24 -1.5 1.375 ) ( -176 56 -8 -1.5 1.375 ) ( -176 72 -8 -1.5 1.125 ) ) @@ -1366,7 +1366,7 @@ common/engine { patchDef2 { -colors/grey75 +metals/steel ( 9 3 0 0 0 ) ( ( ( -216 72 -12 0 0 ) ( -216 72 -12 0 -0.25 ) ( -238 72 -12 0 -0.5 ) ) @@ -1385,7 +1385,7 @@ colors/grey75 { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -160 72 -8 0 0 ) ( -160 72 -8 0 -0.25 ) ( -144 72 -8 0 -0.5 ) ) @@ -1438,7 +1438,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -96 72 -8 -1.5 1.125 ) ( -96 56 -8 -1.5 1.375 ) ( -96 56 -24 -1.5 1.375 ) ( -96 56 -40 -1.5 1.375 ) ( -96 72 -40 -1.5 1.125 ) ) @@ -1451,7 +1451,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -240 72 -8 0 -0.5 ) ( -176 72 -8 0 -0.25 ) ( -176 72 -8 0 0 ) ) @@ -1470,7 +1470,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -160 72 -8 -1.5 1.125 ) ( -160 56 -8 -1.5 1.375 ) ( -160 56 -24 -1.5 1.375 ) ( -160 56 -40 -1.5 1.375 ) ( -160 72 -40 -1.5 1.125 ) ) @@ -1508,7 +1508,7 @@ colors/grey75 { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -144 72 -40 -1.5 1.125 ) ( -144 56 -40 -1.5 1.375 ) ( -144 56 -24 -1.5 1.375 ) ( -144 56 -8 -1.5 1.375 ) ( -144 72 -8 -1.5 1.125 ) ) @@ -1521,7 +1521,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -96 72 -8 0 0 ) ( -96 72 -8 0 -0.25 ) ( -47.9999961853 72 -8 0 -0.5 ) ) @@ -1540,7 +1540,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -48 72 -8 0 0 ) ( -48 72 -8 0 -0.25 ) ( -49.9999961853 72 -12 0 -0.5 ) ) @@ -1559,7 +1559,7 @@ colors/grey50 { patchDef2 { -colors/grey75 +metals/steel ( 9 3 0 0 0 ) ( ( ( -49.9999961853 72 -12 0 -0.5 ) ( -68 72 -12 0 -0.25 ) ( -68 72 -12 0 0 ) ) @@ -1606,7 +1606,7 @@ colors/black_bright { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -144 -72 -40 -1.5 1.125 ) ( -144 -88 -40 -1.5 1.375 ) ( -144 -88 -24 -1.5 1.375 ) ( -144 -88 -8 -1.5 1.375 ) ( -144 -72 -8 -1.5 1.125 ) ) @@ -1619,7 +1619,7 @@ colors/grey50 { patchDef2 { -colors/grey75 +metals/steel ( 9 3 0 0 0 ) ( ( ( -216 -72 -12 0 0 ) ( -216 -72 -12 0 -0.25 ) ( -238 -72 -12 0 -0.5 ) ) @@ -1638,7 +1638,7 @@ colors/grey75 { patchDef2 { -colors/grey25_shiny +metals/steel ( 9 3 0 0 0 ) ( ( ( -238 -72 -12 0 -0.5 ) ( -240 -72 -8 0 -0.25 ) ( -240 -72 -8 0 0 ) ) @@ -1657,7 +1657,7 @@ colors/grey25_shiny { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -48 -72 -8 0 0 ) ( -48 -72 -8 0 -0.25 ) ( -49.9999961853 -72 -12 0 -0.5 ) ) @@ -1689,7 +1689,7 @@ common/engine { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -160 -72 -8 -1.5 1.125 ) ( -160 -88 -8 -1.5 1.375 ) ( -160 -88 -24 -1.5 1.375 ) ( -160 -88 -40 -1.5 1.375 ) ( -160 -72 -40 -1.5 1.125 ) ) @@ -1702,7 +1702,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -176 -72 -40 -1.5 1.125 ) ( -176 -88 -40 -1.5 1.375 ) ( -176 -88 -24 -1.5 1.375 ) ( -176 -88 -8 -1.5 1.375 ) ( -176 -72 -8 -1.5 1.125 ) ) @@ -1734,7 +1734,7 @@ common/engine { patchDef2 { -colors/grey75 +metals/steel ( 9 3 0 0 0 ) ( ( ( -49.9999961853 -72 -12 0 -0.5 ) ( -68 -72 -12 0 -0.25 ) ( -68 -72 -12 0 0 ) ) @@ -1770,7 +1770,7 @@ colors/grey75 { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -96 -72 -8 0 0 ) ( -96 -72 -8 0 -0.25 ) ( -47.9999961853 -72 -8 0 -0.5 ) ) @@ -1789,7 +1789,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -160 -72 -8 0 0 ) ( -160 -72 -8 0 -0.25 ) ( -144 -72 -8 0 -0.5 ) ) @@ -1808,7 +1808,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 3 5 0 0 0 ) ( ( ( -96 -72 -8 -1.5 1.125 ) ( -96 -88 -8 -1.5 1.375 ) ( -96 -88 -24 -1.5 1.375 ) ( -96 -88 -40 -1.5 1.375 ) ( -96 -72 -40 -1.5 1.125 ) ) @@ -1821,7 +1821,7 @@ colors/grey50 { patchDef2 { -colors/grey50 +metals/steel ( 9 3 0 0 0 ) ( ( ( -240 -72 -8 0 -0.5 ) ( -176 -72 -8 0 -0.25 ) ( -176 -72 -8 0 0 ) ) -- cgit v1.2.3