Commit Graph

245 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
329367e04a Account for vanilla BK doors in Stitcher 2023-09-28 10:43:10 -06:00
aerinon
dc96c53a95 Fix for Ganonhunt and various algorithms 2023-09-28 10:43:03 -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
915e7dc416 Ability to enemize fairies
Fix for blue square in caves
Lower limit for sprites on tiles that support it, to help with pot lifting
Swamp waterway enemies fixed to not drop
2023-09-26 08:59:31 -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
2e5b9758c2 Unkillable thieves for now
Turn off enemy drop indicator for modes that don't need it
2023-09-12 10:13:15 -06:00
aerinon
9e6bcf8a99 Various enemizer adjustments and fixes
Fix for retro location counting
Baserom update
2023-09-12 08:40:24 -06:00
aerinon
2a5ceaacd8 Several small fixes
Added special bitmask table for cross dungeon drops and indicator
2023-08-17 13:54:14 -06:00
aerinon
cf2e001447 Fix for TFH 2023-08-17 13:42:45 -06:00
aerinon
1985139cb5 Fixing generation errors
Update rom for multiworld/vanilla sewers problems
2023-08-09 15:33:11 -06:00
aerinon
57da9efcb1 Mimic work 2023-08-09 12:06:20 -06:00
aerinon
44acc4e290 Merge branch 'StairLoops' of github.com:Catobat/ALttPDoorRandomizer into Catobat-StairLoops 2023-08-07 12:15:13 -06:00
aerinon
e6597a7ab9 Fixed inverted problem with experimental (logically assumed link's house was in the light world)
Fixed hint typo
2023-08-07 09:36:50 -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
5d3c401f1f Remove hovers in waterway from drop pool 2023-08-04 10:48:59 -06:00
codemann8
c0c3204fd5 Notes field 2023-08-02 09:45:41 -06:00
Catobat
f2b8c840a2 Fix potential bug with re-linking decoupled doors 2023-08-02 17:02:15 +02:00
Catobat
7197a23b45 Add setting for self-looping doors 2023-08-02 02:23:19 +02:00
Catobat
bf9ad536fe Implement triforce_max_difference 2023-07-26 15:27:47 +02:00
Catobat
66bd8960a1 Support Triforce Piece settings in Customizer YAML 2023-07-26 15:03:45 +02:00
Catobat
ea70d7cb5a Move Triforce Pieces Min and Max handling to Main 2023-07-26 02:40:40 +02:00
aerinon
627168e771 First pass on multiworld for enemy drops. Fixed a few graphical enemizer issues. 2023-06-26 10:29:37 -06:00
aerinon
5da0836d9f Fixed logic with mirror in west dark world 2023-06-16 09:15:06 -06:00
aerinon
0ab54def8b Removed backup locations for Dungeon Only and Major Only algorithms. If item cannot be placed in the appropriate location, the seed will fail to generate instead. 2023-06-08 10:25:05 -06:00
aerinon
503be6aa91 Enemizer refinement 2023-05-19 08:53:01 -06: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
aerinon
907639b984 any_enemy_logic option added 2023-04-10 09:07:01 -06:00
aerinon
4af9419461 GUI cleanup
Fix Chest Game prize display
2023-04-07 16:01:08 -06:00
aerinon
546f5ca10c Fix for gui 2023-04-07 15:00:14 -06:00
aerinon
5d86ed4055 start of any enemy logic option 2023-04-06 16:57:15 -06:00
aerinon
85afd0c09e Add collection_rate to customizer 2023-04-06 11:23:54 -06:00
aerinon
3c18dc6e3a Re-vamp multiple settings as buttons.
Minor logic clean up.
2023-04-06 11:22:12 -06: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
50f92e7aee Release notes and minor cleanup 2023-04-05 15:55:30 -06:00
codemann8
f13880eee9 Major GUI reorganization 2023-04-04 17:11:43 -06:00
aerinon
09550cd546 Minor fix 2023-04-04 16:53:45 -06:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
aerinon
a0b781521f Big enemizer updates
Fix sheets
Health + damage rando
Logical kill rooms
2023-03-30 16:12:46 -06:00
aerinon
f4524d8a87 Fix Snitch Lady (West) location on map 2023-03-13 16:28:11 -06:00
aerinon
d85a63ece1 Damage table start 2023-03-13 11:11:59 -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
14ced2435c Update for enemizer bits 2023-03-06 16:29:58 -07:00
aerinon
a5da504b90 Fix for district shuffle's placeholder issue 2023-03-03 16:53:50 -07:00
aerinon
a75b36e2eb ER2 Minor issues 2023-03-01 16:23:03 -07:00
aerinon
6c0da515b4 Fix dungeon_only + pottery modes 2023-02-24 17:00:25 -07:00