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>2013-04-21 19:29:26 +0000
committerStijn Buys <ingar@osirion.org>2013-04-21 19:29:26 +0000
commit68ac052312781f1fa241c92a9df4a4ddffd5a2d1 (patch)
tree2a41cd23c2dc41e08d76d9f4ac4967954205f115 /base
parent27dffeb005631b57277d3cdad8bf1f94d2ab3c7c (diff)
Added stars to Oran and Phoenicia, and added a jumpgate between the two systems,
tweaked particle systems.
Diffstat (limited to 'base')
-rw-r--r--base/ini/zones/oran.ini19
-rw-r--r--base/ini/zones/phoenicia.ini35
-rw-r--r--base/particles/engine_exhaust.ini2
-rw-r--r--base/particles/engine_exhaust_tsukhan.ini14
-rw-r--r--base/particles/factory_smoke.ini8
5 files changed, 53 insertions, 25 deletions
diff --git a/base/ini/zones/oran.ini b/base/ini/zones/oran.ini
index 045ac2a..5c6d4c0 100644
--- a/base/ini/zones/oran.ini
+++ b/base/ini/zones/oran.ini
@@ -25,7 +25,22 @@ faction=neutral
[jumpgate]
label=jumpgate_camorra
-location=320 -1200 -8
+location=576 -1168 -8
angles=0 100 0
target=camorra:jumpgate_oran
-faction=neutral \ No newline at end of file
+faction=neutral
+
+[jumpgate]
+label=jumpgate_phoenicia
+location=-1080 -736 -8
+angles=0 40 0
+target=phoenicia:jumpgate_oran
+faction=neutral
+
+[star]
+label=star
+name=class F star
+location=1848 304 0
+angles=0 180 0
+radius=72
+color=255 255 222
diff --git a/base/ini/zones/phoenicia.ini b/base/ini/zones/phoenicia.ini
index d2ad897..6c6c75c 100644
--- a/base/ini/zones/phoenicia.ini
+++ b/base/ini/zones/phoenicia.ini
@@ -18,39 +18,52 @@ faction=praetoria
; zone information
info=The Phoenicia system.
-
[racetrack]
label=racetrack
name=Race Start
-model=maps/race/checkpoint
location=64 0 0
-yaw=180
+angles=0 180 0
+model=maps/race/checkpoint
color=.5 .5 .5
[checkpoint]
label=checkpoint1
name=Checkpoint 1
+location=102 3 0
+angles=0 180 0
model=maps/race/checkpoint
-location=96 0 0
-yaw=180
[checkpoint]
label=checkpoint2
name=Checkpoint 2
+location=129 2 4
+angles=0 170 0
model=maps/race/checkpoint
-location=128 0 4
-yaw=180
[checkpoint]
label=checkpoint3
name=Checkpoint 3
+location=149 -12 4
+angles=0 135 0
model=maps/race/checkpoint
-location=138 -10 4
-yaw=135
[checkpoint]
label=checkpoint4
name=Race Finish
+location=158 -37 4
+angles=0 90 0
model=maps/race/checkpoint
-location=138 -28 4
-yaw=90
+
+[jumpgate]
+label=jumpgate_oran
+location=732 688 0
+angles=0 210 0
+target=oran:jumpgate_phoenicia
+faction=praetoria
+[star]
+label=star
+name=class B star
+location=368 -1704 0
+angles=0 90 0
+radius=132
+color=244 244 255
diff --git a/base/particles/engine_exhaust.ini b/base/particles/engine_exhaust.ini
index b2de7bb..39cd740 100644
--- a/base/particles/engine_exhaust.ini
+++ b/base/particles/engine_exhaust.ini
@@ -24,5 +24,5 @@
speed=32
; ejection cone size, in degrees
cone=0
- ; only eject particles when thruster is used
+ ; only eject particles when thruster is active
thrust=true
diff --git a/base/particles/engine_exhaust_tsukhan.ini b/base/particles/engine_exhaust_tsukhan.ini
index f546fcd..a019bbe 100644
--- a/base/particles/engine_exhaust_tsukhan.ini
+++ b/base/particles/engine_exhaust_tsukhan.ini
@@ -5,12 +5,12 @@
[particles]
- [flame]
- texture=fx/flame_tsukhan
- timeout=1.0
- eject=0.01
- radius=32
- alpha=0.5
+; [flame]
+; texture=fx/flame_tsukhan
+; timeout=1.0
+; interval=50
+; radius=32
+; alpha=0.5
[trail]
; particle texture
@@ -18,7 +18,7 @@
; particle lifespan, in milliseconds
lifespan=4000
; ejector interval, in milliseconds
- eject=150
+ interval=150
; particle radius
radius=4
; particle alpha [start] [end]
diff --git a/base/particles/factory_smoke.ini b/base/particles/factory_smoke.ini
index e99a0ce..3ddda1f 100644
--- a/base/particles/factory_smoke.ini
+++ b/base/particles/factory_smoke.ini
@@ -8,7 +8,7 @@
[sprites]
texture=fx/explosion01_15
lifespan=4000
- interval=75
+ interval=100
radius=64 256 16
spawnradius=8
alpha=0 0.5 0
@@ -19,13 +19,13 @@
; smoke effect
[sprites]
texture=fx/engine_smoke
- lifespan=2500
- interval=50
+ lifespan=4500
+ interval=100
spawnradius=16
cone=10
radius=32 512
alpha=0 0.5 0
offset=0.5
- speed=76
+ speed=82
color=0.7 0.7 0.7
colorsecond=0.2 0.2 0.2