Raw input

docs/src/includes/_enums.md

@@ -871,6 +871,8 @@ Name | Data | Description
 [POST_LEVEL_DESTRUCTION](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.POST_LEVEL_DESTRUCTION) | ON::POST_LEVEL_DESTRUCTION | Runs right after the current level has been unloaded and all entities destroyed. Runs in pretty much all screens, even ones without entities. The screen has already changed at this point, meaning the screen being destoyed is in state.screen_last.<br/>
 [PRE_LAYER_DESTRUCTION](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.PRE_LAYER_DESTRUCTION) | ON::PRE_LAYER_DESTRUCTION | Params: [LAYER](#LAYER) layer<br/>Runs right before a layer is unloaded and any entities there destroyed. Runs in pretty much all screens, even ones without entities. The screen has already changed at this point, meaning the screen being destoyed is in state.screen_last.<br/>
 [POST_LAYER_DESTRUCTION](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.POST_LAYER_DESTRUCTION) | ON::POST_LAYER_DESTRUCTION | Params: [LAYER](#LAYER) layer<br/>Runs right after a layer has been unloaded and any entities there destroyed. Runs in pretty much all screens, even ones without entities. The screen has already changed at this point, meaning the screen being destoyed is in state.screen_last.<br/>
+[PRE_PROCESS_INPUT](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.PRE_PROCESS_INPUT) | ON::PRE_PROCESS_INPUT | Runs right before the game gets input from various devices and writes to a bunch of buttons-variables. Return true to disable all game input completely.<br/>
+[POST_PROCESS_INPUT](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.POST_PROCESS_INPUT) | ON::POST_PROCESS_INPUT | Runs right after the game gets input from various devices and writes to a bunch of buttons-variables. Probably the first chance you have to capture or edit buttons_gameplay or buttons_menu sort of things.<br/>
 
 ## PARTICLEEMITTER
 

docs/src/includes/_events.md

@@ -605,3 +605,17 @@ Params: [LAYER](#LAYER) layer<br/>Runs right before a layer is unloaded and any
 > Search script examples for [ON.POST_LAYER_DESTRUCTION](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.POST_LAYER_DESTRUCTION)
 
 Params: [LAYER](#LAYER) layer<br/>Runs right after a layer has been unloaded and any entities there destroyed. Runs in pretty much all screens, even ones without entities. The screen has already changed at this point, meaning the screen being destoyed is in state.screen_last.<br/>
+
+## ON.PRE_PROCESS_INPUT
+
+
+> Search script examples for [ON.PRE_PROCESS_INPUT](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.PRE_PROCESS_INPUT)
+
+Runs right before the game gets input from various devices and writes to a bunch of buttons-variables. Return true to disable all game input completely.<br/>
+
+## ON.POST_PROCESS_INPUT
+
+
+> Search script examples for [ON.POST_PROCESS_INPUT](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.POST_PROCESS_INPUT)
+
+Runs right after the game gets input from various devices and writes to a bunch of buttons-variables. Probably the first chance you have to capture or edit buttons_gameplay or buttons_menu sort of things.<br/>

docs/src/includes/_globals.md

@@ -2064,6 +2064,15 @@ Returns: [ImGuiIO](#ImGuiIO) for raw keyboard, mouse and xinput gamepad stuff.
 - Note: [Overlunky](#Overlunky)/etc will eat all keys it is currently configured to use, your script will only get leftovers.
 - Note: [Gamepad](#Gamepad) is basically [XINPUT_GAMEPAD](https://docs.microsoft.com/en-us/windows/win32/api/xinput/ns-xinput-xinput_gamepad) but variables are renamed and values are normalized to -1.0..1.0 range.
 
+### get_raw_input
+
+
+> Search script examples for [get_raw_input](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_raw_input)
+
+#### [RawInput](#RawInput) get_raw_input()
+
+Returns [RawInput](#RawInput), a game structure for raw keyboard and controller state
+
 ### mouse_position
 
 

docs/src/includes/_types.md

@@ -652,6 +652,14 @@ tuple<int, int, int, int> | [get_rgba()](https://github.com/spelunky-fyi/o
 [Color](#Color) | [set_ucolor(uColor color)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_ucolor) | Changes color based on given [uColor](#Aliases)
 [Color](#Color) | [set(Color other)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set) | Copies the values of different [Color](#Color) to this one
 
+### ControllerButton
+
+
+Type | Name | Description
+---- | ---- | -----------
+bool | [down](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=down) | [Button](#Button) is being held
+bool | [pressed](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pressed) | [Button](#Button) was just pressed down this frame
+
 ### CutsceneBehavior
 
 
@@ -744,6 +752,13 @@ Type | Name | Description
 [ENT_TYPE](#ENT_TYPE) | [owner_type](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=owner_type) | 
 int | [owner_uid](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=owner_uid) | 
 
+### KeyboardKey
+
+
+Type | Name | Description
+---- | ---- | -----------
+bool | [down](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=down) | Key is being held
+
 ### Letter
 
 
@@ -983,6 +998,13 @@ tuple<float, float> | [split()](https://github.com/spelunky-fyi/overlunky/
 ## Input types
 
 
+### ControllerInput
+
+
+Type | Name | Description
+---- | ---- | -----------
+array<[ControllerButton](#ControllerButton), 16> | [buttons](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons) | 
+
 ### Gamepad
 
 Used in [ImGuiIO](#ImGuiIO)
@@ -1025,6 +1047,14 @@ float | [mousewheel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mo
  | [gamepads](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=gamepads) | [Gamepad](#Gamepad) gamepads(int index)<br/>This is the XInput index 1..4, might not be the same as the player slot.<br/> 
 bool | [showcursor](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=showcursor) | 
 
+### InputDevice
+
+
+Type | Name | Description
+---- | ---- | -----------
+int | [input_index](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input_index) | 
+int | [buttons](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons) | 
+
 ### InputMapping
 
 Used in [PlayerSlot](#PlayerSlot)
@@ -1061,6 +1091,14 @@ array&lt;[PlayerSlotSettings](#PlayerSlotSettings), MAX_PLAYERS&gt; | [player_se
 [PlayerSlotSettings](#PlayerSlotSettings) | [player_slot_3_settings](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=player_slot_3_settings) | 
 [PlayerSlotSettings](#PlayerSlotSettings) | [player_slot_4_settings](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=player_slot_4_settings) | 
 
+### RawInput
+
+
+Type | Name | Description
+---- | ---- | -----------
+array&lt;[KeyboardKey](#KeyboardKey), 112&gt; | [keyboard](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keyboard) | State of all keyboard buttons in a random game order as usual
+array&lt;[ControllerInput](#ControllerInput), 12&gt; | [controller](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=controller) | State of controller buttons per controller. Zero-based indexing, i.e. use game_props.input_index directly to index this.
+
 ## Journal types
 
 
@@ -2787,12 +2825,13 @@ array&lt;int, MAX_PLAYERS&gt; | [buttons_movement](https://github.com/spelunky-f
 
 Type | Name | Description
 ---- | ---- | -----------
-int | [buttons](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons) | Might be used for some menu inputs not found in buttons_menu
-int | [buttons_extra](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons_extra) | Might be used for some menu inputs not found in buttons_menu
-[MENU_INPUT](#MENU_INPUT) | [buttons_menu_previous](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons_menu_previous) | Previous state of buttons_menu
-[MENU_INPUT](#MENU_INPUT) | [buttons_menu](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons_menu) | Inputs used to control all the menus, separate from player inputs. You can probably capture and edit this in [ON](#ON).PRE_UPDATE.
+array&lt;int, MAX_PLAYERS&gt; | [input](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input) | Used for player input and might be used for some menu inputs not found in buttons_menu. You can probably capture and edit this in [ON](#ON).POST_PROCESS_INPUT. These are raw inputs, without things like autorun applied.
+array&lt;int, MAX_PLAYERS&gt; | [input_previous](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input_previous) | 
+[MENU_INPUT](#MENU_INPUT) | [input_menu](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input_menu) | Inputs used to control all the menus, separate from player inputs. You can probably capture and edit this in [ON](#ON).POST_PROCESS_INPUT
+[MENU_INPUT](#MENU_INPUT) | [input_menu_previous](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input_menu_previous) | Previous state of buttons_menu
 bool | [game_has_focus](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=game_has_focus) | 
-int | [modal_open](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=modal_open) | 
+int | [menu_open](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=menu_open) | 
+array&lt;int, 5&gt; | [input_index](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input_index) | Input index for players 1-4 and maybe for the menu controls. -1: disabled, 0..3: keyboards, 4..7: Xinput, 8..11: other controllers
 
 ### Items
 

src/game_api/flags.hpp

@@ -767,3 +767,19 @@ std::array renderer_flags1{
     "Liquid smoothing",
     "unknown",
 };
+
+std::array player_inputs{
+    "Disabled",
+    "Keyboard 1",
+    "Keyboard 2",
+    "Keyboard 3",
+    "Keyboard 4",
+    "XInput 1",
+    "XInput 2",
+    "XInput 3",
+    "XInput 4",
+    "Controller 1",
+    "Controller 2",
+    "Controller 3",
+    "Controller 4",
+};

src/game_api/game_manager.cpp

@@ -9,3 +9,9 @@ GameManager* get_game_manager()
     static GameManager** gm = (GameManager**)get_address("game_manager"sv);
     return *gm;
 }
+
+RawInput* get_raw_input()
+{
+    static auto offset = get_address("input_table");
+    return reinterpret_cast<RawInput*>(offset);
+}

src/game_api/game_manager.hpp

@@ -70,31 +70,65 @@ struct BackgroundMusic
     uint32_t unknown22;
 };
 
-struct GameProps
+struct KeyboardKey
 {
-    /// Might be used for some menu inputs not found in buttons_menu
+    /// Key is being held
+    bool down;
+    size_t unknown;
+};
+
+struct ControllerButton
+{
+    /// Button is being held
+    bool down;
+    /// Button was just pressed down this frame
+    bool pressed;
+};
+
+struct ControllerInput
+{
+    std::array<ControllerButton, 16> buttons;
+};
+
+struct RawInput
+{
+    /// State of all keyboard buttons in a random game order as usual
+    std::array<KeyboardKey, 112> keyboard;
+    /// State of controller buttons per controller. Zero-based indexing, i.e. use game_props.input_index directly to index this.
+    std::array<ControllerInput, 12> controller;
+};
+
+struct InputDevice
+{
+    // No idea what these actually do, better not to expose this anyway
+    bool unknown1;
+    bool unknown2;
+    bool menu_input;
+    bool lost_connection;
+    int8_t input_index;
+    uint8_t padding2[3];
     uint32_t buttons;
-    uint32_t unknown1;
-    uint32_t unknown2;
-    uint32_t unknown3;
-    /// Might be used for some menu inputs not found in buttons_menu
-    uint32_t buttons_extra;
-    uint32_t unknown4;
-    uint32_t unknown5;
-    uint32_t unknown6;
+    // a lot more stuff
+};
+
+struct GameProps
+{
+    /// Used for player input and might be used for some menu inputs not found in buttons_menu. You can probably capture and edit this in ON.POST_PROCESS_INPUT. These are raw inputs, without things like autorun applied.
+    std::array<uint32_t, MAX_PLAYERS> buttons;
+    std::array<uint32_t, MAX_PLAYERS> buttons_previous;
     /// Previous state of buttons_menu
     MENU_INPUT buttons_menu_previous;
-    /// Inputs used to control all the menus, separate from player inputs. You can probably capture and edit this in ON.PRE_UPDATE.
+    /// Inputs used to control all the menus, separate from player inputs. You can probably capture and edit this in ON.POST_PROCESS_INPUT
     MENU_INPUT buttons_menu;
-    int8_t modal_open;
+    int8_t menu_icon_slot;
     bool game_has_focus;
     bool unknown9;
     bool unknown10;
-    // there's more stuff here
-    std::array<size_t*, 12> unknown11; // pointers to something
+    /// Yet another place for some buttons in some random order, too tired to make another enum for them
+    std::array<InputDevice*, 12> input_device;
 
-    int8_t input_index[5]; // not sure, just came up with this name, if not used it's -1
-    // for example if you just run the game and use OL to warp somewhere immediately there will be no controller setup, so all of those will be -1
+    /// Input index for players 1-4 and maybe for the menu controls. -1: disabled, 0..3: keyboards, 4..7: Xinput, 8..11: other controllers
+    std::array<int8_t, 5> input_index;
 
     // uint8_t padding_probably1[3];
 
@@ -160,3 +194,4 @@ struct GameManager
 };
 
 GameManager* get_game_manager();
+RawInput* get_raw_input();

src/game_api/script/events.cpp

@@ -486,3 +486,29 @@ bool pre_set_feat(FEAT feat)
         });
     return block;
 }
+
+bool pre_process_input()
+{
+    bool return_val = false;
+    LuaBackend::for_each_backend(
+        [=, &return_val](LuaBackend::LockedBackend backend)
+        {
+            if (backend->on_pre_process_input())
+            {
+                return_val = true;
+                return false;
+            }
+            return true;
+        });
+    return return_val;
+}
+
+void post_process_input()
+{
+    LuaBackend::for_each_backend(
+        [&](LuaBackend::LockedBackend backend)
+        {
+            backend->on_post_process_input();
+            return true;
+        });
+}

src/game_api/script/events.hpp

@@ -22,6 +22,7 @@ bool pre_init_level();
 bool pre_init_layer(LAYER layer);
 bool pre_unload_level();
 bool pre_unload_layer(LAYER layer);
+bool pre_process_input();
 
 void post_room_generation();
 void post_level_generation();
@@ -30,6 +31,7 @@ void post_init_level();
 void post_init_layer(LAYER layer);
 void post_unload_level();
 void post_unload_layer(LAYER layer);
+void post_process_input();
 
 void on_death_message(STRINGID stringid);
 std::optional<bool> pre_get_feat(FEAT feat);