Commit Graph

314 Commits

Author SHA1 Message Date
aerinon
4f2fed48d7 Big key door fix
Some generation fixes (need to look at pre-validate some more)
Bumped up escape assist values in non-basic shuffles
2022-10-26 16:46:32 -06:00
aerinon
30833152f6 Minor decoupled adjustment 2022-09-13 15:54:06 -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
3975c6c65d Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	TestSuite.py
2022-09-01 11:38:02 -06:00
aerinon
258d66fb5c Minor standard fix, fix for test suite, made one error less annoying 2022-08-31 14:10:02 -06:00
aerinon
4aff460b22 Fix for crossed doors with ambrosia
Fix for ER + OWG in crossed doors
Fix for Small Key shuffle
2022-08-30 13:51:12 -06:00
aerinon
16d7ce5e76 Minor issue with new Mire Falling Bridge and a miss in dungeon gen for dungeon pools. 2022-08-25 08:59:44 -06:00
aerinon
5b8b0cb7f8 Mire Falling Bridge logic refinement for possible trap door movement 2022-08-23 15:27:22 -06:00
aerinon
3e7dfaf856 Fix Key Rat region 2022-08-23 15:06:36 -06:00
aerinon
c3dcd56992 Some fixes sent by Catobat 2022-08-11 16:37:15 -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
09fbdc46ca Finish bomb/dash doors
Lots of minor fixes
Fixed a few existing bugs
2022-08-05 14:01:19 -06:00
aerinon
4267c2dde5 Minor bug in intensity 3, pottery setting not drop shuffle for Desert Tiles 2. 2022-07-25 12:13:50 -06:00
aerinon
d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -06:00
aerinon
2e9d132985 Large refactor underway.
Wrote new main method
Implemented trap door shuffle to some degree
Still needs the other types
2022-06-28 13:05:38 -06:00
aerinon
b13e15f999 Merge branch 'DecoupledDoors' into Synthesis
# Conflicts:
#	BaseClasses.py
#	DoorShuffle.py
2022-06-23 10:59:44 -06:00
aerinon
1972500e31 Merge branch 'Customizer' into StandardThrone
# Conflicts:
#	DungeonGenerator.py
#	Main.py
#	RELEASENOTES.md
2022-06-22 13:08:38 -06:00
aerinon
5dce2daa0b Standard throne room changes 2022-06-14 12:29:57 -06:00
aerinon
14571508ae Init work on decoupling doors 2022-05-25 10:31:20 -06:00
aerinon
ac651253fe Fix a couple bugs on generation 2022-05-24 11:07:06 -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
ea745ff22e Hotfix for paired doors
Also made dashable filter work
2022-04-30 15:28:29 -06:00
aerinon
b514df76c3 Prize letters and numbers
Minor bug with max keys: prevent negative values
2022-04-21 15:44:52 -06:00
aerinon
a035beca1e Minor ohko fix 2022-04-20 14:07:18 -06:00
aerinon
52a0e88d12 Minor ohko fix 2022-04-04 14:29:40 -06:00
aerinon
730847fa07 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	DoorShuffle.py
2022-03-29 14:32:24 -06:00
aerinon
68c2d06d85 Rain state prevention fix
Also, disallowed door behind Throne Room to be dashable/bombable in standard/hc
2022-03-29 14:30:20 -06:00
aerinon
69bae0f338 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	DoorShuffle.py
2022-03-29 13:30:49 -06:00
aerinon
8bc446fbc5 Logic refinements for Skull X Room and GT Falling Torches 2022-03-29 13:28:05 -06:00
aerinon
8ec16d46ce Dashable forbidden
Minor logic refinement for Spiky Hint Cave
2022-03-25 15:35:46 -06:00
aerinon
dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06:00
aerinon
64b0740e50 Various shuffled links house fixes 2022-03-12 12:33:14 -07:00
aerinon
bfca2c2ad3 Fix for GT Crystal Conveyor not requiring Somaria/Bombs to get through 2022-03-11 17:11:23 -07:00
aerinon
6f7a2e234d Merge in Unstable updates 2022-03-08 08:58:29 -07:00
aerinon
833a5d8320 Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts:
#	Main.py
#	RELEASENOTES.md
2022-03-04 16:49:41 -07:00
aerinon
922bc6d2d0 Fix some interior doors during key door identification as missing one reachable side 2022-03-04 16:45:51 -07:00
aerinon
ccb7ced735 Lighter pottery modes 2022-02-16 14:02:21 -07:00
aerinon
64c19bc651 Logic fixes for pots in TR Hub and TR Dark Ride
Fix for district + shopsanity
Typo correction
2022-01-31 16:35:11 -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
dc7d4940d9 Overworld map code 2021-10-21 16:29:09 -06:00
aerinon
551d46e5f4 Bug fix for inaccessible region function (always used player 1's HC Ledge) 2021-10-21 14:20:22 -06:00
aerinon
a23315f783 Disarm EG glitch on mirror in most modes
Added a check flag for the disarm on most transitions so if can be armed when wanted
2021-10-05 14:13:24 -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
ddd3aaf9a2 More prize door refinement
Incorporating drop entrances better in the find proposal algorithm
2021-09-16 15:20:29 -06:00