tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 08:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make <system.button()> and KeyBindings consistent

Browse Source
This commit is contained in:
JappaWakka 2025-07-02 15:02:06 +02:00
parent 71321cea42
commit ed6d2d6f11
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
P3D/Input/KeyBindings.vb
View File

@ -49,31 +49,31 @@ Public Class KeyBindings
key = key.Remove(key.Length - 1, 1) key = key.Remove(key.Length - 1, 1)
Select Case key.ToLower() Select Case key.ToLower()
Case "forwardmove" Case "moveforward", "forwardmove"
ForwardMoveKey = binding ForwardMoveKey = binding
Case "leftmove" Case "moveleft", "leftmove"
LeftMoveKey = binding LeftMoveKey = binding
Case "backwardmove" Case "movebackward", "backwardmove"
BackwardMoveKey = binding BackwardMoveKey = binding
Case "rightmove" Case "moveright", "rightmove"
RightMoveKey = binding RightMoveKey = binding
Case "run" Case "run"
RunKey = binding RunKey = binding
Case "inventory", "openmenu" Case "openmenu", "inventory"
OpenInventoryKey = binding OpenInventoryKey = binding
Case "chat" Case "chat"
ChatKey = binding ChatKey = binding
Case "special", "pokegear" Case "special", "phone", "pokegear"
SpecialKey = binding SpecialKey = binding
Case "muteaudio", "mutemusic" Case "muteaudio", "mutemusic"
MuteAudioKey = binding MuteAudioKey = binding
Case "cameraleft" Case "cameraleft", "left"
LeftKey = binding LeftKey = binding
Case "cameraright" Case "cameraright", "right"
RightKey = binding RightKey = binding
Case "cameraup" Case "cameraup", "up"
UpKey = binding UpKey = binding
Case "cameradown" Case "cameradown", "down"
DownKey = binding DownKey = binding
Case "cameralock" Case "cameralock"
CameraLockKey = binding CameraLockKey = binding
@ -238,10 +238,10 @@ Public Class KeyBindings
Public Shared Sub CreateKeySave(ByVal force As Boolean) Public Shared Sub CreateKeySave(ByVal force As Boolean)
If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then
If IO.File.Exists(GameController.GamePath & "\Save\Keyboard.dat") = False Or force = True Then If IO.File.Exists(GameController.GamePath & "\Save\Keyboard.dat") = False Or force = True Then
Dim s As String = "[ForwardMove]=W" & Environment.NewLine & Dim s As String = "[MoveForward]=" & GetKeyName(Keys.W) & Environment.NewLine &
"[LeftMove]=" & GetKeyName(Keys.A) & Environment.NewLine & "[MoveLeft]=" & GetKeyName(Keys.A) & Environment.NewLine &
"[BackwardMove]=" & GetKeyName(Keys.S) & Environment.NewLine & "[MoveBackward]=" & GetKeyName(Keys.S) & Environment.NewLine &
"[RightMove]=" & GetKeyName(Keys.D) & Environment.NewLine & "[MoveRight]=" & GetKeyName(Keys.D) & Environment.NewLine &
"[Run]=" & GetKeyName(Keys.LeftShift) & Environment.NewLine & "[Run]=" & GetKeyName(Keys.LeftShift) & Environment.NewLine &
"[OpenMenu]=" & GetKeyName(Keys.E) & Environment.NewLine & "[OpenMenu]=" & GetKeyName(Keys.E) & Environment.NewLine &
"[Chat]=" & GetKeyName(Keys.T) & Environment.NewLine & "[Chat]=" & GetKeyName(Keys.T) & Environment.NewLine &
@ -276,10 +276,10 @@ Public Class KeyBindings
''' </summary> ''' </summary>
Public Shared Sub SaveKeys() Public Shared Sub SaveKeys()
If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then
Dim s As String = "[ForwardMove]=" & GetKeyName(ForwardMoveKey) & Environment.NewLine & Dim s As String = "[MoveForward]=" & GetKeyName(ForwardMoveKey) & Environment.NewLine &
"[LeftMove]=" & GetKeyName(LeftMoveKey) & Environment.NewLine & "[MoveLeft]=" & GetKeyName(LeftMoveKey) & Environment.NewLine &
"[BackwardMove]=" & GetKeyName(BackwardMoveKey) & Environment.NewLine & "[MoveBackward]=" & GetKeyName(BackwardMoveKey) & Environment.NewLine &
"[RightMove]=" & GetKeyName(RightMoveKey) & Environment.NewLine & "[MoveRight]=" & GetKeyName(RightMoveKey) & Environment.NewLine &
"[Run]=" & GetKeyName(RunKey) & Environment.NewLine & "[Run]=" & GetKeyName(RunKey) & Environment.NewLine &
"[Inventory]=" & GetKeyName(OpenInventoryKey) & Environment.NewLine & "[Inventory]=" & GetKeyName(OpenInventoryKey) & Environment.NewLine &
"[Chat]=" & GetKeyName(ChatKey) & Environment.NewLine & "[Chat]=" & GetKeyName(ChatKey) & Environment.NewLine &

20
P3D/World/ActionScript/V2/ScriptConstructs/DoSystem.vb
View File

@ -26,25 +26,27 @@
key = KeyBindings.BackwardMoveKey key = KeyBindings.BackwardMoveKey
Case "moveright" Case "moveright"
key = KeyBindings.RightMoveKey key = KeyBindings.RightMoveKey
Case "run"
key = KeyBindings.RunKey
Case "openmenu" Case "openmenu"
key = KeyBindings.OpenInventoryKey key = KeyBindings.OpenInventoryKey
Case "chat" Case "chat"
key = KeyBindings.ChatKey key = KeyBindings.ChatKey
Case "special", "phone" Case "special", "phone", "pokegear"
key = KeyBindings.SpecialKey key = KeyBindings.SpecialKey
Case "muteaudio" Case "muteaudio", "mutemusic"
key = KeyBindings.MuteAudioKey key = KeyBindings.MuteAudioKey
Case "cameraleft" Case "cameraleft", "left"
key = KeyBindings.LeftKey key = KeyBindings.LeftKey
Case "cameraright" Case "cameraright", "right"
key = KeyBindings.RightKey key = KeyBindings.RightKey
Case "cameraup" Case "cameraup", "up"
key = KeyBindings.UpKey key = KeyBindings.UpKey
Case "cameradown" Case "cameradown", "down"
key = KeyBindings.DownKey key = KeyBindings.DownKey
Case "cameralock" Case "cameralock"
key = KeyBindings.CameraLockKey key = KeyBindings.CameraLockKey
Case "guicontrol" Case "guicontrol", "hidegui"
key = KeyBindings.GUIControlKey key = KeyBindings.GUIControlKey
Case "screenshot" Case "screenshot"
key = KeyBindings.ScreenshotKey key = KeyBindings.ScreenshotKey
@ -68,10 +70,6 @@
key = KeyBindings.OnlineStatusKey key = KeyBindings.OnlineStatusKey
Case "lighting" Case "lighting"
key = KeyBindings.LightKey key = KeyBindings.LightKey
Case "hidegui"
key = KeyBindings.GUIControlKey
Case "run"
key = KeyBindings.RunKey
End Select End Select
If key <> Nothing Then If key <> Nothing Then
buttonName = Localization.GetString("keyboard_key_" & KeyBindings.GetKeyName(key), KeyBindings.GetKeyName(key)) buttonName = Localization.GetString("keyboard_key_" & KeyBindings.GetKeyName(key), KeyBindings.GetKeyName(key))