Commit Graph
2420 Commits
Author SHA1 Message Date
aerinon a38ef2820a Incremental improvements to algorithm.
Can get stuck in loop because it ran into a dead end only option early, not sure how to avoid that.
Also, some landings are considered outstanding doors, that shouldn't happen.
2019-09-16 22:10:25 -06:00
randall.rupper 49e782b050 Intermediate commit to switch from work to home 2019-09-16 21:12:55 -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
aerinon ada06cb519 Merge pull request #9 from aerinon/DoorShuffleStandardModeDev
Logic!
2019-09-16 13:06:19 -06:00
tolmar 64bdedf1e3 Loosen EP rules
EP boss rules no longer need BK+bow, since those were actually requirements of the rooms leading up to the boss.
2019-09-15 23:41:08 -07:00
tolmar dda7dbaad4 "Ugly door" support
Ugly doors are doors that we don't want to see from the front:
- south-facing side of a BK door
- other side of one of those keyed staircases that don't actually have a matching key on the other side

This rejects layouts where one would appear.
2019-09-15 23:40:06 -07:00
AmazingAmpharos 4246a8b876 Various hint updates/improvements
This update makes the hint system work much better with simpler shuffles, fixes a bug by which two of the paradox cave entrances had reversed instructions in hints, and prevents the useless hint of there being a skull woods small key in the skull woods pinball room. Progressive Bow is added to the important item list for hints. Further tweaks to some hint language may still be incoming, but this should address the structure of the hint system pretty completely.
2019-09-16 00:51:24 -05:00
AmazingAmpharos a02f1e172d Update my dev branch for v31
Update my dev branch for v31
2019-09-16 00:39:14 -05:00
tolmar 9fa26ef067 Handle multiple startpoints and some blocked doors
Better blocked door handling:
- Start dungeon layout at the entrance
- Hold off on linking from blocked doors until the end of the dungeon, so they either point deeper in, or get added as a loop.
- Now that we care what the start is, properly handle the fact that dungeons have multiple starts.
2019-09-15 21:14:51 -07: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 3a872723b0 Use connect_one_way when doors are blocked
Shuffler doesn't respect blocked doors yet so it may create an unbeatable layout, and the item placer will panic. But that's better than silently giving the player something impossible
2019-09-15 02:24:48 -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
tolmar cce2ef12fa Add lamp rules to door entrances 2019-09-15 00:08:56 -07:00
tolmar c8bd17042e More door fixes 2019-09-15 00:08:30 -07:00
tolmar b4028f429a Merge branch 'DoorDev' into DoorShuffleStandardModeDev 2019-09-14 22:15:55 -07:00
tolmar fcd810b4f3 Force pair keydoors 2019-09-14 22:09:21 -07:00
tolmar 8513dff636 Fix some incorrect door keyness 2019-09-14 22:08:32 -07:00
aerinon 4982ef0d9c Starting thinking about a backtracking algorithm 2019-09-14 22:27:38 -06:00
cassidoxa 99a4ea17b0 Fix swordless vanilla shuffle TR keys issue 2019-09-14 10:02:38 -04:00
cassidoxa ec865e67e6 Fix inverted retro take anys
Removed 'Dark Sanctuary Hint' from take any pool if mode is inverted
2019-09-14 10:02:38 -04: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
aerinon e739bf94bb Merge pull request #6 from aerinon/DoorShuffleStandardModeDev
Clean up shuffle_dungeon
2019-09-11 13:13:15 -06:00
randall.rupper ec5e8614bc Started addressing trap doors to help indicate when they should be open
Sped up the gfx fixer stuff by moving the dungeon load room to execute only once
Minor optimization to spiral
Moved normal doors to separate file
2019-09-11 12:17:20 -06:00
tolmar b07c71a487 Merge branch 'DoorDev' into DoorShuffleStandardModeDev 2019-09-07 16:44:26 -07: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
aerinon ed6ad04fa0 Fix to spiral stairs outside of dungeons. 2019-09-06 20:32:59 -06:00
tolmar a0b9b1fefe Clean up shuffle_dungeon
Use logger instead of print, loop shuffling until it works.
2019-09-06 18:14:48 -07:00
aerinon 46b7a3a12f Merge remote-tracking branch 'origin/DoorDev' into DoorDev
# Conflicts:
#	asm/spiral.asm
2019-09-06 17:36:33 -06:00
randall.rupper 48f29b3aa5 Merge branch 'Dev' into DoorDev 2019-09-06 14:22:42 -06:00
randall.rupper 1ec963f162 Moved spiral warp point during dark transition (fixed $53 logic)
More spiral layers fixed by adding a 'from layer' bit.
Several edge cases addressed (a couple stairs crossed quadrant boundaries during transition)
2019-09-06 14:21:19 -06:00
aerinon fe8b3e4252 Merge pull request #5 from KevinCathcart/Dev
Keeping up with Dev
2019-09-06 11:02:46 -06:00
randall.rupper 02b3ca5d52 Some spiral layers fixed
Some spiral camera bounds fixed
2019-09-06 09:13:49 -06:00
aerinon 4c49f7a7c2 Another refactor of camera bounds logic 2019-09-05 22:17:35 -06:00
randall.rupper eb3b1eaa44 Working on spiral problems 2019-09-05 21:09:26 -06:00
aerinon c6a1e90043 Merge pull request #4 from aerinon/DoorShuffleStandardModeDev
Add spiral staircases to basic shuffle
2019-09-05 12:51:33 -06:00
tolmar cd3735fc2f Add spiral staircases to basic shuffle
Makes the basic shuffler attempt to link spiral stairs.
2019-09-05 11:29:15 -07:00
randall.rupper 97c9a1603a Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2019-09-04 16:35:17 -06: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
aerinon dfc3d628df Simple readme update 2019-09-02 21:52:50 -06:00
cassidoxa d393657eac Fix mixup of DM Return caves East and West 2019-09-02 15:36:30 -04:00
cassidoxa f593370ec0 Prevent placing incorrect bosses in GT in inverted enemizer 2019-09-02 15:36:30 -04:00
Kevin Cathcart f2c62e87ef Update flavor text 2019-09-02 15:34:52 -04:00
Kevin Cathcart 7249429f69 Fix silvers hint 2019-09-02 15:33:34 -04:00
Kevin Cathcart 80217b269e Fix inverted triforce hunt 2019-08-28 21:38:36 -04:00
cassidoxa 0a759f18d6 Undo write causing map tile glitch in EP area (#9) 2019-08-28 21:13:35 -04:00
Kevin Cathcart ab99e8c223 Triforce Hunt turn-in logic 2019-08-28 21:12:44 -04:00
tolmar 274634acfd Merge pull request #2 from aerinon/DoorShuffleStandardModeDev
Fill in standard mode shuffle
2019-08-27 09:45:45 -07: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