Commit Graph

103 Commits

Author SHA1 Message Date
aerinon
267e3214a7 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	CLI.py
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	Rules.py
#	data/base2current.bps
#	source/classes/CustomSettings.py
#	source/tools/MysteryUtils.py
2023-09-29 11:44:23 -06:00
aerinon
a4d5dec8ad Fixed an error
Small performance increase
2023-08-07 16:49:34 -06:00
aerinon
187478eb24 Merge branch 'DoorDevUnstable' into Sandbox
# Conflicts:
#	Gui.py
#	Main.py
#	Rom.py
#	Rules.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/dungeon/widgets.json
2023-04-05 16:26:26 -06:00
aerinon
17f9efb230 Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable
# Conflicts:
#	RELEASENOTES.md
2023-04-05 15:56:17 -06:00
aerinon
c9c510ae21 Minor fixes for customized vanilla doors 2023-03-22 14:58:07 -06:00
aerinon
4aae603462 Merge branch 'DoorDevUnstable' into Sandbox
# Conflicts:
#	ItemList.py
#	Items.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2023-03-10 13:43:38 -07:00
aerinon
1a1c60f84a Merge branch 'SynthesisOWRMerge' of github.com:codemann8/ALttPDoorRandomizer into codemann8-SynthesisOWRMerge
# Conflicts:
#	Rules.py
#	source/overworld/EntranceShuffle2.py
2023-03-09 11:29:03 -07:00
aerinon
d23d2d8323 Better support for customized start_inverntory with dungeon items (can be mixed with item pool) 2023-02-24 15:45:37 -07:00
aerinon
a304fd31ac Standard keysanity distribution and generation fixes
Includes new S&Q safety
2023-02-14 15:58:52 -07:00
codemann8
6240061a65 Final fixes and reorganization to Inverted Region merging 2022-12-16 18:26:05 -06:00
codemann8
55a91f8d17 Merged in DRUnstable v1.2.0.1 2022-12-16 18:18:07 -06:00
codemann8
bd53400fec Replaced all references of Inverted-variant regions/exits 2022-12-06 22:21:35 -06:00
aerinon
9bf0391e60 Cleanup and generation fix 2022-12-01 16:23:11 -07:00
aerinon
249fae39a0 Fix for certain Standard key layouts
Valid key door logic fix
2022-12-01 08:30:27 -07:00
aerinon
1134eb23e7 Added support for various avianart modes
Uncle boots hints
Some key logic re-working unsure if safe
2022-11-28 15:05:39 -07:00
aerinon
b71c7aa2b4 Underworld dropshuffle 2022-09-30 15:38:35 -06:00
aerinon
4e418f4218 Important key fix for logic placment 2022-09-02 13:10:03 -06:00
aerinon
87834986d4 Retro break up of various options 2022-09-02 13:09:39 -06:00
aerinon
3e7dfaf856 Fix Key Rat region 2022-08-23 15:06:36 -06:00
aerinon
d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -06:00
aerinon
61f659a511 Initial fill changes
Merge branch 'Bias' into DoorDevVolatile

# Conflicts:
#	Rom.py
2021-11-02 16:03:21 -06:00
aerinon
e78f9218f5 Merge branch 'Ambrosia' into DoorDevVolatile
# Conflicts:
#	BaseClasses.py
#	CLI.py
#	Main.py
2021-10-29 15:26:51 -06:00
aerinon
035621e420 Rupee bow forbids certain lobbies in HC in standard
Allow a lobby in keydrop shuffle
Key rule fix when bk isn't possible
Added controller awareness to world traversal
2021-09-28 14:57:17 -06:00
aerinon
ee545b3543 Merge branch 'Ambrosia' into Bias 2021-09-16 16:15:10 -06:00
aerinon
9e04417072 Merge branch 'DoorDevUnstable' into Ambrosia 2021-09-16 16:12:45 -06:00
aerinon
ddd3aaf9a2 More prize door refinement
Incorporating drop entrances better in the find proposal algorithm
2021-09-16 15:20:29 -06:00
aerinon
ef998a2f7f Merge branch 'Ambrosia' into Bias 2021-09-10 09:18:49 -06:00
aerinon
a6e49513be Merge branch 'DoorDevUnstable' into Ambrosia 2021-09-10 09:17:23 -06:00
aerinon
a7fffd3267 More refinement for prize locked parts of a dungeon and key rule interaction 2021-09-10 09:13:20 -06:00
aerinon
e48dbe3d27 Prize relevance refinement
Subtle change on bk restriction - only restrict if bk was determined to be the way forward
2021-09-02 18:10:49 -06:00
aerinon
84fb47ba9d Couple of big key logic fixes - one with bk forced
Another with bk assumed to be found early in dungeon
Catobat map check fix from rom
2021-08-31 15:36:38 -06:00
aerinon
5c835dc243 Fix can_beat_game error
Add start_region awareness to door finder combinations
Added dungeon table
2021-08-26 15:33:08 -06:00
aerinon
1f884649d1 Remove unnecessary imports 2021-08-26 15:32:35 -06:00
aerinon
5614dea2b5 Fix can_beat_game error
Add start_region awareness to door finder combinations
Added dungeon table
2021-08-26 15:28:42 -06:00
aerinon
746a739339 Main structure for various biased fills
Lots of help around correctly reserving locations
2021-08-26 15:27:05 -06:00
aerinon
6f06dbcd04 Fix can_beat_game error
Add start_region awareness to door finder combinations
Added dungeon table
2021-08-26 15:21:10 -06:00
aerinon
f259e8bdc8 Boss item restriction logic added
Reserved location logic started
2021-08-20 14:32:54 -06:00
aerinon
4e91e627e1 Split dungeon refinement
Prize relevance refinement
2021-08-19 16:21:42 -06:00
aerinon
25bc968b62 Key counts for vanilla fixed 2021-08-19 16:15:05 -06:00
aerinon
b53a005545 Fix for last ditch problems
Special bk adjustments
Exception for self locking key doors in key lock checker
2021-08-16 15:28:20 -06:00
aerinon
fd24c016e2 Total keys fix for key logic
(Basic reductions do not affect amount of keys placed while crossed do)
2021-08-12 15:59:01 -06:00
aerinon
6205dc2cb0 Merge in unstable changes 2021-08-12 13:50:34 -06:00
aerinon
9153dbd382 Fixed a problem that cropped up in retro+vanilla with big key placement 2021-08-12 13:44:47 -06:00
aerinon
feb9177871 Ignore certain rules when bk isn't available in contradiction checking 2021-08-04 13:46:30 -06:00
aerinon
e10c765bc2 Key logic 2021-08-03 12:16:29 -06:00
aerinon
50296915a7 Uncertain key rule change (keeping my eye on it) 2021-08-02 12:40:29 -06:00
aerinon
8a361e9672 Various refinements and fixes to key logic and generation 2021-08-02 12:39:48 -06:00
aerinon
65c583c082 Initial work on dungeon prize logic in key layouts 2021-07-27 16:00:05 -06:00
aerinon
8c2b6f3bd2 Can't have a key at blind unless you can crack the floor and deliver the maiden 2021-07-12 15:54:38 -07:00
aerinon
f15832f85e Refinement - Missing blocked_connections added - appropriate checklists
Optimization - Exp Cache - which is somewhat problematic with the playthrough logic
2021-07-01 16:00:47 -06:00