Author: sveinung
Date: Sun May  3 17:47:25 2015
New Revision: 28974

URL: http://svn.gna.org/viewcvs/freeciv?rev=28974&view=rev
Log:
Unhardcode the rule against poisoning own cities.

Make it possible to create a ruleset where the player can poison his own
cities.

Examples of what this allows:
 * Allow the player to use it as a scorched earth tactic when a city will be
   lost for good.
 * "This horrible accident motivates the surviving citizens to agree to give
   you 5 gold each so the water treatment system can be improved." (Gives
   gold via Lua)

The actor unit will still get killed if caught after completing the mission.
Look at it as the investigators, local population or even the local
government taking vengeance.

patch #6063

Modified:
    trunk/common/actions.c
    trunk/fc_version

Modified: trunk/common/actions.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=28974&r1=28973&r2=28974&view=diff
==============================================================================
--- trunk/common/actions.c      (original)
+++ trunk/common/actions.c      Sun May  3 17:47:25 2015
@@ -414,6 +414,7 @@
   if (enabler->action != ACTION_TRADE_ROUTE
       && enabler->action != ACTION_MARKETPLACE
       && enabler->action != ACTION_HELP_WONDER
+      && enabler->action != ACTION_SPY_POISON
       && enabler->action != ACTION_JOIN_CITY
       && enabler->action != ACTION_FOUND_CITY) {
     /* The Freeciv code assumes that all spy actions have foreign targets.

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=28974&r1=28973&r2=28974&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Sun May  3 17:47:25 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-3.0-2015.May.03"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.May.03b"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


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

Reply via email to