Commit Graph

217 Commits

Author SHA1 Message Date
aerinon
7e5542f3a2 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	Mystery.py
2022-08-24 16:27:18 -06:00
aerinon
0dfdbfd39e Removed "good bee" from Mothula logic
Fixed an issue with Mystery generation and windows file path
2022-08-24 15:00:48 -06:00
aerinon
7be5cc1a6b Merge branch 'Customizer' into Synthesis
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-24 14:29:10 -06:00
aerinon
152c383233 Merge branch 'DoorDevUnstable' into Customizer
# Conflicts:
#	Bosses.py
#	ItemList.py
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-24 13:38:59 -06:00
aerinon
5d419210af Fix a bank conflict with OWR
Release notes and version bump
2022-08-24 13:18:01 -06:00
aerinon
1168273e43 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	Bosses.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2022-08-11 15:43:33 -06:00
aerinon
2ed0a80609 Fix for pot items to not reload with the supertile
Key distribution change
Unique boss shuffle make gt bosses also unique
Removed text color in hints due to bug
2022-08-11 15:25:09 -06:00
aerinon
32714b4c6a Fix for colorized pots in "dark desert hint" aka mire storyteller 2022-08-05 16:48:34 -06:00
aerinon
e167811d34 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-05 14:06:01 -06:00
aerinon
f06e7c7fd3 Merged in Volatile work 2022-07-07 14:20:41 -06:00
aerinon
04fc0b442d Hotfix for enemizer and pot substitutions 2022-06-30 11:51:34 -06:00
aerinon
2f821632e1 Spelling and grammar 2022-06-29 13:01:34 -06:00
aerinon
d488df6d18 Pot substitutions for certain items 2022-06-29 12:58:10 -06:00
aerinon
b426d47a0a Merge branch 'Customizer' into StandardThrone
# Conflicts:
#	Main.py
2022-06-23 10:38:18 -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
1972500e31 Merge branch 'Customizer' into StandardThrone
# Conflicts:
#	DungeonGenerator.py
#	Main.py
#	RELEASENOTES.md
2022-06-22 13:08:38 -06:00
aerinon
c487634d3d Merge branch 'DoorDevVolatile' into StandardThrone
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-06-22 10:55:55 -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
377989d406 Update release notes and version 2022-06-22 10:43:39 -06:00
aerinon
31bee77c4c Mirror scroll behavior during escape altered. Pray I do not alter it further 2022-06-16 12:35:16 -06:00
aerinon
8a6b05fe8f Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py
#	Rom.py
2022-06-15 16:56:57 -06:00
aerinon
32aebb2ad1 Pottery fix for item counting because of shop conflict 2022-06-15 16:55:20 -06:00
aerinon
25905fe3f3 Capitalization fixes
Highlight part of the text in red (experimental)
2022-06-14 13:22:24 -06:00
aerinon
5dce2daa0b Standard throne room changes 2022-06-14 12:29:57 -06:00
aerinon
dbb69359aa Fix customizer GUI yaml selection 2022-05-24 10:17:31 -06:00
aerinon
8d5fe30889 Fix wording 2022-05-24 10:16:36 -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
b0ea301c20 Typo 2022-05-18 16:08:41 -06:00
aerinon
afdb8ebac8 DungeonCompletion fixed
Minor issue with dungeon counters fixed
2022-05-18 15:04:20 -06:00
aerinon
a48a73bcb7 MultiClient fix for shop sram move 2022-05-13 16:09:03 -06:00
aerinon
6ab426b9f3 Fix for keydrops/enemy drops to not be repeatable 2022-05-03 13:55:39 -06:00
aerinon
ea745ff22e Hotfix for paired doors
Also made dashable filter work
2022-04-30 15:28:29 -06:00
aerinon
f93ecf9412 New baserom with various fixes for both font and multiclient issue with pottery
Bump TFH limit to 850. It throws an error if you try to generate with too many pieces.
2022-04-28 16:27:37 -06:00
aerinon
a9797bfd83 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-04-21 13:18:06 -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
31aeb8a776 Pottery fixes for Room0127
Added mystery flag for future use
2022-04-21 11:03:49 -06:00
aerinon
5cc04ed675 Msu resume bug on patcher
Check for retro arrows in pots
2022-04-20 14:00:16 -06:00
aerinon
4880f8017a Pottery fix for vanilla hera key 2022-04-20 08:51:32 -06:00
aerinon
940c179e28 Documentation update 2022-04-19 14:40:27 -06:00
aerinon
c7de8dad79 Minor bug in dungeon_only algoithm (also affected fallback grouping in major_only and vanilla) 2022-04-13 14:27:45 -06:00
aerinon
e1f85efbef Fixes for overworld_map map mode 2022-04-13 13:31:47 -06:00
aerinon
833b570af6 Customizer item_pool updates 2022-04-13 13:22:15 -06:00
aerinon
730847fa07 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	DoorShuffle.py
2022-03-29 14:32:24 -06:00
aerinon
68c2d06d85 Rain state prevention fix
Also, disallowed door behind Throne Room to be dashable/bombable in standard/hc
2022-03-29 14:30:20 -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
2ca8d61c0b Arghus splash fix
Don't bother checking the ssl cert for that call
2022-03-29 12:21:09 -06:00
aerinon
8ec16d46ce Dashable forbidden
Minor logic refinement for Spiky Hint Cave
2022-03-25 15:35:46 -06:00
aerinon
031ec9983f Forfeit multiworld option fix for shops and pots
GT junk fill reworked for pottery lottery
2022-03-25 14:54:28 -06:00