From 1ea88d86780379b32500277a0ea1166e9ef543cc Mon Sep 17 00:00:00 2001 From: Dino Date: Tue, 21 Oct 2025 23:56:39 -0400 Subject: [PATCH] #1267 improve display of civ2civ3 & sandbox ruleset help for units --- data/civ2civ3/effects.ruleset | 40 ++++++ data/civ2civ3/units.ruleset | 205 +++++++++++++-------------- data/sandbox/effects.ruleset | 40 ++++++ data/sandbox/units.ruleset | 253 +++++++++++++++++----------------- 4 files changed, 313 insertions(+), 225 deletions(-) diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index c43434102a..5a12c6210b 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 5429238fd9..66b9f512e6 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -27,6 +27,7 @@ format_version = 30 ; 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.") @@ -597,9 +598,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress" +flags = "Shield2Gold", "ShieldToGold", "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -639,9 +640,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "Transform" +flags = "Shield2Gold", "ShieldToGold", "Settlers", "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 @@ -686,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendOk", "DefendOkStartUnit", "FirstBuild" helptext = _("\ This unit may be built from the start of the game. It is the\ @@ -722,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Phalanx is armored infantry, suitable for defending your cities.\ @@ -757,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendOk", "Hut" helptext = _("\ Archers fight with bows and arrows and have a good offensive\ @@ -793,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 = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress" roles = "DefendOk", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ @@ -829,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Equipped with long pikes, Pikemen replaces Phalanx\ @@ -865,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 = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild", "HutTech", "BarbarianTech", "BarbarianBuildTech", "BarbarianSeaTech" helptext = _("\ @@ -903,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 = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Riflemen are World War-era infantry, very good\ @@ -939,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 = "Shield2Gold", "ShieldToGold", "IgTer", "Capturer", "Fortress" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Alpine Troops are highly mobile units as well as\ @@ -977,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 = "Shield2Gold", "ShieldToGold", "IgTer", "IgZOC", "Capturer", "Fortress" roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ @@ -1065,11 +1066,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.\ @@ -1102,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 = "Shield2Gold", "ShieldToGold", "Paratroopers", "Capturer", "Fortress" roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. From a friendly city, \ @@ -1145,9 +1146,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 \ @@ -1184,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 = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "Hut", "Barbarian", "Hunter" helptext = _("\ Horsemen are mounted warriors and an early\ @@ -1221,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 = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit" helptext = _("\ Chariots are horse-pulled war wagons. They have a stronger attack than \ @@ -1261,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 = "Shield2Gold", "ShieldToGold", "Capturer" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Elephants are towering animals trained for war that are often used as\ @@ -1297,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 = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Crusaders are highly disciplined mounted\ @@ -1333,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 = "Shield2Gold", "ShieldToGold", "Capturer" roles = "DefendOk", "AttackFastStartUnit", "HutTech","BarbarianTech", "BarbarianBuildTech", "Hunter" helptext = _("\ @@ -1369,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 = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "BarbarianBuildTech", "Hunter" helptext = _("\ Dragoons are mounted warriors carrying early firearms.\ @@ -1404,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 = "Shield2Gold", "ShieldToGold", "Capturer" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Cavalry are mounted and highly trained soldiers.\ @@ -1439,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 = "Shield2Gold", "ShieldToGold" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Armors are motorized war wagons that are faster, stronger, and can take \ @@ -1478,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 = "Shield2Gold", "ShieldToGold" roles = "AttackStrongStartUnit" helptext = _("\ Catapults are large rock-throwing machines of war.\ @@ -1520,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 = "Shield2Gold", "ShieldToGold" roles = "AttackStrongStartUnit", "BarbarianTech", "BarbarianBuildTech" helptext = _("\ Cannons are large firearms that can fire heavy projectiles over long \ @@ -1558,9 +1559,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 \ @@ -1595,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 = "Shield2Gold", "ShieldToGold", "CityBuster" roles = "AttackStrongStartUnit" helptext = _("\ Howitzers are upgraded artillery with improved defensive as well as \ @@ -1632,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 = "Shield2Gold", "ShieldToGold", "AirAttacker", "HasNoZOC" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Fighters are your first airborne units. They can\ @@ -1674,9 +1675,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\ @@ -1720,10 +1721,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 = _("\ @@ -1769,11 +1770,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\ @@ -1807,10 +1808,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\ @@ -1845,10 +1846,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\ @@ -1885,10 +1886,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 = _("\ @@ -1923,10 +1924,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\ @@ -1960,9 +1961,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,\ @@ -1996,9 +1997,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,\ @@ -2032,13 +2033,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.\ @@ -2075,9 +2076,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.\ @@ -2110,13 +2111,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\ @@ -2150,9 +2151,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\ @@ -2186,11 +2187,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 = _("\ @@ -2226,10 +2227,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.\ @@ -2270,10 +2271,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 = "Settlers", "BadCityDefender", "HasNoZOC", +flags = "Shield2Gold", "ShieldToGold", "Settlers", "BadCityDefender", "HasNoZOC", "Provoking", "NonMil" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 @@ -2319,10 +2320,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\ @@ -2359,9 +2360,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 @@ -2421,10 +2422,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. */ @@ -2550,10 +2551,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 */ @@ -2625,9 +2626,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,\ @@ -2677,9 +2678,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.\ @@ -2713,9 +2714,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\ @@ -2849,9 +2850,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 \ diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index 11d64d2bd0..67c31a2f76 100644 --- a/data/sandbox/effects.ruleset +++ b/data/sandbox/effects.ruleset @@ -832,6 +832,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/sandbox/units.ruleset b/data/sandbox/units.ruleset index 798b1219e2..fd0bddfb84 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -27,6 +27,7 @@ format_version = 30 ; 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.") @@ -610,9 +611,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", +flags = "Shield2Gold", "ShieldToGold", "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "FleshBased" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -653,9 +654,9 @@ fuel = 0 uk_happy = 0 uk_shield = 1 uk_food = 0 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", +flags = "Shield2Gold", "ShieldToGold", "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "Transform", "IronBased" veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert") veteran_base_raise_chance = 50, 33, 20, 0 @@ -704,9 +705,9 @@ 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 = "Shield2Gold", "ShieldToGold", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "FleshBased" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -741,9 +742,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress", "FleshBased" roles = "DefendOk", "DefendOkStartUnit", "FirstBuild" helptext = _("\ This unit may be built from the start of the game. It is the\ @@ -777,9 +778,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress", "FleshBased" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Phalanx is armored infantry, suitable for defending your cities.\ @@ -812,9 +813,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress", "FleshBased" roles = "DefendOk", "Hut" helptext = _("\ Archers fight with bows and arrows and have a good offensive\ @@ -848,9 +849,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 = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress", "FleshBased" roles = "DefendOk", "BarbarianBuild", "BarbarianSea" helptext = _("\ Legions are heavily armed and well disciplined infantry\ @@ -884,9 +885,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 = "Shield2Gold", "ShieldToGold", "Capturer", "Fortress", "FleshBased" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Equipped with long pikes, Pikemen replaces Phalanx\ @@ -920,9 +921,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 = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress", "FleshBased" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild", "HutTech", "BarbarianTech", "BarbarianBuildTech", "BarbarianSeaTech" helptext = _("\ @@ -958,9 +959,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 = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress", "FleshBased" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ Riflemen are World War-era infantry, very good\ @@ -994,11 +995,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", "SupplyLines", "FleshBased" +flags = "Shield2Gold", "ShieldToGold", "IgTer", "Capturer", "Fortress", "SupplyLines", "FleshBased" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Alpine Troops are highly mobile units as well as\ @@ -1032,11 +1033,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", "SupplyLines", "FleshBased" +flags = "Shield2Gold", "ShieldToGold", "IgTer", "IgZOC", "Capturer", "Fortress", "SupplyLines", "FleshBased" roles = "DefendGood", "DefendGoodStartUnit", "Partisan", "BarbarianTech" helptext = _("\ Partisans are guerilla fighters who are experts\ @@ -1121,11 +1122,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", "SupplyLines", "FleshBased" +flags = "Shield2Gold", "ShieldToGold", "Marines", "Capturer", "Fortress", "SupplyLines", "FleshBased" roles = "DefendGood", "FirstBuild", "BarbarianSeaTech" helptext = _("\ Marines are infantry who are experts at marine warfare.\ @@ -1158,11 +1159,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", "SupplyLines", "FleshBased" +flags = "Shield2Gold", "ShieldToGold", "Paratroopers", "Capturer", "Fortress", "SupplyLines", "FleshBased" roles = "DefendOk" helptext = _("\ Paratroopers are experts at airborne attacks. From a friendly city, \ @@ -1201,9 +1202,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "Shield2Gold", "ShieldToGold", "IronBased" roles = "DefendGood", "DefendGoodStartUnit", "FirstBuild" helptext = _("\ The Mechanized Infantry has the strongest inherent defensive strength \ @@ -1240,9 +1241,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 = "Shield2Gold", "ShieldToGold", "Capturer", "FleshBased" roles = "AttackFastStartUnit", "Hut", "Barbarian", "Hunter" helptext = _("\ Horsemen are mounted warriors and an early\ @@ -1277,9 +1278,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 = "Shield2Gold", "ShieldToGold", "Capturer", "FleshBased" roles = "AttackFastStartUnit" helptext = _("\ Chariots are horse-pulled war wagons. They have a stronger attack than \ @@ -1317,9 +1318,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 = "Shield2Gold", "ShieldToGold", "Capturer", "FleshBased" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Elephants are towering animals trained for war that are often used as\ @@ -1353,9 +1354,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 = "Shield2Gold", "ShieldToGold", "Capturer", "FleshBased" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Crusaders are highly disciplined mounted\ @@ -1389,9 +1390,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 = "Shield2Gold", "ShieldToGold", "Capturer", "FleshBased" roles = "DefendOk", "AttackFastStartUnit", "HutTech","BarbarianTech", "BarbarianBuildTech", "Hunter" helptext = _("\ @@ -1425,9 +1426,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 = "Shield2Gold", "ShieldToGold", "Capturer", "FleshBased" roles = "AttackFastStartUnit", "BarbarianBuildTech", "Hunter" helptext = _("\ Dragoons are mounted warriors carrying early firearms.\ @@ -1460,9 +1461,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 = "Shield2Gold", "ShieldToGold", "Capturer", "FleshBased" roles = "AttackFastStartUnit", "Hunter" helptext = _("\ Cavalry are mounted and highly trained soldiers.\ @@ -1495,9 +1496,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "Shield2Gold", "ShieldToGold", "IronBased" roles = "DefendOk", "AttackFastStartUnit", "Hunter" helptext = _("\ Armors are motorized war wagons that are faster, stronger, and can take \ @@ -1534,9 +1535,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "Shield2Gold", "ShieldToGold", "IronBased" roles = "AttackStrongStartUnit" helptext = _("\ Catapults are large rock-throwing machines of war.\ @@ -1576,9 +1577,9 @@ fuel = 0 uk_happy = 1 uk_shield = 1 uk_food = 1 -uk_gold = 1 +uk_gold = 0 tp_defense = "Alight" -flags = "IronBased" +flags = "Shield2Gold", "ShieldToGold", "IronBased" roles = "AttackStrongStartUnit", "BarbarianTech", "BarbarianBuildTech" helptext = _("\ Cannons are large firearms that can fire heavy projectiles over long \ @@ -1614,9 +1615,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 = "Shield2Gold", "ShieldToGold", "CityBuster", "IronBased" roles = "AttackStrongStartUnit" helptext = _("\ The artillery is an upgraded cannon. As with its predecessors, it is a \ @@ -1651,9 +1652,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 = "Shield2Gold", "ShieldToGold", "CityBuster", "IronBased" roles = "AttackStrongStartUnit" helptext = _("\ Howitzers are upgraded artillery with improved defensive as well as \ @@ -1688,10 +1689,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 = "Shield2Gold", "ShieldToGold", "AirAttacker", "HasNoZOC", "IronBased" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ Fighters are your first airborne units. They can\ @@ -1730,9 +1731,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", +flags = "Shield2Gold", "ShieldToGold", "FieldUnit", "OneAttack", "AirAttacker", "Bombarder", "HasNoZOC", "IronBased" roles = "" helptext = _("\ @@ -1777,11 +1778,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" +flags = "Shield2Gold", "ShieldToGold", "OneAttack", "AirAttacker", + "Bombarder", "HasNoZOC", "Provoking", "IronBased" roles = "" helptext = _("\ A Helicopter's attack against units on land is a bombard attack; against \ @@ -1826,11 +1827,12 @@ 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 = "Shield2Gold", "ShieldToGold", "AirAttacker", "HasNoZOC", + "IronBased" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ An improved Fighter, with improved attack and a higher movement\ @@ -1864,11 +1866,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" +flags = "Shield2Gold", "ShieldToGold", "FieldUnit", "OneAttack", + "AirAttacker", "Bombarder", "HasNoZOC", "IronBased" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ An improved Bomber, with improved attack and a higher movement\ @@ -1903,11 +1905,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" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", "HasNoZOC", + "Provoking", "IronBased", "NonMil" roles = "Ferryboat", "FerryStartUnit" helptext = _("\ The Trireme is your first boat unit. It can act\ @@ -1944,11 +1946,12 @@ 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" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", + "Only_Native_Attack", "HasNoZOC", "Provoking", "Coast", + "IronBased", "NonMil" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ The Caravel is a sailing ship that can enter\ @@ -1983,11 +1986,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" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", "HasNoZOC", + "Provoking", "IronBased", "NonMil" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ The Galleon is a big transport ship, the first which can\ @@ -2021,9 +2024,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 = "Shield2Gold", "ShieldToGold", "BadCityDefender", "IronBased" roles = "Hunter" helptext = _("\ The Frigate is a specialized ship with a strong offensive value,\ @@ -2057,9 +2060,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 = "Shield2Gold", "ShieldToGold", "BadCityDefender", "IronBased" roles = "Hunter" helptext = _("\ The Ironclad is an armored ship,\ @@ -2093,13 +2096,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 = "Shield2Gold", "ShieldToGold", "BadCityDefender", "IronBased" roles = "Hunter" helptext = _("\ An improved Ironclad, with better move rate and vision.\ @@ -2136,9 +2139,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 = "Shield2Gold", "ShieldToGold", "BadCityDefender", "IronBased" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Cruiser is a strong offensive boat unit.\ @@ -2171,13 +2174,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 = "Shield2Gold", "ShieldToGold", "BadCityDefender", "IronBased" roles = "DefendGood", "DefendGoodStartUnit" helptext = _("\ The AEGIS Cruiser is equipped with an advanced\ @@ -2211,13 +2214,14 @@ 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 = "Shield2Gold", "ShieldToGold", "BadCityDefender", + "Consensus", "IronBased" roles = "DefendOk", "DefendOkStartUnit" helptext = _("\ The Battleship is the supreme naval unit with\ @@ -2251,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" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", + "Only_Native_Attack", "Submarine", "Provoking", "IronBased" roles = "Hunter" helptext = _("\ Traveling under the surface of the ocean, Submarines have\ @@ -2291,12 +2295,13 @@ 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 = "Shield2Gold", "ShieldToGold", "BadCityDefender", + "Only_Native_Attack", "Submarine", "Provoking", "TacticalNuke", + "IronBased" roles = "Hunter" helptext = _("\ A SSBN is a nuclear submarine.\ @@ -2331,13 +2336,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" +flags = "Shield2Gold", "ShieldToGold", "BadCityDefender", + "HasNoZOC", "Consensus", "Provoking", "IronBased" roles = "DefendGood" helptext = _("\ The Carrier is a mobile airport.\ @@ -2378,11 +2383,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 = "Settlers", "BadCityDefender", "HasNoZOC", - "Provoking", "IronBased", "NonMil" +flags = "Shield2Gold", "ShieldToGold", "Settlers", "BadCityDefender", + "HasNoZOC", "Provoking", "IronBased", "NonMil" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 0, 0, 0, 0 @@ -2427,11 +2432,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" +flags = "Shield2Gold", "ShieldToGold", "OneAttack", "AirAttacker", + "CityBuster", "HasNoZOC", "IronBased" roles = "" helptext = _("\ The Cruise Missile is a long-distance missile\ @@ -2468,9 +2473,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 = "Shield2Gold", "ShieldToGold", "FieldUnit", "OneAttack", + "Nuclear", "HasNoZOC", "IronBased" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -2530,10 +2536,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" +flags = "Shield2Gold", "ShieldToGold", "FieldUnit", "OneAttack", + "NuclearOP", "HasNoZOC", "IronBased" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -2595,11 +2601,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" +flags = "Shield2Gold", "ShieldToGold", "Diplomat", "IgZOC", "NonMil", + "HasNoZOC", "Provoking", "FleshBased" veteran_names = ; /* TRANS: diplomatic rank. */ _("?diplomatic_rank:attaché"), @@ -2724,11 +2730,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" +flags = "Shield2Gold", "ShieldToGold", "Diplomat", "IgZOC", "NonMil", + "HasNoZOC", "Spy", "Provoking", "SupplyLines", "FleshBased" veteran_names = ; /* TRANS: Spy veteran level */ _("?spy_level:informant"), @@ -2802,10 +2808,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" +flags = "Shield2Gold", "ShieldToGold", "TradeRoute", "HelpWonder", + "NonMil", "HasNoZOC", "Capturable", "FleshBased" roles = "" helptext = _("\ A Caravan carries goods or material for trading with other nations,\ @@ -2856,10 +2862,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" +flags = "Shield2Gold", "ShieldToGold", "TradeRoute", "HelpWonder", + "NonMil", "HasNoZOC", "Capturable", "IronBased" roles = "" helptext = _("\ The Freight unit replaces the Caravan, and moves at twice the speed.\ @@ -2893,9 +2899,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 = "Shield2Gold", "ShieldToGold", "IgTer", "IgZOC", "NonMil", + "HasNoZOC", "FleshBased" roles = "Explorer", "ExplorerStartUnit" helptext = _("\ Explorers are brave individuals that are very useful for\ @@ -3030,9 +3037,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 = "Shield2Gold", "ShieldToGold", "HasNoZOC", "IronBased" roles = "" helptext = _("\ The AWACS (Airborne Warning and Control System) is an airplane with an \ -- 2.31.0