From ead4444b17fbe671ce47dce1aca85160bb91c392 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 12 Nov 2010 00:06:43 +0000
Subject: adds faction.ini, added factions to world definitions adds
 templates.ini  and initial radius keys

---
 base/ini/game.ini            |  6 ------
 base/ini/templates.ini       | 36 ++++++++++++++++++++++++++++++++++++
 base/ini/world.ini           | 12 ------------
 base/ini/zones/antwerp.ini   |  2 ++
 base/ini/zones/lindblade.ini | 13 +------------
 5 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 base/ini/templates.ini

(limited to 'base/ini')

diff --git a/base/ini/game.ini b/base/ini/game.ini
index b8d61b7..4485457 100644
--- a/base/ini/game.ini
+++ b/base/ini/game.ini
@@ -14,9 +14,3 @@ ship=vector
 ; amount of credits a new player receives
 credits=5000
 
-; default cargo pod settings
-;
-
-[cargo]
-model=maps/cargo/pod
-
diff --git a/base/ini/templates.ini b/base/ini/templates.ini
new file mode 100644
index 0000000..fb869be
--- /dev/null
+++ b/base/ini/templates.ini
@@ -0,0 +1,36 @@
+;
+; templates.ini
+; entity templates
+;
+
+; the navpoint template is used by the game code
+[template]
+label=navpoint
+model=maps/static/navpoint
+radius=0.25
+
+; the cargopod template is used by the game code
+[template]
+label=cargopod
+model=maps/cargo/pod
+radius=0.25
+
+[template]
+label=ship_small
+radius=0.25
+
+[template]
+label=ship_medium
+radius=0.5
+
+[template]
+label=ship_large
+radius=1
+
+[template]
+label=cruiser
+radius=2
+
+[template]
+label=battleship
+radius=2
diff --git a/base/ini/world.ini b/base/ini/world.ini
index f37b006..91e542b 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -3,18 +3,6 @@
 ; 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
 ; ------------------------------------------------------------------ ;
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 4a7180c..b880405 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -33,6 +33,8 @@ name=Starbase Helianthos
 model=maps/colonial/helianthos
 location=512 -512 0
 faction=militia
+; overwrite faction colorsecond
+colorsecond=0 1 0
 
 	[ship]
 	label=sharkan
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index a7a43f3..d02e0f4 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -10,17 +10,6 @@
 name=Lindblade system
 sky=sky10
 
-; ------------------------------------------------------------------ 
-; NAVPOINT ORIGIN
-
-[navpoint]
-; [string] entity label
-label=navpoint_origin
-; [string] entity name
-name=Navigation point Origin
-; [x y x] entity location
-location=0 0 0
-
 ; ------------------------------------------------------------------ 
 ; STAR
 
@@ -53,9 +42,9 @@ label=lindblade_central
 name=Lindblade Central
 model=maps/lindblade/lindblade_central
 location=720 564 18
-color=0.5 0.1 0.1
 direction=250
 pitch=0
+faction=lindblade
 
 	[ship]
 	label=halcyon
-- 
cgit v1.2.3