diff options
author | Evan Goers <mega@osirion.org> | 2012-01-13 07:10:35 +0000 |
---|---|---|
committer | Evan Goers <mega@osirion.org> | 2012-01-13 07:10:35 +0000 |
commit | 039e983daaac958a2ca68eb09cfacc21265c86eb (patch) | |
tree | 1e46726b60aa061cdd0bc0ab0a601c41de70aa9a /base/maps/merchant/matrix.map | |
parent | f0fd2cad3aea9edde374cf46e19a9e96beef6453 (diff) |
Merged engine_trail and engine_exhaust.
Diffstat (limited to 'base/maps/merchant/matrix.map')
-rw-r--r-- | base/maps/merchant/matrix.map | 118 |
1 files changed, 47 insertions, 71 deletions
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map index efd671a..6c3735b 100644 --- a/base/maps/merchant/matrix.map +++ b/base/maps/merchant/matrix.map @@ -1748,7 +1748,7 @@ ( -480 -160 -152 ) ( -480 -160 -200 ) ( -480 -208 -152 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 -208 -200 ) ( -480 -208 -200 ) ( -552 -160 -200 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 -208 -200 ) ( -552 -208 -152 ) ( -480 -208 -200 ) common/caulk 0 0 0 1 1 0 0 0 -( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) colors/black_bright 0 0 0 1 1 0 0 0 +( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) common/engine 0 0 0 1 1 0 0 0 } // brush 163 { @@ -1757,7 +1757,7 @@ ( -480 -160 200 ) ( -480 -160 152 ) ( -480 -208 200 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 -208 152 ) ( -480 -208 152 ) ( -552 -160 152 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 -208 152 ) ( -552 -208 200 ) ( -480 -208 152 ) common/caulk 0 0 0 1 1 0 0 0 -( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) colors/black_bright 0 0 0 1 1 0 0 0 +( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) common/engine 0 0 0 1 1 0 0 0 } // brush 164 { @@ -1766,7 +1766,7 @@ ( -480 208 200 ) ( -480 208 152 ) ( -480 160 200 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 160 152 ) ( -480 160 152 ) ( -552 208 152 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 160 152 ) ( -552 160 200 ) ( -480 160 152 ) common/caulk 0 0 0 1 1 0 0 0 -( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) colors/black_bright 0 0 0 1 1 0 0 0 +( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) common/engine 0 0 0 1 1 0 0 0 } // brush 165 { @@ -1775,7 +1775,7 @@ ( -480 208 -152 ) ( -480 208 -200 ) ( -480 160 -152 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 160 -200 ) ( -480 160 -200 ) ( -552 208 -200 ) common/caulk 0 0 0 1 1 0 0 0 ( -552 160 -200 ) ( -552 160 -152 ) ( -480 160 -200 ) common/caulk 0 0 0 1 1 0 0 0 -( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) colors/black_bright 0 0 0 1 1 0 0 0 +( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) common/engine 0 0 0 1 1 0 0 0 } // brush 166 { @@ -3292,11 +3292,11 @@ // brush 329 { ( -448 128 80 ) ( -448 -128 80 ) ( -256 -128 80 ) common/caulk 0 0 0 1 1 0 0 0 -( -432 64 80 ) ( -320 64 120 ) ( -432 -64 80 ) thorn/panel_01 0 0 0 1 1 0 0 0 -( 368 120 80 ) ( 368 -120 80 ) ( 256 64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0 +( -432 64 80 ) ( -320 64 120 ) ( -432 -64 80 ) glass/plain 0 0 0 1 1 0 0 0 +( 368 120 80 ) ( 368 -120 80 ) ( 256 64 120 ) glass/plain 0 0 0 1 1 0 0 0 ( -192 -64 120 ) ( -192 64 120 ) ( -128 -64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0 -( -452 120 80 ) ( 368 120 80 ) ( -452 64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0 -( -452 -64 120 ) ( 368 -120 80 ) ( -452 -120 80 ) thorn/panel_01 0 0 0 1 1 0 0 0 +( -452 120 80 ) ( 368 120 80 ) ( -452 64 120 ) glass/plain 0 0 0 1 1 0 0 0 +( -452 -64 120 ) ( 368 -120 80 ) ( -452 -120 80 ) glass/plain 0 0 0 1 1 0 0 0 } // brush 330 { @@ -4482,22 +4482,13 @@ common/entity_second // entity 20 { "classname" "fx_flare" -"origin" "-496.000000 -184.000000 -176.000000" -"angle" "-179.999985" -"spawnflags" "4" -"flare" "1" -"radius" "32" -} -// entity 21 -{ -"classname" "fx_flare" "origin" "-568.000000 80.000000 0.000000" "angle" "-179.999985" "spawnflags" "4" "radius" "56" "flare" "1" } -// entity 22 +// entity 21 { "classname" "fx_flare" "origin" "-568.000000 -80.000000 0.000000" @@ -4506,35 +4497,41 @@ common/entity_second "radius" "56" "flare" "1" } -// entity 23 +// entity 22 { "classname" "fx_particles" "origin" "-544.000000 -184.000000 -176.000000" "angle" "-179.999985" -"script" "engine_trail" +"script" "engine_exhaust" +"scale" "0.5" +"spawnflags" "4" } -// entity 24 +// entity 23 { "classname" "fx_particles" -"origin" "-704.000000 80.000000 0.000000" +"origin" "-672.000000 80.000000 0.000000" "angle" "-179.999985" "script" "engine_exhaust" +"spawnflags" "4" +"scale" "2" } -// entity 25 +// entity 24 { "classname" "fx_particles" -"origin" "-704.000000 -80.000000 0.000000" +"origin" "-672.000000 -80.000000 0.000000" "angle" "-179.999985" "script" "engine_exhaust" +"spawnflags" "4" +"scale" "2" } -// entity 26 +// entity 25 { "classname" "light" "origin" "-560.000000 -184.000000 -176.000000" "spawnflags" "4" "light" "28" } -// entity 27 +// entity 26 { "classname" "func_group" // brush 0 @@ -4771,7 +4768,7 @@ common/entity_second ( 64 160 -124 ) ( 128 -160 -124 ) ( 128 160 -124 ) common/caulk 0 0 0 1 1 0 0 0 } } -// entity 28 +// entity 27 { "classname" "func_group" // brush 0 @@ -5026,7 +5023,7 @@ common/entity_second ( -268 -66 148 ) ( -276 62 148 ) ( -268 62 148 ) common/caulk 0 0 0 1 1 0 0 0 } } -// entity 29 +// entity 28 { "classname" "func_group" // brush 0 @@ -5281,7 +5278,7 @@ common/entity_second ( -76 -66 148 ) ( -84 62 148 ) ( -76 62 148 ) common/caulk 0 0 0 1 1 0 0 0 } } -// entity 30 +// entity 29 { "classname" "func_group" // brush 0 @@ -5536,7 +5533,7 @@ common/entity_second ( 116 -66 148 ) ( 108 62 148 ) ( 116 62 148 ) common/caulk 0 0 0 1 1 0 0 0 } } -// entity 31 +// entity 30 { "classname" "func_group" // brush 0 @@ -5773,7 +5770,7 @@ common/entity_second ( -128 160 -124 ) ( -64 -160 -124 ) ( -64 160 -124 ) common/caulk 0 0 0 1 1 0 0 0 } } -// entity 32 +// entity 31 { "classname" "func_group" // brush 0 @@ -6010,100 +6007,79 @@ common/entity_second ( -320 160 -124 ) ( -256 -160 -124 ) ( -256 160 -124 ) common/caulk 0 0 0 1 1 0 0 0 } } -// entity 33 +// entity 32 { "classname" "light" "origin" "-544.000000 -184.000000 -176.000000" "light" "32" "spawnflags" "4" } -// entity 34 +// entity 33 { "classname" "light" "origin" "-544.000000 -184.000000 176.000000" "light" "32" "spawnflags" "4" } -// entity 35 +// entity 34 { "classname" "light" "origin" "-560.000000 -184.000000 176.000000" "spawnflags" "4" "light" "28" } -// entity 36 -{ -"classname" "fx_flare" -"origin" "-496.000000 -184.000000 176.000000" -"angle" "-179.999985" -"spawnflags" "4" -"flare" "1" -"radius" "32" -} -// entity 37 +// entity 35 { "classname" "fx_particles" "origin" "-544.000000 -184.000000 176.000000" "angle" "-179.999985" -"script" "engine_trail" +"script" "engine_exhaust" +"scale" "0.5" +"spawnflags" "4" } -// entity 38 +// entity 36 { "classname" "light" "origin" "-544.000000 184.000000 176.000000" "light" "32" "spawnflags" "4" } -// entity 39 +// entity 37 { "classname" "light" "origin" "-560.000000 184.000000 176.000000" "spawnflags" "4" "light" "28" } -// entity 40 -{ -"classname" "fx_flare" -"origin" "-496.000000 184.000000 176.000000" -"angle" "-179.999985" -"spawnflags" "4" -"flare" "1" -"radius" "32" -} -// entity 41 +// entity 38 { "classname" "fx_particles" "origin" "-544.000000 184.000000 176.000000" "angle" "-179.999985" -"script" "engine_trail" +"script" "engine_exhaust" +"scale" "0.5" +"spawnflags" "4" } -// entity 42 +// entity 39 { "classname" "light" "origin" "-544.000000 184.000000 -176.000000" "light" "32" "spawnflags" "4" } -// entity 43 +// entity 40 { "classname" "light" "origin" "-560.000000 184.000000 -176.000000" "spawnflags" "4" "light" "28" } -// entity 44 -{ -"classname" "fx_flare" -"origin" "-496.000000 184.000000 -176.000000" -"angle" "-179.999985" -"spawnflags" "4" -"flare" "1" -"radius" "32" -} -// entity 45 +// entity 41 { "classname" "fx_particles" "origin" "-544.000000 184.000000 -176.000000" "angle" "-179.999985" -"script" "engine_trail" +"script" "engine_exhaust" +"scale" "0.5" +"spawnflags" "4" } |