Ocarina of Time 7.0 #1277
Merged
Ocarina of Time 7.0 #1277
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
it's probably broken but I'll just fix it later
it's not a real sendable item anyway, pretty sure
This change means that 0.3.6 clients won't work with the new format, but they wouldn't have registered some checks correctly anyway.
Also remove some never-used items from item_name_to_id so they can't be given as starting items. This makes it so that every item in the datapackage can also be used as a starting item, finally resolving a long-standing annoyance (not being able to start with keys)
the method got deleted and I forgot to change this
Previously, some locations such as Gerudo archery and requiem would incorrectly have hint data when they should not have, due to additional unnecessary entrances being present in the hint data scan.
The voice changing is not available by default, so I'll be adding it to the adjuster along with custom music and models later on.
Berserker66
reviewed
Dec 9, 2022
WebHostLib/downloads.py
Outdated
| @@ -72,7 +72,10 @@ def download_slot_file(room_id, player_id: int): | |||
| if name.endswith("info.json"): | |||
| fname = name.rsplit("/", 1)[0] + ".zip" | |||
| elif slot_data.game == "Ocarina of Time": | |||
| fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}_P{slot_data.player_id}_{slot_data.player_name}.apz5" | |||
| with zipfile.ZipFile(io.BytesIO(slot_data.data)) as zf: | |||
There was a problem hiding this comment.
This looks like it will crash with a non-descript error on trying to upload an older patch?
There was a problem hiding this comment.
zipfile.is_zipfile might help, assuming the old format is not a valid zip file
There was a problem hiding this comment.
They are not, so I will make that change.
Berserker66
reviewed
Dec 11, 2022
| fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}_P{slot_data.player_id}_{slot_data.player_name}.apz5" | ||
| stream = io.BytesIO(slot_data.data) | ||
| if zipfile.is_zipfile(stream): | ||
| with zipfile.ZipFile(stream) as zf: |
There was a problem hiding this comment.
did you test this? we currently file.seek(0) in upload.py line 128 as is_zipfile can leave the data stream partially read. I'd be surpised if that doesn't happen here.
There was a problem hiding this comment.
I did test it and it seemed to work fine (the game patched and played properly)
There was a problem hiding this comment.
interesting. well, let's see if it breaks for anyone.
There was a problem hiding this comment.
maybe I should just seek to 0 or make a new stream to be safe though
Berserker66
approved these changes
Dec 11, 2022
| fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}_P{slot_data.player_id}_{slot_data.player_name}.apz5" | ||
| stream = io.BytesIO(slot_data.data) | ||
| if zipfile.is_zipfile(stream): | ||
| with zipfile.ZipFile(stream) as zf: |
There was a problem hiding this comment.
interesting. well, let's see if it breaks for anyone.
LiquidCat64
pushed a commit
to LiquidCat64/LiquidCatipelago
that referenced
this pull request
Dec 12, 2022
## What is this fixing or adding? - Adds the majority of OoTR 7.0 features: - Pot shuffle, Freestanding item shuffle, Crate shuffle, Beehive shuffle - Key rings mode - Dungeon shortcuts to speed up dungeons - "Regional" shuffle for dungeon items - New options for shop pricing in shopsanity - Expanded Ganon's Boss Key shuffle options - Pre-planted beans - Improved Chest Appearance Matches Contents mode - Blue Fire Arrows - Bonk self-damage - Finer control over MQ dungeons and spawn position randomization - Several bugfixes as a result of the update: - Items recognized by the server and valid starting items are now in a 1-to-1 correspondence. In particular, starting with keys is now supported. - Entrance randomization success rate improved. Hopefully it is now at 100%. Co-authored-by: Zach Parks <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this fixing or adding?
How was this tested?
Played part of a max-shuffle seed myself. 200 full ER generations with no failures.
Rivers' testing of various smaller options helped catch bugs with bean shuffle, triforce hunt, blue fire arrows, and shuffle child trade item.
Community playtest on 2022-12-03 (results pending).