From 92dfcd3ad1be9725736b8ab7631b3519ea9a8611 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 7 Dec 2008 14:55:48 +0000
Subject: updated ini files, unknown system, flame particles

---
 base/ini/particles.ini           |  92 +++++++++++++++++-------
 base/ini/world.ini               |   1 +
 base/ini/zones/ghant.ini         |   2 +-
 base/ini/zones/unknown.ini       |  68 ++++++++++++++++++
 base/maps/colonial/custodian.map | 150 ++++++++++++++++++++++-----------------
 base/maps/mercenary/pod.map      |   4 +-
 base/maps/merchant/matrix.map    |   4 +-
 7 files changed, 224 insertions(+), 97 deletions(-)
 create mode 100644 base/ini/zones/unknown.ini

(limited to 'base')

diff --git a/base/ini/particles.ini b/base/ini/particles.ini
index a75041c..4b8f728 100644
--- a/base/ini/particles.ini
+++ b/base/ini/particles.ini
@@ -2,34 +2,74 @@
 ; model particles
 ;
 
-; engine exhaust effects
+
+;
+; SMALL
+
+[particles]
+label=engine_trail
+type=trail
+texture=fx/engine_trail
+timeout=4.0
+eject=0.15
+radius=12
+alpha=0.5
+
 [particles]
 label=engine_exhaust
-type=jet
-texture=fx/engine_exhaust
-timeout=1.0
-eject=0.01
-radius=32
+type=flame
+texture=fx/flame00
+timeout=0.25
+eject=0.05
+radius=24
 alpha=0.5
+offset=0.25
+
+;
+; LARGE
 
 [particles]
-label=engine_exhaust_tsukhan
+label=engine_trail_large
+type=trail
+texture=fx/engine_trail
+timeout=8.0
+eject=0.5
+radius=24
+alpha=0.5
+
+[particles]
+label=engine_exhaust_large
+type=flame
+texture=fx/flame00
+timeout=1.0
+eject=0.05
+radius=128
+alpha=0.75
+offset=0.25
+
+[particles]
+label=engine_smoke_large
 type=jet
+texture=fx/engine_smoke
+timeout=7.0
+eject=0.25
+radius=128
+alpha=0.7
+offset=0.2
+
+;
+; TSU'KHAN SHIPS
+;
+
+[particles]
+label=engine_exhaust_tsukhan
+type=flame
 texture=fx/engine_exhaust_tsukhan
 timeout=1.0
 eject=0.01
 radius=32
 alpha=0.5
 
-; engine trail effects
-[particles]
-label=engine_trail
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=12
-alpha=0.5
 
 [particles]
 label=engine_trail_tsukhan
@@ -40,16 +80,6 @@ eject=0.15
 radius=12
 alpha=1.0
 
-; engine smoke effects
-[particles]
-label=engine_smoke
-type=jet
-texture=fx/engine_smoke
-timeout=3.0
-eject=0.1
-radius=32
-alpha=0.8
-
 [particles]
 label=engine_smoke_tsukhan
 type=jet
@@ -58,3 +88,13 @@ timeout=3.0
 eject=0.1
 radius=64
 alpha=0.8
+
+[particles]
+label=engine_exhaust_large_tsukhan
+type=flame
+texture=fx/flame00
+timeout=2.5
+eject=0.20
+radius=256
+alpha=0.5
+offset=0.25
diff --git a/base/ini/world.ini b/base/ini/world.ini
index ba87393..ec027ec 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -23,5 +23,6 @@ zone=kiana
 
 ; misc systems
 zone=race
+zone=unknown
 
 
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index c72ea6f..a0efc00 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -84,7 +84,7 @@ default=yes
 [station]
 label=custodian
 name=battleship Custodian
-model=colonial/battleship
+model=colonial/custodian
 location=-204 -656 32
 direction=305
 color=222 192 145
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
new file mode 100644
index 0000000..694d7ea
--- /dev/null
+++ b/base/ini/zones/unknown.ini
@@ -0,0 +1,68 @@
+[zone]
+name=Unknown system
+default=no
+
+[navpoint]
+label=navpoint_origin
+name=Navigation point Origin
+location=0 0 0
+
+[entity]
+label=vector
+name=Micron Vector
+model=merchant/vector
+location=4 -8 0
+color=0.5 0 0
+colorsecond=0.8 0.2 0
+
+[entity]
+label=matrix
+name=Micron Tensor
+model=merchant/tensor
+location=4 0  0
+color=0.5 0 0
+colorsecond=0.8 0.2 0
+
+[entity]
+label=matrix
+name=Micron Matrix
+model=merchant/matrix
+location=4 8 0
+color=0.5 0 0
+colorsecond=0.8 0.2 0
+
+[entity]
+label=heavycruiser
+label=Tsu'Khan Heavy Cruiser
+model=tsukhan/heavycruiser
+location=32 -16 0
+color=127 26 127
+
+[entity]
+label=juggernaut
+name=Pirate Juggernaut
+model=pirate/juggernaut
+location=32 16 0
+
+[entity]
+label=custodian
+name=Colonial Battleship
+model=colonial/custodian
+location=32 32 0
+
+[entity]
+label=alexandria
+name=Alexandria outpost
+model=colonial/alexandria
+location=32 64 0
+direction=270
+color=222 192 145
+
+[entity]
+label=ensor
+name=Ensor station
+model=independent/ensor
+location=32 -64 0
+color=0.7 0.7 0.9
+colorsecond=0.7 0.8 0.95
+direction=90
\ No newline at end of file
diff --git a/base/maps/colonial/custodian.map b/base/maps/colonial/custodian.map
index d6db555..17921ad 100644
--- a/base/maps/colonial/custodian.map
+++ b/base/maps/colonial/custodian.map
@@ -3926,7 +3926,7 @@
 {
 ( -3328 -608 -160 ) ( -3520 -512 -192 ) ( -3520 -608 -160 ) colors/grey50 0 0 0 1 1 134217728 0 0
 ( -3328 -128 96 ) ( -3328 -640 -96 ) ( -3328 -640 96 ) common/caulk 0 0 0 1 1 134217728 0 0
-( -3520 -128 -96 ) ( -3520 -640 96 ) ( -3520 -640 -96 ) common/engine 0 0 0 1 1 134217728 0 0
+( -3520 -128 -96 ) ( -3520 -640 96 ) ( -3520 -640 -96 ) colors/black 0 0 0 1 1 134217728 0 0
 ( -3328 -640 96 ) ( -3520 -640 -96 ) ( -3520 -640 96 ) colors/grey50 0 0 0 1 1 134217728 0 0
 ( -3328 -608 -160 ) ( -3520 -608 -160 ) ( -3520 -640 -96 ) colors/grey50 0 0 0 1 1 134217728 0 0
 ( -3328 -256 -192 ) ( -3520 -256 -192 ) ( -3520 -512 -192 ) colors/grey50 0 0 0 1 1 134217728 0 0
@@ -10235,7 +10235,7 @@
 {
 ( -3328 160 -160 ) ( -3520 256 -192 ) ( -3520 160 -160 ) colors/grey50 0 0 0 1 1 134217728 0 0
 ( -3328 128 -96 ) ( -3328 640 96 ) ( -3328 640 -96 ) common/caulk 0 0 0 1 1 134217728 0 0
-( -3520 128 96 ) ( -3520 640 -96 ) ( -3520 640 96 ) common/engine 0 0 0 1 1 134217728 0 0
+( -3520 128 96 ) ( -3520 640 -96 ) ( -3520 640 96 ) colors/black 0 0 0 1 1 134217728 0 0
 ( -3328 128 96 ) ( -3520 128 -96 ) ( -3520 128 96 ) colors/grey50 0 0 0 1 1 134217728 0 0
 ( -3328 160 -160 ) ( -3520 160 -160 ) ( -3520 128 -96 ) colors/grey50 0 0 0 1 1 134217728 0 0
 ( -3328 512 -192 ) ( -3520 512 -192 ) ( -3520 256 -192 ) colors/grey50 0 0 0 1 1 134217728 0 0
@@ -10251,27 +10251,13 @@
 }
 // entity 1
 {
-"classname" "fx_particles"
-"origin" "-3840 384 0"
-"script" "engine_smoke"
-"angle" "180"
-}
-// entity 2
-{
-"classname" "fx_particles"
-"origin" "-3840 -384 0"
-"script" "engine_smoke"
-"angle" "180"
-}
-// entity 3
-{
 "classname" "fx_flare"
 "origin" "3088 0 0"
 "flare" "2"
 "spawnflags" "2"
 "radius" "512"
 }
-// entity 4
+// entity 2
 {
 "classname" "light"
 "origin" "1024 -2704 -384"
@@ -10282,7 +10268,7 @@
 "_color" "0.00114443 1 0"
 "offset" ".10"
 }
-// entity 5
+// entity 3
 {
 "classname" "light"
 "origin" "-1280 0 720"
@@ -10292,7 +10278,7 @@
 "frequency" "1"
 "offset" ".25"
 }
-// entity 6
+// entity 4
 {
 "classname" "light"
 "origin" "1024 2704 -384"
@@ -10303,7 +10289,7 @@
 "_color" "1 0 0"
 "offset" ".60"
 }
-// entity 7
+// entity 5
 {
 "classname" "light"
 "origin" "-1024 -2704 -384"
@@ -10314,7 +10300,7 @@
 "_color" "0.00114443 1 0"
 "offset" ".25"
 }
-// entity 8
+// entity 6
 {
 "classname" "light"
 "origin" "-1024 2704 -384"
@@ -10325,7 +10311,7 @@
 "_color" "1 0 0"
 "offset" ".75"
 }
-// entity 9
+// entity 7
 {
 "classname" "light"
 "origin" "0 0 720"
@@ -10335,7 +10321,7 @@
 "frequency" "1"
 "offset" ".05"
 }
-// entity 10
+// entity 8
 {
 "classname" "light"
 "origin" "384 -1920 -720"
@@ -10345,7 +10331,7 @@
 "offset" "0.3"
 "frequency" ".5"
 }
-// entity 11
+// entity 9
 {
 "classname" "light"
 "origin" "-1408 -1920 -720"
@@ -10355,7 +10341,7 @@
 "offset" "0.65"
 "frequency" ".5"
 }
-// entity 12
+// entity 10
 {
 "classname" "light"
 "origin" "-1664 -1920 -720"
@@ -10366,7 +10352,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 13
+// entity 11
 {
 "classname" "light"
 "origin" "640 -1920 -720"
@@ -10376,7 +10362,7 @@
 "offset" "0.25"
 "frequency" ".5"
 }
-// entity 14
+// entity 12
 {
 "classname" "light"
 "origin" "896 -1920 -720"
@@ -10386,7 +10372,7 @@
 "offset" "0.2"
 "frequency" ".5"
 }
-// entity 15
+// entity 13
 {
 "classname" "light"
 "origin" "1856 -2176 -720"
@@ -10396,7 +10382,7 @@
 "offset" "0"
 "frequency" ".5"
 }
-// entity 16
+// entity 14
 {
 "classname" "light"
 "origin" "1664 -1920 -720"
@@ -10406,7 +10392,7 @@
 "offset" "0.05"
 "frequency" ".5"
 }
-// entity 17
+// entity 15
 {
 "classname" "light"
 "origin" "1408 -1920 -720"
@@ -10416,7 +10402,7 @@
 "offset" "0.1"
 "frequency" ".5"
 }
-// entity 18
+// entity 16
 {
 "classname" "light"
 "origin" "-1152 -1920 -720"
@@ -10426,7 +10412,7 @@
 "offset" "0.6"
 "frequency" ".5"
 }
-// entity 19
+// entity 17
 {
 "classname" "light"
 "origin" "-1856 -2176 -720"
@@ -10437,7 +10423,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 20
+// entity 18
 {
 "classname" "light"
 "origin" "1152 -1920 -720"
@@ -10447,7 +10433,7 @@
 "offset" "0.15"
 "frequency" ".5"
 }
-// entity 21
+// entity 19
 {
 "classname" "light"
 "origin" "128 -1920 -720"
@@ -10457,7 +10443,7 @@
 "offset" "0.35"
 "frequency" ".5"
 }
-// entity 22
+// entity 20
 {
 "classname" "light"
 "origin" "-384 -1920 -720"
@@ -10467,7 +10453,7 @@
 "offset" "0.45"
 "frequency" ".5"
 }
-// entity 23
+// entity 21
 {
 "classname" "light"
 "origin" "-640 -1920 -720"
@@ -10477,7 +10463,7 @@
 "offset" "0.5"
 "frequency" ".5"
 }
-// entity 24
+// entity 22
 {
 "classname" "light"
 "origin" "-128 -1920 -720"
@@ -10487,7 +10473,7 @@
 "offset" "0.4"
 "frequency" ".5"
 }
-// entity 25
+// entity 23
 {
 "classname" "light"
 "origin" "-896 -1920 -720"
@@ -10497,7 +10483,7 @@
 "offset" "0.55"
 "frequency" ".5"
 }
-// entity 26
+// entity 24
 {
 "classname" "light"
 "origin" "1920 -1920 -720"
@@ -10507,7 +10493,7 @@
 "offset" "0"
 "frequency" ".5"
 }
-// entity 27
+// entity 25
 {
 "classname" "light"
 "origin" "1856 -1664 -720"
@@ -10517,7 +10503,7 @@
 "offset" "0"
 "frequency" ".5"
 }
-// entity 28
+// entity 26
 {
 "classname" "light"
 "origin" "-1920 -1920 -720"
@@ -10528,7 +10514,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 29
+// entity 27
 {
 "classname" "light"
 "origin" "-1856 -1664 -720"
@@ -10539,7 +10525,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 30
+// entity 28
 {
 "classname" "light"
 "origin" "-1856 2176 -720"
@@ -10550,7 +10536,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 31
+// entity 29
 {
 "classname" "light"
 "origin" "-640 1920 -720"
@@ -10560,7 +10546,7 @@
 "offset" "0.5"
 "frequency" ".5"
 }
-// entity 32
+// entity 30
 {
 "classname" "light"
 "origin" "-384 1920 -720"
@@ -10570,7 +10556,7 @@
 "offset" "0.45"
 "frequency" ".5"
 }
-// entity 33
+// entity 31
 {
 "classname" "light"
 "origin" "1856 2176 -720"
@@ -10580,7 +10566,7 @@
 "offset" "0"
 "frequency" ".5"
 }
-// entity 34
+// entity 32
 {
 "classname" "light"
 "origin" "1920 1920 -720"
@@ -10590,7 +10576,7 @@
 "offset" "0"
 "frequency" ".5"
 }
-// entity 35
+// entity 33
 {
 "classname" "light"
 "origin" "-1920 1920 -720"
@@ -10601,7 +10587,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 36
+// entity 34
 {
 "classname" "light"
 "origin" "-128 1920 -720"
@@ -10611,7 +10597,7 @@
 "offset" "0.4"
 "frequency" ".5"
 }
-// entity 37
+// entity 35
 {
 "classname" "light"
 "origin" "-896 1920 -720"
@@ -10621,7 +10607,7 @@
 "offset" "0.55"
 "frequency" ".5"
 }
-// entity 38
+// entity 36
 {
 "classname" "light"
 "origin" "384 1920 -720"
@@ -10631,7 +10617,7 @@
 "offset" "0.3"
 "frequency" ".5"
 }
-// entity 39
+// entity 37
 {
 "classname" "light"
 "origin" "-1408 1920 -720"
@@ -10641,7 +10627,7 @@
 "offset" "0.65"
 "frequency" ".5"
 }
-// entity 40
+// entity 38
 {
 "classname" "light"
 "origin" "-1664 1920 -720"
@@ -10652,7 +10638,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 41
+// entity 39
 {
 "classname" "light"
 "origin" "640 1920 -720"
@@ -10662,7 +10648,7 @@
 "offset" "0.25"
 "frequency" ".5"
 }
-// entity 42
+// entity 40
 {
 "classname" "light"
 "origin" "896 1920 -720"
@@ -10672,7 +10658,7 @@
 "offset" "0.2"
 "frequency" ".5"
 }
-// entity 43
+// entity 41
 {
 "classname" "light"
 "origin" "1856 1664 -720"
@@ -10682,7 +10668,7 @@
 "offset" "0"
 "frequency" ".5"
 }
-// entity 44
+// entity 42
 {
 "classname" "light"
 "origin" "1664 1920 -720"
@@ -10692,7 +10678,7 @@
 "offset" "0.05"
 "frequency" ".5"
 }
-// entity 45
+// entity 43
 {
 "classname" "light"
 "origin" "1408 1920 -720"
@@ -10702,7 +10688,7 @@
 "offset" "0.1"
 "frequency" ".5"
 }
-// entity 46
+// entity 44
 {
 "classname" "light"
 "origin" "-1152 1920 -720"
@@ -10712,7 +10698,7 @@
 "offset" "0.6"
 "frequency" ".5"
 }
-// entity 47
+// entity 45
 {
 "classname" "light"
 "origin" "-1856 1664 -720"
@@ -10723,7 +10709,7 @@
 "frequency" ".5"
 "_color" "1 0 0"
 }
-// entity 48
+// entity 46
 {
 "classname" "light"
 "origin" "1152 1920 -720"
@@ -10733,7 +10719,7 @@
 "offset" "0.15"
 "frequency" ".5"
 }
-// entity 49
+// entity 47
 {
 "classname" "light"
 "origin" "128 1920 -720"
@@ -10743,7 +10729,7 @@
 "offset" "0.35"
 "frequency" ".5"
 }
-// entity 50
+// entity 48
 {
 "classname" "light"
 "origin" "-1024 0 720"
@@ -10753,7 +10739,7 @@
 "frequency" "1"
 "offset" ".20"
 }
-// entity 51
+// entity 49
 {
 "classname" "light"
 "origin" "1024 0 720"
@@ -10762,15 +10748,47 @@
 "time" "0.15"
 "frequency" "1"
 }
-// entity 52
+// entity 50
 {
 "classname" "location_dock"
 "origin" "2560 1920 -384"
 "radius" "128"
 }
-// entity 53
+// entity 51
 {
 "classname" "location_dock"
 "origin" "2560 -1920 -384"
 "radius" "128"
 }
+// entity 52
+{
+"classname" "fx_flare"
+"origin" "-3584 384 0"
+"radius" "256"
+"spawnflags" "4"
+"flare" "1"
+"angle" "180"
+}
+// entity 53
+{
+"classname" "fx_flare"
+"origin" "-3584 -384 0"
+"radius" "256"
+"spawnflags" "4"
+"flare" "1"
+"angle" "180"
+}
+// entity 54
+{
+"classname" "fx_particles"
+"origin" "-3840 384 0"
+"script" "engine_smoke_large"
+"angle" "180"
+}
+// entity 55
+{
+"classname" "fx_particles"
+"origin" "-3840 -384 0"
+"script" "engine_smoke_large"
+"angle" "180"
+}
diff --git a/base/maps/mercenary/pod.map b/base/maps/mercenary/pod.map
index d78d623..b7e8ae9 100644
--- a/base/maps/mercenary/pod.map
+++ b/base/maps/mercenary/pod.map
@@ -1632,9 +1632,9 @@
 // entity 3
 {
 "classname" "fx_particles"
-"origin" "-320 0 0"
+"origin" "-288 0 0"
 "angle" "180"
-"script" "engine_trail"
+"script" "engine_exhaust"
 }
 // entity 4
 {
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index b84c63d..3af0d05 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -4211,7 +4211,7 @@
 "classname" "fx_particles"
 "origin" "-728 80 384"
 "angle" "180"
-"script" "engine_smoke"
+"script" "engine_exhaust"
 }
 // entity 30
 {
@@ -4225,5 +4225,5 @@
 "classname" "fx_particles"
 "origin" "-728 -80 384"
 "angle" "180"
-"script" "engine_smoke"
+"script" "engine_exhaust"
 }
-- 
cgit v1.2.3