Commit Graph

133 Commits

Author SHA1 Message Date
codemann8
1247716e92 Implemented District/Nearby Dungeon Item Shuffle 2024-12-24 12:09:16 -06:00
codemann8
fe303876b4 Regression error for Prize Shuffle 2024-08-21 03:52:50 -05:00
codemann8
9726c0eeb6 Some minor Prize Shuffle fixes 2024-05-30 01:05:23 -05:00
codemann8
103e098a2e Initial Prize Shuffle Implementation
commit c89c5d3798e2a777011e90d565d74af792330d9f
commit 4159f2e7097fca648828a60d8f6878211d0ded9e
commit a80e3a4301d69146ccfffe0f2f375adac381e165
commit d8ac588cb904152831f514d8276be4e39a43dcd0
commit 68eb75e3391631355b4f56f1dcb7e9dadadf1fdf
commit ba241b47964eadfb40ad323f87b1117598dd91a6
commit aed2821c7165822f5fd5cc1ff3f58f2af095d915
commit bd1c5d8d35ae3cae5f27f236346fff057b7b8cd7
commit f034e31cc585a1648657fc2c4850ebc0c1d8bf78

Author: codemann8 <codemann8@gmail.com>
2024-05-23 18:40:50 -05:00
codemann8
21a1706657 Merged in DR v1.4.1.6 2024-02-23 11:48:04 -06:00
aerinon
b5795e4bf2 Merge branch 'KrisDavie-hmg_logic' into DoorDevVolatile 2024-01-05 09:47:57 -06:00
KrisDavie
dad1ee8336 Implement basic HMG logic
* Ice Palace Lobby Clip
* Kikiskip to Pod
* Mire -> Hera -> Swamp
  - Mire small door to rupee room is removed
  - Hera and Swamp keys are placed without logic
  - Swamp locked by vanilla rules or having all mire smalls
* Above as connectors in ER
2023-12-22 22:48:42 +01:00
codemann8
83831265dd Merged in DR v1.2.0.22 2023-11-18 17:49:41 -06:00
aerinon
71eadd051c fix(key logic): typo
fix(bunny logic): multiple paths considered
2023-11-14 14:42:25 -07:00
aerinon
f4a702951c fix(key logic): typo 2023-11-11 20:00:31 -07:00
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
codemann8
541dbbd9e5 Merge branch 'DoorDevUnstable' into OverworldShuffleDev 2023-08-07 17:59:22 -05:00
aerinon
a4d5dec8ad Fixed an error
Small performance increase
2023-08-07 16:49:34 -06:00
codemann8
793f3b30b0 Merged in DR v1.2.0.14 (2nd) 2023-04-07 12:04:12 -05: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
codemann8
f4f0ff1018 Merge branch 'DoorDevUnstable' into OverworldShuffleDev 2023-03-22 16:15:38 -05: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
codemann8
d1b4d9e044 Merged in DR v1.2.0.10 2023-03-02 19:07:04 -06: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
codemann8
ab5f348f77 Merged in DR v1.2.0.8 2023-02-18 19:33:15 -06: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
a4120e0cb5 Merged in DR v1.2.0.1 2022-12-16 18:14:27 -06:00
codemann8
bd53400fec Replaced all references of Inverted-variant regions/exits 2022-12-06 22:21:35 -06:00
codemann8
d0ddd49a79 Minor change for code consistency 2022-12-06 02:41:04 -06:00
codemann8
e5afe70bcb Merged DR v1.2.0.0 2022-12-03 01:52:22 -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
codemann8
c7610188ef Merged DR v1.0.1.3 2022-09-07 22:44:11 -05:00
aerinon
c10a791ed6 Important key fix for logic placment 2022-09-02 13:10:20 -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
codemann8
c64c0e3301 Fixed bad parenthesis issue 2022-04-08 11:42:33 -05:00
codemann8
200ef7c897 Fixed AT/GT prize relevance 2022-03-28 09:59:51 -05:00
codemann8
fd7d9f7121 Merged in DR v1.0.0.2 2022-03-27 14:56:16 -05:00
codemann8
cf86aedb79 Simplified tile swap check code 2021-12-27 14:28:15 -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
codemann8
4c4c188413 Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffleDev 2021-10-21 21:45:50 -05: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
codemann8
ecacba55a4 Merged in DR v0.5.1.2 2021-09-17 11:12:05 -05:00
aerinon
ee545b3543 Merge branch 'Ambrosia' into Bias 2021-09-16 16:15:10 -06:00