Commit Graph

709 Commits

Author SHA1 Message Date
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
codemann8
85fe7d1d04 Fixed bomb/rupee farming to not include caves if cave pots are shuffled 2022-08-03 17:52:22 -05:00
codemann8
8a5a092522 Adding attribute to world object to indicate whether world is a copy 2022-08-01 19:42:54 -05:00
codemann8
baaa6fcfc7 Prevent unwanted 'allowed' Crossed OWR option 2022-07-31 22:55:36 -05:00
codemann8
a9fa2a326f Scaling infinite loop check to number of players 2022-07-29 21:35:27 -05:00
codemann8
5ded3be276 Rename Drop Shuffle to Enemy Drop Shuffle in spoiler 2022-07-27 18:01:56 -05:00
codemann8
97455dc140 Implemented Bonk Drop Shuffle 2022-07-24 12:50:37 -05:00
codemann8
a5729b51a2 Adding new option for Bonk Drop Shuffle 2022-07-24 12:42:08 -05:00
codemann8
fb02ae0159 Adding Zelda Delivered rule to Agahnim 1 rules if Standard 2022-07-21 10:46:56 -05:00
codemann8
79f35582e8 Adding Zelda Delivered rule to Agahnim 1 rules if Standard 2022-07-20 21:57:06 -05:00
codemann8
51535d7a10 Added Zelda Delivered rule to Flute usage if Standard 2022-07-08 22:12:59 -05:00
codemann8
aec7b7077d Adapted changes to pre-set overworld flags to new initial sram system 2022-07-08 12:13:34 -05:00
codemann8
df86503941 Merged in DR v1.0.1.0 2022-07-08 10:59:00 -05: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
codemann8
0c32cac4f8 Fixed bush crab logic to only allow in enemizer 2022-05-23 13:34:06 -05:00
codemann8
d5f75ff7c5 Updated tree pull logic to also include ability to kill most things 2022-05-22 15:53:26 -05:00
codemann8
5eb04bc41f Added bush crabs to rupee farm logic 2022-05-22 15:53:13 -05:00
codemann8
3993c210c0 Added Crossed OW to spoiler log when Grouped 2022-05-11 14:37:37 -05:00
codemann8
165fc26e33 Add temporary new rule for Bomb Bag +5 upgrades 2022-05-10 08:03:07 -05:00
codemann8
46dfb2f036 Merge pull request #7 from Catobat/Special
Randomize Special Transitions
2022-05-04 16:46:07 -05:00
codemann8
56b2e0e5e4 Adding an Auto default for Pre-open Pyramid option 2022-05-04 11:36:28 -05:00
Catobat
4db69b8779 Randomize Special Transitions 2022-05-01 01:25:32 +02:00
codemann8
5858f7c1da Add major_only algorithm to code 2022-04-21 13:27:57 -05: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
codemann8
8da3b2067f Added remaining RNG influencers to spoiler log 2022-04-16 11:11:47 -05:00
codemann8
f838f73eda Fixed some issues with Flute Spot output on spoiler 2022-04-08 20:59:12 -05:00
codemann8
8eaa20653b Added missing references to Activated Flute 2022-04-08 20:17:20 -05:00
codemann8
72343f8c28 Fixed issue with flute access with Activated flute 2022-04-08 11:41:11 -05:00
aerinon
cf227aafc0 Trinity goal 2022-04-04 13:37:07 -06:00
codemann8
6a1d012a9a Various fixes found from full compare of DR Unstable 2022-03-30 23:52:03 -05:00
codemann8
fdf21b2d5b Various fixes found from full compare of DR Unstable 2022-03-30 23:50:29 -05:00
codemann8
fd7d9f7121 Merged in DR v1.0.0.2 2022-03-27 14:56:16 -05: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