Commit Graph

159 Commits

Author SHA1 Message Date
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
codemann8
87381e495c Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle 2021-02-18 22:44:17 -06:00
codemann8
b11054e6bf Added Overworld Shuffle parameter to CLI and Gui 2021-02-10 22:11:50 -06: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
aerinon
e834fd85a1 Initial Shopsanity
Retro work
2020-12-03 16:25:51 -07:00
aerinon
32e7544775 Generation improvements 2020-12-01 15:00:53 -07:00
aerinon
4dda394a90 Added option to keep original palettes in crossed dungeon mode
If sanc if in a DW dungeon because of crossed+ ER, then you start in bunny form
Mirroring from sanc to the portal is now in logic
Another fix for animated tiles (fairy fountains)
GT Big Key stat changed on credits

Some standard logic fixes for lobbies (more outstanding)
2020-11-16 10:51:26 -07:00
aerinon
d3e643b9c6 Finish bps work
Fixing a couple bugs
2020-10-29 15:46:27 -06:00
aerinon
d89801c72c Key Hud redesign continued
Keydropshuffle prototype
2020-10-23 12:59:18 -06:00
aerinon
357a09d5b7 Added intensity parameter. Clean up for next alpha release 2020-09-16 15:01:01 -06:00
Mike A. Trethewey
4c35b39e35 Fix Hints toggle on CLI 2020-04-07 02:17:25 -07:00
Mike A. Trethewey
ff678659f9 Add Suppress Spoiler 2020-03-23 21:39:45 -07:00
aerinon
4fc15e84fc Bump version
Set shuffleganon to default to True
2020-03-23 14:15:17 -06:00
Mike A. Trethewey
8513b7f270 Fix var loading again
Update Deprecated Args
Parse CLI
Parse Settings
Fix defaults
Fix priority
Add Enemizer error
Fix Custom Item Array again
Make output more verbose
Fix double-negative options
2020-03-22 02:53:40 -07:00
Mike A. Trethewey
d8ea5b0fd0 Merge branch 'DoorDev' into ci-dev 2020-03-12 04:17:05 -07:00
aerinon
ceeb23669a Experimental flag issue
Turned off unprepared experimental feature that snuck in
2020-03-11 14:02:16 -06:00
Mike A. Trethewey
e2943b21dc Fix Seed & Player Names 2020-03-10 18:21:36 -07:00
Mike A. Trethewey
37a1b70f3b Pass the fish better 2020-03-09 03:53:08 -07:00
Mike A. Trethewey
ca7fc4d0f6 Hack in Spanish 2020-03-09 02:25:25 -07:00
Mike A. Trethewey
b25e46b160 Factor out CLI text 2020-03-09 01:11:48 -07:00
Mike A. Trethewey
061852cbd3 Merge branch 'DoorDev' into ci-dev 2020-03-04 14:05:49 -08:00
aerinon
39ea777cf9 Gui fixes for clocks/dungeon_counters
Map fix for settings
2020-03-04 13:57:29 -07:00
Mike A. Trethewey
9884e86459 Merge branch 'gui-improvements-update' into ci-dev 2020-03-04 00:02:16 -08:00
Mike A. Trethewey
4968e72a3b Document stuff, add a couple things
Add Retro World State (Open & Retro on)
Add SpriteSomething plug to sprite selector
Fix Custom Item Pool loading to use disct instead of list
2020-03-03 23:43:43 -08:00
Mike A. Trethewey
2f0d76ba91 Merge branch 'DoorDev' of https://github.com/aerinon/ALttPDoorRandomizer into aerinon-DoorDev 2020-03-03 07:05:23 -08:00
aerinon
c9656d1ac9 Made count default "none" 2020-03-02 15:25:26 -07:00
aerinon
8bdbf5d6b2 Saves sprite settings
Save on exit feature
Some formatting changes
2020-03-02 15:04:46 -07:00
aerinon
a20f5423fd Minor gui fixes 2020-02-28 16:35:45 -07:00
Mike A. Trethewey
74f3e89547 Move GUI to Source folder to avoid conflicts 2020-02-27 01:10:49 -08:00
Mike A. Trethewey
c3a7f69c4b Prelim build scripts 2020-02-23 22:46:50 -08:00
Mike A. Trethewey
97f771fe42 Fix stuff 2020-02-23 22:01:44 -08:00
Mike A. Trethewey
66c57e38b0 Fix CLI precedence 2020-02-23 21:38:22 -08:00
Mike A. Trethewey
01e1e719db Implement Starting Inventory 2020-02-23 17:53:51 -08:00
Mike A. Trethewey
baec0e4548 Fix Custom Item Pool (again again) 2020-02-23 16:21:39 -08:00
Mike A. Trethewey
7a3855a17a Fix Custom Item Pool (again) 2020-02-22 02:43:56 -08:00
Mike A. Trethewey
e898ae078b Try to fix some options 2020-02-22 01:43:39 -08:00
Mike A. Trethewey
bd6685d719 Fix erroneous counts 2020-02-22 01:20:08 -08:00
Mike A. Trethewey
6c9fdcd203 Update Widgets to be able to use grid 2020-02-21 23:47:29 -08:00
Mike A. Trethewey
dbaaef662a Fix a bunch of stuff
Defaults from settings file, then CLI, then canned defaults
Fix Adjust settings
Fix Custom Item Array settings
Create error message for Enemizer Not Found
2020-02-20 01:04:53 -08:00
Mike A. Trethewey
d82c4c9d70 Fix some stuff 2020-02-19 03:53:45 -08:00