6 files changed, 86 insertions, 33 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini
new file mode 100644
index 0000000..fd63dcb
--- /dev/null
+++ b/base/ini/factions.ini
@@ -0,0 +1,43 @@
+;
+; cargo.ini
+;
+; Faction definitions 
+
+[faction]
+; faction label
+label=colonies
+; faction full name
+name=Independent Colonies
+; [r g b] primary faction color, values in the 0-255 range
+color=222 192 145
+; [r g b] secondary faction color, values in the 0-255 range
+colorsecond=160 160 160
+
+[faction]
+label=militia
+name=Colonial Militia
+color=100 100 230
+colorsecond=192 192 40
+
+[faction]
+; faction label
+label=lindblade
+; faction full name
+name=House Lindblade
+; [r g b] primary faction color, values in the 0.0-1.0 range
+color=0.5 0.1 0.1
+; [r g b] secondary faction color, values in the 0.0-1.0 range
+colorsecond=0.75 0.35 0
+
+[faction]
+label=miners
+name=Joint Miners Asssociation
+color=106 95 87
+colorsecond=152 166 169
+
+[faction]
+label=pirates
+name=Pirates
+color=158 0 255
+colorsecond=140 140 180
+
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 462680d..872f782 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -127,9 +127,9 @@ price=20000
 cargo=15
 mass=20
 thrust=1
-impulse=6
+impulse=8
 strafe=0.15
-turn=3
+turn=2
 
 info=The Archer was considered to be leap in technology by the Joint Miners Association, allowing for rapid exploration of mineral deposits. Featuring high maneuverability the Archer was capable of outrunning any threat, while having enough cargo-space to return with mineral samples.
 info=Unfortunately, the design revealed several sensor blind spots and as a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the sensor range since.
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 7cb218d..f37b006 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -3,6 +3,22 @@
 ; list of zones in the world
 ;
 
+[size]
+label=fighter_small
+radius=0.25
+
+[size]
+label=fighter_medium
+radius=0.5
+
+[size]
+label=fighter_large
+radius=0.75
+
+; ------------------------------------------------------------------ ;
+; 		ZONES
+; ------------------------------------------------------------------ ;
+
 [world]
 
 ; independent colonies
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index ded3214..4a7180c 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -32,8 +32,7 @@ label=helianthos
 name=Starbase Helianthos
 model=maps/colonial/helianthos
 location=512 -512 0
-color=100 100 230
-colorsecond=0 1 0
+faction=militia
 
 	[ship]
 	label=sharkan
@@ -54,7 +53,7 @@ label=buccaneers
 name=Buccaneers' Den
 model=maps/pirate/juggernaut
 location=-768 1280 0
-color=158 0 255
+faction=pirates
 
 	[ship]
 	label=raider
@@ -78,7 +77,7 @@ color=158 0 255
 [navpoint]
 label=navpoint_south
 name=Navigation point South
-location=-1024 256 0
+location=-1024 0 0
 model=maps/static/navpoint
 
 [jumpgate]
@@ -86,9 +85,8 @@ label=jumpgate_ghant
 name=Jumpgate Antwerp -> Ghant
 model=maps/pirate/jumpgate
 target=ghant:jumpgate_antwerp
-color=222 192 145
-colorsecond=160 160 160
-location=-1048 256 8
+faction=pirates
+location=-1048 0 8
 direction=0
 
 ; ------------------------------------------------------------------ 
@@ -97,18 +95,18 @@ direction=0
 [navpoint]
 label=navpoint_north
 name=Navigation point North
-location=996 -256 0
+location=1096 -256 0
 model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_dover
 name=Jumpgate Antwerp -> Dover
-model=maps/pirate/jumpgate
+model=maps/colonial/jumpgate
 target=dover:jumpgate_antwerp
-color=222 192 145
-colorsecond=160 160 160
-location=1024 -302 0
+location=1124 -302 0
 direction=300
+faction=colonies
+info=Jumpgate to the Dover system.
 
 ; ------------------------------------------------------------------ 
 ; FINNMARK JUMPGATE
@@ -122,9 +120,9 @@ model=maps/static/navpoint
 [jumpgate]
 label=jumpgate_finnmark
 name=Jumpgate Antwerp -> Finnmark
-model=maps/pirate/jumpgate
+model=maps/colonial/jumpgate
 target=finnmark:jumpgate_antwerp
-color=222 192 145
-colorsecond=160 160 160
 location=384 1056 16
 direction=275
+faction=colonies
+info=Jumpgate to the Finnmark system.
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 564e0a9..41251ea 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -32,7 +32,7 @@ label=finnmark
 name=planet Finnmark
 texture=planets/finnmark
 default=yes
-;color=192 88 -64
+faction=miners
 color=1.0 1.0 1.0
 location=128 64 0
 radius=70
@@ -81,8 +81,7 @@ model=maps/colonial/jumpgate
 target=antwerp:jumpgate_finnmark
 location=-96 -576 4
 direction=95
-color=106 95 87
-colorsecond=152 166 169
+faction=miners
 info=Jumpgate to the Antwerp system.
 
 ; ------------------------------------------------------------------ 
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 4c2bcf0..beb6137 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -80,8 +80,10 @@ color=222 192 145
 colorsecond=160 160 160
 ; [float] axis direction, in degrees
 direction=45
-; this is the default base where new players are dock
+; this is the default base where new players are docked
 default=yes
+; faction this station belongs to, it will automaticly receive faction colors
+faction=colonies
 ; info text
 info=Alexandria outpost serves as a commercial and entertainment centre for the Ghant system. Because of its remote location, it is also a popular transit zone for more shady operations, giving birth to its nickname Queen of the Wasteland.
 
@@ -126,18 +128,16 @@ label=alexandria_storage1
 name=storage tanks
 model=maps/colonial/alexandria_storage
 location=-176 -720 32
-color=222 192 145
-colorsecond=160 160 160
 direction=45
+faction=colonies
 
 [entity]
 label=alexandria_storage2
 name=storage tanks
 model=maps/colonial/alexandria_storage
 location=-172 -720 32
-color=222 192 145
-colorsecond=160 160 160
 direction=45
+faction=colonies
 
 ; ------------------------------------------------------------------
 ; BATTLESHIP CUSTODIAN
@@ -148,9 +148,7 @@ name=battleship Custodian
 model=maps/colonial/custodian
 location=-204 -656 32
 direction=305
-color=222 192 145
-; [r g b] entity secondary color, values in the 0-255 range
-colorsecond=160 160 160
+faction=militia
 
 	[ship]
 	label=sharkan
@@ -187,7 +185,7 @@ model=maps/colonial/regula
 location=-128 928 -32
 color=0.4 0.7 0
 direction=225
-info=Regula station is the headquarters of the local mining operation.
+info=Regula station is the headquarters of the local nobium mining operation.
 
 	[ship]
 	label=vector
@@ -221,9 +219,9 @@ label=ikarus
 name=Ikarus satellite
 model=maps/colonial/ikarus
 location=64 -16 0
-color=100 100 230
 direction=120
 pitch=15
+faction=militia
 
 ; ------------------------------------------------------------------
 ; BROGHA JUMPGATE
@@ -241,7 +239,7 @@ model=maps/colonial/jumpgate
 target=brogha:jumpgate_ghant
 location=716 -1024 24
 direction=90
-color=222 192 145
+faction=colonies
 info=Jumpgate to the Brogha system.
 
 ; ------------------------------------------------------------------
@@ -254,6 +252,5 @@ model=maps/pirate/jumpgate
 target=antwerp:jumpgate_ghant
 location=1024 348 32
 direction=180
-color=222 192 145
-colorsecond=160 160 160
+faction=pirates
 info=Jumpgate to the Antwerp system.