Author: sveinung
Date: Fri Nov 27 10:41:34 2015
New Revision: 30805

URL: http://svn.gna.org/viewcvs/freeciv?rev=30805&view=rev
Log:
sandbox: be merciful when unit upkeep is missing

* never disband a GameLoss unit
* try to get the most out of the unit by first trying to help build a
  wonder, then to join the city, then establish a trade route, then enter
  the marketplace without establishing a trade route and then finally
  recycling the unit for 50% of the units shield build cost.
* wipe a unit if no action makes it disappear. (Spare the citizens)

See patch #6635

Modified:
    trunk/data/sandbox/cities.ruleset

Modified: trunk/data/sandbox/cities.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/cities.ruleset?rev=30805&r1=30804&r2=30805&view=diff
==============================================================================
--- trunk/data/sandbox/cities.ruleset   (original)
+++ trunk/data/sandbox/cities.ruleset   Fri Nov 27 10:41:34 2015
@@ -115,16 +115,17 @@
 ; X_wipe       - wipe the unit if it survived performing the actions listed
 ;                above.
 
-food_protected    = "Undisbandable"
-; food_unit_act   =
+food_protected    = "GameLoss"
+food_unit_act     = "Help Wonder", "Join City", "Establish Trade Route",
+                    "Enter Marketplace", "Recycle Unit"
 food_wipe         = TRUE
 
-; TODO: Should missing gold upkeep really be able to kill units with the
-; Undisbandable unit type flag?
-; gold_protected  =
-; gold_unit_act   =
+gold_protected    = "GameLoss"
+gold_unit_act     = "Help Wonder", "Join City", "Establish Trade Route",
+                    "Enter Marketplace", "Recycle Unit"
 gold_wipe         = TRUE
 
-shield_protected  = "Undisbandable"
-shield_unit_act   = "Help Wonder", "Recycle Unit", "Disband Unit"
-shield_wipe       = FALSE
+shield_protected  = "GameLoss"
+shield_unit_act   = "Help Wonder", "Join City", "Establish Trade Route",
+                    "Enter Marketplace", "Recycle Unit"
+shield_wipe       = TRUE


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

Reply via email to