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

biorand · Dec 8, 2023 · 663ece1 · 663ece1
1 parent 0773c40
commit 663ece1
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/IntelOrca.Biohazard.BioRand/data/re2/rdt.json b/IntelOrca.Biohazard.BioRand/data/re2/rdt.json
@@ -593,7 +593,7 @@
       ],
       "enemies": [
         {
-          "excludeTypes": [ 42, 58 ],
+          "excludeTypes": [ 40, 42, 58 ],
           "maxDifficulty": 2,
           "randomPlacements": false
         },
@@ -605,18 +605,21 @@
         },
         {
           "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 +1607,7 @@
       "enemies": [
         {
           "condition": "3:67 && !4:55",
+          "excludeTypes": [ 40 ],
           "player": 0
         },
         {
@@ -2035,11 +2039,13 @@
         },
         {
           "condition": "3:9 && !1:3",
+          "excludeTypes": [ 40 ],
           "scenario": 0,
           "player": 1
         },
         {
           "condition": "!1:3",
+          "excludeTypes": [ 40 ],
           "scenario": 1,
           "player": 1
         }
@@ -3357,11 +3363,13 @@
       "enemies": [
         {
           "condition": "$27 != 1536 && !34:43",
+          "excludeTypes": [ 40 ],
           "scenario": 1,
           "player": 0
         },
         {
           "condition": "$27 != 1536",
+          "excludeTypes": [ 40 ],
           "player": 1
         }
       ]
@@ -3388,7 +3396,7 @@
       "enemies": [
         {
           "excludeOffsets": [ 10858 ],
-          "excludeTypes": [ 58 ],
+          "excludeTypes": [ 40, 58 ],
           "restricted": true
         }
       ]
@@ -3958,31 +3966,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 +4365,13 @@
       ],
       "enemies": [
         {
+          "excludeTypes": [ 40 ],
           "restricted": true,
           "scenario": 0
         },
         {
           "condition": "!4:137",
+          "excludeTypes": [ 40 ],
           "restricted": true,
           "scenario": 1
         }