inject: fix trigger types in Khamoon levels (LostArtefacts#945)

Converted City of Khamoon trapdoor triggers in rooms 31 and 34 to dummy type. Converted Obelisk of Khamoon trigger in room 66 to switch type. Resolves LostArtefacts#942.
walkawayy · Aug 26, 2023 · bacbddf · bacbddf
1 parent 259c040
commit bacbddf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - fixed the reset and unbind progress bars in the controls menu for non-default bar scaling (#930)
 - fixed original data issues where music triggers are not set as one shot (#939)
 - fixed a missing enemy trigger in Tomb of Tihocan (#751)
+- fixed incorrect trapdoor triggers in City of Khamoon and a switch trigger in Obelisk of Khamoon (#942)
 - improve spanish localization and added translation for rotated pickups
 
 ## [2.15.3](https://github.com/rr-/Tomb1Main/compare/2.15.2...2.15.3) - 2023-08-15

diff --git a/README.md b/README.md
@@ -292,6 +292,8 @@ Not all options are turned on by default. Refer to `Tomb1Main_ConfigTool.exe` fo
 - fixed dead centaurs exploding again after saving and reloading
 - fixed the following floor data issues:
     - **Tomb of Tihocan**: missing trigger in room 62 for enemy 34
+    - **City of Khamoon**: incorrect trapdoor trigger types in rooms 31 and 34
+    - **Obelisk of Khamoon**: missing switch trigger type in room 66
 
 #### Cheats
 - added a fly cheat

diff --git a/bin/cfg/Tomb1Main_gameflow.json5 b/bin/cfg/Tomb1Main_gameflow.json5
@@ -318,6 +318,7 @@
             "type": "normal",
             "music": 59,
             "injections": [
+                "data/khamoon_fd.bin",
                 "data/khamoon_textures.bin",
             ],
             "sequence": [

diff --git a/bin/data/khamoon_fd.bin b/bin/data/khamoon_fd.bin
diff --git a/bin/data/obelisk_fd.bin b/bin/data/obelisk_fd.bin