Author: cazfi
Date: Fri Aug  7 19:26:26 2015
New Revision: 29389

URL: http://svn.gna.org/viewcvs/freeciv?rev=29389&view=rev
Log:
Write "UnitFlag" and not "Unitflag" in action enabler requirements like in all 
other places.

See patch #6185

Modified:
    trunk/data/alien/game.ruleset
    trunk/data/civ1/game.ruleset
    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/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=29389&r1=29388&r2=29389&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset       (original)
+++ trunk/data/alien/game.ruleset       Fri Aug  7 19:26:26 2015
@@ -299,21 +299,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
     }
 
@@ -321,13 +321,13 @@
 action = "Capture Units"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Capturer", "Local", TRUE
+      "UnitFlag", "Capturer", "Local", TRUE
       "DiplRel", "War", "Local", TRUE
       "MinMoveFrags", "1", "Local", TRUE
     }
 target_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Capturable", "Local", TRUE
+      "UnitFlag", "Capturable", "Local", TRUE
       "CityTile", "Center", "Local", FALSE
     }
 
@@ -335,7 +335,7 @@
 action = "Bombard"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Bombarder", "Local", TRUE
+      "UnitFlag", "Bombarder", "Local", TRUE
       "UnitState", "Transported", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -348,7 +348,7 @@
 action = "Found City"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Cities", "Local"
+      "UnitFlag", "Cities", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -357,7 +357,7 @@
 action = "Join City"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "AddToCity", "Local", TRUE
+      "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }

Modified: trunk/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=29389&r1=29388&r2=29389&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset        (original)
+++ trunk/data/civ1/game.ruleset        Fri Aug  7 19:26:26 2015
@@ -299,21 +299,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
     }
 
@@ -321,7 +321,7 @@
 action = "Found City"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Cities", "Local"
+      "UnitFlag", "Cities", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -330,7 +330,7 @@
 action = "Join City"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "AddToCity", "Local", TRUE
+      "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -339,7 +339,7 @@
 action = "Explode Nuclear"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Nuclear", "Local", TRUE
+      "UnitFlag", "Nuclear", "Local", TRUE
     }
 
 [borders]

Modified: trunk/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=29389&r1=29388&r2=29389&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset        (original)
+++ trunk/data/civ2/game.ruleset        Fri Aug  7 19:26:26 2015
@@ -326,7 +326,7 @@
 action = "Sabotage Unit"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Spy", "Local"
+      "UnitFlag", "Spy", "Local"
       "DiplRel", "War", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -341,21 +341,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
     }
 
@@ -363,7 +363,7 @@
 action = "Found City"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Cities", "Local"
+      "UnitFlag", "Cities", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -372,7 +372,7 @@
 action = "Join City"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "AddToCity", "Local", TRUE
+      "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -381,7 +381,7 @@
 action = "Explode Nuclear"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Nuclear", "Local", TRUE
+      "UnitFlag", "Nuclear", "Local", TRUE
     }
 
 [borders]

Modified: trunk/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=29389&r1=29388&r2=29389&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset    (original)
+++ trunk/data/civ2civ3/game.ruleset    Fri Aug  7 19:26:26 2015
@@ -383,7 +383,7 @@
 action = "Sabotage Unit"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Spy", "Local"
+      "UnitFlag", "Spy", "Local"
       "DiplRel", "War", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
@@ -399,21 +399,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
     }
 
@@ -421,13 +421,13 @@
 action = "Capture Units"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Capturer", "Local", TRUE
+      "UnitFlag", "Capturer", "Local", TRUE
       "DiplRel", "War", "Local", TRUE
       "MinMoveFrags", "1", "Local", TRUE
     }
 target_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Capturable", "Local", TRUE
+      "UnitFlag", "Capturable", "Local", TRUE
       "CityTile", "Center", "Local", FALSE
     }
 
@@ -435,7 +435,7 @@
 action = "Bombard"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Bombarder", "Local", TRUE
+      "UnitFlag", "Bombarder", "Local", TRUE
       "UnitState", "Transported", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -448,7 +448,7 @@
 action = "Found City"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Cities", "Local"
+      "UnitFlag", "Cities", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -457,7 +457,7 @@
 action = "Join City"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "AddToCity", "Local", TRUE
+      "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -466,7 +466,7 @@
 action = "Explode Nuclear"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Nuclear", "Local", TRUE
+      "UnitFlag", "Nuclear", "Local", TRUE
     }
 
 [borders]

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=29389&r1=29388&r2=29389&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset     (original)
+++ trunk/data/classic/game.ruleset     Fri Aug  7 19:26:26 2015
@@ -366,7 +366,7 @@
 action = "Sabotage Unit"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Spy", "Local"
+      "UnitFlag", "Spy", "Local"
       "DiplRel", "War", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
@@ -382,21 +382,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
     }
 
@@ -404,7 +404,7 @@
 action = "Found City"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Cities", "Local"
+      "UnitFlag", "Cities", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -413,7 +413,7 @@
 action = "Join City"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "AddToCity", "Local", TRUE
+      "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -422,7 +422,7 @@
 action = "Explode Nuclear"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Nuclear", "Local", TRUE
+      "UnitFlag", "Nuclear", "Local", TRUE
     }
 
 [borders]

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=29389&r1=29388&r2=29389&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset        (original)
+++ trunk/data/experimental/game.ruleset        Fri Aug  7 19:26:26 2015
@@ -385,7 +385,7 @@
 action = "Sabotage Unit"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Spy", "Local"
+      "UnitFlag", "Spy", "Local"
       "DiplRel", "War", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
@@ -400,21 +400,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
     }
 
@@ -422,7 +422,7 @@
 action = "Found City"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Cities", "Local"
+      "UnitFlag", "Cities", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -431,7 +431,7 @@
 action = "Join City"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "AddToCity", "Local", TRUE
+      "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -440,7 +440,7 @@
 action = "Explode Nuclear"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Nuclear", "Local", TRUE
+      "UnitFlag", "Nuclear", "Local", TRUE
     }
 
 [borders]

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=29389&r1=29388&r2=29389&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Fri Aug  7 19:26:26 2015
@@ -364,7 +364,7 @@
 action = "Sabotage Unit"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Spy", "Local"
+      "UnitFlag", "Spy", "Local"
       "DiplRel", "War", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
@@ -380,7 +380,7 @@
 action = "Help Wonder"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "HelpWonder", "Local", TRUE
+      "UnitFlag", "HelpWonder", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
     }
 
@@ -388,7 +388,7 @@
 action = "Found City"
 actor_reqs    =
     { "type",   "name", "range"
-      "Unitflag", "Cities", "Local"
+      "UnitFlag", "Cities", "Local"
       "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
     }
@@ -397,7 +397,7 @@
 action = "Join City"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "AddToCity", "Local", TRUE
+      "UnitFlag", "AddToCity", "Local", TRUE
       "DiplRel", "Is foreign", "Local", FALSE
       "MinMoveFrags", "1", "Local", TRUE
     }
@@ -406,7 +406,7 @@
 action = "Explode Nuclear"
 actor_reqs    =
     { "type",   "name", "range", "present"
-      "Unitflag", "Nuclear", "Local", TRUE
+      "UnitFlag", "Nuclear", "Local", TRUE
     }
 
 [borders]


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

Reply via email to