Author: jtn
Date: Mon Jun 9 10:46:35 2014
New Revision: 25097
URL: http://svn.gna.org/viewcvs/freeciv?rev=25097&view=rev
Log:
Rename AirUnit user flag to AirAttacker in supplied rulesets.
Remove it from AWACS to avoid spurious comments in help.
See gna bug #22155.
Modified:
trunk/data/civ2/units.ruleset
trunk/data/civ2civ3/units.ruleset
trunk/data/classic/units.ruleset
trunk/data/experimental/units.ruleset
trunk/data/multiplayer/units.ruleset
Modified: trunk/data/civ2/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- trunk/data/civ2/units.ruleset (original)
+++ trunk/data/civ2/units.ruleset Mon Jun 9 10:46:35 2014
@@ -22,7 +22,7 @@
{ "name", "helptxt"
"Airbase", _("Can build Airbases.")
"Transform", _("Can transform terrain.")
- "AirUnit", _("Very bad at attacking AEGIS.")
+ "AirAttacker", _("Very bad at attacking AEGIS.")
"Horse", _("Attack value halved when attacking Pikemen.")
"Helicopter", _("Defends very badly against Fighters.")
}
@@ -1197,7 +1197,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1229,7 +1229,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit"
+flags = "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
Bombers are specialized airborne units that may\
@@ -1263,7 +1263,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Helicopter", "AirUnit"
+flags = "FieldUnit", "OneAttack", "Helicopter", "AirAttacker"
roles = ""
helptext = _("\
The Helicopter is a very powerful unit, as it can both fly and\
@@ -1304,7 +1304,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
An improved Fighter, with improved attack and a higher movement\
@@ -1336,7 +1336,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit"
+flags = "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
An improved Bomber, with improved attack and a higher movement\
@@ -1604,7 +1604,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = ""
@@ -1774,7 +1774,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit"
+flags = "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
The Cruise Missile is a long-distance missile\
@@ -1809,7 +1809,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Nuclear", "AirUnit"
+flags = "FieldUnit", "OneAttack", "Nuclear", "AirAttacker"
roles = ""
helptext = _("\
You can build Nuclear units when you have the required advance, and\
Modified: trunk/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset (original)
+++ trunk/data/civ2civ3/units.ruleset Mon Jun 9 10:46:35 2014
@@ -27,7 +27,7 @@
{ "name", "helptxt"
"Airbase", _("Can build Airbases.")
"Transform", _("Can transform terrain.")
- "AirUnit", _("Very bad at attacking AEGIS.")
+ "AirAttacker", _("Very bad at attacking AEGIS.")
"Submarine", _("Attack value halved when attacking Destroyer")
"Unbribable", _("May not be bribed.")
}
@@ -1387,7 +1387,7 @@
uk_food = 1
uk_gold = 1
targets = "Air", "Missile", "Helicopter"
-flags = "AirUnit"
+flags = "AirAttacker"
roles = "DefendOk"
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1419,7 +1419,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 1
-flags = "FieldUnit", "OneAttack", "AirUnit", "Bombarder"
+flags = "FieldUnit", "OneAttack", "AirAttacker", "Bombarder"
roles = ""
helptext = _("\
Bombers are specialized airborne units that may\
@@ -1454,7 +1454,7 @@
uk_food = 1
uk_gold = 1
cargo = "Land"
-flags = "OneAttack", "AirUnit", "Bombarder"
+flags = "OneAttack", "AirAttacker", "Bombarder"
roles = ""
helptext = _("\
The Helicopter can transport one unit of infantry, and it can bombard\
@@ -1490,7 +1490,7 @@
uk_food = 1
uk_gold = 1
targets = "Air", "Missile", "Helicopter"
-flags = "Partial_Invis", "AirUnit"
+flags = "Partial_Invis", "AirAttacker"
roles = "DefendGood"
helptext = _("\
An improved Fighter, with improved attack and a higher movement\
@@ -1522,7 +1522,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 1
-flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirUnit",
"Bombarder"
+flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirAttacker",
"Bombarder"
roles = "DefendOk"
helptext = _("\
An improved Bomber, with improved attack and a higher movement\
@@ -1792,7 +1792,7 @@
uk_gold = 1
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = "DefendGood"
@@ -1961,7 +1961,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 1
-flags = "OneAttack", "AirUnit", "CityBuster"
+flags = "OneAttack", "AirAttacker", "CityBuster"
roles = ""
helptext = _("\
The Cruise Missile is a long-distance missile\
@@ -1996,7 +1996,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 1
-flags = "FieldUnit", "OneAttack", "Nuclear", "AirUnit"
+flags = "FieldUnit", "OneAttack", "Nuclear", "AirAttacker"
roles = ""
helptext = _("\
You can start building Nuclear units when you have the required\
@@ -2398,7 +2398,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 1
-flags = "AirUnit"
+flags = ""
roles = ""
helptext = _("\
The AWACS (Airborne Warning and Control System) is an airplane with an \
Modified: trunk/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset (original)
+++ trunk/data/classic/units.ruleset Mon Jun 9 10:46:35 2014
@@ -27,7 +27,7 @@
{ "name", "helptxt"
"Airbase", _("Can build Airbases.")
"Transform", _("Can transform terrain.")
- "AirUnit", _("Very bad at attacking AEGIS.")
+ "AirAttacker", _("Very bad at attacking AEGIS.")
"Horse", _("Attack value halved when attacking Pikemen.")
"Helicopter", _("Defends very badly against Fighters.")
"Unbribable", _("May not be bribed.")
@@ -1243,7 +1243,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1275,7 +1275,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit"
+flags = "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
Bombers are specialized airborne units that may\
@@ -1309,7 +1309,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Helicopter", "AirUnit"
+flags = "FieldUnit", "OneAttack", "Helicopter", "AirAttacker"
roles = ""
helptext = _("\
The Helicopter is a very powerful unit, as it can both fly and\
@@ -1350,7 +1350,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "Partial_Invis", "AirUnit"
+flags = "Partial_Invis", "AirAttacker"
roles = ""
helptext = _("\
An improved Fighter, with improved attack and a higher movement\
@@ -1382,7 +1382,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirUnit"
+flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
An improved Bomber, with improved attack and a higher movement\
@@ -1650,7 +1650,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = "DefendGood"
@@ -1820,7 +1820,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit"
+flags = "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
The Cruise Missile is a long-distance missile\
@@ -1855,7 +1855,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Nuclear", "AirUnit"
+flags = "FieldUnit", "OneAttack", "Nuclear", "AirAttacker"
roles = ""
helptext = _("\
You can build Nuclear units when you have the required advance, and\
@@ -2257,7 +2257,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "AirUnit"
+flags = ""
roles = ""
helptext = _("\
The AWACS (Airborne Warning and Control System) is an airplane with an \
Modified: trunk/data/experimental/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset (original)
+++ trunk/data/experimental/units.ruleset Mon Jun 9 10:46:35 2014
@@ -30,7 +30,7 @@
{ "name", "helptxt"
"Airbase", _("Can build Airbases.")
"Transform", _("Can transform terrain.")
- "AirUnit", _("Very bad at attacking AEGIS.")
+ "AirAttacker", _("Very bad at attacking AEGIS.")
"Horse", _("Attack value halved when attacking Pikemen.")
"Helicopter", _("Defends very badly against Fighters.")
"Unbribable", _("May not be bribed.")
@@ -1280,7 +1280,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit", "Shield2Gold"
+flags = "AirAttacker", "Shield2Gold"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1312,7 +1312,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit", "Shield2Gold"
+flags = "FieldUnit", "OneAttack", "AirAttacker", "Shield2Gold"
roles = ""
helptext = _("\
Bombers are specialized airborne units that may\
@@ -1346,7 +1346,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Helicopter", "AirUnit",
"Shield2Gold"
+flags = "FieldUnit", "OneAttack", "Helicopter", "AirAttacker",
"Shield2Gold"
roles = ""
helptext = _("\
The Helicopter is a very powerful unit, as it can both fly and\
@@ -1387,7 +1387,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "Partial_Invis", "AirUnit", "Shield2Gold"
+flags = "Partial_Invis", "AirAttacker", "Shield2Gold"
roles = ""
helptext = _("\
An improved Fighter, with improved attack and a higher movement\
@@ -1419,7 +1419,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirUnit",
"Shield2Gold"
+flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirAttacker",
"Shield2Gold"
roles = ""
helptext = _("\
An improved Bomber, with improved attack and a higher movement\
@@ -1687,7 +1687,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender", "Shield2Gold"
roles = "DefendGood"
@@ -1857,7 +1857,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit", "Shield2Gold"
+flags = "FieldUnit", "OneAttack", "AirAttacker", "Shield2Gold"
roles = ""
helptext = _("\
The Cruise Missile is a long-distance missile\
@@ -1892,7 +1892,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Nuclear", "AirUnit", "Shield2Gold"
+flags = "FieldUnit", "OneAttack", "Nuclear", "AirAttacker",
"Shield2Gold"
roles = ""
helptext = _("\
You can build Nuclear units when you have the required advance, and\
@@ -2294,7 +2294,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "AirUnit", "Shield2Gold"
+flags = "Shield2Gold"
roles = ""
helptext = _("\
The AWACS (Airborne Warning and Control System) is an airplane with an \
Modified: trunk/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset (original)
+++ trunk/data/multiplayer/units.ruleset Mon Jun 9 10:46:35 2014
@@ -27,7 +27,7 @@
{ "name", "helptxt"
"Airbase", _("Can build Airbases.")
"Transform", _("Can transform terrain.")
- "AirUnit", _("Very bad at attacking AEGIS.")
+ "AirAttacker", _("Very bad at attacking AEGIS.")
"Horse", _("Attack value halved when attacking Pikemen.")
"Helicopter", _("Defends very badly against Fighters.")
"Unbribable", _("May not be bribed.")
@@ -1343,7 +1343,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1375,7 +1375,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit"
+flags = "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
Bombers are specialized airborne units that may\
@@ -1409,7 +1409,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Helicopter", "AirUnit"
+flags = "FieldUnit", "OneAttack", "Helicopter", "AirAttacker"
roles = ""
helptext = _("\
The Helicopter is a very powerful unit, as it can both fly and\
@@ -1449,7 +1449,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "Partial_Invis", "AirUnit"
+flags = "Partial_Invis", "AirAttacker"
roles = ""
helptext = _("\
An improved Fighter, with improved attack and a higher movement\
@@ -1481,7 +1481,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirUnit"
+flags = "Partial_Invis", "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
An improved Bomber, with improved attack and a higher movement\
@@ -1749,7 +1749,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = "DefendGood"
@@ -1919,7 +1919,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "AirUnit"
+flags = "FieldUnit", "OneAttack", "AirAttacker"
roles = ""
helptext = _("\
The Cruise Missile is a long-distance missile\
@@ -1954,7 +1954,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "FieldUnit", "OneAttack", "Nuclear", "AirUnit"
+flags = "FieldUnit", "OneAttack", "Nuclear", "AirAttacker"
roles = ""
helptext = _("\
You can build Nuclear units when you have the required advance, and\
@@ -2357,7 +2357,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "AirUnit"
+flags = ""
roles = ""
helptext = _("\
The AWACS (Airborne Warning and Control System) is an airplane with an \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
