Commit Graph

707 Commits

Author SHA1 Message Date
aerinon
c4ec28da76 fix: minor fix for take_anys
fix: money balancing - initialization in a good case
2023-12-13 13:59:34 -07:00
codemann8
b65c55e1b5 Fix some issues with Smith return 2023-11-24 16:38:21 -06:00
Cody Bailey
a2c4be4c4c Add aga_randomness to exposed settings 2023-11-19 17:37:30 -05:00
aerinon
f4a702951c fix(key logic): typo 2023-11-11 20:00:31 -07: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
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
codemann8
e19622b566 Fixed and reorganized OWR sections on spoilers 2023-09-08 08:48:15 -05:00
codemann8
bcb224ade8 Some code simplification 2023-09-05 13:38:29 -05:00
codemann8
508a68e5e5 Merging Limited and Chaos Crossed OWR options into Unrestricted 2023-09-05 03:01:49 -05:00
codemann8
927588a3d8 Adding Customizer support for Crossed OWR
Also made Layout OWR compatible with Mixed OWR with asterisk notation
2023-09-05 00:30:53 -05:00
codemann8
26727fbfca Added Customizer support for OWR Layout and Whirlpool Shuffle 2023-08-25 11:18:21 -05:00
aerinon
42bf2f3534 Bunch of fixes for the baserom changes 2023-08-24 16:18:49 -06: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
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
Catobat
1817cf3824 Fix byte 12 in settings code 2023-08-01 22:00:58 +02:00
aerinon
0ee88618a7 Paired dungeon shuffle 2023-08-01 11:31:59 -06:00
codemann8
35f3abc1c1 Creating user notes field to be supplied by the seed roller 2023-07-29 05:10:47 -05:00
codemann8
982032e156 Supporting old keyshuffle keywords 2023-07-29 05:04:46 -05:00
codemann8
d79c8c1fd1 Merged in DR v1.2.0.19 2023-07-29 05:03:37 -05:00
aerinon
8d17d95640 Fixed a generation bug
Add ganonhunt to pyramid open
2023-07-27 13:45:44 -06:00
codemann8
4f5d268401 Adding new Swapped ER mode option 2023-07-16 01:07:17 -05:00
codemann8
f3fd86e10e Add seed number to spoiler metadata 2023-07-07 04:02:59 -05:00
codemann8
32d13a904b Merge pull request #12 from hiimcody1/patch-1 2023-06-29 20:27:49 -05:00
codemann8
8362886cc1 Merged in DR v1.2.0.17 2023-06-16 12:14:16 -05:00
Cody Bailey
8955e8b26f Fix JSON metadata 2023-06-14 15:31:49 -04:00
aerinon
503be6aa91 Enemizer refinement 2023-05-19 08:53:01 -06:00
aerinon
907639b984 any_enemy_logic option added 2023-04-10 09:07:01 -06:00
codemann8
793f3b30b0 Merged in DR v1.2.0.14 (2nd) 2023-04-07 12:04:12 -05: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
codemann8
1005c7f844 Reorganized spoiler log based on UI reorg 2023-04-01 08:16:27 -05:00
codemann8
3eeeda363b Fixed various Flute logic issues and improved logic efficiency 2023-04-01 07:59: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
37750c55cf Remove Polar from Crossed if Mixed not enabled 2023-03-22 16:09:01 -05: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
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
codemann8
d1b4d9e044 Merged in DR v1.2.0.10 2023-03-02 19:07:04 -06:00
codemann8
e8b4d23595 Fixed Placeholder NoneType error 2023-02-26 13:13:13 -06:00
aerinon
7397d779ad Changing colorizing pots defaults 2023-02-24 16:20:29 -07:00
codemann8
ab5f348f77 Merged in DR v1.2.0.8 2023-02-18 19:33:15 -06:00
codemann8
f493709cfe Merged in DR v1.2.0.7 2023-02-18 18:50:21 -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