Author: cazfi Date: Fri Aug 7 19:26:33 2015 New Revision: 29390 URL: http://svn.gna.org/viewcvs/freeciv?rev=29390&view=rev Log: Write "UnitFlag" and not "Unitflag" in action enabler requirements like in all other places.
See patch #6185 Modified: branches/S2_6/data/alien/game.ruleset branches/S2_6/data/civ1/game.ruleset branches/S2_6/data/civ2/game.ruleset branches/S2_6/data/civ2civ3/game.ruleset branches/S2_6/data/classic/game.ruleset branches/S2_6/data/experimental/game.ruleset branches/S2_6/data/multiplayer/game.ruleset Modified: branches/S2_6/data/alien/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/game.ruleset?rev=29390&r1=29389&r2=29390&view=diff ============================================================================== --- branches/S2_6/data/alien/game.ruleset (original) +++ branches/S2_6/data/alien/game.ruleset Fri Aug 7 19:26:33 2015 @@ -286,21 +286,21 @@ action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_marketplace] action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_help_build_wonder] action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "HelpWonder", "Local", TRUE + "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Is foreign", "Local", FALSE } Modified: branches/S2_6/data/civ1/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=29390&r1=29389&r2=29390&view=diff ============================================================================== --- branches/S2_6/data/civ1/game.ruleset (original) +++ branches/S2_6/data/civ1/game.ruleset Fri Aug 7 19:26:33 2015 @@ -289,21 +289,21 @@ action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_marketplace] action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_help_build_wonder] action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "HelpWonder", "Local", TRUE + "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Is foreign", "Local", FALSE } Modified: branches/S2_6/data/civ2/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=29390&r1=29389&r2=29390&view=diff ============================================================================== --- branches/S2_6/data/civ2/game.ruleset (original) +++ branches/S2_6/data/civ2/game.ruleset Fri Aug 7 19:26:33 2015 @@ -316,7 +316,7 @@ action = "Sabotage Unit" actor_reqs = { "type", "name", "range" - "Unitflag", "Spy", "Local" + "UnitFlag", "Spy", "Local" "DiplRel", "War", "Local" "MinMoveFrags", "1", "Local" } @@ -331,21 +331,21 @@ action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_marketplace] action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_help_build_wonder] action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "HelpWonder", "Local", TRUE + "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Is foreign", "Local", FALSE } Modified: branches/S2_6/data/civ2civ3/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/game.ruleset?rev=29390&r1=29389&r2=29390&view=diff ============================================================================== --- branches/S2_6/data/civ2civ3/game.ruleset (original) +++ branches/S2_6/data/civ2civ3/game.ruleset Fri Aug 7 19:26:33 2015 @@ -367,7 +367,7 @@ action = "Sabotage Unit" actor_reqs = { "type", "name", "range" - "Unitflag", "Spy", "Local" + "UnitFlag", "Spy", "Local" "DiplRel", "War", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" @@ -383,21 +383,21 @@ action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_marketplace] action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_help_build_wonder] action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "HelpWonder", "Local", TRUE + "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Is foreign", "Local", FALSE } Modified: branches/S2_6/data/classic/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/game.ruleset?rev=29390&r1=29389&r2=29390&view=diff ============================================================================== --- branches/S2_6/data/classic/game.ruleset (original) +++ branches/S2_6/data/classic/game.ruleset Fri Aug 7 19:26:33 2015 @@ -356,7 +356,7 @@ action = "Sabotage Unit" actor_reqs = { "type", "name", "range" - "Unitflag", "Spy", "Local" + "UnitFlag", "Spy", "Local" "DiplRel", "War", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" @@ -372,21 +372,21 @@ action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_marketplace] action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_help_build_wonder] action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "HelpWonder", "Local", TRUE + "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Is foreign", "Local", FALSE } Modified: branches/S2_6/data/experimental/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/game.ruleset?rev=29390&r1=29389&r2=29390&view=diff ============================================================================== --- branches/S2_6/data/experimental/game.ruleset (original) +++ branches/S2_6/data/experimental/game.ruleset Fri Aug 7 19:26:33 2015 @@ -375,7 +375,7 @@ action = "Sabotage Unit" actor_reqs = { "type", "name", "range" - "Unitflag", "Spy", "Local" + "UnitFlag", "Spy", "Local" "DiplRel", "War", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" @@ -390,21 +390,21 @@ action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_marketplace] action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "TradeRoute", "Local", TRUE + "UnitFlag", "TradeRoute", "Local", TRUE } [actionenabler_help_build_wonder] action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "HelpWonder", "Local", TRUE + "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Is foreign", "Local", FALSE } Modified: branches/S2_6/data/multiplayer/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/game.ruleset?rev=29390&r1=29389&r2=29390&view=diff ============================================================================== --- branches/S2_6/data/multiplayer/game.ruleset (original) +++ branches/S2_6/data/multiplayer/game.ruleset Fri Aug 7 19:26:33 2015 @@ -354,7 +354,7 @@ action = "Sabotage Unit" actor_reqs = { "type", "name", "range" - "Unitflag", "Spy", "Local" + "UnitFlag", "Spy", "Local" "DiplRel", "War", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" @@ -370,7 +370,7 @@ action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" - "Unitflag", "HelpWonder", "Local", TRUE + "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Is foreign", "Local", FALSE } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits