mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-08-13 17:03:47 -04:00
Code Issues Projects Releases Wiki Activity

Fix for "Fewer Tunic Requirements" allowing child access to Fire Temple Boulder Maze (#3273)

Browse Source 
* Add `IsAdult` to Fewer Tunic Requirements check for `FireTimer` in rando logic to preven placing items in lower maze expecting child to get them.

* After discussion, decided to change it to lock access only to lower maze so child access with dungeon shuffle remains intact.
Also changed the tooltip for Fewer Tunic Requirements to reflect the current status of what the trick enables.

* Further update to tooltip.
This commit is contained in:
Malkierian 2023-10-26 17:38:10 -07:00 committed by GitHub
parent 743be7b684
commit de430dc256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
View File

@ -138,7 +138,7 @@ void AreaTable_Init_FireTemple() {
//Exits
Entrance(FIRE_TEMPLE_FIRE_PILLAR_ROOM, {[]{return SmallKeys(FIRE_TEMPLE, 4);}}),
Entrance(FIRE_TEMPLE_SHORTCUT_CLIMB, {[]{return Here(FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}),
Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return (GoronBracelet || (IsAdult && LogicFireStrength)) && (HasExplosives || (IsAdult && (CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT))));}}),
Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return IsAdult && (GoronBracelet || LogicFireStrength) && (HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT));}}),
});
areaTable[FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {

2
soh/soh/Enhancements/randomizer/randomizer_tricks.cpp
View File

@ -38,7 +38,7 @@ std::unordered_map<RandomizerTrick, RandomizerTrickObject> rtObjects = {
RT_OBJECT(RT_ISG, RTVORMQ_BOTH, RTAREA_GENERAL, &advancedBase, true, "ISG", "Enables locations requiring use of the infinite sword glitch."),
RT_OBJECT(RT_VISIBLE_COLLISION, RTVORMQ_BOTH, RTAREA_GENERAL, &noviceBase, false, "Pass Through Visible One-Way Collision", "Allows climbing through the platform to reach Impa's House Back as adult with no items and going through the Kakariko Village Gate as child when coming from the Mountain Trail side."),
RT_OBJECT(RT_GROTTOS_WITHOUT_AGONY, RTVORMQ_BOTH, RTAREA_GENERAL, &noviceBase, false, "Hidden Grottos without Stone of Agony", "Allows entering hidden grottos without the Stone of Agony."),
RT_OBJECT(RT_FEWER_TUNIC_REQUIREMENTS, RTVORMQ_BOTH, RTAREA_GENERAL, &intermediateBase, false, "Fewer Tunic Requirements", "Allows the following possible without Tunics: - Enter Water Temple. The area below the center pillar still requires Zora Tunic. Applies to MQ also. - Enter Fire Temple. Only the first floor is accessible, and not Volvagia. Only Applies to MQ."),
RT_OBJECT(RT_FEWER_TUNIC_REQUIREMENTS, RTVORMQ_BOTH, RTAREA_GENERAL, &intermediateBase, false, "Fewer Tunic Requirements", "Allows the following possible without Tunics:\n- Enter Water Temple. The area below the center pillar still requires Zora Tunic. Applies to MQ also.\n- Enter Fire Temple. Volvagia still requires Goron tunic. Applies to MQ also, and includes child access to first floor with dungeon shuffle."),
RT_OBJECT(RT_RUSTED_SWITCHES, RTVORMQ_BOTH, RTAREA_GENERAL, &noviceBase, false, "Hammer Rusted Switches Through Walls", "Applies to: - Fire Temple Highest Goron Chest. - MQ Fire Temple Lizalfos Maze. - MQ Spirit Trial."),
RT_OBJECT(RT_FLAMING_CHESTS, RTVORMQ_BOTH, RTAREA_GENERAL, &intermediateBase, false, "Flaming Chests", "The chests encircled in flames in Gerudo Training Grounds and in Spirit Temple can be opened by running into the flames while Link is invincible after taking damage."),
//RT_OBJECT(RT_BUNNY_HOOD_JUMPS, RTVORMQ_BOTH, RTAREA_GENERAL, &advancedBase, false, "Bunny Hood Jumps", "Allows reaching locations using Bunny Hood's extended jumps."),