Commit Graph

2102 Commits

Author SHA1 Message Date
aerinon
3975c6c65d Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	TestSuite.py
2022-09-01 11:38:02 -06:00
aerinon
2c78170579 Pyinstaller 5.0+ build fix 2022-08-31 16:16:20 -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
45395e9b15 Legacy pot shuffle fix 2022-08-26 16:08:18 -06:00
aerinon
ae0efad830 More inverted pot fixes 2022-08-26 15:48:07 -06:00
aerinon
3e6f2bb79b Fixed issue with small key shuffle when big keys aren't 2022-08-26 15:20:53 -06:00
aerinon
55364c071a Fixed issue with inverted and certain pottery settings. 2022-08-26 14:42:06 -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
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
7be5cc1a6b Merge branch 'Customizer' into Synthesis
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-24 14:29:10 -06:00
aerinon
152c383233 Merge branch 'DoorDevUnstable' into Customizer
# Conflicts:
#	Bosses.py
#	ItemList.py
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-24 13:38:59 -06:00
aerinon
6b369b68b7 Update lite/lean with pottery options. Houses and caves with pots are shuffled in the ER pool if the pottery setting turns that on. 2022-08-24 13:29:14 -06:00
aerinon
5d419210af Fix a bank conflict with OWR
Release notes and version bump
2022-08-24 13:18:01 -06:00
aerinon
0d9d6f2ceb Copy world needs to copy location type 2022-08-24 13:10:57 -06:00
aerinon
262b36cac6 Custom yaml properly record interior doors that are key doors 2022-08-24 13:10:32 -06:00
aerinon
32305a2202 Copy world needs to copy location type 2022-08-24 12:53:04 -06:00
aerinon
9c612b6c00 Minor edit to when pyramid hole auto pre-opens 2022-08-23 16:43:27 -06:00
aerinon
0d5ea19ecd Fix for small key fill 2022-08-23 15:52:59 -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
a5354f1f30 Spoiler bug 2022-08-12 13:50:04 -06:00
aerinon
c3dcd56992 Some fixes sent by Catobat 2022-08-11 16:37:15 -06:00
aerinon
07b03f78d6 Rom update 2022-08-11 16:07:11 -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
1168273e43 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	Bosses.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2022-08-11 15:43:33 -06:00
aerinon
5dd9403afd Correct rom for tavern work 2022-08-11 15:38:15 -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
2ed0a80609 Fix for pot items to not reload with the supertile
Key distribution change
Unique boss shuffle make gt bosses also unique
Removed text color in hints due to bug
2022-08-11 15:25:09 -06:00
aerinon
32714b4c6a Fix for colorized pots in "dark desert hint" aka mire storyteller 2022-08-05 16:48:34 -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
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
04fc0b442d Hotfix for enemizer and pot substitutions 2022-06-30 11:51:34 -06:00
aerinon
2f821632e1 Spelling and grammar 2022-06-29 13:01:34 -06:00
aerinon
d488df6d18 Pot substitutions for certain items 2022-06-29 12:58:10 -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
b426d47a0a Merge branch 'Customizer' into StandardThrone
# Conflicts:
#	Main.py
2022-06-23 10:38:18 -06:00
aerinon
8ec852a737 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py
2022-06-23 10:37:38 -06:00
aerinon
fe814005d6 Waterfall of Wishing logic exit fix revised 2022-06-23 10:36:51 -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
c487634d3d Merge branch 'DoorDevVolatile' into StandardThrone
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-06-22 10:55:55 -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
377989d406 Update release notes and version 2022-06-22 10:43:39 -06:00
aerinon
f5307dacc1 Waterfall logic fix. Inverted seems to have been fixed years ago 2022-06-17 15:12:37 -06:00
aerinon
8d140c9bf8 Spoiler refactor 2022-06-17 14:36:51 -06:00