epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make remove from control group hotkey available only to players

Browse Source
This commit is contained in:
Ivaylo Draganov
2022-02-04 20:12:40 +02:00
committed by Smittytron
parent c096934db8
commit f5ab9d95fe
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/Hotkeys/RemoveFromControlGroupHotkeyLogic.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic.Ingame
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public RemoveFromControlGroupHotkeyLogic(Widget widget, ModData modData, World world, Dictionary<string, MiniYaml> logicArgs) public RemoveFromControlGroupHotkeyLogic(Widget widget, ModData modData, World world, Dictionary<string, MiniYaml> logicArgs)
: base(widget, modData, "RemoveFromControlGroupKey", "WORLD_KEYHANDLER", logicArgs) : base(widget, modData, "RemoveFromControlGroupKey", "PLAYER_KEYHANDLER", logicArgs)
{ {
selection = world.Selection; selection = world.Selection;
this.world = world; this.world = world;

6
mods/cnc/chrome/ingame.yaml
View File

@@ -10,8 +10,7 @@ Container@INGAME_ROOT:
TakeScreenshotKey: TakeScreenshot TakeScreenshotKey: TakeScreenshot
MuteAudioKey: ToggleMute MuteAudioKey: ToggleMute
LogicKeyListener@WORLD_KEYHANDLER: LogicKeyListener@WORLD_KEYHANDLER:
Logic: CycleBasesHotkeyLogic, CycleProductionActorsHotkeyLogic, CycleHarvestersHotkeyLogic, JumpToLastEventHotkeyLogic, JumpToSelectedActorsHotkeyLogic, ResetZoomHotkeyLogic, TogglePlayerStanceColorHotkeyLogic, CycleStatusBarsHotkeyLogic, PauseHotkeyLogic, RemoveFromControlGroupHotkeyLogic, SelectUnitsByTypeHotkeyLogic, SelectAllUnitsHotkeyLogic Logic: CycleBasesHotkeyLogic, CycleProductionActorsHotkeyLogic, CycleHarvestersHotkeyLogic, JumpToLastEventHotkeyLogic, JumpToSelectedActorsHotkeyLogic, ResetZoomHotkeyLogic, TogglePlayerStanceColorHotkeyLogic, CycleStatusBarsHotkeyLogic, PauseHotkeyLogic, SelectUnitsByTypeHotkeyLogic, SelectAllUnitsHotkeyLogic
RemoveFromControlGroupKey: RemoveFromControlGroup
CycleBasesKey: CycleBase CycleBasesKey: CycleBase
CycleProductionActorsKey: CycleProductionBuildings CycleProductionActorsKey: CycleProductionBuildings
CycleHarvestersKey: CycleHarvesters CycleHarvestersKey: CycleHarvesters
@@ -1162,6 +1161,9 @@ Container@PLAYER_WIDGETS:
BookmarkSaveKeyPrefix: MapBookmarkSave BookmarkSaveKeyPrefix: MapBookmarkSave
BookmarkRestoreKeyPrefix: MapBookmarkRestore BookmarkRestoreKeyPrefix: MapBookmarkRestore
BookmarkKeyCount: 4 BookmarkKeyCount: 4
LogicKeyListener@PLAYER_KEYHANDLER:
Logic: RemoveFromControlGroupHotkeyLogic
RemoveFromControlGroupKey: RemoveFromControlGroup
ControlGroups@CONTROLGROUPS: ControlGroups@CONTROLGROUPS:
SelectGroupKeyPrefix: ControlGroupSelect SelectGroupKeyPrefix: ControlGroupSelect
CreateGroupKeyPrefix: ControlGroupCreate CreateGroupKeyPrefix: ControlGroupCreate

3
mods/common/chrome/ingame.yaml
View File

@@ -10,8 +10,7 @@ Container@INGAME_ROOT:
TakeScreenshotKey: TakeScreenshot TakeScreenshotKey: TakeScreenshot
MuteAudioKey: ToggleMute MuteAudioKey: ToggleMute
LogicKeyListener@WORLD_KEYHANDLER: LogicKeyListener@WORLD_KEYHANDLER:
Logic: CycleBasesHotkeyLogic, CycleProductionActorsHotkeyLogic, CycleHarvestersHotkeyLogic, JumpToLastEventHotkeyLogic, JumpToSelectedActorsHotkeyLogic, ResetZoomHotkeyLogic, TogglePlayerStanceColorHotkeyLogic, CycleStatusBarsHotkeyLogic, PauseHotkeyLogic, RemoveFromControlGroupHotkeyLogic, SelectUnitsByTypeHotkeyLogic, SelectAllUnitsHotkeyLogic Logic: CycleBasesHotkeyLogic, CycleProductionActorsHotkeyLogic, CycleHarvestersHotkeyLogic, JumpToLastEventHotkeyLogic, JumpToSelectedActorsHotkeyLogic, ResetZoomHotkeyLogic, TogglePlayerStanceColorHotkeyLogic, CycleStatusBarsHotkeyLogic, PauseHotkeyLogic, SelectUnitsByTypeHotkeyLogic, SelectAllUnitsHotkeyLogic
RemoveFromControlGroupKey: RemoveFromControlGroup
CycleBasesKey: CycleBase CycleBasesKey: CycleBase
CycleProductionActorsKey: CycleProductionBuildings CycleProductionActorsKey: CycleProductionBuildings
CycleHarvestersKey: CycleHarvesters CycleHarvestersKey: CycleHarvesters

2
mods/common/hotkeys/control-groups.yaml
View File

@@ -251,4 +251,4 @@ ControlGroupJumpTo10: NUMBER_0 Alt
RemoveFromControlGroup: RemoveFromControlGroup:
Description: Remove from control group Description: Remove from control group
Types: ControlGroups Types: ControlGroups
Contexts: Player, Spectator Contexts: Player

3
mods/d2k/chrome/ingame-player.yaml
View File

@@ -2,6 +2,9 @@ Container@PLAYER_WIDGETS:
Logic: LoadIngameChatLogic Logic: LoadIngameChatLogic
Children: Children:
Container@CHAT_ROOT: Container@CHAT_ROOT:
LogicKeyListener@PLAYER_KEYHANDLER:
Logic: RemoveFromControlGroupHotkeyLogic
RemoveFromControlGroupKey: RemoveFromControlGroup
ControlGroups@CONTROLGROUPS: ControlGroups@CONTROLGROUPS:
SelectGroupKeyPrefix: ControlGroupSelect SelectGroupKeyPrefix: ControlGroupSelect
CreateGroupKeyPrefix: ControlGroupCreate CreateGroupKeyPrefix: ControlGroupCreate

3
mods/ra/chrome/ingame-player.yaml
View File

@@ -2,6 +2,9 @@ Container@PLAYER_WIDGETS:
Logic: LoadIngameChatLogic Logic: LoadIngameChatLogic
Children: Children:
Container@CHAT_ROOT: Container@CHAT_ROOT:
LogicKeyListener@PLAYER_KEYHANDLER:
Logic: RemoveFromControlGroupHotkeyLogic
RemoveFromControlGroupKey: RemoveFromControlGroup
ControlGroups@CONTROLGROUPS: ControlGroups@CONTROLGROUPS:
SelectGroupKeyPrefix: ControlGroupSelect SelectGroupKeyPrefix: ControlGroupSelect
CreateGroupKeyPrefix: ControlGroupCreate CreateGroupKeyPrefix: ControlGroupCreate

3
mods/ts/chrome/ingame-player.yaml
View File

@@ -9,6 +9,9 @@ Container@PLAYER_WIDGETS:
DecreaseDepthPreviewContrastKey: DecreaseDepthPreviewContrast DecreaseDepthPreviewContrastKey: DecreaseDepthPreviewContrast
IncreaseDepthPreviewOffsetKey: IncreaseDepthPreviewOffset IncreaseDepthPreviewOffsetKey: IncreaseDepthPreviewOffset
DecreaseDepthPreviewOffsetKey: DecreaseDepthPreviewOffset DecreaseDepthPreviewOffsetKey: DecreaseDepthPreviewOffset
LogicKeyListener@PLAYER_KEYHANDLER:
Logic: RemoveFromControlGroupHotkeyLogic
RemoveFromControlGroupKey: RemoveFromControlGroup
ControlGroups@CONTROLGROUPS: ControlGroups@CONTROLGROUPS:
SelectGroupKeyPrefix: ControlGroupSelect SelectGroupKeyPrefix: ControlGroupSelect
CreateGroupKeyPrefix: ControlGroupCreate CreateGroupKeyPrefix: ControlGroupCreate