Author: sveinung
Date: Wed Apr 20 04:18:49 2016
New Revision: 32443

URL: http://svn.gna.org/viewcvs/freeciv?rev=32443&view=rev
Log:
sandbox: allow peaceful unit expulsion.

Give all infantry and mounted units the ability to police the border. They
can now expel foreign civilian units as an alternative to (declaring war
and) killing the foreign invader.

See patch #7117

Modified:
    trunk/data/sandbox/game.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=32443&r1=32442&r2=32443&view=diff
==============================================================================
--- trunk/data/sandbox/game.ruleset     (original)
+++ trunk/data/sandbox/game.ruleset     Wed Apr 20 04:18:49 2016
@@ -593,6 +593,23 @@
       "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
+    }
+
+[actionenabler_border_police]
+action = "Expel Unit"
+actor_reqs    =
+    { "type",          "name",           "range", "present"
+      "UnitClassFlag", "BorderPolice",   "Local", TRUE
+      "UnitState",     "OnDomesticTile", "Local", TRUE
+      "DiplRel",       "Is foreign",     "Local", TRUE
+      "DiplRel",       "Team",           "Local", FALSE
+      "DiplRel",       "Alliance",       "Local", FALSE
+      "DiplRel",       "War",            "Local", FALSE
+    }
+target_reqs    =
+    { "type",          "name",           "range", "present"
+      "UnitClassFlag", "Expellable",     "Local", TRUE
+      "UnitState",     "OnDomesticTile", "Local", FALSE
     }
 
 [actionenabler_nuke]

Modified: trunk/data/sandbox/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/units.ruleset?rev=32443&r1=32442&r2=32443&view=diff
==============================================================================
--- trunk/data/sandbox/units.ruleset    (original)
+++ trunk/data/sandbox/units.ruleset    Wed Apr 20 04:18:49 2016
@@ -56,6 +56,8 @@
     _("LightWeight"), _("Airliftable once you learn Flight.")
     _("MediumWeight"), _("Airliftable from Airport after you learn Advanced 
Flight.")
     _("HeavyWeight"), _("Airliftable from Airport after you learn Fusion 
Power.")
+    _("BorderPolice"), _("Can peacefully expel certain foreign units.")
+    _("Expellable"), _("Can be peacefully expelled from foreign tiles.")
   }
 
 [veteran_system]
@@ -158,7 +160,8 @@
 hp_loss_pct   = 0
 flags         = "TerrainSpeed", "DamageSlows", "CanOccupyCity", 
"BuildAnywhere",
                 "CollectRansom", "ZOC", "CanFortify", "CanPillage",
-                "TerrainDefense", "KillCitizen", "LightWeight"
+                "TerrainDefense", "KillCitizen", "LightWeight",
+                "BorderPolice"
 
 [unitclass_land_small]
 ; /* TRANS: Unit class: used adjectivally */
@@ -166,7 +169,8 @@
 min_speed     = 1
 hp_loss_pct   = 0
 flags         = "TerrainSpeed", "DamageSlows", "BuildAnywhere", 
"CollectRansom",
-                "ZOC", "TerrainDefense", "DoesntOccupyTile", "LightWeight"
+                "ZOC", "TerrainDefense", "DoesntOccupyTile", "LightWeight",
+                "Expellable"
 
 [unitclass_land_big]
 ; /* TRANS: Unit class: used adjectivally */
@@ -182,7 +186,8 @@
 min_speed     = 1
 hp_loss_pct   = 0
 flags         = "BuildAnywhere", "DoesntOccupyTile",
-                "TerrainDefense", "TerrainSpeed", "MediumWeight"
+                "TerrainDefense", "TerrainSpeed", "MediumWeight",
+                "Expellable"
 
 [unitclass_sea]
 ; /* TRANS: Unit class: used adjectivally */


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

Reply via email to