Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-09-28 17:32:45 +0000
committerStijn Buys <ingar@osirion.org>2013-09-28 17:32:45 +0000
commitefe71bb0a6fb329bc49bb55bab187e36e5c21c58 (patch)
tree3fcc8da216bf378194a80b4c378731040007e667 /base/maps/merchant
parent6a1eba1907fbe7690eab9a6b406ddb81d2d094e7 (diff)
Updates engine particles.
Diffstat (limited to 'base/maps/merchant')
-rw-r--r--base/maps/merchant/matrix.map8
-rw-r--r--base/maps/merchant/scalar.map67
-rw-r--r--base/maps/merchant/vector.map132
3 files changed, 49 insertions, 158 deletions
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index 0af223a..0972572 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -4347,16 +4347,16 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-672.000000 80.000000 0.000000"
"angle" "-179.999985"
-"script" "engine_smoke"
-"scale" "2"
+"script" "engine_exhaust"
+"scale" "1"
}
// entity 24
{
"classname" "fx_particles"
"origin" "-672.000000 -80.000000 0.000000"
"angle" "-179.999985"
-"script" "engine_smoke"
-"scale" "2"
+"script" "engine_exhaust"
+"scale" "1"
}
// entity 25
{
diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map
index f21c177..bf3f20a 100644
--- a/base/maps/merchant/scalar.map
+++ b/base/maps/merchant/scalar.map
@@ -1966,7 +1966,7 @@ colors/grey75
"origin" "-272.000000 0.000000 16.000000"
"angle" "180.000000"
"script" "engine_exhaust"
-"scale" "1.5"
+"scale" "1"
}
// entity 5
{
@@ -2053,93 +2053,44 @@ colors/grey75
// entity 14
{
"classname" "light"
-"origin" "-300.000000 -8.000000 16.000000"
-"light" "20"
-"spawnflags" "4"
-}
-// entity 15
-{
-"classname" "light"
-"origin" "-292.000000 0.000000 16.000000"
-"light" "28"
-"spawnflags" "4"
-}
-// entity 16
-{
-"classname" "light"
-"origin" "-272.000000 -16.000000 16.000000"
-"light" "36"
-"spawnflags" "4"
-}
-// entity 17
-{
-"classname" "light"
-"origin" "-272.000000 16.000000 16.000000"
-"light" "36"
-"spawnflags" "4"
-}
-// entity 18
-{
-"classname" "light"
-"origin" "-288.000000 -12.000000 16.000000"
-"light" "28"
-"spawnflags" "4"
-}
-// entity 19
-{
-"classname" "light"
-"origin" "-288.000000 12.000000 16.000000"
-"light" "28"
-"spawnflags" "4"
-}
-// entity 20
-{
-"classname" "light"
-"origin" "-300.000000 8.000000 16.000000"
-"light" "20"
-"spawnflags" "4"
-}
-// entity 21
-{
-"classname" "light"
-"origin" "-308.000000 0.000000 16.000000"
+"origin" "-284.000000 0.000000 16.000000"
"light" "12"
"spawnflags" "4"
}
-// entity 22
+// entity 15
{
"classname" "light"
"origin" "-224.000000 -72.000000 -24.000000"
"light" "16"
"spawnflags" "4"
}
-// entity 23
+// entity 16
{
"classname" "light"
"origin" "-224.000000 72.000000 -24.000000"
"light" "16"
"spawnflags" "4"
}
-// entity 24
+// entity 17
{
"classname" "location_cannon"
"origin" "168.000000 0.000000 -8.000000"
}
-// entity 25
+// entity 18
{
"classname" "fx_flare"
"origin" "-66.000000 -72.000000 -24.000000"
"spawnflags" "2"
"radius" "16"
}
-// entity 26
+// entity 19
{
"classname" "fx_flare"
"origin" "-66.000000 72.000000 -24.000000"
"spawnflags" "2"
"radius" "16"
}
-// entity 27
+// entity 20
{
"classname" "light"
"origin" "-176.000000 32.000000 -26.000000"
@@ -2148,7 +2099,7 @@ colors/grey75
"spawnflags" "1"
"offset" ".65"
}
-// entity 28
+// entity 21
{
"classname" "location_turret"
"origin" "-176.000000 0.000000 -32.000000"
diff --git a/base/maps/merchant/vector.map b/base/maps/merchant/vector.map
index ed0cf6f..c5ba14a 100644
--- a/base/maps/merchant/vector.map
+++ b/base/maps/merchant/vector.map
@@ -4098,122 +4098,38 @@ detail/warn_16_decal_entitysecond
// entity 9
{
"classname" "fx_flare"
-"origin" "-152 72 -8"
-"spawnflags" "4"
-"angle" "180"
+"origin" "-168.000000 72.000000 -8.000000"
+"angle" "-179.999985"
"radius" "18"
"flare" "1"
-"_color" "1 1 0"
-}
-// entity 10
-{
-"classname" "fx_flare"
-"origin" "-152 -72 -8"
"spawnflags" "4"
-"angle" "180"
-"radius" "18"
-"flare" "1"
-"_color" "1 1 0"
}
-// entity 11
-{
-"classname" "fx_particles"
-"origin" "-172 72 -8"
-"angle" "180"
-"script" "engine_exhaust"
-"scale" "0.8"
-}
-// entity 12
+// entity 10
{
"classname" "fx_particles"
-"origin" "-172 -72 -8"
-"angle" "180"
+"origin" "-152.000000 72.000000 -8.000000"
+"angle" "-179.999985"
"script" "engine_exhaust"
-"scale" "0.8"
-}
-// entity 13
-{
-"classname" "light"
-"origin" "-180.000000 -72.000000 -8.000000"
-"spawnflags" "4"
-"light" "18"
-}
-// entity 14
-{
-"classname" "light"
-"origin" "-180.000000 72.000000 -8.000000"
-"spawnflags" "4"
-"light" "18"
-}
-// entity 15
-{
-"classname" "light"
-"origin" "-176.000000 -72.000000 -8.000000"
-"spawnflags" "4"
-"light" "18"
-}
-// entity 16
-{
-"classname" "light"
-"origin" "-176.000000 72.000000 -8.000000"
-"spawnflags" "4"
-"light" "18"
-}
-// entity 17
-{
-"classname" "light"
-"origin" "-188.000000 -72.000000 -8.000000"
-"spawnflags" "4"
-"light" "14"
+"scale" "0.5"
}
-// entity 18
-{
-"classname" "light"
-"origin" "-188.000000 72.000000 -8.000000"
-"spawnflags" "4"
-"light" "14"
-}
-// entity 19
-{
-"classname" "light"
-"origin" "-184.000000 -72.000000 -8.000000"
-"spawnflags" "4"
-"light" "18"
-}
-// entity 20
+// entity 11
{
"classname" "light"
-"origin" "-184.000000 72.000000 -8.000000"
+"origin" "-168.000000 72.000000 -8.000000"
"spawnflags" "4"
"light" "18"
}
-// entity 21
-{
-"classname" "fx_flare"
-"origin" "-181.000000 72.000000 -8.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"radius" "20"
-}
-// entity 22
-{
-"classname" "fx_flare"
-"origin" "-181.000000 -72.000000 -8.000000"
-"angle" "180"
-"spawnflags" "4"
-"radius" "20"
-}
-// entity 23
+// entity 12
{
"classname" "location_cannon"
"origin" "160.000000 64.000000 24.000000"
}
-// entity 24
+// entity 13
{
"classname" "location_cannon"
"origin" "160.000000 -64.000000 24.000000"
}
-// entity 25
+// entity 14
{
"classname" "light"
"origin" "-112.000000 0.000000 50.000000"
@@ -4222,7 +4138,7 @@ detail/warn_16_decal_entitysecond
"spawnflags" "1"
"offset" "0.8"
}
-// entity 26
+// entity 15
{
"classname" "light"
"origin" "-56.000000 0.000000 42.000000"
@@ -4232,3 +4148,27 @@ detail/warn_16_decal_entitysecond
"offset" "1.3"
"frequency" "0.5"
}
+// entity 16
+{
+"classname" "fx_flare"
+"origin" "-168.000000 -72.000000 -8.000000"
+"angle" "-179.999985"
+"radius" "18"
+"flare" "1"
+"spawnflags" "4"
+}
+// entity 17
+{
+"classname" "fx_particles"
+"origin" "-152.000000 -72.000000 -8.000000"
+"angle" "-179.999985"
+"script" "engine_exhaust"
+"scale" "0.5"
+}
+// entity 18
+{
+"classname" "light"
+"origin" "-168.000000 -72.000000 -8.000000"
+"light" "18"
+"spawnflags" "4"
+}