Author: cazfi
Date: Sun Jan  1 23:28:17 2017
New Revision: 34761

URL: http://svn.gna.org/viewcvs/freeciv?rev=34761&view=rev
Log:
Dropped "Infra" unit type flag from supplied rulesets.

See patch #7353

Modified:
    branches/S3_0/data/alien/units.ruleset
    branches/S3_0/data/civ1/units.ruleset
    branches/S3_0/data/civ2/units.ruleset
    branches/S3_0/data/civ2civ3/units.ruleset
    branches/S3_0/data/classic/units.ruleset
    branches/S3_0/data/experimental/units.ruleset
    branches/S3_0/data/multiplayer/units.ruleset
    branches/S3_0/data/sandbox/units.ruleset
    branches/S3_0/data/webperimental/units.ruleset
    branches/S3_0/server/rscompat.c

Modified: branches/S3_0/data/alien/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/alien/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/alien/units.ruleset      (original)
+++ branches/S3_0/data/alien/units.ruleset      Sun Jan  1 23:28:17 2017
@@ -31,7 +31,6 @@
     _("Bombarder")
     _("Cities")
     _("AddToCity")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
   }
 
@@ -503,7 +502,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil"
+flags         = "Settlers", "Cant_Fortify", "NonMil"
 roles         = "Settlers", "WorkerStartUnit"
 helptext      = _("\
 This is Earth technology engineer.\
@@ -534,7 +533,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil"
+flags         = "Settlers", "Cant_Fortify", "NonMil"
 roles         = "Settlers"
 helptext      = _("\
 Native version of the Engineer unit.\
@@ -566,7 +565,7 @@
 uk_food       = 0
 uk_gold       = 0
 city_size     = 2
-flags         = "Cities", "Settlers", "Infra", "Cant_Fortify", "NonMil"
+flags         = "Cities", "Settlers", "Cant_Fortify", "NonMil"
 roles         = "Settlers"
 helptext      = _("\
 Amphibious Engineer that can also establish new cities on Ocean. \
@@ -912,7 +911,7 @@
 uk_food       = 0
 uk_gold       = 0
 targets       = "Antigravity", "Burrowing"
-flags         = "Settlers", "Infra", "Capturer"
+flags         = "Settlers", "Capturer"
 roles         = "Hunter"
 helptext      = _("\
 Burrowing unit that also has capability to attack Antigravity units with \

Modified: branches/S3_0/data/civ1/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ1/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/civ1/units.ruleset       (original)
+++ branches/S3_0/data/civ1/units.ruleset       Sun Jan  1 23:28:17 2017
@@ -26,7 +26,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
   }
 
 ; Names for custom unit class flags. There can be up to 8 of these.
@@ -352,7 +351,7 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "AddToCity", 
"Cities", "NoVeteran"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "AddToCity", "Cities", 
"NoVeteran"
 roles         = "Settlers", "WorkerStartUnit", "CitiesStartUnit"
 helptext      = _("\
 Settlers are one of the key units in the game, as they are your main \

Modified: branches/S3_0/data/civ2/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/civ2/units.ruleset       (original)
+++ branches/S3_0/data/civ2/units.ruleset       Sun Jan  1 23:28:17 2017
@@ -31,7 +31,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
     _("Marines"), _("Can launch attack from non-native tiles.")
   }
@@ -356,7 +355,7 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "Airbase", 
"AddToCity", "Cities", "NoVeteran"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "Airbase", "AddToCity", 
"Cities", "NoVeteran"
 roles         = "Settlers", "WorkerStartUnit", "CitiesStartUnit"
 helptext      = _("\
 Settlers are one of the key units in the game, as they are your main \
@@ -415,7 +414,7 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "Transform", 
"Airbase", "AddToCity", "Cities", "NoVeteran"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "Transform", "Airbase", 
"AddToCity", "Cities", "NoVeteran"
 roles         = "Settlers", "WorkerStartUnit", "CitiesStartUnit"
 helptext      = _("\
 Engineers are similar to Settlers, but they work twice as fast and\

Modified: branches/S3_0/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2civ3/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/civ2civ3/units.ruleset   (original)
+++ branches/S3_0/data/civ2civ3/units.ruleset   Sun Jan  1 23:28:17 2017
@@ -40,7 +40,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
     _("Marines"), _("Can launch attack from non-native tiles.")
   }
@@ -469,7 +468,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"AddToCity", "Cities"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", 
"Cities"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -513,7 +512,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"AddToCity", "Capturable"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", 
"Capturable"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -552,7 +551,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"Airbase"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -616,7 +615,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"Airbase", "Transform"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase", 
"Transform"
 veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert")
 veteran_raise_chance      = 50, 33, 20, 0
 veteran_work_raise_chance = 3, 2, 1, 0
@@ -2077,7 +2076,7 @@
 uk_food       = 1
 uk_gold       = 1
 cargo         = "Land", "Small Land", "Big Land", "Merchant"
-flags         = "Settlers", "Infra", "BadCityDefender", "HasNoZOC",
+flags         = "Settlers", "BadCityDefender", "HasNoZOC",
                 "Provoking"
 veteran_names = _("green"), _("veteran"), _("hardened"), _("elite")
 veteran_raise_chance      = 50, 33, 20, 0

Modified: branches/S3_0/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/classic/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/classic/units.ruleset    (original)
+++ branches/S3_0/data/classic/units.ruleset    Sun Jan  1 23:28:17 2017
@@ -38,7 +38,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
     _("Marines"), _("Can launch attack from non-native tiles.")
   }
@@ -445,7 +444,7 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"AddToCity", "Cities"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", 
"Cities"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -490,7 +489,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"Airbase"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -552,7 +551,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"Transform", "Airbase"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Transform", 
"Airbase"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0

Modified: branches/S3_0/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/experimental/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/experimental/units.ruleset       (original)
+++ branches/S3_0/data/experimental/units.ruleset       Sun Jan  1 23:28:17 2017
@@ -41,7 +41,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
     _("Marines"), _("Can launch attack from non-native tiles.")
   }
@@ -457,7 +456,7 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"AddToCity", "Cities"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", 
"Cities"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -502,7 +501,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "NonMil", "HasNoZOC", "Airbase"
+flags         = "Settlers", "NonMil", "HasNoZOC", "Airbase"
 veteran_names             =
 ; /* TRANS: Worker veteran level */
   _("?worker_level:apprentice"),
@@ -569,7 +568,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "NonMil", "HasNoZOC", "Transform", 
"Airbase"
+flags         = "Settlers", "NonMil", "HasNoZOC", "Transform", "Airbase"
 veteran_names             =
 ; /* TRANS: Worker veteran level */
   _("?worker_level:apprentice"),

Modified: branches/S3_0/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/multiplayer/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/multiplayer/units.ruleset        (original)
+++ branches/S3_0/data/multiplayer/units.ruleset        Sun Jan  1 23:28:17 2017
@@ -37,7 +37,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
     _("Marines"), _("Can launch attack from non-native tiles.")
   }
@@ -444,7 +443,7 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 0
-flags         = "Settlers", "Infra", "NonMil", "HasNoZOC", "AddToCity", 
"Cities", "Cant_Fortify"
+flags         = "Settlers", "NonMil", "HasNoZOC", "AddToCity", "Cities", 
"Cant_Fortify"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -490,7 +489,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "NonMil", "HasNoZOC", "Airbase", 
"Cant_Fortify"
+flags         = "Settlers", "NonMil", "HasNoZOC", "Airbase", "Cant_Fortify"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -551,7 +550,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "NonMil", "HasNoZOC", "Transform", 
"Airbase", "Cant_Fortify"
+flags         = "Settlers", "NonMil", "HasNoZOC", "Transform", "Airbase", 
"Cant_Fortify"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0

Modified: branches/S3_0/data/sandbox/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/sandbox/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/sandbox/units.ruleset    (original)
+++ branches/S3_0/data/sandbox/units.ruleset    Sun Jan  1 23:28:17 2017
@@ -41,7 +41,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
     _("Marines"), _("Can launch attack from non-native tiles.")
   }
@@ -479,7 +478,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"AddToCity", "Cities"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", 
"Cities"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -523,7 +522,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"AddToCity", "Capturable"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", 
"Capturable"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -562,7 +561,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"Airbase"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -626,7 +625,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 1
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC", 
"Airbase", "Transform"
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase", 
"Transform"
 veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert")
 veteran_raise_chance      = 50, 33, 20, 0
 veteran_work_raise_chance = 3, 2, 1, 0
@@ -2093,7 +2092,7 @@
 uk_food       = 1
 uk_gold       = 1
 cargo         = "Land", "Small Land", "Big Land", "Merchant"
-flags         = "Settlers", "Infra", "BadCityDefender", "HasNoZOC",
+flags         = "Settlers", "BadCityDefender", "HasNoZOC",
                 "Provoking"
 veteran_names = _("green"), _("veteran"), _("hardened"), _("elite")
 veteran_raise_chance      = 50, 33, 20, 0

Modified: branches/S3_0/data/webperimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/webperimental/units.ruleset?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/data/webperimental/units.ruleset      (original)
+++ branches/S3_0/data/webperimental/units.ruleset      Sun Jan  1 23:28:17 2017
@@ -45,7 +45,6 @@
     _("Cities")
     _("AddToCity")
     _("Nuclear")
-    _("Infra"), _("Can build infrastructure.")
     _("Paratroopers"), _("Can be paradropped from a friendly city or suitable 
base.")
     _("Marines"), _("Can launch attack from non-native tiles.")
   }
@@ -449,7 +448,7 @@
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC",
                 "AddToCity", "Cities", "Expellable", "LightWeight"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
@@ -495,7 +494,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC",
                 "Airbase", "Expellable", "LightWeight"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
@@ -558,7 +557,7 @@
 uk_shield     = 1
 uk_food       = 0
 uk_gold       = 0
-flags         = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
+flags         = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC",
                 "Transform", "Airbase", "Expellable", "MediumWeight"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")

Modified: branches/S3_0/server/rscompat.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/rscompat.c?rev=34761&r1=34760&r2=34761&view=diff
==============================================================================
--- branches/S3_0/server/rscompat.c     (original)
+++ branches/S3_0/server/rscompat.c     Sun Jan  1 23:28:17 2017
@@ -182,7 +182,6 @@
       { N_("AddToCity"), N_("Can join cities.") },
       { N_("Bombarder"), N_("Can do bombard attacks.") },
       { N_("Nuclear"), N_("This unit's attack causes a nuclear explosion!") },
-      { N_("Infra"), N_("Can build infrastructure.") },
       { N_("Paratroopers"),
           N_("Can be paradropped from a friendly city or suitable base.") },
       { N_("Marines"), N_("Can launch attack from non-native tiles.") },


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

Reply via email to