Commit Graph

355 Commits

Author SHA1 Message Date
Catobat
4243494b66 Write Pot Shuffle setting to spoiler 2021-05-29 16:57:34 +02:00
aerinon
8f00f7969b Actually restrict Sanctuary from being a DW lobby in non-crossed ER modes 2021-05-17 13:41:32 -06:00
aerinon
7a94f4ba3a Fix standard_restricted 2021-05-05 08:42:40 -06:00
aerinon
a12ebfaf50 Merge branch 'StructuralMike-BombSwitchDevUnstable' into DoorDevVolatile 2021-05-04 16:30:27 -06:00
compiling
5139a7fef1 Remove duplicated copy code 2021-04-30 00:24:38 +10:00
compiling
639a3ec383 Fix inverted checks
Fix superbunny / dungeon revive rules due to late binding
Fix inverted swamp patch
Fix most unit tests (dungeons still broken)
2021-04-27 23:51:12 +10:00
compiling
9852352027 Temp 2021-04-21 18:40:54 +10:00
compiling
30baec65af Merge remote-tracking branch 'remotes/origin/Dev-owg' into DoorDevUnstable 2021-04-18 14:28:29 +10:00
StructuralMike
06357f5f21 minor cleanup 2021-03-19 17:35:09 +01:00
StructuralMike
d9d664f7ba minor cleanup 2021-03-19 17:29:45 +01:00
StructuralMike
16ba877e86 Merge branch 'DoorDevUnstable' into BombSwitchDevUnstable 2021-03-18 17:19:52 +01:00
randall.rupper
27ed4ecd04 Small Shopsanity price adjustments
Fixed a subtle error with shop shields and progressive shields - should result in more successful generation
2021-03-17 14:37:39 -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
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
StructuralMike
77e4102ab6 Small error 2021-03-13 14:00:14 +01:00
Fouton
c47090ce61 Add files via upload 2021-03-12 22:15:27 -05:00
Fouton
6526d1b877 Add files via upload 2021-03-12 21:48:51 -05:00
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