Author: sveinung
Date: Wed May 24 11:56:53 2017
New Revision: 35706
URL: http://svn.gna.org/viewcvs/freeciv?rev=35706&view=rev
Log:
webperimental: killstack decides stack protects.
Make the killstack server setting decide if a unit in a unit stack can be
bribed or sabotaged.
See hrm Feature #661974
Modified:
branches/S3_0/data/webperimental/game.ruleset
Modified: branches/S3_0/data/webperimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/webperimental/game.ruleset?rev=35706&r1=35705&r2=35706&view=diff
==============================================================================
--- branches/S3_0/data/webperimental/game.ruleset (original)
+++ branches/S3_0/data/webperimental/game.ruleset Wed May 24 11:56:53 2017
@@ -44,8 +44,8 @@
(unless it's in Anarchy).\n\
- An even higher percentage of a nation's gold can be stolen from its \
capital if it is communist.\n\
-- Unit stacks don't protect against spy actions\n\
- The killstack server setting is disabled by default.\n\
+ - unit stack blocks bribe/sabotage unit needs killstack.\n\
- Spies can steal parts of other player's world map. \n\
- Spies belonging to the owner of the Manhattan Project can nuke cities.\n\
- agents and spymasters may even escape before the nuke detonates.\n\
@@ -580,34 +580,71 @@
[actionenabler_bribe_unit]
action = "Bribe Unit"
actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
- "DiplRel", "Alliance", "Local", FALSE
- "DiplRel", "Team", "Local", FALSE
- "UnitState", "OnLivableTile", "Local", TRUE
- "MinMoveFrags", "1", "Local", TRUE
- "DiplRel", "Is foreign", "Local", TRUE
- }
-target_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "Unbribable", "Local", FALSE
- "CityTile", "Center", "Local", FALSE
- "Gov", "Democracy", "Player", FALSE
+ { "type", "name", "range", "present"
+ "UnitFlag", "Diplomat", "Local", TRUE
+ "DiplRel", "Alliance", "Local", FALSE
+ "DiplRel", "Team", "Local", FALSE
+ "UnitState", "OnLivableTile", "Local", TRUE
+ "MinMoveFrags", "1", "Local", TRUE
+ "DiplRel", "Is Foreign", "Local", TRUE
+ "ServerSetting", "killstack", "World", FALSE
+ }
+target_reqs =
+ { "type", "name", "range", "present"
+ "UnitFlag", "Unbribable", "Local", FALSE
+ "CityTile", "Center", "Local", FALSE
+ "Gov", "Democracy", "Player", FALSE
+ }
+
+[actionenabler_bribe_unit_killstack_enabled]
+action = "Bribe Unit"
+actor_reqs =
+ { "type", "name", "range", "present"
+ "UnitFlag", "Diplomat", "Local", TRUE
+ "DiplRel", "Alliance", "Local", FALSE
+ "DiplRel", "Team", "Local", FALSE
+ "UnitState", "OnLivableTile", "Local", TRUE
+ "MinMoveFrags", "1", "Local", TRUE
+ "DiplRel", "Is Foreign", "Local", TRUE
+ }
+target_reqs =
+ { "type", "name", "range", "present"
+ "UnitFlag", "Unbribable", "Local", FALSE
+ "CityTile", "Center", "Local", FALSE
+ "Gov", "Democracy", "Player", FALSE
+ "MaxUnitsOnTile", "1", "Local", TRUE
}
[actionenabler_sabotage_unit]
action = "Sabotage Unit"
actor_reqs =
- { "type", "name", "range"
- "UnitFlag", "Spy", "Local"
- "DiplRel", "War", "Local"
- "UnitState", "OnLivableTile", "Local"
- "MinMoveFrags", "1", "Local"
- }
-target_reqs =
- { "type", "name", "range", "present"
- "CityTile", "Center", "Local", FALSE
- "MinHitPoints", "2", "Local", TRUE
+ { "type", "name", "range", "present"
+ "UnitFlag", "Spy", "Local", TRUE
+ "DiplRel", "War", "Local", TRUE
+ "UnitState", "OnLivableTile", "Local", TRUE
+ "MinMoveFrags", "1", "Local", TRUE
+ "ServerSetting", "killstack", "World", FALSE
+ }
+target_reqs =
+ { "type", "name", "range", "present"
+ "CityTile", "Center", "Local", FALSE
+ "MinHitPoints", "2", "Local", TRUE
+ }
+
+[actionenabler_sabotage_unit_killstack_enabled]
+action = "Sabotage Unit"
+actor_reqs =
+ { "type", "name", "range"
+ "UnitFlag", "Spy", "Local"
+ "DiplRel", "War", "Local"
+ "UnitState", "OnLivableTile", "Local"
+ "MinMoveFrags", "1", "Local"
+ }
+target_reqs =
+ { "type", "name", "range", "present"
+ "CityTile", "Center", "Local", FALSE
+ "MinHitPoints", "2", "Local", TRUE
+ "MaxUnitsOnTile", "1", "Local", TRUE
}
[actionenabler_steal_gold_capital]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
