Author: sveinung
Date: Fri Jul 4 18:10:57 2014
New Revision: 25383
URL: http://svn.gna.org/viewcvs/freeciv?rev=25383&view=rev
Log:
Helptext: Don't say that a unit is unbribable more than once.
Each user flag adds its description to the generated help text of all unit types
that has it. If an unit type is immune to an action (since no action enabler can
be active against it) this fact is pointed out in its auto generated help text.
Remove the user flag "Unbribable" from all bundled rulesets. Replace its use as
a !present requirement in the "Bribe Unit" action enablers with !present
requirements of the units that had it.
See bug #22255
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=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Fri Jul 4 18:10:57 2014
@@ -307,7 +307,8 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Unbribable", "Local", FALSE
+ "UnitType", "Leader", "Local", FALSE
+ "UnitType", "Barbarian Leader", "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=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset (original)
+++ trunk/data/civ2civ3/units.ruleset Fri Jul 4 18:10:57 2014
@@ -29,7 +29,6 @@
"Transform", _("Can transform terrain.")
"AirAttacker", _("Very bad at attacking AEGIS.")
"Submarine", _("Attack value halved when attacking Destroyer")
- "Unbribable", _("May not be bribed.")
}
[veteran_system]
@@ -2354,7 +2353,7 @@
uk_food = 0
uk_gold = 0
flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy",
- "Undisbandable", "Unbribable", "GameLoss", "Unique"
+ "Undisbandable", "GameLoss", "Unique"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -2391,7 +2390,7 @@
uk_shield = 0
uk_food = 0
uk_gold = 0
-flags = "IgZOC", "NonMil", "Unbribable",
+flags = "IgZOC", "NonMil",
"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=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Fri Jul 4 18:10:57 2014
@@ -297,7 +297,8 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Unbribable", "Local", FALSE
+ "UnitType", "Leader", "Local", FALSE
+ "UnitType", "Barbarian Leader", "Local", FALSE
"CityTile", "Center", "Local", FALSE
"Gov", "Democracy", "Player", FALSE
}
Modified: trunk/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset (original)
+++ trunk/data/classic/units.ruleset Fri Jul 4 18:10:57 2014
@@ -30,7 +30,6 @@
"AirAttacker", _("Very bad at attacking AEGIS.")
"Horse", _("Attack value halved when attacking Pikemen.")
"Helicopter", _("Defends very badly against Fighters.")
- "Unbribable", _("May not be bribed.")
}
[veteran_system]
@@ -2219,7 +2218,7 @@
uk_food = 0
uk_gold = 0
flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy",
- "Undisbandable", "Unbribable", "GameLoss", "Unique"
+ "Undisbandable", "GameLoss", "Unique"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -2256,7 +2255,7 @@
uk_shield = 0
uk_food = 0
uk_gold = 0
-flags = "IgZOC", "NonMil", "Unbribable",
+flags = "IgZOC", "NonMil",
"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=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset (original)
+++ trunk/data/experimental/game.ruleset Fri Jul 4 18:10:57 2014
@@ -303,7 +303,8 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Unbribable", "Local", FALSE
+ "UnitType", "Leader", "Local", FALSE
+ "UnitType", "Barbarian Leader", "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=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset (original)
+++ trunk/data/experimental/units.ruleset Fri Jul 4 18:10:57 2014
@@ -33,7 +33,6 @@
"AirAttacker", _("Very bad at attacking AEGIS.")
"Horse", _("Attack value halved when attacking Pikemen.")
"Helicopter", _("Defends very badly against Fighters.")
- "Unbribable", _("May not be bribed.")
}
[veteran_system]
@@ -2244,7 +2243,7 @@
uk_food = 0
uk_gold = 0
flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy",
- "Undisbandable", "Unbribable", "GameLoss", "Unique"
+ "Undisbandable", "GameLoss", "Unique"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -2281,7 +2280,7 @@
uk_shield = 0
uk_food = 0
uk_gold = 0
-flags = "IgZOC", "NonMil", "Unbribable",
+flags = "IgZOC", "NonMil",
"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=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Fri Jul 4 18:10:57 2014
@@ -301,7 +301,8 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "UnitFlag", "Unbribable", "Local", FALSE
+ "UnitType", "Leader", "Local", FALSE
+ "UnitType", "Barbarian Leader", "Local", FALSE
"CityTile", "Center", "Local", FALSE
"Gov", "Democracy", "Player", FALSE
}
Modified: trunk/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=25383&r1=25382&r2=25383&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset (original)
+++ trunk/data/multiplayer/units.ruleset Fri Jul 4 18:10:57 2014
@@ -30,7 +30,6 @@
"AirAttacker", _("Very bad at attacking AEGIS.")
"Horse", _("Attack value halved when attacking Pikemen.")
"Helicopter", _("Defends very badly against Fighters.")
- "Unbribable", _("May not be bribed.")
}
[veteran_system]
@@ -2310,7 +2309,7 @@
uk_food = 0
uk_gold = 0
flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy",
- "Undisbandable", "Unbribable", "GameLoss", "Unique"
+ "Undisbandable", "GameLoss", "Unique"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -2347,7 +2346,7 @@
uk_shield = 0
uk_food = 0
uk_gold = 0
-flags = "IgZOC", "NonMil", "Unbribable",
+flags = "IgZOC", "NonMil",
"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
