Merge pull request #358 from spelunky-fyi/RawKey

RawInput fixes
spelunky-fyi · Nov 11, 2023 · 51ad73e · 51ad73e
2 parents 1c61afb + dd652db
commit 51ad73e
Show file tree

Hide file tree

Showing 14 changed files with 521 additions and 43 deletions.
diff --git a/docs/game_data/lua_enums.txt b/docs/game_data/lua_enums.txt
@@ -1879,6 +1879,7 @@ KEY = {
   ["6"] = 54,
   ["7"] = 55,
   ["8"] = 56,
+  ["9"] = 57,
   A = 65,
   ADD = 107,
   ALT = 18,
@@ -1997,7 +1998,8 @@ KEY = {
   V = 86,
   W = 87,
   X = 88,
-  Y = 89
+  Y = 89,
+  Z = 90
 }
 LAYER = {
   BACK = 1,
@@ -2028,6 +2030,12 @@ LEVEL_CONFIG = {
   MAX_LIQUID_PARTICLES = 15,
   MOUNT_CHANCE = 4
 }
+LIGHT_TYPE = {
+  FOLLOW_CAMERA = 1,
+  FOLLOW_ENTITY = 2,
+  NONE = 0,
+  ROOM_LIGHT = 4
+}
 LIQUID_POOL = {
   COARSE_LAVA = 4,
   COARSE_WATER = 2,
@@ -2084,6 +2092,18 @@ MASK = {
   SHADOW = 2048,
   WATER = 8192
 }
+MENU_INPUT = {
+  BACK = 2,
+  DELETE = 4,
+  DOWN = 256,
+  JOURNAL = 16,
+  LEFT = 32,
+  NONE = 0,
+  RANDOM = 8,
+  RIGHT = 64,
+  SELECT = 1,
+  UP = 128
+}
 ON = {
   ARENA_INTRO = 25,
   ARENA_ITEMS = 23,
@@ -2112,15 +2132,18 @@ ON = {
   ONLINE_LOBBY = 29,
   OPTIONS = 5,
   PLAYER_PROFILE = 6,
+  POST_GAME_LOOP = 156,
   POST_LAYER_CREATION = 148,
   POST_LAYER_DESTRUCTION = 152,
   POST_LEVEL_CREATION = 146,
   POST_LEVEL_DESTRUCTION = 150,
   POST_LEVEL_GENERATION = 112,
   POST_LOAD_JOURNAL_CHAPTER = 139,
   POST_LOAD_SCREEN = 136,
+  POST_PROCESS_INPUT = 154,
   POST_ROOM_GENERATION = 111,
   POST_UPDATE = 143,
+  PRE_GAME_LOOP = 155,
   PRE_GET_FEAT = 140,
   PRE_GET_RANDOM_ROOM = 113,
   PRE_HANDLE_ROOM_TILES = 114,
@@ -2132,6 +2155,7 @@ ON = {
   PRE_LOAD_JOURNAL_CHAPTER = 138,
   PRE_LOAD_LEVEL_FILES = 109,
   PRE_LOAD_SCREEN = 135,
+  PRE_PROCESS_INPUT = 153,
   PRE_SET_FEAT = 141,
   PRE_UPDATE = 142,
   PROLOGUE = 2,
@@ -2544,6 +2568,136 @@ QUEST_FLAG = {
   VAULT_SPAWNED = 3,
   WADDLER_AGGROED = 10
 }
+RAW_BUTTON = {
+  A = 4,
+  B = 5,
+  BACK = 14,
+  DOWN = 1,
+  LEFT = 2,
+  LEFT_SHOULDER = 8,
+  LEFT_THUMB = 12,
+  LEFT_TRIGGER = 10,
+  RIGHT = 3,
+  RIGHT_SHOULDER = 9,
+  RIGHT_THUMB = 13,
+  RIGHT_TRIGGER = 11,
+  START = 15,
+  UP = 0,
+  X = 6,
+  Y = 7
+}
+RAW_DUALSHOCK = {
+  CIRCLE = 5,
+  CROSS = 4,
+  DOWN = 1,
+  L1 = 8,
+  L2 = 10,
+  L3 = 12,
+  LEFT = 2,
+  OPTIONS = 15,
+  R1 = 9,
+  R2 = 11,
+  R3 = 13,
+  RIGHT = 3,
+  SHARE = 14,
+  SQUARE = 6,
+  TRIANGLE = 7,
+  UP = 0
+}
+RAW_KEY = {
+  ["0"] = 65,
+  ["1"] = 66,
+  ["2"] = 67,
+  ["3"] = 68,
+  ["4"] = 69,
+  ["5"] = 70,
+  ["6"] = 71,
+  ["7"] = 72,
+  ["8"] = 73,
+  ["9"] = 74,
+  A = 9,
+  ADD = 86,
+  ALT = 37,
+  B = 10,
+  BACKSPACE = 40,
+  C = 11,
+  COMMA = 93,
+  CTRL = 33,
+  D = 12,
+  DECIMAL = 90,
+  DELETE = 104,
+  DIVIDE = 88,
+  DOWN = 1,
+  E = 13,
+  END = 106,
+  ESCAPE = 4,
+  F = 14,
+  F1 = 41,
+  F2 = 42,
+  F3 = 43,
+  F4 = 44,
+  F5 = 45,
+  F6 = 46,
+  F7 = 47,
+  F8 = 48,
+  F9 = 49,
+  F10 = 50,
+  F11 = 51,
+  F12 = 52,
+  G = 15,
+  H = 16,
+  HOME = 108,
+  I = 17,
+  INSERT = 103,
+  J = 18,
+  K = 19,
+  L = 20,
+  LALT = 37,
+  LCONTROL = 33,
+  LEFT = 2,
+  LSHIFT = 35,
+  M = 21,
+  MINUS = 92,
+  MULTIPLY = 87,
+  N = 22,
+  NUMPAD0 = 75,
+  NUMPAD1 = 76,
+  NUMPAD2 = 77,
+  NUMPAD3 = 78,
+  NUMPAD4 = 79,
+  NUMPAD5 = 80,
+  NUMPAD6 = 81,
+  NUMPAD7 = 82,
+  NUMPAD8 = 83,
+  NUMPAD9 = 84,
+  NUMPADENTER = 110,
+  O = 23,
+  P = 24,
+  PERIOD = 94,
+  PGDN = 105,
+  PGUP = 107,
+  PLUS = 98,
+  Q = 25,
+  R = 26,
+  RALT = 38,
+  RCONTROL = 34,
+  RETURN = 5,
+  RIGHT = 3,
+  RSHIFT = 36,
+  S = 27,
+  SHIFT = 35,
+  SPACE = 39,
+  SUBTRACT = 85,
+  T = 28,
+  TAB = 6,
+  U = 29,
+  UP = 0,
+  V = 30,
+  W = 31,
+  X = 32,
+  Y = 33,
+  Z = 34
+}
 RECURSIVE_MODE = {
   EXCLUSIVE = 0,
   INCLUSIVE = 1,