Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2009-01-15 19:37:28 +0000
committerEvan Goers <mega@osirion.org>2009-01-15 19:37:28 +0000
commitacf9677ad653458c0d58e8b20df882646c64cdd3 (patch)
tree2346aa8e4492ef25118a29047b0a24f5e1fb4670 /base
parent254dd1f5ec872a815e40a5d8093a4d0448ae6a95 (diff)
Updated custodian, bomber.
Removed particle systems of different sizes as they are depricated now.
Diffstat (limited to 'base')
-rw-r--r--base/ini/particles/engine_exhaust_large.ini13
-rw-r--r--base/ini/particles/engine_exhaust_large_tsukhan.ini13
-rw-r--r--base/ini/particles/engine_exhaust_medium.ini13
-rw-r--r--base/ini/particles/engine_smoke.ini12
-rw-r--r--base/ini/particles/engine_smoke_extralarge_tsukhan.ini13
-rw-r--r--base/ini/particles/engine_smoke_large.ini13
-rw-r--r--base/ini/particles/engine_smoke_large_tsukhan.ini13
-rw-r--r--base/ini/particles/engine_trail_large.ini12
-rw-r--r--base/maps/colonial/custodian.map6
-rw-r--r--base/maps/tsukhan/bomber.map76
10 files changed, 81 insertions, 103 deletions
diff --git a/base/ini/particles/engine_exhaust_large.ini b/base/ini/particles/engine_exhaust_large.ini
deleted file mode 100644
index 8704e2b..0000000
--- a/base/ini/particles/engine_exhaust_large.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_exhaust_large.ini
-; large engine exhaust particles
-;
-
-[particles]
-type=flame
-texture=fx/flame00
-timeout=2.0
-eject=0.04
-radius=128
-alpha=0.75
-offset=0.1 \ No newline at end of file
diff --git a/base/ini/particles/engine_exhaust_large_tsukhan.ini b/base/ini/particles/engine_exhaust_large_tsukhan.ini
deleted file mode 100644
index 7e6ca6d..0000000
--- a/base/ini/particles/engine_exhaust_large_tsukhan.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_exhaust_large_tsukhan.ini
-; large tsukhan engine exhaust particles
-;
-
-[particles]
-type=flame
-texture=fx/flame_tsukhan
-timeout=2.5
-eject=0.20
-radius=256
-alpha=0.5
-offset=0.25
diff --git a/base/ini/particles/engine_exhaust_medium.ini b/base/ini/particles/engine_exhaust_medium.ini
deleted file mode 100644
index d39c3ca..0000000
--- a/base/ini/particles/engine_exhaust_medium.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_exhaust_large.ini
-; large engine exhaust particles
-;
-
-[particles]
-type=flame
-texture=fx/flame00
-timeout=0.75
-eject=0.02
-radius=64
-alpha=0.75
-offset=0.05 \ No newline at end of file
diff --git a/base/ini/particles/engine_smoke.ini b/base/ini/particles/engine_smoke.ini
new file mode 100644
index 0000000..212d980
--- /dev/null
+++ b/base/ini/particles/engine_smoke.ini
@@ -0,0 +1,12 @@
+;
+; particles/engine_smoke_tsukhan.ini
+; tsukhan engine smoke particles
+;
+
+[particles]
+type=jet
+texture=fx/engine_smoke
+timeout=3.0
+eject=0.1
+radius=64
+alpha=0.8
diff --git a/base/ini/particles/engine_smoke_extralarge_tsukhan.ini b/base/ini/particles/engine_smoke_extralarge_tsukhan.ini
deleted file mode 100644
index b476e28..0000000
--- a/base/ini/particles/engine_smoke_extralarge_tsukhan.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_smoke_large.ini
-; large engine smoke particles
-;
-
-[particles]
-type=jet
-texture=fx/engine_smoke_tsukhan
-timeout=7.0
-eject=0.25
-radius=512
-alpha=0.7
-offset=0.2
diff --git a/base/ini/particles/engine_smoke_large.ini b/base/ini/particles/engine_smoke_large.ini
deleted file mode 100644
index 19891f3..0000000
--- a/base/ini/particles/engine_smoke_large.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_smoke_large.ini
-; large engine smoke particles
-;
-
-[particles]
-type=jet
-texture=fx/engine_smoke
-timeout=7.0
-eject=0.25
-radius=128
-alpha=0.7
-offset=0.2 \ No newline at end of file
diff --git a/base/ini/particles/engine_smoke_large_tsukhan.ini b/base/ini/particles/engine_smoke_large_tsukhan.ini
deleted file mode 100644
index 8a127d9..0000000
--- a/base/ini/particles/engine_smoke_large_tsukhan.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_smoke_large.ini
-; large engine smoke particles
-;
-
-[particles]
-type=jet
-texture=fx/engine_smoke_tsukhan
-timeout=7.0
-eject=0.25
-radius=128
-alpha=0.7
-offset=0.2
diff --git a/base/ini/particles/engine_trail_large.ini b/base/ini/particles/engine_trail_large.ini
deleted file mode 100644
index e847aff..0000000
--- a/base/ini/particles/engine_trail_large.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-;
-; particles/engine_trail_large.ini
-; large engine trail particles
-;
-
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=8.0
-eject=0.5
-radius=24
-alpha=0.5 \ No newline at end of file
diff --git a/base/maps/colonial/custodian.map b/base/maps/colonial/custodian.map
index 17921ad..8514f3c 100644
--- a/base/maps/colonial/custodian.map
+++ b/base/maps/colonial/custodian.map
@@ -10782,13 +10782,15 @@
{
"classname" "fx_particles"
"origin" "-3840 384 0"
-"script" "engine_smoke_large"
+"script" "engine_smoke"
"angle" "180"
+"radius" "24"
}
// entity 55
{
"classname" "fx_particles"
"origin" "-3840 -384 0"
-"script" "engine_smoke_large"
+"script" "engine_smoke"
"angle" "180"
+"radius" "24"
}
diff --git a/base/maps/tsukhan/bomber.map b/base/maps/tsukhan/bomber.map
index 5a8b344..c6dc65f 100644
--- a/base/maps/tsukhan/bomber.map
+++ b/base/maps/tsukhan/bomber.map
@@ -1294,25 +1294,79 @@
// entity 6
{
"classname" "fx_flare"
-"origin" "-128 -116 -4"
+"origin" "-130 116 -4"
"flare" "3"
"spawnflags" "4"
"radius" "192"
+"angle" "180"
}
// entity 7
{
-"classname" "fx_flare"
-"origin" "-130 116 -4"
-"flare" "3"
-"spawnflags" "4"
-"radius" "192"
+"classname" "fx_particles"
+"origin" "-64 -116 0"
"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+"roll" "135"
}
// entity 8
{
-"classname" "fx_flare"
-"origin" "-128 116 -4"
-"flare" "3"
-"spawnflags" "4"
-"radius" "192"
+"classname" "fx_particles"
+"origin" "-64 116 0"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+"roll" "135"
+}
+// entity 9
+{
+"classname" "fx_particles"
+"origin" "-64 116 0"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+}
+// entity 10
+{
+"classname" "fx_particles"
+"origin" "-64 -116 0"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+}
+// entity 11
+{
+"classname" "fx_particles"
+"origin" "-64 116 0"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+"roll" "90"
+}
+// entity 12
+{
+"classname" "fx_particles"
+"origin" "-64 -116 0"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+"roll" "90"
+}
+// entity 13
+{
+"classname" "fx_particles"
+"origin" "-64 116 0"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+"roll" "45"
+}
+// entity 14
+{
+"classname" "fx_particles"
+"origin" "-64 -116 0"
+"angle" "180"
+"script" "engine_trail_tsukhan"
+"radius" "15"
+"roll" "45"
}