Commit Graph

456 Commits

Author SHA1 Message Date
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
codemann8
f13880eee9 Major GUI reorganization 2023-04-04 17:11:43 -06:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -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
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
c3dd6bac79 Murderdactyl ohko rule 2023-03-03 16:52:29 -07:00
aerinon
1dc3b13449 Change info message to debug for cleaner output
Possible generation error
2023-02-27 14:42:52 -07:00
aerinon
d7c15ae22c Strict and Partial key logic implementations with new test suite utility 2023-02-17 10:07:43 -07:00
aerinon
a304fd31ac Standard keysanity distribution and generation fixes
Includes new S&Q safety
2023-02-14 15:58:52 -07:00
aerinon
22dfeeecca Starting inventory updates
Logic fix for skull woods star tile logic
Standard logic improvement
2023-01-12 15:32:49 -07:00
aerinon
4d1b5f58c0 Minor naming convention fixed 2023-01-06 16:57:52 -07:00
codemann8
118adabeb1 Changing mirror exits to be dynamically created 2022-12-30 06:17:54 -06:00
codemann8
c6d0df5f4f Modeling Fairy Ascension Mirror Spot more correctly 2022-12-29 23:46:15 -06:00
codemann8
55a91f8d17 Merged in DRUnstable v1.2.0.1 2022-12-16 18:18:07 -06:00
codemann8
2d26954422 Final fixes and reorganization to Inverted Region merging 2022-12-15 17:26:02 -06:00
codemann8
f8bba4176b Reorganized and renamed regions, rules, and lists 2022-12-14 04:12:17 -06:00
codemann8
8e08f336d0 Merging Regions and Rulesets 2022-12-13 01:40:44 -06:00
aerinon
e67ff4d5dc Completionist fixes 2022-12-07 15:57:51 -07:00
codemann8
bd53400fec Replaced all references of Inverted-variant regions/exits 2022-12-06 22:21:35 -06:00
aerinon
becba348b9 New goals and rom update 2022-12-01 14:10:10 -07:00
aerinon
f977c06b5e Merge branch 'DoorDev' into Synthesis
# Conflicts:
#	Main.py
#	RELEASENOTES.md
2022-11-29 13:26:32 -07:00
aerinon
6934aedfd8 Logic bug for GT Refill room not requiring boots 2022-11-29 13:22:27 -07:00
aerinon
1134eb23e7 Added support for various avianart modes
Uncle boots hints
Some key logic re-working unsure if safe
2022-11-28 15:05:39 -07:00
aerinon
9fafa8981e Big Key Door fix for when big key double sided is off
Fix for basic issues - key total doesn't change
Potential key lock logic fix
2022-10-28 12:47:43 -06:00
aerinon
0783f97b57 Merge branch 'DoorDev' into Synthesis
# Conflicts:
#	Main.py
#	README.md
#	RELEASENOTES.md
2022-10-27 15:22:44 -06:00
aerinon
4ab0a40c45 Bumper cave fix
Pottery coloring updated
2022-10-27 13:56:37 -06:00
aerinon
a5fc4dd7a6 Rules changes
Implement Big Magic/Chicken/Fairy spawn items
2022-10-03 16:12:05 -06:00
aerinon
b71c7aa2b4 Underworld dropshuffle 2022-09-30 15:38:35 -06:00
aerinon
5b4bcc02d4 Finished region mapping 2022-09-16 15:49:16 -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
3975c6c65d Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	TestSuite.py
2022-09-01 11:38:02 -06:00
aerinon
45395e9b15 Legacy pot shuffle fix 2022-08-26 16:08:18 -06:00
aerinon
5b8b0cb7f8 Mire Falling Bridge logic refinement for possible trap door movement 2022-08-23 15:27:22 -06:00
aerinon
3e7dfaf856 Fix Key Rat region 2022-08-23 15:06:36 -06:00
aerinon
8ec852a737 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py
2022-06-23 10:37:38 -06:00
aerinon
fe814005d6 Waterfall of Wishing logic exit fix revised 2022-06-23 10:36:51 -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
f5307dacc1 Waterfall logic fix. Inverted seems to have been fixed years ago 2022-06-17 15:12:37 -06:00
aerinon
7dd5cc0e36 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	BaseClasses.py
#	ItemList.py
#	Main.py
2022-04-21 11:14:40 -06:00
aerinon
31a279d63d Trinity goal added 2022-04-20 14:06:55 -06:00
aerinon
26e8e23fce Initial work on new pottery modes 2022-04-19 13:56:39 -06:00
aerinon
cf227aafc0 Trinity goal 2022-04-04 13:37:07 -06:00
aerinon
69bae0f338 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	DoorShuffle.py
2022-03-29 13:30:49 -06:00
aerinon
8bc446fbc5 Logic refinements for Skull X Room and GT Falling Torches 2022-03-29 13:28:05 -06:00
aerinon
8ec16d46ce Dashable forbidden
Minor logic refinement for Spiky Hint Cave
2022-03-25 15:35:46 -06:00
aerinon
dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06:00