Author: sveinung
Date: Sun Mar 19 11:14:00 2017
New Revision: 35129
URL: http://svn.gna.org/viewcvs/freeciv?rev=35129&view=rev
Log:
Restore "Recycle Unit"'s DiplRel rules.
Hrm Feature #644449 made it legal to do "Recycle Unit" to an adjacent city.
It is possible to be adjacent to non allied cities. This accidentally
removed the old implicit rules that only an allied city could have its
production helped with "Recycle Unit". Restore the old rules by making them
explicit.
Reported by Christian Knoke <chrisk>
See gna bug #25597
Modified:
branches/S3_0/data/alien/game.ruleset
branches/S3_0/data/civ1/game.ruleset
branches/S3_0/data/civ2/game.ruleset
branches/S3_0/data/civ2civ3/game.ruleset
branches/S3_0/data/classic/game.ruleset
branches/S3_0/data/experimental/game.ruleset
branches/S3_0/data/multiplayer/game.ruleset
branches/S3_0/data/sandbox/game.ruleset
branches/S3_0/data/webperimental/game.ruleset
Modified: branches/S3_0/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/alien/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/alien/game.ruleset (original)
+++ branches/S3_0/data/alien/game.ruleset Sun Mar 19 11:14:00 2017
@@ -433,6 +433,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ1/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/civ1/game.ruleset (original)
+++ branches/S3_0/data/civ1/game.ruleset Sun Mar 19 11:14:00 2017
@@ -420,6 +420,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/civ2/game.ruleset (original)
+++ branches/S3_0/data/civ2/game.ruleset Sun Mar 19 11:14:00 2017
@@ -504,6 +504,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2civ3/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/civ2civ3/game.ruleset (original)
+++ branches/S3_0/data/civ2civ3/game.ruleset Sun Mar 19 11:14:00 2017
@@ -516,6 +516,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/classic/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/classic/game.ruleset (original)
+++ branches/S3_0/data/classic/game.ruleset Sun Mar 19 11:14:00 2017
@@ -508,6 +508,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/experimental/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/experimental/game.ruleset (original)
+++ branches/S3_0/data/experimental/game.ruleset Sun Mar 19 11:14:00 2017
@@ -524,6 +524,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/multiplayer/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/multiplayer/game.ruleset (original)
+++ branches/S3_0/data/multiplayer/game.ruleset Sun Mar 19 11:14:00 2017
@@ -491,6 +491,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/sandbox/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/sandbox/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/sandbox/game.ruleset (original)
+++ branches/S3_0/data/sandbox/game.ruleset Sun Mar 19 11:14:00 2017
@@ -563,6 +563,10 @@
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
"UnitFlag", "Consensus", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_recycle_unit_consensus]
@@ -574,6 +578,10 @@
"Gov", "Communism", "Player", FALSE
"Gov", "Democracy", "Player", FALSE
"Gov", "Republic", "Player", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
Modified: branches/S3_0/data/webperimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/webperimental/game.ruleset?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- branches/S3_0/data/webperimental/game.ruleset (original)
+++ branches/S3_0/data/webperimental/game.ruleset Sun Mar 19 11:14:00 2017
@@ -635,6 +635,10 @@
actor_reqs =
{ "type", "name", "range", "present"
"UnitFlag", "EvacuateFirst", "Local", FALSE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire", "Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
}
[actionenabler_disband_unit]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
