Author: sveinung
Date: Sun Aug 23 17:09:20 2015
New Revision: 29657

URL: http://svn.gna.org/viewcvs/freeciv?rev=29657&view=rev
Log:
Bring back the "Unbribable" unit type flag

The custom unit type flag "Unbribable" was removed in bug #22255 to avoid
double documentation in the auto generated help. Simply removing the help
text has the same effect. Bring it back.

Pointed out by Jacob Nevins <jtn> in patch #4905

See patch #6269

Modified:
    trunk/data/civ2civ3/game.ruleset
    trunk/data/civ2civ3/units.ruleset
    trunk/data/classic/game.ruleset
    trunk/data/classic/units.ruleset
    trunk/data/experimental/game.ruleset
    trunk/data/experimental/units.ruleset
    trunk/data/multiplayer/game.ruleset
    trunk/data/multiplayer/units.ruleset

Modified: trunk/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset    (original)
+++ trunk/data/civ2civ3/game.ruleset    Sun Aug 23 17:09:20 2015
@@ -386,8 +386,7 @@
     }
 target_reqs    =
     { "type",   "name", "range", "present"
-      "UnitType", "Leader", "Local", FALSE
-      "UnitType", "Barbarian Leader", "Local", FALSE
+      "UnitFlag", "Unbribable", "Local", FALSE
       "CityTile", "Center", "Local", FALSE
       "Gov", "Republic", "Player", FALSE
       "Gov", "Democracy", "Player", FALSE

Modified: trunk/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset   (original)
+++ trunk/data/civ2civ3/units.ruleset   Sun Aug 23 17:09:20 2015
@@ -30,6 +30,7 @@
     _("Transform")
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Submarine"), _("Attack value halved when attacking Destroyer.")
+    _("Unbribable")
     _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
     _("HelpWonder")
     _("Capturer"),   _("Can capture some enemy units.")
@@ -2462,7 +2463,7 @@
 uk_food       = 0
 uk_gold       = 0
 flags         = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy", 
-                "Undisbandable", "GameLoss", "Unique"
+                "Undisbandable", "Unbribable", "GameLoss", "Unique"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -2499,7 +2500,7 @@
 uk_shield     = 0
 uk_food       = 0
 uk_gold       = 0
-flags         = "IgZOC", "NonMil",
+flags         = "IgZOC", "NonMil", "Unbribable",
                 "Undisbandable", "SuperSpy", "NoHome", "NoBuild"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset     (original)
+++ trunk/data/classic/game.ruleset     Sun Aug 23 17:09:20 2015
@@ -370,8 +370,7 @@
     }
 target_reqs    =
     { "type",   "name", "range", "present"
-      "UnitType", "Leader", "Local", FALSE
-      "UnitType", "Barbarian Leader", "Local", FALSE
+      "UnitFlag", "Unbribable", "Local", FALSE
       "CityTile", "Center", "Local", FALSE
       "Gov", "Democracy", "Player", FALSE
       "MaxUnitsOnTile", "1", "Local", TRUE

Modified: trunk/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset    (original)
+++ trunk/data/classic/units.ruleset    Sun Aug 23 17:09:20 2015
@@ -31,6 +31,7 @@
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Horse"), _("Attack value halved when attacking Pikemen.")
     _("Helicopter"), _("Defends very badly against Fighters.")
+    _("Unbribable")
     _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
     _("HelpWonder")
     _("Cities")
@@ -2257,7 +2258,7 @@
 uk_food       = 0
 uk_gold       = 0
 flags         = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", 
"SuperSpy", 
-                "Undisbandable", "GameLoss", "Unique"
+                "Undisbandable", "Unbribable", "GameLoss", "Unique"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -2294,7 +2295,7 @@
 uk_shield     = 0
 uk_food       = 0
 uk_gold       = 0
-flags         = "IgZOC", "NonMil", "HasNoZOC",
+flags         = "IgZOC", "NonMil", "HasNoZOC", "Unbribable",
                 "Undisbandable", "SuperSpy", "NoHome", "NoBuild"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset        (original)
+++ trunk/data/experimental/game.ruleset        Sun Aug 23 17:09:20 2015
@@ -390,8 +390,7 @@
     }
 target_reqs    =
     { "type",   "name", "range", "present"
-      "UnitType", "Leader", "Local", FALSE
-      "UnitType", "Barbarian Leader", "Local", FALSE
+      "UnitFlag", "Unbribable", "Local", FALSE
       "CityTile", "Center", "Local", FALSE
       "Gov", "Democracy", "Player", FALSE
     }

Modified: trunk/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset       (original)
+++ trunk/data/experimental/units.ruleset       Sun Aug 23 17:09:20 2015
@@ -34,6 +34,7 @@
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Horse"), _("Attack value halved when attacking Pikemen.")
     _("Helicopter"), _("Defends very badly against Fighters.")
+    _("Unbribable")
     _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
     _("HelpWonder")
     _("Cities")
@@ -2291,7 +2292,7 @@
 uk_food       = 0
 uk_gold       = 0
 flags         = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", 
"SuperSpy", 
-                "Undisbandable", "GameLoss", "Unique"
+                "Undisbandable", "Unbribable", "GameLoss", "Unique"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -2328,7 +2329,7 @@
 uk_shield     = 0
 uk_food       = 0
 uk_gold       = 0
-flags         = "IgZOC", "NonMil", "HasNoZOC",
+flags         = "IgZOC", "NonMil", "HasNoZOC", "Unbribable",
                 "Undisbandable", "SuperSpy", "NoHome", "NoBuild"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Sun Aug 23 17:09:20 2015
@@ -368,8 +368,7 @@
     }
 target_reqs    =
     { "type",   "name", "range", "present"
-      "UnitType", "Leader", "Local", FALSE
-      "UnitType", "Barbarian Leader", "Local", FALSE
+      "UnitFlag", "Unbribable", "Local", FALSE
       "CityTile", "Center", "Local", FALSE
       "Gov", "Democracy", "Player", FALSE
       "MaxUnitsOnTile", "1", "Local", TRUE

Modified: trunk/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=29657&r1=29656&r2=29657&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset        (original)
+++ trunk/data/multiplayer/units.ruleset        Sun Aug 23 17:09:20 2015
@@ -31,6 +31,7 @@
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Horse"), _("Attack value halved when attacking Pikemen.")
     _("Helicopter"), _("Defends very badly against Fighters.")
+    _("Unbribable")
     _("HelpWonder")
     _("Cities")
     _("AddToCity")
@@ -2342,7 +2343,7 @@
 uk_food       = 0
 uk_gold       = 0
 flags         = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", 
"SuperSpy", 
-                "Undisbandable", "GameLoss", "Unique"
+                "Undisbandable", "Unbribable", "GameLoss", "Unique"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")
 veteran_raise_chance = 0
@@ -2379,7 +2380,7 @@
 uk_shield     = 0
 uk_food       = 0
 uk_gold       = 0
-flags         = "IgZOC", "NonMil", "HasNoZOC",
+flags         = "IgZOC", "NonMil", "HasNoZOC", "Unbribable",
                 "Undisbandable", "SuperSpy", "NoHome", "NoBuild"
 ; No veteran levels (level name is never displayed)
 veteran_names = _("green")


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

Reply via email to