Author: sveinung
Date: Mon Sep 1 14:25:01 2014
New Revision: 26160
URL: http://svn.gna.org/viewcvs/freeciv?rev=26160&view=rev
Log:
Remove redundant "Diplomat" flag checks from action enablers
Some action enablers require the Spy unit flag. The Spy unit flag requires
the Diplomat unit flag. Requiring the Diplomat unit flag when the Spy unit
flag is required is therefore redundant.
Requested by Marko Lindqvist <cazfi>
See patch #5152
Modified:
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/multiplayer/game.ruleset
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=26160&r1=26159&r2=26160&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Mon Sep 1 14:25:01 2014
@@ -176,7 +176,6 @@
action = "Targeted Sabotage City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -205,7 +204,6 @@
action = "Poison City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -235,7 +233,6 @@
action = "Targeted Steal Tech"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
"MinMoveFrags", "1", "Local", TRUE
@@ -282,7 +279,6 @@
action = "Sabotage Unit"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"Unitflag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=26160&r1=26159&r2=26160&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Mon Sep 1 14:25:01 2014
@@ -209,7 +209,6 @@
action = "Targeted Sabotage City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -258,7 +257,6 @@
action = "Targeted Steal Tech"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
"MinMoveFrags", "1", "Local", TRUE
@@ -273,7 +271,6 @@
action = "Poison City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -325,7 +322,6 @@
action = "Sabotage Unit"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"Unitflag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
Modified: trunk/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=26160&r1=26159&r2=26160&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Mon Sep 1 14:25:01 2014
@@ -201,7 +201,6 @@
action = "Targeted Sabotage City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -235,7 +234,6 @@
action = "Poison City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -265,7 +263,6 @@
action = "Targeted Steal Tech"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
"MinMoveFrags", "1", "Local", TRUE
@@ -314,7 +311,6 @@
action = "Sabotage Unit"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"Unitflag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
Modified: trunk/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=26160&r1=26159&r2=26160&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset (original)
+++ trunk/data/experimental/game.ruleset Mon Sep 1 14:25:01 2014
@@ -207,7 +207,6 @@
action = "Targeted Sabotage City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -256,7 +255,6 @@
action = "Poison City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -286,7 +284,6 @@
action = "Targeted Steal Tech"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
"MinMoveFrags", "1", "Local", TRUE
@@ -335,7 +332,6 @@
action = "Sabotage Unit"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"Unitflag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
Modified: trunk/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=26160&r1=26159&r2=26160&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Mon Sep 1 14:25:01 2014
@@ -205,7 +205,6 @@
action = "Targeted Sabotage City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -239,7 +238,6 @@
action = "Poison City"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
@@ -269,7 +267,6 @@
action = "Targeted Steal Tech"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"UnitFlag", "Spy", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
"MinMoveFrags", "1", "Local", TRUE
@@ -318,7 +315,6 @@
action = "Sabotage Unit"
actor_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Diplomat", "Local", TRUE
"Unitflag", "Spy", "Local", TRUE
"DiplRel", "War", "Local", TRUE
"UnitState", "TransportDependent", "Local", FALSE
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
