Commit Graph

434 Commits

Author SHA1 Message Date
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
3975c6c65d Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	TestSuite.py
2022-09-01 11:38:02 -06:00
aerinon
55364c071a Fixed issue with inverted and certain pottery settings. 2022-08-26 14:42:06 -06:00
aerinon
7e5542f3a2 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	Mystery.py
2022-08-24 16:27:18 -06:00
aerinon
0dfdbfd39e Removed "good bee" from Mothula logic
Fixed an issue with Mystery generation and windows file path
2022-08-24 15:00:48 -06:00
aerinon
a5354f1f30 Spoiler bug 2022-08-12 13:50:04 -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
aerinon
8a6b05fe8f Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py
#	Rom.py
2022-06-15 16:56:57 -06:00
Catobat
6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon
96f25d15a9 Settings code fix 2022-06-07 08:10:19 -06:00
aerinon
14571508ae Init work on decoupling doors 2022-05-25 10:31:20 -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
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
042b9a9fa0 Pottery counting fixes
Add major_only algorithm to code
2022-03-08 08:47:25 -07:00
aerinon
a12216da0b Pottery counts and despawning items fixed 2022-03-04 14:53:30 -07:00
aerinon
ccb7ced735 Lighter pottery modes 2022-02-16 14:02:21 -07:00
aerinon
76aed82843 Added versioning for code
Fixed bug in standard where Links S&Q was usable before delivering Zelda
2022-02-16 12:59:45 -07:00
aerinon
7747a1f204 Unique boss shuffle mode 2022-02-15 16:29:52 -07:00
aerinon
da89ab1006 Bug fixes for pottery lottery changes 2022-01-24 16:04:16 -07:00
aerinon
5211b305e6 Re-worked settings for pottery lottery
Fixed multiworld support for lottery
2022-01-21 16:10:33 -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
515f6dafed Standing Items refinement - starting testing no keydrops and pot shuffle
Fairly substantial change to Crossed Sector distribution due to so many pots making it fail
2022-01-04 15:48:27 -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
3369528596 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	Rom.py
#	data/base2current.bps
2021-11-02 15:31:14 -06:00
aerinon
f8ed4f0c38 Merge branch 'DRFix' of https://github.com/Catobat/ALttPDoorRandomizer into Catobat-DRFix 2021-11-02 15:19:07 -06:00
Catobat
01e4c2bff7 Include bottle refills in spoiler 2021-11-01 17:58:01 +01:00
aerinon
e78f9218f5 Merge branch 'Ambrosia' into DoorDevVolatile
# Conflicts:
#	BaseClasses.py
#	CLI.py
#	Main.py
2021-10-29 15:26:51 -06:00
aerinon
d84a3832a6 Merge branch 'DoorDevUnstable' into DoorDevVolatile 2021-10-29 11:50:35 -06:00
aerinon
3a41314003 Shufflelinks and bombbag added to settings code 2021-10-29 11:50:16 -06:00
aerinon
dc7d4940d9 Overworld map code 2021-10-21 16:29:09 -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
c5f6c46bd8 Remove unique annotation from FastEnum class 2021-09-14 15:24:23 -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
cb8a168b6c Merge pull request #123 from Catobat/ItemPool
Fix money balancing with reduced item pool
2021-09-01 15:57:14 -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
07287d85a7 Improve exclusion calculation 2021-08-30 15:21:25 -06:00