Commit Graph

1500 Commits

Author SHA1 Message Date
aerinon
f1fd2c2759 Revert "Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable"
This reverts commit 3448693f52, reversing
changes made to f2c021500d.
2021-02-25 16:16:20 -07:00
aerinon
af441a8e9b Merging in base er changes 2021-02-25 15:26:29 -07:00
aerinon
5dded84a4c Merge pull request #88 from KevinCathcart/Dev
Dev
2021-02-24 15:31:36 -07:00
aerinon
3448693f52 Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable 2021-02-24 15:24:25 -07:00
aerinon
f2c021500d Merge branch 'Portals' of https://github.com/Catobat/ALttPDoorRandomizer into Catobat-Portals 2021-02-24 15:23:34 -07:00
aerinon
d14c9b5758 Object reading improvements in utils 2021-02-24 13:29:10 -07:00
Mike A. Trethewey
33d05c1b1f Fix Selectors 2021-02-23 01:38:10 -08:00
Mike A. Trethewey
37b778c71e Merge pull request #1 from aerinon/DoorDevUnstable
Update from Aerinon
2021-02-22 16:03:56 -08:00
aerinon
90d45cc371 Potion shop crash in non-shopsanity modes 2021-02-22 14:47:24 -07:00
Catobat
f6394cd7f2 Only shuffle dungeon order in Crossed 2021-02-21 14:54:51 +01:00
Catobat
27b9257981 Portal fixes and adjustments 2021-02-21 14:43:49 +01: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
cassidoxa
9ae6829b0d Add flippers requirement for no glitches inverted E Dark World Pier
Remove flippers from E Dark World River Pier base rule and add them back
in no glitches rules. This puts qirn jump into glitches logic.
2021-02-19 19:42:28 -05:00
cassidoxa
fda228935f Add pearl requirement for Ice Rod Cave entrance 2021-02-19 19:42:28 -05:00
aerinon
4ee60db31a Documentation clean up and including the non-progressive shields. 2021-02-18 16:09:46 -07: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
309260a1e2 Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into MikeQoL 2021-02-16 13:59:24 -07:00
aerinon
9bce09aad6 Merge branch 'InroomStairFix' into Unstable2 2021-02-16 13:58:31 -07:00
aerinon
b36c03a8b4 Pot shuffle repair 2021-02-16 13:34:00 -07:00
Catobat
5a8139258d PoD Mimics 2 portal flexibility 2021-02-16 20:00:21 +01:00
Mike A. Trethewey
f13dba3512 QoL Improvements
Update SpriteSomething collections page for Z3Link sprites
Add Diagnostics button to the GUI
2021-02-15 19:36:20 -08: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
352592bd00 Key logic error with odd_counter and child doors
Fix the Lone Pot doors (E/W) swapped
2021-02-13 21:09:57 -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
8083c8c179 Minor fix to ensure the key logic is correct when selling keys 2021-02-13 20:59:40 -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
1faf8c168c Only print lobbies if shuffling doors
Couple shopsanity bugs
2021-02-03 16:29:14 -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
f21687bd32 Update release notes and version 2021-02-01 16:30:47 -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
c411f5543c Couple minor problems addressed 2021-01-14 13:47:21 -07:00
aerinon
f45ae1c97b Fix to portal/rooms resets 2021-01-12 14:38:34 -07:00
aerinon
f72d287441 Merge in Door Dev 2021-01-11 13:49:47 -07:00
aerinon
0f93a01a37 Fix auto release notes 2021-01-11 13:38:30 -07:00
aerinon
a835eb3fb8 Typo v0.2.1-dev.44 2021-01-11 13:33:03 -07:00
aerinon
0beeeebce6 Ci change 2021-01-11 13:31:54 -07:00
aerinon
4213129cdc Ci change 2021-01-11 13:28:15 -07:00
aerinon
001eadee56 Version bump 2021-01-11 11:43:25 -07:00