diff --git a/mods/ts/chrome.yaml b/mods/ts/chrome.yaml index 378e028852..82d7c6cd7b 100644 --- a/mods/ts/chrome.yaml +++ b/mods/ts/chrome.yaml @@ -21,9 +21,9 @@ production-icons: building: 0, 68, 16, 16 building-disabled: 0, 85, 16, 16 building-alert: 0, 102, 16, 16 - defense: 17, 68, 16, 16 - defense-disabled: 17, 85, 16, 16 - defense-alert: 17, 102, 16, 16 + support: 17, 68, 16, 16 + support-disabled: 17, 85, 16, 16 + support-alert: 17, 102, 16, 16 infantry: 34, 68, 16, 16 infantry-disabled: 34, 85, 16, 16 infantry-alert: 34, 102, 16, 16 diff --git a/mods/ts/chrome/ingame-player.yaml b/mods/ts/chrome/ingame-player.yaml index 9bc33ad8db..0398590dc7 100644 --- a/mods/ts/chrome/ingame-player.yaml +++ b/mods/ts/chrome/ingame-player.yaml @@ -529,7 +529,7 @@ Container@PLAYER_WIDGETS: X: 7 Y: 7 ImageCollection: production-icons - ProductionTypeButton@DEFENSE: + ProductionTypeButton@SUPPORT: Logic: AddFactionSuffixLogic X: 72 Y: 1 @@ -537,9 +537,9 @@ Container@PLAYER_WIDGETS: Height: 31 VisualHeight: 0 Background: sidebar-button - TooltipText: button-production-types-defense-tooltip + TooltipText: button-production-types-support-tooltip TooltipContainer: TOOLTIP_CONTAINER - ProductionGroup: Defense + ProductionGroup: Support Key: ProductionTypeDefense Children: Image@ICON: diff --git a/mods/ts/hotkeys.yaml b/mods/ts/hotkeys.yaml index bac63d3109..e2b740af39 100644 --- a/mods/ts/hotkeys.yaml +++ b/mods/ts/hotkeys.yaml @@ -4,7 +4,7 @@ ProductionTypeBuilding: E Contexts: player ProductionTypeDefense: R - Description: hotkey-description-productiontypedefense + Description: hotkey-description-productiontypesupport Types: Production Contexts: player diff --git a/mods/ts/languages/chrome/en.ftl b/mods/ts/languages/chrome/en.ftl index 77ade91bec..81c1619d92 100644 --- a/mods/ts/languages/chrome/en.ftl +++ b/mods/ts/languages/chrome/en.ftl @@ -176,7 +176,7 @@ productionpalette-sidebar-production-palette = .hold = ON HOLD button-production-types-building-tooltip = Buildings -button-production-types-defense-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/ts/languages/hotkeys/en.ftl b/mods/ts/languages/hotkeys/en.ftl index 562ee766ca..aa79b5fb4b 100644 --- a/mods/ts/languages/hotkeys/en.ftl +++ b/mods/ts/languages/hotkeys/en.ftl @@ -1,6 +1,6 @@ ## hotkeys.yaml 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/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index 914552f568..00ac8cbb9e 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -1435,7 +1435,7 @@ GAOLDCC6: GASAND: Inherits: ^Wall Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 1000 Prerequisites: ~disabled Description: actor-gasand.description diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 467b3687de..d9b1a7bc83 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -143,11 +143,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, Building, Defense + ValidTargets: Infantry, Vehicle, Creep, Water, Building, Support InvalidTargets: NoAutoTarget ^AutoTargetGroundAssaultMove: @@ -170,11 +170,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, Building, Defense + ValidTargets: Infantry, Vehicle, Creep, Water, Air, Building, Support InvalidTargets: NoAutoTarget ^AutoTargetAllAssaultMove: @@ -1154,7 +1154,7 @@ Tooltip: Name: meta-palette-name -^Defense: +^Support: Inherits: ^Building Inherits@selection: ^SelectableCombatBuilding -GivesBuildableArea: @@ -1165,11 +1165,11 @@ DetectCloaked: Range: 5c0 Targetable: - TargetTypes: Ground, Building, C4, Defense + TargetTypes: Ground, Building, C4, Support -Capturable: RevealOnFire: MapEditorData: - Categories: Defense + Categories: Support -CommandBarBlacklist: ^Train: diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index 2f0c2f9199..e5e76916e3 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -1,7 +1,7 @@ GAWALL: Inherits: ^Wall Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 10 Prerequisites: ~structures.gdi, ~techlevel.low Description: actor-gawall.description @@ -22,7 +22,7 @@ GAWALL: GAGATE_A: Inherits: ^Gate_A Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 30 Prerequisites: gapile, ~structures.gdi, ~techlevel.low Tooltip: @@ -33,7 +33,7 @@ GAGATE_A: GAGATE_B: Inherits: ^Gate_B Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 50 Prerequisites: gapile, ~structures.gdi, ~techlevel.low Tooltip: @@ -42,7 +42,7 @@ GAGATE_B: ReplaceableTypes: GDIGate GACTWR: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisableOnPowerDown Inherits@AUTOTARGET: ^AutoTargetAll WithMakeAnimation: @@ -58,7 +58,7 @@ GACTWR: Tooltip: Name: actor-gactwr.name Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 70 Prerequisites: gapile, ~structures.gdi, ~techlevel.low Description: actor-gactwr.description @@ -164,7 +164,7 @@ GAVULC: Tooltip: Name: actor-gavulc.name Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 80 Prerequisites: gactwr.socket, gapile, ~structures.gdi, ~techlevel.low Description: actor-gavulc.description @@ -180,7 +180,7 @@ GAROCK: Tooltip: Name: actor-garock.name Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 90 Prerequisites: gactwr.socket, gapile, ~structures.gdi, ~techlevel.high Description: actor-garock.description @@ -196,7 +196,7 @@ GACSAM: Tooltip: Name: actor-gacsam.name Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 100 Prerequisites: gactwr.socket, garadr, ~structures.gdi, ~techlevel.medium Description: actor-gacsam.description diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index d37604b9f9..1a7051ffc7 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -1,7 +1,7 @@ NAWALL: Inherits: ^Wall Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 20 Prerequisites: ~structures.nod, ~techlevel.low Description: actor-nawall.description @@ -22,7 +22,7 @@ NAWALL: NAGATE_A: Inherits: ^Gate_A Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 40 Prerequisites: nahand, ~structures.nod, ~techlevel.low Tooltip: @@ -33,7 +33,7 @@ NAGATE_A: NAGATE_B: Inherits: ^Gate_B Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 60 Prerequisites: nahand, ~structures.nod, ~techlevel.low Tooltip: @@ -45,7 +45,7 @@ NAPOST: Inherits: ^Building Inherits@IDISABLED: ^DisableOnLowPowerOrPowerDown Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 150 Prerequisites: naapwr, ~structures.nod Description: actor-napost.description @@ -168,7 +168,7 @@ NAFNCE: Bounds: 1448, 1448 NALASR: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisableOnPowerDown Inherits@AUTOTARGET: ^AutoTargetGround Valued: @@ -176,7 +176,7 @@ NALASR: Tooltip: Name: actor-nalasr.name Buildable: - Queue: Defense + Queue: Support Prerequisites: nahand, ~structures.nod, ~techlevel.low BuildPaletteOrder: 90 Description: actor-nalasr.description @@ -207,7 +207,7 @@ NALASR: QuantizedFacings: 0 NAOBEL: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown Inherits@AUTOTARGET: ^AutoTargetGround Inherits@SHAPE: ^2x2Shape @@ -216,7 +216,7 @@ NAOBEL: Tooltip: Name: actor-naobel.name Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 160 Prerequisites: natech, ~structures.nod, ~techlevel.high Description: actor-naobel.description @@ -251,7 +251,7 @@ NAOBEL: Amount: -150 NASAM: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown Inherits@AUTOTARGET: ^AutoTargetAir Valued: @@ -259,7 +259,7 @@ NASAM: Tooltip: Name: actor-nasam.name Buildable: - Queue: Defense + Queue: Support Prerequisites: naradr, ~structures.nod, ~techlevel.medium BuildPaletteOrder: 100 Description: actor-nasam.description diff --git a/mods/ts/rules/player.yaml b/mods/ts/rules/player.yaml index 915d0ecd0d..3a392a1ac0 100644 --- a/mods/ts/rules/player.yaml +++ b/mods/ts/rules/player.yaml @@ -27,8 +27,8 @@ Player: OnHoldAudio: OnHold CancelledAudio: Cancelled SpeedUp: True - ClassicProductionQueue@Defense: - Type: Defense + ClassicProductionQueue@Support: + Type: Support DisplayOrder: 1 BuildDurationModifier: 120 LowPowerModifier: 300 diff --git a/mods/ts/rules/shared-structures.yaml b/mods/ts/rules/shared-structures.yaml index bacd5cabaf..5207e05def 100644 --- a/mods/ts/rules/shared-structures.yaml +++ b/mods/ts/rules/shared-structures.yaml @@ -18,7 +18,7 @@ GACNST: Range: 5c0 MaxHeightDelta: 3 Production: - Produces: Building,Defense + Produces: Building,Support PauseOnCondition: empdisable Valued: Cost: 2500 @@ -60,8 +60,8 @@ GACNST: Prerequisites: global-factundeploy ProductionBar@Building: ProductionType: Building - ProductionBar@Defense: - ProductionType: Defense + ProductionBar@Support: + ProductionType: Support WithIdleOverlay@TOP: RequiresCondition: !build-incomplete Sequence: idle-top diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index 2d254fd486..615217a625 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -1,5 +1,5 @@ NAPULS: - Inherits: ^Defense + Inherits: ^Support Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown Inherits@SHAPE: ^2x2Shape Valued: @@ -7,7 +7,7 @@ NAPULS: Tooltip: Name: actor-napuls.name Buildable: - Queue: Defense + Queue: Support BuildPaletteOrder: 110 Prerequisites: radar, ~techlevel.superweapons Description: actor-napuls.description diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index 789eebd526..596e13f4d1 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -62,11 +62,11 @@ SuicideBomb: TargetActorCenter: true Report: hunter2.aud Projectile: InstantHit - ValidTargets: Vehicle, Building, Defense, Infantry + ValidTargets: Vehicle, Building, Support, Infantry Warhead@1Dam: TargetDamage Damage: 1000000 DamageTypes: FireDeath - ValidTargets: Vehicle, Building, Defense, Infantry + ValidTargets: Vehicle, Building, Support, Infantry IonCannon: ValidTargets: Ground, Water, Air, Trees