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
50f92e7aee
Release notes and minor cleanup
2023-04-05 15:55:30 -06:00
codemann8
09ea7dd9a9
Fixed various Flute logic issues and improved logic efficiency
2023-04-01 09:11: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
f4f0ff1018
Merge branch 'DoorDevUnstable' into OverworldShuffleDev
2023-03-22 16:15:38 -05:00
aerinon
c9c510ae21
Minor fixes for customized vanilla doors
2023-03-22 14:58:07 -06:00
codemann8
57b39993b9
Merged in DR v1.2.0.13
2023-03-14 17:48:42 -05:00
aerinon
636819ffc0
Versioning update
2023-03-14 16:05:28 -06:00
aerinon
b44caa76a7
Customize certain potions refills.
2023-03-13 14:26:25 -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
1bb4d5f03b
Version bump and note
2023-03-09 11:14:13 -07:00
codemann8
b6da5e51fd
Merged in DR v1.2.0.12
2023-03-08 16:16:04 -06:00
aerinon
44afe50bf4
Version bump
2023-03-08 08:26:50 -07:00
codemann8
e6a1476244
Merged in DR v1.2.0.11
2023-03-07 18:58:08 -06:00
aerinon
87ab4a8c8a
Update baserom and release notes
2023-03-06 16:10:07 -07:00
codemann8
d1b4d9e044
Merged in DR v1.2.0.10
2023-03-02 19:07:04 -06:00
aerinon
00b06c53d6
Rom updates and version update
2023-03-01 16:28:47 -07:00
codemann8
90c6854919
Initial OWR/ER2 merge
2023-02-26 13:44:30 -06:00
codemann8
4caee1cbec
Merged in DR v1.2.0.9
2023-02-24 16:14:00 -06:00
aerinon
409f7d50d5
Rom changes (see that commmit message or release notes)
...
Customizer improvements:
- Better logic around customized lobbies
- Better logic around customized door types
Fix to key doors that was causing extra key doors
Generation improvement around crystal switches
Fix bug in dungeon_only that wasn't using pot key locations (known issue still exists in pottery modes)
Fixes an issue when keys are found in own dungeon for another player when using the bizhawk plugin
2023-02-24 14:25:04 -07:00
codemann8
4ea0eda0b9
Initializing districts after OWR so ER can use them
2023-02-22 17:37:27 -06: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
f0101c9854
Trap door mode initial work
2023-02-16 11:49:29 -07:00
aerinon
5f8be831ec
Version bump and release notes
2023-02-15 14:25:00 -07:00
aerinon
fb13785abc
Minor standard generation fix
...
Minor ER + Partitioned fix
2023-02-06 13:46:25 -07:00
aerinon
04a9bcc68b
Fix for free light cone in escape.
...
No longer missing when entering from DW.
No longer disappears after using fire rod to light torch.
2023-01-27 15:21:22 -07:00
codemann8
96806f2b5e
Merged DR v1.2.0.5
2023-01-19 08:18:22 -06:00
aerinon
4547a0a43b
Logic fix for sanc mirror route
...
Minor updates to customizer
Minor update to new ER (seed duplication issue)
2023-01-18 08:02:32 -07:00
codemann8
904ff5ec85
Merged in DR v1.2.0.4
2023-01-13 04:08:10 -06: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
codemann8
c98300e2ff
Merged in DR v1.2.0.3
2023-01-06 21:37:28 -06:00
aerinon
8839926a97
Race flag on GUI
...
Async Doors League presets
Take into account starting inventory with default item pool
2023-01-06 13:56:18 -07:00
aerinon
46903470b5
Fix typo for door "Sewers Key Rat E"
2023-01-03 16:14:42 -07:00
codemann8
118adabeb1
Changing mirror exits to be dynamically created
2022-12-30 06:17:54 -06:00
codemann8
3cb90d8221
Combining dynamic exits into one call
2022-12-26 13:09:23 -06:00
codemann8
196de5a08e
Changing mirror exits to be dynamically created
2022-12-26 05:09:27 -06:00
codemann8
245b4744bb
Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffleDev
2022-12-22 04:27:59 -06:00
codemann8
0324017c2d
Merge remote-tracking branch 'upstream/DoorDevUnstable' into SynthesisOWRMerge
2022-12-22 03:47:30 -06:00
aerinon
8f9f9e03c1
Fixed an issue with certain trap doors
...
DR Hint reference started
2022-12-21 16:57:25 -07:00
codemann8
55a91f8d17
Merged in DRUnstable v1.2.0.1
2022-12-16 18:18:07 -06:00
codemann8
a4120e0cb5
Merged in DR v1.2.0.1
2022-12-16 18:14:27 -06:00
codemann8
8e08f336d0
Merging Regions and Rulesets
2022-12-13 01:40:44 -06:00
