From 761c9015fed782780c93886cea043993f8989145 Mon Sep 17 00:00:00 2001 From: Evan Goers Date: Sat, 21 Jan 2012 10:33:26 +0000 Subject: Gave current decals nicer qer_editorimages. Added missing supertanker_rib*. --- base/maps/colonial/sections/lancer_cannon.map | 2 +- base/maps/colonial/sections/tiger_cannon.map | 2 +- base/maps/lindblade/sections/supertanker_rib.map | 145 ++++++++++++++++ .../lindblade/sections/supertanker_rib_middle.map | 186 +++++++++++++++++++++ .../mercenary/sections/archer_wing_connector.map | 4 +- base/maps/mercenary/sections/talon_cannon.map | 2 +- base/maps/miners/sections/defender_wing.map | 4 +- base/maps/pirate/juggernaut.map | 4 +- base/maps/pirate/raider.map | 12 +- base/maps/tsukhan/imp.map | 4 +- base/maps/tsukhan/inquisitor.map | 4 +- base/materials/detail.shader | 42 +++-- base/textures/detail/danger.png | Bin 5250 -> 3083 bytes base/textures/detail/danger_entity.png | Bin 25256 -> 0 bytes base/textures/detail/danger_entitysecond.png | Bin 30760 -> 0 bytes base/textures/detail/danger_trans.png | Bin 0 -> 2429 bytes base/textures/detail/line.png | Bin 195 -> 202 bytes base/textures/detail/line_trans.png | Bin 0 -> 195 bytes base/textures/detail/shark_512.png | Bin 25036 -> 31121 bytes base/textures/detail/shark_512_trans.png | Bin 0 -> 25036 bytes base/textures/detail/tigerstripe.png | Bin 34107 -> 45301 bytes base/textures/detail/tigerstripe_trans.png | Bin 0 -> 36066 bytes base/textures/detail/warn_16.png | Bin 228 -> 255 bytes base/textures/detail/warn_16_trans.png | Bin 0 -> 228 bytes 24 files changed, 376 insertions(+), 35 deletions(-) create mode 100644 base/maps/lindblade/sections/supertanker_rib.map create mode 100644 base/maps/lindblade/sections/supertanker_rib_middle.map delete mode 100644 base/textures/detail/danger_entity.png delete mode 100644 base/textures/detail/danger_entitysecond.png create mode 100644 base/textures/detail/danger_trans.png create mode 100644 base/textures/detail/line_trans.png create mode 100644 base/textures/detail/shark_512_trans.png create mode 100644 base/textures/detail/tigerstripe_trans.png create mode 100644 base/textures/detail/warn_16_trans.png diff --git a/base/maps/colonial/sections/lancer_cannon.map b/base/maps/colonial/sections/lancer_cannon.map index d60b2c3..8a51c30 100644 --- a/base/maps/colonial/sections/lancer_cannon.map +++ b/base/maps/colonial/sections/lancer_cannon.map @@ -235,7 +235,7 @@ { patchDef2 { -detail/gatling +detail/gatling_decal ( 3 3 0 0 0 ) ( ( ( 4 -4 -4 0 0 ) ( 4 -4 -4 0 -0.4999999404 ) ( 6 -4 4 0 -0.9999998808 ) ) diff --git a/base/maps/colonial/sections/tiger_cannon.map b/base/maps/colonial/sections/tiger_cannon.map index 0c98eba..1475a27 100644 --- a/base/maps/colonial/sections/tiger_cannon.map +++ b/base/maps/colonial/sections/tiger_cannon.map @@ -59,7 +59,7 @@ { patchDef2 { -detail/gatling +detail/gatling_decal ( 3 3 0 0 0 ) ( ( ( 4 -8 -8 0 0 ) ( 4 -8 0 0 -0.4999999404 ) ( 4 -8 8 0 -0.9999998808 ) ) diff --git a/base/maps/lindblade/sections/supertanker_rib.map b/base/maps/lindblade/sections/supertanker_rib.map new file mode 100644 index 0000000..0e85e5e --- /dev/null +++ b/base/maps/lindblade/sections/supertanker_rib.map @@ -0,0 +1,145 @@ + +// entity 0 +{ +"classname" "worldspawn" +"enginecolor" "0.5 0.8 1" +// brush 0 +{ +( 16 -288 64 ) ( 12 -288 156 ) ( 16 -288 160 ) colors/grey50 32 32 0 1 1 0 0 0 +( 32 -128 -16 ) ( 32 -272 160 ) ( 32 -128 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( 16 -288 64 ) ( 16 -288 160 ) ( 32 -272 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( 32 -128 160 ) ( 16 -288 160 ) ( 16 -128 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 12 -192 -32 ) ( 12 -128 156 ) ( 12 -288 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( -16 -288 64 ) ( 16 -192 -32 ) ( -16 -192 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( 16 -288 64 ) ( 32 -176 -32 ) ( 16 -192 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( 32 -128 -28 ) ( 16 -128 160 ) ( 12 -128 156 ) common/caulk 32 32 0 1 1 0 0 0 +( 32 192 -32 ) ( -32 192 -32 ) ( 32 0 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( 16 352 -32 ) ( 32 352 -16 ) ( 16 480 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( 12 -128 156 ) ( 16 -128 160 ) ( 16 -288 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 1 +{ +( 12 -128 -24 ) ( 12 -128 156 ) ( -12 -128 156 ) common/caulk 32 32 0 1 1 0 0 0 +( 12 -192 -24 ) ( 12 -280 156 ) ( 12 -128 156 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -12 -128 -24 ) ( -12 -128 156 ) ( -12 -280 156 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 12 -280 64 ) ( -12 -280 156 ) ( 12 -280 156 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -64 -128 -24 ) ( -64 -152 -24 ) ( 64 -128 -24 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -64 -192 -24 ) ( -64 -200 -16 ) ( 64 -192 -24 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -12 -280 156 ) ( 12 -128 156 ) ( 12 -280 156 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 2 +{ +( -32 -192 -16 ) ( -32 -128 160 ) ( -32 -272 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( -16 -288 64 ) ( 16 -192 -32 ) ( -16 -192 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( -16 -288 64 ) ( -16 -192 -32 ) ( -32 -176 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( -12 -128 -32 ) ( -12 -288 156 ) ( -12 -128 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( -32 -128 -28 ) ( -12 -128 156 ) ( -16 -128 160 ) common/caulk 32 32 0 1 1 0 0 0 +( -32 -272 160 ) ( -16 -128 160 ) ( -16 -288 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -16 -288 64 ) ( -16 -288 160 ) ( -12 -288 156 ) colors/grey50 32 32 0 1 1 0 0 0 +( -16 -288 64 ) ( -32 -272 160 ) ( -16 -288 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( 32 192 -32 ) ( -32 192 -32 ) ( 32 0 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( -32 352 -16 ) ( -16 352 -32 ) ( -32 480 -16 ) colors/grey25 32 0 0 1 1 0 0 0 +( -12 -288 156 ) ( -16 -288 160 ) ( -16 -128 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 3 +{ +( 32 272 160 ) ( 16 128 160 ) ( 16 288 160 ) common/caulk 32 0 0 1 1 0 0 0 +( 32 128 -16 ) ( 32 128 160 ) ( 32 272 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( 32 128 -28 ) ( 12 128 156 ) ( 16 128 160 ) common/caulk 32 40 0 1 1 0 0 0 +( 12 128 -32 ) ( 12 288 156 ) ( 12 128 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( 32 192 -32 ) ( -32 192 -32 ) ( 32 0 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( 16 352 -32 ) ( 32 352 -16 ) ( 16 480 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( 16 288 64 ) ( 16 288 160 ) ( 12 288 156 ) colors/grey50 32 32 0 1 1 0 0 0 +( 32 272 64 ) ( 32 272 160 ) ( 16 288 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( 16 288 64 ) ( -16 192 -32 ) ( 16 192 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( 16 288 64 ) ( 16 192 -32 ) ( 32 176 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( 12 288 156 ) ( 16 288 160 ) ( 16 128 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 4 +{ +( 12 286 -64 ) ( 12 280 -64 ) ( 12 286 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -12 284 64 ) ( -12 280 -64 ) ( -12 284 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -160 128 68 ) ( -160 128 132 ) ( -32 128 68 ) common/caulk 32 36 0 1 1 0 0 0 +( -64 192 -24 ) ( -64 176 -24 ) ( 64 192 -24 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -64 200 -16 ) ( -64 192 -24 ) ( 64 200 -16 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -64 280 76 ) ( -64 280 60 ) ( 64 280 76 ) colors/grey25 0 56 0 0.5 0.5 0 0 0 +( -8 64 156 ) ( 4 64 156 ) ( -8 -64 156 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 5 +{ +( -32 128 160 ) ( -16 288 160 ) ( -16 128 160 ) common/caulk 32 0 0 1 1 0 0 0 +( -16 288 64 ) ( -12 288 156 ) ( -16 288 160 ) colors/grey50 32 32 0 1 1 0 0 0 +( -32 128 -16 ) ( -32 272 160 ) ( -32 128 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( -32 272 64 ) ( -16 288 160 ) ( -32 272 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( -12 128 -32 ) ( -12 128 156 ) ( -12 288 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( -32 128 -28 ) ( -16 128 160 ) ( -12 128 156 ) common/caulk 32 40 0 1 1 0 0 0 +( 16 288 64 ) ( -16 192 -32 ) ( 16 192 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( -16 288 64 ) ( -32 176 -32 ) ( -16 192 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( 32 192 -32 ) ( -32 192 -32 ) ( 32 0 -32 ) colors/grey50 32 0 0 1 1 0 0 0 +( -32 352 -16 ) ( -16 352 -32 ) ( -32 480 -16 ) colors/grey25 32 0 0 1 1 0 0 0 +( -12 288 156 ) ( -16 128 160 ) ( -16 288 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 6 +{ +( 16 -128 -32 ) ( 16 -64 -48 ) ( -16 -64 -48 ) colors/grey50 32 0 0 1 1 0 0 0 +( 32 64 -32 ) ( 32 -128 160 ) ( 32 128 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( 32 -128 -16 ) ( 32 -64 -32 ) ( 16 -64 -48 ) colors/grey25 32 0 0 1 1 0 0 0 +( 16 -128 -44 ) ( 12 -128 156 ) ( 16 -128 160 ) common/caulk 32 32 0 1 1 0 0 0 +( 12 64 -48 ) ( 12 128 156 ) ( 12 -128 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( 16 64 -48 ) ( -16 -64 -48 ) ( 16 -64 -48 ) colors/grey50 32 0 0 1 1 0 0 0 +( 32 -64 -32 ) ( 16 64 -48 ) ( 16 -64 -48 ) colors/grey25 32 0 0 1 1 0 0 0 +( 16 128 -32 ) ( -16 64 -48 ) ( 16 64 -48 ) colors/grey50 32 0 0 1 1 0 0 0 +( 32 128 -16 ) ( 16 64 -48 ) ( 32 64 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( 16 128 -44 ) ( 16 128 160 ) ( 12 128 156 ) common/caulk 32 32 0 1 1 0 0 0 +( 32 128 160 ) ( 16 -128 160 ) ( 16 128 160 ) common/caulk 32 8 0 1 1 0 0 0 +( 12 -128 156 ) ( 16 128 160 ) ( 16 -128 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 7 +{ +( 16 -128 -32 ) ( 16 -64 -48 ) ( -16 -64 -48 ) colors/grey50 32 0 0 1 1 0 0 0 +( -32 -64 -32 ) ( -32 128 160 ) ( -32 -128 160 ) colors/grey25 0 32 0 1 1 0 0 0 +( -32 -128 -16 ) ( -16 -64 -48 ) ( -32 -64 -32 ) colors/grey25 32 0 0 1 1 0 0 0 +( -16 -128 -44 ) ( -16 -128 160 ) ( -12 -128 156 ) common/caulk 32 32 0 1 1 0 0 0 +( -12 -64 -48 ) ( -12 -128 156 ) ( -12 128 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( 16 128 -32 ) ( -16 64 -48 ) ( 16 64 -48 ) colors/grey50 32 0 0 1 1 0 0 0 +( -32 128 -16 ) ( -32 64 -32 ) ( -16 64 -48 ) colors/grey25 32 0 0 1 1 0 0 0 +( -32 128 -28 ) ( -12 128 156 ) ( -16 128 160 ) common/caulk 32 32 0 1 1 0 0 0 +( -32 -128 160 ) ( -16 128 160 ) ( -16 -128 160 ) common/caulk 32 8 0 1 1 0 0 0 +( 16 64 -48 ) ( -16 -64 -48 ) ( 16 -64 -48 ) colors/grey50 32 0 0 1 1 0 0 0 +( -32 -64 -32 ) ( -16 -64 -48 ) ( -16 64 -48 ) colors/grey25 32 0 0 1 1 0 0 0 +( -12 -128 156 ) ( -16 -128 160 ) ( -16 128 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 8 +{ +( 12 -64 -40 ) ( 12 -128 156 ) ( 12 128 156 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -12 64 -40 ) ( -12 128 156 ) ( -12 -128 156 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 16 64 -40 ) ( -16 -64 -40 ) ( 16 -64 -40 ) colors/grey25 32 0 0 1 1 0 0 0 +( 12 -128 -24 ) ( -12 -128 156 ) ( 12 -128 156 ) common/caulk 32 32 0 1 1 0 0 0 +( 16 -128 -24 ) ( 16 -64 -40 ) ( -16 -64 -40 ) colors/grey25 32 0 0 1 1 0 0 0 +( 12 128 -24 ) ( 12 128 156 ) ( -12 128 156 ) common/caulk 32 28 0 1 1 0 0 0 +( 16 128 -24 ) ( -16 64 -40 ) ( 16 64 -40 ) colors/grey25 32 0 0 1 1 0 0 0 +( -12 128 156 ) ( 12 128 156 ) ( 12 -128 156 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 9 +{ +( -16 -288 160 ) ( 16 288 160 ) ( 16 -288 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -16 288 160 ) ( 12 288 156 ) ( 16 288 160 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( -12 -288 156 ) ( 12 -288 156 ) ( 12 288 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( -16 -288 160 ) ( 16 -288 160 ) ( 12 -288 156 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( -12 288 156 ) ( -16 288 160 ) ( -16 -288 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 12 -288 156 ) ( 16 -288 160 ) ( 16 288 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 10 +{ +( 4 288 176 ) ( 4 128 176 ) ( -32 288 176 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 4 288 176 ) ( -32 288 176 ) ( 4 288 172 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 32 288 176 ) ( 32 288 172 ) ( 32 128 176 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -32 128 160 ) ( 4 128 160 ) ( -32 288 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -32 -288 168 ) ( -32 -288 172 ) ( 4 -288 168 ) colors/grey25 0 56 0 0.5 0.5 0 0 0 +( -32 128 172 ) ( -32 288 172 ) ( -32 128 176 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 16 288 -64 ) ( 20 284 -64 ) ( 16 288 64 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -32 272 -64 ) ( -28 276 -64 ) ( -32 272 64 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 32 -272 -64 ) ( 28 -276 -64 ) ( 32 -272 64 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -16 -288 -64 ) ( -20 -284 -64 ) ( -16 -288 64 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +} +} diff --git a/base/maps/lindblade/sections/supertanker_rib_middle.map b/base/maps/lindblade/sections/supertanker_rib_middle.map new file mode 100644 index 0000000..48c3bdc --- /dev/null +++ b/base/maps/lindblade/sections/supertanker_rib_middle.map @@ -0,0 +1,186 @@ + +// entity 0 +{ +"classname" "worldspawn" +"enginecolor" "0.5 0.8 1" +// brush 0 +{ +( 128 96 0 ) ( 128 -96 0 ) ( -128 96 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 128 96 160 ) ( -128 96 160 ) ( 128 96 -32 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 128 96 160 ) ( 128 96 -32 ) ( 128 -96 160 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( -128 -96 -16 ) ( 128 -96 -16 ) ( -128 96 -16 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -128 -96 -32 ) ( -128 -96 160 ) ( 128 -96 -32 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( -128 -96 -32 ) ( -128 96 -32 ) ( -128 -96 160 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 640 96 -8 ) ( 640 64 -16 ) ( 768 96 -8 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 640 -64 -16 ) ( 640 -96 -8 ) ( 768 -64 -16 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +} +// brush 1 +{ +( -240 -128 0 ) ( 16 -96 0 ) ( 16 -128 0 ) common/caulk 32 0 0 0.5 -0.5 0 0 0 +( 16 -96 0 ) ( 16 -128 -8 ) ( 16 -128 0 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( 16 -96 -8 ) ( -240 -96 0 ) ( -240 -96 -8 ) common/caulk 32 -0 0 0.5 0.5 0 0 0 +( 656 -128 0 ) ( 528 -96 -8 ) ( 528 -128 0 ) colors/grey25 32 0 0 0.5 -0.5 0 0 0 +( -16 -96 480 ) ( -16 -128 352 ) ( -16 -96 352 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( 656 -112 0 ) ( 528 -112 -4 ) ( 528 -112 0 ) colors/grey25 32 -0 0 0.5 0.5 0 0 0 +} +// brush 2 +{ +( -128 -128 0 ) ( 128 -96 0 ) ( 128 -128 0 ) common/caulk 0 0 0 0.5 -0.5 0 0 0 +( 128 -96 0 ) ( 128 -128 -8 ) ( 128 -128 0 ) common/caulk 0 -0 0 -0.5 0.5 0 0 0 +( 128 -96 -8 ) ( -128 -96 0 ) ( -128 -96 -8 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 768 -128 0 ) ( 640 -96 -8 ) ( 640 -128 0 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( 96 -96 480 ) ( 96 -128 352 ) ( 96 -96 352 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( 768 -112 0 ) ( 640 -112 -4 ) ( 640 -112 0 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +} +// brush 3 +{ +( -352 -128 0 ) ( -96 -96 0 ) ( -96 -128 0 ) common/caulk 0 0 0 0.5 -0.5 0 0 0 +( -96 -96 0 ) ( -96 -128 -8 ) ( -96 -128 0 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( -96 -96 -8 ) ( -352 -96 0 ) ( -352 -96 -8 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 544 -128 0 ) ( 416 -96 -8 ) ( 416 -128 0 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( -128 -96 480 ) ( -128 -128 352 ) ( -128 -96 352 ) common/caulk 0 -0 0 -0.5 0.5 0 0 0 +( 544 -112 0 ) ( 416 -112 -4 ) ( 416 -112 0 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +} +// brush 4 +{ +( 104 -56 -4 ) ( 104 -104 -20 ) ( 104 -104 -4 ) common/caulk 16 -0 0 -0.5 0.5 0 0 0 +( -112 -112 -18 ) ( -80 -64 -18 ) ( -112 -64 -18 ) colors/grey50 32 0 0 0.5 -0.5 0 0 0 +( -104 -64 -4 ) ( -104 -112 -20 ) ( -104 -64 -20 ) common/caulk 0 -0 0 -0.5 0.5 0 0 0 +( 560 -56 -18 ) ( 432 -40 -14 ) ( 432 -56 -18 ) colors/grey50 32 0 0 0.5 -0.5 0 0 0 +( 560 -112 -6 ) ( 432 -96 -10 ) ( 432 -112 -6 ) colors/grey50 32 0 0 0.5 -0.5 0 0 0 +( 768 -48 -16 ) ( 640 -48 -13 ) ( 640 -48 -16 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 768 -88 -8 ) ( 640 -88 -11 ) ( 640 -88 -8 ) colors/grey50 0 -0 0 0.5 0.5 0 0 0 +( 768 -84 -10 ) ( 640 -85 -10 ) ( 640 -84 -10 ) common/caulk 0 0 0 0.5 -0.5 0 0 0 +} +// brush 5 +{ +( 120 -64 -4 ) ( 120 -112 -20 ) ( 120 -112 -4 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( 96 -112 -20 ) ( 128 -64 -20 ) ( 96 -64 -20 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( 128 -40 -20 ) ( 96 -40 -4 ) ( 96 -40 -20 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 104 -64 -4 ) ( 104 -112 -20 ) ( 104 -64 -20 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( 768 -56 -20 ) ( 640 -40 -16 ) ( 640 -56 -20 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( 768 -112 -8 ) ( 640 -96 -12 ) ( 640 -112 -8 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( 768 -96 -4 ) ( 640 -96 -12 ) ( 640 -96 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 768 -56 -8 ) ( 640 -72 -8 ) ( 640 -56 -8 ) common/caulk 0 0 0 0.5 -0.5 0 0 0 +} +// brush 6 +{ +( 8 -64 -4 ) ( 8 -112 -20 ) ( 8 -112 -4 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( -16 -112 -20 ) ( 16 -64 -20 ) ( -16 -64 -20 ) colors/grey25 32 0 0 0.5 -0.5 0 0 0 +( 16 -40 -20 ) ( -16 -40 -4 ) ( -16 -40 -20 ) common/caulk 32 -0 0 0.5 0.5 0 0 0 +( -8 -64 -4 ) ( -8 -112 -20 ) ( -8 -64 -20 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( 656 -56 -20 ) ( 528 -40 -16 ) ( 528 -56 -20 ) colors/grey25 32 0 0 0.5 -0.5 0 0 0 +( 656 -112 -8 ) ( 528 -96 -12 ) ( 528 -112 -8 ) colors/grey25 32 0 0 0.5 -0.5 0 0 0 +( 656 -96 -4 ) ( 528 -96 -12 ) ( 528 -96 -4 ) colors/grey25 32 -0 0 0.5 0.5 0 0 0 +( 656 -56 -8 ) ( 528 -72 -8 ) ( 528 -56 -8 ) common/caulk 32 0 0 0.5 -0.5 0 0 0 +} +// brush 7 +{ +( -104 -64 -4 ) ( -104 -112 -20 ) ( -104 -112 -4 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( -128 -112 -20 ) ( -96 -64 -20 ) ( -128 -64 -20 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( -96 -40 -20 ) ( -128 -40 -4 ) ( -128 -40 -20 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( -120 -64 -4 ) ( -120 -112 -20 ) ( -120 -64 -20 ) colors/grey25 0 -0 0 -0.5 0.5 0 0 0 +( 544 -56 -20 ) ( 416 -40 -16 ) ( 416 -56 -20 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( 544 -112 -8 ) ( 416 -96 -12 ) ( 416 -112 -8 ) colors/grey25 0 0 0 0.5 -0.5 0 0 0 +( 544 -96 -4 ) ( 416 -96 -12 ) ( 416 -96 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 544 -56 -8 ) ( 416 -72 -8 ) ( 416 -56 -8 ) common/caulk 0 0 0 0.5 -0.5 0 0 0 +} +// brush 8 +{ +( 16 128 0 ) ( 16 96 0 ) ( -240 128 0 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +( 16 128 0 ) ( 16 128 -8 ) ( 16 96 0 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( -240 96 -8 ) ( -240 96 0 ) ( 16 96 -8 ) common/caulk 32 -0 0 0.5 0.5 0 0 0 +( 528 128 0 ) ( 528 96 -8 ) ( 656 128 0 ) colors/grey25 32 0 0 0.5 0.5 0 0 0 +( -16 96 352 ) ( -16 128 352 ) ( -16 96 480 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 528 112 0 ) ( 528 112 -4 ) ( 656 112 0 ) colors/grey25 32 -0 0 0.5 0.5 0 0 0 +} +// brush 9 +{ +( 104 104 -4 ) ( 104 104 -20 ) ( 104 56 -4 ) common/caulk 16 -0 0 0.5 0.5 0 0 0 +( -112 64 -18 ) ( -80 64 -18 ) ( -112 112 -18 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +( -104 64 -20 ) ( -104 112 -20 ) ( -104 64 -4 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 432 56 -18 ) ( 432 40 -14 ) ( 560 56 -18 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +( 432 112 -6 ) ( 432 96 -10 ) ( 560 112 -6 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +( 640 48 -16 ) ( 640 48 -13 ) ( 768 48 -16 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 640 88 -8 ) ( 640 88 -11 ) ( 768 88 -8 ) colors/grey50 0 -0 0 0.5 0.5 0 0 0 +( 640 84 -10 ) ( 640 85 -10 ) ( 768 84 -10 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 10 +{ +( 128 128 0 ) ( 128 96 0 ) ( -128 128 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 128 128 0 ) ( 128 128 -8 ) ( 128 96 0 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( -128 96 -8 ) ( -128 96 0 ) ( 128 96 -8 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 640 128 0 ) ( 640 96 -8 ) ( 768 128 0 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 96 96 352 ) ( 96 128 352 ) ( 96 96 480 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 640 112 0 ) ( 640 112 -4 ) ( 768 112 0 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +} +// brush 11 +{ +( -96 128 0 ) ( -96 96 0 ) ( -352 128 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -96 128 0 ) ( -96 128 -8 ) ( -96 96 0 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( -352 96 -8 ) ( -352 96 0 ) ( -96 96 -8 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 416 128 0 ) ( 416 96 -8 ) ( 544 128 0 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -128 96 352 ) ( -128 128 352 ) ( -128 96 480 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 416 112 0 ) ( 416 112 -4 ) ( 544 112 0 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +} +// brush 12 +{ +( 120 112 -4 ) ( 120 112 -20 ) ( 120 64 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 96 64 -20 ) ( 128 64 -20 ) ( 96 112 -20 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 96 40 -20 ) ( 96 40 -4 ) ( 128 40 -20 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( 104 64 -20 ) ( 104 112 -20 ) ( 104 64 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 640 56 -20 ) ( 640 40 -16 ) ( 768 56 -20 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 640 112 -8 ) ( 640 96 -12 ) ( 768 112 -8 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 640 96 -4 ) ( 640 96 -12 ) ( 768 96 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 640 56 -8 ) ( 640 72 -8 ) ( 768 56 -8 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 13 +{ +( 8 112 -4 ) ( 8 112 -20 ) ( 8 64 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( -16 64 -20 ) ( 16 64 -20 ) ( -16 112 -20 ) colors/grey25 32 0 0 0.5 0.5 0 0 0 +( -16 40 -20 ) ( -16 40 -4 ) ( 16 40 -20 ) common/caulk 32 -0 0 0.5 0.5 0 0 0 +( -8 64 -20 ) ( -8 112 -20 ) ( -8 64 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 528 56 -20 ) ( 528 40 -16 ) ( 656 56 -20 ) colors/grey25 32 0 0 0.5 0.5 0 0 0 +( 528 112 -8 ) ( 528 96 -12 ) ( 656 112 -8 ) colors/grey25 32 0 0 0.5 0.5 0 0 0 +( 528 96 -4 ) ( 528 96 -12 ) ( 656 96 -4 ) colors/grey25 32 -0 0 0.5 0.5 0 0 0 +( 528 56 -8 ) ( 528 72 -8 ) ( 656 56 -8 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +} +// brush 14 +{ +( -104 112 -4 ) ( -104 112 -20 ) ( -104 64 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( -128 64 -20 ) ( -96 64 -20 ) ( -128 112 -20 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( -128 40 -20 ) ( -128 40 -4 ) ( -96 40 -20 ) common/caulk 0 -0 0 0.5 0.5 0 0 0 +( -120 64 -20 ) ( -120 112 -20 ) ( -120 64 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 416 56 -20 ) ( 416 40 -16 ) ( 544 56 -20 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 416 112 -8 ) ( 416 96 -12 ) ( 544 112 -8 ) colors/grey25 0 0 0 0.5 0.5 0 0 0 +( 416 96 -4 ) ( 416 96 -12 ) ( 544 96 -4 ) colors/grey25 0 -0 0 0.5 0.5 0 0 0 +( 416 56 -8 ) ( 416 72 -8 ) ( 544 56 -8 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +} +// brush 15 +{ +( 528 -56 -16 ) ( 528 -48 -16 ) ( 656 -56 -16 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +( 528 -56 -20 ) ( 528 -40 -16 ) ( 656 -56 -20 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +( 528 40 -16 ) ( 528 56 -20 ) ( 656 40 -16 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +( 528 48 -18 ) ( 528 42 -18 ) ( 656 48 -18 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +( -108 64 -16 ) ( -110 64 -18 ) ( -108 -64 -16 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +( -114 64 -18 ) ( -116 64 -16 ) ( -114 -64 -18 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +} +// brush 16 +{ +( 640 -56 -16 ) ( 640 -48 -16 ) ( 768 -56 -16 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 640 -56 -20 ) ( 640 -40 -16 ) ( 768 -56 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 640 40 -16 ) ( 640 56 -20 ) ( 768 40 -16 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 640 48 -18 ) ( 640 42 -18 ) ( 768 48 -18 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( 4 64 -16 ) ( 2 64 -18 ) ( 4 -64 -16 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +( -2 64 -18 ) ( -4 64 -16 ) ( -2 -64 -18 ) colors/grey50 0 0 0 0.5 0.5 0 0 0 +} +// brush 17 +{ +( 752 -56 -16 ) ( 752 -48 -16 ) ( 880 -56 -16 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +( 752 -56 -20 ) ( 752 -40 -16 ) ( 880 -56 -20 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +( 752 40 -16 ) ( 752 56 -20 ) ( 880 40 -16 ) common/caulk 32 0 0 0.5 0.5 0 0 0 +( 752 48 -18 ) ( 752 42 -18 ) ( 880 48 -18 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +( 116 64 -16 ) ( 114 64 -18 ) ( 116 -64 -16 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +( 110 64 -18 ) ( 108 64 -16 ) ( 110 -64 -18 ) colors/grey50 32 0 0 0.5 0.5 0 0 0 +} +} diff --git a/base/maps/mercenary/sections/archer_wing_connector.map b/base/maps/mercenary/sections/archer_wing_connector.map index 09aedfd..b744f25 100644 --- a/base/maps/mercenary/sections/archer_wing_connector.map +++ b/base/maps/mercenary/sections/archer_wing_connector.map @@ -494,7 +494,7 @@ { patchDef2 { -detail/gatling +detail/gatling_decal ( 3 3 0 0 0 ) ( ( ( 30 2 -3 0 0 ) ( 30 2 -3 0 -0.4999999404 ) ( 30 2 3 0 -0.9999998808 ) ) @@ -507,7 +507,7 @@ detail/gatling { patchDef2 { -detail/gatling +detail/gatling_decal ( 3 3 0 0 0 ) ( ( ( 30 -8 -3 0 0 ) ( 30 -8 -3 0 -0.4999999404 ) ( 30 -8 3 0 -0.9999998808 ) ) diff --git a/base/maps/mercenary/sections/talon_cannon.map b/base/maps/mercenary/sections/talon_cannon.map index df96781..f281791 100644 --- a/base/maps/mercenary/sections/talon_cannon.map +++ b/base/maps/mercenary/sections/talon_cannon.map @@ -339,7 +339,7 @@ colors/grey50 { patchDef2 { -detail/gatling +detail/gatling_decal ( 3 3 0 0 0 ) ( ( ( 4 -5 -5 0 0 ) ( 4 -5 0 0 -0.4999999404 ) ( 4 -5 5 0 -0.9999998808 ) ) diff --git a/base/maps/miners/sections/defender_wing.map b/base/maps/miners/sections/defender_wing.map index 20cc197..dd025ff 100644 --- a/base/maps/miners/sections/defender_wing.map +++ b/base/maps/miners/sections/defender_wing.map @@ -520,7 +520,7 @@ colors/grey50 { patchDef2 { -detail/gatling +detail/gatling_decal ( 3 5 0 0 0 ) ( ( ( 58 0 23 3.5000004768 -2 ) ( 58 5 23 4 -2 ) ( 58 5 18 4 -1.5000001192 ) ( 58 5 13 4 -1 ) ( 58 0 13 3.5000004768 -1 ) ) @@ -533,7 +533,7 @@ detail/gatling { patchDef2 { -detail/gatling +detail/gatling_decal ( 3 5 0 0 0 ) ( ( ( 58 0 -13 3.5000004768 -2 ) ( 58 5 -13 4 -2 ) ( 58 5 -18 4 -1.5000001192 ) ( 58 5 -23 4 -1 ) ( 58 0 -23 3.5000004768 -1 ) ) diff --git a/base/maps/pirate/juggernaut.map b/base/maps/pirate/juggernaut.map index 356768d..068b4f0 100644 --- a/base/maps/pirate/juggernaut.map +++ b/base/maps/pirate/juggernaut.map @@ -4511,7 +4511,7 @@ kuroto/metal_03a_noborder { patchDef2 { -detail/tigerstripe_entity +detail/tigerstripe_decal_entity ( 5 5 0 0 0 ) ( ( ( 196 128 64 0.765625 -0.25 ) ( 196 128 64 0.765625 -0.25 ) ( 196 128 -64 0.765625 0.25 ) ( 196 128 -64 0.765625 0.25 ) ( 196 64 -192 0.765625 0.75 ) ) @@ -4526,7 +4526,7 @@ detail/tigerstripe_entity { patchDef2 { -detail/tigerstripe_entity +detail/tigerstripe_decal_entity ( 5 5 0 0 0 ) ( ( ( 196 -64 -192 0.765625 0.75 ) ( 196 -128 -64 0.765625 0.25 ) ( 196 -128 -64 0.765625 0.25 ) ( 196 -128 64 0.765625 -0.25 ) ( 196 -128 64 0.765625 -0.25 ) ) diff --git a/base/maps/pirate/raider.map b/base/maps/pirate/raider.map index 4e02e30..7950607 100644 --- a/base/maps/pirate/raider.map +++ b/base/maps/pirate/raider.map @@ -2449,7 +2449,7 @@ colors/grey50 { patchDef2 { -detail/tigerstripe_entity +detail/tigerstripe_decal_entity ( 5 7 0 0 0 ) ( ( ( 392 0 56 0 0 ) ( 392 0 56 0 0 ) ( 392 64 40 0 -0.5153881907 ) ( 392 64 40 0 -0.5153881907 ) ( 392 64 -40 0 -0.9216381907 ) ( 392 0 -56 0 -1.4370263815 ) ( 392 0 -56 0 -1.4370263815 ) ) @@ -2933,7 +2933,7 @@ detail/warn_16_decal_entity { patchDef2 { -detail/tigerstripe_entitysecond +detail/tigerstripe_decal_entitysecond ( 3 3 0 0 0 ) ( ( ( -64 128 -8 -0.25 0.03125 ) ( -64 128 -8 -0.25 0.03125 ) ( -64 128 -16 -0.25 0.0625 ) ) @@ -2955,7 +2955,7 @@ detail/tigerstripe_entitysecond { patchDef2 { -detail/tigerstripe_entitysecond +detail/tigerstripe_decal_entitysecond ( 3 3 0 0 0 ) ( ( ( 64 128 32 0.25 -0.125 ) ( 64 128 32 0.25 -0.125 ) ( 64 128 15 0.25 -0.05859375 ) ) @@ -2968,7 +2968,7 @@ detail/tigerstripe_entitysecond { patchDef2 { -detail/tigerstripe_entitysecond +detail/tigerstripe_decal_entitysecond ( 3 3 0 0 0 ) ( ( ( 2.000002861 128 32 0.0078125112 -0.125 ) ( 2.000002861 128 32 0.0078125112 -0.125 ) ( 2.000002861 128 0 0.0078125112 -0 ) ) @@ -2981,7 +2981,7 @@ detail/tigerstripe_entitysecond { patchDef2 { -detail/tigerstripe_entitysecond +detail/tigerstripe_decal_entitysecond ( 3 3 0 0 0 ) ( ( ( -24 128 32 -0.09375 -0.125 ) ( -24 128 32 -0.09375 -0.125 ) ( -24 128 -4 -0.09375 0.015625 ) ) @@ -3003,7 +3003,7 @@ detail/tigerstripe_entitysecond { patchDef2 { -detail/tigerstripe_entitysecond +detail/tigerstripe_decal_entitysecond ( 3 3 0 0 0 ) ( ( ( -64 128 32 -0.25 -0.125 ) ( -64 128 32 -0.25 -0.125 ) ( -64 128 16 -0.25 -0.0625 ) ) diff --git a/base/maps/tsukhan/imp.map b/base/maps/tsukhan/imp.map index 325aa56..52146f8 100644 --- a/base/maps/tsukhan/imp.map +++ b/base/maps/tsukhan/imp.map @@ -2509,7 +2509,7 @@ tsukhan/tsukhan_grey50 { ( 128 24 -32 ) ( 128 16 -32 ) ( 99 24 -32 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 ( 128 24 -32 ) ( 99 24 -32 ) ( 128 24 -40 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 -( 128 24 -32 ) ( 128 24 -40 ) ( 128 16 -32 ) detail/gatling 0 -0 0 0.125 0.125 0 0 0 +( 128 24 -32 ) ( 128 24 -40 ) ( 128 16 -32 ) detail/gatling_decal 0 -0 0 0.125 0.125 0 0 0 ( 99 16 -40 ) ( 128 16 -40 ) ( 99 24 -40 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 ( 99 16 -40 ) ( 99 16 -32 ) ( 128 16 -40 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 ( -56 24 -38 ) ( -56 23 -39 ) ( 72 24 -38 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 @@ -2544,7 +2544,7 @@ tsukhan/tsukhan_grey50 { ( 128 -16 -32 ) ( 128 -24 -32 ) ( 99 -16 -32 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 ( 128 -16 -32 ) ( 99 -16 -32 ) ( 128 -16 -40 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 -( 128 -16 -32 ) ( 128 -16 -40 ) ( 128 -24 -32 ) detail/gatling 0 -0 0 0.125 0.125 0 0 0 +( 128 -16 -32 ) ( 128 -16 -40 ) ( 128 -24 -32 ) detail/gatling_decal 0 -0 0 0.125 0.125 0 0 0 ( 99 -24 -40 ) ( 128 -24 -40 ) ( 99 -16 -40 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 ( 99 -24 -40 ) ( 99 -24 -32 ) ( 128 -24 -40 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 ( -56 -16 -38 ) ( -56 -17 -39 ) ( 72 -16 -38 ) tsukhan/tsukhan_grey50 0 0 0 0.5 0.5 0 0 0 diff --git a/base/maps/tsukhan/inquisitor.map b/base/maps/tsukhan/inquisitor.map index fdcd413..b9cc767 100644 --- a/base/maps/tsukhan/inquisitor.map +++ b/base/maps/tsukhan/inquisitor.map @@ -1796,7 +1796,7 @@ ( 104 116 64 ) ( 96 116 -64 ) ( 104 116 -64 ) common/caulk 0 0 0 1 1 0 0 0 ( -64 68 8 ) ( -64 72 8 ) ( 64 68 8 ) common/caulk 0 0 0 1 1 0 0 0 ( -64 92 -8 ) ( -64 88 -8 ) ( 64 92 -8 ) common/caulk 0 0 0 1 1 0 0 0 -( 112 68 64 ) ( 64 116 -64 ) ( 112 68 -64 ) detail/gatling 48 32 0 0.25 0.25 0 0 0 +( 112 68 64 ) ( 64 116 -64 ) ( 112 68 -64 ) detail/gatling_decal 48 32 0 0.25 0.25 0 0 0 } // brush 188 { @@ -3039,7 +3039,7 @@ tsukhan/tsukhan_grey50 ( 104 -116 -64 ) ( 96 -116 -64 ) ( 104 -116 64 ) common/caulk 0 0 0 1 1 0 0 0 ( 64 -68 8 ) ( -64 -72 8 ) ( -64 -68 8 ) common/caulk 0 0 0 1 1 0 0 0 ( 64 -92 -8 ) ( -64 -88 -8 ) ( -64 -92 -8 ) common/caulk 0 0 0 1 1 0 0 0 -( 112 -68 -64 ) ( 64 -116 -64 ) ( 112 -68 64 ) detail/gatling 16 32 0 0.25 0.25 0 0 0 +( 112 -68 -64 ) ( 64 -116 -64 ) ( 112 -68 64 ) detail/gatling_decal 16 32 0 0.25 0.25 0 0 0 ( 140 -68 64 ) ( 132 -68 -64 ) ( 140 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0 } // brush 292 diff --git a/base/materials/detail.shader b/base/materials/detail.shader index 7f19a93..c971c15 100644 --- a/base/materials/detail.shader +++ b/base/materials/detail.shader @@ -17,7 +17,7 @@ textures/detail/warn_16_entitysecond textures/detail/warn_16_decal_entity { qer_editorimage textures/detail/warn_16 - texture textures/detail/warn_16 + texture textures/detail/warn_16_trans color 1.00 1.00 1.00 entity decal @@ -26,25 +26,25 @@ textures/detail/warn_16_decal_entity textures/detail/warn_16_decal_entitysecond { qer_editorimage textures/detail/warn_16 - texture textures/detail/warn_16 + texture textures/detail/warn_16_trans color 1.00 1.00 1.00 entitySecond decal } -textures/detail/tigerstripe_entity +textures/detail/tigerstripe_decal_entity { qer_editorimage textures/detail/tigerstripe - texture textures/detail/tigerstripe + texture textures/detail/tigerstripe_trans color 1.00 1.00 1.00 entity decal } -textures/detail/tigerstripe_entitysecond +textures/detail/tigerstripe_decal_entitysecond { qer_editorimage textures/detail/tigerstripe - texture textures/detail/tigerstripe + texture textures/detail/tigerstripe_trans color 1.00 1.00 1.00 entitySecond decal @@ -74,23 +74,33 @@ textures/detail/dockingbay_orange_light bright } -textures/detail/danger_entity +textures/detail/danger_decal { - qer_editorimage textures/detail/danger_entity - texture textures/detail/danger + qer_editorimage textures/detail/danger + texture textures/detail/danger_trans + color 1.00 1.00 1.00 + decal +} + +textures/detail/danger_decal_entity +{ + qer_editorimage textures/detail/danger + texture textures/detail/danger_trans color 1.00 1.00 1.00 entity + decal } -textures/detail/danger_entitysecond +textures/detail/danger_decal_entitysecond { - qer_editorimage textures/detail/danger_entitysecond - texture textures/detail/danger + qer_editorimage textures/detail/danger + texture textures/detail/danger_trans color 1.00 1.00 1.00 entitySecond + decal } -textures/detail/gatling +textures/detail/gatling_decal { qer_editorimage textures/detail/gatling texture textures/detail/gatling_trans @@ -99,10 +109,10 @@ textures/detail/gatling decal } -textures/detail/shark_512 +textures/detail/shark_512_decal { qer_editorimage textures/detail/shark_512 - texture textures/detail/shark_512 + texture textures/detail/shark_512_trans color 1.00 1.00 1.00 decal } @@ -110,7 +120,7 @@ textures/detail/shark_512 textures/detail/line { qer_editorimage textures/detail/line - texture textures/detail/line + texture textures/detail/line_trans color 1.00 1.00 1.00 bright decal diff --git a/base/textures/detail/danger.png b/base/textures/detail/danger.png index dd948d6..caa9a1d 100644 Binary files a/base/textures/detail/danger.png and b/base/textures/detail/danger.png differ diff --git a/base/textures/detail/danger_entity.png b/base/textures/detail/danger_entity.png deleted file mode 100644 index d4b2754..0000000 Binary files a/base/textures/detail/danger_entity.png and /dev/null differ diff --git a/base/textures/detail/danger_entitysecond.png b/base/textures/detail/danger_entitysecond.png deleted file mode 100644 index a24e456..0000000 Binary files a/base/textures/detail/danger_entitysecond.png and /dev/null differ diff --git a/base/textures/detail/danger_trans.png b/base/textures/detail/danger_trans.png new file mode 100644 index 0000000..2360fdd Binary files /dev/null and b/base/textures/detail/danger_trans.png differ diff --git a/base/textures/detail/line.png b/base/textures/detail/line.png index 4bf0283..0aa9dcd 100644 Binary files a/base/textures/detail/line.png and b/base/textures/detail/line.png differ diff --git a/base/textures/detail/line_trans.png b/base/textures/detail/line_trans.png new file mode 100644 index 0000000..100e131 Binary files /dev/null and b/base/textures/detail/line_trans.png differ diff --git a/base/textures/detail/shark_512.png b/base/textures/detail/shark_512.png index 3328bc5..43c3bcc 100644 Binary files a/base/textures/detail/shark_512.png and b/base/textures/detail/shark_512.png differ diff --git a/base/textures/detail/shark_512_trans.png b/base/textures/detail/shark_512_trans.png new file mode 100644 index 0000000..becb7d4 Binary files /dev/null and b/base/textures/detail/shark_512_trans.png differ diff --git a/base/textures/detail/tigerstripe.png b/base/textures/detail/tigerstripe.png index 9bda8ad..08caf89 100644 Binary files a/base/textures/detail/tigerstripe.png and b/base/textures/detail/tigerstripe.png differ diff --git a/base/textures/detail/tigerstripe_trans.png b/base/textures/detail/tigerstripe_trans.png new file mode 100644 index 0000000..ad7b202 Binary files /dev/null and b/base/textures/detail/tigerstripe_trans.png differ diff --git a/base/textures/detail/warn_16.png b/base/textures/detail/warn_16.png index 713f61a..e29a824 100644 Binary files a/base/textures/detail/warn_16.png and b/base/textures/detail/warn_16.png differ diff --git a/base/textures/detail/warn_16_trans.png b/base/textures/detail/warn_16_trans.png new file mode 100644 index 0000000..51f268f Binary files /dev/null and b/base/textures/detail/warn_16_trans.png differ -- cgit v1.2.3