Fix #687: RE 2, room 219, crash due to G-Adult

biorand · Dec 8, 2023 · 05615c0 · 05615c0
1 parent 0773c40
commit 05615c0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/IntelOrca.Biohazard.BioRand/RE2/Re2EnemyHelper.cs b/IntelOrca.Biohazard.BioRand/RE2/Re2EnemyHelper.cs
@@ -198,6 +198,10 @@ public void SetEnemy(RandoConfig config, Rng rng, SceEmSetOpcode enemy, MapRoomE
                     {
                         enemy.State = 1;
                         enemy.SoundBank = 21;
+                        if (enemy.Id != 0)
+                        {
+                            throw new Exception("G-Adult not set for ID_EM_0");
+                        }
                     }
                     break;
             }

diff --git a/IntelOrca.Biohazard.BioRand/data/re2/rdt.json b/IntelOrca.Biohazard.BioRand/data/re2/rdt.json
@@ -560,6 +560,7 @@
       "enemies": [
         {
           "nop": [ "0x2DEC-0x2E90" ],
+          "excludeTypes": [ 40 ],
           "randomPlacements": true
         }
       ]
@@ -593,30 +594,34 @@
       ],
       "enemies": [
         {
-          "excludeTypes": [ 42, 58 ],
+          "excludeTypes": [ 40, 42, 58 ],
           "maxDifficulty": 2,
           "randomPlacements": false
         },
         {
           "nop": [ "0x10A8", "0x0F86-0x0F94" ],
+          "excludeTypes": [ 40 ],
           "randomPlacements": true,
           "scenario": 0,
           "player": 0
         },
         {
           "condition": "4:15",
+          "excludeTypes": [ 40 ],
           "randomPlacements": true,
           "scenario": 1,
           "player": 0
         },
         {
           "condition": "4:15",
+          "excludeTypes": [ 40 ],
           "randomPlacements": true,
           "scenario": 0,
           "player": 1
         },
         {
           "nop": [ "0x0F90", "0x0F3C-0x0F4A" ],
+          "excludeTypes": [ 40 ],
           "randomPlacements": true,
           "scenario": 1,
           "player": 1
@@ -1604,6 +1609,7 @@
       "enemies": [
         {
           "condition": "3:67 && !4:55",
+          "excludeTypes": [ 40 ],
           "player": 0
         },
         {
@@ -1764,6 +1770,7 @@
         },
         {
           "condition": "3:5 && !1:3",
+          "excludeTypes": [ 40 ],
           "player": 1
         }
       ],
@@ -2035,11 +2042,13 @@
         },
         {
           "condition": "3:9 && !1:3",
+          "excludeTypes": [ 40 ],
           "scenario": 0,
           "player": 1
         },
         {
           "condition": "!1:3",
+          "excludeTypes": [ 40 ],
           "scenario": 1,
           "player": 1
         }
@@ -2073,6 +2082,7 @@
         },
         {
           "condition": "!1:3",
+          "excludeTypes": [ 40 ],
           "player": 1
         }
       ],
@@ -3357,11 +3367,13 @@
       "enemies": [
         {
           "condition": "$27 != 1536 && !34:43",
+          "excludeTypes": [ 40 ],
           "scenario": 1,
           "player": 0
         },
         {
           "condition": "$27 != 1536",
+          "excludeTypes": [ 40 ],
           "player": 1
         }
       ]
@@ -3388,7 +3400,7 @@
       "enemies": [
         {
           "excludeOffsets": [ 10858 ],
-          "excludeTypes": [ 58 ],
+          "excludeTypes": [ 40, 58 ],
           "restricted": true
         }
       ]
@@ -3958,31 +3970,31 @@
         },
         {
           "condition": "!3:67",
-          "excludeTypes": [ 58 ],
+          "excludeTypes": [ 40, 58 ],
           "restricted": true,
           "doorRando": false,
           "scenario": 0,
           "player": 1
         },
         {
           "condition": "!34:43",
-          "excludeTypes": [ 58 ],
+          "excludeTypes": [ 40, 58 ],
           "restricted": true,
           "doorRando": false,
           "scenario": 1,
           "player": 1
         },
         {
           "condition": "3:133",
-          "excludeTypes": [ 58 ],
+          "excludeTypes": [ 40, 58 ],
           "restricted": true,
           "doorRando": true,
           "scenario": 0,
           "player": 1
         },
         {
           "condition": "3:132",
-          "excludeTypes": [ 58 ],
+          "excludeTypes": [ 40, 58 ],
           "restricted": true,
           "doorRando": true,
           "scenario": 1,
@@ -4357,11 +4369,13 @@
       ],
       "enemies": [
         {
+          "excludeTypes": [ 40 ],
           "restricted": true,
           "scenario": 0
         },
         {
           "condition": "!4:137",
+          "excludeTypes": [ 40 ],
           "restricted": true,
           "scenario": 1
         }