Skip to content

Commit

Permalink
Lint error fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
MustaphaTR committed Jan 16, 2025
1 parent eb158c2 commit 3674acd
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 112 deletions.
114 changes: 67 additions & 47 deletions mods/mtrsd2k2/chrome/ingame-observer.yaml

Large diffs are not rendered by default.

110 changes: 48 additions & 62 deletions mods/mtrsd2k2/chrome/ingame-player.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@ Container@PLAYER_WIDGETS:
IconSize: 60, 48
IconSpriteOffset: -1, -1
TooltipContainer: TOOLTIP_CONTAINER
ReadyText: READY
HoldText: ON HOLD
ReadyText: supportpowers-support-powers-palette.ready
HoldText: supportpowers-support-powers-palette.hold
HotkeyPrefix: SupportPower
HotkeyCount: 6
Image@COMMAND_BAR_BACKGROUND:
X: 0
Y: WINDOW_HEIGHT - HEIGHT
Width: 416
Width: 451
Height: 43
ImageCollection: commandbar
ImageName: background
ClickThrough: False
Container@COMMAND_BAR:
Logic: CommandBarLogic
X: 24
Expand All @@ -47,8 +48,8 @@ Container@PLAYER_WIDGETS:
Background: command-button
Key: AttackMove
DisableKeySound: true
TooltipText: Attack Move
TooltipDesc: Selected units will move to the desired location\nand attack any enemies they encounter en route.\n\nHold {(Ctrl)} while targeting to order an Assault Move\nthat attacks any units or structures encountered en route.\n\nLeft-click icon then right-click on target location.
TooltipText: button-command-bar-attack-move.tooltip
TooltipDesc: button-command-bar-attack-move.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
Children:
Expand All @@ -64,8 +65,8 @@ Container@PLAYER_WIDGETS:
VisualHeight: 0
Background: command-button
DisableKeySound: true
TooltipText: Force Move
TooltipDesc: Selected units will move to the desired location\n - Default activity for the target is suppressed\n - Vehicles will attempt to crush enemies at the target location\n - Deployed thumpers will undeploy and move to the target location\n\nLeft-click icon then right-click on target.\nHold {(Alt)} to activate temporarily while commanding units.
TooltipText: button-command-bar-force-move.tooltip
TooltipDesc: button-command-bar-force-move.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
Children:
Expand All @@ -81,8 +82,8 @@ Container@PLAYER_WIDGETS:
VisualHeight: 0
Background: command-button
DisableKeySound: true
TooltipText: Force Attack
TooltipDesc: Selected units will attack the targeted unit or location\n - Default activity for the target is suppressed\n - Allows targeting of own or ally forces\n\nLeft-click icon then right-click on target.\nHold {(Ctrl)} to activate temporarily while commanding units.
TooltipText: button-command-bar-force-attack.tooltip
TooltipDesc: button-command-bar-force-attack.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
Children:
Expand All @@ -99,8 +100,8 @@ Container@PLAYER_WIDGETS:
Background: command-button
Key: Guard
DisableKeySound: true
TooltipText: Guard
TooltipDesc: Selected units will follow the targeted unit.\n\nLeft-click icon then right-click on target unit.
TooltipText: button-command-bar-guard.tooltip
TooltipDesc: button-command-bar-guard.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -117,8 +118,8 @@ Container@PLAYER_WIDGETS:
Key: Deploy
DisableKeyRepeat: true
DisableKeySound: true
TooltipText: Deploy
TooltipDesc: Selected units will perform their default deploy activity\n - MCVs will unpack into a Construction Yard\n - Thumpers will start or stop attracting worms\n - Devastators will become immobilized and explode\n\nActs immediately on selected units.
TooltipText: button-command-bar-deploy.tooltip
TooltipDesc: button-command-bar-deploy.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -135,8 +136,8 @@ Container@PLAYER_WIDGETS:
Key: Scatter
DisableKeyRepeat: true
DisableKeySound: true
TooltipText: Scatter
TooltipDesc: Selected units will stop their current activity\nand move to a nearby location.\n\nActs immediately on selected units.
TooltipText: button-command-bar-scatter.tooltip
TooltipDesc: button-command-bar-scatter.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -153,8 +154,8 @@ Container@PLAYER_WIDGETS:
Key: Stop
DisableKeyRepeat: true
DisableKeySound: true
TooltipText: Stop
TooltipDesc: Selected units will stop their current activity.\nSelected buildings will reset their rally point.\n\nActs immediately on selected targets.
TooltipText: button-command-bar-stop.tooltip
TooltipDesc: button-command-bar-stop.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -169,8 +170,8 @@ Container@PLAYER_WIDGETS:
VisualHeight: 0
Background: command-button
DisableKeySound: true
TooltipText: Waypoint Mode
TooltipDesc: Use Waypoint Mode to give multiple linking commands\nto the selected units. Units will execute the commands\nimmediately upon receiving them.\n\nLeft-click icon then give commands in the game world.\nHold {(Shift)} to activate temporarily while commanding units.
TooltipText: button-command-bar-queue-orders.tooltip
TooltipDesc: button-command-bar-queue-orders.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
Children:
Expand All @@ -194,8 +195,8 @@ Container@PLAYER_WIDGETS:
Key: StanceAttackAnything
DisableKeyRepeat: true
DisableKeySound: true
TooltipText: Attack Anything Stance
TooltipDesc: Set the selected units to Attack Anything stance:\n - Units will attack enemy units and structures on sight\n - Units will pursue attackers across the battlefield
TooltipText: button-stance-bar-attackanything.tooltip
TooltipDesc: button-stance-bar-attackanything.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -212,8 +213,8 @@ Container@PLAYER_WIDGETS:
Key: StanceDefend
DisableKeyRepeat: true
DisableKeySound: true
TooltipText: Defend Stance
TooltipDesc: Set the selected units to Defend stance:\n - Units will attack enemy units on sight\n - Units will not move or pursue enemies
TooltipText: button-stance-bar-defend.tooltip
TooltipDesc: button-stance-bar-defend.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -230,8 +231,8 @@ Container@PLAYER_WIDGETS:
Key: StanceReturnFire
DisableKeyRepeat: true
DisableKeySound: true
TooltipText: Return Fire Stance
TooltipDesc: Set the selected units to Return Fire stance:\n - Units will retaliate against enemies that attack them\n - Units will not move or pursue enemies
TooltipText: button-stance-bar-returnfire.tooltip
TooltipDesc: button-stance-bar-returnfire.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -248,8 +249,8 @@ Container@PLAYER_WIDGETS:
Key: StanceHoldFire
DisableKeyRepeat: true
DisableKeySound: true
TooltipText: Hold Fire Stance
TooltipDesc: Set the selected units to Hold Fire stance:\n - Units will not fire upon enemies\n - Units will not move or pursue enemies
TooltipText: button-stance-bar-holdfire.tooltip
TooltipDesc: button-stance-bar-holdfire.tooltipdesc
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -275,7 +276,7 @@ Container@PLAYER_WIDGETS:
Width: PARENT_WIDTH - 30
Height: 25
Align: Right
Text: Audio Muted
Text: label-mute-indicator
Contrast: true
Image@SIDEBAR_BACKGROUND_TOP:
X: WINDOW_WIDTH - 226
Expand All @@ -298,7 +299,7 @@ Container@PLAYER_WIDGETS:
Height: 35
Background:
Key: Repair
TooltipText: Repair
TooltipText: button-top-buttons-repair-tooltip
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Expand All @@ -313,7 +314,7 @@ Container@PLAYER_WIDGETS:
Height: 35
Background:
Key: Sell
TooltipText: Sell
TooltipText: button-top-buttons-sell-tooltip
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Expand All @@ -328,7 +329,7 @@ Container@PLAYER_WIDGETS:
Height: 35
Background:
Key: PlaceBeacon
TooltipText: Place Beacon
TooltipText: button-top-buttons-beacon-tooltip
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Expand All @@ -343,7 +344,7 @@ Container@PLAYER_WIDGETS:
Height: 35
Background:
Key: PowerDown
TooltipText: Power Down
TooltipText: button-top-buttons-power-tooltip
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Expand All @@ -358,7 +359,7 @@ Container@PLAYER_WIDGETS:
Width: 40
Height: 38
Background:
TooltipText: Options
TooltipText: button-top-buttons-options-tooltip
TooltipContainer: TOOLTIP_CONTAINER
DisableWorldSounds: true
VisualHeight: 0
Expand Down Expand Up @@ -446,7 +447,6 @@ Container@PLAYER_WIDGETS:
Width: 50
Height: 22
Font: Bold
Text: {0}
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
LabelWithTooltip@POWER:
Expand All @@ -457,7 +457,6 @@ Container@PLAYER_WIDGETS:
Height: 22
Align: Right
Font: Bold
Text: {0}
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
Children:
Expand Down Expand Up @@ -492,8 +491,8 @@ Container@PLAYER_WIDGETS:
X: 39
Y: 1
TooltipContainer: TOOLTIP_CONTAINER
ReadyText: READY
HoldText: ON HOLD
ReadyText: productionpalette-sidebar-production-palette.ready
HoldText: productionpalette-sidebar-production-palette.hold
IconSize: 58, 48
IconMargin: 2, 0
IconSpriteOffset: 0, 0
Expand All @@ -515,7 +514,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Buildings
TooltipText: button-production-types-building-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Building
Key: ProductionTypeBuilding
Expand All @@ -530,7 +529,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Support
TooltipText: button-production-types-support-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Defense
Key: ProductionTypeDefense
Expand All @@ -545,7 +544,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Infantry
TooltipText: button-production-types-infantry-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Infantry
Key: ProductionTypeInfantry
Expand All @@ -560,7 +559,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Light Vehicles
TooltipText: button-production-types-vehicle-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Vehicle
Key: ProductionTypeVehicle
Expand All @@ -575,7 +574,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Heavy Vehicles
TooltipText: button-production-types-tanks-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Armor
Key: ProductionTypeTank
Expand All @@ -590,7 +589,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Aircraft
TooltipText: button-production-types-aircraft-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Aircraft
Key: ProductionTypeAircraft
Expand All @@ -605,7 +604,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Scroll up
TooltipText: button-production-types-scroll-up-tooltip
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -619,7 +618,7 @@ Container@PLAYER_WIDGETS:
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Scroll down
TooltipText: button-production-types-scroll-down-tooltip
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand All @@ -633,7 +632,7 @@ Container@PLAYER_WIDGETS:
Height: 16
VisualHeight: 0
Background: sidebar-button
TooltipText: Starport
TooltipText: button-production-types-starport-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Starport
Key: ProductionTypeMerchant
Expand All @@ -646,28 +645,15 @@ Container@PLAYER_WIDGETS:
Height: 16
VisualHeight: 0
Background: sidebar-button
TooltipText: Upgrades
TooltipText: button-production-types-upgrade-tooltip
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Upgrade
Key: ProductionTypeUpgrade
Children:
Image@ICON:
ImageCollection: production-icons
Container@HPF_OVERLAY:
Logic: HierarchicalPathFinderOverlayLogic
Container@HPF_ROOT:
Logic: LoadIngameHierarchicalPathFinderOverlayLogic
X: WINDOW_WIDTH - WIDTH - 231
Y: 40
Width: 175
Height: 60
Children:
DropDownButton@HPF_OVERLAY_LOCOMOTOR:
Width: PARENT_WIDTH
Height: 25
Text: Select Locomotor
Font: Regular
DropDownButton@HPF_OVERLAY_CHECK:
Y: 0 + 35
Width: PARENT_WIDTH
Height: 25
Text: Select BlockedByActor
Font: Regular
11 changes: 11 additions & 0 deletions mods/mtrsd2k2/fluent/chrome.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## ingame-player.yaml
button-command-bar-deploy =
.tooltip = Deploy
.tooltipdesc = Selected units will perform their default deploy activity
- MCVs will unpack into a Construction Yard
- Thumpers will start or stop attracting worms
- Quake Tanks and Bomb Buggies will self-destruct
Acts immediately on selected units.
button-production-types-support-tooltip = Support
5 changes: 4 additions & 1 deletion mods/mtrsd2k2/mod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Sequences:
mtrsd2k2|sequences/infantry.yaml
mtrsd2k2|sequences/structures.yaml
mtrsd2k2|sequences/misc.yaml
mtrsd2k2|sequences/arrakis.yaml

TileSets:
mtrsd2k2|tilesets/arrakis.yaml
Expand Down Expand Up @@ -97,6 +98,7 @@ ChromeLayout:
mtrsd2k2|chrome/ingame-player.yaml
common|chrome/ingame-perf.yaml
common|chrome/ingame-debug.yaml
common|chrome/ingame-debug-hpf.yaml
common|chrome/ingame-debuginfo.yaml
common|chrome/ingame-infochat.yaml
d2k|chrome/mainmenu.yaml
Expand Down Expand Up @@ -144,8 +146,9 @@ FluentMessages:
d2k|fluent/chrome.ftl
d2k|fluent/hotkeys.ftl
d2k|fluent/rules.ftl
mtrsd2k2|fluent/mtrsd2k2.ftl
mtrsd2k2|fluent/chrome.ftl
mtrsd2k2|fluent/hotkeys.ftl
mtrsd2k2|fluent/mtrsd2k2.ftl
mtrsd2k2|fluent/rules.ftl

AllowUnusedFluentMessagesInExternalPackages: true
Expand Down
2 changes: 1 addition & 1 deletion mods/mtrsd2k2/rules/aircraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ ornithopter:
AmmoPool:
Ammo: 5
Tooltip:
Name: actor-ornithopter-name
Name: actor-ornithopter.name
SpawnActorOnDeath:
Actor: ornithopter.husk
RejectsOrders:
Expand Down
Loading

0 comments on commit 3674acd

Please sign in to comment.