Author: sveinung
Date: Thu Nov 19 10:26:59 2015
New Revision: 30684

URL: http://svn.gna.org/viewcvs/freeciv?rev=30684&view=rev
Log:
sandbox: add disband unit rules

A unit can be Disbandable, Undisbandable or ConsensusUndisbandable. The
consensus among the player's bureaucracy is that ConsensusUndisbandable
units never should be disbanded (or recycled). Under some governments it
has the power to enforce its will.

The unit types Battleship and Carrier are ConsensusUndisbandable. Both unit
types gets an Easter Egg in their ruleset comments: a reference to a news
paper article indicating that ConsensusUndisbandable isn't a completely
fictional concept.

Adding "Disband Unit" to the sandbox ruleset was accidentally forgotten
when "Disband Unit" was introduced in patch #6573.

Reported by Marko Lindqvist <cazfi>

See patch #6596

Modified:
    trunk/data/sandbox/game.ruleset
    trunk/data/sandbox/governments.ruleset
    trunk/data/sandbox/units.ruleset

Modified: trunk/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=30684&r1=30683&r2=30684&view=diff
==============================================================================
--- trunk/data/sandbox/game.ruleset     (original)
+++ trunk/data/sandbox/game.ruleset     Thu Nov 19 10:26:59 2015
@@ -247,6 +247,9 @@
 ; /* TRANS: Rec_ycle Unit (100% chance of success). */
 ui_name_recycle_unit = _("Rec%sycle Unit%s")
 
+; /* TRANS: _You're Fired (100% chance of success). */
+ui_name_disband_unit = _("%sYou're Fired%s")
+
 ; /* TRANS: _Capture Units (100% chance of success). */
 ui_name_capture_units = _("%sCapture Units%s")
 
@@ -455,6 +458,37 @@
 actor_reqs    =
     { "type",   "name", "range", "present"
       "UnitFlag", "Undisbandable", "Local", FALSE
+      "UnitFlag", "Consensus",     "Local", FALSE
+    }
+
+[actionenabler_recycle_unit_consensus]
+action = "Recycle Unit"
+actor_reqs    =
+    { "type",     "name",          "range",  "present"
+      "UnitFlag", "Undisbandable", "Local",  FALSE
+      "UnitFlag", "Consensus",     "Local",  TRUE
+      "Gov",      "Communism",     "Player", FALSE
+      "Gov",      "Democracy",     "Player", FALSE
+      "Gov",      "Republic",      "Player", FALSE
+    }
+
+[actionenabler_disband_unit]
+action = "Disband Unit"
+actor_reqs    =
+    { "type",   "name", "range", "present"
+      "UnitFlag", "Undisbandable", "Local", FALSE
+      "UnitFlag", "Consensus",     "Local", FALSE
+    }
+
+[actionenabler_disband_unit_consensus]
+action = "Disband Unit"
+actor_reqs    =
+    { "type",     "name",          "range",  "present"
+      "UnitFlag", "Undisbandable", "Local",  FALSE
+      "UnitFlag", "Consensus",     "Local",  TRUE
+      "Gov",      "Communism",     "Player", FALSE
+      "Gov",      "Democracy",     "Player", FALSE
+      "Gov",      "Republic",      "Player", FALSE
     }
 
 [actionenabler_capture]

Modified: trunk/data/sandbox/governments.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/governments.ruleset?rev=30684&r1=30683&r2=30684&view=diff
==============================================================================
--- trunk/data/sandbox/governments.ruleset      (original)
+++ trunk/data/sandbox/governments.ruleset      Thu Nov 19 10:26:59 2015
@@ -216,6 +216,7 @@
  each further unit causes 1 unhappy citizen.\n\
 * Base corruption is 30%, but is not affected by distance to the capital.\n\
 * There is no production waste.\
+"), _("* Your bureaucracy can prevent you from disbanding certain units.\
 ")
 
 ;------------------------------------------------------------------------
@@ -335,6 +336,7 @@
  (half as fast with knowledge of The Corporation).\n\
 * Base production waste is 5%. This increases with distance from the\
  capital (half as fast with knowledge of Trade).\
+"), _("* Your bureaucracy can prevent you from disbanding certain units.\
 ")
 
 ;------------------------------------------------------------------------
@@ -371,6 +373,7 @@
  (half as fast with knowledge of The Corporation).\n\
 * Base production waste is 25%. This increases with distance from the\
  capital (half as fast with knowledge of Trade).\
+"), _("* Your bureaucracy can prevent you from disbanding certain units.\
 ")
 
 ; /* <-- avoid gettext warnings

Modified: trunk/data/sandbox/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/units.ruleset?rev=30684&r1=30683&r2=30684&view=diff
==============================================================================
--- trunk/data/sandbox/units.ruleset    (original)
+++ trunk/data/sandbox/units.ruleset    Thu Nov 19 10:26:59 2015
@@ -30,6 +30,7 @@
     _("Transform")
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Submarine"), _("Attack value halved when attacking Destroyer.")
+    _("Consensus"), _("Undisbandable when your bureaucracy has a veto.")
     _("Unbribable")
     _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
     _("HelpWonder")
@@ -335,7 +336,7 @@
 ;                the same time; barbarians cannot use this at present
 ; "GameLoss"   = losing one of these units means you lose the game, but it
 ;                is produced without homecity and upkeep
-; "Undisbandable" = this unit cannot be disbanded, will not drown, and will not
+; "Undisbandable" = this unit is protected. It will not drown and will not
 ;                disband due to lack of shields to upkeep it in homecity;
 ;                if not given enough food to upkeep it, homecity will shrink 
 ;                every turn it cannot do so, however
@@ -1941,7 +1942,9 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
-flags         = "BadCityDefender"
+; ConsensusUndisbandable historical article: "Airplanes Sink a Battleship?
+; No, Sir! Declares President" Chicago Daily Tribune, Feb. 26, 1938.
+flags         = "BadCityDefender", "Consensus"
 roles         = "DefendOk", "DefendOkStartUnit"
 helptext      = _("\
 The Battleship is the supreme naval unit with\
@@ -2008,7 +2011,9 @@
 uk_food       = 1
 uk_gold       = 1
 cargo         = "Air", "Missile", "Helicopter"
-flags         = "BadCityDefender", "HasNoZOC"
+; ConsensusUndisbandable historical article: Julian Borger. "Wake-up call"
+; The Guardian, Sep. 6, 2002.
+flags         = "BadCityDefender", "HasNoZOC", "Consensus"
 roles         = "DefendGood", "DefendGoodStartUnit"
 helptext      = _("\
 The Carrier is a mobile airport.\


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

Reply via email to