Author: sveinung
Date: Tue Sep 22 11:04:27 2015
New Revision: 29949
URL: http://svn.gna.org/viewcvs/freeciv?rev=29949&view=rev
Log:
Fix alien and civ2civ3 action enablers
The rule that only wonders can receive shields from the "Help Wonder" action
was moved to the ruleset in patch #6362. It was moved by adding the
requirement that the target city must be building a great wonder to the each
"Help Wonder" action enabler and by adding a new action enabler for cities
building a small wonder. The requirement that the target city must be
building a great wonder accidentally ended up on "Join City" in the alien
ruleset and on "Establish Trade Route" in the civ2civ3 ruleset. Move it to
the correct action enabler.
See bug #23890
Modified:
trunk/data/alien/game.ruleset
trunk/data/civ2civ3/game.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=29949&r1=29948&r2=29949&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Tue Sep 22 11:04:27 2015
@@ -336,6 +336,22 @@
"UnitFlag", "HelpWonder", "Local", TRUE
"DiplRel", "Is foreign", "Local", FALSE
}
+target_reqs =
+ { "type", "name", "range"
+ "BuildingGenus", "GreatWonder", "Local"
+ }
+
+[actionenabler_help_build_small_wonder]
+action = "Help Wonder"
+actor_reqs =
+ { "type", "name", "range", "present"
+ "UnitFlag", "HelpWonder", "Local", TRUE
+ "DiplRel", "Is foreign", "Local", FALSE
+ }
+target_reqs =
+ { "type", "name", "range"
+ "BuildingGenus", "SmallWonder", "Local"
+ }
[actionenabler_capture]
action = "Capture Units"
@@ -394,22 +410,6 @@
"UnitFlag", "AddToCity", "Local", TRUE
"DiplRel", "Is foreign", "Local", FALSE
"MinMoveFrags", "1", "Local", TRUE
- }
-target_reqs =
- { "type", "name", "range"
- "BuildingGenus", "GreatWonder", "Local"
- }
-
-[actionenabler_help_build_small_wonder]
-action = "Help Wonder"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "HelpWonder", "Local", TRUE
- "DiplRel", "Is foreign", "Local", FALSE
- }
-target_reqs =
- { "type", "name", "range"
- "BuildingGenus", "SmallWonder", "Local"
}
[borders]
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=29949&r1=29948&r2=29949&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Tue Sep 22 11:04:27 2015
@@ -418,6 +418,21 @@
{ "type", "name", "range", "present"
"UnitFlag", "TradeRoute", "Local", TRUE
}
+
+[actionenabler_marketplace]
+action = "Enter Marketplace"
+actor_reqs =
+ { "type", "name", "range", "present"
+ "UnitFlag", "TradeRoute", "Local", TRUE
+ }
+
+[actionenabler_help_build_wonder]
+action = "Help Wonder"
+actor_reqs =
+ { "type", "name", "range", "present"
+ "UnitFlag", "HelpWonder", "Local", TRUE
+ "DiplRel", "Is foreign", "Local", FALSE
+ }
target_reqs =
{ "type", "name", "range"
"BuildingGenus", "GreatWonder", "Local"
@@ -433,21 +448,6 @@
target_reqs =
{ "type", "name", "range"
"BuildingGenus", "SmallWonder", "Local"
- }
-
-[actionenabler_marketplace]
-action = "Enter Marketplace"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "TradeRoute", "Local", TRUE
- }
-
-[actionenabler_help_build_wonder]
-action = "Help Wonder"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "HelpWonder", "Local", TRUE
- "DiplRel", "Is foreign", "Local", FALSE
}
[actionenabler_capture]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
