Commit Graph
133 Commits
Author SHA1 Message Date
codemann8 89e91a85fd Merged in DR v1.4.5 2024-08-21 03:57:12 -05:00
codemann8 103e098a2e Initial Prize Shuffle Implementation
commit c89c5d3798e2a777011e90d565d74af792330d9f
commit 4159f2e7097fca648828a60d8f6878211d0ded9e
commit a80e3a4301d69146ccfffe0f2f375adac381e165
commit d8ac588cb904152831f514d8276be4e39a43dcd0
commit 68eb75e3391631355b4f56f1dcb7e9dadadf1fdf
commit ba241b47964eadfb40ad323f87b1117598dd91a6
commit aed2821c7165822f5fd5cc1ff3f58f2af095d915
commit bd1c5d8d35ae3cae5f27f236346fff057b7b8cd7
commit f034e31cc585a1648657fc2c4850ebc0c1d8bf78

Author: codemann8 <codemann8@gmail.com>
2024-05-23 18:40:50 -05:00
codemann8 dab9d75dc1 Merged in DR v1.4.1.11 2024-04-25 15:06:59 -05:00
aerinon 20e60c8a1d feat(spoiler): introducing custom spoiler levels 2024-04-22 08:35:17 -06:00
codemann8 21a1706657 Merged in DR v1.4.1.6 2024-02-23 11:48:04 -06:00
codemann8 893947f89b Added new SFX instrument shuffle option 2024-01-26 22:36:30 -06:00
codemann8 2bec50b26b Implemented District ER 2024-01-10 05:57:39 -06:00
aerinon b5795e4bf2 Merge branch 'KrisDavie-hmg_logic' into DoorDevVolatile 2024-01-05 09:47:57 -06:00
codemann8 bd5232bf24 Fixed missing OWR brand labels 2023-12-23 03:42:52 -06:00
KrisDavie 6a41dff98b Raise error on doors + hmg 2023-12-22 22:48:42 +01:00
KrisDavie dad1ee8336 Implement basic HMG logic
* Ice Palace Lobby Clip
* Kikiskip to Pod
* Mire -> Hera -> Swamp
  - Mire small door to rupee room is removed
  - Hera and Swamp keys are placed without logic
  - Swamp locked by vanilla rules or having all mire smalls
* Above as connectors in ER
2023-12-22 22:48:42 +01:00
aerinon 4b888b3c48 feat: swapped ER 2023-12-19 16:31:29 -07:00
codemann8 a1b570da62 Added song instrument shuffle 2023-12-02 05:46:33 -06:00
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
codemann8 1024126835 Moving Display Collection Rate option away from post-gen options 2023-09-10 14:51:43 -05:00
codemann8 508a68e5e5 Merging Limited and Chaos Crossed OWR options into Unrestricted 2023-09-05 03:01:49 -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
Catobat 7197a23b45 Add setting for self-looping doors 2023-08-02 02:23:19 +02:00
aerinon 0ee88618a7 Paired dungeon shuffle 2023-08-01 11:31:59 -06:00
codemann8 4f5d268401 Adding new Swapped ER mode option 2023-07-16 01:07:17 -05:00
aerinon 907639b984 any_enemy_logic option added 2023-04-10 09:07:01 -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
codemann8 ab5f348f77 Merged in DR v1.2.0.8 2023-02-18 19:33:15 -06:00
aerinon 9a71e56546 Trap door refinement with "optional" value versus "vanilla"
Slight balance of chaos mode
Warping Pool trap no longer shuffled
2023-02-17 16:55:35 -07:00
aerinon d7c15ae22c Strict and Partial key logic implementations with new test suite utility 2023-02-17 10:07:43 -07:00
aerinon f0101c9854 Trap door mode initial work 2023-02-16 11:49:29 -07:00
codemann8 a4120e0cb5 Merged in DR v1.2.0.1 2022-12-16 18:14:27 -06:00
codemann8 e5afe70bcb Merged DR v1.2.0.0 2022-12-03 01:52:22 -06:00
aerinon becba348b9 New goals and rom update 2022-12-01 14:10:10 -07:00
codemann8 46786ca489 Renamed Tile Swap to Tile Flip 2022-11-01 20:16:01 -05:00
codemann8 ae1a775248 Reordering Crossed options to have Grouped as first option 2022-10-29 11:30:10 -05:00
Catobat 0c53fc8519 Add Free Terrain mode and terrain rules 2022-10-09 01:23:47 +02:00
aerinon b71c7aa2b4 Underworld dropshuffle 2022-09-30 15:38:35 -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 21456b5c90 Merge branch 'Customizer' into Synthesis
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
2022-08-11 16:06:50 -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
codemann8 7fecbee3bb Removed 'allowed' Crossed OWR option 2022-08-01 15:51:33 -05:00
codemann8 a5729b51a2 Adding new option for Bonk Drop Shuffle 2022-07-24 12:42:08 -05:00
codemann8 df86503941 Merged in DR v1.0.1.0 2022-07-08 10:59:00 -05:00
aerinon d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -06:00
aerinon b13e15f999 Merge branch 'DecoupledDoors' into Synthesis
# Conflicts:
#	BaseClasses.py
#	DoorShuffle.py
2022-06-23 10:59:44 -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 8d140c9bf8 Spoiler refactor 2022-06-17 14:36:51 -06:00
Catobat 6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon 14571508ae Init work on decoupling doors 2022-05-25 10:31:20 -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 e1bf283e1c Fix help 2022-05-13 16:37:27 -06:00
aerinon 7dd5cc0e36 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	BaseClasses.py
#	ItemList.py
#	Main.py
2022-04-21 11:14:40 -06:00