Commit Graph

80 Commits

Author SHA1 Message Date
aerinon
19e9738c42 Merge branch 'MinorCleanup' into DoorDev
# Conflicts:
#	DoorShuffle.py
#	Doors.py
2019-11-01 16:18:37 -06:00
aerinon
e08bf3776a Ice Palace added
Dynamic logical doors added for ice cross w/ push block
Improved crystal switch pathing
Minor update to PoD
2019-11-01 16:13:23 -06:00
aerinon
90c3368f9d Revamped dungeon generation
Revamped key logic generation
Prevent key floods in playthrough/can_beat_game checks
2019-10-31 11:09:58 -06:00
aerinon
050ae66bf6 Thieves Town 2019-10-25 13:50:37 -06:00
aerinon
b27dd2f64f Finishing up interior doors for Eastern 2019-10-24 22:45:03 -06:00
aerinon
be03fc214d Adding some more interior doors to HC and Eastern 2019-10-22 23:00:07 -06:00
aerinon
01a4d4b872 Generation tweaks and fixes
- Flooding the keys in swamp
- Logical dead ends
- The pinball exception
2019-10-21 22:32:49 -06:00
aerinon
beb15951a0 Skull Woods added
Fixed polarity for stairs
Some swamp fixes
Prep work for dungeons that can require traversal through overworld - like skull woods
Special case for pinball room so it can be in Skull 2 or Skull 1
2019-10-17 16:35:13 -06:00
aerinon
7db3c82e70 More swamp fixes
Removed Left Drain to Right (switch resets)
2019-10-16 06:57:57 -06:00
aerinon
a0fdb25b43 Spirals for Swamp
Swamp Logic
Door definition cleanup
Stabs at Swamp events and Crystal Switches
2019-10-11 16:53:46 -06:00
aerinon
87ff92ba7c Swamp regions and doors 2019-10-09 16:46:26 -06:00
aerinon
2ced48c691 Incorporated key logic prototype in the rules.
Relaxed key_layout_validation more (allows keys to lead to more keys)
2019-10-08 16:57:27 -06:00
aerinon
92ad60bedf Key Door Shuffle algorithm added 2019-10-03 16:27:44 -06:00
aerinon
5cc4fdfa1f Added PoD
Added Logic for Desert,Hera,Aga,PoD
Revamped Logic for HC, Eastern
2019-10-03 09:24:27 -06:00
aerinon
5eb0e6e379 Aga Tower preliminary check in 2019-09-20 21:24:46 -06:00
aerinon
e66908816d Kill Landing/Warp End "Doors" 2019-09-19 14:44:33 -06:00
aerinon
6534aaecc6 Tower of Hera Door
Logical Doors
2019-09-19 14:40:16 -06:00
randall.rupper
6f5121c028 Updated desert to be more compatible with logic changes (no logic yet)
Refactored doors to clean up builder flags.
2019-09-16 15:10:37 -06:00
randall.rupper
dc74df793c Merge branch 'DoorDev' into DoorExtension
# Conflicts:
#	DoorShuffle.py
#	Doors.py
#	Regions.py
2019-09-16 14:02:32 -06:00
tolmar
6ac00c2968 Eastern Palace Logic
Works sometimes. Either needs a south-facing big key door hack, or a way to avoid placing big key doors in places where you can see their back.
2019-09-15 11:35:35 -07:00
tolmar
40f345df13 Simple key logic for Escape
Adds ability to make a location for required keys (enemy drops and pots), so the filler knows about them.

Uses the most pessimistic possible rule to make sure you can't keylock yourself in Escape.
2019-09-15 02:28:04 -07:00
tolmar
b1e20c9c94 Revert forced keys change
I think I found a better way to do it
2019-09-15 00:27:51 -07:00
randall.rupper
97c225ab2f Desert Regions, Doors, and fixes associate with the new stuff
Updated generation algorithm to use new Sector object
Moved Dungeon items back for now
Created region lists for ease of grouping
2019-09-13 16:38:23 -06:00
tolmar
861195eb8b Add internal key data
Adds forced keys (enemy and pot drops) to regions, adds key doors within supertiles.
2019-09-07 16:39:39 -07:00
randall.rupper
ac01262a31 Refactored normal doors to use a lookup table. Now the door table is <4k
Fixed graphics between HC/Sewers and cross dungeons.
Added base work for spiral staircases in HC/Eastern. (More data needed for other dungeons.)
Added new region to deal with push blocks in Sewers Secret Room
Refactored asm to be in multiple files.
2019-09-04 16:34:59 -06:00
tolmar
5a891c68d1 Fill in standard mode shuffle
A bit ugly for now, but it basically works. Still needs logic.
2019-08-26 21:37:31 -07:00
aerinon
1e495de31c Spoiler additions for doors 2019-08-26 21:59:02 -06:00
randall.rupper
c87c767835 Upgrades doors to be written out by the rom. (No testing today)
Added some various modes to play around with.
Fixed prototype's generation code to run
2019-08-23 16:52:53 -06:00
randall.rupper
ad3770e534 An initial commit.
ASAR asm patch included with test tables.
Eastern and Hyrule Castle regions created from a while ago.
Currently broken because boss prizes are unreachable.
2019-08-22 12:03:55 -06:00
Bonta-kun
1a62b1da28 Multiworld core implementation By Bonta0
Does not include the server/client code or the rom writes
specific to it. Indeed it cannot write multiworld roms at
all right now, pending addition future updates to support
the official ALTTPR Multiworld client.

Includes some GUI changes by Alaszun

Co-authored-by: Alaszun <koelze@google.com>
2019-07-11 20:39:08 -04:00
AmazingAmpharos
d6babfe222 Fix Fairy Ascension as bunny
A longstanding issue is that Fairy Ascension Cave has been treated as a simple two way connector, but in reality bunny cannot "logically" go through the cave in reverse as it requires lifting some pots with super bunny. This super bunny state is effectively unavoidable and can really only be lost if you have Boots and foolishly bonk before lifting a pot, but for logical consistency fixing this is the right thing to do. The logic should now correctly see that the cave is a two way connection with no particular item requirements in general but that the reverse direction isn't bunny transversable.
2019-04-22 16:41:33 -05:00
AmazingAmpharos
0cd86c9a61 Updated hint text
Hopefully these text changes will make the hints less cryptic for more users.
2019-04-10 17:03:01 -05:00
AmazingAmpharos
91bee4f1b9 The rest of the helpful hint system
This should now work fairly completely. I've added the IR's junk hint text, updated the base ROM to v30, added a checkbox to the GUI/option to the command line to control the hint system, and fixed a bug in the previous upload that listed Skull Woods final erroneously in two arrays. I also now shuffle the Silver Arrow locations before hinting at the first one (so if multiple Silver Arrows are in a seed, all of them are equally likely to be the one Ganon hints at) and now call out "Castle Tower" in hints as a unique location and not as "Hyrule Castle" (what was I thinking on that?).
2019-01-23 03:04:42 -06:00
AmazingAmpharos
b2defa664d Hint system prototype
The junk hints still need filled in. For now, they're just clones of the Tavern Man hints. Also I haven't really tested this at all beyond verifying it runs and the ROM it makes boots. That needs to be addressed of course.
2019-01-20 01:01:02 -06:00
Kevin Cathcart
54926a17f4 Additional v30 updates 2018-09-26 17:34:15 -04:00
Kevin Cathcart
5539143f00 v30 updates 2018-09-22 22:51:54 -04:00
Kevin Cathcart
9bd9bb4f93 Shop implementation
Also a few retro mode fixes
2018-03-18 21:01:45 -04:00
Kevin Cathcart
3592d12bfd Convert several locations to using events
Event locations automatically get Moon Perarl requirements added, and
ensure the other referenced location is listed in the spoiler log's path
section
2018-03-18 01:39:48 -04:00
Kevin Cathcart
e100b5cd93 Rename Very misleading entrance/region 2018-03-02 19:07:55 -05:00
Kevin Cathcart
eb8cff4d5a Model Link's house and Houlihan room
This is mostly to have all the interesting exits actually included in
the source
2018-02-24 14:22:36 -05:00
AmazingAmpharos
9c9636316e Regionalize King's Grave
This is necessary to account for exiting here without otherwise having access to the area behind the rocks. Will mostly come up in insanity but has some extreme niches where it could matter in full.
2018-02-19 20:30:56 -06:00
AmazingAmpharos
3471a9394a Regionalize some West Dark World stuff
The Dark World Hammer Pegs area and the Dark World shop in VoO are both regionalized to handle the possibility of connectors leading to them. Also an oversight in regionalizing Desert Palace that had broken the vanilla shuffle is corrected.
2018-02-11 22:04:58 -06:00
Kevin Cathcart
165feee1cd Dedupe 2018-02-10 18:12:49 -05:00
Kevin Cathcart
6b7e2d86f1 Regionized Northeast Dark World 2018-02-09 01:12:11 -05:00
AmazingAmpharos
bded86957d Desert bunny fix and super bomb logic updates
Desert Palace's main section is now broken into outer and inner regions separated by the pots, and the inner region is flagged as bunny impassable which should prevent the use of the central portion of Desert Main as a bunny by the logic while still permitting the outer two doors to be used as a connection.

Super Bomb logic was supposed to just be a small tweak to take care of the TODO on adding those three insanity only bomb shop locations to the logic, but then I realized that the rules for most of Death Mountain could be liberalized somewhat since that Flute to take the bomb away is also a direct access method and took care of all that. Hopefully Super Bomb logic won't need further tweaks for a good long while.
2018-02-08 04:40:16 -06:00
Kevin Cathcart
39f177dfa3 Fix incorrect rules for death mountain entrance cave
also some related fixes to super bomb logic
2018-02-06 23:21:04 -05:00
Kevin Cathcart
f39886579a Add cross world bunny logic 2018-02-06 19:18:13 -05:00
Kevin Cathcart
c8f1ed28ef Updates to Region tag
Modify Region taging to include a Dungeon Tag
Refactor to use helper methods to make it easier to see the types.
Add an underlying enum for storage on the region class
2018-02-06 19:18:12 -05:00
AmazingAmpharos
9af585f1aa Typo fix 2018-01-21 20:35:31 -06:00
AmazingAmpharos
2dbd376f64 Tag regions by world
All regions now have a property for 'Light', 'Dark', or 'Inside' for future logic use.
2018-01-18 19:20:33 -06:00