Commit Graph

423 Commits

Author SHA1 Message Date
StructuralMike
ad8dbcd01c Merge branch 'DoorDevUnstable' into BombSwitchDevUnstable 2021-03-18 23:19:20 +01:00
aerinon
906134800b Fixed the error with TFH counter turned on for wrong modes
Updated pip requirements for MultiClient
Fixed Big bomb rules for Inverted (merge mistake)
2021-03-18 13:53:19 -06:00
StructuralMike
16ba877e86 Merge branch 'DoorDevUnstable' into BombSwitchDevUnstable 2021-03-18 17:19:52 +01: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
StructuralMike
13c2022bc9 BombSwitchDev 2021-03-16 22:05:10 +01:00
randall.rupper
3c81e377e5 Fix for intensity 3 inverted lobbies if lobbies are chosen to be vanilla
Flooded pots not actually able to be flooded in some potshuffles
2021-03-16 14:23:52 -06:00
Fouton
1aa770e33a Add files via upload 2021-03-12 21:58:19 -05:00
Fouton
2e07fc2dd0 Add files via upload 2021-03-12 16:57:42 -05:00
Fouton
8d933b82de TFH Futures 2021-03-12 16:41:35 -05:00
StructuralMike
6f62c41ec3 Removed futuro-stuff 2021-03-08 22:07:01 +01:00
StructuralMike
464dd652c6 basepatch changes 2021-03-04 21:35:45 +01:00
randall.rupper
9a5be8644c Fixed Ganon's silver hints for shops 2021-03-04 11:11:55 -07:00
StructuralMike
f8e6692dea Update Rom.py 2021-03-03 14:42:12 +01:00
StructuralMike
8a203c3158 All futuro code - apart from logic 2021-03-03 13:38:37 +01:00
aerinon
6a5bdbee6b Mostly a fix for Blind outside of TT when Blind is the boss of TT (boss enemizer)
Remove RaceRandom use for now
2021-02-27 15:33:05 -07: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
90d45cc371 Potion shop crash in non-shopsanity modes 2021-02-22 14:47:24 -07:00
Kevin Cathcart
633c221d6f New ganon goal sign text 2021-02-19 21:02:54 -05:00
Kevin Cathcart
39d4af9ef0 Fix ganon-only silvers not being ties to world adjustments 2021-02-19 20:14:03 -05:00
aerinon
9d32a85b89 Progressive limits ignored for shop items (multiworld)
Multi Client improvements to reporting
2021-02-18 13:39:03 -07:00
aerinon
8d22dd1a3d Bringing in Unstable2 changes 2021-02-18 13:19:08 -07:00
aerinon
5945360f58 Silvers issue in swordless 2021-02-18 10:01:52 -07:00
aerinon
2af9ffbda4 Notes and version update
Fix hera double count
2021-02-17 15:23:46 -07:00
aerinon
26f7b1c993 Notes/version
Baserom update
2021-02-15 13:36:34 -07:00
aerinon
3b8773ea33 Update item counter for mystery
Fixed bug with door restart
Made retro keys more lenient with door shuffle
2021-02-13 21:11:31 -07:00
aerinon
f83b28adb6 -Disallowed Swamp Lobby in Hyrule Castle in Standard mode
-Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage)
-Fix for Ice Jelly room when going backward and enemizer is on
-Fix for inverted - don't start as a bunny in Dark Sanctuary
-Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now.
2021-02-13 21:08:06 -07:00
aerinon
2caf5abe4a Update item counter for mystery
Fixed bug with door restart
Made retro keys more lenient with door shuffle
2021-02-13 20:58:59 -07:00
Catobat
74a8ec6486 Minor fixes for in-room stairs 2021-02-12 23:01:50 +01: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
7a22db5dd4 -Disallowed Swamp Lobby in Hyrule Castle in Standard mode
-Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage)
-Fix for Ice Jelly room when going backward and enemizer is on
-Fix for inverted - don't start as a bunny in Dark Sanctuary
-Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now.
2021-02-05 15:05:16 -07:00
aerinon
4e71b97403 Merging in shop work
Updated release notes and testsuite
2021-02-03 13:04:35 -07:00
aerinon
09cae6e640 Shopsanity multiworld and rupee progression balancing 2021-02-03 10:49:29 -07:00
aerinon
f8a0ba1816 merge in inroom staircases 2021-02-01 10:07:53 -07:00
aerinon
b5f3c752e6 Shop work:
- Potion shop
- Cap Fairy blacklist
- Item counter increased over 255
- Inverted work
- Static sram for shops
- Price adjustments (and discounts)
2021-02-01 09:57:20 -07:00
Catobat
43b0f95877 Shuffle in-room stairs 2021-01-30 00:35:41 +01:00
aerinon
f143e0d166 Merge in unstable 2021-01-28 21:20:32 -07:00
aerinon
d64a4e63a2 A lot of generation improvements and bug squashing 2021-01-08 16:31:33 -07:00
cassidoxa
d6d19158a7 Inform user when enemizer returns non-zero exit code, log the error content 2020-12-29 14:59:22 -05:00
aerinon
80d642996d Merging in unstable 2020-12-18 16:23:57 -07:00
aerinon
77cf9e6883 Repair hera basement cage to not count Byrna 2020-12-09 14:29:18 -07:00
aerinon
85d05f625b Generation improvements
Potential fix for overworld problem
2020-12-08 11:24:44 -07:00
aerinon
e834fd85a1 Initial Shopsanity
Retro work
2020-12-03 16:25:51 -07:00
aerinon
ba3bd4b648 Generation improvements
Bomb/dash doors removed from experimental
2020-12-02 15:13:42 -07:00
aerinon
ad00c2aea7 Merge branch 'error' into DoorDevUnstable 2020-11-30 15:57:18 -07:00
aerinon
1b060f893b Prevent HUD from showing key counter when in the overworld. (Aga 2 doesn't always clear the dungeon indicator)
Fixed key logic regarding certain isolated "important" locations
Fixed a problem with keydropshuffle thinking certain progression items are keys
A couple of inverted rules fixed (from an outstanding ER pull request)
A more accurate count of which locations are blocked by the big key in Ganon's Tower
Updated base rom to 31.0.7 (includes potential hera basement cage fix)
2020-11-30 15:54:39 -07:00
aerinon
90fc60a9f0 Compiling pot shuffle 2020-11-25 23:03:49 -07:00
aerinon
ef3bc0aee0 Spoiler log improvements
Fix multi-entrance checks
Tower lobby door pairing fixed
2020-11-25 23:00:54 -07:00
aerinon
5b9919153e Merging of pot shuffle 2020-11-24 12:57:11 -07:00
aerinon
22f749e767 Keysanity menu bugfix
Inverted ER + intensity 3 fix
Swamp Trench 1 locking flippers fix
Fix for lobbies overwriting logic in TR Hub (and elsewhere)
Repaired exits that were wrongly affected by entrance fixes
2020-11-20 14:00:40 -07:00