From 4a89cc7e2645620fbb56af6d1948a930a68f342a Mon Sep 17 00:00:00 2001 From: Dino Date: Fri, 24 Oct 2025 22:24:21 -0400 Subject: [PATCH] #1267 improve display of civ2civ3 and sandbox ruleset help for units --- data/civ2civ3/effects.ruleset | 17 +++ data/civ2civ3/units.ruleset | 209 ++++++++++++++++--------------- data/sandbox/effects.ruleset | 17 +++ data/sandbox/units.ruleset | 228 ++++++++++++++++++---------------- 4 files changed, 264 insertions(+), 207 deletions(-) diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index c3dd77a18a..e4f5f62e75 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -741,6 +741,23 @@ reqs = "Gov", "Communism", "Player", TRUE } +[effect_upkeep_shield2gold] +type = "Shield2Gold_Pct" +value = 100 +reqs = + { "type", "name", "range", "present" + "UnitTypeFlag", "ShieldToGold", "Local", TRUE + "Gov", "Anarchy", "Player", FALSE + "Gov", "Tribal", "Player", FALSE + "Gov", "Communism", "Player", FALSE +; "Gov", "Despotism", "Player", FALSE +; "Gov", "Monarchy", "Player", FALSE +; "Gov", "Fundamentalism", "Player", FALSE +; "Gov", "Federation", "Player", FALSE + "Gov", "Republic", "Player", FALSE +; "Gov", "Democracy", "Player", FALSE + } + [effect_base_unit_upkeep_gold_1] type = "Upkeep_Factor" value = 1 diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 75716ce171..bbbb3b2e5c 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -45,6 +45,9 @@ flags = _("Cant_Fortify") _("OneAttack") _("NoVeteran") + _("ShieldToGold"), _("The 1 shield unit upkeep becomes 1 gold under \ +Despotism and Monarchy, and 2 gold under Fundamentalism, Federation and \ +Democracy.") } ; Names for custom unit class flags. There can be up to 25 of these. @@ -593,9 +596,10 @@ 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 = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", + "ShieldToGold" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -635,9 +639,10 @@ 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 = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", + "Transform", "ShieldToGold" veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 3, 2, 1, 0 @@ -682,9 +687,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 = "Capturer", "Fortress", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit", "FirstBuild" helptext = _("\ This unit may be built from the start of the game. It is the\ @@ -718,9 +723,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 = "Capturer", "Fortress", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Phalanx is armored infantry, suitable for defending your cities.\ @@ -753,9 +758,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 = "Capturer", "Fortress", "ShieldToGold" roles = "DefendOk", "Hut" helptext = _("\ Archers fight with bows and arrows and have a good offensive\ @@ -789,9 +794,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 = "Marines", "Capturer", "Fortress", "ShieldToGold" roles = "DefendOk", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ @@ -825,9 +830,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 = "Capturer", "Fortress", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Equipped with long pikes, Pikemen replaces Phalanx\ @@ -861,9 +866,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 = "Marines", "Capturer", "Fortress", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild", "HutTech", "BarbarianTech", "BarbarianBuildTech", "BarbarianSeaTech" helptext = _("\ @@ -899,9 +904,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 = "Marines", "Capturer", "Fortress", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Riflemen are World War-era infantry, very good\ @@ -935,11 +940,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 = "IgTer", "Capturer", "Fortress", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Alpine Troops are highly mobile units as well as\ @@ -973,11 +978,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 = "IgTer", "IgZOC", "Capturer", "Fortress", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ @@ -1061,7 +1066,7 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" embarks = "Helicopter" disembarks = "Helicopter" @@ -1098,11 +1103,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 = "Paratroopers", "Capturer", "Fortress", "ShieldToGold" roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. From a friendly city, \ @@ -1141,7 +1146,7 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" flags = "" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" @@ -1180,9 +1185,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Capturer", "ShieldToGold" roles = "AttackFastStartUnit", "Hut", "Barbarian", "Hunter" helptext = _("\ Horsemen are mounted warriors and an early\ @@ -1217,9 +1222,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Capturer", "ShieldToGold" roles = "AttackFastStartUnit" helptext = _("\ Chariots are horse-pulled war wagons. They have a stronger attack than \ @@ -1257,9 +1262,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Capturer", "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Elephants are towering animals trained for war that are often used as\ @@ -1293,9 +1298,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Capturer", "ShieldToGold" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Crusaders are highly disciplined mounted\ @@ -1329,9 +1334,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Capturer", "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "HutTech","BarbarianTech", "BarbarianBuildTech", "Hunter" helptext = _("\ @@ -1365,9 +1370,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Capturer", "ShieldToGold" roles = "AttackFastStartUnit", "BarbarianBuildTech", "Hunter" helptext = _("\ Dragoons are mounted warriors carrying early firearms.\ @@ -1400,9 +1405,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer" +flags = "Capturer", "ShieldToGold" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Cavalry are mounted and highly trained soldiers.\ @@ -1435,9 +1440,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "" +flags = "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Armors are motorized war wagons that are faster, stronger, and can take \ @@ -1474,9 +1479,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "" +flags = "ShieldToGold" roles = "AttackStrongStartUnit" helptext = _("\ Catapults are large rock-throwing machines of war.\ @@ -1516,9 +1521,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "" +flags = "ShieldToGold" roles = "AttackStrongStartUnit", "BarbarianTech", "BarbarianBuildTech" helptext = _("\ Cannons are large firearms that can fire heavy projectiles over long \ @@ -1554,7 +1559,7 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" flags = "CityBuster" roles = "AttackStrongStartUnit" @@ -1591,9 +1596,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "CityBuster" +flags = "CityBuster", "ShieldToGold" roles = "AttackStrongStartUnit" helptext = _("\ Howitzers are upgraded artillery with improved defensive as well as \ @@ -1628,10 +1633,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 = "AirAttacker", "HasNoZOC", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Fighters are your first airborne units. They can\ @@ -1670,9 +1675,10 @@ 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 = "FieldUnit", "OneAttack", "AirAttacker", "Bombarder", + "HasNoZOC", "ShieldToGold" roles = "" helptext = _("\ Bombers are specialized airborne units that may\ @@ -1716,11 +1722,11 @@ 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", - "Provoking" + "Provoking", "ShieldToGold" roles = "" helptext = _("\ A Helicopter's attack against units on land is a bombard attack; against \ @@ -1765,11 +1771,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 = "AirAttacker", "HasNoZOC", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ An improved Fighter, with improved attack and a higher movement\ @@ -1803,10 +1809,11 @@ 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 = "FieldUnit", "OneAttack", "AirAttacker", "Bombarder", + "HasNoZOC", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ An improved Bomber, with improved attack and a higher movement\ @@ -1841,10 +1848,11 @@ 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 = "BadCityDefender", "HasNoZOC", "Provoking", "NonMil", + "ShieldToGold" roles = "Ferryboat", "FerryStartUnit" helptext = _("\ The Trireme is your first boat unit. It can act\ @@ -1881,7 +1889,7 @@ 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", @@ -1919,10 +1927,11 @@ 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 = "BadCityDefender", "HasNoZOC", "Provoking", "NonMil", + "ShieldToGold" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ The Galleon is a big transport ship, the first which can\ @@ -1956,9 +1965,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "BadCityDefender", "ShieldToGold" roles = "Hunter" helptext = _("\ The Frigate is a specialized ship with a strong offensive value,\ @@ -1992,9 +2001,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "BadCityDefender", "ShieldToGold" roles = "Hunter" helptext = _("\ The Ironclad is an armored ship,\ @@ -2028,13 +2037,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 = "BadCityDefender", "ShieldToGold" roles = "Hunter" helptext = _("\ An improved Ironclad, with better move rate and vision.\ @@ -2071,9 +2080,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "BadCityDefender", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Cruiser is a strong offensive boat unit.\ @@ -2106,13 +2115,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 = "BadCityDefender", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ The AEGIS Cruiser is equipped with an advanced\ @@ -2146,9 +2155,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender" +flags = "BadCityDefender", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Battleship is the supreme naval unit with\ @@ -2182,12 +2191,12 @@ 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", - "Submarine", "Provoking" + "Submarine", "Provoking", "ShieldToGold" roles = "Hunter" helptext = _("\ Traveling under the surface of the ocean, Submarines have\ @@ -2222,10 +2231,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 = "BadCityDefender", "HasNoZOC", "Provoking", "ShieldToGold" roles = "DefendGood" helptext = _("\ The Carrier is a mobile airport.\ @@ -2266,11 +2275,11 @@ 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", - "Provoking", "NonMil" + "Provoking", "NonMil", "ShieldToGold" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 0, 0, 0, 0 @@ -2315,10 +2324,11 @@ 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 = "OneAttack", "AirAttacker", "CityBuster", "HasNoZOC", + "ShieldToGold" roles = "" helptext = _("\ The Cruise Missile is a long-distance missile\ @@ -2355,9 +2365,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 = "FieldUnit", "OneAttack", "Nuclear", "HasNoZOC", "ShieldToGold" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -2417,11 +2427,11 @@ 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", - "Provoking" + "Provoking", "ShieldToGold" veteran_names = ; /* TRANS: diplomatic rank. */ _("?diplomatic_rank:attaché"), @@ -2546,11 +2556,11 @@ 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", - "Spy", "Provoking" + "Spy", "Provoking", "ShieldToGold" veteran_names = ; /* TRANS: Spy veteran level */ _("?spy_level:informant"), @@ -2621,9 +2631,10 @@ 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 = "TradeRoute", "HelpWonder", "NonMil", "HasNoZOC", "Capturable", + "ShieldToGold" roles = "" helptext = _("\ A Caravan carries goods or material for trading with other nations,\ @@ -2673,9 +2684,10 @@ 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 = "TradeRoute", "HelpWonder", "NonMil", "HasNoZOC", "Capturable", + "ShieldToGold" roles = "" helptext = _("\ The Freight unit replaces the Caravan, and moves at twice the speed.\ @@ -2709,9 +2721,10 @@ 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 = "IgTer", "IgZOC", "NonMil", "HasNoZOC", "Cant_Fortify", + "ShieldToGold" roles = "Explorer", "ExplorerStartUnit" helptext = _("\ Explorers are brave individuals that are very useful for\ @@ -2845,9 +2858,9 @@ fuel = 3 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "HasNoZOC" +flags = "HasNoZOC", "ShieldToGold" roles = "" helptext = _("\ The AWACS (Airborne Warning and Control System) is an airplane with an \ diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index a2b762c2f4..a4e5b7dc2b 100644 --- a/data/sandbox/effects.ruleset +++ b/data/sandbox/effects.ruleset @@ -832,6 +832,23 @@ reqs = "Gov", "Communism", "Player", TRUE } +[effect_upkeep_shield2gold] +type = "Shield2Gold_Pct" +value = 100 +reqs = + { "type", "name", "range", "present" + "UnitTypeFlag", "ShieldToGold", "Local", TRUE + "Gov", "Anarchy", "Player", FALSE + "Gov", "Tribal", "Player", FALSE + "Gov", "Communism", "Player", FALSE +; "Gov", "Despotism", "Player", FALSE +; "Gov", "Monarchy", "Player", FALSE +; "Gov", "Fundamentalism", "Player", FALSE +; "Gov", "Federation", "Player", FALSE + "Gov", "Republic", "Player", FALSE +; "Gov", "Democracy", "Player", FALSE + } + [effect_base_unit_upkeep_gold_1] type = "Upkeep_Factor" value = 1 diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index faa8204f80..560504f63a 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -51,6 +51,9 @@ flags = _("Cant_Fortify") _("OneAttack") _("NoVeteran") + _("ShieldToGold"), _("The 1 shield unit upkeep becomes 1 gold under \ +Despotism and Monarchy, and 2 gold under Fundamentalism, Federation and \ +Democracy.") } ; Names for custom unit class flags. There can be up to 25 of these. @@ -606,10 +609,10 @@ 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", - "FleshBased" + "FleshBased", "ShieldToGold" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -649,10 +652,10 @@ 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", "IronBased" + "Transform", "IronBased", "ShieldToGold" veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 3, 2, 1, 0 @@ -700,9 +703,10 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "FleshBased" +flags = "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "FleshBased", + "ShieldToGold" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -737,9 +741,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress", "FleshBased" +flags = "Capturer", "Fortress", "FleshBased", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit", "FirstBuild" helptext = _("\ This unit may be built from the start of the game. It is the\ @@ -773,9 +777,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress", "FleshBased" +flags = "Capturer", "Fortress", "FleshBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Phalanx is armored infantry, suitable for defending your cities.\ @@ -808,9 +812,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress", "FleshBased" +flags = "Capturer", "Fortress", "FleshBased", "ShieldToGold" roles = "DefendOk", "Hut" helptext = _("\ Archers fight with bows and arrows and have a good offensive\ @@ -844,9 +848,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", "FleshBased" +flags = "Marines", "Capturer", "Fortress", "FleshBased", "ShieldToGold" roles = "DefendOk", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ @@ -880,9 +884,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "Fortress", "FleshBased" +flags = "Capturer", "Fortress", "FleshBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Equipped with long pikes, Pikemen replaces Phalanx\ @@ -916,9 +920,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", "FleshBased" +flags = "Marines", "Capturer", "Fortress", "FleshBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild", "HutTech", "BarbarianTech", "BarbarianBuildTech", "BarbarianSeaTech" helptext = _("\ @@ -954,9 +958,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", "FleshBased" +flags = "Marines", "Capturer", "Fortress", "FleshBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Riflemen are World War-era infantry, very good\ @@ -990,11 +994,12 @@ 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", "SupplyLines", "FleshBased" +flags = "IgTer", "Capturer", "Fortress", "SupplyLines", "FleshBased", + "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Alpine Troops are highly mobile units as well as\ @@ -1028,11 +1033,12 @@ 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", "SupplyLines", "FleshBased" +flags = "IgTer", "IgZOC", "Capturer", "Fortress", "SupplyLines", + "FleshBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ @@ -1117,11 +1123,12 @@ 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", "SupplyLines", "FleshBased" +flags = "Marines", "Capturer", "Fortress", "SupplyLines", "FleshBased", + "ShieldToGold" roles = "DefendGood", "FirstBuild", "BarbarianSeaTech" helptext = _("\ Marines are infantry who are experts at marine warfare.\ @@ -1154,11 +1161,12 @@ 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", "SupplyLines", "FleshBased" +flags = "Paratroopers", "Capturer", "Fortress", "SupplyLines", + "FleshBased", "ShieldToGold" roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. From a friendly city, \ @@ -1197,9 +1205,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "IronBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Mechanized Infantry has the strongest inherent defensive strength \ @@ -1236,9 +1244,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "FleshBased" +flags = "Capturer", "FleshBased", "ShieldToGold" roles = "AttackFastStartUnit", "Hut", "Barbarian", "Hunter" helptext = _("\ Horsemen are mounted warriors and an early\ @@ -1273,9 +1281,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "FleshBased" +flags = "Capturer", "FleshBased", "ShieldToGold" roles = "AttackFastStartUnit" helptext = _("\ Chariots are horse-pulled war wagons. They have a stronger attack than \ @@ -1313,9 +1321,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "FleshBased" +flags = "Capturer", "FleshBased", "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Elephants are towering animals trained for war that are often used as\ @@ -1349,9 +1357,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "FleshBased" +flags = "Capturer", "FleshBased", "ShieldToGold" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Crusaders are highly disciplined mounted\ @@ -1385,9 +1393,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "FleshBased" +flags = "Capturer", "FleshBased", "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "HutTech","BarbarianTech", "BarbarianBuildTech", "Hunter" helptext = _("\ @@ -1421,9 +1429,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "FleshBased" +flags = "Capturer", "FleshBased", "ShieldToGold" roles = "AttackFastStartUnit", "BarbarianBuildTech", "Hunter" helptext = _("\ Dragoons are mounted warriors carrying early firearms.\ @@ -1456,9 +1464,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Capturer", "FleshBased" +flags = "Capturer", "FleshBased", "ShieldToGold" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Cavalry are mounted and highly trained soldiers.\ @@ -1491,9 +1499,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "IronBased", "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Armors are motorized war wagons that are faster, stronger, and can take \ @@ -1530,9 +1538,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "IronBased", "ShieldToGold" roles = "AttackStrongStartUnit" helptext = _("\ Catapults are large rock-throwing machines of war.\ @@ -1572,9 +1580,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "IronBased", "ShieldToGold" roles = "AttackStrongStartUnit", "BarbarianTech", "BarbarianBuildTech" helptext = _("\ Cannons are large firearms that can fire heavy projectiles over long \ @@ -1610,9 +1618,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "CityBuster", "IronBased" +flags = "CityBuster", "IronBased", "ShieldToGold" roles = "AttackStrongStartUnit" helptext = _("\ The artillery is an upgraded cannon. As with its predecessors, it is a \ @@ -1647,9 +1655,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "CityBuster", "IronBased" +flags = "CityBuster", "IronBased", "ShieldToGold" roles = "AttackStrongStartUnit" helptext = _("\ Howitzers are upgraded artillery with improved defensive as well as \ @@ -1684,10 +1692,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", "IronBased" +flags = "AirAttacker", "HasNoZOC", "IronBased", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Fighters are your first airborne units. They can\ @@ -1726,10 +1734,10 @@ 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", "IronBased" + "HasNoZOC", "IronBased", "ShieldToGold" roles = "" helptext = _("\ Bombers are specialized airborne units that may\ @@ -1773,11 +1781,11 @@ 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", - "Provoking", "IronBased" + "Provoking", "IronBased", "ShieldToGold" roles = "" helptext = _("\ A Helicopter's attack against units on land is a bombard attack; against \ @@ -1822,11 +1830,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", "IronBased" +flags = "AirAttacker", "HasNoZOC", "IronBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ An improved Fighter, with improved attack and a higher movement\ @@ -1860,11 +1868,11 @@ 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", "IronBased" + "HasNoZOC", "IronBased", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ An improved Bomber, with improved attack and a higher movement\ @@ -1899,11 +1907,11 @@ 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", "IronBased", - "NonMil" + "NonMil", "ShieldToGold" roles = "Ferryboat", "FerryStartUnit" helptext = _("\ The Trireme is your first boat unit. It can act\ @@ -1940,11 +1948,11 @@ fuel = 3 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", - "Provoking", "Coast", "IronBased", "NonMil" + "Provoking", "Coast", "IronBased", "NonMil", "ShieldToGold" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ The Caravel is a sailing ship that can enter\ @@ -1979,11 +1987,11 @@ 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", "IronBased", - "NonMil" + "NonMil", "ShieldToGold" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ The Galleon is a big transport ship, the first which can\ @@ -2017,9 +2025,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender", "IronBased" +flags = "BadCityDefender", "IronBased", "ShieldToGold" roles = "Hunter" helptext = _("\ The Frigate is a specialized ship with a strong offensive value,\ @@ -2053,9 +2061,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender", "IronBased" +flags = "BadCityDefender", "IronBased", "ShieldToGold" roles = "Hunter" helptext = _("\ The Ironclad is an armored ship,\ @@ -2089,13 +2097,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", "IronBased" +flags = "BadCityDefender", "IronBased", "ShieldToGold" roles = "Hunter" helptext = _("\ An improved Ironclad, with better move rate and vision.\ @@ -2132,9 +2140,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "BadCityDefender", "IronBased" +flags = "BadCityDefender", "IronBased", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Cruiser is a strong offensive boat unit.\ @@ -2167,13 +2175,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", "IronBased" +flags = "BadCityDefender", "IronBased", "ShieldToGold" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ The AEGIS Cruiser is equipped with an advanced\ @@ -2207,13 +2215,13 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" ; /* <-- avoid gettext warnings ; Consensus historical article: "Airplanes Sink a Battleship? ; No, Sir! Declares President" Chicago Daily Tribune, Feb. 26, 1938. ; */ <-- avoid gettext warnings -flags = "BadCityDefender", "Consensus", "IronBased" +flags = "BadCityDefender", "Consensus", "IronBased", "ShieldToGold" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Battleship is the supreme naval unit with\ @@ -2247,12 +2255,12 @@ 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", - "Submarine", "Provoking", "IronBased" + "Submarine", "Provoking", "IronBased", "ShieldToGold" roles = "Hunter" helptext = _("\ Traveling under the surface of the ocean, Submarines have\ @@ -2287,12 +2295,12 @@ fuel = 0 uk_happy = 0 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", - "Submarine", "Provoking", "TacticalNuke", "IronBased" +flags = "BadCityDefender", "Only_Native_Attack", "Submarine", + "Provoking", "TacticalNuke", "IronBased", "ShieldToGold" roles = "Hunter" helptext = _("\ A SSBN is a nuclear submarine.\ @@ -2327,13 +2335,13 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 cargo = "Land", "Air", "Missile", "Helicopter" tp_defense = "Alight" ; Consensus historical article: Julian Borger. "Wake-up call" ; The Guardian, Sep. 6, 2002. flags = "BadCityDefender", "HasNoZOC", "Consensus", "Provoking", - "IronBased" + "IronBased", "ShieldToGold" roles = "DefendGood" helptext = _("\ The Carrier is a mobile airport.\ @@ -2374,11 +2382,11 @@ 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", - "Provoking", "IronBased", "NonMil" + "Provoking", "IronBased", "NonMil", "ShieldToGold" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 0, 0, 0, 0 @@ -2423,11 +2431,11 @@ 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", - "IronBased" + "IronBased", "ShieldToGold" roles = "" helptext = _("\ The Cruise Missile is a long-distance missile\ @@ -2464,9 +2472,10 @@ 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", "IronBased" +flags = "FieldUnit", "OneAttack", "Nuclear", "HasNoZOC", "IronBased", + "ShieldToGold" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -2526,10 +2535,10 @@ fuel = 1 uk_happy = 1 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" flags = "FieldUnit", "OneAttack", "NuclearOP", "HasNoZOC", - "IronBased" + "IronBased", "ShieldToGold" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -2591,11 +2600,11 @@ 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", - "Provoking", "FleshBased" + "Provoking", "FleshBased", "ShieldToGold" veteran_names = ; /* TRANS: diplomatic rank. */ _("?diplomatic_rank:attaché"), @@ -2720,11 +2729,11 @@ 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", - "Spy", "Provoking", "SupplyLines", "FleshBased" + "Spy", "Provoking", "SupplyLines", "FleshBased", "ShieldToGold" veteran_names = ; /* TRANS: Spy veteran level */ _("?spy_level:informant"), @@ -2798,10 +2807,10 @@ 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", "FleshBased" + "Capturable", "FleshBased", "ShieldToGold" roles = "" helptext = _("\ A Caravan carries goods or material for trading with other nations,\ @@ -2852,10 +2861,10 @@ 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", "IronBased" + "Capturable", "IronBased", "ShieldToGold" roles = "" helptext = _("\ The Freight unit replaces the Caravan, and moves at twice the speed.\ @@ -2889,9 +2898,10 @@ 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", "FleshBased" +flags = "IgTer", "IgZOC", "NonMil", "HasNoZOC", "FleshBased", + "ShieldToGold" roles = "Explorer", "ExplorerStartUnit" helptext = _("\ Explorers are brave individuals that are very useful for\ @@ -3026,9 +3036,9 @@ fuel = 3 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "HasNoZOC", "IronBased" +flags = "HasNoZOC", "IronBased", "ShieldToGold" roles = "" helptext = _("\ The AWACS (Airborne Warning and Control System) is an airplane with an \ -- 2.31.0