Commit Graph
149 Commits
Author SHA1 Message Date
aerinon 907639b984 any_enemy_logic option added 2023-04-10 09:07:01 -06:00
aerinon ddfbece2bd Clean up enemizer cli argument and gui code 2023-04-05 16:38:17 -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
codemann8 f13880eee9 Major GUI reorganization 2023-04-04 17:11:43 -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 9a71e56546 Trap door refinement with "optional" value versus "vanilla"
Slight balance of chaos mode
Warping Pool trap no longer shuffled
2023-02-17 16:55:35 -07:00
aerinon d7c15ae22c Strict and Partial key logic implementations with new test suite utility 2023-02-17 10:07:43 -07:00
aerinon f0101c9854 Trap door mode initial work 2023-02-16 11:49:29 -07:00
aerinon 8839926a97 Race flag on GUI
Async Doors League presets
Take into account starting inventory with default item pool
2023-01-06 13:56:18 -07:00
aerinon becba348b9 New goals and rom update 2022-12-01 14:10:10 -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 82965ac734 Big Key fix for dungeons with only big chests
Door pairing issues
Minor gui error
2022-10-28 08:56:06 -06:00
aerinon b71c7aa2b4 Underworld dropshuffle 2022-09-30 15:38:35 -06:00
aerinon db43ce8d15 Fix keyshuffle 2022-09-08 16:24:48 -06:00
aerinon 87834986d4 Retro break up of various options 2022-09-02 13:09:39 -06:00
aerinon af4f8e5b4b Flute mode
And some odd fixes
2022-09-01 13:59:26 -06:00
aerinon 21456b5c90 Merge branch 'Customizer' into Synthesis
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
2022-08-11 16:06:50 -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 e167811d34 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-05 14:06:01 -06:00
aerinon f06e7c7fd3 Merged in Volatile work 2022-07-07 14:20:41 -06:00
aerinon d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -06:00
aerinon b13e15f999 Merge branch 'DecoupledDoors' into Synthesis
# Conflicts:
#	BaseClasses.py
#	DoorShuffle.py
2022-06-23 10:59:44 -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 8d140c9bf8 Spoiler refactor 2022-06-17 14:36:51 -06:00
Catobat 6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon 14571508ae Init work on decoupling doors 2022-05-25 10:31:20 -06:00
aerinon 8fd010985f Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	DoorShuffle.py
#	ItemList.py
#	Main.py
2022-05-24 10:09:36 -06:00
aerinon e1bf283e1c Fix help 2022-05-13 16:37:27 -06:00
aerinon 7dd5cc0e36 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	BaseClasses.py
#	ItemList.py
#	Main.py
2022-04-21 11:14:40 -06:00
aerinon 31aeb8a776 Pottery fixes for Room0127
Added mystery flag for future use
2022-04-21 11:03:49 -06:00
aerinon 31a279d63d Trinity goal added 2022-04-20 14:06:55 -06:00
aerinon 26e8e23fce Initial work on new pottery modes 2022-04-19 13:56:39 -06:00
aerinon cf227aafc0 Trinity goal 2022-04-04 13:37:07 -06:00
aerinon dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06: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 4717449c35 Used create rom flag to indicate if sfc file should be generated or not 2022-02-24 10:10:51 -07:00
aerinon b024311aaa BPS support 2022-02-17 14:00:00 -07:00
aerinon ccb7ced735 Lighter pottery modes 2022-02-16 14:02:21 -07:00
aerinon 7747a1f204 Unique boss shuffle mode 2022-02-15 16:29:52 -07:00
aerinon 49accbd2b1 Many bugfixes
* Fixed inverted generation issues with pottery option
* Moved SRAM according to SRAM standard
* Removed equitable algorithm
* Upped TFH goal limit to 254
* Cuccos should no longer cause trap door rooms to not open
* Added double click fix for install.py
* Fix for pottery item palettes near bonkable torches
* Fix for multiworld progression balancing would place Nothing or Arrow items
2022-02-09 14:19:10 -07:00
aerinon 5211b305e6 Re-worked settings for pottery lottery
Fixed multiworld support for lottery
2022-01-21 16:10:33 -07:00
aerinon b2f2565271 Standing Items initial commit 2021-12-16 16:02:11 -07: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 dc7d4940d9 Overworld map code 2021-10-21 16:29:09 -06:00
aerinon 28b87428cc Changed bias named. Added districting 2021-10-05 13:58:30 -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 f259e8bdc8 Boss item restriction logic added
Reserved location logic started
2021-08-20 14:32:54 -06:00
aerinon 939d495be7 Merge in combinatoric key logic from keyLogicAttempt1 branch 2021-08-20 10:03:40 -06:00
StructuralMike dcba2be757 Bombbag instead of Bombbags 2021-08-11 16:29:12 +02:00