[Freeorion-programmers] SF.net SVN: freeorion:[5735] trunk/FreeOrion/default

[<geo...@us...>]

Revision: 5735
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5735&view=rev
Author:   geoffthemedio
Date:     2013-02-08 19:00:50 +0000 (Fri, 08 Feb 2013)
Log Message:
-----------
Semi-tested change to colony upkeep so outposts don't count. Outpost ship cost still increases, though.

Modified Paths:
--------------
    trunk/FreeOrion/default/buildings.txt
    trunk/FreeOrion/default/shared_macros.txt
    trunk/FreeOrion/default/ship_parts.txt

Modified: trunk/FreeOrion/default/buildings.txt
===================================================================
--- trunk/FreeOrion/default/buildings.txt	2013-02-08 07:49:14 UTC (rev 5734)
+++ trunk/FreeOrion/default/buildings.txt	2013-02-08 19:00:50 UTC (rev 5735)
@@ -1390,10 +1390,3 @@
     icon = "icons/species/other-04.png"
 */
 
-COLONY_UPKEEP_MULTIPLICATOR
-'''(1 + 0.05 *
-        Count condition = And [
-            Planet
-            OwnedBy TheEmpire Source.Owner
-            VisibleToEmpire Source.Owner
-        ])'''

Modified: trunk/FreeOrion/default/shared_macros.txt
===================================================================
--- trunk/FreeOrion/default/shared_macros.txt	2013-02-08 07:49:14 UTC (rev 5734)
+++ trunk/FreeOrion/default/shared_macros.txt	2013-02-08 19:00:50 UTC (rev 5735)
@@ -146,3 +146,11 @@
 PLUS_PLUS_STEALTH
 '''[[PLUS_STEALTH]] + [[PLUS_STEALTH]]'''
 
+COLONY_UPKEEP_MULTIPLICATOR
+'''(1 + 0.06 *
+        Count condition = And [
+            Planet
+            OwnedBy TheEmpire Source.Owner
+            VisibleToEmpire Source.Owner
+            Not Population high = 0
+        ])'''

Modified: trunk/FreeOrion/default/ship_parts.txt
===================================================================
--- trunk/FreeOrion/default/ship_parts.txt	2013-02-08 07:49:14 UTC (rev 5734)
+++ trunk/FreeOrion/default/ship_parts.txt	2013-02-08 19:00:50 UTC (rev 5735)
@@ -1,3 +1,4 @@
+include "shared_macros.txt"
 
 Part
     name = "GT_TROOP_POD"
@@ -1341,11 +1342,3 @@
     ]
     icon = ""
 */
-
-COLONY_UPKEEP_MULTIPLICATOR
-'''(1 + 0.05 *
-        Count condition = And [
-            Planet
-            OwnedBy TheEmpire Source.Owner
-            VisibleToEmpire Source.Owner
-        ])'''