From 1c9411fa6e85e0edc5c42b473dca2cca16873bc9 Mon Sep 17 00:00:00 2001 From: Dino Date: Mon, 28 Jul 2025 20:28:24 -0400 Subject: [PATCH] #1267 improve display of civ2civ3 ruleset help for units --- data/civ2civ3/effects.ruleset | 40 +++++++ data/civ2civ3/units.ruleset | 205 +++++++++++++++++----------------- 2 files changed, 143 insertions(+), 102 deletions(-) diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index c3dd77a18a..394ae20584 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -741,6 +741,46 @@ reqs = "Gov", "Communism", "Player", TRUE } +[effect_shield2gold_despotism] +type = "Shield2Gold_Factor" +value = 1 +reqs = + { "type", "name", "range" + "Gov", "Despotism", "Player" + } + +[effect_shield2gold_monarchy] +type = "Shield2Gold_Factor" +value = 1 +reqs = + { "type", "name", "range" + "Gov", "Monarchy", "Player" + } + +[effect_shield2gold_fundamentalism] +type = "Shield2Gold_Factor" +value = 2 +reqs = + { "type", "name", "range" + "Gov", "Fundamentalism", "Player" + } + +[effect_shield2gold_federation] +type = "Shield2Gold_Factor" +value = 2 +reqs = + { "type", "name", "range" + "Gov", "Federation", "Player" + } + +[effect_shield2gold_democracy] +type = "Shield2Gold_Factor" +value = 2 +reqs = + { "type", "name", "range" + "Gov", "Democracy", "Player" + } + [effect_base_unit_upkeep_gold_1] type = "Upkeep_Factor" value = 1 diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 95b1e6e2f1..6fb79de92d 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -27,6 +27,7 @@ format_version = 40 ; helptxt = displayed in the help for unit types with this flag (optional) flags = { "name", "helptxt" + _("ShieldToGold"), _("The 1 shield unit upkeep becomes 1 gold under Despotism and Monarchy, and 2 gold under Fundamentalism, Federation and Democracy.") _("Fortress"), _("Can build Forts and Fortresses.") _("Transform") _("AirAttacker"), _("Very bad at attacking AEGIS.") @@ -592,9 +593,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -634,9 +635,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "Transform" +flags = "Shield2Gold", "ShieldToGold", "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "Transform" veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 3, 2, 1, 0 @@ -681,9 +682,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendOk", "DefendOkStartUnit", "FirstBuild" helptext = _("\ This unit may be built from the start of the game. It is the\ @@ -717,9 +718,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Phalanx is armored infantry, suitable for defending your cities.\ @@ -752,9 +753,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendOk", "Hut" helptext = _("\ Archers fight with bows and arrows and have a good offensive\ @@ -788,9 +789,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Marines", "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress" roles = "DefendOk", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ @@ -824,9 +825,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Equipped with long pikes, Pikemen replaces Phalanx\ @@ -860,9 +861,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Marines", "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild", "HutTech", "BarbarianTech", "BarbarianBuildTech", "BarbarianSeaTech" helptext = _("\ @@ -898,9 +899,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Marines", "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Riflemen are World War-era infantry, very good\ @@ -934,11 +935,11 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" -flags = "IgTer", "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "IgTer", "Capturer", "Fortress" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Alpine Troops are highly mobile units as well as\ @@ -972,11 +973,11 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" -flags = "IgTer", "IgZOC", "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "IgTer", "IgZOC", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ @@ -1060,11 +1061,11 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" -flags = "Marines", "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress" roles = "DefendGood", "DefendOkStartUnit", "FirstBuild", "BarbarianSeaTech" helptext = _("\ Marines are infantry who are experts at marine warfare.\ @@ -1097,11 +1098,11 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" -flags = "Paratroopers", "Capturer", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Paratroopers", "Capturer", "Fortress" roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. From a friendly city, \ @@ -1140,9 +1141,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "" +flags = "Shield2Gold", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Mechanized Infantry has the strongest inherent defensive strength \ @@ -1179,9 +1180,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "Hut", "Barbarian", "Hunter" helptext = _("\ Horsemen are mounted warriors and an early\ @@ -1216,9 +1217,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit" helptext = _("\ Chariots are horse-pulled war wagons. They have a stronger attack than \ @@ -1256,9 +1257,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Shield2Gold", "ShieldToGold", "Capturer" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Elephants are towering animals trained for war that are often used as\ @@ -1292,9 +1293,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Crusaders are highly disciplined mounted\ @@ -1328,9 +1329,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Shield2Gold", "ShieldToGold", "Capturer" roles = "DefendOk", "AttackFastStartUnit", "HutTech","BarbarianTech", "BarbarianBuildTech", "Hunter" helptext = _("\ @@ -1364,9 +1365,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "BarbarianBuildTech", "Hunter" helptext = _("\ Dragoons are mounted warriors carrying early firearms.\ @@ -1399,9 +1400,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Cavalry are mounted and highly trained soldiers.\ @@ -1434,9 +1435,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "" +flags = "Shield2Gold", "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Armors are motorized war wagons that are faster, stronger, and can take \ @@ -1473,9 +1474,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "" +flags = "Shield2Gold", "ShieldToGold" roles = "AttackStrongStartUnit" helptext = _("\ Catapults are large rock-throwing machines of war.\ @@ -1515,9 +1516,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "" +flags = "Shield2Gold", "ShieldToGold" roles = "AttackStrongStartUnit", "BarbarianTech", "BarbarianBuildTech" helptext = _("\ Cannons are large firearms that can fire heavy projectiles over long \ @@ -1553,9 +1554,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "CityBuster" +flags = "Shield2Gold", "ShieldToGold", "CityBuster" roles = "AttackStrongStartUnit" helptext = _("\ The artillery is an upgraded cannon. As with its predecessors, it is a \ @@ -1590,9 +1591,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "CityBuster" +flags = "Shield2Gold", "ShieldToGold", "CityBuster" roles = "AttackStrongStartUnit" helptext = _("\ Howitzers are upgraded artillery with improved defensive as well as \ @@ -1627,10 +1628,10 @@ fuel = 2 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" targets = "Air", "Missile", "Helicopter" -flags = "AirAttacker", "HasNoZOC" +flags = "Shield2Gold", "ShieldToGold", "AirAttacker", "HasNoZOC" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Fighters are your first airborne units. They can\ @@ -1669,9 +1670,9 @@ fuel = 3 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "FieldUnit", "OneAttack", "AirAttacker", "Bombarder", "HasNoZOC" +flags = "Shield2Gold", "ShieldToGold", "FieldUnit", "OneAttack", "AirAttacker", "Bombarder", "HasNoZOC" roles = "" helptext = _("\ Bombers are specialized airborne units that may\ @@ -1715,10 +1716,10 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" cargo = "Land" -flags = "OneAttack", "AirAttacker", "Bombarder", "HasNoZOC", +flags = "Shield2Gold", "ShieldToGold", "OneAttack", "AirAttacker", "Bombarder", "HasNoZOC", "Provoking" roles = "" helptext = _("\ @@ -1764,11 +1765,11 @@ fuel = 2 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" targets = "Air", "Missile", "Helicopter" vision_layer = "Stealth" -flags = "AirAttacker", "HasNoZOC" +flags = "Shield2Gold", "ShieldToGold", "AirAttacker", "HasNoZOC" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ An improved Fighter, with improved attack and a higher movement\ @@ -1802,10 +1803,10 @@ fuel = 3 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" vision_layer = "Stealth" -flags = "FieldUnit", "OneAttack", "AirAttacker", "Bombarder", "HasNoZOC" +flags = "Shield2Gold", "ShieldToGold", "FieldUnit", "OneAttack", "AirAttacker", "Bombarder", "HasNoZOC" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ An improved Bomber, with improved attack and a higher movement\ @@ -1840,10 +1841,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" cargo = "Land", "Small Land", "Merchant" -flags = "BadCityDefender", "HasNoZOC", "Provoking", "NonMil" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", "HasNoZOC", "Provoking", "NonMil" roles = "Ferryboat", "FerryStartUnit" helptext = _("\ The Trireme is your first boat unit. It can act\ @@ -1880,10 +1881,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" cargo = "Land", "Small Land", "Merchant" -flags = "BadCityDefender", "Only_Native_Attack", "HasNoZOC", +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", "Only_Native_Attack", "HasNoZOC", "Provoking", "NonMil" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ @@ -1918,10 +1919,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" cargo = "Land", "Small Land", "Big Land", "Merchant" -flags = "BadCityDefender", "HasNoZOC", "Provoking", "NonMil" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", "HasNoZOC", "Provoking", "NonMil" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ The Galleon is a big transport ship, the first which can\ @@ -1955,9 +1956,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender" roles = "Hunter" helptext = _("\ The Frigate is a specialized ship with a strong offensive value,\ @@ -1991,9 +1992,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender" roles = "Hunter" helptext = _("\ The Ironclad is an armored ship,\ @@ -2027,13 +2028,13 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" bonuses = { "flag", "type", "value" "Submarine", "DefenseMultiplier", 1 } -flags = "BadCityDefender" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender" roles = "Hunter" helptext = _("\ An improved Ironclad, with better move rate and vision.\ @@ -2070,9 +2071,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Cruiser is a strong offensive boat unit.\ @@ -2105,13 +2106,13 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" bonuses = { "flag", "type", "value" "AirAttacker", "DefenseMultiplier", 4 } -flags = "BadCityDefender" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ The AEGIS Cruiser is equipped with an advanced\ @@ -2145,9 +2146,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Battleship is the supreme naval unit with\ @@ -2181,11 +2182,11 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" cargo = "Missile" vision_layer = "Subsurface" -flags = "BadCityDefender", "Only_Native_Attack", +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", "Only_Native_Attack", "Submarine", "Provoking" roles = "Hunter" helptext = _("\ @@ -2221,10 +2222,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" cargo = "Land", "Air", "Missile", "Helicopter" -flags = "BadCityDefender", "HasNoZOC", "Provoking" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", "HasNoZOC", "Provoking" roles = "DefendGood" helptext = _("\ The Carrier is a mobile airport.\ @@ -2265,10 +2266,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" cargo = "Land", "Small Land", "Big Land", "Merchant" -flags = "Workers", "BadCityDefender", "HasNoZOC", +flags = "Shield2Gold", "ShieldToGold", "Workers", "BadCityDefender", "HasNoZOC", "Provoking", "NonMil" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 @@ -2314,10 +2315,10 @@ fuel = 1 uk_happy = 1 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" targets = "Air", "Missile", "Helicopter" -flags = "OneAttack", "AirAttacker", "CityBuster", "HasNoZOC" +flags = "Shield2Gold", "ShieldToGold", "OneAttack", "AirAttacker", "CityBuster", "HasNoZOC" roles = "" helptext = _("\ The Cruise Missile is a long-distance missile\ @@ -2354,9 +2355,9 @@ fuel = 1 uk_happy = 1 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "FieldUnit", "OneAttack", "Nuclear", "HasNoZOC" +flags = "Shield2Gold", "ShieldToGold", "FieldUnit", "OneAttack", "Nuclear", "HasNoZOC" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -2416,10 +2417,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" vision_layer = "Stealth" -flags = "Diplomat", "IgZOC", "NonMil", "HasNoZOC", +flags = "Shield2Gold", "ShieldToGold", "Diplomat", "IgZOC", "NonMil", "HasNoZOC", "Provoking" veteran_names = ; /* TRANS: diplomatic rank. */ @@ -2545,10 +2546,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" vision_layer = "Stealth" -flags = "Diplomat", "IgZOC", "NonMil", "HasNoZOC", +flags = "Shield2Gold", "ShieldToGold", "Diplomat", "IgZOC", "NonMil", "HasNoZOC", "Spy", "Provoking" veteran_names = ; /* TRANS: Spy veteran level */ @@ -2620,9 +2621,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "TradeRoute", "HelpWonder", "NonMil", "HasNoZOC", "Capturable" +flags = "Shield2Gold", "ShieldToGold", "TradeRoute", "HelpWonder", "NonMil", "HasNoZOC", "Capturable" roles = "" helptext = _("\ A Caravan carries goods or material for trading with other nations,\ @@ -2672,9 +2673,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "TradeRoute", "HelpWonder", "NonMil", "HasNoZOC", "Capturable" +flags = "Shield2Gold", "ShieldToGold", "TradeRoute", "HelpWonder", "NonMil", "HasNoZOC", "Capturable" roles = "" helptext = _("\ The Freight unit replaces the Caravan, and moves at twice the speed.\ @@ -2708,9 +2709,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IgTer", "IgZOC", "NonMil", "HasNoZOC", "Cant_Fortify" +flags = "Shield2Gold", "ShieldToGold", "IgTer", "IgZOC", "NonMil", "HasNoZOC", "Cant_Fortify" roles = "Explorer", "ExplorerStartUnit" helptext = _("\ Explorers are brave individuals that are very useful for\ @@ -2844,9 +2845,9 @@ fuel = 3 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "HasNoZOC" +flags = "Shield2Gold", "ShieldToGold", "HasNoZOC" roles = "" helptext = _("\ The AWACS (Airborne Warning and Control System) is an airplane with an \ -- 2.31.0