Commit Graph

181 Commits

Author SHA1 Message Date
codemann8
2d26954422 Final fixes and reorganization to Inverted Region merging 2022-12-15 17:26:02 -06:00
codemann8
86c8fd37e7 Reorganized and renamed regions, rules, and lists 2022-12-14 05:36:36 -06:00
codemann8
f8bba4176b Reorganized and renamed regions, rules, and lists 2022-12-14 04:12:17 -06:00
codemann8
8e08f336d0 Merging Regions and Rulesets 2022-12-13 01:40:44 -06:00
codemann8
5ac01f4f35 Merged Inverted/Open ER code and data 2022-12-07 22:16:55 -06:00
codemann8
52edfcdddb Merged Inverted/Open ER code and data 2022-12-07 22:05:48 -06:00
codemann8
bd53400fec Replaced all references of Inverted-variant regions/exits 2022-12-06 22:21:35 -06:00
aerinon
0783f97b57 Merge branch 'DoorDev' into Synthesis
# Conflicts:
#	Main.py
#	README.md
#	RELEASENOTES.md
2022-10-27 15:22:44 -06:00
aerinon
4ab0a40c45 Bumper cave fix
Pottery coloring updated
2022-10-27 13:56:37 -06:00
aerinon
3975c6c65d Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	TestSuite.py
2022-09-01 11:38:02 -06:00
aerinon
4aff460b22 Fix for crossed doors with ambrosia
Fix for ER + OWG in crossed doors
Fix for Small Key shuffle
2022-08-30 13:51:12 -06:00
aerinon
b2ae92a451 Merge branch 'Tavern' of github.com:Catobat/ALttPDoorRandomizer into Catobat-Tavern
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
Note: rom is not correct
2022-08-11 15:37:19 -06:00
aerinon
64048ba58d Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py

Also fixed a bug with lite/lean
2022-06-22 10:53:06 -06:00
aerinon
f5307dacc1 Waterfall logic fix. Inverted seems to have been fixed years ago 2022-06-17 15:12:37 -06:00
Catobat
6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon
dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06:00
aerinon
64b0740e50 Various shuffled links house fixes 2022-03-12 12:33:14 -07:00
aerinon
4e43f38332 Separated Collection Rate counter from experimental
Added MSU Resume option
Ensured pots in TR Dark Ride need lamp
Fix for Links House being at Maze Race (did not generate)
2022-03-09 15:42:00 -07:00
aerinon
dd18f13930 Trash ditching method rebalanced for lots of triforce pieces
Added a few places Links House shouldn't go when shuffled
Ped goal + vanilla sword = random sword in pool
2022-02-24 14:39:07 -07:00
aerinon
bcf1ce297c Bunch of logic fixes for various pots
Vanilla fill support for potsanity
Fix for playthrough error
2022-01-07 14:46:25 -07:00
aerinon
f9c1219785 Merge branch 'DoorDevVolatile' into StandingItems
# Conflicts:
#	Rom.py
#	data/base2current.bps
2022-01-06 16:09:42 -07:00
aerinon
fab5f5bb70 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	Rom.py
#	data/base2current.bps
2022-01-06 16:06:51 -07:00
aerinon
4f3ff95f81 -Baserom update
-Incorporate some rom PRs
-Updated Houlihan to exit to wherever Link's House is (inverted, too)
2022-01-05 14:37:10 -07:00
aerinon
b2f2565271 Standing Items initial commit 2021-12-16 16:02:11 -07:00
aerinon
1525a949ca Merge branch 'DoorDevUnstable' into DoorDevVolatile 2021-10-27 15:02:47 -06:00
aerinon
3b3fe7f8ca Bonk fairy (light) standard er restriction 2021-10-27 13:29:07 -06:00
aerinon
dc7d4940d9 Overworld map code 2021-10-21 16:29:09 -06:00
aerinon
24b01cfcc7 Performance optimizations 2021-08-03 09:26:41 -06:00
StructuralMike
779c7d78c0 New hookshot cave region definitions 2021-07-24 17:22:48 +02:00
aerinon
c522a1b001 Aga Tower shouldn't choose inverted links house if not shuffled 2021-07-23 10:09:01 -07:00
aerinon
c6ed7bcd04 Merge branch 'DoorDevUnstable' of https://github.com/ardnaxelarak/ALttPDoorRandomizer into ardnaxelarak-DoorDevUnstable 2021-07-23 10:04:02 -07:00
aerinon
0607cf67ef Insanity: blacksmith/bomb shop placement shouldn't preclude another multi-exit cave from exiting there 2021-07-06 13:21:51 -07:00
3896066193 Reimplement --securerandom
Seeds should be reproducable without the flag passed, and unreproducable with the flag passed.
With --securerandom, generate a 9-char alphanumeric string to use to make filenames differ.
2021-06-29 11:13:17 -07:00
aerinon
87c4c0811a Inverted fix for insanity 2021-06-01 09:33:15 -06:00
aerinon
dfe824069a Insanity restrictions lifted on multi-entrance caves and dungeon exits 2021-05-28 16:01:09 -06:00
aerinon
f49dffa91a Fix typo 2021-05-26 08:37:50 -06:00
aerinon
fff7cd691e Added the --shufflelinks option
Moved bunny spawn to experimental
Baserom bugfixes
2021-05-24 15:14:23 -06:00
compiling
1c93db414f Fix inverted Aga Tower handling 2021-04-29 19:38:52 +10:00
compiling
639a3ec383 Fix inverted checks
Fix superbunny / dungeon revive rules due to late binding
Fix inverted swamp patch
Fix most unit tests (dungeons still broken)
2021-04-27 23:51:12 +10:00
compiling
df2b12774d Fix broken connection between superbunny bottom and top 2021-04-27 18:33:32 +10:00
compiling
9852352027 Temp 2021-04-21 18:40:54 +10:00
compiling
30baec65af Merge remote-tracking branch 'remotes/origin/Dev-owg' into DoorDevUnstable 2021-04-18 14:28:29 +10:00
aerinon
6a5bdbee6b Mostly a fix for Blind outside of TT when Blind is the boss of TT (boss enemizer)
Remove RaceRandom use for now
2021-02-27 15:33:05 -07:00
aerinon
af441a8e9b Merging in base er changes 2021-02-25 15:26:29 -07:00
aerinon
d64a4e63a2 A lot of generation improvements and bug squashing 2021-01-08 16:31:33 -07:00
aerinon
22f749e767 Keysanity menu bugfix
Inverted ER + intensity 3 fix
Swamp Trench 1 locking flippers fix
Fix for lobbies overwriting logic in TR Hub (and elsewhere)
Repaired exits that were wrongly affected by entrance fixes
2020-11-20 14:00:40 -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
compiling
e62d095d28 Connect hyrule_castle_exits to light world exits in standard dungeonsfull shuffle when there are no mandatory exits.
Fix GT key logic to only allow placing a small key in the map room when the playthrough algorithm can reach it (due to limitations of the key logic).
2020-10-31 10:22:43 +11:00
compiling
6ff039e67a Fix some more multiworld conflict issues 2020-10-31 10:20:00 +11:00
compiling
665e7b1497 Reduce mandatory exits for OWG logic to only those that cannot be reached by glitches 2020-10-31 10:13:33 +11:00