Adds a soalr power arrya to the Carthagio system,

renames a number of common objects.

4 files changed, 124 insertions, 22 deletions

diff --git a/base/ini/templates.ini b/base/ini/templates.ini
index 652c261..13ce670 100644
--- a/base/ini/templates.ini
+++ b/base/ini/templates.ini
@@ -4,6 +4,25 @@
 ; entity templates define a set of default settings that
 ; can be applied to an entity or ship type
 
+; generic solar unit
+[template]
+label=solarunit
+model=maps/common/solarunit
+radius=2.0
+color=128 64 0
+
+; generic storage tanks
+[template]
+label=storagetanks
+name=Storage tanks
+model=maps/common/storagetanks
+
+; generic storage unit
+[template]
+label=storageunit
+name=Storage unit
+model=maps/common/storageunit
+
 ; the navpoint template is used by the game code
 [template]
 label=navpoint
diff --git a/base/ini/zones/carthagio.ini b/base/ini/zones/carthagio.ini
index 091a970..14bc59d 100644
--- a/base/ini/zones/carthagio.ini
+++ b/base/ini/zones/carthagio.ini
@@ -36,9 +36,89 @@ faction=praetoria
 [star]
 label=star
 name=class K star
-location=-304 -460 0
+location=-332 -572 0
 angles=0 60 0
 radius=72
 ; [r g b] entity primary color, values in the 0-255 range
 color=219 91 0
 
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=873 -209 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=879 -219 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=885 -230 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=892 -241 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=867 -199 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=881 -200 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=875 -188 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=895 -222 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=solarunit
+label=solarunit
+name=Solar Unit
+location=901 -232 2
+angles=15 200 0
+faction=praetoria
+
+[entity]
+template=storageunit
+label=solar_poWer_array
+name=Solar power array
+location=888 -212 3
+angles=0 20 0
+faction=praetoria
+showonmap=true
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 43a3fda..bf29f06 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -16,6 +16,7 @@ ambient=0.05 0.05 0.0
 location=466 278 0
 ; faction
 faction=colonies
+
 ; zone information
 info=The Ghant system is the headquarters of the Merchants Association.
 
@@ -94,14 +95,14 @@ info=fiscal climate of the Independent Colonies.
 	;price=
 	; no initial supply
 	amount=0
-	
+
 	[cargo]
 	label=optronics
 	; default price
 	;price=
 	; no initial supply
 	amount=0
-	
+
 	[cargo]
 	label=water
 	amount=-1
@@ -118,12 +119,12 @@ info=fiscal climate of the Independent Colonies.
 
 	[ship]
 	label=scalar
-	
+
 	; weapon trade definitions
 	[weapon]
 	label=mine_dumb
 	amount=-1
-	
+
 	[weapon]
 	label=laser1
 	amount=-1
@@ -131,7 +132,7 @@ info=fiscal climate of the Independent Colonies.
 	[weapon]
 	label=turretlaser1
 	amount=-1
-	
+
 ; ------------------------------------------------------------------
 ; ALEXANDRIA OUTPOST
 
@@ -161,7 +162,6 @@ info=Because of its remote location, it is also a popular transit zone for more
 	label=vector
 
 	; available cargo types
-	
 	[cargo]
 	; always declare the label first
 	label=crates
@@ -198,25 +198,25 @@ info=Because of its remote location, it is also a popular transit zone for more
 	[weapon]
 	label=mine_dumb
 	amount=-1
-	
+
 	[weapon]
 	label=laser1
 	amount=-1
-	
+
 [entity]
+template=storagetanks
 label=alexandria_storage1
-name=storage tanks
+name=Storage tanks
 location=-176 -720 32
 angles=0 45 0
-model=maps/colonial/alexandria_storage
 faction=colonies
 
 [entity]
+template=storagetanks
 label=alexandria_storage2
-name=storage tanks
+name=Storage tanks
 location=-172 -720 32
 angles=0 45 0
-model=maps/colonial/alexandria_storage
 faction=colonies
 
 ; ------------------------------------------------------------------
@@ -252,7 +252,7 @@ faction=militia
 	[weapon]
 	label=blaster1
 	amount=-1
-	
+
 ; ------------------------------------------------------------------
 ; PLANET SEYMOUR
 
@@ -301,17 +301,18 @@ info=Regula station is the headquarters of the local niobium mining operation.
 	label=water
 	price=14
 	amount=0
-	
+
 	[weapon]
 	label=laser1
 	amount=-1
 
 [entity]
+template=storageunit
 label=regula_storage
-name=Storage tanks
+name=Storage unit
 location=-122 928 -32
-model=maps/colonial/regula_storage
 color=0.4 0.7 0
+angles=0 -90 0
 
 ; ------------------------------------------------------------------
 ; KRONENBADEN JUMPGATE
@@ -365,3 +366,4 @@ location=-840 324 -8
 angles=0 320 0
 target=warsaw:jumpgate_ghant
 faction=colonies
+
diff --git a/base/ini/zones/khorsand.ini b/base/ini/zones/khorsand.ini
index 00ca938..8bba93e 100644
--- a/base/ini/zones/khorsand.ini
+++ b/base/ini/zones/khorsand.ini
@@ -102,18 +102,19 @@ info=Kerman refinery is the largest niobium processing facility in the Independe
 	amount=-1
 
 [entity]
+template=storageunit
 label=kerman_storage1
-name=Storage tanks
+name=Storage unit
 location=-448 -86 -12
-model=maps/colonial/regula_storage
+angles=0 -90 0
 color=0.9 0.9 0.1
 
 [entity]
+template=storageunit
 label=kerman_storage2
-name=Storage tanks
+name=Storage unit
 location=-448 -106 -12
-angles=0 180 0
-model=maps/colonial/regula_storage
+angles=0 90 0
 color=0.9 0.9 0.1
 
 ; ------------------------------------------------------------------