Commit Graph
100 Commits
Author SHA1 Message Date
aerinon 61fb954c9c Merge branch 'bps_basepatch' of https://github.com/compiling/ALttPEntranceRandomizer into BpsWork 2020-11-16 11:13:39 -07:00
aerinon 11154e1544 Crossed dungeon palette refinement
Fixed some entrances that require reset otherwise
Fixed TR lobbies that need to be bombed
Fixed animated tiles in lobbies
Fixed wallmaster+lamp problem
Fixed some key rules that caused item requirements to be ignored
Fixed Old Man cave to be properly one-way in the graph
Fixed some odd key logic issues
2020-11-12 12:18:00 -07:00
aerinon 7d3bb07382 Fix /missing command 2020-11-12 06:31:44 -07:00
aerinon d3cde6c901 Messing around with HC/Sewer ID
Compass code uses original addresses
2020-11-09 16:13:29 -07:00
aerinon 6162fddf47 Lots of bugfixes - see notes 2020-11-09 13:54:03 -07:00
aerinon cdf5f23b75 Potential multiworld fixes for keydropshuffle 2020-11-03 10:19:22 -07:00
aerinon f62ba51469 Baserom re-factor of compass code
Scrolling fix
2020-11-03 10:17:46 -07:00
aerinon 4a4868bb5b Version bump 2020-11-02 12:40:43 -07:00
aerinon d3e643b9c6 Finish bps work
Fixing a couple bugs
2020-10-29 15:46:27 -06:00
aerinon a02dcd0ba4 Basic Bps work 2020-10-29 12:11:27 -06:00
aerinon cade01b489 GUI work and revert find_accessible_entrances for main dungeon generation 2020-10-27 14:45:22 -06:00
aerinon abb59308ef Merge in some PRs (Ganon hint and Vanilla key logic edit) 2020-10-27 11:52:19 -06:00
aerinon 62d7ae0327 Version bump - auto-assign reviewers to PRs 2020-10-27 11:39:24 -06:00
aerinon c1d46796fe Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2020-10-27 11:38:54 -06:00
aerinon 471ab3d50e Hint work (Lobby, Ganon, Keydropshuffle)
Preliminary multiworld work
2020-10-27 11:37:47 -06:00
aerinon 6a1e35308b Merge branch 'DoorDev' into DoorDevUnstable 2020-10-27 11:20:15 -06:00
aerinon 465721480b Merge pull request #66 from compiling/dungeon_entrance_fix
Dungeon entrance fix (key logic)
2020-10-27 11:08:55 -06:00
aerinon 5e0e297614 Merge pull request #67 from compiling/HintFix
Fix Ganon's Silvers hint for crossed dungeon shuffle
2020-10-27 11:08:13 -06:00
aerinon a77ecb4e13 Update documentation slightly 2020-10-26 11:51:55 -06:00
aerinon 8c73947ad7 Bug fix for vanilla BK at Ball n Chain guard
Bug fix for camera unlock
Bug fix for bad pseudo layer at PoD Map Balcony
Minor fix for non-retro key hud info
2020-10-26 11:46:52 -06:00
aerinon a1782e3edc Bug fix for vanilla standard key rules 2020-10-23 15:25:49 -06:00
aerinon c0f6c3fd52 Bug fix for intensity 3 + enemizer (just taking it out for now)
Lobbies added to spoiler
2020-10-23 15:07:55 -06:00
aerinon d89801c72c Key Hud redesign continued
Keydropshuffle prototype
2020-10-23 12:59:18 -06:00
aerinon 7aca24b10f Standard + Crossed bug with Hyrule Castle
Big Key logic for standard
Some generation issues with ER
Redesigned Map/Compass section of Keysanity menu
2020-10-09 16:02:39 -06:00
aerinon 38be9e6ec0 Generation improvements
Hera Lobby fix
Added gauntlet 3 to cut carpet
2020-10-07 16:33:43 -06:00
aerinon 7bc2d803eb Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2020-09-24 16:05:17 -06:00
aerinon f275dfb218 Test files 2020-09-24 16:03:16 -06:00
aerinon 96fe4a62f5 Test files 2020-09-24 15:32:02 -06:00
aerinon adc27c4dbc Generation improvements 2020-09-24 15:30:35 -06:00
aerinon 99f262cc72 Lobby logic improvements
Cutoff entrance rug re-work
2020-09-21 16:38:15 -06:00
aerinon d2ea578df8 Merge in door dev unstable 2020-09-17 15:23:06 -06:00
aerinon 46d4fd4b91 Merge pull request #63 from aerinon/DoorDevUnstable
Door dev unstable moving to stable
2020-09-17 14:58:25 -06:00
aerinon 357a09d5b7 Added intensity parameter. Clean up for next alpha release 2020-09-16 15:01:01 -06:00
aerinon 7653c95fd7 Minor fixes for a few lobbies 2020-09-15 16:13:54 -06:00
aerinon f881d1d133 Merge pull request #62 from CaitSith2/patch-5
Add two more rooms that need rug cuts.
2020-09-15 15:57:14 -06:00
aerinon 907b13b59a Minor key door fix 2020-09-09 16:15:39 -06:00
aerinon 309dc40f08 Minor ASM reorg
Fix for bonking across the TR chest gap
2020-09-09 16:03:43 -06:00
aerinon 973bf02b1d Palette refinement
Sanctuary starting dungeon and mirror target
Sanctuary limited to LW in open mode (non-crossed/insanity ER)
2020-09-09 15:49:00 -06:00
aerinon 804309565b Bulk of Lobby randomization work 2020-08-28 12:42:20 -06:00
aerinon 18447cfe3e Torch+ChestKey counter bug fixed
Total Keys on keysanity menu fixed
Changed X and grayish circular symbol for new O character
Fixed a key logic error
Fixed unplaced items bug to remove red rupees
2020-08-18 15:21:35 -06:00
aerinon 49e799f658 Fixed two minor bugs 2020-08-17 11:23:12 -06:00
aerinon 53a5d6a98f Incorporating CrossGenWork2 branch again 2020-08-14 16:27:37 -06:00
aerinon 459e3cdc26 Merge branch 'DoorDevUnstable' of github.com:aerinon/ALttPDoorRandomizer into DoorDevUnstable 2020-08-14 16:24:26 -06:00
aerinon b37dc454ad Crossed Dungeon generation work
-Added more path checking to dungeon gen
-Found and squashed a pair of infinite loops
2020-08-14 16:12:41 -06:00
aerinon 2eb6c1ebc0 Crossed Dungeon generation work
-Added a bunch of crystal switch logic
-Added a check for maiden backtracking
-OrderedFrozenSet to prevent randomization leaks with the same seed
-A few key improvements from an outstanding PR
2020-08-13 16:23:40 -06:00
aerinon df52ca2730 Crossed Dungeon generation work
-Rewrite of step 3b for accuracy - verified acceptable speed
--Can now detect an impossible balance situation and restart
-Eliminated false negatives in step 4 (still need to rework false positives)
-Minor key logic improvement
2020-08-04 15:24:24 -06:00
aerinon 2aa2266a9c Merge pull request #56 from Berserker66/DoorDevUnstable
Report extraneous or insufficient items as warning.
2020-08-03 21:36:14 -06:00
aerinon 24177fa8b8 Crossed Dungeon generation work
--Introduced reachable_switches
--Calculate total completion in equation resolution
--Prioritized one-way connections over neutral/neutral_profitable sectored but not over dead-ends
--Simplified finding good complex branching candidates - just re-used equations routine
--Valid multi choice for global polarity when fixing parity
--Added total dungeon charge as critieria when fixing parity
--Pinball used for navigation in skull 2, marked appropriately (particularly with Ice Cross in Skull 2)
--Equation resolution detects used benefits with unreached_doors benefits
--Greedy equation finder not longer used destination/entrance sectors of the wrong split dungeon
--Required connections don't overestimate benefits
--Introduced the concept of crystal switches and doors blocked by blue barriers to equations
2020-07-22 17:11:20 -06:00
aerinon b4fd8f6bdc Bug fix for attic blind
Bug fix for simple dungeon shuffles making HC your DW access with door shuffle on
Bug fix for accessibility: none
Moved bk/key info to keysanity screen
Added chest total to keysanity screen
2020-07-13 17:11:36 -06:00
aerinon 6574b5708a Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable 2020-06-25 16:17:13 -06:00
aerinon ed20ff5f63 Bug fixes for crashes involving new baserom 2020-06-25 16:16:56 -06:00
aerinon b5d18c4b4d Merge pull request #53 from CaitSith2/patch-3
player names moved in new basepatch
2020-06-23 16:45:06 -06:00
aerinon 50f55b8008 New baserom (31.0.5)
Updated release notes
2020-06-23 16:43:15 -06:00
aerinon a51820e2cf New baserom
Asar compatibility
Potential SRAM fix
2020-06-12 16:01:11 -06:00
aerinon 6f94ca5bee Potential fix for bottle issues 2020-06-08 13:07:11 -06:00
aerinon 5ab4b29937 Merge branch 'DoorDev' of github.com:aerinon/ALttPDoorRandomizer into DoorDevUnstable 2020-06-08 13:01:57 -06:00
aerinon c9a379e652 Merge pull request #52 from Berserker66/patch-1
Fix triforce hunt logic
2020-06-08 11:14:33 -06:00
aerinon 0b943b01e8 Merge branch 'compiling-DoorPerf' into DoorDevUnstable 2020-05-29 16:20:04 -06:00
aerinon 3b4e19b5de Fixes for compatibility with compiling perf
Couple fixes for standard+ER
2020-05-29 16:19:32 -06:00
aerinon d9d497ba62 Merge branch 'DoorPerf' of https://github.com/compiling/ALttPEntranceRandomizer into compiling-DoorPerf 2020-05-26 14:35:12 -06:00
aerinon 2b441134fe Fixed a problem with edges when those are turned off (experimental not on)
Fixed a problem with standard requiring you to go through the tapestry backwards to save Zelda
Added debugging features to help figure out some bugs
2020-05-26 14:34:24 -06:00
aerinon 2d8d4ebf4a Added the stz $047a for pod eg glitch
Standard generation improvements (Bomb escape rework)
Vanilla+ER generation improvements
2020-05-22 13:45:00 -06:00
aerinon ae7ce076af Open edges math fix (indices corrected in tables)
Spoiler lists bosses
Enemizer settings fix
Swamp flooded ladder's fix (Crossed mostly)
Spoiler encoding issue fixed
2020-05-20 10:51:56 -06:00
aerinon 337dbf311d Some generation improvements (bk checked better, backtrack added re-attempts)
No logic skips more key logic
Some prototyping new key rules
2020-05-12 15:03:39 -06:00
aerinon 300db22725 Some ER generation improvements
Attempt at Attic Hint Tile
Stonewall detection improved by not excluding drops
2020-05-05 13:24:51 -06:00
aerinon aeb3b3d4b1 Forgot straight stairs in vanilla 2020-05-02 15:15:21 -06:00
aerinon 0705ccaeda Edge rom changes and minor mystery defensive coding 2020-05-02 15:09:23 -06:00
aerinon 79c4889e07 Merge remote-tracking branch 'origin/EdgeWork' into EdgeWork
# Conflicts:
#	asm/edges.asm
2020-04-29 21:20:47 -06:00
aerinon 467507b505 Straight Stairs trap doors
Straight Stairs adjustment for different door types
2020-04-28 17:05:58 -06:00
aerinon 45016ed5ce Merge Unstable into EdgeWork 2020-04-24 14:02:47 -06:00
aerinon 810942cf69 DungeonGen bug
Animated tiles fix
2020-04-23 16:18:56 -06:00
aerinon 946c7bbcef Merge in DoorDev changes
Revert ci changes
2020-04-21 16:06:49 -06:00
aerinon 53ddd1963c Split dungeon combinations - runs through combinations if few enough
Odd builders - new algorithm for testing entire set then making a decision
Force groupings updated to be smarter about it - needs to apply elsewhere
2020-04-21 16:03:07 -06:00
aerinon 0bb7e7caf8 update ci to build dev releases for now 2020-04-17 14:13:27 -06:00
aerinon 88b93d2649 Bump version 2020-04-17 14:08:52 -06:00
aerinon 1f2edde2e5 Add minor notes 2020-04-17 14:07:39 -06:00
aerinon bc06b86311 Multiworld torch key fix 2020-04-16 15:52:19 -06:00
aerinon 57cd5575da Merge branch 'patch-1' of https://github.com/zig-for/ALttPEntranceRandomizer into zig-for-patch-2 2020-04-16 14:31:55 -06:00
aerinon aed4251f13 Merge branch 'DoorDevUnstable' into CrossGenWork 2020-04-13 14:54:59 -06:00
aerinon d02cc2bb15 Fix compassshuffle/mapshuffle menu flags 2020-04-13 14:49:04 -06:00
aerinon e1cd520ea9 Merge unstable into CrossGen 2020-04-10 15:17:31 -06:00
aerinon 09bd392fd0 Bugfix to map info
Bugfix to dungeon reminder on death
2020-04-10 11:19:05 -06:00
aerinon acd430378d Minor fix to vanilla doors 2020-04-09 17:32:06 -06:00
aerinon ff3577358d Version bump
Release notes updated
2020-04-09 17:14:42 -06:00
aerinon 8e7ed89723 Formatting
Json spoiler tied to jsonout arg
Fixed Default Link sprite button again
Removed odd return from local_path (need to test this with bundle)
2020-04-09 17:02:40 -06:00
aerinon b86ffc3378 Merge branch 'miketrethewey-dev' into DoorDevUnstable 2020-04-09 15:55:42 -06:00
aerinon 23e6c5b14d Merge branch 'dev' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-dev 2020-04-09 15:55:27 -06:00
aerinon 954a5fa09f Merge branch 'CaitSith2-patch-1' into DoorDevUnstable 2020-04-09 15:54:34 -06:00
aerinon e7c2e63166 Formatting 2020-04-09 15:53:58 -06:00
aerinon f6f7d8add3 Merge branch 'patch-1' of https://github.com/CaitSith2/ALttPEntranceRandomizer into CaitSith2-patch-1 2020-04-09 15:51:17 -06:00
aerinon 7f935d6ff9 Fix fire speed for ice palace rooms 2020-04-08 17:04:33 -06:00
aerinon 4fe97f9b7f Adjusted map info to be experimental
Moved mirror scroll to be standard in non-vanilla door shuffles
Fixed potential duplicate map issues
2020-04-08 15:56:03 -06:00
aerinon 114ed784f1 Torch keys counted like chest
Moved the total key counter to a count down on the left.
Added the BK indicator
Attempt to fix dungeon counters and fish error in Mystery.py
Removed double rom patch
AT map added.
5 chests min for all dungeons
2020-04-07 16:50:02 -06:00
aerinon bb402ff7f2 Dungeon reminder added to hud for Crossed dungeons
Blinking red square added to hud and it indicates a boss room is close by. Only appears if you have the compass. (Basic & Crossed)
Key counters added to hud if you have found the map. (Crossed only)
2020-04-03 15:45:55 -06:00
aerinon e30f66742b MirrorScroll block erase removed
Standard+Crossed ammo issue addressed
Fix for vitreous' eye dropping keys
Fix for vanilla linking doors (hc back hallway)
2020-04-02 13:15:08 -06:00
aerinon 01bff51707 Fixed some minor issues
Started work on Straight Stairs
2020-04-01 12:48:04 -06:00
aerinon c968621ba3 Tons of edge work:
--Refactor of scrolling
--Addition of edge math
--Tied linking doors to DR Flag
--Fixed vanilla linking doors
2020-03-31 11:00:49 -06:00
aerinon e5a1c59f85 Fix for capacity shop and hobo splash interaction 2020-03-25 15:52:57 -06:00
aerinon 8ceb1f4585 CI change 2020-03-24 10:50:25 -06:00
aerinon 8f545fc6d1 Merge branch 'DoorDev' into EdgeWork 2020-03-24 10:49:28 -06:00