Commit Graph

865 Commits

Author SHA1 Message Date
aerinon
267e3214a7 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	CLI.py
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	Rules.py
#	data/base2current.bps
#	source/classes/CustomSettings.py
#	source/tools/MysteryUtils.py
2023-09-29 11:44:23 -06:00
aerinon
7a16ea4fe1 Rule fix for zelda to throne room
Minor fix to standard generation and spoilers
2023-09-29 09:33:33 -06:00
aerinon
f4c465f5c3 Baserom update (colletion rate counter for mystery)
Minor issue with customizer/mystery yamls and booleans
2023-09-26 13:40:22 -06:00
aerinon
06ae4f25e1 Several rom fixes, multiworld keys/lamp, pendant count, collection rate
Fix for castle barrier gfx in rain state
Chainchomp placement in Spiral Cave generation issue
A bunch of new bans, Mimics, Stal, Bumper issues mostly. A few others.
2023-09-20 13:11:44 -06:00
aerinon
26c26acd6e Fix item duping and disappearing
Fix mutliworld crash
Fix assured sword + start inventory
New bans on enemy placement
2023-09-14 08:51:29 -06:00
aerinon
42bf2f3534 Bunch of fixes for the baserom changes 2023-08-24 16:18:49 -06:00
codemann8
7bc9a43ef4 Fixed false negative reachability error in playthru calc 2023-08-17 07:33:17 -05:00
codemann8
06e3dc80d6 Merged in DR v1.2.0.20 2023-08-07 15:30:50 -05:00
aerinon
44acc4e290 Merge branch 'StairLoops' of github.com:Catobat/ALttPDoorRandomizer into Catobat-StairLoops 2023-08-07 12:15:13 -06:00
aerinon
9e26c9c42c Fixed minor issue with dungeon counter interfering with timer 2023-08-07 10:44:55 -06:00
aerinon
90f1629f0e Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	MultiClient.py
#	Rom.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/item/widgets.json
#	source/gui/bottom.py
#	source/gui/widgets.py
2023-08-04 11:33:31 -06:00
aerinon
f442cff061 Logic added for openable trap doors 2023-08-03 15:06:54 -06:00
codemann8
c0c3204fd5 Notes field 2023-08-02 09:45:41 -06:00
Catobat
7197a23b45 Add setting for self-looping doors 2023-08-02 02:23:19 +02:00
codemann8
35f3abc1c1 Creating user notes field to be supplied by the seed roller 2023-07-29 05:10:47 -05:00
codemann8
d79c8c1fd1 Merged in DR v1.2.0.19 2023-07-29 05:03:37 -05:00
aerinon
75fc1f7cc3 Fixed customizer example
Fixed /missing command in multiworld for non-pottery lottery settings
2023-07-28 12:29:47 -06:00
Catobat
bf9ad536fe Implement triforce_max_difference 2023-07-26 15:27:47 +02:00
Catobat
ea70d7cb5a Move Triforce Pieces Min and Max handling to Main 2023-07-26 02:40:40 +02:00
codemann8
551638e00c Merged in DR v1.2.0.18 2023-07-19 16:12:09 -05:00
codemann8
6d03c5c532 Merge branch 'OverworldShuffleDev' of https://github.com/codemann8/ALttPDoorRandomizer into OverworldShuffleDev
Adding console output when generation fails to reach required items
2023-07-19 14:14:01 -05:00
aerinon
5d2ceaf75c Updated baserom for crystal custscene and hera music fix
Updated a couple of error messages and when they are displayed
Updated Ganonhunt goal text to be more consistent across randomizers
2023-07-10 13:56:05 -06:00
aerinon
0c640bf9dd Fix for pyrmaid hole logic 2023-07-10 10:35:18 -06:00
codemann8
d30642c0c7 Including OW Tile Flips in Printed Customizer File 2023-07-07 03:41:33 -05:00
codemann8
8362886cc1 Merged in DR v1.2.0.17 2023-06-16 12:14:16 -05:00
codemann8
a842939e92 Various region/rule reorganization to match DR 2023-06-13 18:36:16 -05:00
aerinon
d5e69b28f2 Fix for Non-ER Inverted Experimental (Aga and GT weren't logically swapped)
Fix for customizer setting crystals to 0 for either GT/Ganon
2023-04-14 15:23:38 -06:00
codemann8
6d2e95e6ef Merged in DR v1.2.0.16 2023-04-14 16:00:21 -05:00
aerinon
072bbfac1f Version bump and release note 2023-04-13 16:20:54 -06:00
aerinon
907639b984 any_enemy_logic option added 2023-04-10 09:07:01 -06:00
codemann8
8e7a4fcd8e Merged in DR v1.2.0.15 2023-04-07 13:22:53 -05:00
codemann8
793f3b30b0 Merged in DR v1.2.0.14 (2nd) 2023-04-07 12:04:12 -05: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
aerinon
abb11558d8 Correct version bump 2023-04-05 15:58:16 -06:00
aerinon
50f92e7aee Release notes and minor cleanup 2023-04-05 15:55:30 -06:00
codemann8
09ea7dd9a9 Fixed various Flute logic issues and improved logic efficiency 2023-04-01 09:11:13 -05:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
aerinon
d9c18407e4 Fix starting flute logic 2023-03-31 09:29:01 -06:00
aerinon
a0b781521f Big enemizer updates
Fix sheets
Health + damage rando
Logical kill rooms
2023-03-30 16:12:46 -06:00
codemann8
f4f0ff1018 Merge branch 'DoorDevUnstable' into OverworldShuffleDev 2023-03-22 16:15:38 -05:00
aerinon
c9c510ae21 Minor fixes for customized vanilla doors 2023-03-22 14:58:07 -06:00
codemann8
57b39993b9 Merged in DR v1.2.0.13 2023-03-14 17:48:42 -05:00
aerinon
636819ffc0 Versioning update 2023-03-14 16:05:28 -06:00
aerinon
b44caa76a7 Customize certain potions refills. 2023-03-13 14:26:25 -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
affd7568cb Minor adjustments to world model refactor 2023-03-09 16:48:14 -07:00
aerinon
1a1c60f84a Merge branch 'SynthesisOWRMerge' of github.com:codemann8/ALttPDoorRandomizer into codemann8-SynthesisOWRMerge
# Conflicts:
#	Rules.py
#	source/overworld/EntranceShuffle2.py
2023-03-09 11:29:03 -07:00
aerinon
1bb4d5f03b Version bump and note 2023-03-09 11:14:13 -07:00
codemann8
b6da5e51fd Merged in DR v1.2.0.12 2023-03-08 16:16:04 -06:00