Commit Graph

95 Commits

Author SHA1 Message Date
aerinon
b71c7aa2b4 Underworld dropshuffle 2022-09-30 15:38:35 -06:00
aerinon
9caea3fc85 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	CLI.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2022-09-08 13:47:38 -06:00
aerinon
1e4b857dab Update default setting to vanilla 2022-09-07 16:55:46 -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
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
d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -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
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
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
dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06:00
aerinon
4e43f38332 Separated Collection Rate counter from experimental
Added MSU Resume option
Ensured pots in TR Dark Ride need lamp
Fix for Links House being at Maze Race (did not generate)
2022-03-09 15:42:00 -07:00
aerinon
2b0e891ee9 Usestartinventory ignored 2022-02-24 10:04:59 -07:00
aerinon
b024311aaa BPS support 2022-02-17 14:00:00 -07:00
aerinon
da89ab1006 Bug fixes for pottery lottery changes 2022-01-24 16:04:16 -07:00
aerinon
5211b305e6 Re-worked settings for pottery lottery
Fixed multiworld support for lottery
2022-01-21 16:10:33 -07:00
aerinon
b2f2565271 Standing Items initial commit 2021-12-16 16:02:11 -07:00
aerinon
e78f9218f5 Merge branch 'Ambrosia' into DoorDevVolatile
# Conflicts:
#	BaseClasses.py
#	CLI.py
#	Main.py
2021-10-29 15:26:51 -06:00
aerinon
dc7d4940d9 Overworld map code 2021-10-21 16:29:09 -06:00
aerinon
f259e8bdc8 Boss item restriction logic added
Reserved location logic started
2021-08-20 14:32:54 -06:00
StructuralMike
dcba2be757 Bombbag instead of Bombbags 2021-08-11 16:29:12 +02:00
StructuralMike
44efe51e02 Changing the cli to be bombbags over bomblogic
Bombbags seemed better over bomblogic which is more ambiguous when considering new stuff OW and the bomb-only modes.

Also added bombbags to the example yaml
2021-08-11 10:22:54 +02:00
aerinon
1871b7ee6e Merge branch 'SFXShuffle' into DoorDevUnstable 2021-08-02 12:40:52 -06:00
StructuralMike
051a47e0cd Bomblogic added 2021-07-23 20:35:48 +02:00
aerinon
68dc27902b SFX Shuffle initial implementation 2021-07-15 16:02:07 -07:00
aerinon
940369d3ec Rename fake boots to pseudo boots
Doc updates
2021-07-09 15:13:01 -07:00
aerinon
ffcc78f95c Fake boots checkbox/argument 2021-07-07 16:23:16 -07:00
aerinon
23ffc61667 Sprite author credit
Reduce flashing option
2021-06-07 11:13:28 -06:00
aerinon
63d49c5775 Beemizer stuff 2021-06-02 11:15:22 -06:00
aerinon
46ccfedcdc Blind Attic hint in crossed
Hint default change to False, moved GUI checkbox
2021-06-02 10:51:21 -06:00
aerinon
fff7cd691e Added the --shufflelinks option
Moved bunny spawn to experimental
Baserom bugfixes
2021-05-24 15:14:23 -06:00
aerinon
70a3f2e53e Remove link sprite. Updated bob sprite 2021-04-30 15:55:00 -06:00
randall.rupper
7b9deb2190 Merge branch 'DoorDevUnstable' of https://github.com/Fouton/ALttPDoorRandomizer into Fouton-DoorDevUnstable
some refinements too

# Conflicts:
#	ItemList.py
2021-03-16 15:15:48 -06:00
Fouton
0865288581 Add files via upload 2021-03-12 16:53:08 -05:00
Fouton
2a1eb07d73 Add files via upload 2021-03-12 16:51:16 -05:00
Fouton
8d933b82de TFH Futures 2021-03-12 16:41:35 -05:00
randall.rupper
dc5cd2b744 Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts:
#	Main.py
#	RELEASENOTES.md
2021-03-05 10:43:05 -07:00
Thomas Prescott
e5b9019828 remove unused import 2021-03-03 08:02:50 -06:00
Thomas Prescott
1bac04a24c formatting, and fix output 2021-03-02 20:12:24 -06:00
Thomas Prescott
7674e7dafb hack in a thing to use a settings file for generation 2021-03-02 19:34:29 -06:00
Mike A. Trethewey
f7df6c0e69 Fixes
Change Spoiler default to True
Set base rom to actually do the thing
2021-02-26 02:13:11 -08:00
aerinon
f6d1dc282b Minor bugfix update 2021-02-25 16:51:07 -07:00
aerinon
af441a8e9b Merging in base er changes 2021-02-25 15:26:29 -07:00
aerinon
2765f9bec0 - Settings code added (prototype)
- Mystery.py updates
- Blind maiden sequence restored if Blind is shuffled to TT
- Spoiler updated
- Fix for standard in vanilla ER
- Minor shopsanity discount
2021-02-09 16:31:12 -07:00