Author: jtn
Date: Mon Jun 9 10:49:24 2014
New Revision: 25106
URL: http://svn.gna.org/viewcvs/freeciv?rev=25106&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:
branches/S2_5/data/civ2/units.ruleset
branches/S2_5/data/civ2civ3/units.ruleset
branches/S2_5/data/classic/units.ruleset
branches/S2_5/data/experimental/units.ruleset
branches/S2_5/data/multiplayer/units.ruleset
Modified: branches/S2_5/data/civ2/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/units.ruleset?rev=25106&r1=25105&r2=25106&view=diff
==============================================================================
--- branches/S2_5/data/civ2/units.ruleset (original)
+++ branches/S2_5/data/civ2/units.ruleset Mon Jun 9 10:49:24 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.")
}
@@ -1196,7 +1196,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1228,7 +1228,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\
@@ -1262,7 +1262,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\
@@ -1303,7 +1303,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
An improved Fighter, with improved attack and a higher movement\
@@ -1335,7 +1335,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\
@@ -1603,7 +1603,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = ""
@@ -1773,7 +1773,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\
@@ -1808,7 +1808,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: branches/S2_5/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=25106&r1=25105&r2=25106&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/units.ruleset (original)
+++ branches/S2_5/data/civ2civ3/units.ruleset Mon Jun 9 10:49:24 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")
}
@@ -1384,7 +1384,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\
@@ -1416,7 +1416,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\
@@ -1451,7 +1451,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\
@@ -1487,7 +1487,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\
@@ -1519,7 +1519,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\
@@ -1789,7 +1789,7 @@
uk_gold = 1
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = "DefendGood"
@@ -1958,7 +1958,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\
@@ -1993,7 +1993,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\
@@ -2395,7 +2395,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: branches/S2_5/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/units.ruleset?rev=25106&r1=25105&r2=25106&view=diff
==============================================================================
--- branches/S2_5/data/classic/units.ruleset (original)
+++ branches/S2_5/data/classic/units.ruleset Mon Jun 9 10:49:24 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.")
}
@@ -1240,7 +1240,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1272,7 +1272,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\
@@ -1306,7 +1306,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\
@@ -1347,7 +1347,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\
@@ -1379,7 +1379,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\
@@ -1647,7 +1647,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = "DefendGood"
@@ -1817,7 +1817,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\
@@ -1852,7 +1852,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\
@@ -2254,7 +2254,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: branches/S2_5/data/experimental/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/units.ruleset?rev=25106&r1=25105&r2=25106&view=diff
==============================================================================
--- branches/S2_5/data/experimental/units.ruleset (original)
+++ branches/S2_5/data/experimental/units.ruleset Mon Jun 9 10:49:24 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.")
}
@@ -1277,7 +1277,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit", "Shield2Gold"
+flags = "AirAttacker", "Shield2Gold"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1309,7 +1309,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\
@@ -1343,7 +1343,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\
@@ -1384,7 +1384,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\
@@ -1416,7 +1416,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\
@@ -1684,7 +1684,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender", "Shield2Gold"
roles = "DefendGood"
@@ -1854,7 +1854,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\
@@ -1889,7 +1889,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\
@@ -2291,7 +2291,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: branches/S2_5/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/units.ruleset?rev=25106&r1=25105&r2=25106&view=diff
==============================================================================
--- branches/S2_5/data/multiplayer/units.ruleset (original)
+++ branches/S2_5/data/multiplayer/units.ruleset Mon Jun 9 10:49:24 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.")
}
@@ -1340,7 +1340,7 @@
"Helicopter", "DefenseDivider", 1
"Helicopter", "Firepower1", 1
}
-flags = "AirUnit"
+flags = "AirAttacker"
roles = ""
helptext = _("\
Fighters are your first airborne units. They can\
@@ -1372,7 +1372,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\
@@ -1406,7 +1406,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\
@@ -1446,7 +1446,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\
@@ -1478,7 +1478,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\
@@ -1746,7 +1746,7 @@
uk_gold = 0
bonuses =
{ "flag", "type", "value"
- "AirUnit", "DefenseMultiplier", 4
+ "AirAttacker", "DefenseMultiplier", 4
}
flags = "BadCityDefender"
roles = "DefendGood"
@@ -1916,7 +1916,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\
@@ -1951,7 +1951,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\
@@ -2354,7 +2354,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
