Author: sveinung
Date: Sun Jan  4 10:05:53 2015
New Revision: 27506

URL: http://svn.gna.org/viewcvs/freeciv?rev=27506&view=rev
Log:
Put the rule that empty cities cost half as much in the ruleset.

See patch #5634

Modified:
    branches/S2_6/data/alien/effects.ruleset
    branches/S2_6/data/civ1/effects.ruleset
    branches/S2_6/data/civ2/effects.ruleset
    branches/S2_6/data/civ2civ3/effects.ruleset
    branches/S2_6/data/classic/effects.ruleset
    branches/S2_6/data/experimental/effects.ruleset
    branches/S2_6/data/multiplayer/effects.ruleset
    branches/S2_6/server/cityturn.c

Modified: branches/S2_6/data/alien/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/effects.ruleset?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/data/alien/effects.ruleset    (original)
+++ branches/S2_6/data/alien/effects.ruleset    Sun Jan  4 10:05:53 2015
@@ -980,6 +980,14 @@
 type    = "Max_Trade_Routes"
 value   = 4
 
+[effect_incite_cost_empty]
+type = "Incite_Cost_Pct"
+value = -50
+reqs    =
+    { "type", "name", "range"
+      "MaxUnitsOnTile", "0", "Local"
+    }
+
 [effect_unit_bribe_cost_settlers]
 type   = "Unit_Bribe_Cost_Pct"
 value  = -50

Modified: branches/S2_6/data/civ1/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/effects.ruleset?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/data/civ1/effects.ruleset     (original)
+++ branches/S2_6/data/civ1/effects.ruleset     Sun Jan  4 10:05:53 2015
@@ -1410,6 +1410,14 @@
       "Extra", "Pollution", "Local"
     }
 
+[effect_incite_cost_empty]
+type = "Incite_Cost_Pct"
+value = -50
+reqs    =
+    { "type", "name", "range"
+      "MaxUnitsOnTile", "0", "Local"
+    }
+
 [effect_unit_bribe_cost_settlers]
 type   = "Unit_Bribe_Cost_Pct"
 value  = -50

Modified: branches/S2_6/data/civ2/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/effects.ruleset?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/data/civ2/effects.ruleset     (original)
+++ branches/S2_6/data/civ2/effects.ruleset     Sun Jan  4 10:05:53 2015
@@ -1151,8 +1151,27 @@
 type    = "Incite_Cost_Pct"
 value  = 300
 reqs   =
-    { "type", "name", "range"
-      "Building", "Courthouse", "City"
+    { "type", "name", "range", "present"
+      "Building", "Courthouse", "City", TRUE
+      "MaxUnitsOnTile", "0", "Local", FALSE
+    }
+
+[effect_incite_cost_empty_courthouse]
+type = "Incite_Cost_Pct"
+value = 100
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", TRUE
+    }
+
+[effect_incite_cost_empty]
+type = "Incite_Cost_Pct"
+value = -50
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", FALSE
     }
 
 [effect_factory]

Modified: branches/S2_6/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_6/data/civ2civ3/effects.ruleset Sun Jan  4 10:05:53 2015
@@ -2062,10 +2062,29 @@
 
 [effect_courthouse_incite]
 type    = "Incite_Cost_Pct"
-value   = 300
-reqs    =
-    { "type", "name", "range"
-      "Building", "Courthouse", "City"
+value  = 300
+reqs   =
+    { "type", "name", "range", "present"
+      "Building", "Courthouse", "City", TRUE
+      "MaxUnitsOnTile", "0", "Local", FALSE
+    }
+
+[effect_incite_cost_empty_courthouse]
+type = "Incite_Cost_Pct"
+value = 100
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", TRUE
+    }
+
+[effect_incite_cost_empty]
+type = "Incite_Cost_Pct"
+value = -50
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", FALSE
     }
 
 [effect_factory]

Modified: branches/S2_6/data/classic/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/effects.ruleset?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/data/classic/effects.ruleset  (original)
+++ branches/S2_6/data/classic/effects.ruleset  Sun Jan  4 10:05:53 2015
@@ -1014,8 +1014,27 @@
 type    = "Incite_Cost_Pct"
 value  = 300
 reqs   =
-    { "type", "name", "range"
-      "Building", "Courthouse", "City"
+    { "type", "name", "range", "present"
+      "Building", "Courthouse", "City", TRUE
+      "MaxUnitsOnTile", "0", "Local", FALSE
+    }
+
+[effect_incite_cost_empty_courthouse]
+type = "Incite_Cost_Pct"
+value = 100
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", TRUE
+    }
+
+[effect_incite_cost_empty]
+type = "Incite_Cost_Pct"
+value = -50
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", FALSE
     }
 
 [effect_factory]

Modified: branches/S2_6/data/experimental/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/effects.ruleset?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/data/experimental/effects.ruleset     (original)
+++ branches/S2_6/data/experimental/effects.ruleset     Sun Jan  4 10:05:53 2015
@@ -1162,8 +1162,27 @@
 type    = "Incite_Cost_Pct"
 value  = 300
 reqs   =
-    { "type", "name", "range"
-      "Building", "Courthouse", "City"
+    { "type", "name", "range", "present"
+      "Building", "Courthouse", "City", TRUE
+      "MaxUnitsOnTile", "0", "Local", FALSE
+    }
+
+[effect_incite_cost_empty_courthouse]
+type = "Incite_Cost_Pct"
+value = 100
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", TRUE
+    }
+
+[effect_incite_cost_empty]
+type = "Incite_Cost_Pct"
+value = -50
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", FALSE
     }
 
 [effect_factory]

Modified: branches/S2_6/data/multiplayer/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/effects.ruleset?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/effects.ruleset      (original)
+++ branches/S2_6/data/multiplayer/effects.ruleset      Sun Jan  4 10:05:53 2015
@@ -1024,8 +1024,27 @@
 type    = "Incite_Cost_Pct"
 value  = 300
 reqs   =
-    { "type", "name", "range"
-      "Building", "Courthouse", "City"
+    { "type", "name", "range", "present"
+      "Building", "Courthouse", "City", TRUE
+      "MaxUnitsOnTile", "0", "Local", FALSE
+    }
+
+[effect_incite_cost_empty_courthouse]
+type = "Incite_Cost_Pct"
+value = 100
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", TRUE
+    }
+
+[effect_incite_cost_empty]
+type = "Incite_Cost_Pct"
+value = -50
+reqs   =
+    { "type", "name", "range", "present"
+      "MaxUnitsOnTile", "0", "Local", TRUE
+      "Building", "Courthouse", "City", FALSE
     }
 
 [effect_factory]

Modified: branches/S2_6/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=27506&r1=27505&r2=27506&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c     (original)
+++ branches/S2_6/server/cityturn.c     Sun Jan  4 10:05:53 2015
@@ -2710,11 +2710,6 @@
     cost *= 2;
   }
 
-  /* City is empty */
-  if (unit_list_size(pcity->tile->units) == 0) {
-    cost /= 2;
-  }
-
   /* Buy back is cheap, conquered cities are also cheap */
   if (!game.info.citizen_nationality) {
     if (city_owner(pcity) != pcity->original) {


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to