Commit Graph
100 Commits
Author SHA1 Message Date
aerinon c475dc746c Better polarity match 2020-01-03 07:22:22 -07:00
aerinon 4d27c2ad88 Merge pull request #16 from aerinon/CompilingDev
Compiling dev
2020-01-02 11:53:52 -07:00
aerinon 66598f7c30 Merge branch 'compiling-Dev2' into CompilingDev 2020-01-02 11:52:46 -07:00
aerinon fea605ae66 Fixing conflicts 2020-01-02 11:52:24 -07:00
aerinon 41af3b8892 Merging of CrossDungeon into DoorDev 2020-01-02 11:42:40 -07:00
aerinon 88849e921c Revert "Revert "Cross Dungeon initial work""
This reverts commit fadc085b67.
2020-01-02 11:37:47 -07:00
aerinon 791d139e6b Merging of DoorDev into Cross - hopefully perserving all cross dungeon stuff 2020-01-02 11:31:33 -07:00
aerinon 438d765627 Directional typos on interior doors fixed.
Better batching support for mass testing of seed generation.

Generation issues fixed:
--Filler now tests with the key in the proposed location to enable alternate key rules
--Key rule checker now only considers key locations that the parent sphere did not have - better key rules
2020-01-02 11:15:27 -07:00
aerinon 59f819aebd Fixed a couple of generation errors 2019-12-31 21:12:53 -07:00
aerinon dcec274b63 Fix typo 2019-12-31 21:12:18 -07:00
aerinon 511cc62234 Fix typo 2019-12-31 11:44:30 -07:00
aerinon 34352b35fc PoD Key door - wrong position 2019-12-30 11:02:40 -07:00
aerinon 3a5a918012 Mark regions as light/dark world after dungeons are connected up. 2019-12-30 11:02:30 -07:00
aerinon bdc722eaa3 readme updates 2019-12-30 11:02:15 -07:00
aerinon f021530392 Potential stair key door fix 2019-12-30 11:01:31 -07:00
aerinon d0129256df logic fixes 2019-12-30 11:00:47 -07:00
aerinon 5338c78fe1 PoD Key door - wrong position 2019-12-28 20:54:48 -07:00
aerinon ee3cf80732 Mark regions as light/dark world after dungeons are connected up. 2019-12-24 07:15:34 -07:00
aerinon db3677487f readme updates 2019-12-23 13:56:47 -07:00
aerinon ccd2665256 Potential stair key door fix 2019-12-23 11:21:16 -07:00
aerinon 52f9900e4b logic fixes 2019-12-23 11:15:55 -07:00
aerinon fadc085b67 Revert "Cross Dungeon initial work"
This reverts commit 35c3a07dc3.
2019-12-19 16:24:58 -07:00
aerinon 263b155110 Revert "Potential stair key door fix"
This reverts commit 106e25f120.
2019-12-19 16:24:46 -07:00
aerinon ea53f97289 Removed the sewer dungeon for now to enable Escape Big Key to work. 2019-12-19 16:18:59 -07:00
aerinon 106e25f120 Potential stair key door fix 2019-12-19 15:10:03 -07:00
aerinon 35c3a07dc3 Cross Dungeon initial work 2019-12-19 14:48:09 -07:00
aerinon 0cd665a1fc Entrance data reader 2019-12-13 06:40:12 -07:00
aerinon 7422eb5ccc Fixed Swordless rules
Added rule for Freezor chest (for crossed and swordless)
Added more "single exit" caves to possible inaccessible regions
Prevented dungeon gen from assuming you could get GT Big Key at Aga 2
Prevented cross-dungeon contamination during key rule gen
Fixed some key-sphere merging problems (I'm ready to get rid of spheres now)
2019-12-12 15:01:12 -07:00
aerinon b18812ef0e Fixing infinite loop caused by not exploring Spiral Cave (712344909)
Fixed not resetting the sampleList after a door needed to be dropped (List index out of range) (966141807, 538815752)
Multiworld support for RoomData
2019-12-12 08:26:29 -07:00
aerinon 45e7e228f6 Fixed a trap door in GT
Tried to remove set sensitivity in KeyDoorShuffle
Added a sophisticated way to find permutations in KeyDoorShuffle
2019-12-11 06:37:54 -07:00
aerinon f8218cf2ea Key shuffling rules rework and refinement
--Concept of best key counter and wasted keys added
--Moved softlock checking & added random order to door candidate combinations
2019-12-09 15:05:07 -07:00
aerinon 9dfd93adbc More trap doors (mostly interior)
DungeonGen refinements
--More Big Key door considerations
--Backtracks earlier when hook candidates comes up empty
Minor work on key shuffling - lots of bad rules still
Playthrough gen doesn't flood swamp keys now
2019-12-03 15:50:15 -07:00
aerinon 43ba391df1 Fixed some trap doors in logic
Added the one way after validation chest (can't get to the chest from the door)
Started refining some key logic to relax it / tighten it
2019-12-02 16:36:15 -07:00
aerinon c64b2269c0 Couple minor door fixes
New key logic algorithm - some advanced rules in place to allow more locations
Changed generation to handle big key placement better
2019-11-26 16:43:43 -07:00
aerinon 1467b76d84 Fixed ice palace Hammer Block stairs
Initial work on new key logic - only for vanilla for now
2019-11-22 12:04:36 -07:00
aerinon 91f619e36f Fixed when a multi-entrance cave is initially inaccessible (i.e. Superbunny connects Skull 3 to DDM Ledge)
Fixed some path checking in full where entrances are all over the place
2019-11-21 15:54:51 -07:00
aerinon f6e8584d19 Fixed Death Mountain Return Ledge dungeons
Multiplayer support for inaccessible regions
2019-11-21 14:04:29 -07:00
aerinon 5e9134a74e GT Lobby Up Stairs fixed
Minor typo in help
2019-11-20 13:47:44 -07:00
aerinon 41a8da1b05 Desert Palace interior rooms I skipped 2019-11-19 16:24:08 -07:00
aerinon 6a276ca0b8 MSU Scrolling bug
Crystaroller Stairs fixed
More Full ER support
Added DungeonGen check for hangers without enough hooks
DungeonGen doesn't consider BK door problems unless starting from origin
--This could cause some longer gen times - as the origin is hooked up last
Skull 3 Exit - attempt to fix
2019-11-19 16:00:55 -07:00
aerinon 48494a09ba TR Crystal Maze adjustments
Fixed key door candidate finder to stay within own dungeon
Standard mode support added
Added missed Pre-moldorm chest
Started work on new key logic analyzer
2019-11-19 10:50:44 -07:00
aerinon 644785b140 Ice & TR door bugs 2019-11-19 06:52:36 -07:00
aerinon 52c9cca701 Ice Doors 2019-11-18 22:09:31 -07:00
aerinon b64b2b7d2b Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2019-11-16 21:40:15 -07:00
aerinon 407bac641d Couple of fixes for mire stairs 2019-11-16 21:39:54 -07:00
aerinon 7a87ef8520 More ER support added 2019-11-15 16:36:27 -07:00
aerinon 69c4dc17fd Merge branch 'MinorFixes' into DoorDev 2019-11-15 14:33:19 -07:00
aerinon 093746a0c7 Ganon's Tower added
Some key logic work
2019-11-15 13:50:31 -07:00
aerinon 2ad03af1da Removed Pot Circle from drops (it has unique regions)
Fixed a door in mire
Adjusted stair camera in Swamp
2019-11-14 06:39:27 -07:00
aerinon 77667668c9 Drop entrances not part of dungeon gen 2019-11-12 06:49:52 -07:00
aerinon d365ae5c36 Fixing a couple minor bugs 2019-11-09 19:10:13 -07:00
aerinon e7ddae0dfa Fix a TT open edge (getting caught by door code)
Try to fix Skull exit again
Fix Hera stair key
Some vanilla fixes
2019-11-08 16:51:51 -07:00
aerinon 84851b3979 Gui improvement 2019-11-07 13:15:35 -07:00
aerinon 5718018982 Added Turtle Rock.
Fixed clock -> process_time for Python 3.8
Fixed interior blocked doors
Vanilla logical connections for Ice Cross (Push block)
Dungeon entrance enhancement for TR, Skull, HC (Standard)
Kill on invalid dungeons during key door shuffle
Key logic improvements (Smallkey restrictions, Logic Min/Logic Max for key doors, Big Chest doesn't count for small keys if BK not found yet)
Key door candidate now accounts for "overworld" dungeon traversal
Path checking added some Crystal Logic (Blind's Cell to Boss mostly)
Kill on dungeon gen if taking too long
2019-11-07 12:16:13 -07:00
aerinon f8abf1fe81 Implemented mire 2019-11-05 11:39:13 -07:00
aerinon bad5fff022 Skull 3 entrance fix - could be refined
Thieves Town region addition - couldn't reach certain doors from elsewhere.
Ice Palace trap doors and fixed a couple broken staircases
2019-11-04 13:04:26 -07:00
aerinon 8b7bbc25ff Bug fixes for that one dumb pod spiral staircase 2019-11-04 12:49:25 -07:00
aerinon 0c6ea6a14d Fixed some typos with new interior doors
Used direction abbreviations for the ones missed
2019-11-01 16:28:08 -06:00
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 49cfe923b6 Merge pull request #12 from aerinon/Swamp
Swamp, Skull and TT
2019-10-31 11:20:50 -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 bc30cc3b42 Minor fix to basic generation for now 2019-10-28 13:55:07 -06:00
aerinon 417fc0797f Shuffling sectors is improved slightly
Changing many logging statements to debug only
2019-10-25 13:56:44 -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 8db8d066b4 PoD and Swamp logical dead end detection improved 2019-10-22 15:49:36 -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 c090bd7003 Early bad loop detection. 2019-10-18 11:56:56 -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 6e4ab638aa Desert Cannonball/Compass fix
Potential PoD stair fix
--Going a down stair in Q1 to a 00 x coord is problematic
PoD stair coordinates
Attempted Swamp layer fix
More swamp fixes
--Note: Left switch resets
2019-10-15 22:38:25 -06:00
aerinon 4d35265e5c Key flood protection in sweep for events
Better loop validation
Small key validation tweaks
2019-10-15 15:15:29 -06:00
aerinon ce626bd093 Unification of exploration logic
Crystal stuff for PoD/Hera
Minor fixes to key logic
2019-10-15 13:01:32 -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 d7b5a513bf More swamp door rom data 2019-10-10 21:52:58 -06:00
aerinon 87ff92ba7c Swamp regions and doors 2019-10-09 16:46:26 -06:00
aerinon dc6791da08 Door Types in Spoiler
Some fixes for rooms with ToggleFlag "doors"
2019-10-09 14:26:18 -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 db155950f2 Not allowing Lower Layer keydoors for now. vanilla Lttp engine does not handle them
Killed the restrictive Eastern key rules - in prep for real key logic
2019-10-07 14:32:34 -06:00
aerinon 19a78f2a0c Fixed a few spiral bugs
Fixed a problem with door pairing system
2019-10-05 23:15:06 -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 fd11e8cde1 Merge branch 'Dev' into DoorDev 2019-10-01 14:35:30 -06:00
aerinon 1f9f9e5656 Merge pull request #11 from KevinCathcart/Dev
Dev
2019-10-01 14:34:44 -06:00
aerinon 8719a4919d Door pairing system initial pass complete
Sucessfully de-coupling of Big Key doors with dumb small key doors behind
Added a bit to trap door fixer so that we can hit the 3rd door in the door list
Added door list position info
2019-10-01 11:26:10 -06:00
aerinon f12659af9d Fixes to Aga Tower staircases
Lots of initial work on key doors and other door pairs
2019-09-27 22:00:45 -06:00
aerinon 3df4fe08b3 More fixes for problems with staircases (quads 01 & 02) 2019-09-23 23:55:05 -06:00
aerinon 8e50c6d8eb Several fixes for problems with staircases in Hera/AgaTower 2019-09-21 22:15:51 -06:00
aerinon 5eb0e6e379 Aga Tower preliminary check in 2019-09-20 21:24:46 -06:00
aerinon 1aa2d904d3 Spirals Can "connect" to the same direction now. Screws with maps.
Some initial work on key doors. Namely altering the reverse side of Big Key doors that were unreachable in vanilla.
2019-09-19 14:58:50 -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
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
aerinon ada06cb519 Merge pull request #9 from aerinon/DoorShuffleStandardModeDev
Logic!
2019-09-16 13:06:19 -06:00
aerinon 4982ef0d9c Starting thinking about a backtracking algorithm 2019-09-14 22:27:38 -06:00
aerinon e739bf94bb Merge pull request #6 from aerinon/DoorShuffleStandardModeDev
Clean up shuffle_dungeon
2019-09-11 13:13:15 -06:00
aerinon ed6ad04fa0 Fix to spiral stairs outside of dungeons. 2019-09-06 20:32:59 -06:00
aerinon 46b7a3a12f Merge remote-tracking branch 'origin/DoorDev' into DoorDev
# Conflicts:
#	asm/spiral.asm
2019-09-06 17:36:33 -06:00