Commit Graph

487 Commits

Author SHA1 Message Date
Fouton
08a5e2f27f Add files via upload 2021-03-12 21:22:35 -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
StructuralMike
8689bd6a4c Crystals that can be hit with pots
Moved the can_hit_crystal() function to rules where it belongs, and applied it to all instances of crystals in rooms that don't have pots.
2021-03-12 17:07:17 +01:00
krelbel
5210bbe4e0 Fix chaos boss/enemy shuffle
Update BaseClasses.py to make make_code()'s byte 6 handle "chaos" boss/enemy shuffle the same as "random".
2021-03-09 22:10:30 -08:00
StructuralMike
b68eff5b77 Update BaseClasses.py 2021-03-09 10:23:05 +01:00
StructuralMike
f33d8a5279 Refined crystal rules 2021-03-09 09:40:50 +01:00
StructuralMike
6f62c41ec3 Removed futuro-stuff 2021-03-08 22:07:01 +01:00
StructuralMike
5ef1ceb136 ToH Crystal Switch Region WIP 2021-03-06 17:56:45 +01:00
StructuralMike
aeda137498 Simple switch rules 2021-03-05 21:43:41 +01:00
StructuralMike
06b172ee32 Initial full rules commit 2021-03-05 20:10:21 +01:00
randall.rupper
dc5cd2b744 Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts:
#	Main.py
#	RELEASENOTES.md
2021-03-05 10:43:05 -07:00
StructuralMike
a21423ee9c Small boss rule 2021-03-04 23:46:19 +01:00
StructuralMike
8a203c3158 All futuro code - apart from logic 2021-03-03 13:38:37 +01:00
StructuralMike
6f39648666 Initial futuro settings implementation 2021-03-03 12:34:59 +01:00
aerinon
8d22dd1a3d Bringing in Unstable2 changes 2021-02-18 13:19:08 -07:00
aerinon
b36c03a8b4 Pot shuffle repair 2021-02-16 13:34:00 -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
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
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
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
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
compiling
e6d9fc71a9 Fix FastEnum compatibility with normal enums - use IntFlag to allow bitwise operations and interpreting as raw integers. 2020-11-21 23:01:22 +11:00
aerinon
f5327bc0e6 Fix trock entrances when intensity >= 3
Keysanity menu countdowns
Standard rain state
Multi-entrance dungeon bosses
This dungeon/universl key drops skip pose
More rupee candidates to remove for retro
2020-11-19 16:26:45 -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
11154e1544 Crossed dungeon palette refinement
Fixed some entrances that require reset otherwise
Fixed TR lobbies that need to be bombed
Fixed animated tiles in lobbies
Fixed wallmaster+lamp problem
Fixed some key rules that caused item requirements to be ignored
Fixed Old Man cave to be properly one-way in the graph
Fixed some odd key logic issues
2020-11-12 12:18:00 -07:00
aerinon
6162fddf47 Lots of bugfixes - see notes 2020-11-09 13:54:03 -07:00
compiling
078b5eeb85 Merge remote-tracking branch 'remotes/origin/DoorDevUnstable' into DoorDevUnstable 2020-11-07 18:48:26 +11:00
compiling
31c0540cc8 Merge remote-tracking branch 'remotes/origin/dungeon_entrance_fix' into DoorDevUnstable 2020-11-02 10:28:54 +11:00
compiling
6c531620e5 Make it possible to generate standard / retro / vanilla doors. 2020-11-02 10:21:34 +11:00
compiling
dc5319ae97 Don't fix fake worlds for glitched modes.
Pre-open pyramid for crystals goal with entrance shuffles that don't move Ganon (vanilla, dungeon-only shuffles)
2020-10-31 14:37:34 +11:00
compiling
ef294ab0d3 Fix copy world. 2020-10-31 10:05:28 +11:00
compiling
ad9db670a2 Merge branch 'master' into Dev-owg 2020-10-30 16:00:22 +11:00
aerinon
d3e643b9c6 Finish bps work
Fixing a couple bugs
2020-10-29 15:46:27 -06:00
aerinon
c0f6c3fd52 Bug fix for intensity 3 + enemizer (just taking it out for now)
Lobbies added to spoiler
2020-10-23 15:07:55 -06:00
aerinon
d89801c72c Key Hud redesign continued
Keydropshuffle prototype
2020-10-23 12:59:18 -06:00
aerinon
7aca24b10f Standard + Crossed bug with Hyrule Castle
Big Key logic for standard
Some generation issues with ER
Redesigned Map/Compass section of Keysanity menu
2020-10-09 16:02:39 -06:00
aerinon
38be9e6ec0 Generation improvements
Hera Lobby fix
Added gauntlet 3 to cut carpet
2020-10-07 16:33:43 -06:00
aerinon
99f262cc72 Lobby logic improvements
Cutoff entrance rug re-work
2020-09-21 16:38:15 -06:00
aerinon
d2ea578df8 Merge in door dev unstable 2020-09-17 15:23:06 -06:00
aerinon
357a09d5b7 Added intensity parameter. Clean up for next alpha release 2020-09-16 15:01:01 -06:00