Commit Graph
100 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 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 e722a1129f Rule fix for zelda to throne room 2023-09-28 10:31:36 -06:00
aerinon dd9cdee37f Fix location of new doors 2023-09-27 09:10:55 -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 b37bcc987a Merge pull request #149 from tcprescott/patch-2
Update sprite author char_map
2023-09-14 08:35:24 -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 8d31b0080f Fixed shops not counting items
Baserom update
2023-09-01 14:14:57 -06:00
aerinon 9ce8daf4e8 Let dungeons exceed 256 items 2023-08-30 16:17:36 -06:00
aerinon fa155a78f8 Baserom patch
Attempt to repair bee trap and other items
Some other minor fixes
2023-08-30 15:26:46 -06:00
aerinon 42bf2f3534 Bunch of fixes for the baserom changes 2023-08-24 16:18:49 -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 f906633c2b Fix for older key drops (multidata still uses the old address calculation) 2023-08-09 13:30:14 -06:00
aerinon 57da9efcb1 Mimic work 2023-08-09 12:06:20 -06:00
aerinon a4d5dec8ad Fixed an error
Small performance increase
2023-08-07 16:49:34 -06:00
aerinon bc5c6da2ac Fix for hera boss music (the last?) 2023-08-07 12:19:35 -06:00
aerinon a3fcd5ee24 Merge branch 'Catobat-StairLoops' into DoorDevUnstable 2023-08-07 12:15:48 -06:00
aerinon 44acc4e290 Merge branch 'StairLoops' of github.com:Catobat/ALttPDoorRandomizer into Catobat-StairLoops 2023-08-07 12:15:13 -06:00
aerinon db70a16dea Fixed minor issue with dungeon counter interfering with timer (rom re-build) 2023-08-07 10:49:55 -06:00
aerinon e6072cb8dc Fixed minor issue with dungeon counter interfering with timer (merge from Stable) 2023-08-07 10:48:23 -06:00
aerinon 9e26c9c42c Fixed minor issue with dungeon counter interfering with timer 2023-08-07 10:44:55 -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
aerinon f442cff061 Logic added for openable trap doors 2023-08-03 15:06:54 -06:00
aerinon 9497ef36ad Paired needs a bunch of generation work apparently. Disabling it. Minor generation improvements. 2023-08-02 08:05:54 -06:00
aerinon 0ee88618a7 Paired dungeon shuffle 2023-08-01 11:31:59 -06:00
aerinon 1592fac792 Typo 2023-07-28 12:32:28 -06:00
aerinon 75fc1f7cc3 Fixed customizer example
Fixed /missing command in multiworld for non-pottery lottery settings
2023-07-28 12:29:47 -06:00
aerinon b7b9e5aea7 Merge branch 'Catobat-TriforceMinMax' into DoorDevUnstable 2023-07-27 13:47:29 -06:00
aerinon 2e07d03000 Merge branch 'TriforceMinMax' of github.com:Catobat/ALttPDoorRandomizer into Catobat-TriforceMinMax 2023-07-27 13:46:42 -06:00
aerinon 8d17d95640 Fixed a generation bug
Add ganonhunt to pyramid open
2023-07-27 13:45:44 -06:00
aerinon b6275d0688 Typo 2023-07-19 12:57:07 -06:00
aerinon 213d3d3aa0 Fixed an issue where certain vanilla door types would not allow other types to be placed.
Customizer: fixed an issue where last ditch placements would move customized items. Those are now locked and the generation will fail instead if no alternatives are found.
2023-07-19 12:31:50 -06:00
aerinon 1b81151941 Customizer: Fixed issue with Assured sword and start inventory 2023-07-12 09:50:53 -06:00
aerinon d135405ed3 Customizer: Exception raised for placements of items that are not in pool 2023-07-12 09:16:00 -06: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
aerinon 627168e771 First pass on multiworld for enemy drops. Fixed a few graphical enemizer issues. 2023-06-26 10:29:37 -06:00
aerinon 8afdbaca25 Update release notes 2023-06-16 09:22:08 -06:00
aerinon 002e46e56e Merge branch 'hiimcody1-DoorDevUnstable' into DoorDevUnstable 2023-06-16 09:18:31 -06:00
aerinon 0d4ff815d3 Merge branch 'DoorDevUnstable' of github.com:hiimcody1/ALttPDoorRandomizer into hiimcody1-DoorDevUnstable 2023-06-16 09:17:46 -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 ea8bd117fc Fix for partial key logic for vanilla mire
Fix for Kholdstare shell collision
2023-04-14 14:17:57 -06:00
aerinon 072bbfac1f Version bump and release note 2023-04-13 16:20:54 -06:00
aerinon 2abfc6ea80 Swap E/W on Mire Torches/Mire Attic Hint 2023-04-13 16:19:18 -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 8ffefdca9a Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable 2023-04-07 10:28:07 -06:00
aerinon 5d86ed4055 start of any enemy logic option 2023-04-06 16:57:15 -06:00
aerinon ef63511bd8 Update notes 2023-04-06 11:25:32 -06:00
aerinon 85afd0c09e Add collection_rate to customizer 2023-04-06 11:23:54 -06:00
aerinon 10eac87922 Logic fix: hookshot needed for pots in GT conveyor cross 2023-04-06 11:23:04 -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 abb11558d8 Correct version bump 2023-04-05 15:58:16 -06:00
aerinon 17f9efb230 Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable
# Conflicts:
#	RELEASENOTES.md
2023-04-05 15:56:17 -06:00
aerinon 50f92e7aee Release notes and minor cleanup 2023-04-05 15:55:30 -06:00
aerinon 09550cd546 Minor fix 2023-04-04 16:53:45 -06:00
aerinon 3e65deda14 Minor fixes 2023-04-03 16:37:29 -06:00
aerinon 41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
aerinon a4f3afdf5d Reduce retro keys slightly 2023-03-31 16:00:15 -06:00
aerinon d9c18407e4 Fix starting flute logic 2023-03-31 09:29:01 -06:00
aerinon 6f18c4c4a5 Fix lamp logic in partitioned 2023-03-30 16:42:56 -06:00
aerinon a0b781521f Big enemizer updates
Fix sheets
Health + damage rando
Logical kill rooms
2023-03-30 16:12:46 -06:00
aerinon 4a1efb141a Add collection_rate to customizer 2023-03-24 09:12:46 -06:00
aerinon b513bbef1b Logic fix: hookshot needed for pots in GT Conveyor Cross 2023-03-23 15:33:29 -06:00
aerinon c9c510ae21 Minor fixes for customized vanilla doors 2023-03-22 14:58:07 -06:00
aerinon 636819ffc0 Versioning update 2023-03-14 16:05:28 -06:00
aerinon b2b3d789ca Some rom fixes: - standing item data now cleared on dungeon exit
Escape assist won't fill arrows resulting in free quiver in retro bow mode
2023-03-13 20:42:55 -06:00
aerinon 02c7a5279c Fix some paired doors 2023-03-13 20:40:45 -06:00
aerinon f4524d8a87 Fix Snitch Lady (West) location on map 2023-03-13 16:28:11 -06:00
aerinon b44caa76a7 Customize certain potions refills. 2023-03-13 14:26:25 -06:00
aerinon d85a63ece1 Damage table start 2023-03-13 11:11:59 -06:00
aerinon 9d9071a984 Unstable rom updates 2023-03-10 14:19:09 -07: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 c48c89f65b Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts:
#	Main.py
#	RELEASENOTES.md
2023-03-09 11:16:24 -07:00
aerinon 1bb4d5f03b Version bump and note 2023-03-09 11:14:13 -07:00
aerinon bd25c6be26 Merge pull request #141 from tcprescott/DoorDev_MultiworldService
MultiServer: Add option to MultiServer to disable client forfeits
2023-03-09 11:12:37 -07:00
aerinon 44afe50bf4 Version bump 2023-03-08 08:26:50 -07:00
aerinon 4563f96fd5 Fix for mirror portal in inverted
Yet another fix for blocked doors in Standard ER, minor alteration for the swamp entrance fix to work when blocked as well.
2023-03-08 08:25:46 -07:00
aerinon 14ced2435c Update for enemizer bits 2023-03-06 16:29:58 -07:00
aerinon 87ab4a8c8a Update baserom and release notes 2023-03-06 16:10:07 -07:00
aerinon a5da504b90 Fix for district shuffle's placeholder issue 2023-03-03 16:53:50 -07:00
aerinon 9aab5a2c95 Beemizer fix for shopsanity, pottery, etc. 2023-03-03 16:53:23 -07:00