Skip to content

Core: add layer for patches that don't use Patch.py#2889

Merged
black-sliver merged 10 commits intoArchipelagoMW:mainfrom
beauxq:patch-procedure-layer
Mar 14, 2024
Merged

Core: add layer for patches that don't use Patch.py#2889
black-sliver merged 10 commits intoArchipelagoMW:mainfrom
beauxq:patch-procedure-layer

Conversation

@beauxq
Copy link
Collaborator

@beauxq beauxq commented Mar 3, 2024

What is this fixing or adding?

as discussed black-sliver/apbpatch#2 and various other places

This adds a layer in the patch heirarchy for a patch file that is not applied with our Patch.py

I think Mystic Quest falls into this category, I'm not sure what else.

  • APContainer: something that is not necessarily a patch
  • APPatch: a patch that is not necessarily applied with Patch.py
  • CreateRomInterface: an APPatch that is is applied with Patch.py (previously APPatch)
  • (APPP to be inserted here)
  • APDeltaPatch: all the things

How was this tested?

none yet
generated, patched, played through a game of Zillion

@github-actions github-actions bot added the affects: core Issues/PRs that touch core and may need additional validation. label Mar 3, 2024
@beauxq
Copy link
Collaborator Author

beauxq commented Mar 3, 2024

I'm not sure about the name CreateRomInterface...
Should it change APPatchInterface?
(The name of the function that uses it is create_rom_file)

@black-sliver
Copy link
Member

Any reason not to call it APAutoPatch if it's supposed to be picked up automatically by patch?

@beauxq
Copy link
Collaborator Author

beauxq commented Mar 3, 2024

I like Interface because it is abstract and users will need to implement that patch function.

@beauxq
Copy link
Collaborator Author

beauxq commented Mar 3, 2024

AutoPatchInterface? IAPAutoPatch? APAutoPatchI?

@black-sliver
Copy link
Member

black-sliver commented Mar 3, 2024

Archipelago.abc.AutoPatch Of the suggest ones, I think I prefer APAutoPatchInterface. While some libs use the I prefix, it doesn't really look pythonic to me.

@beauxq
Copy link
Collaborator Author

beauxq commented Mar 3, 2024

@Alchav FFMQ This should just add a key to your manifest to indicate that this is a patch file.

@beauxq
Copy link
Collaborator Author

beauxq commented Mar 3, 2024

What other games have a patch file that isn't APDeltaPatch?

@Silvris
Copy link
Collaborator

Silvris commented Mar 4, 2024

What other games have a patch file that isn't APDeltaPatch?

FFMQ, OoT (which I think is already accounted for here), Adventure (which is also on APContainer).

@beauxq
Copy link
Collaborator Author

beauxq commented Mar 4, 2024

@JusticePS @espeon65536 Adventure and OoT
same small change to review

@beauxq
Copy link
Collaborator Author

beauxq commented Mar 4, 2024

I'm not sure why Adventure uses metaclass=AutoPatchRegister. It doesn't look like it would work where that registry is used. (It doesn't define the patch method.)

@beauxq beauxq marked this pull request as ready for review March 4, 2024 15:29
@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label Mar 4, 2024
@JusticePS
Copy link
Collaborator

JusticePS commented Mar 5, 2024

Adventure and OoT same small change to review

No Adventure problems here

@black-sliver
Copy link
Member

black-sliver commented Mar 12, 2024

While maybe a bit confusing to people that are not sure which one to copy inherit from, I think the code looks good. I really would like to get this in soon(and ProcedurePatch soon after). Hopefully espeon can test OoT, alchav can test ffmq, and then I'll also compare output files to "my" expectations. Testing basically just means rolling a seed and starting it.

@beauxq
Copy link
Collaborator Author

beauxq commented Mar 12, 2024

@Alchav and @espeon65536
In addition to looking at and testing the small changes to your world code,
make sure that this sounds right for your situations:
(from the docstring of APPatch)

Your implementation should inherit from this if your output file
represents a patch file, but will not be applied with AP's Patch.py

@black-sliver
Copy link
Member

black-sliver commented Mar 14, 2024

Hm, couple of things:

  • Factorio says compatible_version: 5, version: 6, procedure: None/absent. I think this is correct, but compatible 6 would also be valid here.
  • As it is now, Alttp (and all other Delta) are wrong. They say procedure: "custom", but should either be procedure: None to enforce old behaviour, or procedure: [["apply_bsdiff4", ["delta.bsdiff4"]]] (which will be part of PP) to enforce new behaviour. I think this PR should set it to None and then PP should replace that.
  • Zillion sets compatible_version: 5, version: 6, procedure: "custom", which is not correct, I think. It should set compatible_version to 6, because handling of procedure: "custom" is required, but did not exist in 5.

Copy link
Member

@black-sliver black-sliver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I think this looks good now.

With a v5 Patcher:

  • Factorio now gives: "could not open patch file" (i.e. not a valid (delta) patch)
  • Lttp still works (falls back to detecting delta.bsdiff4)
  • Zillion gives "Incompatible version 6"

Per proposed v6 Spec

  • Factorio would be detected as non-patch by not having procedure nor bsdiff file
  • Lttp would use the fall-back code path using bsdiff by detecting the bsdiff file
  • Zillion either needs "custom" implementation, or has "custom not supported"

@black-sliver
Copy link
Member

black-sliver commented Mar 14, 2024

Espeon posted in discord and OoT seems to still work in AP, I don't think we broke that now (but read at the very end), and I don't think there is an alternative patcher for OoT implemented unless you unpack it and apply zpf by "hand".

Applying patch from this branch with Patch.py in this branch:

  • Factorio gives "No Handler for ..."
  • Alttp works
  • Zillion works

Applying patch from this branch with Patch.py in main:

  • Factorio as above
  • Alttp works
  • Zillion gives File (version: 6) too new for this handler (version: 5), which is correct
  • Worst case Adventure and OoT might also give that error now, which should be fine, I hope

@black-sliver black-sliver merged commit e534abe into ArchipelagoMW:main Mar 14, 2024
EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024
…2889)

* Core: add layer for patches that don't use `Patch.py`

* bump container version

* APAutoPatchInterface name

* mystic quest change

* OoT and Adventure changes

* missed name in docstring

* container version compatibility
EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024
…2889)

* Core: add layer for patches that don't use `Patch.py`

* bump container version

* APAutoPatchInterface name

* mystic quest change

* OoT and Adventure changes

* missed name in docstring

* container version compatibility
FlySniper added a commit to FlySniper/Archipelago that referenced this pull request Aug 3, 2024
…pelagoMW#2922)

* remove component checking

* fix missing deathlink messages

* move reads under deathlink check
Core: Fix OptionList and OptionSet to allow Iterable of Iterable (ArchipelagoMW#2911)

* fix, maybe

* typegard for iterable of any

* wow I'm so tired I just changed the method name without changing what it actually does...

* also exclude bytes in is_iterable_but_str

* apply pr comments

* Update Utils.py

Co-authored-by: Doug Hoskisson <[email protected]>

* Revert "also exclude bytes in is_iterable_but_str"

This reverts commit cf087d2.

---------

Co-authored-by: Doug Hoskisson <[email protected]>
Docs: Added snes9x-nwa as recommended emulator to the setup guides for SNES games (ArchipelagoMW#1778)

* Added snes9x-nwa as recommended emulator to the setup guides

* Removed snes9x-nwa from the setup guides of DKC3 and SMW

* Update worlds/alttp/docs/multiworld_en.md

Co-authored-by: Aaron Wagener <[email protected]>

* Removed duplicate text
Minor grammar and spelling fixes

* Unified required software for SM, SMZ3 and SoE with ALTTP

* Added instructions for usage of BSNES-Plus for ALTTP, SM and SMZ3

---------

Co-authored-by: Aaron Wagener <[email protected]>
KH2: Update all instances of multiworld.option_name to option.option_name (ArchipelagoMW#2634)

* update the multiworld to options

* Update worlds/kh2/Rules.py

Co-authored-by: Exempt-Medic <[email protected]>

* does this work

* namine sketches

* wrong branch :)

---------

Co-authored-by: Exempt-Medic <[email protected]>
The Messenger: fix items accessibility reachability bug due to new rules (ArchipelagoMW#2937)

CI: Don't auto-remove content based labels (ArchipelagoMW#2941)

Docs: improve AutoWorld method docstrings (ArchipelagoMW#2509)

* clarify some autoworld docstrings

* revert accidental change
The Witness: Don't unnecessarily break people's 0.4.4 yamls (ArchipelagoMW#2940)

kvui: allow sorting hints in the hint tab (ArchipelagoMW#2684)

MultiServer: send new read_hints datastore values on change (ArchipelagoMW#2558)

The Witness: Obelisk Keys (ArchipelagoMW#2805)

Core: String comparison with FreeText class (ArchipelagoMW#2942)

CommonClient: use rich text for /received (ArchipelagoMW#2715)

CommonClient: Fix item link group name when member slot name contains brackets (ArchipelagoMW#2794)

SMW: v2.0 Content Update (ArchipelagoMW#2762)

Changelog:

Features:
- New optional Location Checks
  - 3-Up Moons
  - Hidden 1-Ups
  - Bonus Blocks
  - Blocksanity
    - All blocks that contain coins or items are included, with the exception of:
      - Blocks in Top Secret Area & Front Door/Bowser Castle
      - Blocks that are unreachable without glitches/unreasonable movement
- New Items
  - Special Zone Clear
  - New Filler Items
    - 1 Coin
    - 5 Coins
    - 10 Coins
    - 50 Coins
  - New Trap Items
    - Reverse Trap
    - Thwimp Trap
- SFX Shuffle
- Palette Shuffle Overhaul
  - New Curated Palette can now be used for the Overworld and Level Palette Shuffle options
  - Foreground and Background Shuffle options have been merged into a single setting
- Max possible Yoshi Egg value is 255
  - UI in-game is updated to handle 3-digits
  - New `Display Received Item Popups` option: `progression_minus_yoshi_eggs`

Quality of Life:
- In-Game Indicators are now displayed on the map screen for location checks and received items
- In-level sprites are displayed upon receiving certain items
- The Camera Scroll unlocking is now only enabled on levels where it needs to be
- SMW can now handle receiving more than 255 items
- Significant World Code cleanup
  - New Options API
  - Removal of `world: MultiWorld` across the world
- The PopTracker pack now has tabs for every level/sublevel, and can automatically swap tabs while playing if connected to the server

Bug Fixes:
- Several logic tweaks/fixes

"Major credit to @TheLX5 for being the driving force for almost all of this update. We've been collaborating on design and polish of the features for the last few months, but all of the heavy lifting was all @TheLX5."
Core: typing for `Option.default` and a few other ClassVars (ArchipelagoMW#2899)

* Core: typing for `Option.default` and a few other `Option` class variables

This is a replacement for ArchipelagoMW#2173

You can read discussion there for issues we found for why we can't have more specific typing on `default`

instead of setting a default in `Option` (where we don't know the type), we check in the metaclass to make sure they have a default.

* NumericOption doesn't need the type annotation that brings out the mypy bug

* SoE default ClassVar
Core: add list/dict merging feature to triggers (ArchipelagoMW#2793)

* proof of concept

* add dict support, block top/game level merge

* prevent key error when option being merged is new

* update triggers guide

* Add documentation about add/remove/replace

* move to trailing name instead of proper tag

* update docs

* confirm types

* Update Utils.py

* Update Generate.py

* pep8

* move to + syntax

* forgot to support sets

* specify received type of type error

* Update Generate.py

Co-authored-by: Fabian Dill <[email protected]>

* Apply suggestion from review

* add test for update weights

* move test to new test case

* Apply suggestions from code review

Co-authored-by: black-sliver <[email protected]>

---------

Co-authored-by: Fabian Dill <[email protected]>
Co-authored-by: black-sliver <[email protected]>
CI: build: create setup (ArchipelagoMW#2936)

* CI: build: create setup

also add /DNO_SIGNTOOL to inno_setup.iss

* CI: build: trigger when changing setup-related files
Shivers: Renaming for clarity and consistency (ArchipelagoMW#2869)

* Moves plaque location to front for better tracker referencing.

* Tiki should be Shaman.

* Hanging should be Gallows.

* Merrick spelling.

* Clarity change.
FFMQ: Update Map Shuffle Seed description (ArchipelagoMW#2658)

* Update Map Shuffle Seed description

* Update worlds/ffmq/Options.py

Co-authored-by: Exempt-Medic <[email protected]>

---------

Co-authored-by: Exempt-Medic <[email protected]>
Core: fix incorrect ordering on the always_allow static method (ArchipelagoMW#2938)

CI: update actions (ArchipelagoMW#2943)

HK: Removes Vanilla Items from ItemPool and Uses Grimmchild1 when relevant (ArchipelagoMW#2898)

KDL3: Ensure all abilities accessible on non-minimal (ArchipelagoMW#2929)

Pokemon Emerald: v2 Update (ArchipelagoMW#2918)

Core: add layer for patches that don't use `Patch.py` (ArchipelagoMW#2889)

* Core: add layer for patches that don't use `Patch.py`

* bump container version

* APAutoPatchInterface name

* mystic quest change

* OoT and Adventure changes

* missed name in docstring

* container version compatibility
Lingo: Pre-compile datafile to improve loading time (ArchipelagoMW#2829)

CommonClient: Don't retry connection when connection details are invalid (ArchipelagoMW#2831)

Stardew Valley: 5.x.x - The Allsanity Update (ArchipelagoMW#2764)

Major Content update for Stardew Valley, including the following features

- Major performance improvements all across the Stardew Valley apworld, including a significant reduction in the test time
- Randomized Farm Type
- Bundles rework (Remixed Bundles and Missing Bundle!)
- New Settings:
  * Shipsanity - Shipping individual items
  * Monstersanity - Slaying monsters
  * Cooksanity - Cooking individual recipes
  * Chefsanity - Learning individual recipes
  * Craftsanity - Crafting individual items
- New Goals:
  * Protector of the Valley - Complete every monster slayer goal
  * Full Shipment - Ship every item
  * Craftmaster - Craft every item
  * Gourmet Chef - Cook every recipe
  * Legend - Earn 10 000 000g
  * Mystery of the Stardrops - Find every stardrop (Maguffin Hunt)
  * Allsanity - Complete every check in your slot
- Building Shuffle: Cheaper options
- Tool Shuffle: Cheaper options
- Money rework
- New traps
- New isolated checks and items, including the farm cave, the movie theater, etc
- Mod Support: SVE [Albrekka]
- Mod Support: Distant Lands [Albrekka]
- Mod Support: Hat Mouse Lacey [Albrekka]
- Mod Support: Boarding House [Albrekka]

Co-authored-by: Witchybun <[email protected]>
Co-authored-by: Witchybun <[email protected]>
Co-authored-by: Jouramie <[email protected]>
Co-authored-by: Alchav <[email protected]>
Launcher: make scrollbar more prominent (ArchipelagoMW#2955)

TUNIC: Updated display name for a few options (ArchipelagoMW#2953)

SMW: Add CHANGELOG.md (ArchipelagoMW#2947)

Celeste 64: Add CHANGELOG.md (ArchipelagoMW#2948)

DKC3: Add CHANGELOG.md (ArchipelagoMW#2946)

Core: increment version (ArchipelagoMW#2958)

SA2B: Add CHANGELOG.md (ArchipelagoMW#2945)

The Witness: Add newly submitted junk hints (ArchipelagoMW#2949)

OoT: Entrance Spoiler Fixes (ArchipelagoMW#2500)

Stardew Valley: Added a Great Combat requirement to an entrance that could block its own key (ArchipelagoMW#2959)

SC2: Multi-campaign (ArchipelagoMW#2954)

Adds HotS, LotV and NCO campaigns to SC2 game.
The world's name has changed to reflect that (it's not only Wings of Liberty now)
The client was patched in a way that can still join to games generated prior this change
---------

Co-authored-by: Magnemania <[email protected]>
Co-authored-by: EnvyDragon <[email protected]>
Co-authored-by: Matthew <[email protected]>
Co-authored-by: hopop201 <[email protected]>
Co-authored-by: Salzkorn <[email protected]>
Co-authored-by: genderdruid <[email protected]>
Co-authored-by: MadiMadsen <[email protected]>
Co-authored-by: neocerber <[email protected]>
Co-authored-by: Exempt-Medic <[email protected]>
Co-authored-by: Fabian Dill <[email protected]>
Zork Grand Inquisitor: Implement New Game (ArchipelagoMW#2539)

Adds Archipelago support for Zork Grand Inquisitor, the 1997 point-and-click PC adventure game.

The client (based on `CommonClient`), on top of its regular Archipelago duties, fully handles the randomization of the game and the monitoring / modification of the game state. No game modding needed at all; the player is ready to play an Archipelago seed if they can play the vanilla game through ScummVM.

The "reverse engineering" (there's likely a better term for this...) of the game is my own original work and I included an MIT license at the root of my world directory.

A PopTracker pack was also created to help people learn the game: https://github.com/SerpentAI/ZorkGrandInquisitorAPTracker
TUNIC: Implement support for connection plando (ArchipelagoMW#2864)

The Witness: Add junk hint for Zork: Grand Inquisitor (ArchipelagoMW#2961)

SMW: Increment Required Client Version (ArchipelagoMW#2962)

Core: implement APProcedurePatch and APTokenMixin (ArchipelagoMW#2536)

* initial work on procedure patch

* more flexibility

load default procedure for version 5 patches
add args for procedure
add default extension for tokens and bsdiff
allow specifying additional required extensions for generation

* pushing current changes to go fix tloz bug

* move tokens into a separate inheritable class

* forgot the commit to remove token from ProcedurePatch

* further cleaning from bad commit

* start on docstrings

* further work on docstrings and typing

* improve docstrings

* fix incorrect docstring

* cleanup

* clean defaults and docstring

* define interface that has only the bare minimum required
for `Patch.create_rom_file`

* change to dictionary.get

* remove unnecessary if statement

* update to explicitly check for procedure, restore compatible version and manual override

* Update Files.py

* remove struct uses

* ensure returning bytes, add token type checking

* Apply suggestions from code review

Co-authored-by: Doug Hoskisson <[email protected]>

* pep8

---------

Co-authored-by: beauxq <[email protected]>
Co-authored-by: Doug Hoskisson <[email protected]>
Pokemon Emerald: Bump required client version (ArchipelagoMW#2963)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

affects: core Issues/PRs that touch core and may need additional validation. waiting-on: peer-review Issue/PR has not been reviewed by enough people yet.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants