From 48a2e5c7a1d14d56d85e0b5fdcdceab929eab79a Mon Sep 17 00:00:00 2001 From: Gustas Date: Wed, 18 Sep 2024 11:41:51 +0300 Subject: [PATCH] Rename TD defense to support --- mods/cnc/chrome.yaml | 6 ++-- mods/cnc/chrome/ingame.yaml | 6 ++-- mods/cnc/hotkeys.yaml | 2 +- mods/cnc/languages/chrome/en.ftl | 2 +- mods/cnc/languages/hotkeys/en.ftl | 2 +- mods/cnc/maps/gdi08a/rules.yaml | 4 +-- mods/cnc/maps/gdi08b/rules.yaml | 4 +-- mods/cnc/maps/nod05/rules.yaml | 2 +- mods/cnc/maps/nod07a/rules.yaml | 4 +-- mods/cnc/maps/nod07b/rules.yaml | 4 +-- mods/cnc/maps/nod08a/rules.yaml | 4 +-- mods/cnc/maps/nod08b/rules.yaml | 4 +-- mods/cnc/maps/nod09/rules.yaml | 6 ++-- mods/cnc/rules/ai.yaml | 6 ++-- mods/cnc/rules/defaults.yaml | 14 ++++----- mods/cnc/rules/structures.yaml | 50 +++++++++++++++---------------- 16 files changed, 60 insertions(+), 60 deletions(-) diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 0cd6a4ca8e..9cb0225e59 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -545,9 +545,9 @@ production-icons: building: 768, 68, 16, 16 building-disabled: 768, 85, 16, 16 building-alert: 768, 102, 16, 16 - defence: 785, 68, 16, 16 - defence-disabled: 785, 85, 16, 16 - defence-alert: 785, 102, 16, 16 + support: 785, 68, 16, 16 + support-disabled: 785, 85, 16, 16 + support-alert: 785, 102, 16, 16 infantry: 802, 68, 16, 16 infantry-disabled: 802, 85, 16, 16 infantry-alert: 802, 102, 16, 16 diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index b3264ab5d0..f5531e8a5e 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -1772,16 +1772,16 @@ Container@PLAYER_WIDGETS: Y: 2 ImageCollection: chrome-button ImageName: separator - ProductionTypeButton@DEFENCE: + ProductionTypeButton@SUPPORT: Logic: AddFactionSuffixLogic X: 39 Width: 38 Height: 26 Background: chrome-button-background - TooltipText: button-production-types-defence-tooltip + TooltipText: button-production-types-support-tooltip TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: BUTTON_TOOLTIP_FACTIONSUFFIX - ProductionGroup: Defence + ProductionGroup: Support Key: ProductionTypeDefense Children: Image@ICON: diff --git a/mods/cnc/hotkeys.yaml b/mods/cnc/hotkeys.yaml index be9b3a6496..48248ddc77 100644 --- a/mods/cnc/hotkeys.yaml +++ b/mods/cnc/hotkeys.yaml @@ -14,7 +14,7 @@ ProductionTypeBuilding: E Contexts: player ProductionTypeDefense: R - Description: hotkey-description-productiontypedefense + Description: hotkey-description-productiontypesupport Types: Production Contexts: player diff --git a/mods/cnc/languages/chrome/en.ftl b/mods/cnc/languages/chrome/en.ftl index d317f6ea08..d2b0140358 100644 --- a/mods/cnc/languages/chrome/en.ftl +++ b/mods/cnc/languages/chrome/en.ftl @@ -330,7 +330,7 @@ button-top-buttons-repair-tooltip = Repair button-top-buttons-beacon-tooltip = Place Beacon button-top-buttons-options-tooltip = Options button-production-types-building-tooltip = Buildings -button-production-types-defence-tooltip = Support +button-production-types-support-tooltip = Support button-production-types-infantry-tooltip = Infantry button-production-types-vehicle-tooltip = Vehicles button-production-types-aircraft-tooltip = Aircraft diff --git a/mods/cnc/languages/hotkeys/en.ftl b/mods/cnc/languages/hotkeys/en.ftl index 733b76a82c..ad600d2756 100644 --- a/mods/cnc/languages/hotkeys/en.ftl +++ b/mods/cnc/languages/hotkeys/en.ftl @@ -2,7 +2,7 @@ hotkey-description-nextproductiontab = Next tab hotkey-description-previousproductiontab = Previous tab hotkey-description-productiontypebuilding = Building Tab -hotkey-description-productiontypedefense = Defense Tab +hotkey-description-productiontypesupport = Support Tab hotkey-description-productiontypeinfantry = Infantry Tab hotkey-description-productiontypevehicle = Vehicle Tab hotkey-description-productiontypeaircraft = Aircraft Tab diff --git a/mods/cnc/maps/gdi08a/rules.yaml b/mods/cnc/maps/gdi08a/rules.yaml index 3d2c9fdf18..a5832642f1 100644 --- a/mods/cnc/maps/gdi08a/rules.yaml +++ b/mods/cnc/maps/gdi08a/rules.yaml @@ -117,11 +117,11 @@ GTWR: SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod GUN: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod C3: Tooltip: diff --git a/mods/cnc/maps/gdi08b/rules.yaml b/mods/cnc/maps/gdi08b/rules.yaml index 292038d348..1ee568cf5e 100644 --- a/mods/cnc/maps/gdi08b/rules.yaml +++ b/mods/cnc/maps/gdi08b/rules.yaml @@ -153,11 +153,11 @@ CYCL: SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod GUN: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod airstrike.proxy: AirstrikePower: diff --git a/mods/cnc/maps/nod05/rules.yaml b/mods/cnc/maps/nod05/rules.yaml index b955aa593a..8168436914 100644 --- a/mods/cnc/maps/nod05/rules.yaml +++ b/mods/cnc/maps/nod05/rules.yaml @@ -124,7 +124,7 @@ MSAM: SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod HQ: AirstrikePower: diff --git a/mods/cnc/maps/nod07a/rules.yaml b/mods/cnc/maps/nod07a/rules.yaml index a3e51c3196..506415996a 100644 --- a/mods/cnc/maps/nod07a/rules.yaml +++ b/mods/cnc/maps/nod07a/rules.yaml @@ -120,11 +120,11 @@ FIX: SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod GTWR: Buildable: - Queue: Defence.GDI + Queue: Support.GDI Armament: Weapon: HighV.in diff --git a/mods/cnc/maps/nod07b/rules.yaml b/mods/cnc/maps/nod07b/rules.yaml index 5c5bfa3b82..b1e81282c7 100644 --- a/mods/cnc/maps/nod07b/rules.yaml +++ b/mods/cnc/maps/nod07b/rules.yaml @@ -116,11 +116,11 @@ FIX: SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod GTWR: Buildable: - Queue: Defence.GDI + Queue: Support.GDI HQ: AirstrikePower: diff --git a/mods/cnc/maps/nod08a/rules.yaml b/mods/cnc/maps/nod08a/rules.yaml index 42229a3a88..21da6a39a8 100644 --- a/mods/cnc/maps/nod08a/rules.yaml +++ b/mods/cnc/maps/nod08a/rules.yaml @@ -117,11 +117,11 @@ HELI: SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod GTWR: Buildable: - Queue: Defence.GDI + Queue: Support.GDI A10.IN: Inherits: A10 diff --git a/mods/cnc/maps/nod08b/rules.yaml b/mods/cnc/maps/nod08b/rules.yaml index 863caa3498..cb7d78201b 100644 --- a/mods/cnc/maps/nod08b/rules.yaml +++ b/mods/cnc/maps/nod08b/rules.yaml @@ -139,11 +139,11 @@ HELI: SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod GTWR: Buildable: - Queue: Defence.GDI + Queue: Support.GDI A10.IN: Inherits: A10 diff --git a/mods/cnc/maps/nod09/rules.yaml b/mods/cnc/maps/nod09/rules.yaml index 694d3b2094..8932dc8696 100644 --- a/mods/cnc/maps/nod09/rules.yaml +++ b/mods/cnc/maps/nod09/rules.yaml @@ -66,7 +66,7 @@ EYE: GUN: Buildable: - Queue: Defence.Nod + Queue: Support.Nod OBLI: Buildable: @@ -118,11 +118,11 @@ STNK: GTWR: Buildable: - Queue: Defence.GDI + Queue: Support.GDI SBAG: Buildable: - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod HQ: AirstrikePower: diff --git a/mods/cnc/rules/ai.yaml b/mods/cnc/rules/ai.yaml index a2aa944617..7d658def3c 100644 --- a/mods/cnc/rules/ai.yaml +++ b/mods/cnc/rules/ai.yaml @@ -85,7 +85,7 @@ Player: BaseBuilderBotModule@cabal: RequiresCondition: enable-cabal-ai BuildingQueues: Building.Nod, Building.GDI - DefenseQueues: Defence.Nod, Defence.GDI + DefenseQueues: Support.Nod, Support.GDI MinimumExcessPower: 30 MaximumExcessPower: 150 ExcessPowerIncrement: 30 @@ -129,7 +129,7 @@ Player: BaseBuilderBotModule@watson: RequiresCondition: enable-watson-ai BuildingQueues: Building.Nod, Building.GDI - DefenseQueues: Defence.Nod, Defence.GDI + DefenseQueues: Support.Nod, Support.GDI MinimumExcessPower: 30 MaximumExcessPower: 150 ExcessPowerIncrement: 30 @@ -173,7 +173,7 @@ Player: BaseBuilderBotModule@hal9001: RequiresCondition: enable-hal9001-ai BuildingQueues: Building.Nod, Building.GDI - DefenseQueues: Defence.Nod, Defence.GDI + DefenseQueues: Support.Nod, Support.GDI MinimumExcessPower: 30 MaximumExcessPower: 210 ExcessPowerIncrement: 30 diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 8b2791a63a..09adff769d 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -145,11 +145,11 @@ AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: RequiresCondition: !stance-attackanything - ValidTargets: Infantry, Vehicle, Creep, Water, Defense + ValidTargets: Infantry, Vehicle, Creep, Water, Support InvalidTargets: NoAutoTarget AutoTargetPriority@ATTACKANYTHING: RequiresCondition: stance-attackanything - ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense + ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Support InvalidTargets: NoAutoTarget ^AutoTargetGroundAssaultMove: @@ -172,11 +172,11 @@ AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: RequiresCondition: !stance-attackanything - ValidTargets: Infantry, Vehicle, Creep, Water, Air, Defense + ValidTargets: Infantry, Vehicle, Creep, Water, Air, Support InvalidTargets: NoAutoTarget AutoTargetPriority@ATTACKANYTHING: RequiresCondition: stance-attackanything - ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense + ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Support InvalidTargets: NoAutoTarget ^AutoTargetAllAssaultMove: @@ -1160,7 +1160,7 @@ MapEditorData: Categories: System -^Defense: +^Support: Inherits: ^BaseBuilding Inherits@selection: ^SelectableCombatBuilding RenderRangeCircle: @@ -1169,9 +1169,9 @@ MustBeDestroyed: RequiredForShortGame: false Targetable: - TargetTypes: Ground, C4, Structure, Defense + TargetTypes: Ground, C4, Structure, Support MapEditorData: - Categories: Defense + Categories: Support -CommandBarBlacklist: -AcceptsDeliveredCash: diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 976740059a..2039d3d4a5 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -22,7 +22,7 @@ FACT: RevealsShroud: Range: 10c0 Production: - Produces: Building.GDI, Building.Nod, Defence.GDI, Defence.Nod + Produces: Building.GDI, Building.Nod, Support.GDI, Support.Nod Transforms: RequiresCondition: factundeploy PauseOnCondition: being-demolished || build-incomplete @@ -76,11 +76,11 @@ FACT: QueuedAudio: Building OnHoldAudio: OnHold CancelledAudio: Cancelled - ProductionQueue@GDIDefense: - Type: Defence.GDI + ProductionQueue@GDISupport: + Type: Support.GDI DisplayOrder: 1 Factions: gdi - Group: Defence + Group: Support LowPowerModifier: 150 ReadyAudio: ConstructionComplete ReadyTextNotification: notification-construction-complete @@ -91,11 +91,11 @@ FACT: QueuedAudio: Building OnHoldAudio: OnHold CancelledAudio: Cancelled - ProductionQueue@NodDefense: - Type: Defence.Nod + ProductionQueue@NodSupport: + Type: Support.Nod DisplayOrder: 1 Factions: nod - Group: Defence + Group: Support LowPowerModifier: 150 ReadyAudio: ConstructionComplete ReadyTextNotification: notification-construction-complete @@ -111,11 +111,11 @@ FACT: ProductionType: Building.GDI ProductionBar@BuildingNod: ProductionType: Building.Nod - ProductionBar@DefenceGDI: - ProductionType: Defence.GDI + ProductionBar@SupportGDI: + ProductionType: Support.GDI Color: 8A8A8A - ProductionBar@DefenceNod: - ProductionType: Defence.Nod + ProductionBar@SupportNod: + ProductionType: Support.Nod Color: 8A8A8A BaseProvider: Range: 14c0 @@ -294,7 +294,7 @@ SILO: Buildable: BuildPaletteOrder: 35 Prerequisites: proc - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod Description: actor-silo.description Building: Footprint: xx @@ -948,7 +948,7 @@ TMPL: ProvidesPrerequisite@buildingname: GUN: - Inherits: ^Defense + Inherits: ^Support Inherits@AUTOTARGET: ^AutoTargetGround Selectable: Bounds: 1024, 1024 @@ -959,7 +959,7 @@ GUN: Buildable: BuildPaletteOrder: 45 Prerequisites: barracks - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod BuildDuration: 960 Description: actor-gun.description Building: @@ -1001,7 +1001,7 @@ GUN: ClassicFacingBodyOrientation: SAM: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisabledOverlay Inherits@AUTOTARGET: ^AutoTargetAir Inherits@shape: ^2x1Shape @@ -1018,7 +1018,7 @@ SAM: Buildable: BuildPaletteOrder: 50 Prerequisites: hand - Queue: Defence.Nod + Queue: Support.Nod BuildDuration: 1130 Description: actor-sam.description Building: @@ -1058,7 +1058,7 @@ SAM: SequenceAlpha: 0.65 OBLI: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisabledOverlay Inherits@AUTOTARGET: ^AutoTargetGround Valued: @@ -1068,7 +1068,7 @@ OBLI: Buildable: BuildPaletteOrder: 60 Prerequisites: tmpl, ~techlevel.high - Queue: Defence.Nod + Queue: Support.Nod BuildDuration: 2080 Description: actor-obli.description Selectable: @@ -1108,7 +1108,7 @@ OBLI: Amount: -90 GTWR: - Inherits: ^Defense + Inherits: ^Support Inherits@AUTOTARGET: ^AutoTargetGround Selectable: Bounds: 1024, 1024 @@ -1119,7 +1119,7 @@ GTWR: Buildable: BuildPaletteOrder: 40 Prerequisites: barracks - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod BuildDuration: 960 Description: actor-gtwr.description Building: @@ -1152,7 +1152,7 @@ GTWR: Amount: -10 ATWR: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisabledOverlay Inherits@AUTOTARGET: ^AutoTargetAll Valued: @@ -1162,7 +1162,7 @@ ATWR: Buildable: BuildPaletteOrder: 60 Prerequisites: anyhq, ~techlevel.medium - Queue: Defence.GDI + Queue: Support.GDI BuildDuration: 1920 Description: actor-atwr.description Selectable: @@ -1216,7 +1216,7 @@ SBAG: Buildable: BuildPaletteOrder: 20 Prerequisites: fact - Queue: Defence.GDI + Queue: Support.GDI Description: actor-sbag.description Encyclopedia: Description: actor-sbag.encyclopedia @@ -1242,7 +1242,7 @@ CYCL: Buildable: BuildPaletteOrder: 20 Prerequisites: fact - Queue: Defence.Nod + Queue: Support.Nod Description: actor-cycl.description Encyclopedia: Description: actor-cycl.encyclopedia @@ -1268,7 +1268,7 @@ BRIK: Buildable: BuildPaletteOrder: 30 Prerequisites: vehicleproduction - Queue: Defence.GDI, Defence.Nod + Queue: Support.GDI, Support.Nod BuildDuration: 230 Description: actor-brik.description Encyclopedia: