Merge 'Adding missing locations back into Advanced Logic' (#2524)

Author: cjohnson57

CHANGELOG.md

@@ -20,6 +20,7 @@
 * Add two missing locations: `Ganons Castle MQ Shadow Trial Explosives Wonderitem` and a `Bombable Fairy` in MQ Jabu.
 * Improve the error message when a settings string from the wrong randomizer version is imported.
 * Fix wrong Goal hints being generated for worlds other than the first in multiworld seeds.
+* Added some missing or incorrectly named locations in advanced logic.
 
 ## Other Changes
 * It is no longer required to have either the goron tunic or the Fewer Tunic Requirements trick for adult to go from the Bolero warp pad to the Fire temple in logic.

data/Glitched World/Forest Temple MQ.json

@@ -117,7 +117,7 @@
             "Forest Temple Twisted Hallway Switch": "True"
         },
         "locations": {
-            "Forest Temple MQ ReDead Chest": "has_soul(Redead_and_Gibdo)"
+            "Forest Temple MQ Redead Chest": "has_soul(Redead_and_Gibdo)"
         },
         "exits": {
             "Forest Temple NW Outdoors": "True",

data/Glitched World/Ganons Castle MQ.json

@@ -1,6 +1,7 @@
 [
     {
         "region_name": "Ganons Castle Lobby",
+        "dungeon": "Ganons Castle",
         "exits": {
             "Castle Grounds From Ganons Castle": "True",
             "Ganons Castle Main": "

data/Glitched World/Jabu Jabus Belly MQ.json

@@ -104,6 +104,15 @@
             "Jabu Jabus Belly MQ Falling Like Like Room Chest": "has_soul(Like_Like)",
             "Jabu Jabus Belly MQ Falling Like Like Room Pot 1": "True",
             "Jabu Jabus Belly MQ Falling Like Like Room Pot 2": "True",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Right Cow Wonderitem 1": "True",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Right Cow Wonderitem 2": "True",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Right Cow Wonderitem 3": "True",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Left Cow Wonderitem 1": "True",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Left Cow Wonderitem 2": "True",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Left Cow Wonderitem 3": "True",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Explosives Wonderitem 1": "has_explosives",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Explosives Wonderitem 2": "has_explosives",
+            "Jabu Jabus Belly MQ Falling Like-Like Room Explosives Wonderitem 3": "has_explosives",
             "Jabu Jabus Belly MQ Hallway Small Crate 1": "True",
             "Jabu Jabus Belly MQ Hallway Small Crate 2": "True",
             "Bombable Fairy": "has_bottle and has_explosives"

data/Glitched World/Overworld.json

@@ -3460,7 +3460,7 @@
         "region_name": "Kak Redead Grotto",
         "scene": "Kak Redead Grotto",
         "locations": {
-            "Kak ReDead Grotto Chest": "can_kill_redead"
+            "Kak Redead Grotto Chest": "can_kill_redead"
         },
         "exits": {
             "Kakariko Village": "True"

data/Glitched World/Shadow Temple MQ.json

@@ -136,7 +136,8 @@
             "Shadow Temple MQ Invisible Blades Silver Rupee 3": "True",
             "Shadow Temple MQ Invisible Blades Silver Rupee 4": "True",
             "Shadow Temple MQ Invisible Blades Silver Rupee 5": "True",
-            "Shadow Temple MQ Invisible Blades Silver Rupee 6": "True"
+            "Shadow Temple MQ Invisible Blades Silver Rupee 6": "True",
+            "Shadow Temple MQ Invisible Blades Silver Rupee Like Like": "True"
         }
     },
     {

version.py

@@ -1,4 +1,4 @@
-__version__ = '9.0.29'
+__version__ = '9.0.30'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0