Author: sveinung
Date: Thu May  7 16:43:28 2015
New Revision: 29019

URL: http://svn.gna.org/viewcvs/freeciv?rev=29019&view=rev
Log:
Unhardcode the rule against self sabotage.

Make it possible to create a ruleset where the player can sabotage his own
units and cities.

Possible use: Every time an act of sabotage happens the victim gets 30 gold
and the following message: "The Committee Against Conspiracy Theories raise
30 gold from loyal donors to help you fight the terrorist saboteur
conspiracy." (A player is allowed to sabotage him self)

See patch #6067

Modified:
    branches/S2_6/common/actions.c
    branches/S2_6/doc/README.actions
    branches/S2_6/fc_version

Modified: branches/S2_6/common/actions.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.c?rev=29019&r1=29018&r2=29019&view=diff
==============================================================================
--- branches/S2_6/common/actions.c      (original)
+++ branches/S2_6/common/actions.c      Thu May  7 16:43:28 2015
@@ -363,7 +363,10 @@
   if (enabler->action != ACTION_TRADE_ROUTE
       && enabler->action != ACTION_MARKETPLACE
       && enabler->action != ACTION_HELP_WONDER
-      && enabler->action != ACTION_SPY_POISON) {
+      && enabler->action != ACTION_SPY_POISON
+      && enabler->action != ACTION_SPY_SABOTAGE_CITY
+      && enabler->action != ACTION_SPY_TARGETED_SABOTAGE_CITY
+      && enabler->action != ACTION_SPY_SABOTAGE_UNIT) {
     /* The Freeciv code assumes that all spy actions have foreign targets.
      * TODO: Move this restriction to the ruleset to prepare for false flag
      * operations. */

Modified: branches/S2_6/doc/README.actions
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.actions?rev=29019&r1=29018&r2=29019&view=diff
==============================================================================
--- branches/S2_6/doc/README.actions    (original)
+++ branches/S2_6/doc/README.actions    Thu May  7 16:43:28 2015
@@ -144,12 +144,10 @@
 "Sabotage City" - Destroy a building or the production in the target city.
  * UI name can be set using ui_name_sabotage_city
  * actor must be on the same tile as the target or on the tile next to it.
- * target must be foreign.
 
 "Targeted Sabotage City" - Targeted version of the above.
  * UI name can be set using ui_name_targeted_sabotage_city
  * actor must be on the same tile as the target or on the tile next to it.
- * target must be foreign.
 
 "Poison City" - Kill a citizen in the target city.
  * UI name can be set using ui_name_poison_city
@@ -205,7 +203,6 @@
 "Sabotage Unit" - Halve the target unit's hit points.
  * UI name can be set using ui_name_sabotage_unit
  * actor must be on the same tile as the target or on the tile next to it.
- * target must be foreign.
  * target must be visible for the actor.
 
 "Bribe Unit" - Make the target unit join the actors owners side.

Modified: branches/S2_6/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=29019&r1=29018&r2=29019&view=diff
==============================================================================
--- branches/S2_6/fc_version    (original)
+++ branches/S2_6/fc_version    Thu May  7 16:43:28 2015
@@ -54,7 +54,7 @@
 #   - Avoid adding a new mandatory capability to the development branch for
 #     as long as possible.  We want to maintain network compatibility with
 #     the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2015.May.05"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2015.May.07"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


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

Reply via email to