Logic Fixes & Some Tricks

[r0bd0g]

Changes/Notes:

I probably messed a few things up so please look over it closely!

General:

• Gave the tricks and tags and once over looking for anything relevant to silver rupee shuffle.
• Added full silver rupee shuffle to Hell Mode. Adjusted the enabled tricks to match the changes made here.
• Reordered the checks to consistently put silver rupees last, before GS, in any region they feature.
• Removed those extra spaces again.

MQ DC:

• I thought it'd be easier to understand if we just make a region for the silver rupee on the vines. (In the past I've considered separating staircase lower and upper to better reflect how the region is actually accessed, but I haven't done this because I don't want to have pointless full logic for lowering the stairs.)

Ganon's:

• Spirit Trial first chest needs a way to hit the switch to spawn it now that the door might already be open when you enter.
• Moved the tunic/FTR check onto Fire Trial region access.
• Removed the Hover Boots option to reach centre right rupee under FTR because I don't feel the Hover Boots help enough. If you don't take them on and off in the right way, they will actually cost you time. But then I felt that this rupee was just barely too tight for FTR, so I've put hard required tunic on it.
• If silver rupees aren't shuffled, you'll need to hard require Goron Tunic to collect them all at once. I added this line, but it's not necessary anymore since I decided to make one of the rupees hard require tunic anyway. Is it worth having anyway?
• I'm assuming the back right silver rupee is the one by the torch slug. Please confirm that that's correct. To get this rupee as child requires kind of difficult platform height management, so I've opted to make it a trick.

MQ Ganon's:

• Moved the tunic/FTR check onto Fire Trial region access. Not sure why honestly.
• Hookshot trick route to reach the end of the trial requires the Golden Gauntlets pillar.
• Decided to hard require tunic for most of MQ Fire Trial. Most of the Hover Boots checks were not really needed, you could make it in reasonable time without them, they just made one jump to the 2nd moving platform slightly easier. (Reaching the end of the trial would have been reasonable without tunic also, which was missed previously.) Because each rupee would basically require its own trip, plus needing a bit of knowhow in a pretty tricky room, let's give people time to breathe. The only rupee reasonable for child is the one on the rising platform. I decided to leave that one only as tunic/FTR.
• The back left rupee can be obtained without the gauntlets by jumping off of the rising platform that you would normally use to jump to the gauntlets block. It's actually a pretty straight-forward jump (just don't be weird and try to do it with Hovers on).

GTG:

• Reworked the hookshotless GTG trick to separate the ceiling rupee from the flame wall. (Also combined the two ceiling rupee tricks together even though the MQ version of the trick is a bit harder.) It didn't make sense to keep them combined anymore now that they are no longer required to be performed together to achieve something useful.
• Removed checking is child/rupee shuffle on the individual lava room rupees. If shuffle is off, then really if they're appearing in the playthrough they should appear all at once, since they uncollect if you don't succeed in collecting them all. I would say instead maybe they shouldn't appear in the playthrough at all but, if neither of those things are going to happen then I don't think it makes sense to limit when they can appear in the playthrough beyond when you first have the ability to collect them individually. Previous logic checked for adult on the individual rupees but I think the logic to ensure you can collect them all at once should be moved onto the door to the water room. Just the flame circle rupee confirmed possible as adult should be enough, which means either Song of Time or Hover Boots [or maybe some day, precise jumps], but since you can't do anything in the water room with the shuffle off without Song of Time anyway, there's no need to actually check for anything.
• I arbitrarily moved stuff around in the lava room based on my notes on how things connect together. I don't think I actually changed anything, and I don't think the end result is actually cleaner; it's probably worse honestly.
• Removed is_child as an option for going from lava back to centre maze since child is never coming from that direction.
• Removed Boomerang as an option for the Hookshot target rupee.
• I opted to not touch, for now, adding tricks for doing precise jumps to get around the lava room. I would, except the MQ version of this room is too confusing. I will have to continue to think about what I want to do for tricks in this room.
• I added a trick for obtaining the highest underwater rupee with Gold Scale. Since I was so close to putting this into default logic, I wanted to add this as an option sooner than later. The camera is horrible to you as you attempt to do this, but luckily the current always pulls you directly into the rupee pretty quickly. Actually the final straw that made me decide to make this a trick is that as child, the currently usually does not pull you into the rupee, so you would have to find it while the camera is making zero sense.
• Added a separate region for going underwater.

MQ GTG:

• Got rid of the extra region with the Iron Knuckle chest since it's not logically different from accessing the following room.
• Removed here() around has_fire_source b/c it doesn't do anything as far as I could figure. And technically beating the Iron Knuckle could also be wrapped in a here(), and having here()s for both for no reason seemed wasteful.
• Removed the check for hookshot/trick on accessing Stalfos room since the flame wall to the left was removed in MQ.
• Removed jumpslashing the switch in the eye statue room from default logic; new trick. It's not THAT hard but it used to already be gated by another trick, hookshotless MQ GTG.
• Reorganized the Lava Room, including adding a region for the entrance to the water room for no real reason. It seemed nicer to have it as a go-between but I don't know maybe it's just complicated for no reason.
• I think I've fixed some bugs while restructuring the lava room but I'm not sure what all I might have fixed, or maybe might have broken. It's a confusing room. I think the main thing that was missed before is that you can make use of the hookshot target that spawns on maze right to aid in collecting the rupees. (I opted not to use a named event for this since I only would have been able to call on it two times. Three times and I would have.)
• I added a route from the back to the water room using Hookshot and the targets that spawn from having the rupees already. A slight issue with this route is that there's a bubble that spawns right on this target and blasts you into the lava, lol. You have to hookshot the right side of it. Deal with it I guess?
• I want to point out also that it's possible to use the Hookshot pillars that spawn from collecting the rupees to go from back rupees to the water room door, but that jump from the pillar to the door is also precise, so it's kind of pointless when you could just do the normal precise jump instead. Again, I'm currently avoiding precise jump tricks in this room.
• There's a route from maze-right back to the front using Hookshot that used to be gated by one of the left side longshot skip tricks. I decided that now that it could come up without any tricks enabled, that it probably is just barely too awkward for default logic, and have made it a new trick. I really didn't know what to call this. I'm avoiding tricks in this room because who knows how the tricks in here ought to be structured, and this isn't a super impactful trick, but since this was technically in logic before I didn't want to completely remove it now just because silver rupee shuffle exists.
• Unlike in vanilla GTG, here you do need to confirm that you have the ability to collect all of the rupees in one go when the shuffle is off. If you got to the back left rupee using Hover Boots, you're fine to collect all of them with Hovers. The other way you can get to the back left rupee when the shuffle is off is by jumping down from the right side of the maze. Hookshot confirms we can get back up in order to collect the rest of the rupees.
• Added a separate region for going underwater.

Shadow:

• Hookshot is not needed for the single giant pot GS. It was previously only checked for collecting the rupees.

MQ Shadow:

• Added two regions to remove some repetition in the invisible blades room.
• Removed damage logic from the two rupees that can be collected without getting within range of the blades. Also renamed them to easily see which ones have the different logic.

Spirit:

• The child loop region wasn't really doing anything since one of Boomerang or Silver Rupees were required to get the Skulltula, and those will let you into beyond metal bridges anyway, so we can just leave the skulltula in the beyond metal bridges region. Some aspects of the logic I'm adding to this skull make more sense viewed as being on the other side of the bridge so it's not completely out of place in this region.
• If the gate by the skulltula is down then you can kill it with more than just child projectiles. Deku Stick jumpslash seems perfectly fine, as does Din's Fire.
• If the gate isn't down, these items can all be used to kill the fence skulltula through the fence, and then you can climb on the gate on the wrong side and collect it through the gate. I've added a new trick for these methods, as an alternative to collecting the rupees to bring down the gate. Kokiri Sword jumpslash is too short to kill it from the ground: you'd have to climb the fence slightly, let go, and jumpslash it. So regardless of whether the fence is down, Kokiri Sword would have to be a trick. I wouldn't make a trick just for something that only would skip Sticks, but rather than not cover it at all I opted to fold it into the trick I made for collecting it through the fence. I felt that this trick was too classic not to add right now.
• The check for Silver Rupees on the shared route for the Sun Block Room Chest was in the wrong place.
• But because I'm adding a trick that allows you skip the rupees when using Sticks, I had to check for the rupees in both places. While this trick is pretty hard, I felt it was pretty classic and as such deserved to be added now. (Also I was thinking about Spirit Temple and if I do this now I won't have to think about it as hard again next time.)
• All 'free' checks in the main room and sun block room need additional logic to confirm you can actually get them, as was done with the pots previously. Honestly maybe the 'free' checks should have their own region to avoid repetition at this point.

MQ Spirit

• I considered, but opted not to add at this time, a trick for collecting the silver rupee in the water jet by longshotting to the chest that that rupee normally helps to spawn.

[r0bd0g]

I got assistance from RealRob who checked the MQ Shadow flags in whatever program it is you can check flags in.

What would you have done differently in MQ GTG? I'm open to suggestions. Missing from the previous version was, after hitting the switch to spawn the target on maze right, you can hookshot up to it, allowing you to get the silvers by jumping down from maze right without having to be in maze right when you light the torch (with fire arrows being the only way to light it from there). I couldn't think of a great way to capture that without using events (maybe I could have exited from maze right after checking a lot of items, but it seemed simpler to understand doing it this way). I think before also there was no route for jumping to the back left rupee from maze right?, the only route being going from the rest of the back rupees to the back right rupee (mainly with hovers). And this route existing necessitated checking for some items to confirm all of the rupees could be collected in one go if the shuffle was off. There was a route also into the water room that didn't collect the silver rupees for some reason? That could have been bad. There was a route from back rupees to water room that I think was intending to jump from the spawned hookshot targets from if you have all of the rupees already? But I felt that that jump was too precise. It's a difficult room to understand, there's so much going on, it's hard to figure out exactly what all the practical differences are between the two implementations.

There might be some connections that I don't technically need? I guess I don't need the exit from maze right to back rupees since fire arrows can already get you there from the back areas. Since Fire Arrows are the only way to light the torch when coming from back areas (without going over to the torch directly with one of the routes you can use to get there), you must have bow, which could get you to the front of the room from the other direction, so the connection from back rupees to front rupees with hovers/hook might not be necessary, not entirely sure. The connection from water room entrance to front rupees might be fine with just din's fire rather than any fire source, also not entirely sure. I didn't want to pare those last couple of things back if I wasn't positive lol.