ffx-rc -> ffx - #131
Merged
Merged
Conversation
* Replace pymem with PyMemoryEditor (nonworking) * Add back pymem for faster windows address searching. * Replace other uses of pymem, parameterize executable names. * Updated to add linux and potential MacOS support to launching gk and … (#84) * Updated to add linux and potential MacOS support to launching gk and goalc. Still needs tested on MacOS. * Switched to using x-terminal-emulator instead of trying to find gnome-terminal or konsole Made argument building for suprocessing goalc easier to read Fixed OS X support to use osascript instead of attempting to run Terminal directly * Changed Terminal usage to use Archipelago's Launh utility, which handles terminal launching for me for both linux and OS X * Added try/except to re-connect the memory process. The process file/id changes over time on linux, and this works to re-connect without needing to restart * Removed Unsetting env var in favor of reporting to the source authors * Putting PyMemoryEditor local. (#85) * Putting PyMemoryEditor local --------- Co-authored-by: massimilianodelliubaldini <8584296+massimilianodelliubaldini@users.noreply.github.com> * Fixing minor problems (#87) * Refactor away circular launcher import. * Push latest PyMemoryEditor scan utility (#91) Co-authored-by: Louis M <Louis M> * Remove Pymem, rely solely on PyMemoryEditor. Add konsole support. * Jak 1: Remove vendored copy of PME, update imports, requirements, and manifest. * Jak 1: Prevent server connect until game is properly setup. * Jak 1: reduce REPL/Compiler confusion, small updates to setup guide. * Write hack for Konsole on AppImage to avoid OpenSSL error. * Refactor LD_LIBRARY_PATH hack. * Update worlds/jakanddaxter/agents/memory_reader.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * Update worlds/jakanddaxter/agents/memory_reader.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> --------- Co-authored-by: Morgan <morgan07kelley@gmail.com> Co-authored-by: Louis M <prog@tioui.com> Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Docs: add spanish language for SM64 * Docs: add spanish language for MLSS * Update worlds/mlss/docs/setup_es.md Co-authored-by: PantoUwUr <99690102+PantoUwUr@users.noreply.github.com> * Update worlds/mlss/docs/es_Mario & Luigi Superstar Saga.md Co-authored-by: RoobyRoo <thegreenrobby@gmail.com> --------- Co-authored-by: PantoUwUr <99690102+PantoUwUr@users.noreply.github.com> Co-authored-by: RoobyRoo <thegreenrobby@gmail.com>
It is no longer possible to connect to a multiworld game on a version of the client with this bug, as all versions with this bug report AP v0.3.5 or less
* Support launcher command line arguments * Use `launch` instead of `launch_subprocess` * Remove old runner code
* Remove outdated header change for ROM verification * Update Connections to be compatible with python ver. 3.8 * Update inno_setup.iss * Update inno_setup.iss * Merge branch 'main' of https://github.com/jamesbrq/ArchipelagoMainMLSS * Add Manifest + Minor Bugfixes * Even further safeguards for Oho Oasis Temples * Update basepatch.bsdiff
* KH2: casual bounties option * Casual Bounty: Adjust level bounty logic to correspond with max level check setting * Bugfix: We have one less possible bounty with corresponding level bounty logic * Casual Bounty: Move option to better spot * Bugfix: Prevent possible .remove() crash * Revert "Bugfix: We have one less possible bounty with corresponding level bounty logic" This reverts commit 3c929e0. * Bugfix: Typo in conditional * Casual Bounties: Remove Scar, add MCP I knew I was missing one second visit fight and Scar shouldn't be there he's a first visit * Casual Bounties: Add some clarity to the CasualBounty setting * Docs: Update docs to reflect new CasualBounty setting * KH2: Add bounty locations as location groups Feedback on this needed, trying to do this to make it work with the code above the additions made it so the game generated 1 less item than locations, despite linking properly It does function as intended though * KH2: Update docs
…ggle to slot data (ArchipelagoMW#5708) * Add SuperBosses, Cups and AtlanticaToggle * Add SummonLevelLocationToggle
…ArchipelagoMW#5804) This variable should fix the 'double click' required when trying to interact with buttons on an unfocused window
…pelagoMW#5890) Bumps [protobuf](https://github.com/protocolbuffers/protobuf) from 6.31.1 to 6.33.5. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Commits](https://github.com/protocolbuffers/protobuf/commits) --- updated-dependencies: - dependency-name: protobuf dependency-version: 6.33.5 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* initial commit of rules engine * implement most of the stuff * add docs and fill out rest of the functionality * add in explain functions * dedupe items and add more docs * pr feedback and optimization updates * Self is not in typing on 3.10 * fix test * Update docs/rule builder.md Co-authored-by: BadMagic100 <dempsey.sean@outlook.com> * pr feedback * love it when CI gives me different results than local * add composition with bitwise and and or * strongly typed option filtering * skip resolving location parent region * update docs * update typing and add decorator * add string explains * move simplify code to world * add wrapper rule * I may need to abandon the generic typing * missing space for faris * fix hashing for resolved rules * thank u typing extensions ilu * remove bad cacheable check * add decorator to assign hash and rule name * more type crimes... * region access rules are now cached * break compatibility so new features work * update docs * replace decorators with __init_subclass__ * ok now the frozen dataclass is automatic * one more type fix for the road * small fixes and caching tests * play nicer with tests * ok actually fix the tests * add item_mapping for faris * add more state helpers as rules * fix has from list rules * fix can reach location caching and add set completion condition * fix can reach entrance caching * implement HasGroup and HasGroupUnique * add more tests and fix some bugs * Add name arg to create_entrance Co-authored-by: roseasromeo <11944660+roseasromeo@users.noreply.github.com> * fix json dumping option filters * restructure and test serialization * add prop to disable caching * switch to __call__ and revert access_rule changes * update docs and make edge cases match * ruff has lured me into a false sense of security * also unused * fix disabling caching * move filter function to filter class * add more docs * tests for explain functions * Update docs/rule builder.md Co-authored-by: roseasromeo <11944660+roseasromeo@users.noreply.github.com> * chore: Strip out uses of TYPE_CHECKING as much as possible * chore: add empty webworld for test * chore: optimize rule evaluations * remove getattr from hot code paths * testing new cache flags * only clear cache for rules cached as false in collect * update test for new behaviour * do not have rules inherit from each other * update docs on caching * fix name of attribute * make explain messages more colorful * fix issue with combining rules with different options * add convenience functions for filtering * use an operator with higher precedence * name conflicts less with optionfilter * move simplify and instance caching code * update docs * kill resolve_rule * kill true_rule and false_rule * move helpers to base classes * update docs * I really should finish all of my * fix test * rename mixin * fix typos * refactor rule builder into folder for better imports * update docs * do not dupe collectionrule * docs review feedback * missed a file * remove rule_caching_enabled from base World * update docs on caching * shuffle around some docs * use option instead of option.value * add in operator and more testing * rm World = object * test fixes * move cache to logic mixin * keep test rule builder world out of global registry * todone * call register_dependencies automatically * move register deps call to call_single * add filtered_resolution * allow bool opts on filters * fix serialization tests * allow reverse operations --------- Co-authored-by: BadMagic100 <dempsey.sean@outlook.com> Co-authored-by: roseasromeo <11944660+roseasromeo@users.noreply.github.com>
…rchipelagoMW#5874) * Throw OptionError for option type Toggle in certain scenarios * Adding missing space to Options.py Co-authored-by: Katelyn Gigante <clockwork.singularity@gmail.com> --------- Co-authored-by: Katelyn Gigante <clockwork.singularity@gmail.com>
…hipelagoMW#4685) * Improvements to visualize_regions for debugging GER usage - allow the user to pass in a dict[int, int] to visualize_regions that maps Entrance.randomization_group to a color in RGB form. This allows for better visualization of which dangling entrances should match, or which matching groups are not being correctly respected. - do full region visualization for unreached regions, so that entrances that could connect to new regions can be visualized. - visualize unconnected entrances on regions, in addition to connected and unconnected exits, so that available ER targets can be visualized as well * Add detail_disconnected_regions parameter to visualize_regions * Rename detail_disconnected_regions to detail_other_regions for consistency * Add auto_assign_colors param to visualize_regions * Make auto assignment of entrance colors deterministic * Assume show_other_regions is true if detail_other_regions is true * Remove unused random import * whitespace adjustments * Move overflow check to prevent potential infinite loop It wasn't exactly likely, as the user would have had to manually define all 4096 colors and then need an additional color on top of that, but accounting for that kind of nonsense is easy enough in this case. * positive condition --------- Co-authored-by: CodeGorilla <3672561+Ars-Ignis@users.noreply.github.com>
…pelagoMW#5670) I didn't quite think this through: In this specific case, you want the gitignore to also ignore itself, since it itself is an auto-generated file.
Major Content update for Stardew Valley ### Features - New BundleRandomization Value: Meme Bundles - Over 100 custom bundles, designed to be jokes, references, trolls, etc - New Setting: Bundles Per Room modifier - New Setting: Backpack Size - New Setting: Secretsanity - Checks for triggering easter eggs and secrets - New Setting: Moviesanity - Checks for watching movies and sharing snacks with Villagers - New Setting: Eatsanity - Checks for eating items - New Setting: Hatsanity - Checks for wearing Hats - New Setting: Start Without - Allows you to select any combination of various "starting" items, that you will actually not start with. Notably, tools, backpack slots, Day5 unlocks, etc. - New Setting: Allowed Filler Items - Allows you to customize the filler items you'll get - New Setting: Endgame Locations - Checks for various expensive endgame tasks and purchases - New Shipsanity value: Crops and Fish - New Settings: Jojapocalypse and settings to customize it - Bundle Plando: Replaced with BundleWhitelist and BundleBlacklist, for more customization freedom - Added a couple of Host.yaml settings to help hosts allow or ban specific difficult settings that could cause problems if the people don't know what they are signing up for. Plus a truckload of improvements on the mod side, not seen in this PR. ### Removed features - Integration for Stardew Valley Expanded. It is simply disabled, the code is all still there, but I'm extremely tired of providing tech support for it, plus Stardew Valley 1.7 was announced and that will break it again, so I'm done. When a maintainer steps up, it can be re-enabled.
First, there is one check that has been added. The location is "Sitting on the throne before the cathedral with the crest on it" and the item is the "Opening of the Cathedral door". In Vanilla, sitting on the crested throne open the door to the cathedral. Now for the options added: - infinite_hot_soup: Make the game impossible to run out of hot soup once you got it as an item. - open_body_tongue: The body level (the ending level) is blocked by a big tongue. This option remove the tongue without having to go to the Sunken City (where it is normally removed) - maximum_ingredient_amount: In the Vanilla game, the ingredients and dishes count is limited to 8. This option make this count configurable. - skip_final_boss_3rd_form: The final boss has 5 forms. The 3rd one is long and not really challenging. So, this option is used to skip this form. - save_healing: Normally, the save points heal the player. There is also beds in the game that can heal the player. This option removed the healing from the save point and forced the player to heal using beds (or healing monsters or healing items) - no_progression_(whatever): Make this "whatever" (generally regions) exempt of progression items. Note that this is not using the exclusion-feature of AP, as these locations may still contain 'Useful' items. It is only guaranteed that no 'Progression' and 'Progression_Skip_Balancing'-items will appear in these regions. This option does not remove locations. I did not exclude or completely remove the regions because I don't have enough location to put every useful item in the game. There is also 2 new goals: - Four gods: The goal is obtained when the player beat the four gods (this is something like half the game). Useful to have quicker runs - Gods and Creator: Like the Four Gods run, but when the four gods are obtained, that open a transportation turtle to the final boss (the Creator) and the player have to beat the final boss to obtain the goal. Note that for the 2 new goals, all locations from the last 4 areas (Abyss, Frozen Veil, Sunken City and The Body) are completely removed (not just excluded).
* CI: make the comment in 'Build' more verbose * Doc: add Linux running from source and build instructions * Doc: fix name in running from source on Linux * Update docs/running from source.md Co-authored-by: qwint <qwint.42@gmail.com> --------- Co-authored-by: qwint <qwint.42@gmail.com>
…ipelagoMW#5514) * move `gui_enabled` to Utils * docstring * If a user specified no-gui, don't use GUI messageboxes --------- Co-authored-by: alwaysintreble <mmmcheese158@gmail.com>
* change functionality to follow comment * revert code change and explicitly document intent
### Logic Fixes: - Old Site A - Logic now allows for going backwards from the `Awake` checkpoint - Golden Ridge A - `Golden Strawberry` now requires `Moving Platforms` as it should - Mirror Temple A - `Room b-01c Strawberry` and `Room b-10 Strawberry` no longer erroneously require `Red Boosters` - `Golden Strawberry` now requires `Dash Refills` as it should - Reflection A - Logic now allows for going backwards from the `Reflection` checkpoint - Reflection B - Logic now allows for going backwards from the `Reflection` checkpoint - Farewell - `Power Source Key 2` now logically requires `Dash Switches` and `Double Dash Refills` as it should
…rchipelagoMW#5933) * make region.connect and add_event support rule builder * fix test * oops fix * update tests and typing * rm unused
…alid_keys (ArchipelagoMW#4418) * seemingly works? needs testing * attempt docs update * move to verify resolution (keep?) * account for no valid keys and "random" being passed * Update advanced_settings_en.md * Update Options.py Co-authored-by: qwint <qwint.42@gmail.com> * Update Options.py Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> * unify random handling between range and set * Update Options.py * Update Options.py * Update Options.py Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> * super is weird * fix item/location * remove groups from options * unittest * pep8 * Update Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update Options.py --------- Co-authored-by: qwint <qwint.42@gmail.com> Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* add filtered_resolution to inits * update from_dict calls too
…elagoMW#5952) `music_table` was initialized on the `SavingPrincessWorld` *class*, so was being shared by each Saving Princess slot in the multiworld. This has been fixed by initializing the `music_table` attribute on each `SavingPrincessWorld` *instance* in `generate_early()` instead.
…ipelagoMW#5684) * Make component launching indicate if no terminal window, add konsole * Attempt to spell better and remove whitespace * Update terminal priority * Make helper for clearing LD_LIBRARY_PATH * Add handling to linux launch * Hopefully fix setter * Apply suggestions from code review Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> --------- Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
…elagoMW#6040) The include_songs option is an OptionSet, whose value is a set, but was being iterated to produce self.included_songs. Sets are unordered and may have a different iteration order each time a python process is run. This meant that the order of the elements in self.included_songs could differ even when generating with a fixed seed. This caused nondeterministic generation with the same seed because create_song_pool() deterministically randomly picks songs from self.included_songs, which could be in a different order each time, so different songs could be picked.
* - Fixed the Dr Seuss Bundle asking for tigerseye (mineral) instead of tiger trout (fish) * - Made blue grass starter more consistent * - Fragments of the past does not rely on ginger island * - Removed legacy hard coded strange bun recipe that messed with chefsanity logic
…elagoMW#6034) The current logic only requires the shorts and a sewing machine, but a gold bar is also necessary
…s could create more items than locations (ArchipelagoMW#6012) * - Improved the dynamic locations count algorithm to take into account the nature of various heavy settings in both directions * - Fixes from Code Review * - We're only testing for sunday locations, might as well only take sunday locations in the list to test * - One more slight optimization * - Added consideration for bundles per room in filler locations counting * - Registered some more IDs to handle items up to 10
Solved indentation error to return to intended functionality
…chipelagoMW#5999) * Remove space before comma * Factorio authors update * Simplify template
* Import Buffer from typing_extensions instead of collections.abc for 3.11 compat * always re-set sound volumes before playing * fix game window scaling if parent is vertical * make default volume lower
…ipelagoMW#6073) * CI: reduce default permissions to minimum * CI: update pin actions Most of them. CodeQL and action-gh-release is untouched for now. Immutable actions and actions/* are pinned to version, other actions are pinned to hash. * CI: make use of archive: false in upload-artifact also set compression level and error behavior for scan-build upload. * CI: update codeql and enable scanning actions
…uired when the box is rotated (ArchipelagoMW#5889) * Unbeatable seed: 11 lasers + redirect when the box is rotated * naming
* Tap to move * inputs * cleanup * oops
Update main to AP v0.6.7
Update ffx-rc from main
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
No description provided.