From cb21bebed3761a7897f907a95bc9fca073a3f119 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 4 Dec 2022 06:56:06 +0200 Subject: [PATCH 54/54] Rulesets: Clear extraneous StartUnit roles Mainly from classic/multiplayer/goldkeep/webperimental Additional changes to civ2civ3/sandbox touched earlier already. Requested by Alexandro Ignatiev See osdn #45984 Signed-off-by: Marko Lindqvist --- data/civ2civ3/units.ruleset | 4 ++-- data/classic/units.ruleset | 4 ++-- data/goldkeep/units.ruleset | 6 +++--- data/multiplayer/units.ruleset | 6 +++--- data/sandbox/units.ruleset | 4 ++-- data/webperimental/units.ruleset | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 93e1533ff5..a266f05d86 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -1062,7 +1062,7 @@ tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" flags = "Marines", "Capturer", "Fortress" -roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild", "BarbarianSeaTech" +roles = "DefendGood", "DefendOkStartUnit", "FirstBuild", "BarbarianSeaTech" helptext = _("\ Marines are infantry who are experts at marine warfare.\ ") @@ -1099,7 +1099,7 @@ tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" flags = "Paratroopers", "Capturer", "Fortress" -roles = "DefendOk", "DefendOkStartUnit" +roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. From a friendly city, \ airbase, or airstrip, Paratroopers who have not expended any \ diff --git a/data/classic/units.ruleset b/data/classic/units.ruleset index a4dcfccfd7..7e08c8bdc0 100644 --- a/data/classic/units.ruleset +++ b/data/classic/units.ruleset @@ -724,7 +724,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "" -roles = "DefendOk", "DefendOkStartUnit", "Hut", "BarbarianBuild", "BarbarianSea" +roles = "DefendOk", "Hut", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ units with an excellent offensive value.\ @@ -989,7 +989,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "Paratroopers" -roles = "DefendOk", "DefendOkStartUnit" +roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. \ From a friendly city or airbase, Paratroopers who have not expended any \ diff --git a/data/goldkeep/units.ruleset b/data/goldkeep/units.ruleset index 936828f3bf..5042d13616 100644 --- a/data/goldkeep/units.ruleset +++ b/data/goldkeep/units.ruleset @@ -746,7 +746,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "" -roles = "DefendOk", "DefendOkStartUnit", "Hut", "BarbarianBuild", "BarbarianSea" +roles = "DefendOk", "Hut", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ units with an excellent offensive value.\ @@ -860,7 +860,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "IgTer", "IgZOC" -roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" +roles = "DefendGood", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ at using the terrain to their advantage.\ @@ -1011,7 +1011,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "Paratroopers", "Shield2Gold" -roles = "DefendOk", "DefendOkStartUnit" +roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. \ From a friendly city or airbase, Paratroopers who have not expended any \ diff --git a/data/multiplayer/units.ruleset b/data/multiplayer/units.ruleset index bb49664e03..8fbd1e02ee 100644 --- a/data/multiplayer/units.ruleset +++ b/data/multiplayer/units.ruleset @@ -725,7 +725,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "" -roles = "DefendOk", "DefendOkStartUnit", "Hut", "BarbarianBuild", "BarbarianSea" +roles = "DefendOk", "Hut", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ units with an excellent offensive value.\ @@ -878,7 +878,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "IgTer", "IgZOC" -roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" +roles = "DefendGood", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ at using the terrain to their advantage.\ @@ -1029,7 +1029,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "Paratroopers" -roles = "DefendOk", "DefendOkStartUnit" +roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. \ From a friendly city or airbase, Paratroopers who have not expended any \ diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 7cef757f3e..5dd188eda0 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -1118,7 +1118,7 @@ tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" flags = "Marines", "Capturer", "Fortress", "SupplyLines", "FleshBased" -roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild", "BarbarianSeaTech" +roles = "DefendGood", "FirstBuild", "BarbarianSeaTech" helptext = _("\ Marines are infantry who are experts at marine warfare.\ ") @@ -1155,7 +1155,7 @@ tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" flags = "Paratroopers", "Capturer", "Fortress", "SupplyLines", "FleshBased" -roles = "DefendOk", "DefendOkStartUnit" +roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. From a friendly city, \ airbase, or airstrip, Paratroopers who have not expended any \ diff --git a/data/webperimental/units.ruleset b/data/webperimental/units.ruleset index 27122a0af2..16f205a944 100644 --- a/data/webperimental/units.ruleset +++ b/data/webperimental/units.ruleset @@ -731,7 +731,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "BorderPolice", "LightWeight" -roles = "DefendOk", "DefendOkStartUnit", "Hut", "BarbarianBuild", "BarbarianSea" +roles = "DefendOk", "Hut", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ units with an excellent offensive value.\ @@ -845,7 +845,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "IgTer", "IgZOC", "BorderPolice", "LightWeight", "SupplyLines" -roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" +roles = "DefendGood", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ at using the terrain to their advantage.\ @@ -996,7 +996,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" flags = "Paratroopers", "BorderPolice", "LightWeight", "SupplyLines" -roles = "DefendOk", "DefendOkStartUnit" +roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. \ From a friendly city or airbase, Paratroopers who have not expended any \ -- 2.35.1