cleanups

13 files changed, 90 insertions, 73 deletions

diff --git a/base/ini/player.ini b/base/ini/player.ini
new file mode 100644
index 0000000..cd5feb9
--- /dev/null
+++ b/base/ini/player.ini
@@ -0,0 +1,9 @@
+;
+; player.ini
+; default player settings
+
+[player]
+zone=ghant
+ship=vector
+credits=5000
+
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 7846a9b..f1b7568 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -24,8 +24,6 @@ turnspeed=45
 price=12500
 ; cargo hold size, 10 is one metric tonne
 cargo=50
-; this is the default ship model
-default=yes
 
 [ship]
 label=tensor
diff --git a/base/ini/ui.ini b/base/ini/ui.ini
index 7ee3cf4..747af6e 100644
--- a/base/ini/ui.ini
+++ b/base/ini/ui.ini
@@ -27,13 +27,28 @@ foreground=1 1 1
 highlight=1 1 .5
 ; global text color
 text=0.75 0.75 0.75
+;text=0.8 0.8 0.6
 ; global background color rgba
 background=0.0 0.0 0.0 0.75
 ; global border color rgb
 border=0 0.8 0 0.5
 ; pointer color
-pointer=0 .75 0
+pointer=0 0.75 0
 ; active pointer color
 active=0 1 0
 ; debug color
-debug=1.0 0.0 1.0 0.75
+debug=0.5 0.5 0.5
+
+[hud]
+; mission target
+mission=1.0 0.5 1.0
+
+[text]
+; bold text color
+bold=1 1 1
+; set fancy color
+fancy=0 1 0
+; warning text color
+warning=1 1 0
+; error text color
+error=1 0 0
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 4907ae6..0d1883a 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -37,7 +37,8 @@ name=planet Brogha
 ; [x y x] entity location
 location=768 -786 32
 ; [r g b] entity primary color, values in the 0-1 range
-color=.7 0.95 0.4
+;color=.7 0.95 0.4
+color=1 1 1
 ; [string] globe texture name
 texture=planets/brogha
 ; [float] entity radius (10 game units == 1km ingame)
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index a0efc00..8724078 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -11,8 +11,6 @@
 name=Ghant system
 ; [string] sky texture
 sky=sky12
-; [bool] this is the default system
-default=yes
 
 ;
 ; ORIGIN
@@ -131,7 +129,7 @@ color=0.4 0.7 0
 label=ikarus
 name=Ikarus satellite
 model=colonial/ikarus
-location=64 0 0
+location=64 -16 0
 color=100 100 230
 direction=120
 pitch=15
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index d5bff17..cbbb543 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -9,7 +9,6 @@
 [zone]
 name=Kiana system
 sky=sky20
-default=no
 
 ;
 ; ORIGIN
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index 9e3d4e9..7aaa425 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -9,7 +9,6 @@
 [zone]
 name=Lindblade system
 sky=sky17
-;default=no
 
 ;
 ; ORIGIN
diff --git a/base/ini/zones/race.ini b/base/ini/zones/race.ini
index 332dd0d..9c0397a 100644
--- a/base/ini/zones/race.ini
+++ b/base/ini/zones/race.ini
@@ -1,6 +1,5 @@
 [zone]
-name=RaceTrack system
-default=no
+name=Race Track system
 
 [navpoint]
 label=navpoint_origin
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index 694d7ea..7131760 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -1,6 +1,5 @@
 [zone]
 name=Unknown system
-default=no
 
 [navpoint]
 label=navpoint_origin
@@ -65,4 +64,4 @@ 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
+direction=90
diff --git a/base/maps/independent/horizon.map b/base/maps/independent/horizon.map
index 0102ceb..1073b95 100644
--- a/base/maps/independent/horizon.map
+++ b/base/maps/independent/horizon.map
@@ -4337,14 +4337,6 @@
 }
 // entity 1
 {
-"classname" "target_engine"
-"origin" "-784 -496 -144"
-"angle" "180"
-"radius" "80"
-"_color" "0 25 230"
-}
-// entity 2
-{
 "classname" "light"
 "origin" "176 -376 -24"
 "light" "15"
@@ -4353,7 +4345,7 @@
 "time" "0.20"
 "offset" "0.25"
 }
-// entity 3
+// entity 2
 {
 "classname" "light"
 "origin" "-592 -376 -24"
@@ -4363,7 +4355,7 @@
 "time" "0.2"
 "offset" "0"
 }
-// entity 4
+// entity 3
 {
 "classname" "light"
 "origin" "-80 -376 -24"
@@ -4373,7 +4365,7 @@
 "time" "0.2"
 "offset" "0.5"
 }
-// entity 5
+// entity 4
 {
 "classname" "light"
 "origin" "-336 -376 -24"
@@ -4383,7 +4375,7 @@
 "time" "0.2"
 "offset" "0.75"
 }
-// entity 6
+// entity 5
 {
 "classname" "light"
 "origin" "-336 -616 -24"
@@ -4393,7 +4385,7 @@
 "time" "0.2"
 "offset" "0.75"
 }
-// entity 7
+// entity 6
 {
 "classname" "light"
 "origin" "176 -616 -24"
@@ -4403,7 +4395,7 @@
 "time" "0.20"
 "offset" "0.25"
 }
-// entity 8
+// entity 7
 {
 "classname" "light"
 "origin" "-592 -616 -24"
@@ -4413,7 +4405,7 @@
 "time" "0.2"
 "offset" "0"
 }
-// entity 9
+// entity 8
 {
 "classname" "light"
 "origin" "-80 -616 -24"
@@ -4423,3 +4415,10 @@
 "time" "0.2"
 "offset" "0.5"
 }
+// entity 9
+{
+"classname" "fx_particles"
+"origin" "-752 -496 -144"
+"angle" "180"
+"script" "engine_exhaust_medium"
+}
diff --git a/base/maps/tsukhan/interceptor.map b/base/maps/tsukhan/interceptor.map
index 70ab607..dfb8d80 100644
--- a/base/maps/tsukhan/interceptor.map
+++ b/base/maps/tsukhan/interceptor.map
@@ -2990,16 +2990,6 @@
 }
 // entity 1
 {
-"classname" "target_cannon"
-"origin" "152 80 0"
-}
-// entity 2
-{
-"classname" "target_cannon"
-"origin" "152 -80 0"
-}
-// entity 3
-{
 "classname" "light"
 "origin" "280 0 0"
 "light" "10"
@@ -3008,7 +2998,7 @@
 "time" "0.1"
 "offset" "0.5"
 }
-// entity 4
+// entity 2
 {
 "classname" "light"
 "origin" "-252 292 0"
@@ -3018,7 +3008,7 @@
 "time" "0.2"
 "offset" "0"
 }
-// entity 5
+// entity 3
 {
 "classname" "light"
 "origin" "-252 -292 0"
@@ -3028,87 +3018,97 @@
 "time" "0.2"
 "offset" "0.5"
 }
-// entity 6
+// entity 4
 {
 "classname" "fx_particles"
 "origin" "-240 -152 -20"
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
-// entity 7
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-240 -152 20"
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
-// entity 8
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-240 152 20"
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
-// entity 9
+// entity 7
 {
 "classname" "fx_particles"
 "origin" "-240 152 -20"
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
-// entity 10
+// entity 8
 {
 "classname" "fx_particles"
 "origin" "-264 -152 -20"
 "angle" "180"
 "script" "engine_trail_tsukhan"
 }
-// entity 11
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-272 -152 20"
 "angle" "180"
 "script" "engine_trail_tsukhan"
 }
-// entity 12
+// entity 10
 {
 "classname" "fx_particles"
 "origin" "-272 152 20"
 "angle" "180"
 "script" "engine_trail_tsukhan"
 }
-// entity 13
+// entity 11
 {
 "classname" "fx_particles"
 "origin" "-264 152 -20"
 "angle" "180"
 "script" "engine_trail_tsukhan"
 }
-// entity 14
+// entity 12
 {
 "classname" "fx_particles"
 "origin" "-268 -152 -20"
 "angle" "180"
 "script" "engine_smoke_tsukhan"
 }
-// entity 15
+// entity 13
 {
 "classname" "fx_particles"
 "origin" "-276 -152 20"
 "angle" "180"
 "script" "engine_smoke_tsukhan"
 }
-// entity 16
+// entity 14
 {
 "classname" "fx_particles"
 "origin" "-276 152 20"
 "angle" "180"
 "script" "engine_smoke_tsukhan"
 }
-// entity 17
+// entity 15
 {
 "classname" "fx_particles"
 "origin" "-268 152 -20"
 "angle" "180"
 "script" "engine_smoke_tsukhan"
 }
+// entity 16
+{
+"classname" "location_cannon"
+"origin" "152 -80 0"
+}
+// entity 17
+{
+"classname" "location_cannon"
+"origin" "152 80 0"
+}
diff --git a/base/maps/tsukhan/scout.map b/base/maps/tsukhan/scout.map
index f756d37..1e83dee 100644
--- a/base/maps/tsukhan/scout.map
+++ b/base/maps/tsukhan/scout.map
@@ -4020,16 +4020,6 @@
 }
 // entity 1
 {
-"classname" "target_cannon"
-"origin" "248 -24 -56"
-}
-// entity 2
-{
-"classname" "target_cannon"
-"origin" "248 24 -56"
-}
-// entity 3
-{
 "classname" "light"
 "origin" "280 0 -58"
 "light" "10"
@@ -4039,7 +4029,7 @@
 "time" "0.1"
 "_color" "1.0 1.0 1.0"
 }
-// entity 4
+// entity 2
 {
 "classname" "light"
 "origin" "-88 232 -48"
@@ -4049,7 +4039,7 @@
 "time" "0.2"
 "_color" "1.0 0.0 0.0"
 }
-// entity 5
+// entity 3
 {
 "classname" "light"
 "origin" "-88 -232 -48"
@@ -4060,7 +4050,7 @@
 "time" "0.2"
 "_color" "0.0 1.0 0.0"
 }
-// entity 6
+// entity 4
 {
 "classname" "fx_particles"
 "origin" "-172 -44 -48"
@@ -4068,7 +4058,7 @@
 "angle" "180"
 "script" "engine_trail_tsukhan"
 }
-// entity 7
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-172 44 -48"
@@ -4076,7 +4066,7 @@
 "angle" "180"
 "script" "engine_trail_tsukhan"
 }
-// entity 8
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-164 -44 -48"
@@ -4084,7 +4074,7 @@
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
-// entity 9
+// entity 7
 {
 "classname" "fx_particles"
 "origin" "-164 44 -48"
@@ -4092,7 +4082,7 @@
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
-// entity 10
+// entity 8
 {
 "classname" "fx_particles"
 "origin" "-168 -44 -48"
@@ -4100,7 +4090,7 @@
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
-// entity 11
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-168 44 -48"
@@ -4108,3 +4098,13 @@
 "angle" "180"
 "script" "engine_exhaust_tsukhan"
 }
+// entity 10
+{
+"classname" "location_cannon"
+"origin" "248 -24 -56"
+}
+// entity 11
+{
+"classname" "location_cannon"
+"origin" "248 24 -56"
+}
diff --git a/gtkradiant/osirion.game/base/entities.def b/gtkradiant/osirion.game/base/entities.def
index 0d28f85..0d84591 100644
--- a/gtkradiant/osirion.game/base/entities.def
+++ b/gtkradiant/osirion.game/base/entities.def
@@ -19,6 +19,7 @@ An exterior light
 
 strobe		make a strobe light (spawflag 1)
 entity		light has entity color (spawflag 2)
+
 light		light radius, default is 100
 frequency	strobe frequency, in flashes per second
 offset		strobe offset, in seconds
@@ -51,8 +52,8 @@ roll		roll ange of the flare
 /*QUAKED fx_particles (.7 .5 1) (-8 -8 -8) (8 8 8) ? entity engine
 A particle system
 
-entity		flare has entity color (spawflag 2)
-engine		flare is actived by engine (spawnflag 4)
+entity		particles have entity color (spawflag 2)
+engine		particles have engine color (spawnflag 4)
 
 script		name of the particle system script
 angle		direction angle of the flare