From caad8ba44b222bcbcd016bf4bb24870e12ad5926 Mon Sep 17 00:00:00 2001 From: Gustas Date: Sat, 11 Nov 2023 23:20:42 +0200 Subject: [PATCH] Manual cleanup --- mods/cnc/languages/campaign/en.ftl | 28 +++ mods/cnc/languages/rules/en.ftl | 54 +++--- mods/cnc/maps/cnc64gdi01/map.yaml | 2 +- mods/cnc/maps/eviction-notice/map.yaml | 2 +- mods/cnc/maps/funpark01/map.yaml | 2 +- mods/cnc/maps/gdi01/map.yaml | 2 +- mods/cnc/maps/gdi02/map.yaml | 2 +- mods/cnc/maps/gdi03/en.ftl | 3 - mods/cnc/maps/gdi03/map.yaml | 2 +- mods/cnc/maps/gdi04a/map.yaml | 2 +- mods/cnc/maps/gdi04b/map.yaml | 2 +- mods/cnc/maps/gdi04c/map.yaml | 2 +- mods/cnc/maps/gdi05a/map.yaml | 2 +- mods/cnc/maps/gdi05b/map.yaml | 2 +- mods/cnc/maps/gdi05c/map.yaml | 2 +- mods/cnc/maps/gdi06/map.yaml | 2 +- mods/cnc/maps/gdi07/en.ftl | 3 - mods/cnc/maps/gdi07/map.yaml | 2 +- mods/cnc/maps/gdi08a/en.ftl | 4 - mods/cnc/maps/gdi08a/map.yaml | 2 +- mods/cnc/maps/gdi08b/en.ftl | 5 - mods/cnc/maps/gdi08b/map.yaml | 2 +- mods/cnc/maps/gdi09/en.ftl | 3 - mods/cnc/maps/gdi09/map.yaml | 2 +- mods/cnc/maps/nod01/en.ftl | 2 - mods/cnc/maps/nod01/map.yaml | 2 +- mods/cnc/maps/nod02a/map.yaml | 2 +- mods/cnc/maps/nod02b/map.yaml | 2 +- mods/cnc/maps/nod03a/en.ftl | 4 - mods/cnc/maps/nod03a/map.yaml | 2 +- mods/cnc/maps/nod03a/rules.yaml | 2 +- mods/cnc/maps/nod03b/en.ftl | 4 - mods/cnc/maps/nod03b/map.yaml | 2 +- mods/cnc/maps/nod03b/rules.yaml | 2 +- mods/cnc/maps/nod04a/map.yaml | 2 +- mods/cnc/maps/nod04b/map.yaml | 2 +- mods/cnc/maps/nod05/map.yaml | 2 +- mods/cnc/maps/nod06a/map.yaml | 2 +- mods/cnc/maps/nod06b/map.yaml | 2 +- mods/cnc/maps/nod06c/map.yaml | 2 +- mods/cnc/maps/nod07a/map.yaml | 2 +- mods/cnc/maps/nod07b/map.yaml | 2 +- mods/cnc/maps/nod07c/map.yaml | 2 +- mods/cnc/maps/nod08a/map.yaml | 2 +- mods/cnc/maps/nod08b/map.yaml | 2 +- mods/cnc/maps/nod09/map.yaml | 2 +- mods/cnc/maps/nod10a/map.yaml | 2 +- mods/cnc/maps/nod10b/map.yaml | 2 +- mods/cnc/maps/twist-of-fate/map.yaml | 2 +- mods/cnc/rules/defaults.yaml | 3 - .../languages/campaign}/en.ftl | 7 + mods/d2k/languages/difficulties/en.ftl | 8 - mods/d2k/languages/rules/en.ftl | 159 ++++++++---------- mods/d2k/maps/atreides-01a/map.yaml | 2 +- mods/d2k/maps/atreides-01b/map.yaml | 2 +- mods/d2k/maps/atreides-02a/map.yaml | 2 +- mods/d2k/maps/atreides-02b/map.yaml | 2 +- mods/d2k/maps/atreides-03a/map.yaml | 2 +- mods/d2k/maps/atreides-03b/map.yaml | 2 +- mods/d2k/maps/atreides-04/map.yaml | 2 +- mods/d2k/maps/atreides-05/map.yaml | 2 +- mods/d2k/maps/harkonnen-01a/map.yaml | 2 +- mods/d2k/maps/harkonnen-01b/map.yaml | 2 +- mods/d2k/maps/harkonnen-02a/map.yaml | 2 +- mods/d2k/maps/harkonnen-02b/map.yaml | 2 +- mods/d2k/maps/harkonnen-03a/map.yaml | 2 +- mods/d2k/maps/harkonnen-03b/map.yaml | 2 +- mods/d2k/maps/harkonnen-04/map.yaml | 2 +- mods/d2k/maps/harkonnen-05/en.ftl | 2 - mods/d2k/maps/harkonnen-05/map.yaml | 2 +- mods/d2k/maps/harkonnen-06a/map.yaml | 2 +- mods/d2k/maps/harkonnen-06b/map.yaml | 2 +- mods/d2k/maps/harkonnen-07/map.yaml | 2 +- mods/d2k/maps/harkonnen-08/map.yaml | 2 +- mods/d2k/maps/harkonnen-09a/map.yaml | 2 +- mods/d2k/maps/harkonnen-09b/map.yaml | 2 +- mods/d2k/maps/ordos-01a/map.yaml | 2 +- mods/d2k/maps/ordos-01b/map.yaml | 2 +- mods/d2k/maps/ordos-02a/map.yaml | 2 +- mods/d2k/maps/ordos-02b/map.yaml | 2 +- mods/d2k/maps/ordos-03a/map.yaml | 2 +- mods/d2k/maps/ordos-03b/map.yaml | 2 +- mods/d2k/maps/ordos-04/en.ftl | 2 - mods/d2k/maps/ordos-04/map.yaml | 2 +- mods/d2k/maps/ordos-05/map.yaml | 2 +- mods/d2k/maps/ordos-06a/map.yaml | 2 +- mods/d2k/rules/campaign-tooltips.yaml | 12 +- mods/d2k/rules/structures.yaml | 1 - mods/d2k/rules/vehicles.yaml | 4 +- mods/ra/languages/campaign/en.ftl | 71 ++++++++ mods/ra/languages/difficulties/en.ftl | 8 - mods/ra/languages/rules/en.ftl | 80 ++++----- mods/ra/maps/allies-01/map.yaml | 2 +- mods/ra/maps/allies-02/map.yaml | 2 +- mods/ra/maps/allies-03a/map.yaml | 2 +- mods/ra/maps/allies-03b/map.yaml | 2 +- mods/ra/maps/allies-04/map.yaml | 2 +- mods/ra/maps/allies-05a/en.ftl | 2 - mods/ra/maps/allies-05a/map.yaml | 2 +- mods/ra/maps/allies-05a/rules.yaml | 2 +- mods/ra/maps/allies-05b/en.ftl | 2 - mods/ra/maps/allies-05b/map.yaml | 2 +- mods/ra/maps/allies-05b/rules.yaml | 2 +- mods/ra/maps/allies-05c/en.ftl | 2 - mods/ra/maps/allies-05c/map.yaml | 2 +- mods/ra/maps/allies-05c/rules.yaml | 2 +- mods/ra/maps/allies-06a/map.yaml | 2 +- mods/ra/maps/allies-06b/map.yaml | 2 +- mods/ra/maps/allies-07/map.yaml | 2 +- mods/ra/maps/allies-08a/map.yaml | 2 +- mods/ra/maps/allies-08b/map.yaml | 2 +- mods/ra/maps/allies-09a/map.yaml | 2 +- mods/ra/maps/allies-10a/map.yaml | 2 +- mods/ra/maps/allies-10b/map.yaml | 2 +- mods/ra/maps/ant-01/map.yaml | 2 +- mods/ra/maps/ant-03/map.yaml | 2 +- mods/ra/maps/bomber-john/en.ftl | 6 +- mods/ra/maps/bomber-john/map.yaml | 1 + mods/ra/maps/bomber-john/rules.yaml | 4 +- .../maps/drop-zone-battle-of-tikiaki/map.yaml | 1 + mods/ra/maps/drop-zone-w/map.yaml | 1 + mods/ra/maps/drop-zone/map.yaml | 1 + mods/ra/maps/evacuation/map.yaml | 2 +- mods/ra/maps/exodus/map.yaml | 2 +- .../maps/fall-of-greece-1-personal-war/en.ftl | 3 - .../fall-of-greece-1-personal-war/map.yaml | 2 +- .../fall-of-greece-1-personal-war/rules.yaml | 4 +- .../maps/fall-of-greece-2-evacuation/map.yaml | 2 +- mods/ra/maps/fort-lonestar/en.ftl | 3 +- mods/ra/maps/fort-lonestar/rules.yaml | 2 +- mods/ra/maps/in-the-nick-of-time/map.yaml | 2 +- mods/ra/maps/infiltration/map.yaml | 2 +- mods/ra/maps/intervention/en.ftl | 4 - mods/ra/maps/intervention/map.yaml | 2 +- mods/ra/maps/intervention/rules.yaml | 2 +- mods/ra/maps/monster-tank-madness/en.ftl | 8 - mods/ra/maps/monster-tank-madness/map.yaml | 2 +- mods/ra/maps/mousetrap/en.ftl | 3 - mods/ra/maps/mousetrap/map.yaml | 2 +- mods/ra/maps/mousetrap/rules.yaml | 6 +- mods/ra/maps/oil-spill/map.yaml | 1 + mods/ra/maps/production-disruption/map.yaml | 2 +- mods/ra/maps/sarin-gas-1-crackdown/map.yaml | 2 +- mods/ra/maps/sarin-gas-2-down-under/en.ftl | 2 - mods/ra/maps/sarin-gas-2-down-under/map.yaml | 2 +- .../ra/maps/sarin-gas-2-down-under/rules.yaml | 2 +- .../maps/sarin-gas-3-controlled-burn/en.ftl | 2 - .../maps/sarin-gas-3-controlled-burn/map.yaml | 2 +- .../sarin-gas-3-controlled-burn/rules.yaml | 2 +- mods/ra/maps/shock-therapy/map.yaml | 2 +- .../siberian-conflict-1-fresh-tracks/en.ftl | 2 - .../siberian-conflict-1-fresh-tracks/map.yaml | 2 +- .../rules.yaml | 2 +- .../siberian-conflict-3-wasteland/map.yaml | 2 +- mods/ra/maps/situation-critical/en.ftl | 4 - mods/ra/maps/situation-critical/map.yaml | 2 +- mods/ra/maps/situation-critical/rules.yaml | 4 +- mods/ra/maps/soviet-01/map.yaml | 2 +- mods/ra/maps/soviet-02a/map.yaml | 2 +- mods/ra/maps/soviet-02b/map.yaml | 2 +- mods/ra/maps/soviet-03/map.yaml | 2 +- mods/ra/maps/soviet-04a/map.yaml | 2 +- mods/ra/maps/soviet-04b/map.yaml | 2 +- mods/ra/maps/soviet-05/map.yaml | 2 +- mods/ra/maps/soviet-06a/map.yaml | 2 +- mods/ra/maps/soviet-06b/map.yaml | 2 +- mods/ra/maps/soviet-07/map.yaml | 2 +- mods/ra/maps/soviet-08a/map.yaml | 2 +- mods/ra/maps/soviet-08b/map.yaml | 2 +- mods/ra/maps/soviet-09/map.yaml | 2 +- mods/ra/maps/soviet-10/map.yaml | 2 +- mods/ra/maps/soviet-11a/map.yaml | 2 +- mods/ra/maps/soviet-11b/map.yaml | 2 +- mods/ra/maps/soviet-13a/map.yaml | 2 +- mods/ra/maps/soviet-13b/map.yaml | 2 +- .../soviet-soldier-volkov-n-chitzkoi/en.ftl | 16 -- .../soviet-soldier-volkov-n-chitzkoi/map.yaml | 2 +- mods/ra/maps/survival01/map.yaml | 2 +- mods/ra/maps/survival02/map.yaml | 2 +- mods/ra/maps/top-o-the-world/map.yaml | 2 +- mods/ra/rules/campaign-rules.yaml | 2 +- mods/ra/rules/campaign-tooltips.yaml | 2 +- 182 files changed, 399 insertions(+), 424 deletions(-) create mode 100644 mods/cnc/languages/campaign/en.ftl delete mode 100644 mods/cnc/maps/gdi03/en.ftl delete mode 100644 mods/cnc/maps/gdi07/en.ftl delete mode 100644 mods/cnc/maps/gdi08a/en.ftl delete mode 100644 mods/cnc/maps/gdi08b/en.ftl delete mode 100644 mods/cnc/maps/gdi09/en.ftl delete mode 100644 mods/cnc/maps/nod01/en.ftl delete mode 100644 mods/cnc/maps/nod03a/en.ftl delete mode 100644 mods/cnc/maps/nod03b/en.ftl rename mods/{cnc/languages/difficulties => d2k/languages/campaign}/en.ftl (55%) delete mode 100644 mods/d2k/languages/difficulties/en.ftl delete mode 100644 mods/d2k/maps/harkonnen-05/en.ftl delete mode 100644 mods/d2k/maps/ordos-04/en.ftl create mode 100644 mods/ra/languages/campaign/en.ftl delete mode 100644 mods/ra/languages/difficulties/en.ftl delete mode 100644 mods/ra/maps/allies-05a/en.ftl delete mode 100644 mods/ra/maps/allies-05b/en.ftl delete mode 100644 mods/ra/maps/allies-05c/en.ftl delete mode 100644 mods/ra/maps/fall-of-greece-1-personal-war/en.ftl delete mode 100644 mods/ra/maps/intervention/en.ftl delete mode 100644 mods/ra/maps/monster-tank-madness/en.ftl delete mode 100644 mods/ra/maps/mousetrap/en.ftl delete mode 100644 mods/ra/maps/sarin-gas-2-down-under/en.ftl delete mode 100644 mods/ra/maps/sarin-gas-3-controlled-burn/en.ftl delete mode 100644 mods/ra/maps/siberian-conflict-1-fresh-tracks/en.ftl delete mode 100644 mods/ra/maps/situation-critical/en.ftl delete mode 100644 mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/en.ftl diff --git a/mods/cnc/languages/campaign/en.ftl b/mods/cnc/languages/campaign/en.ftl new file mode 100644 index 0000000000..5735ca32a7 --- /dev/null +++ b/mods/cnc/languages/campaign/en.ftl @@ -0,0 +1,28 @@ +## world +dropdown-difficulty = + .label = Difficulty + .description = The difficulty of the mission + +options-difficulty = + .easy = Easy + .normal = Normal + .hard = Hard + +## campaign-maprules.yaml +actor-moneycrate-name = Money Crate + +## gdi03, gdi07, gdi08a, gdi08b, gdi09, nod03a, nod03b +actor-hq-description = Provides an overview of the battlefield. + Requires power to operate. + +## gdi08a +actor-c3-name = Farmer Mike + +## gdi08b +civilian-killed = Civilian killed. + +## nod01 +actor-c10-name = Nikoomba + +## nod03a, nod03b +actor-prison-name = Prison diff --git a/mods/cnc/languages/rules/en.ftl b/mods/cnc/languages/rules/en.ftl index 5572feb366..e8358c1c19 100644 --- a/mods/cnc/languages/rules/en.ftl +++ b/mods/cnc/languages/rules/en.ftl @@ -1,4 +1,4 @@ -## Player +## player.yaml options-tech-level = .low = Low .medium = Medium @@ -20,7 +20,7 @@ notification-base-under-attack = Base under attack. notification-ally-under-attack = Our ally is under attack. notification-silos-needed = Silos needed. -## World +## world.yaml options-starting-units = .mcv-only = MCV Only .light-support = Light Support @@ -30,33 +30,13 @@ dropdown-map-creeps = .label = Creep Actors .description = Hostile forces spawn on the battlefield -## Structures -notification-construction-complete = Construction complete. -notification-unit-ready = Unit ready. -notification-reinforcements-have-arrived = Reinforcements have arrived. -notification-unable-to-build-more = Unable to build more. -notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress. -notification-repairing = Repairing. -notification-ion-cannon-charging = Ion cannon charging. -notification-ion-cannon-ready = Ion cannon ready. -notification-select-target = Select target. -notification-insufficient-power = Insufficient power. -notification-airstrike-ready = Airstrike ready. -notification-enemy-planes-approaching = Enemy planes approaching. -notification-nuclear-weapon-available = Nuclear weapon available. -notification-nuclear-weapon-launched = Nuclear weapon launched. -notification-nuclear-warhead-approaching = Nuclear warhead approaching. - -## Defaults +## defaults.yaml notification-unit-lost = Unit lost. notification-unit-promoted = Unit promoted. notification-building-captured = Building captured. notification-civilian-building-captured = Civilian Building captured. notification-structure-lost = Structure lost. -## Vehicles -notification-harvester-lost = Harvester lost. - ## aircraft.yaml actor-tran = .name = Chinook Transport @@ -82,9 +62,6 @@ actor-tran-husk-name = Chinook Transport actor-heli-husk-name = Apache Longbow actor-orca-husk-name = Orca -## campaign-maprules.yaml -actor-moneycrate-name = Money Crate - ## civilian-desert.yaml actor-v20-name = Sala's House actor-v20-husk-name = Sala's House (Destroyed) @@ -170,7 +147,6 @@ meta-tank-generic-name = Tank meta-helicopter-generic-name = Helicopter meta-soldier-generic-name = Soldier meta-civinfantry-name = Civilian -meta-dino-name = Dinosaur meta-viceroid-name = Visceroid meta-ship-generic-name = Ship meta-building-generic-name = Structure @@ -182,8 +158,6 @@ meta-civhaystackorigloo = .winter--name = Igloo .summer--name = Haystacks -meta-civfieldhusk-name = Field (Destroyed) - meta-civhaystackorigloohusk = .winter--name = Igloo (Destroyed) .summer--name = Haystacks (Destroyed) @@ -226,12 +200,12 @@ actor-e1 = actor-e2 = .name = Grenadier - .description = Fast infantry armed with grenades. + .description = Fast infantry armed with grenades. Strong vs Buildings, slow-moving targets actor-e3 = .name = Rocket Soldier - .description = Anti-tank/Anti-aircraft infantry. + .description = Anti-tank/Anti-aircraft infantry. Strong vs Tanks, Aircraft Weak vs Infantry @@ -292,6 +266,22 @@ actor-boat-name = Gunboat actor-lst-name = Landing Craft ## structures.yaml +notification-construction-complete = Construction complete. +notification-unit-ready = Unit ready. +notification-reinforcements-have-arrived = Reinforcements have arrived. +notification-unable-to-build-more = Unable to build more. +notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress. +notification-repairing = Repairing. +notification-ion-cannon-charging = Ion cannon charging. +notification-ion-cannon-ready = Ion cannon ready. +notification-select-target = Select target. +notification-insufficient-power = Insufficient power. +notification-airstrike-ready = Airstrike ready. +notification-enemy-planes-approaching = Enemy planes approaching. +notification-nuclear-weapon-available = Nuclear weapon available. +notification-nuclear-weapon-launched = Nuclear weapon launched. +notification-nuclear-warhead-approaching = Nuclear warhead approaching. + actor-fact = .name = Construction Yard .description = Builds structures @@ -437,6 +427,8 @@ actor-harv = .description = Collects Tiberium for processing. Unarmed +notification-harvester-lost = Harvester lost. + actor-apc = .name = APC .description = Armed infantry transport. diff --git a/mods/cnc/maps/cnc64gdi01/map.yaml b/mods/cnc/maps/cnc64gdi01/map.yaml index 3df027a179..20af83f453 100644 --- a/mods/cnc/maps/cnc64gdi01/map.yaml +++ b/mods/cnc/maps/cnc64gdi01/map.yaml @@ -715,4 +715,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/eviction-notice/map.yaml b/mods/cnc/maps/eviction-notice/map.yaml index dd09605314..e6be5c04d1 100644 --- a/mods/cnc/maps/eviction-notice/map.yaml +++ b/mods/cnc/maps/eviction-notice/map.yaml @@ -646,4 +646,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml index a9ed1f6aa7..074727f3f5 100644 --- a/mods/cnc/maps/funpark01/map.yaml +++ b/mods/cnc/maps/funpark01/map.yaml @@ -414,4 +414,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index d429a68799..6ac8a6dea8 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -237,4 +237,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 2eb5fb028e..4939fb0e02 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -626,4 +626,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi03/en.ftl b/mods/cnc/maps/gdi03/en.ftl deleted file mode 100644 index 29923ef91d..0000000000 --- a/mods/cnc/maps/gdi03/en.ftl +++ /dev/null @@ -1,3 +0,0 @@ -## rules.yaml -actor-hq-description = Provides an overview of the battlefield. - Requires power to operate. diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 015dcdc64d..1a70397071 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -700,4 +700,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index e905122d39..6d5c19a580 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -452,4 +452,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index 4c73124fda..a6bb38d735 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -529,4 +529,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 1af3b4a379..e55587bdd8 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -746,4 +746,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi05a/map.yaml b/mods/cnc/maps/gdi05a/map.yaml index 24a84494d5..7047cabac4 100644 --- a/mods/cnc/maps/gdi05a/map.yaml +++ b/mods/cnc/maps/gdi05a/map.yaml @@ -758,4 +758,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi05b/map.yaml b/mods/cnc/maps/gdi05b/map.yaml index 6726078c8b..bb921ee5b7 100644 --- a/mods/cnc/maps/gdi05b/map.yaml +++ b/mods/cnc/maps/gdi05b/map.yaml @@ -614,4 +614,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi05c/map.yaml b/mods/cnc/maps/gdi05c/map.yaml index 137c37d919..8697d3f665 100644 --- a/mods/cnc/maps/gdi05c/map.yaml +++ b/mods/cnc/maps/gdi05c/map.yaml @@ -767,4 +767,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi06/map.yaml b/mods/cnc/maps/gdi06/map.yaml index 6e0ff943ca..8fe83476a0 100644 --- a/mods/cnc/maps/gdi06/map.yaml +++ b/mods/cnc/maps/gdi06/map.yaml @@ -1021,4 +1021,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Music: music.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi07/en.ftl b/mods/cnc/maps/gdi07/en.ftl deleted file mode 100644 index 29923ef91d..0000000000 --- a/mods/cnc/maps/gdi07/en.ftl +++ /dev/null @@ -1,3 +0,0 @@ -## rules.yaml -actor-hq-description = Provides an overview of the battlefield. - Requires power to operate. diff --git a/mods/cnc/maps/gdi07/map.yaml b/mods/cnc/maps/gdi07/map.yaml index 232738467e..5a2b42758f 100644 --- a/mods/cnc/maps/gdi07/map.yaml +++ b/mods/cnc/maps/gdi07/map.yaml @@ -1029,4 +1029,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi08a/en.ftl b/mods/cnc/maps/gdi08a/en.ftl deleted file mode 100644 index 7814ed8b1f..0000000000 --- a/mods/cnc/maps/gdi08a/en.ftl +++ /dev/null @@ -1,4 +0,0 @@ -## rules.yaml -actor-c3-name = Farmer Mike -actor-hq-description = Provides an overview of the battlefield. - Requires power to operate. diff --git a/mods/cnc/maps/gdi08a/map.yaml b/mods/cnc/maps/gdi08a/map.yaml index af904994f1..d322ea32e3 100644 --- a/mods/cnc/maps/gdi08a/map.yaml +++ b/mods/cnc/maps/gdi08a/map.yaml @@ -888,4 +888,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi08b/en.ftl b/mods/cnc/maps/gdi08b/en.ftl deleted file mode 100644 index d8d880d757..0000000000 --- a/mods/cnc/maps/gdi08b/en.ftl +++ /dev/null @@ -1,5 +0,0 @@ -civilian-killed = Civilian killed. - -## rules.yaml -actor-hq-description = Provides an overview of the battlefield. - Requires power to operate. diff --git a/mods/cnc/maps/gdi08b/map.yaml b/mods/cnc/maps/gdi08b/map.yaml index c00a61d154..ae642ad32c 100644 --- a/mods/cnc/maps/gdi08b/map.yaml +++ b/mods/cnc/maps/gdi08b/map.yaml @@ -1063,4 +1063,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/gdi09/en.ftl b/mods/cnc/maps/gdi09/en.ftl deleted file mode 100644 index 29923ef91d..0000000000 --- a/mods/cnc/maps/gdi09/en.ftl +++ /dev/null @@ -1,3 +0,0 @@ -## rules.yaml -actor-hq-description = Provides an overview of the battlefield. - Requires power to operate. diff --git a/mods/cnc/maps/gdi09/map.yaml b/mods/cnc/maps/gdi09/map.yaml index facdde8e6c..3233d1556b 100644 --- a/mods/cnc/maps/gdi09/map.yaml +++ b/mods/cnc/maps/gdi09/map.yaml @@ -784,4 +784,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod01/en.ftl b/mods/cnc/maps/nod01/en.ftl deleted file mode 100644 index ce5fe34b76..0000000000 --- a/mods/cnc/maps/nod01/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-c10-name = Nikoomba diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index 75248d592f..678772211c 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -233,4 +233,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml index 33d93def4a..87e8a2af30 100644 --- a/mods/cnc/maps/nod02a/map.yaml +++ b/mods/cnc/maps/nod02a/map.yaml @@ -236,4 +236,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml index 0ca5a5ba11..ea7b1c8ff8 100644 --- a/mods/cnc/maps/nod02b/map.yaml +++ b/mods/cnc/maps/nod02b/map.yaml @@ -197,4 +197,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod03a/en.ftl b/mods/cnc/maps/nod03a/en.ftl deleted file mode 100644 index 165600d298..0000000000 --- a/mods/cnc/maps/nod03a/en.ftl +++ /dev/null @@ -1,4 +0,0 @@ -## rules.yaml -actor-hq-description = Provides an overview of the battlefield. - Requires power to operate. -actor-miss-name = Prison diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index b62d94206f..bd33036da3 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -436,4 +436,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod03a/rules.yaml b/mods/cnc/maps/nod03a/rules.yaml index c8105a2dcc..3be3d6b458 100644 --- a/mods/cnc/maps/nod03a/rules.yaml +++ b/mods/cnc/maps/nod03a/rules.yaml @@ -96,7 +96,7 @@ RMBO: MISS: Tooltip: - Name: actor-miss-name + Name: actor-prison-name CaptureManager: Capturable: Types: building diff --git a/mods/cnc/maps/nod03b/en.ftl b/mods/cnc/maps/nod03b/en.ftl deleted file mode 100644 index 165600d298..0000000000 --- a/mods/cnc/maps/nod03b/en.ftl +++ /dev/null @@ -1,4 +0,0 @@ -## rules.yaml -actor-hq-description = Provides an overview of the battlefield. - Requires power to operate. -actor-miss-name = Prison diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index a20d67f402..769e0e6a7a 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -477,4 +477,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod03b/rules.yaml b/mods/cnc/maps/nod03b/rules.yaml index 2a2dc84d34..15be4950cf 100644 --- a/mods/cnc/maps/nod03b/rules.yaml +++ b/mods/cnc/maps/nod03b/rules.yaml @@ -95,7 +95,7 @@ RMBO: MISS: Tooltip: - Name: actor-miss-name + Name: actor-prison-name CaptureManager: Capturable: Types: building diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml index df2bb2d75d..98bff68a67 100644 --- a/mods/cnc/maps/nod04a/map.yaml +++ b/mods/cnc/maps/nod04a/map.yaml @@ -479,4 +479,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml index c905ef451e..59e2a35331 100644 --- a/mods/cnc/maps/nod04b/map.yaml +++ b/mods/cnc/maps/nod04b/map.yaml @@ -538,4 +538,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml index 9f4e6dac96..782a9fe40f 100644 --- a/mods/cnc/maps/nod05/map.yaml +++ b/mods/cnc/maps/nod05/map.yaml @@ -377,4 +377,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml index 8970886e0f..79f241d8fe 100644 --- a/mods/cnc/maps/nod06a/map.yaml +++ b/mods/cnc/maps/nod06a/map.yaml @@ -669,4 +669,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, languages/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml index c9602ae5db..c55a14fa8d 100644 --- a/mods/cnc/maps/nod06b/map.yaml +++ b/mods/cnc/maps/nod06b/map.yaml @@ -599,4 +599,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, languages/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml index 54f360fb20..1a7c348607 100644 --- a/mods/cnc/maps/nod06c/map.yaml +++ b/mods/cnc/maps/nod06c/map.yaml @@ -467,4 +467,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod07a/map.yaml b/mods/cnc/maps/nod07a/map.yaml index 7b649ffde1..23a5637568 100644 --- a/mods/cnc/maps/nod07a/map.yaml +++ b/mods/cnc/maps/nod07a/map.yaml @@ -600,4 +600,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod07b/map.yaml b/mods/cnc/maps/nod07b/map.yaml index d32bab121e..1d3461d5f9 100644 --- a/mods/cnc/maps/nod07b/map.yaml +++ b/mods/cnc/maps/nod07b/map.yaml @@ -957,4 +957,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod07c/map.yaml b/mods/cnc/maps/nod07c/map.yaml index 583968c11c..608b6804fa 100644 --- a/mods/cnc/maps/nod07c/map.yaml +++ b/mods/cnc/maps/nod07c/map.yaml @@ -772,4 +772,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod08a/map.yaml b/mods/cnc/maps/nod08a/map.yaml index 871de18214..9dff0ea4dc 100644 --- a/mods/cnc/maps/nod08a/map.yaml +++ b/mods/cnc/maps/nod08a/map.yaml @@ -614,4 +614,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod08b/map.yaml b/mods/cnc/maps/nod08b/map.yaml index 401963b2db..4ab1362992 100644 --- a/mods/cnc/maps/nod08b/map.yaml +++ b/mods/cnc/maps/nod08b/map.yaml @@ -773,4 +773,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod09/map.yaml b/mods/cnc/maps/nod09/map.yaml index 5c5b82a95b..12435a67b1 100644 --- a/mods/cnc/maps/nod09/map.yaml +++ b/mods/cnc/maps/nod09/map.yaml @@ -886,4 +886,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r Weapons: weapons.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod10a/map.yaml b/mods/cnc/maps/nod10a/map.yaml index ce7c17f17d..fc93a42267 100644 --- a/mods/cnc/maps/nod10a/map.yaml +++ b/mods/cnc/maps/nod10a/map.yaml @@ -1345,4 +1345,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/nod10b/map.yaml b/mods/cnc/maps/nod10b/map.yaml index 0ad352ee42..18187ee5fd 100644 --- a/mods/cnc/maps/nod10b/map.yaml +++ b/mods/cnc/maps/nod10b/map.yaml @@ -726,4 +726,4 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl diff --git a/mods/cnc/maps/twist-of-fate/map.yaml b/mods/cnc/maps/twist-of-fate/map.yaml index ca8dc79ae0..a16d589d8d 100644 --- a/mods/cnc/maps/twist-of-fate/map.yaml +++ b/mods/cnc/maps/twist-of-fate/map.yaml @@ -1142,6 +1142,6 @@ Actors: Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml -Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl +Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl Weapons: weapons.yaml diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index cdcbbd4207..0eda31a3bb 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -519,8 +519,6 @@ Prerequisites: ~disabled Valued: Cost: 1000 - Tooltip: - Name: meta-dino-name RevealsShroud: Range: 6c0 Mobile: @@ -861,7 +859,6 @@ Dimensions: 1,1 Footprint: = Tooltip: - Name: meta-civfieldhusk-name GenericVisibility: None ShowOwnerRow: false RenderSprites: diff --git a/mods/cnc/languages/difficulties/en.ftl b/mods/d2k/languages/campaign/en.ftl similarity index 55% rename from mods/cnc/languages/difficulties/en.ftl rename to mods/d2k/languages/campaign/en.ftl index 5521c17cd5..0b5e7b03e9 100644 --- a/mods/cnc/languages/difficulties/en.ftl +++ b/mods/d2k/languages/campaign/en.ftl @@ -1,3 +1,4 @@ +## world dropdown-difficulty = .label = Difficulty .description = The difficulty of the mission @@ -6,3 +7,9 @@ options-difficulty = .easy = Easy .normal = Normal .hard = Hard + +## campaign-tooltips.yaml +neutral-prefix = Neutral + +## harkonnen-05, ordos-04 +actor-outpost-modified--name = Modified Outpost diff --git a/mods/d2k/languages/difficulties/en.ftl b/mods/d2k/languages/difficulties/en.ftl deleted file mode 100644 index 5521c17cd5..0000000000 --- a/mods/d2k/languages/difficulties/en.ftl +++ /dev/null @@ -1,8 +0,0 @@ -dropdown-difficulty = - .label = Difficulty - .description = The difficulty of the mission - -options-difficulty = - .easy = Easy - .normal = Normal - .hard = Hard diff --git a/mods/d2k/languages/rules/en.ftl b/mods/d2k/languages/rules/en.ftl index 0f16f3026d..69fc91bd09 100644 --- a/mods/d2k/languages/rules/en.ftl +++ b/mods/d2k/languages/rules/en.ftl @@ -1,4 +1,4 @@ -## Player +## player.yaml options-tech-level = .low = Low .medium = Medium @@ -21,7 +21,7 @@ notification-no-room-for-new-units = No room for new unit. notification-cannot-build-here = Cannot build here. notification-one-of-our-buildings-has-been-captured = One of our buildings has been captured. -## World +## world.yaml dropdown-map-worms = .label = Worms .description = Worms roam the map and devour unprepared forces @@ -31,26 +31,7 @@ options-starting-units = .light-support = Light Support .heavy-support = Heavy Support -## Arrakis -notification-worm-attack = Worm attack. -notification-worm-sign = Worm sign. - -## Structures -notification-construction-complete = Construction complete. -notification-unit-ready = Unit ready. -notification-repairing = Repairing. -notification-unit-repaired = Unit repaired. -notification-select-target = Select target. -notifciation-missile-launch-detected = Missile launch detected. -notification-airstrike-ready = Airstrike ready. -notification-building-lost = Building lost. -notification-reinforcements-have-arrived = Reinforcements have arrived. -notification-death-hand-missile-prepping = Death Hand missile prepping. -notification-death-hand-missile-ready = Death Hand missile ready. -notification-fremen-ready = Fremen ready. -notification-saboteur-ready = Saboteur ready. - -## Defaults +## defaults.yaml notification-unit-lost = Unit lost. notification-unit-promoted = Unit promoted. notification-enemy-building-captured = Enemy Building captured. @@ -64,7 +45,7 @@ actor-carryall-reinforce = Lifts vehicles to Repair Pads when ordered. actor-carryall-encyclopedia = Carryalls will automatically transport Harvesters back and forth from the Spice Fields to the Refineries. They will also pick up units and deliver them to the Repair Pad, when ordered to. - + The Carryall is a lightly armored transport aircraft. They are vulnerable to missiles and can only be hit by anti-aircraft weapons. actor-frigate-name = Frigate @@ -77,19 +58,14 @@ actor-carryall-husk-name = Carryall actor-carryall-huskvtol-name = Carryall ## arrakis.yaml +notification-worm-attack = Worm attack. +notification-worm-sign = Worm sign. + actor-spicebloom-spawnpoint-name = Spice Bloom spawnpoint actor-spicebloom-name = Spice Bloom actor-sandworm-name = Sandworm actor-sietch-name = Fremen Sietch -## campaign-tooltips.yaml -meta-vehicle-neutral-prefix = Neutral -meta-tank-neutral-prefix = Neutral -meta-infantry-neutral-prefix = Neutral -meta-plane-neutral-prefix = Neutral -meta-building-neutral-prefix = Neutral -actor-wall-neutral-prefix = Neutral - ## defaults.yaml meta-vehicle-generic-name = Unit meta-husk-generic-name = Destroyed Unit @@ -115,7 +91,7 @@ actor-light-inf = Weak vs Vehicles, Artillery .name = Light Infantry .encyclopedia = Light Infantry are lightly armored foot soldiers, equipped with 9mm RP assault rifles. Light Infantry are effective against other infantry and lightly armored vehicles. - + Light Infantry are resistant to missiles and large-caliber guns, but very vulnerable to high-explosives, fire and bullet weapons. actor-engineer = @@ -124,7 +100,7 @@ actor-engineer = Weak vs Everything .name = Engineer .encyclopedia = Engineers can be used to capture enemy buildings. - + Engineers are resistant to anti-tank weaponry but very vulnerable to high-explosives, fire and bullet weapons. actor-trooper = @@ -133,7 +109,7 @@ actor-trooper = Weak vs Infantry, Artillery .name = Trooper .encyclopedia = Armed with missile launchers, Troopers fire wire guided armor-piercing warheads. These units are particularly effective against vehicles (especially armored ones) and buildings. However, this unit is largely useless against infantry. - + Troopers are resistant to anti-tank weaponry but very vulnerable to high-explosives, fire and bullet weapons. actor-thumper = @@ -149,11 +125,11 @@ actor-fremen = Weak vs Artillery Special Ability: Invisibility .encyclopedia = Fremen are the native desert warriors of Dune. Fremen ground units carry 10mm Assault Rifles and Rockets. Their firepower is equally effective against infantry and vehicles. - + Fremen units are very vulnerable to high-explosive and bullet weapons. actor-grenadier = - .description = Infantry armed with grenades. + .description = Infantry armed with grenades. Strong vs Buildings, Infantry Weak vs Vehicles .name = Grenadier @@ -178,7 +154,7 @@ actor-saboteur = Special Ability: destroy buildings .name = Saboteur .encyclopedia = The Saboteur is a special military unit acquired by House Ordos. A single Saboteur can destroy any enemy building once he moves into it, though also destroys himself! A Saboteur can be stealthed by deploying itself. - + The Saboteur is resistant to anti-tank weaponry, but very vulnerable to high-explosives, fire, and bullet weapons. actor-nsfremen-description = Elite infantry unit armed with assault rifles and rockets @@ -194,31 +170,31 @@ actor-wormspawner-name = (worm spawning location) actor-upgrade-conyard = .name = Construction Yard Upgrade - .description = Unlocks additional construction options + .description = Unlocks additional construction options (Large Concrete Slab, Rocket Turret) actor-upgrade-barracks = .name = Barracks Upgrade - .description = Unlocks additional infantry - (Trooper, Engineer, Thumper Infantry) - - Required to unlock faction specific infantry + .description = Unlocks additional infantry + (Trooper, Engineer, Thumper Infantry) + + Required to unlock faction specific infantry (Atreides: Grenadier, Harkonnen: Sardaukar) actor-upgrade-light = .name = Light Factory Upgrade - .description = Unlocks additional light unit - (Missile Quad) - - Required to unlock faction specific light unit + .description = Unlocks additional light unit + (Missile Quad) + + Required to unlock faction specific light unit (Ordos: Stealth Raider Trike) actor-upgrade-heavy = .name = Heavy Factory Upgrade - .description = Unlocks additional construction options - (Repair Pad, IX Research Center) - - Unlocks additional heavy units + .description = Unlocks additional construction options + (Repair Pad, IX Research Center) + + Unlocks additional heavy units (Siege Tank, Missile Tank, MCV) actor-upgrade-hightech = @@ -230,8 +206,21 @@ actor-deathhand = .encyclopedia = The Death Hand warhead carries atomic cluster munitions. It detonates above the target, inflicting great damage over a wide area. ## structures.yaml +notification-construction-complete = Construction complete. +notification-unit-ready = Unit ready. +notification-repairing = Repairing. +notification-unit-repaired = Unit repaired. +notification-select-target = Select target. +notifciation-missile-launch-detected = Missile launch detected. +notification-airstrike-ready = Airstrike ready. +notification-building-lost = Building lost. +notification-reinforcements-have-arrived = Reinforcements have arrived. +notification-death-hand-missile-prepping = Death Hand missile prepping. +notification-death-hand-missile-ready = Death Hand missile ready. +notification-fremen-ready = Fremen ready. +notification-saboteur-ready = Saboteur ready. + meta-concrete = - .name = Concrete .generic-name = Structure .description = Provides a strong foundation that prevents damage from the terrain. @@ -239,7 +228,7 @@ meta-concrete = actor-concretea = .name = Concrete Slab .encyclopedia = If buildings are not placed on concrete, they will be damaged. Buildings can be repaired, but unless the building sits completely on concrete, the building will suffer continual weathering damage from the erosive desert environment. - + Concrete is vulnerable to most weapon types. Concrete cannot be repaired if damaged. actor-concreteb-name = Large Concrete Slab @@ -247,7 +236,7 @@ actor-concreteb-name = Large Concrete Slab actor-construction-yard = .description = Produces structures. .encyclopedia = The Construction Yard is the foundation of any base built on Arrakis. Construction Yards produce a small amount of power and are required for the building of any new structures. Protect this structure! It is critical to the success of your base. - + Construction yards are fairly strong, but vulnerable in varying degrees to all types of weapons. .name = Construction Yard @@ -255,27 +244,27 @@ actor-wind-trap = .description = Provides power for other structures. .name = Wind Trap .encyclopedia = Wind Traps provide power and water to an installation. Large, above-ground ducts funnel wind currents underground into massive turbines which power generators and humidity extractors. - + Wind Traps are vulnerable to most types of weapons. actor-barracks = .description = Trains infantry. .name = Barracks .encyclopedia = Barracks are required to produce and train light infantry units. Barracks can be upgraded for the production of more advanced infantry in later missions. - + Barracks are vulnerable to most types of weapons. actor-refinery = .description = Harvesters unload Spice here for processing. .name = Spice Refinery .encyclopedia = The Refinery is the basis of all Spice production on Dune. Harvesters transport mined Spice to the Refinery where it is converted into credits. Refined Spice is automatically distributed among the Silos and Refineries for storage. A refinery can store 2000 spice. A Spice Harvester is delivered via Carryall once a Refinery is built. - + Refineries are vulnerable to most types of weapons. actor-silo = .description = Stores excess harvested Spice. .encyclopedia = The Spice Silo allows the player to store 1500 harvested Spice. When a Refinery completes processing, excess Spice is automatically distributed evenly among the Silos and Refineries. When harvested Spice exceeds Silo capacity, the excess will be lost. When Spice Silos are destroyed or captured, the amount stored will be dispersed among other Silos and Refineries unless there is insufficient storage capacity. - + The Spice Silo is vulnerable to most types of weapons. .name = Silo @@ -283,14 +272,14 @@ actor-light-factory = .description = Produces light vehicles. .name = Light Factory .encyclopedia = The Light Factory is required for the production of small, lightly armored, combat vehicles. The Light Factory can be upgraded to produce more advanced light vehicles in later missions. - + A Light Factory is vulnerable to most types of weapons. actor-heavy-factory = .description = Produces heavy vehicles. .name = Heavy Factory .encyclopedia = The Heavy Factory allows the player to build heavy vehicles such as Harvesters and Combat Tanks. When upgraded, this facility allows the construction of advanced vehicles, though some vehicles also require other buildings. - + The Heavy Factory is vulnerable to most types of weapons. actor-outpost = @@ -298,14 +287,14 @@ actor-outpost = Requires power to operate. .name = Outpost .encyclopedia = If the player has sufficient power, the Radar Outpost will generate a radar map. Radar is automatically activated when construction of the Outpost is complete. - + The Radar Outpost is vulnerable to most types of weapons. actor-starport = .name = Starport .description = Dropzone for quick reinforcements, at a price. .encyclopedia = The Starport allows you to engage in intergalactic trading with the C.H.O.A.M. Merchants' Guild. The Starport provides a trading market for vehicles and airborne units at varying rates. You cannot purchase units from the Guild without this facility. - + Armor is heavy, but the Starport is vulnerable to most types of weapons. actor-wall = @@ -313,7 +302,7 @@ actor-wall = .name = Concrete Wall .generic-name = Structure .encyclopedia = Base defense. Concrete walls are the most effective barriers on Dune. Concrete walls will block tank bullets and impede unit movement. - + Walls can only be damaged by explosive weapons, missiles and shells. Like concrete slabs, walls cannot be repaired if damaged. actor-medium-gun-turret = @@ -322,18 +311,18 @@ actor-medium-gun-turret = Weak vs Infantry, Aircraft .name = Gun Turret .encyclopedia = The Gun Turret has a medium range gun which is effective against vehicles, especially heavily armored vehicles. The Gun Turret will fire on any enemy unit within range. - + The Gun Turret is resistant to bullet and explosive weapons, but vulnerable to missiles and high-caliber guns. actor-large-gun-turret = .description = Defensive structure. Strong vs Infantry, Aircraft Weak vs Tanks - + Requires power to operate. .name = Rocket Turret .encyclopedia = The substantially improved Rocket Turret has a longer range and a higher rate of fire than the Gun Turret. The Rocket Turret's advanced targeting equipment requires power to operate. - + The Rocket Turret is resistant to bullet and explosive weapons, but vulnerable to missiles and high-caliber guns. actor-repair-pad = @@ -341,28 +330,28 @@ actor-repair-pad = Allows construction of MCVs .name = Repair Pad .encyclopedia = With a Repair Pad, vehicles can be repaired for a varying price. - + The Repair Pad is vulnerable to most types of weapons. actor-high-tech-factory = .description = Unlocks advanced technology. .name = High Tech Factory .encyclopedia = The High Tech Factory produces airborne units, and is required for the production of Carryalls. House Atreides can upgrade the High Tech Factory to build Ornithopters for an air strike in later missions. - + The High Tech Factory is vulnerable to most types of weapons. actor-research-centre = .description = Unlocks advanced tanks. .name = IX Research Center .encyclopedia = The IX Research Center provides technology upgrades for structures and vehicles. This facility is required for production of a number of advanced special weapons and prototypes. - + The IX Research Center is vulnerable to most types of weapons. actor-palace = .description = Unlocks elite infantry and weapons. .name = Palace .encyclopedia = The Palace serves as the command center once it is constructed. Palaces feature unique additional options, making available advanced special weapons. - + Armor is heavy, but the Palace is vulnerable to most types of weapons. ## vehicles.yaml @@ -371,7 +360,7 @@ actor-mcv = Unarmed .name = Mobile Construction Vehicle .encyclopedia = The Mobile Construction Vehicle must be driven to a suitable deployment area. After locating an appropriate area of rock, the MCV can be transformed into a Construction Yard. - + MCVs are resistant to bullets and light-explosives. They are vulnerable to missiles and high-caliber guns. actor-harvester = @@ -379,7 +368,7 @@ actor-harvester = Unarmed .name = Spice Harvester .encyclopedia = Harvesters are resistant to bullets, and to some degree, high-explosives. These units are vulnerable to missiles and high-caliber guns. - + A Harvester is included with a Refinery. actor-trike = @@ -388,7 +377,7 @@ actor-trike = Weak vs Tanks .name = Trike .encyclopedia = Trikes are lightly armored, three-wheeled vehicles equipped with heavy machine guns, effective against infantry and lightly armored vehicles. - + Trikes are vulnerable to most weapons, though high-caliber guns are slightly less effective against them. actor-quad = @@ -397,7 +386,7 @@ actor-quad = Weak vs Infantry .name = Missile Quad .encyclopedia = Stronger than the Trike in both armor and firepower, the Quad is a four-wheeled vehicle firing armor-piercing rockets. The Quad is effective against most vehicles. - + Quads are resistant to bullets and explosives, to a lesser degree. However, Quads are vulnerable to missiles and high-caliber guns. actor-siege-tank = @@ -406,7 +395,7 @@ actor-siege-tank = Weak vs Tanks .name = Siege Tank .encyclopedia = Siege Tanks are very effective against infantry and lightly armored vehicles - but very weak against heavily armored targets. They fire over a long range. - + Siege Tanks are resistant to bullets, and to some degree, explosives. These units are vulnerable to missiles and high-caliber guns. actor-missile-tank = @@ -415,7 +404,7 @@ actor-missile-tank = Strong vs Vehicles, Buildings, Aircraft Weak vs Infantry .encyclopedia = The Missile Tank is anti-aircraft capable and effective against most targets, except infantry units. - + Missile Tanks are vulnerable to most weapons, though high-caliber guns are slightly less effective. actor-sonic-tank = @@ -424,9 +413,9 @@ actor-sonic-tank = Weak vs Artillery .name = Sonic Tank .encyclopedia = The Sonic Tank is most effective against infantry and lightly armored vehicles - but weaker against armored targets. - + The Sonic Tank will damage all units in its firing path. - + They are very resistant to bullets and small-explosives, but vulnerable to missiles and high-caliber guns. actor-devastator = @@ -435,7 +424,7 @@ actor-devastator = Weak vs Artillery .name = Devastator .encyclopedia = The Devastator is the most powerful tank on Dune - powerfully effective against most units, but slow - and slow to fire. Nuclear powered, the Devastator fires dual plasma charges and may be ordered to self-destruct, damaging surrounding units and structures. - + The Devastator is very resistant to bullet and high-explosives, but vulnerable to missiles and high-caliber guns. actor-raider = @@ -444,7 +433,7 @@ actor-raider = Weak vs Tanks .name = Raider Trike .encyclopedia = Raiders are similar to Trikes, but the Ordos have refined their fire power, speed and armor to create a powerful and maneuverable scout. With dual 20mm cannons, Raiders are most effective against infantry and lightly armored vehicles. - + Raiders are vulnerable to most types of weaponry, though high-caliber guns are slightly less effective. actor-stealth-raider = @@ -459,29 +448,27 @@ actor-deviator = .description = Fires a warhead which changes the allegiance of enemy vehicles .encyclopedia = The Deviator's missiles discharge a silicon cloud that interferes with vehicle controls - temporarily changing the allegiance of the targeted unit. Personnel are not seriously effected by the cloud. - + The Deviator is vulnerable to most types of weapon, though high-caliber guns are slightly less effective. -meta-combat-tank = - .description = Main Battle Tank +meta-combat-tank-description = Main Battle Tank Strong vs Tanks Weak vs Infantry - .name = Combat Tank actor-combat-tank-a = .name = Atreides Combat Tank .encyclopedia = The Combat Tank is effective against most vehicles, less so against lightly armored vehicles. - + Atreides Combat Tanks are very resistant to bullet and heavy-explosives, but vulnerable to missiles and high-caliber guns. actor-combat-tank-h = .name = Harkonnen Combat Tank .encyclopedia = The Combat Tank is effective against most vehicles, less so against lightly armored vehicles. - + The Harkonnen Combat Tank is stronger than its counterparts, but also slower. actor-combat-tank-o = .name = Ordos Combat Tank .encyclopedia = The Combat Tank is effective against most vehicles, less so against lightly armored vehicles. - + The Ordos Combat Tank is the fastest variant of the Combat Tank, but it is also the weakest. diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml index 33e182484f..0e985a4173 100644 --- a/mods/d2k/maps/atreides-01a/map.yaml +++ b/mods/d2k/maps/atreides-01a/map.yaml @@ -114,4 +114,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml index cd70186c3b..0c6c77d528 100644 --- a/mods/d2k/maps/atreides-01b/map.yaml +++ b/mods/d2k/maps/atreides-01b/map.yaml @@ -113,4 +113,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/atreides-02a/map.yaml b/mods/d2k/maps/atreides-02a/map.yaml index f153663c38..6238561a6d 100644 --- a/mods/d2k/maps/atreides-02a/map.yaml +++ b/mods/d2k/maps/atreides-02a/map.yaml @@ -171,4 +171,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/atreides-02b/map.yaml b/mods/d2k/maps/atreides-02b/map.yaml index 5191815f16..fd20bf2a36 100644 --- a/mods/d2k/maps/atreides-02b/map.yaml +++ b/mods/d2k/maps/atreides-02b/map.yaml @@ -141,4 +141,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/atreides-03a/map.yaml b/mods/d2k/maps/atreides-03a/map.yaml index 7d55e63e19..2aeb5306a9 100644 --- a/mods/d2k/maps/atreides-03a/map.yaml +++ b/mods/d2k/maps/atreides-03a/map.yaml @@ -138,4 +138,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/atreides-03b/map.yaml b/mods/d2k/maps/atreides-03b/map.yaml index 48c1ff0b9e..f52fc8fc9b 100644 --- a/mods/d2k/maps/atreides-03b/map.yaml +++ b/mods/d2k/maps/atreides-03b/map.yaml @@ -135,4 +135,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/atreides-04/map.yaml b/mods/d2k/maps/atreides-04/map.yaml index ea758f5cab..89fb533cfa 100644 --- a/mods/d2k/maps/atreides-04/map.yaml +++ b/mods/d2k/maps/atreides-04/map.yaml @@ -419,4 +419,4 @@ Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rule Sequences: sequences.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/atreides-05/map.yaml b/mods/d2k/maps/atreides-05/map.yaml index 069dfa6aa6..f5dc2bb483 100644 --- a/mods/d2k/maps/atreides-05/map.yaml +++ b/mods/d2k/maps/atreides-05/map.yaml @@ -368,4 +368,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-01a/map.yaml b/mods/d2k/maps/harkonnen-01a/map.yaml index b7e37d9a16..c7256179bd 100644 --- a/mods/d2k/maps/harkonnen-01a/map.yaml +++ b/mods/d2k/maps/harkonnen-01a/map.yaml @@ -109,4 +109,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-01b/map.yaml b/mods/d2k/maps/harkonnen-01b/map.yaml index 065c216fce..19b42964ab 100644 --- a/mods/d2k/maps/harkonnen-01b/map.yaml +++ b/mods/d2k/maps/harkonnen-01b/map.yaml @@ -109,4 +109,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-02a/map.yaml b/mods/d2k/maps/harkonnen-02a/map.yaml index 7283bf89fb..22e6c6f548 100644 --- a/mods/d2k/maps/harkonnen-02a/map.yaml +++ b/mods/d2k/maps/harkonnen-02a/map.yaml @@ -165,4 +165,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-02b/map.yaml b/mods/d2k/maps/harkonnen-02b/map.yaml index 1b1e9a989f..a9a34da2f5 100644 --- a/mods/d2k/maps/harkonnen-02b/map.yaml +++ b/mods/d2k/maps/harkonnen-02b/map.yaml @@ -147,4 +147,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-03a/map.yaml b/mods/d2k/maps/harkonnen-03a/map.yaml index 1911d3b55d..3b29a888bf 100644 --- a/mods/d2k/maps/harkonnen-03a/map.yaml +++ b/mods/d2k/maps/harkonnen-03a/map.yaml @@ -180,4 +180,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-03b/map.yaml b/mods/d2k/maps/harkonnen-03b/map.yaml index 6c0ede745d..b04e0aa0b2 100644 --- a/mods/d2k/maps/harkonnen-03b/map.yaml +++ b/mods/d2k/maps/harkonnen-03b/map.yaml @@ -210,4 +210,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-04/map.yaml b/mods/d2k/maps/harkonnen-04/map.yaml index 50a8d47fbd..4cd8f56748 100644 --- a/mods/d2k/maps/harkonnen-04/map.yaml +++ b/mods/d2k/maps/harkonnen-04/map.yaml @@ -379,4 +379,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-05/en.ftl b/mods/d2k/maps/harkonnen-05/en.ftl deleted file mode 100644 index c1083526ff..0000000000 --- a/mods/d2k/maps/harkonnen-05/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-outpost-modified--name = Modified Outpost diff --git a/mods/d2k/maps/harkonnen-05/map.yaml b/mods/d2k/maps/harkonnen-05/map.yaml index 2c0f7e01f7..59f893570b 100644 --- a/mods/d2k/maps/harkonnen-05/map.yaml +++ b/mods/d2k/maps/harkonnen-05/map.yaml @@ -517,4 +517,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl, en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-06a/map.yaml b/mods/d2k/maps/harkonnen-06a/map.yaml index af6fd91568..df172df9dd 100644 --- a/mods/d2k/maps/harkonnen-06a/map.yaml +++ b/mods/d2k/maps/harkonnen-06a/map.yaml @@ -718,4 +718,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-06b/map.yaml b/mods/d2k/maps/harkonnen-06b/map.yaml index 642413920b..287c75532b 100644 --- a/mods/d2k/maps/harkonnen-06b/map.yaml +++ b/mods/d2k/maps/harkonnen-06b/map.yaml @@ -655,4 +655,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-07/map.yaml b/mods/d2k/maps/harkonnen-07/map.yaml index 8c6c14a13b..c590ee853b 100644 --- a/mods/d2k/maps/harkonnen-07/map.yaml +++ b/mods/d2k/maps/harkonnen-07/map.yaml @@ -772,4 +772,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-08/map.yaml b/mods/d2k/maps/harkonnen-08/map.yaml index 23cb3d8c75..40dfc63c01 100644 --- a/mods/d2k/maps/harkonnen-08/map.yaml +++ b/mods/d2k/maps/harkonnen-08/map.yaml @@ -655,4 +655,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-09a/map.yaml b/mods/d2k/maps/harkonnen-09a/map.yaml index 70e78e1348..29c8d8867f 100644 --- a/mods/d2k/maps/harkonnen-09a/map.yaml +++ b/mods/d2k/maps/harkonnen-09a/map.yaml @@ -1045,4 +1045,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/harkonnen-09b/map.yaml b/mods/d2k/maps/harkonnen-09b/map.yaml index d732643f16..b5c262ebc5 100644 --- a/mods/d2k/maps/harkonnen-09b/map.yaml +++ b/mods/d2k/maps/harkonnen-09b/map.yaml @@ -1008,4 +1008,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-01a/map.yaml b/mods/d2k/maps/ordos-01a/map.yaml index cf62224734..7b88a01d85 100644 --- a/mods/d2k/maps/ordos-01a/map.yaml +++ b/mods/d2k/maps/ordos-01a/map.yaml @@ -104,4 +104,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-01b/map.yaml b/mods/d2k/maps/ordos-01b/map.yaml index 1718f0bf46..f4a3716c30 100644 --- a/mods/d2k/maps/ordos-01b/map.yaml +++ b/mods/d2k/maps/ordos-01b/map.yaml @@ -104,4 +104,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-02a/map.yaml b/mods/d2k/maps/ordos-02a/map.yaml index 3c8fc3fde3..ecc79bc513 100644 --- a/mods/d2k/maps/ordos-02a/map.yaml +++ b/mods/d2k/maps/ordos-02a/map.yaml @@ -155,4 +155,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-02b/map.yaml b/mods/d2k/maps/ordos-02b/map.yaml index ccfa115e5a..8e9e6eb636 100644 --- a/mods/d2k/maps/ordos-02b/map.yaml +++ b/mods/d2k/maps/ordos-02b/map.yaml @@ -140,4 +140,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-03a/map.yaml b/mods/d2k/maps/ordos-03a/map.yaml index 24cefd3de8..6e0dc56195 100644 --- a/mods/d2k/maps/ordos-03a/map.yaml +++ b/mods/d2k/maps/ordos-03a/map.yaml @@ -146,4 +146,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-03b/map.yaml b/mods/d2k/maps/ordos-03b/map.yaml index d2b3c91497..0f5e30e0c2 100644 --- a/mods/d2k/maps/ordos-03b/map.yaml +++ b/mods/d2k/maps/ordos-03b/map.yaml @@ -257,4 +257,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-04/en.ftl b/mods/d2k/maps/ordos-04/en.ftl deleted file mode 100644 index c1083526ff..0000000000 --- a/mods/d2k/maps/ordos-04/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-outpost-modified--name = Modified Outpost diff --git a/mods/d2k/maps/ordos-04/map.yaml b/mods/d2k/maps/ordos-04/map.yaml index f412ddb46b..7c7ca3035d 100644 --- a/mods/d2k/maps/ordos-04/map.yaml +++ b/mods/d2k/maps/ordos-04/map.yaml @@ -519,4 +519,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl, en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-05/map.yaml b/mods/d2k/maps/ordos-05/map.yaml index 0a874ea4f0..0a9db7edc8 100644 --- a/mods/d2k/maps/ordos-05/map.yaml +++ b/mods/d2k/maps/ordos-05/map.yaml @@ -573,4 +573,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/maps/ordos-06a/map.yaml b/mods/d2k/maps/ordos-06a/map.yaml index a086c77d68..cc873e9067 100644 --- a/mods/d2k/maps/ordos-06a/map.yaml +++ b/mods/d2k/maps/ordos-06a/map.yaml @@ -577,4 +577,4 @@ Actors: Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml -Translations: d2k|languages/lua/en.ftl, d2k|languages/difficulties/en.ftl +Translations: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl diff --git a/mods/d2k/rules/campaign-tooltips.yaml b/mods/d2k/rules/campaign-tooltips.yaml index f8d5d75e1f..51bd11546d 100644 --- a/mods/d2k/rules/campaign-tooltips.yaml +++ b/mods/d2k/rules/campaign-tooltips.yaml @@ -1,31 +1,31 @@ ^Vehicle: Tooltip: GenericVisibility: Enemy, Neutral - NeutralPrefix: meta-vehicle-neutral-prefix + NeutralPrefix: neutral-prefix ShowOwnerRow: false ^Tank: Tooltip: GenericVisibility: Enemy, Neutral - NeutralPrefix: meta-tank-neutral-prefix + NeutralPrefix: neutral-prefix ShowOwnerRow: false ^Infantry: Tooltip: GenericVisibility: Enemy, Neutral - NeutralPrefix: meta-infantry-neutral-prefix + NeutralPrefix: neutral-prefix ShowOwnerRow: false ^Plane: Tooltip: GenericVisibility: Enemy, Neutral - NeutralPrefix: meta-plane-neutral-prefix + NeutralPrefix: neutral-prefix ShowOwnerRow: false ^Building: Tooltip: GenericVisibility: Enemy, Neutral - NeutralPrefix: meta-building-neutral-prefix + NeutralPrefix: neutral-prefix ShowOwnerRow: false ^Husk: @@ -41,5 +41,5 @@ wall: Tooltip: GenericVisibility: Enemy, Neutral - NeutralPrefix: actor-wall-neutral-prefix + NeutralPrefix: neutral-prefix ShowOwnerRow: false diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index e4f926e91b..47515ddbc2 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -10,7 +10,6 @@ AreaTypes: building Adjacent: 4 Tooltip: - Name: meta-concrete.name GenericName: meta-concrete.generic-name RenderSprites: KillsSelf: diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 7e18142e48..faa4251a9a 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -568,11 +568,9 @@ deviator: BuildPaletteOrder: 40 BuildDuration: 432 BuildDurationModifier: 100 - Description: meta-combat-tank.description + Description: meta-combat-tank-description Valued: Cost: 700 - Tooltip: - Name: meta-combat-tank.name UpdatesPlayerStatistics: AddToArmyValue: true Health: diff --git a/mods/ra/languages/campaign/en.ftl b/mods/ra/languages/campaign/en.ftl new file mode 100644 index 0000000000..d004f11742 --- /dev/null +++ b/mods/ra/languages/campaign/en.ftl @@ -0,0 +1,71 @@ +## world +dropdown-difficulty = + .label = Difficulty + .description = The difficulty of the mission + +options-difficulty = + .easy = Easy + .normal = Normal + .hard = Hard + +## campaign-rules.yaml +actor-crate-name = Crate + +## campaign-tooltips.yaml +actor-technology-center-name = Technology Center + +## allies-05a, allies-05b, allies-05c +actor-prison-name = Prison + +## fall-of-greece-1-personal-war, situation-critical +actor-strategic-bomber-name = Strategic Bomber + +## fall-of-greece-1-personal-war, mousetrap +actor-stavros-name = Stavros + +## intervention +actor-air-force-hq-name = Soviet Air Force HQ +actor-mainland-name = Reach the mainland +actor-givefix-name = Weapons Factory or Helipad + +## monster-tank-madness +actor-demitri-name = Dr. Demitri + +actor-5tnk = + .name = Super Tank + .generic-name = Super Tank + +actor-5tnk-husk-name = Husk (Super Tank) + +## mousetrap +actor-gas-name = Gas + +## sarin-gas-2-down-under +actor-offiser-name = Officer + +## sarin-gas-3-controlled-burn +actor-sarin-processing-plant-name = Sarin Processing Plant + +## siberian-conflict-1-fresh-tracks +actor-atomic-material-name = Atomic Material + +## situation-critical +actor-scientist-name = Scientist + +## soviet-soldier-volkov-n-chitzkoi +actor-afac = + .name = Alloy Facility + .generic-name = Alloy Facility + +actor-ccen = + .name = Control Center + .generic-name = Control Center + +actor-hgun-name = Heavy Turret Prototype + +actor-zkoi = + .name = Chitzkoi + .generic-name = Cyborg Dog + +## situation-critical, soviet-soldier-volkov-n-chitzkoi +actor-volk-name = Volkov diff --git a/mods/ra/languages/difficulties/en.ftl b/mods/ra/languages/difficulties/en.ftl deleted file mode 100644 index 5521c17cd5..0000000000 --- a/mods/ra/languages/difficulties/en.ftl +++ /dev/null @@ -1,8 +0,0 @@ -dropdown-difficulty = - .label = Difficulty - .description = The difficulty of the mission - -options-difficulty = - .easy = Easy - .normal = Normal - .hard = Hard diff --git a/mods/ra/languages/rules/en.ftl b/mods/ra/languages/rules/en.ftl index c531b74b9c..77a7699409 100644 --- a/mods/ra/languages/rules/en.ftl +++ b/mods/ra/languages/rules/en.ftl @@ -1,4 +1,4 @@ -## Player +## player.yaml options-tech-level = .infantry-only = Infantry Only .low = Low @@ -26,48 +26,12 @@ notification-base-under-attack = Base under attack. notification-ally-under-attack = Our ally is under attack. notification-silos-needed = Silos needed. -## World +## world.yaml options-starting-units = .mcv-only = MCV Only .light-support = Light Support .heavy-support = Heavy Support -## Structures -notification-construction-complete = Construction complete. -notification-unit-ready = Unit ready. -notification-unable-to-build-more = Unable to build more. -notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress. -notification-repairing = Repairing. -notification-unit-repaired = Unit repaired. -notification-select-target = Select target. -notification-insufficient-power = Insufficient power. -notification-reinforcements-have-arrived = Reinforcements have arrived. -notification-abomb-prepping = A-bomb prepping. -notification-abomb-ready = A-bomb ready. -notification-abomb-launch-detected = A-bomb launch detected. -notification-iron-curtain-charging = Iron curtain charging. -notification-iron-curtain-ready = Iron curtain ready. -notification-chronosphere-charging = Chronosphere charging. -notification-chronosphere-ready = Chronosphere ready. -notification-satellite-launched = Satellite launched. -notification-credits-stolen = Credits stolen. -notifcation-spy-plane-ready = Spy plane ready. - -## Defaults -notification-unit-lost = Unit lost. -notification-airborne-unit-lost = Airborne Unit lost. -notification-naval-unit-lost = Naval Unit lost. -notification-unit-promoted = Unit promoted. -notification-primary-building-selected = Primary building selected. -notification-structure-captured = Structure captured. -notification-unit-stolen = Unit stolen. - -## Infantry -notification-building-infiltrated = Building infiltrated. - -## Misc -notification-sonar-pulse-ready = Sonar pulse ready. - ## aircraft.yaml actor-badr-name = Badger @@ -112,12 +76,6 @@ actor-mh60 = Weak vs Tanks, Aircraft .name = Black Hawk -## campaign-rules.yaml -actor-moneycrate-name = Crate - -## campaign-tooltips.yaml -actor-miss-name = Technology Center - ## civilian.yaml actor-c10-name = Scientist actor-tecn-name = Technician @@ -148,6 +106,14 @@ actor-tanktrap1-name = Tank Trap actor-tanktrap2-name = Tank Trap ## defaults.yaml +notification-unit-lost = Unit lost. +notification-airborne-unit-lost = Airborne Unit lost. +notification-naval-unit-lost = Naval Unit lost. +notification-unit-promoted = Unit promoted. +notification-primary-building-selected = Primary building selected. +notification-structure-captured = Structure captured. +notification-unit-stolen = Unit stolen. + meta-vehicle-generic-name = Vehicle meta-infantry-generic-name = Soldier meta-civinfantry-name = Civilian @@ -261,6 +227,8 @@ actor-u2-husk-name = Husk (Spy Plane) actor-mh60-husk-name = Black Hawk ## infantry.yaml +notification-building-infiltrated = Building infiltrated. + actor-dog = .description = Anti-infantry unit. Can detect spies. @@ -364,6 +332,8 @@ actor-scoutant-name = Scout Ant actor-warriorant-name = Warrior Ant ## misc.yaml +notification-sonar-pulse-ready = Sonar pulse ready. + actor-moneycrate-name = Money Crate actor-healcrate-name = Heal Crate actor-wcrate-name = Wooden Crate @@ -429,6 +399,26 @@ actor-pt = .name = Gunboat ## structures.yaml +notification-construction-complete = Construction complete. +notification-unit-ready = Unit ready. +notification-unable-to-build-more = Unable to build more. +notification-unable-to-comply-building-in-progress = Unable to comply. Building in progress. +notification-repairing = Repairing. +notification-unit-repaired = Unit repaired. +notification-select-target = Select target. +notification-insufficient-power = Insufficient power. +notification-reinforcements-have-arrived = Reinforcements have arrived. +notification-abomb-prepping = A-bomb prepping. +notification-abomb-ready = A-bomb ready. +notification-abomb-launch-detected = A-bomb launch detected. +notification-iron-curtain-charging = Iron curtain charging. +notification-iron-curtain-ready = Iron curtain ready. +notification-chronosphere-charging = Chronosphere charging. +notification-chronosphere-ready = Chronosphere ready. +notification-satellite-launched = Satellite launched. +notification-credits-stolen = Credits stolen. +notifcation-spy-plane-ready = Spy plane ready. + actor-mslo = .name = Missile Silo .description = Provides an atomic bomb. @@ -693,7 +683,7 @@ actor-truk = .name = Supply Truck actor-mgg = - .description = Regenerates the shroud nearby, + .description = Regenerates the shroud nearby, obscuring the area. Unarmed .name = Mobile Gap Generator diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index 2c54c6720f..cfe6aca582 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/mods/ra/maps/allies-01/map.yaml @@ -449,4 +449,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index 39d404b0ed..3fd8ef4157 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/mods/ra/maps/allies-02/map.yaml @@ -658,4 +658,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, languages/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index 43b52fb1f6..f211f2bdbf 100644 --- a/mods/ra/maps/allies-03a/map.yaml +++ b/mods/ra/maps/allies-03a/map.yaml @@ -1312,4 +1312,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-03b/map.yaml b/mods/ra/maps/allies-03b/map.yaml index 2b6f221492..9a2f2d50b6 100644 --- a/mods/ra/maps/allies-03b/map.yaml +++ b/mods/ra/maps/allies-03b/map.yaml @@ -1212,4 +1212,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-04/map.yaml b/mods/ra/maps/allies-04/map.yaml index eea267959f..b30f35e306 100644 --- a/mods/ra/maps/allies-04/map.yaml +++ b/mods/ra/maps/allies-04/map.yaml @@ -535,4 +535,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, languages/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl diff --git a/mods/ra/maps/allies-05a/en.ftl b/mods/ra/maps/allies-05a/en.ftl deleted file mode 100644 index 2c3f7fc523..0000000000 --- a/mods/ra/maps/allies-05a/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-miss-name = Prison diff --git a/mods/ra/maps/allies-05a/map.yaml b/mods/ra/maps/allies-05a/map.yaml index 80545733f0..2c24f6c7d4 100644 --- a/mods/ra/maps/allies-05a/map.yaml +++ b/mods/ra/maps/allies-05a/map.yaml @@ -1565,4 +1565,4 @@ Weapons: weapons.yaml Notifications: notifications.yaml -Translations: ra|languages/lua/en.ftl, languages/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl diff --git a/mods/ra/maps/allies-05a/rules.yaml b/mods/ra/maps/allies-05a/rules.yaml index 118be7ce1c..0c3e8652d2 100644 --- a/mods/ra/maps/allies-05a/rules.yaml +++ b/mods/ra/maps/allies-05a/rules.yaml @@ -96,7 +96,7 @@ WEAP.infiltratable: MISS: Tooltip: - Name: actor-miss-name + Name: actor-prison-name Targetable: TargetTypes: GroundActor, C4, DetonateAttack, Structure, Mission Objectives AttackOmni: diff --git a/mods/ra/maps/allies-05b/en.ftl b/mods/ra/maps/allies-05b/en.ftl deleted file mode 100644 index 2c3f7fc523..0000000000 --- a/mods/ra/maps/allies-05b/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-miss-name = Prison diff --git a/mods/ra/maps/allies-05b/map.yaml b/mods/ra/maps/allies-05b/map.yaml index 2fd3509dcd..4a82979f34 100644 --- a/mods/ra/maps/allies-05b/map.yaml +++ b/mods/ra/maps/allies-05b/map.yaml @@ -1195,4 +1195,4 @@ Weapons: weapons.yaml Notifications: notifications.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-05b/rules.yaml b/mods/ra/maps/allies-05b/rules.yaml index b95fec9d63..bc2f89a961 100644 --- a/mods/ra/maps/allies-05b/rules.yaml +++ b/mods/ra/maps/allies-05b/rules.yaml @@ -93,7 +93,7 @@ WEAP.infiltratable: MISS: Tooltip: - Name: actor-miss-name + Name: actor-prison-name Targetable: TargetTypes: GroundActor, C4, DetonateAttack, Structure, Mission Objectives AttackOmni: diff --git a/mods/ra/maps/allies-05c/en.ftl b/mods/ra/maps/allies-05c/en.ftl deleted file mode 100644 index 2c3f7fc523..0000000000 --- a/mods/ra/maps/allies-05c/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-miss-name = Prison diff --git a/mods/ra/maps/allies-05c/map.yaml b/mods/ra/maps/allies-05c/map.yaml index 860b4901ca..636662930a 100644 --- a/mods/ra/maps/allies-05c/map.yaml +++ b/mods/ra/maps/allies-05c/map.yaml @@ -1066,4 +1066,4 @@ Weapons: weapons.yaml Notifications: notifications.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-05c/rules.yaml b/mods/ra/maps/allies-05c/rules.yaml index 27c3c86aca..7d4d7d37e9 100644 --- a/mods/ra/maps/allies-05c/rules.yaml +++ b/mods/ra/maps/allies-05c/rules.yaml @@ -95,7 +95,7 @@ WEAP.infiltratable: MISS: Tooltip: - Name: actor-miss-name + Name: actor-prison-name Targetable: TargetTypes: GroundActor, C4, DetonateAttack, Structure, Mission Objectives AttackOmni: diff --git a/mods/ra/maps/allies-06a/map.yaml b/mods/ra/maps/allies-06a/map.yaml index a03d0b8792..1417469742 100644 --- a/mods/ra/maps/allies-06a/map.yaml +++ b/mods/ra/maps/allies-06a/map.yaml @@ -631,4 +631,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-06b/map.yaml b/mods/ra/maps/allies-06b/map.yaml index 6992167a0e..41758e7c64 100644 --- a/mods/ra/maps/allies-06b/map.yaml +++ b/mods/ra/maps/allies-06b/map.yaml @@ -845,4 +845,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-07/map.yaml b/mods/ra/maps/allies-07/map.yaml index 096ad37e5e..ab06c1ba6c 100644 --- a/mods/ra/maps/allies-07/map.yaml +++ b/mods/ra/maps/allies-07/map.yaml @@ -878,4 +878,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-08a/map.yaml b/mods/ra/maps/allies-08a/map.yaml index 55f02d45ce..144e23d9f5 100644 --- a/mods/ra/maps/allies-08a/map.yaml +++ b/mods/ra/maps/allies-08a/map.yaml @@ -989,4 +989,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-08b/map.yaml b/mods/ra/maps/allies-08b/map.yaml index 5210d00f67..884a99ddf0 100644 --- a/mods/ra/maps/allies-08b/map.yaml +++ b/mods/ra/maps/allies-08b/map.yaml @@ -828,4 +828,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-09a/map.yaml b/mods/ra/maps/allies-09a/map.yaml index 22bb14c69e..3f44885cd4 100644 --- a/mods/ra/maps/allies-09a/map.yaml +++ b/mods/ra/maps/allies-09a/map.yaml @@ -974,4 +974,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-10a/map.yaml b/mods/ra/maps/allies-10a/map.yaml index d48426f1b9..6078fdcc16 100644 --- a/mods/ra/maps/allies-10a/map.yaml +++ b/mods/ra/maps/allies-10a/map.yaml @@ -1617,4 +1617,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/allies-10b/map.yaml b/mods/ra/maps/allies-10b/map.yaml index 4f3b5409a2..e9e47f4426 100644 --- a/mods/ra/maps/allies-10b/map.yaml +++ b/mods/ra/maps/allies-10b/map.yaml @@ -938,4 +938,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Notifications: notifications.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/ant-01/map.yaml b/mods/ra/maps/ant-01/map.yaml index 1f0cac1287..2cd77fafc5 100644 --- a/mods/ra/maps/ant-01/map.yaml +++ b/mods/ra/maps/ant-01/map.yaml @@ -597,4 +597,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml, ra|rules/campaign-palettes.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/ant-03/map.yaml b/mods/ra/maps/ant-03/map.yaml index 74c1be601f..650d220edb 100644 --- a/mods/ra/maps/ant-03/map.yaml +++ b/mods/ra/maps/ant-03/map.yaml @@ -670,4 +670,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/bomber-john/en.ftl b/mods/ra/maps/bomber-john/en.ftl index 3a6ff5cc62..c692249065 100644 --- a/mods/ra/maps/bomber-john/en.ftl +++ b/mods/ra/maps/bomber-john/en.ftl @@ -1,7 +1,7 @@ ## rules.yaml -actor-player = - .grantexternalconditionpower-ironcurtain-begin-charge-text-notification = Iron curtain charging. - .grantexternalconditionpower-ironcurtain-end-charge-text-notification = Iron curtain ready. +notification-ironcurtain = + .charging = Iron curtain charging. + .ready = Iron curtain ready. actor-mnlyr-name = Bomber diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index a6b7e2ea90..7ce8080945 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -755,4 +755,5 @@ Actors: Rules: rules.yaml Sequences: sequences.yaml + Translations: en.ftl diff --git a/mods/ra/maps/bomber-john/rules.yaml b/mods/ra/maps/bomber-john/rules.yaml index 1d78236ea4..a4c0f6942f 100644 --- a/mods/ra/maps/bomber-john/rules.yaml +++ b/mods/ra/maps/bomber-john/rules.yaml @@ -103,8 +103,8 @@ Player: EndChargeSpeechNotification: IronCurtainReady SelectTargetTextNotification: notification-select-target InsufficientPowerTextNotification: notification-insufficient-power - BeginChargeTextNotification: actor-player.grantexternalconditionpower-ironcurtain-begin-charge-text-notification - EndChargeTextNotification: actor-player.grantexternalconditionpower-ironcurtain-end-charge-text-notification + BeginChargeTextNotification: notification-ironcurtain.charging + EndChargeTextNotification: notification-ironcurtain.ready Condition: invulnerability Sequence: idle OnFireSound: ironcur9.aud diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index cd5bd8465b..556e1fbc85 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -265,4 +265,5 @@ Actors: Rules: rules.yaml Weapons: weapons.yaml + Translations: en.ftl diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index a6a093ac1c..92d95e34ce 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -184,4 +184,5 @@ Rules: rules.yaml Sequences: sequences.yaml Weapons: weapons.yaml + Translations: en.ftl diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index e1f027ab70..04b237944f 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -160,4 +160,5 @@ Actors: Rules: rules.yaml Weapons: weapons.yaml + Translations: en.ftl diff --git a/mods/ra/maps/evacuation/map.yaml b/mods/ra/maps/evacuation/map.yaml index 64e79bc125..5cd1f8ce2b 100644 --- a/mods/ra/maps/evacuation/map.yaml +++ b/mods/ra/maps/evacuation/map.yaml @@ -1757,4 +1757,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, ra|rules/coop-missions-rules.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/exodus/map.yaml b/mods/ra/maps/exodus/map.yaml index 0b260d76fa..952e7687ba 100644 --- a/mods/ra/maps/exodus/map.yaml +++ b/mods/ra/maps/exodus/map.yaml @@ -1384,4 +1384,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, ra|rules/coop-missions-rules.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/en.ftl b/mods/ra/maps/fall-of-greece-1-personal-war/en.ftl deleted file mode 100644 index 9f6aacd0f9..0000000000 --- a/mods/ra/maps/fall-of-greece-1-personal-war/en.ftl +++ /dev/null @@ -1,3 +0,0 @@ -## rules.yaml -actor-gnrl-name = Stavros -actor-badr-bomber-name = Strategic Bomber diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml b/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml index 96a9d87166..cb008017e9 100644 --- a/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml +++ b/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml @@ -1309,4 +1309,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml b/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml index 88003784ab..ba2ef8bb46 100644 --- a/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml +++ b/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml @@ -45,7 +45,7 @@ GNRL: Valued: Cost: 1000 Tooltip: - Name: actor-gnrl-name + Name: actor-stavros-name Armament: Weapon: SilencedPPK Passenger: @@ -86,7 +86,7 @@ BADR.Bomber: Aircraft: Speed: 373 Tooltip: - Name: actor-badr-bomber-name + Name: actor-strategic-bomber-name RenderSprites: Image: U2 diff --git a/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml b/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml index fa3575f7e5..9f8f50c53f 100644 --- a/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml +++ b/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml @@ -1045,4 +1045,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/fort-lonestar/en.ftl b/mods/ra/maps/fort-lonestar/en.ftl index ec694fcc72..3e01603f27 100644 --- a/mods/ra/maps/fort-lonestar/en.ftl +++ b/mods/ra/maps/fort-lonestar/en.ftl @@ -1,4 +1,3 @@ -## rules.yaml actor-mobiletent-name = Mobile Tent actor-sniper = @@ -8,4 +7,4 @@ actor-sniper = Strong vs Infantry Weak vs Vehicles, Aircraft -actor-badr-bomber-name = MiG Bomber +actor-mig-bomber-name = MiG Bomber diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index a3e9413573..d624c8e134 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -404,7 +404,7 @@ BADR.Bomber: AmmoPool: Ammo: 30 Tooltip: - Name: actor-badr-bomber-name + Name: actor-mig-bomber-name SpawnActorOnDeath: Actor: MIG.Husk RenderSprites: diff --git a/mods/ra/maps/in-the-nick-of-time/map.yaml b/mods/ra/maps/in-the-nick-of-time/map.yaml index 2bdb71193c..dc1f7b2d2f 100644 --- a/mods/ra/maps/in-the-nick-of-time/map.yaml +++ b/mods/ra/maps/in-the-nick-of-time/map.yaml @@ -956,4 +956,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/infiltration/map.yaml b/mods/ra/maps/infiltration/map.yaml index 0c07df6cac..6f6a4cc5ba 100644 --- a/mods/ra/maps/infiltration/map.yaml +++ b/mods/ra/maps/infiltration/map.yaml @@ -1791,4 +1791,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, ra|rules/coop-missions-rules.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/intervention/en.ftl b/mods/ra/maps/intervention/en.ftl deleted file mode 100644 index a002ebc9ef..0000000000 --- a/mods/ra/maps/intervention/en.ftl +++ /dev/null @@ -1,4 +0,0 @@ -## rules.yaml -actor-miss-name = Soviet Air Force HQ -actor-mainland-name = Reach the mainland -actor-givefix-name = Weapons Factory or Helipad diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index 87de3f7387..f31f628b14 100644 --- a/mods/ra/maps/intervention/map.yaml +++ b/mods/ra/maps/intervention/map.yaml @@ -2204,4 +2204,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml index 885f68212d..5e78b422fa 100644 --- a/mods/ra/maps/intervention/rules.yaml +++ b/mods/ra/maps/intervention/rules.yaml @@ -22,7 +22,7 @@ CAMERA: MISS: Tooltip: - Name: actor-miss-name + Name: actor-air-force-hq-name Capturable: Types: building CaptureManager: diff --git a/mods/ra/maps/monster-tank-madness/en.ftl b/mods/ra/maps/monster-tank-madness/en.ftl deleted file mode 100644 index d8993959ad..0000000000 --- a/mods/ra/maps/monster-tank-madness/en.ftl +++ /dev/null @@ -1,8 +0,0 @@ -## rules.yaml -actor-demitri-name = Dr. Demitri - -actor-5tnk = - .name = Super Tank - .generic-name = Super Tank - -actor-5tnk-husk-name = Husk (Super Tank) diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 31a6ae2a79..c4da305757 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2099,4 +2099,4 @@ Weapons: weapons.yaml Voices: voices.yaml -Translations: ra|languages/lua/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/mousetrap/en.ftl b/mods/ra/maps/mousetrap/en.ftl deleted file mode 100644 index bfbf80b80a..0000000000 --- a/mods/ra/maps/mousetrap/en.ftl +++ /dev/null @@ -1,3 +0,0 @@ -## rules.yaml -actor-flare-name = Gas -actor-stavros-name = Stavros diff --git a/mods/ra/maps/mousetrap/map.yaml b/mods/ra/maps/mousetrap/map.yaml index c9db053c8d..a95c42ba60 100644 --- a/mods/ra/maps/mousetrap/map.yaml +++ b/mods/ra/maps/mousetrap/map.yaml @@ -751,4 +751,4 @@ Notifications: notifications.yaml Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/mousetrap/rules.yaml b/mods/ra/maps/mousetrap/rules.yaml index a005a0b08a..d9ecca38e2 100644 --- a/mods/ra/maps/mousetrap/rules.yaml +++ b/mods/ra/maps/mousetrap/rules.yaml @@ -20,7 +20,7 @@ World: Locomotor@TRACKED: TerrainSpeeds: ClearNoSmudges: 100 - + ^Palettes: -ChronoshiftPostProcessEffect: @@ -51,8 +51,8 @@ FLARE: Range: 1c512 ValidRelationships: Ally, Neutral, Enemy Tooltip: - Name: actor-flare-name - + Name: actor-gas-name + IRONCRATE: Inherits: ^Crate GrantExternalConditionCrateAction: diff --git a/mods/ra/maps/oil-spill/map.yaml b/mods/ra/maps/oil-spill/map.yaml index b081934e10..590743b4f5 100644 --- a/mods/ra/maps/oil-spill/map.yaml +++ b/mods/ra/maps/oil-spill/map.yaml @@ -307,4 +307,5 @@ Actors: Rules: rules.yaml Sequences: sequences.yaml + Translations: en.ftl diff --git a/mods/ra/maps/production-disruption/map.yaml b/mods/ra/maps/production-disruption/map.yaml index 6eaed232e6..bb57ef1633 100644 --- a/mods/ra/maps/production-disruption/map.yaml +++ b/mods/ra/maps/production-disruption/map.yaml @@ -649,4 +649,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/sarin-gas-1-crackdown/map.yaml b/mods/ra/maps/sarin-gas-1-crackdown/map.yaml index b77ad33ea8..9809202ef3 100644 --- a/mods/ra/maps/sarin-gas-1-crackdown/map.yaml +++ b/mods/ra/maps/sarin-gas-1-crackdown/map.yaml @@ -1011,4 +1011,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/sarin-gas-2-down-under/en.ftl b/mods/ra/maps/sarin-gas-2-down-under/en.ftl deleted file mode 100644 index 09b06ad761..0000000000 --- a/mods/ra/maps/sarin-gas-2-down-under/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-gnrl-name = Officer diff --git a/mods/ra/maps/sarin-gas-2-down-under/map.yaml b/mods/ra/maps/sarin-gas-2-down-under/map.yaml index 042798d821..63d5ef756a 100644 --- a/mods/ra/maps/sarin-gas-2-down-under/map.yaml +++ b/mods/ra/maps/sarin-gas-2-down-under/map.yaml @@ -1367,4 +1367,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/sarin-gas-2-down-under/rules.yaml b/mods/ra/maps/sarin-gas-2-down-under/rules.yaml index 6766a54331..346e67f23d 100644 --- a/mods/ra/maps/sarin-gas-2-down-under/rules.yaml +++ b/mods/ra/maps/sarin-gas-2-down-under/rules.yaml @@ -32,7 +32,7 @@ TSLA: GNRL: Tooltip: - Name: actor-gnrl-name + Name: actor-offiser-name C5: -Wanders: diff --git a/mods/ra/maps/sarin-gas-3-controlled-burn/en.ftl b/mods/ra/maps/sarin-gas-3-controlled-burn/en.ftl deleted file mode 100644 index 465e274794..0000000000 --- a/mods/ra/maps/sarin-gas-3-controlled-burn/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-bio-name = Sarin Processing Plant diff --git a/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml b/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml index 4e0bceb95d..3e26572211 100644 --- a/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml +++ b/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml @@ -1243,4 +1243,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/sarin-gas-3-controlled-burn/rules.yaml b/mods/ra/maps/sarin-gas-3-controlled-burn/rules.yaml index b727af41e0..040a43ac85 100644 --- a/mods/ra/maps/sarin-gas-3-controlled-burn/rules.yaml +++ b/mods/ra/maps/sarin-gas-3-controlled-burn/rules.yaml @@ -56,7 +56,7 @@ ATEK: BIO: Tooltip: - Name: actor-bio-name + Name: actor-sarin-processing-plant-name E7: Buildable: diff --git a/mods/ra/maps/shock-therapy/map.yaml b/mods/ra/maps/shock-therapy/map.yaml index ef6cbdb816..0ec3ed38f7 100644 --- a/mods/ra/maps/shock-therapy/map.yaml +++ b/mods/ra/maps/shock-therapy/map.yaml @@ -997,4 +997,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/siberian-conflict-1-fresh-tracks/en.ftl b/mods/ra/maps/siberian-conflict-1-fresh-tracks/en.ftl deleted file mode 100644 index 4f92300c90..0000000000 --- a/mods/ra/maps/siberian-conflict-1-fresh-tracks/en.ftl +++ /dev/null @@ -1,2 +0,0 @@ -## rules.yaml -actor-moneycrate-name = Atomic Material diff --git a/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml b/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml index 1f007b87e5..429bbf6d1d 100644 --- a/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml +++ b/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml @@ -671,4 +671,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/siberian-conflict-1-fresh-tracks/rules.yaml b/mods/ra/maps/siberian-conflict-1-fresh-tracks/rules.yaml index 47992a72f6..7887b9f09d 100644 --- a/mods/ra/maps/siberian-conflict-1-fresh-tracks/rules.yaml +++ b/mods/ra/maps/siberian-conflict-1-fresh-tracks/rules.yaml @@ -23,7 +23,7 @@ MONEYCRATE: ExplodeCrateAction: Weapon: MiniNuke Tooltip: - Name: actor-moneycrate-name + Name: actor-atomic-material-name RenderSprites: Image: wcrate diff --git a/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml b/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml index ce221c372d..42fdeac7d2 100644 --- a/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml +++ b/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml @@ -1017,4 +1017,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/situation-critical/en.ftl b/mods/ra/maps/situation-critical/en.ftl deleted file mode 100644 index 01cc50d012..0000000000 --- a/mods/ra/maps/situation-critical/en.ftl +++ /dev/null @@ -1,4 +0,0 @@ -## rules.yaml -actor-volk-name = Volkov -actor-badr-bomber-name = Strategic Bomber -actor-delphi-name = Scientist diff --git a/mods/ra/maps/situation-critical/map.yaml b/mods/ra/maps/situation-critical/map.yaml index bd04c08c2b..b66523fd8d 100644 --- a/mods/ra/maps/situation-critical/map.yaml +++ b/mods/ra/maps/situation-critical/map.yaml @@ -566,4 +566,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/situation-critical/rules.yaml b/mods/ra/maps/situation-critical/rules.yaml index bf735094e4..709c0cc7a3 100644 --- a/mods/ra/maps/situation-critical/rules.yaml +++ b/mods/ra/maps/situation-critical/rules.yaml @@ -64,7 +64,7 @@ BADR.Bomber: Aircraft: Speed: 373 Tooltip: - Name: actor-badr-bomber-name + Name: actor-strategic-bomber-name RenderSprites: Image: U2 @@ -74,7 +74,7 @@ powerproxy.parabombs: DELPHI: Tooltip: - Name: actor-delphi-name + Name: actor-scientist-name Infiltrates: Types: ScientistInfiltrate diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 5bc91c5ab3..4fbaa44483 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -589,4 +589,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-02a/map.yaml b/mods/ra/maps/soviet-02a/map.yaml index 3badde5d16..ec6313be96 100644 --- a/mods/ra/maps/soviet-02a/map.yaml +++ b/mods/ra/maps/soviet-02a/map.yaml @@ -513,4 +513,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-02b/map.yaml b/mods/ra/maps/soviet-02b/map.yaml index 94479deffa..5437bc2291 100644 --- a/mods/ra/maps/soviet-02b/map.yaml +++ b/mods/ra/maps/soviet-02b/map.yaml @@ -492,4 +492,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml index f92065adde..b69cead839 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -1054,4 +1054,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Notifications: notifications.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-04a/map.yaml b/mods/ra/maps/soviet-04a/map.yaml index 5722f202d7..2902d32ffd 100644 --- a/mods/ra/maps/soviet-04a/map.yaml +++ b/mods/ra/maps/soviet-04a/map.yaml @@ -600,4 +600,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-04b/map.yaml b/mods/ra/maps/soviet-04b/map.yaml index 665ef732a9..2da25b8aaf 100644 --- a/mods/ra/maps/soviet-04b/map.yaml +++ b/mods/ra/maps/soviet-04b/map.yaml @@ -649,4 +649,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-05/map.yaml b/mods/ra/maps/soviet-05/map.yaml index f628100c10..eb2a44c969 100644 --- a/mods/ra/maps/soviet-05/map.yaml +++ b/mods/ra/maps/soviet-05/map.yaml @@ -591,4 +591,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-06a/map.yaml b/mods/ra/maps/soviet-06a/map.yaml index 3cf3f7bb20..9551f362da 100644 --- a/mods/ra/maps/soviet-06a/map.yaml +++ b/mods/ra/maps/soviet-06a/map.yaml @@ -828,4 +828,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-06b/map.yaml b/mods/ra/maps/soviet-06b/map.yaml index 860321f379..b8c88bb315 100644 --- a/mods/ra/maps/soviet-06b/map.yaml +++ b/mods/ra/maps/soviet-06b/map.yaml @@ -505,4 +505,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index 76e7a0e2d4..86d76383ed 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -795,4 +795,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-08a/map.yaml b/mods/ra/maps/soviet-08a/map.yaml index 940e3747ff..ae616f30ff 100644 --- a/mods/ra/maps/soviet-08a/map.yaml +++ b/mods/ra/maps/soviet-08a/map.yaml @@ -1069,4 +1069,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-08b/map.yaml b/mods/ra/maps/soviet-08b/map.yaml index 2c45156fae..6e7dddf394 100644 --- a/mods/ra/maps/soviet-08b/map.yaml +++ b/mods/ra/maps/soviet-08b/map.yaml @@ -891,4 +891,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-09/map.yaml b/mods/ra/maps/soviet-09/map.yaml index b3b3899f11..dbf093e981 100644 --- a/mods/ra/maps/soviet-09/map.yaml +++ b/mods/ra/maps/soviet-09/map.yaml @@ -1497,4 +1497,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-10/map.yaml b/mods/ra/maps/soviet-10/map.yaml index c5eb340d53..f0935975c6 100644 --- a/mods/ra/maps/soviet-10/map.yaml +++ b/mods/ra/maps/soviet-10/map.yaml @@ -1133,4 +1133,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-11a/map.yaml b/mods/ra/maps/soviet-11a/map.yaml index a6f7a4ad56..aef477ddba 100644 --- a/mods/ra/maps/soviet-11a/map.yaml +++ b/mods/ra/maps/soviet-11a/map.yaml @@ -911,4 +911,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-11b/map.yaml b/mods/ra/maps/soviet-11b/map.yaml index 9fce1f3a8d..32534ee43f 100644 --- a/mods/ra/maps/soviet-11b/map.yaml +++ b/mods/ra/maps/soviet-11b/map.yaml @@ -839,4 +839,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-13a/map.yaml b/mods/ra/maps/soviet-13a/map.yaml index 7debbb5f5c..bbd5ae735c 100644 --- a/mods/ra/maps/soviet-13a/map.yaml +++ b/mods/ra/maps/soviet-13a/map.yaml @@ -937,4 +937,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-13b/map.yaml b/mods/ra/maps/soviet-13b/map.yaml index 33f9c31957..7eea34e831 100644 --- a/mods/ra/maps/soviet-13b/map.yaml +++ b/mods/ra/maps/soviet-13b/map.yaml @@ -954,4 +954,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/en.ftl b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/en.ftl deleted file mode 100644 index 698dbfaf74..0000000000 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/en.ftl +++ /dev/null @@ -1,16 +0,0 @@ -## rules.yaml -actor-afac = - .name = Alloy Facility - .generic-name = Alloy Facility - -actor-ccen = - .name = Control Center - .generic-name = Control Center - -actor-hgun-name = Heavy Turret Prototype - -actor-zkoi = - .name = Chitzkoi - .generic-name = Cyborg Dog - -actor-volk-name = Volkov diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml index 8d9773a8da..8cd2a9fc56 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml @@ -1319,4 +1319,4 @@ Weapons: weapons.yaml Notifications: notifications.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl, en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index 599ede9cda..3346075973 100644 --- a/mods/ra/maps/survival01/map.yaml +++ b/mods/ra/maps/survival01/map.yaml @@ -1196,4 +1196,4 @@ Actors: Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml index 6adc331392..bf2383b8eb 100644 --- a/mods/ra/maps/survival02/map.yaml +++ b/mods/ra/maps/survival02/map.yaml @@ -1011,4 +1011,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/maps/top-o-the-world/map.yaml b/mods/ra/maps/top-o-the-world/map.yaml index 9036dd044e..d08140f66a 100644 --- a/mods/ra/maps/top-o-the-world/map.yaml +++ b/mods/ra/maps/top-o-the-world/map.yaml @@ -897,4 +897,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c Weapons: weapons.yaml -Translations: ra|languages/lua/en.ftl, ra|languages/difficulties/en.ftl +Translations: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl diff --git a/mods/ra/rules/campaign-rules.yaml b/mods/ra/rules/campaign-rules.yaml index 6127e1bd93..553e862801 100644 --- a/mods/ra/rules/campaign-rules.yaml +++ b/mods/ra/rules/campaign-rules.yaml @@ -84,7 +84,7 @@ HARV: MONEYCRATE: Tooltip: - Name: actor-moneycrate-name + Name: actor-crate-name GiveCashCrateAction: Amount: 2000 diff --git a/mods/ra/rules/campaign-tooltips.yaml b/mods/ra/rules/campaign-tooltips.yaml index 9ad9886e53..1df85cc985 100644 --- a/mods/ra/rules/campaign-tooltips.yaml +++ b/mods/ra/rules/campaign-tooltips.yaml @@ -86,7 +86,7 @@ FCOM: MISS: Tooltip: - Name: actor-miss-name + Name: actor-technology-center-name -TooltipDescription@ally: -TooltipDescription@other: