diff options
Diffstat (limited to 'base')
-rw-r--r-- | base/maps/merchant/matrix.map | 44 | ||||
-rw-r--r-- | base/maps/merchant/scalar.map | 106 | ||||
-rw-r--r-- | base/maps/merchant/vector.map | 40 |
3 files changed, 121 insertions, 69 deletions
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map index 83294c5..29a1233 100644 --- a/base/maps/merchant/matrix.map +++ b/base/maps/merchant/matrix.map @@ -4264,17 +4264,18 @@ colors/grey25_shiny // entity 13 { "classname" "light" -"origin" "-96.000000 0.000000 136.000000" -"light" "20" -"spawnflags" "1" -"time" ".2" -"offset" ".7" +"origin" "192.000000 0.000000 136.000000" +"light" "8" +"spawnflags" "9" +"time" ".1" +"offset" ".25" +"frequency" ".5" } // entity 14 { "classname" "light" "origin" "608.000000 0.000000 72.000000" -"light" "20" +"light" "8" "spawnflags" "1" "time" ".2" } @@ -4282,7 +4283,7 @@ colors/grey25_shiny { "classname" "light" "origin" "448.000000 0.000000 88.000000" -"light" "20" +"light" "8" "spawnflags" "1" "time" ".2" "offset" ".4" @@ -5928,3 +5929,32 @@ colors/grey25_shiny "classname" "location_cannon" "origin" "480.000000 -200.000000 0.000000" } +// entity 45 +{ +"classname" "light" +"origin" "-96.000000 0.000000 136.000000" +"light" "8" +"spawnflags" "1" +"time" ".2" +"offset" ".7" +} +// entity 46 +{ +"classname" "light" +"origin" "-192.000000 0.000000 136.000000" +"light" "8" +"spawnflags" "9" +"time" ".1" +"offset" "1.25" +"frequency" ".5" +} +// entity 47 +{ +"classname" "light" +"origin" "0.000000 0.000000 136.000000" +"light" "8" +"spawnflags" "9" +"time" ".1" +"offset" ".75" +"frequency" ".5" +} diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map index a9bb892..b39a82b 100644 --- a/base/maps/merchant/scalar.map +++ b/base/maps/merchant/scalar.map @@ -1578,7 +1578,7 @@ colors/grey75 { patchDef2 { -colors/white_bright +colors/black_bright ( 3 5 0 0 0 ) ( ( ( -66 72 -8 -1.125 0.125 ) ( -66 88 -8 -0.875 0.125 ) ( -74 88 -24 -0.875 0.375 ) ( -82 88 -40 -0.875 0.625 ) ( -82 72 -40 -1.125 0.625 ) ) @@ -1840,7 +1840,7 @@ colors/grey50 { patchDef2 { -colors/white_bright +colors/black_bright ( 3 5 0 0 0 ) ( ( ( -66 -72 -8 -1.125 0.125 ) ( -66 -56 -8 -0.875 0.125 ) ( -74 -56 -24 -0.875 0.375 ) ( -82 -56 -40 -0.875 0.625 ) ( -82 -72 -40 -1.125 0.625 ) ) @@ -1954,20 +1954,13 @@ colors/grey75 } // entity 3 { -"classname" "light" -"origin" "-64.000000 -72.000000 -24.000000" -"light" "16" -"flare" "4" -} -// entity 4 -{ "classname" "fx_particles" "origin" "-216.000000 -72.000000 -24.000000" "angle" "180.000000" "script" "engine_exhaust" "scale" "0.5" } -// entity 5 +// entity 4 { "classname" "fx_particles" "origin" "-272.000000 0.000000 16.000000" @@ -1975,7 +1968,7 @@ colors/grey75 "script" "engine_exhaust" "scale" "1.5" } -// entity 6 +// entity 5 { "classname" "fx_particles" "origin" "-216.000000 72.000000 -24.000000" @@ -1983,163 +1976,170 @@ colors/grey75 "script" "engine_exhaust" "scale" "0.5" } -// entity 7 +// entity 6 { "classname" "light" -"origin" "104.000000 0.000000 -24.000000" -"light" "15" +"origin" "104.000000 0.000000 -18.000000" +"light" "4" "time" "0.1" "spawnflags" "1" "offset" "0.3" } -// entity 8 +// entity 7 { "classname" "light" -"origin" "0.000000 -66.000000 16.000000" -"light" "15" +"origin" "0.000000 -60.000000 16.000000" +"light" "4" "_color" "0 1 0" "spawnflags" "1" "time" "0.2" } -// entity 9 +// entity 8 { "classname" "light" -"origin" "0.000000 66.000000 16.000000" -"light" "15" +"origin" "0.000000 60.000000 16.000000" +"light" "4" "_color" "1 0 0" "spawnflags" "1" "offset" "0.5" "time" "0.2" } -// entity 10 +// entity 9 { "classname" "light" -"origin" "-176.000000 0.000000 -32.000000" -"light" "15" +"origin" "-176.000000 0.000000 -26.000000" +"light" "4" "time" "0.1" "spawnflags" "1" } -// entity 11 +// entity 10 { "classname" "light" -"origin" "0.000000 0.000000 56.000000" -"light" "15" +"origin" "0.000000 0.000000 54.000000" +"light" "4" "time" "0.1" "spawnflags" "1" "offset" "0.5" } -// entity 12 +// entity 11 { "classname" "light" -"origin" "-128.000000 0.000000 56.000000" -"light" "15" +"origin" "-128.000000 0.000000 54.000000" +"light" "4" "time" "0.1" "spawnflags" "1" "offset" "0.8" } -// entity 13 +// entity 12 { "classname" "light" -"origin" "-128.000000 -66.000000 16.000000" -"light" "15" +"origin" "-128.000000 -60.000000 16.000000" +"light" "4" "_color" "0 1 0" "spawnflags" "1" "time" "0.2" } -// entity 14 +// entity 13 { "classname" "light" -"origin" "-128.000000 66.000000 16.000000" -"light" "15" +"origin" "-128.000000 60.000000 16.000000" +"light" "4" "_color" "1 0 0" "spawnflags" "1" "offset" "0.5" "time" "0.2" } -// entity 15 +// entity 14 { "classname" "light" "origin" "-300.000000 -8.000000 16.000000" "light" "20" "spawnflags" "4" } -// entity 16 +// entity 15 { "classname" "light" "origin" "-292.000000 0.000000 16.000000" "light" "28" "spawnflags" "4" } -// entity 17 +// entity 16 { "classname" "light" "origin" "-272.000000 -16.000000 16.000000" "light" "36" "spawnflags" "4" } -// entity 18 +// entity 17 { "classname" "light" "origin" "-272.000000 16.000000 16.000000" "light" "36" "spawnflags" "4" } -// entity 19 +// entity 18 { "classname" "light" "origin" "-288.000000 -12.000000 16.000000" "light" "28" "spawnflags" "4" } -// entity 20 +// entity 19 { "classname" "light" "origin" "-288.000000 12.000000 16.000000" "light" "28" "spawnflags" "4" } -// entity 21 +// entity 20 { "classname" "light" "origin" "-300.000000 8.000000 16.000000" "light" "20" "spawnflags" "4" } -// entity 22 +// entity 21 { "classname" "light" "origin" "-308.000000 0.000000 16.000000" "light" "12" "spawnflags" "4" } -// entity 23 +// entity 22 { "classname" "light" "origin" "-224.000000 -72.000000 -24.000000" "light" "16" "spawnflags" "4" } -// entity 24 +// entity 23 { "classname" "light" "origin" "-224.000000 72.000000 -24.000000" "light" "16" "spawnflags" "4" } +// entity 24 +{ +"classname" "location_cannon" +"origin" "64.000000 72.000000 16.000000" +} // entity 25 { -"classname" "light" -"origin" "-64.000000 72.000000 -24.000000" -"light" "16" -"flare" "4" +"classname" "location_cannon" +"origin" "64.000000 -72.000000 16.000000" } // entity 26 { -"classname" "location_cannon" -"origin" "64.000000 72.000000 16.000000" +"classname" "fx_flare" +"origin" "-66.000000 -72.000000 -24.000000" +"spawnflags" "2" +"radius" "16" } // entity 27 { -"classname" "location_cannon" -"origin" "64.000000 -72.000000 16.000000" +"classname" "fx_flare" +"origin" "-66.000000 72.000000 -24.000000" +"spawnflags" "2" +"radius" "16" } diff --git a/base/maps/merchant/vector.map b/base/maps/merchant/vector.map index a74d12d..ed0cf6f 100644 --- a/base/maps/merchant/vector.map +++ b/base/maps/merchant/vector.map @@ -4030,7 +4030,7 @@ detail/warn_16_decal_entitysecond { "classname" "light" "origin" "152.000000 0.000000 0.000000" -"light" "8" +"light" "4" "time" "0.1" "spawnflags" "1" "offset" "0.3" @@ -4039,7 +4039,7 @@ detail/warn_16_decal_entitysecond { "classname" "light" "origin" "-56.000000 -72.000000 20.000000" -"light" "8" +"light" "4" "_color" "0 1 0" "spawnflags" "1" "time" "0.2" @@ -4048,7 +4048,7 @@ detail/warn_16_decal_entitysecond { "classname" "light" "origin" "-56.000000 72.000000 20.000000" -"light" "8" +"light" "4" "_color" "1 0 0" "spawnflags" "1" "offset" "0.5" @@ -4058,7 +4058,7 @@ detail/warn_16_decal_entitysecond { "classname" "light" "origin" "-112.000000 0.000000 -2.000000" -"light" "8" +"light" "4" "time" "0.1" "spawnflags" "1" } @@ -4066,7 +4066,7 @@ detail/warn_16_decal_entitysecond { "classname" "light" "origin" "112.000000 0.000000 50.000000" -"light" "8" +"light" "4" "time" "0.1" "spawnflags" "1" "offset" "0.5" @@ -4074,23 +4074,26 @@ detail/warn_16_decal_entitysecond // entity 6 { "classname" "light" -"origin" "-112.000000 0.000000 50.000000" -"light" "8" +"origin" "56.000000 0.000000 42.000000" +"light" "2" "time" "0.1" -"spawnflags" "1" -"offset" "0.8" +"spawnflags" "9" +"offset" "0.3" +"frequency" "0.5" } // entity 7 { "classname" "fx_flare" "origin" "-8 72 -8" "radius" "16" +"spawnflags" "2" } // entity 8 { "classname" "fx_flare" "origin" "-8 -72 -8" "radius" "16" +"spawnflags" "2" } // entity 9 { @@ -4210,3 +4213,22 @@ detail/warn_16_decal_entitysecond "classname" "location_cannon" "origin" "160.000000 -64.000000 24.000000" } +// entity 25 +{ +"classname" "light" +"origin" "-112.000000 0.000000 50.000000" +"light" "4" +"time" "0.1" +"spawnflags" "1" +"offset" "0.8" +} +// entity 26 +{ +"classname" "light" +"origin" "-56.000000 0.000000 42.000000" +"light" "2" +"time" "0.1" +"spawnflags" "9" +"offset" "1.3" +"frequency" "0.5" +} |