24 files changed, 86 insertions, 0 deletions
diff --git a/data/ids.yaml b/data/ids.yaml
index 3aff6ea..b66d6a9 100644
--- a/data/ids.yaml
+++ b/data/ids.yaml

@@ -20,6 +20,11 @@ maps:
        panels:
          COLOR: 2726
          Letters: 2727
+        keyholders:
+          1: 2760
+          2: 2761
+          3: 2762
+          4: 2763
      Partial Entrance:
        panels:
          PARTIAL: 2729
@@ -155,6 +160,9 @@ maps:
      Brown Smiley:
        panels:
          OTHERS: 1667
+      C Keyholder:
+        keyholders:
+          C: 2755
      Castle:
        panels:
          FIVE (Blue): 1673
@@ -265,6 +273,9 @@ maps:
          SUMMER: 1754
          WORD: 1753
          WORDWORD: 1761
+      D Keyholder:
+        keyholders:
+          D: 2759
      Dark Light Exit:
        panels:
          GASKET: 1763
@@ -287,6 +298,9 @@ maps:
      Eye Painting:
        panels:
          REVILED: 1777
+      F Keyholder:
+        keyholders:
+          F: 2756
      F2 Room:
        panels:
          CAST: 1782
@@ -480,6 +494,8 @@ maps:
        panels:
          GOING: 1934
          TURN: 1935
+        keyholders:
+          G: 2757
      Nursery:
        panels:
          "?": 1937
@@ -547,6 +563,8 @@ maps:
          WALLS: 1986
          WHISPER: 1978
          WING: 1979
+        keyholders:
+          H: 2758
      Outside Magic Room:
        panels:
          WIZARD: 1988
@@ -1160,6 +1178,9 @@ maps:
          SWAY: 24
          TERROR: 20
          TURN: 22
+      Keyholder Room:
+        keyholders:
+          A: 2773
      Synonyms Room:
        panels:
          ADORE: 26
@@ -1452,6 +1473,9 @@ maps:
        panels:
          CIVIL: 216
          CRABS: 217
+      T Keyholder:
+        keyholders:
+          T: 2754
    doors:
      C Keyholder Blocker: 176
      C2 Door: 177
@@ -1760,6 +1784,8 @@ maps:
      X Plus:
        panels:
          ROSE: 405
+        keyholders:
+          M: 2766
      X Plus Middle Leg:
        panels:
          COLONY: 403
@@ -1789,6 +1815,9 @@ maps:
      Daedalus Extension:
        panels:
          WHERE: 433
+      Main Area:
+        keyholders:
+          P: 2765
    doors:
      Ancient Painting: 428
      Between Painting: 414
@@ -1973,6 +2002,8 @@ maps:
          LAUGH FINISHED: 573
          PLANTS: 570
          WEATHER: 568
+        keyholders:
+          X: 2770
      Outside Jail:
        panels:
          GUT: 575
@@ -2120,6 +2151,8 @@ maps:
          WAS: 631
          WINGS: 662
          YELL: 636
+        keyholders:
+          B: 2769
      Mastery Room:
        masteries:
          MASTERY: 666
@@ -2186,6 +2219,8 @@ maps:
          FLASHBACK: 705
          PUSH: 703
          PUSHBACK: 702
+        keyholders:
+          J: 2772
    doors:
      Side Door: 687
  the_keen:
@@ -2297,6 +2332,8 @@ maps:
          NAY: 774
          NIGH: 781
          TORE: 787
+        keyholders:
+          S: 2767
    doors:
      Left Room Puzzles: 763
      Main Room Door: 2750
@@ -2404,6 +2441,9 @@ maps:
          CLEOPATRA: 859
          NAPOLEON: 860
          XERXES: 857
+      U Keyholder:
+        keyholders:
+          U: 2777
    doors:
      K2 Door: 852
  the_partial:
@@ -2427,6 +2467,8 @@ maps:
          TON: 878
          TURN: 875
          UP: 870
+        keyholders:
+          L: 2771
      Reverse Side:
        panels:
          BRO: 884
@@ -2545,6 +2587,9 @@ maps:
      Turtle Entrance: 891
  the_quiet:
    rooms:
+      Keyholder Room:
+        keyholders:
+          Q: 2778
      Main Area:
        panels:
          BEE: 979
@@ -2791,6 +2836,8 @@ maps:
          STIM: 1148
          STONE: 1142
          TADPOLES: 1159
+        keyholders:
+          N: 2779
    doors:
      Books Puzzles: 1136
      Games Puzzles: 1137
@@ -3145,6 +3192,8 @@ maps:
          SWINE (Brown): 2446
          WIFE (Black): 2440
          WIFE (Brown): 2447
+        keyholders:
+          Y: 2764
    doors:
      Black Side Panels: 2427
      Brown Side Panels: 2428
@@ -3157,6 +3206,9 @@ maps:
      Control Center Entrance:
        panels:
          ZERO: 2455
+      Main Area:
+        keyholders:
+          K: 2768
      Mastery:
        masteries:
          MASTERY: 2456
@@ -3361,6 +3413,8 @@ maps:
          WAYS: 2621
          WHILE: 2613
          ZOO: 2615
+        keyholders:
+          I: 2775
      Middle Room:
        panels:
          FELLOW: 2624
@@ -3408,6 +3462,12 @@ maps:
          UNINTERESTED: 2650
          UNIRONIC: 2656
          UNLUCKY: 2654
+      V Keyholder:
+        keyholders:
+          V: 2776
+      W Keyholder:
+        keyholders:
+          W: 2774
    doors:
      Cog Rhino Hug Rug: 2586
      Control Center Orange Door: 2582
diff --git a/data/maps/control_center/rooms/Main Area.txtpb b/data/maps/control_center/rooms/Main Area.txtpb
index 44b0f79..bf81e26 100644
--- a/data/maps/control_center/rooms/Main Area.txtpb
+++ b/data/maps/control_center/rooms/Main Area.txtpb

@@ -30,18 +30,22 @@ panels {
 keyholders {
  name: "1"
  path: "Components/KeyHolders/keyHolder"
+  key: "z"
 }
 keyholders {
  name: "2"
  path: "Components/KeyHolders/keyHolder2"
+  key: "e"
 }
 keyholders {
  name: "3"
  path: "Components/KeyHolders/keyHolder3"
+  key: "r"
 }
 keyholders {
  name: "4"
  path: "Components/KeyHolders/keyHolder4"
+  key: "o"
 }
 ports {
  name: "RIGHT"
diff --git a/data/maps/daedalus/rooms/C Keyholder.txtpb b/data/maps/daedalus/rooms/C Keyholder.txtpb
index cc8548c..ef10a90 100644
--- a/data/maps/daedalus/rooms/C Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/C Keyholder.txtpb

@@ -3,4 +3,5 @@ panel_display_name: "North Area"
 keyholders {
  name: "C"
  path: "Components/KeyHolders/keyHolderC"
+  key: "c"
 }
diff --git a/data/maps/daedalus/rooms/D Keyholder.txtpb b/data/maps/daedalus/rooms/D Keyholder.txtpb
index 2521ab2..a5852be 100644
--- a/data/maps/daedalus/rooms/D Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/D Keyholder.txtpb

@@ -3,4 +3,5 @@ panel_display_name: "Plum Room"
 keyholders {
  name: "D"
  path: "Components/KeyHolders/keyHolderD"
+  key: "d"
 }
diff --git a/data/maps/daedalus/rooms/F Keyholder.txtpb b/data/maps/daedalus/rooms/F Keyholder.txtpb
index 662f76d..b424c6a 100644
--- a/data/maps/daedalus/rooms/F Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/F Keyholder.txtpb

@@ -3,4 +3,5 @@ panel_display_name: "West Area"
 keyholders {
  name: "F"
  path: "Components/KeyHolders/keyHolderF"
+  key: "f"
 }
diff --git a/data/maps/daedalus/rooms/Number Paintings Area.txtpb b/data/maps/daedalus/rooms/Number Paintings Area.txtpb
index 15c8875..c89bfcf 100644
--- a/data/maps/daedalus/rooms/Number Paintings Area.txtpb
+++ b/data/maps/daedalus/rooms/Number Paintings Area.txtpb

@@ -17,6 +17,7 @@ panels {
 keyholders {
  name: "G"
  path: "Components/KeyHolders/keyHolderG"
+  key: "g"
 }
 paintings {
  name: "WON"
diff --git a/data/maps/daedalus/rooms/Outside House.txtpb b/data/maps/daedalus/rooms/Outside House.txtpb
index fd3f5f0..fed9dda 100644
--- a/data/maps/daedalus/rooms/Outside House.txtpb
+++ b/data/maps/daedalus/rooms/Outside House.txtpb

@@ -75,6 +75,7 @@ panels {
 keyholders {
  name: "H"
  path: "Components/KeyHolders/keyHolderH"
+  key: "h"
 }
 paintings {
  name: "CASTLE2"
diff --git a/data/maps/four_rooms/rooms/Keyholder Room.txtpb b/data/maps/four_rooms/rooms/Keyholder Room.txtpb
index e7c7fa6..13c3dce 100644
--- a/data/maps/four_rooms/rooms/Keyholder Room.txtpb
+++ b/data/maps/four_rooms/rooms/Keyholder Room.txtpb

@@ -2,4 +2,5 @@ name: "Keyholder Room"
 keyholders {
  name: "A"
  path: "Components/KeyHolders/keyHolderA"
+  key: "a"
 }
diff --git a/data/maps/the_congruent/rooms/T Keyholder.txtpb b/data/maps/the_congruent/rooms/T Keyholder.txtpb
index 360b030..143ea53 100644
--- a/data/maps/the_congruent/rooms/T Keyholder.txtpb
+++ b/data/maps/the_congruent/rooms/T Keyholder.txtpb

@@ -2,4 +2,5 @@ name: "T Keyholder"
 keyholders {
  name: "T"
  path: "Components/KeyHolders/keyHolderT"
+  key: "t"
 }
diff --git a/data/maps/the_extravagant/rooms/X Plus.txtpb b/data/maps/the_extravagant/rooms/X Plus.txtpb
index 89b6da7..a1c4b9d 100644
--- a/data/maps/the_extravagant/rooms/X Plus.txtpb
+++ b/data/maps/the_extravagant/rooms/X Plus.txtpb

@@ -23,4 +23,5 @@ paintings {
 keyholders {
  name: "M"
  path: "Components/KeyHolders/keyHolderM"
+  key: "m"
 }
diff --git a/data/maps/the_gallery/rooms/Main Area.txtpb b/data/maps/the_gallery/rooms/Main Area.txtpb
index 5ba6b25..bc1606d 100644
--- a/data/maps/the_gallery/rooms/Main Area.txtpb
+++ b/data/maps/the_gallery/rooms/Main Area.txtpb

@@ -2,6 +2,7 @@ name: "Main Area"
 keyholders {
  name: "P"
  path: "Components/KeyHolders/keyHolderP"
+  key: "p"
 }
 paintings {
  name: "OWL"
diff --git a/data/maps/the_great/rooms/North Landscape.txtpb b/data/maps/the_great/rooms/North Landscape.txtpb
index f0fde77..fb11c42 100644
--- a/data/maps/the_great/rooms/North Landscape.txtpb
+++ b/data/maps/the_great/rooms/North Landscape.txtpb

@@ -52,6 +52,7 @@ panels {
 keyholders {
  name: "X"
  path: "Components/KeyHolders/keyHolderX"
+  key: "x"
 }
 ports {
  name: "INVISIBLE"
diff --git a/data/maps/the_hive/rooms/Main Area.txtpb b/data/maps/the_hive/rooms/Main Area.txtpb
index 0f73682..013390a 100644
--- a/data/maps/the_hive/rooms/Main Area.txtpb
+++ b/data/maps/the_hive/rooms/Main Area.txtpb

@@ -268,6 +268,7 @@ panels {
 keyholders {
  name: "B"
  path: "Components/KeyHolders/keyHolderB"
+  key: "b"
 }
 ports {
  name: "DAED1"
diff --git a/data/maps/the_jubilant/rooms/Side Area.txtpb b/data/maps/the_jubilant/rooms/Side Area.txtpb
index e924762..807f044 100644
--- a/data/maps/the_jubilant/rooms/Side Area.txtpb
+++ b/data/maps/the_jubilant/rooms/Side Area.txtpb

@@ -38,4 +38,5 @@ panels {
 keyholders {
  name: "J"
  path: "Components/KeyHolders/keyHolderJ"
+  key: "j"
 }
diff --git a/data/maps/the_nuanced/rooms/Main Room.txtpb b/data/maps/the_nuanced/rooms/Main Room.txtpb
index 8da3b5f..da89bd8 100644
--- a/data/maps/the_nuanced/rooms/Main Room.txtpb
+++ b/data/maps/the_nuanced/rooms/Main Room.txtpb

@@ -112,4 +112,5 @@ ports {
 keyholders {
  name: "S"
  path: "Components/KeyHolders/keyHolderS"
+  key: "s"
 }
diff --git a/data/maps/the_parthenon/rooms/U Keyholder.txtpb b/data/maps/the_parthenon/rooms/U Keyholder.txtpb
index 8248df8..0a5c31b 100644
--- a/data/maps/the_parthenon/rooms/U Keyholder.txtpb
+++ b/data/maps/the_parthenon/rooms/U Keyholder.txtpb

@@ -2,4 +2,5 @@ name: "U Keyholder"
 keyholders {
  name: "U"
  path: "Components/KeyHolders/keyHolderU"
+  key: "u"
 }
diff --git a/data/maps/the_partial/rooms/Obverse Side.txtpb b/data/maps/the_partial/rooms/Obverse Side.txtpb
index 75cd9bb..c0ce04b 100644
--- a/data/maps/the_partial/rooms/Obverse Side.txtpb
+++ b/data/maps/the_partial/rooms/Obverse Side.txtpb

@@ -106,6 +106,7 @@ keyholders {
  # This is one of the ones that's misnamed within the game.
  name: "L"
  path: "Components/KeyHolders/keyHolderI"
+  key: "l"
 }
 paintings {
  name: "F"
diff --git a/data/maps/the_quiet/rooms/Keyholder Room.txtpb b/data/maps/the_quiet/rooms/Keyholder Room.txtpb
index d0f2677..d3cab73 100644
--- a/data/maps/the_quiet/rooms/Keyholder Room.txtpb
+++ b/data/maps/the_quiet/rooms/Keyholder Room.txtpb

@@ -2,4 +2,5 @@ name: "Keyholder Room"
 keyholders {
  name: "Q"
  path: "Components/KeyHolders/keyHolderQ"
+  key: "q"
 }
diff --git a/data/maps/the_shop/rooms/Main Area.txtpb b/data/maps/the_shop/rooms/Main Area.txtpb
index d45e0f0..db93fe1 100644
--- a/data/maps/the_shop/rooms/Main Area.txtpb
+++ b/data/maps/the_shop/rooms/Main Area.txtpb

@@ -160,4 +160,5 @@ ports {
 keyholders {
  name: "N"
  path: "Components/KeyHolders/keyHolderN"
+  key: "n"
 }
diff --git a/data/maps/the_talented/rooms/Main Area.txtpb b/data/maps/the_talented/rooms/Main Area.txtpb
index cc3e222..f99be48 100644
--- a/data/maps/the_talented/rooms/Main Area.txtpb
+++ b/data/maps/the_talented/rooms/Main Area.txtpb

@@ -107,6 +107,7 @@ panels {
 keyholders {
  name: "Y"
  path: "Components/KeyHolders/keyHolderY"
+  key: "y"
 }
 ports {
  name: "GREAT"
diff --git a/data/maps/the_tenacious/rooms/Main Area.txtpb b/data/maps/the_tenacious/rooms/Main Area.txtpb
index 8190827..18356e7 100644
--- a/data/maps/the_tenacious/rooms/Main Area.txtpb
+++ b/data/maps/the_tenacious/rooms/Main Area.txtpb

@@ -2,4 +2,5 @@ name: "Main Area"
 keyholders {
  name: "K"
  path: "Components/KeyHolders/keyHolderK"
+  key: "k"
 }
diff --git a/data/maps/the_unkempt/rooms/Main Area.txtpb b/data/maps/the_unkempt/rooms/Main Area.txtpb
index ed3ce21..b5d29c4 100644
--- a/data/maps/the_unkempt/rooms/Main Area.txtpb
+++ b/data/maps/the_unkempt/rooms/Main Area.txtpb

@@ -212,6 +212,7 @@ panels {
 keyholders {
  name: "I"
  path: "Components/KeyHolders/keyHolderL"
+  key: "i"
 }
 ports {
  name: "GREAT"
diff --git a/data/maps/the_unkempt/rooms/V Keyholder.txtpb b/data/maps/the_unkempt/rooms/V Keyholder.txtpb
index 0906b2e..8a4941d 100644
--- a/data/maps/the_unkempt/rooms/V Keyholder.txtpb
+++ b/data/maps/the_unkempt/rooms/V Keyholder.txtpb

@@ -2,4 +2,5 @@ name: "V Keyholder"
 keyholders {
  name: "V"
  path: "Components/KeyHolders/keyHolderV"
+  key: "v"
 }
diff --git a/data/maps/the_unkempt/rooms/W Keyholder.txtpb b/data/maps/the_unkempt/rooms/W Keyholder.txtpb
index ae367b2..e16f997 100644
--- a/data/maps/the_unkempt/rooms/W Keyholder.txtpb
+++ b/data/maps/the_unkempt/rooms/W Keyholder.txtpb

@@ -2,4 +2,5 @@ name: "W Keyholder"
 keyholders {
  name: "W"
  path: "Components/KeyHolders/keyHolderW"
+  key: "w"
 }