Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-11-27 21:03:23 +0000
committerStijn Buys <ingar@osirion.org>2008-11-27 21:03:23 +0000
commitad207c50fb2c608336c333beec697f4f3ba6ba77 (patch)
tree85c376adbb532d9b66c3c45fc129b649a146c1fa /base
parent2f2f112fc9c24ac639276c418dcd8289e3bd98aa (diff)
fx_entity updates by Odin
Diffstat (limited to 'base')
-rw-r--r--base/maps/ships/avenger.map26
-rw-r--r--base/maps/ships/bomber.map32
-rw-r--r--base/maps/ships/carrier.map18
-rw-r--r--base/maps/ships/destroyer.map24
-rw-r--r--base/maps/ships/freighter.map68
-rw-r--r--base/maps/ships/heavycruiser.map124
-rw-r--r--base/maps/ships/interceptor.map128
-rw-r--r--base/maps/ships/scout.map70
8 files changed, 315 insertions, 175 deletions
diff --git a/base/maps/ships/avenger.map b/base/maps/ships/avenger.map
index dd3487e..c01b59d 100644
--- a/base/maps/ships/avenger.map
+++ b/base/maps/ships/avenger.map
@@ -1171,13 +1171,6 @@
}
// entity 1
{
-"classname" "target_engine"
-"origin" "-46 0 0"
-"radius" "40"
-"spawnflags" "1"
-}
-// entity 2
-{
"classname" "light"
"origin" "84 0 0"
"light" "10"
@@ -1186,7 +1179,7 @@
"offset" "0.5"
"time" "0.1"
}
-// entity 3
+// entity 2
{
"classname" "light"
"origin" "-4 76 0"
@@ -1196,7 +1189,7 @@
"offset" "0"
"time" "0.2"
}
-// entity 4
+// entity 3
{
"classname" "light"
"origin" "-4 -76 0"
@@ -1206,3 +1199,18 @@
"offset" "0.5"
"time" "0.2"
}
+// entity 4
+{
+"classname" "fx_particles"
+"origin" "-54 0 0"
+"angle" "180"
+"script" "engine_trail"
+}
+// entity 5
+{
+"classname" "fx_particles"
+"origin" "-46 0 0"
+"angle" "180"
+"script" "engine_exhaust"
+"radius" "48"
+}
diff --git a/base/maps/ships/bomber.map b/base/maps/ships/bomber.map
index f96dc8f..3a194a7 100644
--- a/base/maps/ships/bomber.map
+++ b/base/maps/ships/bomber.map
@@ -1283,3 +1283,35 @@
"offset" "0.5"
"time" "0.1"
}
+// entity 5
+{
+"classname" "fx_particles"
+"origin" "-128 -108 -20"
+"radius" "64"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 6
+{
+"classname" "fx_particles"
+"origin" "-128 -124 12"
+"radius" "64"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 7
+{
+"classname" "fx_particles"
+"origin" "-128 108 -20"
+"radius" "64"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 8
+{
+"classname" "fx_particles"
+"origin" "-128 124 12"
+"radius" "64"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
diff --git a/base/maps/ships/carrier.map b/base/maps/ships/carrier.map
index 84c9c42..a0b4357 100644
--- a/base/maps/ships/carrier.map
+++ b/base/maps/ships/carrier.map
@@ -2542,7 +2542,7 @@
( -608 -32 48 ) ( -608 -32 -112 ) ( -608 -192 48 ) common/caulk 0 0 0 1 1
( -616 -192 -112 ) ( -608 -192 -112 ) ( -616 -32 -112 ) common/caulk 0 0 0 1 1
( -616 -192 -112 ) ( -616 -192 48 ) ( -608 -192 -112 ) common/caulk 0 0 0 1 1
-( -612 -192 -112 ) ( -612 -32 -112 ) ( -612 -192 48 ) colors/black 0 0 0 1 1
+( -612 -192 -112 ) ( -612 -32 -112 ) ( -612 -192 48 ) common/engine 0 0 0 1 1
( -56 -192 32 ) ( -56 -184 40 ) ( 72 -192 32 ) common/caulk 0 0 0 1 1
( -56 -176 -112 ) ( -56 -184 -104 ) ( 72 -176 -112 ) common/caulk 0 0 0 1 1
( -56 -32 -96 ) ( -56 -40 -104 ) ( 72 -32 -96 ) common/caulk 0 0 0 1 1
@@ -2635,7 +2635,7 @@
( -608 192 48 ) ( -608 192 -112 ) ( -608 32 48 ) common/caulk 0 0 0 1 1
( -616 32 -112 ) ( -608 32 -112 ) ( -616 192 -112 ) common/caulk 0 0 0 1 1
( -616 32 -112 ) ( -616 32 48 ) ( -608 32 -112 ) common/caulk 0 0 0 1 1
-( -612 32 -112 ) ( -612 192 -112 ) ( -612 32 48 ) colors/black 0 0 0 1 1
+( -612 32 -112 ) ( -612 192 -112 ) ( -612 32 48 ) common/engine 0 0 0 1 1
( -56 32 32 ) ( -56 40 40 ) ( 72 32 32 ) common/caulk 0 0 0 1 1
( -56 48 -112 ) ( -56 40 -104 ) ( 72 48 -112 ) common/caulk 0 0 0 1 1
( -56 192 -96 ) ( -56 184 -104 ) ( 72 192 -96 ) common/caulk 0 0 0 1 1
@@ -2664,15 +2664,17 @@
}
// entity 3
{
-"classname" "target_engine"
+"classname" "fx_particles"
"origin" "-624 -112 -32"
-"radius" "160"
-"_color" "0.5 0.1 0.5"
+"angle" "180"
+"radius" "192"
+"script" "engine_exhaust_tsukhan"
}
// entity 4
{
-"classname" "target_engine"
+"classname" "fx_particles"
"origin" "-624 112 -32"
-"radius" "160"
-"_color" "0.5 0.1 0.5"
+"angle" "180"
+"radius" "192"
+"script" "engine_exhaust_tsukhan"
}
diff --git a/base/maps/ships/destroyer.map b/base/maps/ships/destroyer.map
index 993c8f5..efe94ed 100644
--- a/base/maps/ships/destroyer.map
+++ b/base/maps/ships/destroyer.map
@@ -2518,13 +2518,6 @@
}
// entity 1
{
-"classname" "target_engine"
-"origin" "-800 0 116"
-"radius" "304"
-"_color" "0.5 0.1 0.5"
-}
-// entity 2
-{
"classname" "light"
"origin" "0 -600 -28"
"light" "10"
@@ -2533,7 +2526,7 @@
"offset" "0.5"
"time" "0.2"
}
-// entity 3
+// entity 2
{
"classname" "light"
"origin" "0 600 -28"
@@ -2543,10 +2536,19 @@
"offset" "0"
"time" "0.2"
}
-// entity 4
+// entity 3
{
-"classname" "target_engine"
+"classname" "fx_particles"
"origin" "-800 0 -172"
+"script" "engine_exhaust_tsukhan"
+"radius" "304"
+"angle" "180"
+}
+// entity 4
+{
+"classname" "fx_particles"
+"origin" "-800 0 116"
+"script" "engine_exhaust_tsukhan"
"radius" "304"
-"_color" "0.5 0.1 0.5"
+"angle" "180"
}
diff --git a/base/maps/ships/freighter.map b/base/maps/ships/freighter.map
index dce3f8b..e78af06 100644
--- a/base/maps/ships/freighter.map
+++ b/base/maps/ships/freighter.map
@@ -1538,24 +1538,6 @@
}
// entity 7
{
-"classname" "target_engine"
-"origin" "-780 -144 -32"
-"radius" "96"
-}
-// entity 8
-{
-"classname" "target_engine"
-"origin" "-780 144 -32"
-"radius" "96"
-}
-// entity 9
-{
-"classname" "target_engine"
-"origin" "-780 0 -32"
-"radius" "96"
-}
-// entity 10
-{
"classname" "light"
"origin" "-608 -488 -128"
"light" "50"
@@ -1564,7 +1546,7 @@
"time" "0.2"
"offset" "0.06"
}
-// entity 11
+// entity 8
{
"classname" "light"
"origin" "160 -488 -128"
@@ -1574,7 +1556,7 @@
"time" "0.2"
"offset" "0"
}
-// entity 12
+// entity 9
{
"classname" "light"
"origin" "32 -488 -128"
@@ -1584,7 +1566,7 @@
"time" "0.2"
"offset" "0.01"
}
-// entity 13
+// entity 10
{
"classname" "light"
"origin" "-96 -488 -128"
@@ -1594,7 +1576,7 @@
"time" "0.2"
"offset" "0.02"
}
-// entity 14
+// entity 11
{
"classname" "light"
"origin" "-224 -488 -128"
@@ -1604,7 +1586,7 @@
"time" "0.2"
"offset" "0.03"
}
-// entity 15
+// entity 12
{
"classname" "light"
"origin" "-352 -488 -128"
@@ -1614,7 +1596,7 @@
"time" "0.2"
"offset" "0.04"
}
-// entity 16
+// entity 13
{
"classname" "light"
"origin" "-480 -488 -128"
@@ -1624,7 +1606,7 @@
"time" "0.2"
"offset" "0.05"
}
-// entity 17
+// entity 14
{
"classname" "light"
"origin" "160 488 -128"
@@ -1634,7 +1616,7 @@
"time" "0.2"
"offset" "0.5"
}
-// entity 18
+// entity 15
{
"classname" "light"
"origin" "32 488 -128"
@@ -1644,7 +1626,7 @@
"time" "0.2"
"offset" "0.51"
}
-// entity 19
+// entity 16
{
"classname" "light"
"origin" "-352 488 -128"
@@ -1654,7 +1636,7 @@
"time" "0.2"
"offset" "0.54"
}
-// entity 20
+// entity 17
{
"classname" "light"
"origin" "-96 488 -128"
@@ -1664,7 +1646,7 @@
"time" "0.2"
"offset" "0.52"
}
-// entity 21
+// entity 18
{
"classname" "light"
"origin" "-224 488 -128"
@@ -1674,7 +1656,7 @@
"time" "0.2"
"offset" "0.53"
}
-// entity 22
+// entity 19
{
"classname" "light"
"origin" "-480 488 -128"
@@ -1684,7 +1666,7 @@
"time" "0.2"
"offset" "0.55"
}
-// entity 23
+// entity 20
{
"classname" "light"
"origin" "-608 488 -128"
@@ -1694,3 +1676,27 @@
"time" "0.2"
"offset" "0.56"
}
+// entity 21
+{
+"classname" "fx_particles"
+"origin" "-780 -144 -32"
+"angle" "180"
+"radius" "96"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 22
+{
+"classname" "fx_particles"
+"origin" "-780 144 -32"
+"angle" "180"
+"radius" "96"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 23
+{
+"classname" "fx_particles"
+"origin" "-780 0 -32"
+"angle" "180"
+"radius" "96"
+"script" "engine_exhaust_tsukhan"
+}
diff --git a/base/maps/ships/heavycruiser.map b/base/maps/ships/heavycruiser.map
index 992707f..05c4800 100644
--- a/base/maps/ships/heavycruiser.map
+++ b/base/maps/ships/heavycruiser.map
@@ -4135,7 +4135,7 @@
{
( -9280 736 768 ) ( -9600 736 768 ) ( -9280 1248 768 ) common/caulk 0 0 0 1 1
( -9280 736 768 ) ( -9280 1248 768 ) ( -9280 736 -128 ) common/caulk 0 0 0 1 1
-( -9344 1248 -128 ) ( -9344 1248 768 ) ( -9344 736 -128 ) colors/black 0 0 0 1 1
+( -9344 1248 -128 ) ( -9344 1248 768 ) ( -9344 736 -128 ) common/engine 0 0 0 1 1
( -9600 1232 -128 ) ( -9280 1232 -128 ) ( -9600 1232 768 ) common/caulk 0 0 0 1 1
( 960 1232 528 ) ( 960 1224 536 ) ( 832 1232 528 ) common/caulk 0 0 0 1 1
( 960 608 768 ) ( 960 600 760 ) ( 832 608 768 ) common/caulk 0 0 0 1 1
@@ -4150,7 +4150,7 @@
( -9280 1664 2176 ) ( -9280 2176 2176 ) ( -9280 1664 1280 ) common/caulk 0 0 0 1 1
( -9280 1040 2136 ) ( -9280 1040 1240 ) ( -9600 1040 2136 ) common/caulk 0 0 0 1 1
( -9600 2168 1056 ) ( -9600 1656 1056 ) ( -9280 2168 1056 ) common/caulk 0 0 0 1 1
-( -9344 2176 1280 ) ( -9344 2176 2176 ) ( -9344 1664 1280 ) colors/black 0 0 0 1 1
+( -9344 2176 1280 ) ( -9344 2176 2176 ) ( -9344 1664 1280 ) common/engine 0 0 0 1 1
( -9600 2160 1280 ) ( -9280 2160 1280 ) ( -9600 2160 2176 ) common/caulk 0 0 0 1 1
( 960 1048 1944 ) ( 960 1040 1936 ) ( 832 1048 1944 ) common/caulk 0 0 0 1 1
( 960 1040 1296 ) ( 960 1048 1288 ) ( 832 1040 1296 ) common/caulk 0 0 0 1 1
@@ -4163,7 +4163,7 @@
( -9280 64 2176 ) ( -9280 576 2176 ) ( -9280 64 1280 ) common/caulk 0 0 0 1 1
( -9280 -560 2136 ) ( -9280 -560 1240 ) ( -9600 -560 2136 ) common/caulk 0 0 0 1 1
( -9600 568 1056 ) ( -9600 56 1056 ) ( -9280 568 1056 ) common/caulk 0 0 0 1 1
-( -9344 576 1280 ) ( -9344 576 2176 ) ( -9344 64 1280 ) colors/black 0 0 0 1 1
+( -9344 576 1280 ) ( -9344 576 2176 ) ( -9344 64 1280 ) common/engine 0 0 0 1 1
( -9600 560 1280 ) ( -9280 560 1280 ) ( -9600 560 2176 ) common/caulk 0 0 0 1 1
( 960 -552 1944 ) ( 960 -560 1936 ) ( 832 -552 1944 ) common/caulk 0 0 0 1 1
( 960 -560 1296 ) ( 960 -552 1288 ) ( 832 -560 1296 ) common/caulk 0 0 0 1 1
@@ -4176,7 +4176,7 @@
( -9280 -1536 2176 ) ( -9280 -1024 2176 ) ( -9280 -1536 1280 ) common/caulk 0 0 0 1 1
( -9280 -2160 2136 ) ( -9280 -2160 1240 ) ( -9600 -2160 2136 ) common/caulk 0 0 0 1 1
( -9600 -1032 1056 ) ( -9600 -1544 1056 ) ( -9280 -1032 1056 ) common/caulk 0 0 0 1 1
-( -9344 -1024 1280 ) ( -9344 -1024 2176 ) ( -9344 -1536 1280 ) colors/black 0 0 0 1 1
+( -9344 -1024 1280 ) ( -9344 -1024 2176 ) ( -9344 -1536 1280 ) common/engine 0 0 0 1 1
( -9600 -1040 1280 ) ( -9280 -1040 1280 ) ( -9600 -1040 2176 ) common/caulk 0 0 0 1 1
( 960 -2152 1944 ) ( 960 -2160 1936 ) ( 832 -2152 1944 ) common/caulk 0 0 0 1 1
( 960 -2160 1296 ) ( 960 -2152 1288 ) ( 832 -2160 1296 ) common/caulk 0 0 0 1 1
@@ -4187,7 +4187,7 @@
{
( -9280 -864 768 ) ( -9600 -864 768 ) ( -9280 -352 768 ) common/caulk 0 0 0 1 1
( -9280 -864 768 ) ( -9280 -352 768 ) ( -9280 -864 -128 ) common/caulk 0 0 0 1 1
-( -9344 -352 -128 ) ( -9344 -352 768 ) ( -9344 -864 -128 ) colors/black 0 0 0 1 1
+( -9344 -352 -128 ) ( -9344 -352 768 ) ( -9344 -864 -128 ) common/engine 0 0 0 1 1
( -9600 -368 -128 ) ( -9280 -368 -128 ) ( -9600 -368 768 ) common/caulk 0 0 0 1 1
( 960 -368 528 ) ( 960 -376 536 ) ( 832 -368 528 ) common/caulk 0 0 0 1 1
( 960 -992 768 ) ( 960 -1000 760 ) ( 832 -992 768 ) common/caulk 0 0 0 1 1
@@ -6179,46 +6179,6 @@
}
// entity 1
{
-"classname" "target_engine"
-"origin" "-9352 -800 336"
-"radius" "664"
-"angle" "-90"
-"_color" "0.5 0.1 0.5"
-}
-// entity 2
-{
-"classname" "target_engine"
-"origin" "-9352 1600 1616"
-"radius" "1120"
-"angle" "-90"
-"_color" "0.5 0.1 0.5"
-}
-// entity 3
-{
-"classname" "target_engine"
-"origin" "-9352 -1600 1616"
-"radius" "1120"
-"angle" "-90"
-"_color" "0.5 0.1 0.5"
-}
-// entity 4
-{
-"classname" "target_engine"
-"origin" "-9352 0 1616"
-"radius" "1120"
-"angle" "-90"
-"_color" "0.5 0.1 0.5"
-}
-// entity 5
-{
-"classname" "target_engine"
-"origin" "-9352 800 336"
-"radius" "664"
-"angle" "-90"
-"_color" "0.5 0.1 0.5"
-}
-// entity 6
-{
"classname" "light"
"origin" "1920 1288 -1664"
"light" "100"
@@ -6227,7 +6187,7 @@
"offset" "0"
"time" "0.1"
}
-// entity 7
+// entity 2
{
"classname" "light"
"origin" "1664 1288 -1664"
@@ -6237,7 +6197,7 @@
"offset" "0.1"
"time" "0.1"
}
-// entity 8
+// entity 3
{
"classname" "light"
"origin" "1408 1288 -1664"
@@ -6247,7 +6207,7 @@
"offset" "0.2"
"time" "0.1"
}
-// entity 9
+// entity 4
{
"classname" "light"
"origin" "1152 1288 -1664"
@@ -6257,7 +6217,7 @@
"offset" "0.3"
"time" "0.1"
}
-// entity 10
+// entity 5
{
"classname" "light"
"origin" "896 1288 -1664"
@@ -6267,7 +6227,7 @@
"offset" "0.4"
"time" "0.1"
}
-// entity 11
+// entity 6
{
"classname" "light"
"origin" "640 1288 -1664"
@@ -6277,7 +6237,7 @@
"offset" "0.5"
"time" "0.1"
}
-// entity 12
+// entity 7
{
"classname" "light"
"origin" "384 1288 -1664"
@@ -6287,7 +6247,7 @@
"offset" "0.6"
"time" "0.1"
}
-// entity 13
+// entity 8
{
"classname" "light"
"origin" "128 1288 -1664"
@@ -6297,7 +6257,7 @@
"offset" "0.7"
"time" "0.1"
}
-// entity 14
+// entity 9
{
"classname" "light"
"origin" "-128 1288 -1664"
@@ -6307,7 +6267,7 @@
"offset" "0.8"
"time" "0.1"
}
-// entity 15
+// entity 10
{
"classname" "light"
"origin" "-384 1288 -1664"
@@ -6317,7 +6277,7 @@
"offset" "0.9"
"time" "0.1"
}
-// entity 16
+// entity 11
{
"classname" "light"
"origin" "-640 1288 -1664"
@@ -6327,7 +6287,7 @@
"offset" "1"
"time" "0.1"
}
-// entity 17
+// entity 12
{
"classname" "light"
"origin" "-896 1288 -1664"
@@ -6337,7 +6297,7 @@
"offset" "1.1"
"time" "0.1"
}
-// entity 18
+// entity 13
{
"classname" "light"
"origin" "-1152 1288 -1664"
@@ -6347,7 +6307,7 @@
"offset" "1.2"
"time" "0.1"
}
-// entity 19
+// entity 14
{
"classname" "light"
"origin" "-1408 1288 -1664"
@@ -6357,7 +6317,7 @@
"offset" "1.3"
"time" "0.1"
}
-// entity 20
+// entity 15
{
"classname" "light"
"origin" "-1664 1288 -1664"
@@ -6367,7 +6327,7 @@
"offset" "1.4"
"time" "0.1"
}
-// entity 21
+// entity 16
{
"classname" "light"
"origin" "-1664 -1544 3648"
@@ -6378,7 +6338,7 @@
"offset" "0"
"time" "0.1"
}
-// entity 22
+// entity 17
{
"classname" "light"
"origin" "-1664 1544 3648"
@@ -6389,8 +6349,48 @@
"offset" "1"
"time" "0.1"
}
-// entity 23
+// entity 18
{
"classname" "target_cannon"
"origin" "5568 0 -1344"
}
+// entity 19
+{
+"classname" "fx_particles"
+"origin" "-9352 -1600 1616"
+"script" "engine_exhaust_tsukhan"
+"angle" "180"
+"radius" "1120"
+}
+// entity 20
+{
+"classname" "fx_particles"
+"origin" "-9352 -800 336"
+"script" "engine_exhaust_tsukhan"
+"angle" "180"
+"radius" "664"
+}
+// entity 21
+{
+"classname" "fx_particles"
+"origin" "-9352 800 336"
+"script" "engine_exhaust_tsukhan"
+"angle" "180"
+"radius" "664"
+}
+// entity 22
+{
+"classname" "fx_particles"
+"origin" "-9352 1600 1616"
+"script" "engine_exhaust_tsukhan"
+"angle" "180"
+"radius" "1120"
+}
+// entity 23
+{
+"classname" "fx_particles"
+"origin" "-9352 0 1616"
+"script" "engine_exhaust_tsukhan"
+"angle" "180"
+"radius" "1120"
+}
diff --git a/base/maps/ships/interceptor.map b/base/maps/ships/interceptor.map
index 37a3f9d..70ab607 100644
--- a/base/maps/ships/interceptor.map
+++ b/base/maps/ships/interceptor.map
@@ -266,7 +266,7 @@
( -224 -128 -8 ) ( -224 -176 -8 ) ( -232 -128 -8 ) common/caulk 0 0 0 1 1
( -224 -128 -8 ) ( -224 -128 -32 ) ( -224 -176 -8 ) common/caulk 0 0 0 1 1
( -232 -176 -32 ) ( -224 -176 -32 ) ( -232 -128 -32 ) common/caulk 0 0 0 1 1
-( -232 -176 -32 ) ( -232 -128 -32 ) ( -232 -176 -8 ) colors/black 0 0 0 1 1
+( -232 -176 -32 ) ( -232 -128 -32 ) ( -232 -176 -8 ) common/engine 0 0 0 1 1
( -96 -144 -8 ) ( -96 -140 -12 ) ( 32 -144 -8 ) common/caulk 0 0 0 1 1
( -96 -140 -12 ) ( -96 -140 -16 ) ( 32 -140 -12 ) common/caulk 0 0 0 1 1
( -96 -140 -28 ) ( -96 -144 -32 ) ( 32 -140 -28 ) common/caulk 0 0 0 1 1
@@ -342,7 +342,7 @@
( -224 -128 32 ) ( -224 -176 32 ) ( -232 -128 32 ) common/caulk 0 0 0 1 1
( -224 -128 32 ) ( -224 -128 8 ) ( -224 -176 32 ) common/caulk 0 0 0 1 1
( -232 -176 8 ) ( -224 -176 8 ) ( -232 -128 8 ) common/caulk 0 0 0 1 1
-( -232 -176 8 ) ( -232 -128 8 ) ( -232 -176 32 ) colors/black 0 0 0 1 1
+( -232 -176 8 ) ( -232 -128 8 ) ( -232 -176 32 ) common/engine 0 0 0 1 1
( -96 -144 32 ) ( -96 -140 28 ) ( 32 -144 32 ) common/caulk 0 0 0 1 1
( -96 -140 28 ) ( -96 -140 24 ) ( 32 -140 28 ) common/caulk 0 0 0 1 1
( -96 -140 12 ) ( -96 -144 8 ) ( 32 -140 12 ) common/caulk 0 0 0 1 1
@@ -762,7 +762,7 @@
( -224 176 -8 ) ( -224 128 -8 ) ( -232 176 -8 ) common/caulk 0 0 0 1 1
( -224 176 -8 ) ( -224 176 -32 ) ( -224 128 -8 ) common/caulk 0 0 0 1 1
( -232 128 -32 ) ( -224 128 -32 ) ( -232 176 -32 ) common/caulk 0 0 0 1 1
-( -232 128 -32 ) ( -232 176 -32 ) ( -232 128 -8 ) colors/black 0 0 0 1 1
+( -232 128 -32 ) ( -232 176 -32 ) ( -232 128 -8 ) common/engine 0 0 0 1 1
( -96 160 -8 ) ( -96 164 -12 ) ( 32 160 -8 ) common/caulk 0 0 0 1 1
( -96 164 -12 ) ( -96 164 -16 ) ( 32 164 -12 ) common/caulk 0 0 0 1 1
( -96 164 -28 ) ( -96 160 -32 ) ( 32 164 -28 ) common/caulk 0 0 0 1 1
@@ -838,7 +838,7 @@
( -224 176 32 ) ( -224 128 32 ) ( -232 176 32 ) common/caulk 0 0 0 1 1
( -224 176 32 ) ( -224 176 8 ) ( -224 128 32 ) common/caulk 0 0 0 1 1
( -232 128 8 ) ( -224 128 8 ) ( -232 176 8 ) common/caulk 0 0 0 1 1
-( -232 128 8 ) ( -232 176 8 ) ( -232 128 32 ) colors/black 0 0 0 1 1
+( -232 128 8 ) ( -232 176 8 ) ( -232 128 32 ) common/engine 0 0 0 1 1
( -96 160 32 ) ( -96 164 28 ) ( 32 160 32 ) common/caulk 0 0 0 1 1
( -96 164 28 ) ( -96 164 24 ) ( 32 164 28 ) common/caulk 0 0 0 1 1
( -96 164 12 ) ( -96 160 8 ) ( 32 164 12 ) common/caulk 0 0 0 1 1
@@ -2990,43 +2990,15 @@
}
// entity 1
{
-"classname" "target_engine"
-"origin" "-240 152 -20"
-"radius" "24"
-"_color" "0.5 0.1 0.5"
-}
-// entity 2
-{
-"classname" "target_engine"
-"origin" "-240 152 20"
-"radius" "24"
-"_color" "0.5 0.1 0.5"
-}
-// entity 3
-{
-"classname" "target_engine"
-"origin" "-240 -152 -20"
-"radius" "24"
-"_color" "0.5 0.1 0.5"
-}
-// entity 4
-{
-"classname" "target_engine"
-"origin" "-240 -152 20"
-"radius" "24"
-"_color" "0.5 0.1 0.5"
-}
-// entity 5
-{
"classname" "target_cannon"
"origin" "152 80 0"
}
-// entity 6
+// entity 2
{
"classname" "target_cannon"
"origin" "152 -80 0"
}
-// entity 7
+// entity 3
{
"classname" "light"
"origin" "280 0 0"
@@ -3036,7 +3008,7 @@
"time" "0.1"
"offset" "0.5"
}
-// entity 8
+// entity 4
{
"classname" "light"
"origin" "-252 292 0"
@@ -3046,7 +3018,7 @@
"time" "0.2"
"offset" "0"
}
-// entity 9
+// entity 5
{
"classname" "light"
"origin" "-252 -292 0"
@@ -3056,3 +3028,87 @@
"time" "0.2"
"offset" "0.5"
}
+// entity 6
+{
+"classname" "fx_particles"
+"origin" "-240 -152 -20"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 7
+{
+"classname" "fx_particles"
+"origin" "-240 -152 20"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 8
+{
+"classname" "fx_particles"
+"origin" "-240 152 20"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 9
+{
+"classname" "fx_particles"
+"origin" "-240 152 -20"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 10
+{
+"classname" "fx_particles"
+"origin" "-264 -152 -20"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+}
+// entity 11
+{
+"classname" "fx_particles"
+"origin" "-272 -152 20"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+}
+// entity 12
+{
+"classname" "fx_particles"
+"origin" "-272 152 20"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+}
+// entity 13
+{
+"classname" "fx_particles"
+"origin" "-264 152 -20"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+}
+// entity 14
+{
+"classname" "fx_particles"
+"origin" "-268 -152 -20"
+"angle" "180"
+"script" "engine_smoke_tsukhan"
+}
+// entity 15
+{
+"classname" "fx_particles"
+"origin" "-276 -152 20"
+"angle" "180"
+"script" "engine_smoke_tsukhan"
+}
+// entity 16
+{
+"classname" "fx_particles"
+"origin" "-276 152 20"
+"angle" "180"
+"script" "engine_smoke_tsukhan"
+}
+// entity 17
+{
+"classname" "fx_particles"
+"origin" "-268 152 -20"
+"angle" "180"
+"script" "engine_smoke_tsukhan"
+}
diff --git a/base/maps/ships/scout.map b/base/maps/ships/scout.map
index 0cca824..16806ab 100644
--- a/base/maps/ships/scout.map
+++ b/base/maps/ships/scout.map
@@ -4021,29 +4021,15 @@
}
// entity 1
{
-"classname" "target_engine"
-"origin" "-164 -44 -48"
-"radius" "48"
-"_color" "0.5 0.1 0.5"
-}
-// entity 2
-{
-"classname" "target_engine"
-"origin" "-164 44 -48"
-"radius" "48"
-"_color" "0.5 0.1 0.5"
-}
-// entity 3
-{
"classname" "target_cannon"
"origin" "248 -24 -56"
}
-// entity 4
+// entity 2
{
"classname" "target_cannon"
"origin" "248 24 -56"
}
-// entity 5
+// entity 3
{
"classname" "light"
"origin" "280 0 -58"
@@ -4054,7 +4040,7 @@
"time" "0.1"
"_color" "1.0 1.0 1.0"
}
-// entity 6
+// entity 4
{
"classname" "light"
"origin" "-88 232 -48"
@@ -4064,7 +4050,7 @@
"time" "0.2"
"_color" "1.0 0.0 0.0"
}
-// entity 7
+// entity 5
{
"classname" "light"
"origin" "-88 -232 -48"
@@ -4075,3 +4061,51 @@
"time" "0.2"
"_color" "0.0 1.0 0.0"
}
+// entity 6
+{
+"classname" "fx_particles"
+"origin" "-172 -44 -48"
+"radius" "48"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+}
+// entity 7
+{
+"classname" "fx_particles"
+"origin" "-172 44 -48"
+"radius" "48"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+}
+// entity 8
+{
+"classname" "fx_particles"
+"origin" "-164 -44 -48"
+"radius" "48"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 9
+{
+"classname" "fx_particles"
+"origin" "-164 44 -48"
+"radius" "48"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 10
+{
+"classname" "fx_particles"
+"origin" "-168 -44 -48"
+"radius" "48"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}
+// entity 11
+{
+"classname" "fx_particles"
+"origin" "-168 44 -48"
+"radius" "48"
+"angle" "180"
+"script" "engine_exhaust_tsukhan"
+}