Merge Main into branch #13
Merged
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
* world: multiworld and deprecated options getting * Oops * Found two more
* Update advanced yaml guide wording * Update options api as well * Update exclude locations description slightly to use more current verbiage * Update priority locations in options api.md to note what happens if it runs out * Remove auto-added bullet points * Slightly mess with wording to make it more succinct
…on option (#3289) * Hylics 2: Remove Random Start option and replace it with Start Location option * remove choice * Readd random start to slot data * newlines * Add random_start as a Removed option
* Wargroove: Switched to options API. * Update Options.py * Update __init__.py * Options is plural * Wargroove: Options updates with some small fixes. --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Docs: remove obsolete yaml generation info This line was added when we didn't have the "Generate Template Options" button in the launcher. * add information about `Launcher.py`
* Removing deprecated function * Removing SpecialRange
* Use OptionError * ruff
…ailable portals (#3200)
Adds Team Reptile's Bomb Rush Cyberfunk as a new game.
…" from being logged. (#3225)
This is a new world for the Aquaria game (https://www.bit-blot.com/aquaria/).
* Initial implementation of Yu-Gi-Oh! WC 2006 * Added Opponents and banlists * Initial implementation of Yu-Gi-Oh! WC 2006 * Added Opponents and banlists * Added Campaign Logic * Added Bonuses Logic * Added challenge logic * fixed yugioh client * ygo06 rom cleanup and include lua * ygo06 patch cleanup * ygo06 move client to world folder * lots of small changes * bug fixes * implemented filler item for yugioh06 * BizHawkClient: Add client and connector * BizHawkClient: Add launcher component and inno_setup lines * BizHawkClient: Misc stability updates and small improvements Bad commit organization a consequence of working with two different branches and not keeping the commits separated * BizHawkClient: Add docstrings * BizHawkClient: Pull in changes from other branch * BizHawkClient: Fix no handler message not displaying after changed ROMs * BizHawkClient: Remove extra print statement from lua * BizHawkClient: Change version command to use raw strings * BizHawkClient: Change script version to single integer * YGO06: added logic for "all expect type forbidden" limited duels * YGO06: Structure Deck choice now affects logic. Fixed a bug with tier 5 campaign opponents. Added logic for TD16 Union. * BizHawkClient: Add newline to version for lua script * BizHawkClient: Call send_connect from BizHawkClient's watcher loop * BizHawkClient: Add handling for failed request getting script version * BizHawkClient: Have base64.lua check lua version explicitly for bit operations On 2.9, it would detect LuaJIT and flood the console with deprecation warnings * BizHawkClient: Update connector script for slightly better errors and address Gambatte frame sync issue * BizHawkClient: Remove accidentally added print statements * BizHawkClient: Fix connector server not closing correctly * BizHawkClient: Move some connector code around, some linting * BizHawkClient: Small cleanup in lua * BizHawkClient: Lua linting * BizHawkClient: Remove outdated sentences in docstrings * YGO06: Logic additions and bug fixes * BizHawkClient: Correctly null check patch file arg * BizHawkClient: Initialize logging * BizHawkClient: Move code to worlds/_bizhawk Also splits out BizHawk communication functions to their own file for use outside this client * BizHawkClient: Add license to connector lua, add types to docs * BizHawkClient: Add module docstrings * YGO06: Logic additions * BizHawkClient: Allow clients to define multiple systems * BizHawkClient: Better logging and handling of interruptions to connection to script * YGO06: Logic additions * YGO06: Added text to options * YGO06: Ported to bizhawk client * YGO06: fix goal not being detected * YGO06: fix access item rule for tier 5 column 1 and 2 * YGO06: docu and bug fixes * YGO06: change name * YGO06: some fixes * YGO06: fix starting opponent and booster not applying * YGO06: added option to reduce the amount of challenges and remove the no ban list from pool. * YGO06: added rom being asked for on first use * YGO06: fix rules for challenges * YGO06: create proper rules for TD04 Ritual Summon * YGO06: mark most banlists as usefull instead of progression * YGO06: reduce the required core boosters across the board * YGO06: fix client not loading if another game already loaded the bizhawk client * YGO06: fix client not finding the bizhawk client. * YGO06: fix TD08 Draw not giving out an item * YGO06: small text changes * YGO06: update to version 0.4.4 * YGO06: logic mixin clean-up * YGO06: added option for campaign opponents as goal * Pokemon Emerald add encounter table randomization * Pokemon Emerald: Item ball randomization working * Pokemon Emerald: Clean up code a little * Pokemon Emerald: Partial rework of region/location creation * Pokemon Emerald: Dedupe items and add more readable names * Refactor region creation to manually defined regions * Split region json * Use new data.json with flattened constants and add HM locations * YGO06: bug fixes * YGO06: bug fix * YGO06: changes default options to be more beginner friendly * YGO06: attempt at universal tracker support. Settings are stored in slot data now. * YGO06: fix for older python versions * YGO06: fix slot data * YGO06: added diiferent opponents to the campaign * YGO06: fix small bug with opponent icons * YGO06: fix unwanted changes * YGO06: repair merge with main * YGO06: map out all of the opponents * YGO06: added opponent shuffle * YGO06: added logic to opponent shuffle * YGO06: added option to use ocg art * YGO06: bug_fixes * YGO06: removed todos, since they are not needed anymore * YGO06: added draft mode * YGO06: added logic to draft mode * YGO06: Added Money multiplier when you lose * YGO06: Fixed Unit Test errors * YGO06: Added Random deck option * YGO06: Bug fix with registering client * YGO06: client clean-up * YGO06: fixed card misspellings * YGO06: removed unused imports and other small changes * YGO06: small changes * YGO06: fix generation error when the combination of starting with "No Banlist" and not adding "No Banlist" to the pool is selected * YGO06: fix ocg art path overwriting Huge Revolution bugfix * YGO06: added comments and other minor changes * YGO06: fixed byte length in client for money * YGO06: fixes for webhost and options * YGO06: use the proper random function * YGO06: change settings to options * YGO06: move to procedure patch * YGO06: fix imports * YGO06: fix download link for patch not showing * YGO06: remove unnecessary Optional * YGO06: fix universal tracker stuff * YGO06: add typings * YGO06: small cleanup * yugioh06: small change to setup Co-authored-by: Scipio Wright <scipiowright@gmail.com> * YGO06: remove logic mixin * YGO06: fix create item and implement create filler and get filler item name * YGO06: remove double lambdas * YGO06: use pkgutil.get_data instaed pf zipFile * YGO06: fix starting items being duplicated * YGO06: lots of small changes * YGO06: moved functions to match execution order * YGO06: run ruff * YGO06: run ruff format * YGO06: fix ruff errors * YGO06: undo ruff format for rules * YGO06: move import to prevent circular dependency * YGO06: remove unused class * YGO06: optimizing rules * YGO06: some optimization and small bug fix --------- Co-authored-by: Zunawe <gyroscope15@gmail.com> Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Plural fix * Update link
* some worlds: some typing in `LocalRom` ### `read_bytes` It's not safe to return `bytearray` when we think it's `bytes` ```python a = rom.read_bytes(8, 3) hash(a) # This won't crash, right? ``` ### `write_bytes` `Iterable[SupportsIndex]` is what's required for `bytearray.__setitem__(slice, values)` We need to add `__len__` for the `len(values)` in this function. * remove `object` inheritance
* Pokemon Emerald: Update changelog * Pokemon Emerald: Fix spelling error in changelog Co-authored-by: Remy Jette <remy@remyjette.com> --------- Co-authored-by: Remy Jette <remy@remyjette.com>
* player property on world class * Remove dat shi from overcooked * Update worlds/AutoWorld.py Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> --------- Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
* Implement support for option groups. WebHost options pages still need to be updated. * Remove debug output * In-progress conversion of player-options to Jinja rendering * Support "Randomize" button without JS, transpile SCSS to CSS, include map file for later editors * Un-alphabetize options, add default group name for item/location Option classes, implement more option types * Re-flow UI generation to avoid printing rows with unsupported or invalid option types, add support for TextChoice options * Support all remaining option types * Rendering improvements and CSS fixes for prettiness * Wrap options in a form, update button styles, fix labels, disable inputs where the default is random, nuke the JS * Minor CSS tweaks, as recommended by the designer * Hide JS-required elements in noscript tag. Add JS reactivity to range, named-range, and randomize buttons. * Fix labels, add JS handling for TextChoice * Make option groups collapsable * PEP8 current option_groups progress (#2604) * Make the python more PEP8 and remove unneeded imports * remove LocationSet from `Item & Location Options` group * It's ugly, but YAML generation is working * Stop generating JSON files for player-options pages * Do not include ItemDict entries whose values are zero * Properly format yaml output * Save options when form is submitted, load options on page load * Fix options being omitted from the page if a group has an even number of options * Implement generate-game, escape option descriptions * Fix "randomize" checkboxes not properly setting YAML options to "random" * Add a separator between item/location groups and items/locations in their respective lists * Implement option presets * Fix docs to detail what actually ended up happening * implement option groups on webworld to allow dev sorting (#2616) * Force extremely long item/location/option names with no spaces to text-wrap * Fix "randomize" button being too wide in single-column display, change page header to include game name * Update preset select to read "custom" when updating form inputs. Show error message if the user doesn't input a name * Un-break weighted-options, add option group names to weighted options * Nuke weighted-options. Set up framework to rebuild it in Jinja. * Generate styles with scss, remove styles which will be replaced, add placeholders for worlds * Support Toggle, DefaultOnToggle, and Choice options in weighted-options * Implement expand/collapse without JS for worlds and option groups * Properly style set options * Implement Range and NamedRange. Also, CSS is hard. * Add support for remaining option types. JS and backend still forthcoming. * Add JS functionality for collapsing game divs, populating span values on range updates. Add <noscript> tag to warn users with JS disabled. * Support showing/hiding game divs based on range value for game * Add support for adding/deleting range rows * Save settings to localStorage on form submission * Save deleted options on form submission * Break weighted-options into a per-game page. - Break weighted-options into a per-game page - Add "advanced options" links to supported games page - Use details/summary tags on supported games, player-options, and weighted-options - Fix bug preventing previously deleted rows from being removed on page load if JS is enabled - Move route handling for options pages to options.py - Remove world handling from weighted-options * Implement loading previous settings from localStorage on page load if JS is enabled * Weighted options can now generate YAML files and single-player games * options pages now respect option visibility settings for simple and complex pages * Remove `/weighted-settings` redirect, fix weighted-options link on player-options page * Fix instance of AutoWorld not having access to proper `random` * Catch instances of frozenset along with set * Restore word-wrap in tooltips * Fix word wrap in player-options labels * Add `dedent` filter to help with formatting tooltips in player-options * Do not change the ordering of keys when printing yaml files * Move necessary import out of conditional statement * Expand only the first option group by default on both options pages * Respect option visibility when generating yaml template files * Swap to double quotes * Replace instances of `/weighted-settings` with `/weighted-options`, swap out incomplete links * Strip newlines and spaces after applying dedent filter * Fix documentation for option groups * Update site map * Update various docs * Sort OptionSet lists alphabetically * Minor style tweak * Fix extremely long text overflowing tooltips * Convert player-options to use CSS grid instead of tables * Do not display link to weighted-options page on supported games if the options page is an external link * Update worlds/AutoWorld.py Bugfix by @alwaysintreble Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * Fix NamedRange options not being properly set if a preset it loaded * Move option-presets route into options.py * Include preset name in YAML if not "default" and not "custom" * Removed macros for PlandoBosses and DefaultOnToggle, as they were handled by their parent classes * Fix not disabling custom inputs when the randomize button is clicked * Only sort OptionList and OptionSet valid_keys if they are unordered * Quick style fixes for player-settings to give `select` elements `text-overflow: ellipsis` and increase base size of left-column * Prevent showing a horizontal scroll bar on player-options if the browser width was beneath a certain threshold * Fix a bug in weighted-options which prevented inputting a negative value for new range inputs --------- Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
* YGO06: make sure it runs on python 3.8 * YGO06: change merge of dict, so it runs on python 3.8
* 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
…2904) Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> Co-authored-by: Scipio Wright <scipiowright@gmail.com> Co-authored-by: beauxq <beauxq@yahoo.com> Co-authored-by: alwaysintreble <mmmcheese158@gmail.com>
Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
* Refactor postgame code to be more readable * Change all references to options to strings * oops * Fix some outdated code related to yaml-disabled EPs * Small fixes to short/longbox stuff (thanks Medic) * comment * fix duplicate * Removed triplicate lmfao * Better comment * added another 'unfun' postgame consideration * comment * more option strings * oops * Remove an unnecessary comparison * another string missed * New classification changes (Credit: Exempt-Medic) * Don't need to pass world * Comments * Replace it with another magic system because why not at this point :DDDDDD * oops * Oops * Another was missed * Make events conditions. Disable_Non_Randomized will no longer just 'have all events' * What the fuck? Has this just always been broken? * Don't have boolean function with 'not' in the name * Another useful classification * slight code refactor * Funny haha booleans * This would create a really bad merge error * I can't believe this actually kind of works * And here's the punchline. + some bugfixes * Comment dat code * Comments galore * LMAO OOPS * so nice I did it twice * debug x2 * Careful * Add more comments * That comment is a bit unnecessary now * Fix overriding region connections * Correct a comment * Correct again * Rename variable * Idk I guess this is in this branch now * More tweaking of postgame & comments * This is commit just exists to fix that grammar error * I think I can just fucking delete this now??? * Forgot to reset something here * Delete dead codepath * Obelisk Keys were getting yote erroneously * More comments * Fix duplicate connections * Oopsington III * performance improvements & cleanup * More rules cleanup and performance improvements * Oh cool I can do this huh * Okay but this is even more swag tho * Lazy eval * remove some implicit checks * Is this too magical yet * more guard magic * Maaaaaaaagiccccccccc * Laaaaaaaaaaaaaaaazzzzzzyyyyyyyyyyy * Make it docstring * Newline bc I like that better * this is a little spooky lol * lol * Wait * spoO * Better variable name and comment * Improved comment again * better API * oops I deleted a deepcopy * lol help * Help??? * player_regionsns lmao * Add some comments * Make doors disabled properly again. I hope this works * Don't disable lasers * Omega oops * Make Floor 2 Exit not exist * Make a fix that's warps compatible * I think this was an oversight, I tested a seed and it seems to have the same result * This is definitely less Violet than before * Does this feel more violet lol * Exception if a laser gets disabled, cleanup * Ruff * >:( * consistent utils import * Make autopostgame more reviewable (hopefully) * more reviewability * WitnessRule * replace another instance of it * lint * style * comment * found the bug * Move comment * Get rid of cache and ugly allow_victory * comments and lint
* Pokemon RB: Add an item group for each HM HMs are suffixed with the name of the move, e.g. "HM02 Fly". If TM move are randomized, they do not have the move name, e.g. "TM02". If someone hints for an HM using the just the number, the fuzzy matching sees "TM02" as closer than "HM02 Fly", and in fact sees it as close enough to not ask the user to confirm, leading them to waste hint points on non-progression item that they didn't intend. Emerald already does this for this reason, adding the same for RB. * Add the new groups for HMs in the item_table instead
… tracker functionality. (#3433)
* Fix improper css for word-break on player-options page * Add default handling to weighted-options types * Remove random-low/mid/high from Toggle, Choice, and TextChoice, * Port key sorting for OptionList and OptionSet from player-options to weighted-options * Ensure Choice and TextChoice values are set properly * Remove debug line 🤦♂️
* duh * Fuck it * Major fixes * a * b * Even more fixes * New option - NoFreeRoamFinale * a * Hat Logic Fix * Just to be safe * multiworld.random to world.random * KeyError fix * Update .gitignore * Update __init__.py * Zoinks Scoob * ffs * Ruh Roh Raggy, more r-r-r-random bugs! * 0.9b - cleanup + expanded logic difficulty * Update Rules.py * Update Regions.py * AttributeError fix * 0.10b - New Options * 1.0 Preparations * Docs * Docs 2 * Fixes * Update __init__.py * Fixes * variable capture my beloathed * Fixes * a * 10 Seconds logic fix * 1.1 * 1.2 * a * New client * More client changes * 1.3 * Final touch-ups for 1.3 * 1.3.1 * 1.3.3 * Zero Jumps gen error fix * more fixes * Formatting improvements * typo * Update __init__.py * Revert "Update __init__.py" This reverts commit e178a7c. * init * Update to new options API * Missed some * Snatcher Coins fix * Missed some more * some slight touch ups * rewind * a * fix things * Revert "Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit" This reverts commit a2360fe, reversing changes made to b8948bc. * Update .gitignore * 1.3.6 * Final touch-ups * Fix client and leftover old options api * Delete setup-ahitclient.py * Update .gitignore * old python version fix * proper warnings for invalid act plandos * Update worlds/ahit/docs/en_A Hat in Time.md Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com> * Update worlds/ahit/docs/setup_en.md Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com> * 120 char per line * "settings" to "options" * Update DeathWishRules.py * Update worlds/ahit/docs/en_A Hat in Time.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * No more loading the data package * cleanup + act plando fixes * almost forgot * Update Rules.py * a * Update worlds/ahit/Options.py Co-authored-by: Ixrec <ericrhitchcock@gmail.com> * Options stuff * oop * no unnecessary type hints * warn about depot download length in setup guide * Update worlds/ahit/Options.py Co-authored-by: Ixrec <ericrhitchcock@gmail.com> * typo Co-authored-by: Ixrec <ericrhitchcock@gmail.com> * Update worlds/ahit/Rules.py Co-authored-by: Ixrec <ericrhitchcock@gmail.com> * review stuff * More stuff from review * comment * 1.5 Update * link fix? * link fix 2 * Update setup_en.md * Update setup_en.md * Update setup_en.md * Evil * Good fucking lord * Review stuff again + Logic fixes * More review stuff * Even more review stuff - we're almost done * DW review stuff * Finish up review stuff * remove leftover stuff * a * assert item * add A Hat in Time to readme/codeowners files * Fix range options not being corrected properly * 120 chars per line in docs * Update worlds/ahit/Regions.py Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * Update worlds/ahit/DeathWishLocations.py Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * Remove some unnecessary option.class.value * Remove data_version and more option.class.value * Update worlds/ahit/Items.py Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * Remove the rest of option.class.value * Update worlds/ahit/DeathWishLocations.py Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * review stuff * Replace connect_regions with Region.connect * review stuff * Remove unnecessary Optional from LocData * Remove HatType.NONE * Update worlds/ahit/test/TestActs.py Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * fix so default tests actually don't run * Improve performance for death wish rules * rename test file * change test imports * 1000 is probably unnecessary * a * change state.count to state.has * stuff * starting inventory hats fix * shouldn't have done this lol * make ship shape task goal equal to number of tasksanity checks if set to 0 * a * change act shuffle starting acts + logic updates * dumb * option groups + lambda capture cringe + typo * a * b * missing option in groups * c * Fix Your Contract Has Expired being placed on first level when it shouldn't * formatting * major logic bug fix for death wish --------- Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com> Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> Co-authored-by: Ixrec <ericrhitchcock@gmail.com> Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
… two typos (#3444) * Fixing inclusion checking error * Fixing typo, limiting valid keys to valid keys * Adding space * Add period
* Pokemon Emerald: Remove mirage tower from allowed dexsanity maps * Pokemon Emerald: Prevent placing wailord/relicanth in out of logic maps * Pokemon Emerald: Clarify docstring Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Pokemon Emerald: Update changelog --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* add support for the new stage added to RoR2 * Fix stage being unreachable * add option groups * reorder option groups
* Ensure that included/starter songs only include those within enabled dlcs. * Allow filtering traps by trap instead of by category. * Add in the currently available limited time dlcs to the dlc list. * Add the option group to the webhost and cleanup some errors. * Fix trap list. * Update tests. Add new ones to test correctness of new features. * Remove the old Just As Planned option * Make traps order alphabetically. Also adjust the title for traps. * Adjust new lines to better fit the website. * Style fixes. * Test adjustments and a fix due to test no longer having just as planned dlc. * Undo spacing changes as it breaks yaml generation. * Fix indenting in webhost. * Add the old options in as removed. Also clean up unused import. * Remove references to the old allow_just_as_planned_dlc_songs option in Muse Dash tests. * Add newline to end of file. --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Docs: Fix incorrect assertion in option group docs and add detail on customizing the forced groups. * add docs for the visibility attribute * typos * review comments * missed one Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * better wording Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
GodlFire
pushed a commit
that referenced
this pull request
Sep 5, 2024
* Update worlds/dark_souls_3/Locations.py Co-authored-by: Scipio Wright <scipiowright@gmail.com> * Fix Covetous Silver Serpent Ring location * Update location groups This should cover pretty much all of the seriously hidden items. It also splits out miniboss drops, mimic drops, and hostile NPC drops. * Remove the "Guarded by Keys" group On reflection, I don't think this is actually that useful. It'll also get a lot muddier once we can randomize shops and ashes become pseudo-"keys". * Restore Knight Slayer's Ring classification * Support infusions/upgrades in the new DS3 mod system * Support random starting loadouts * Make an item's NPC status orthogonal to its category * Track location groups with flags * Track Archipelago/Offline mismatches on the server Also fix a few incorrect item names. * Add additional locations that are now randomizable * Don't put soul and multiple items in shops * Add an option to enable whether NG+ items/locations are included * Clean up useful item categorization There are so many weapons in the game now, it doesn't make sense to treat them all as useful * Add more variety to filler items * Iron out a few bugs and incompatibilities * Fix more silly bugs * Get tests passing * Update options to cover new item types Also recategorize some items. * Verify the default values of `Option`s. Since `Option.verify()` can handle normalization of option names, this allows options to define defaults which rely on that normalization. For example, it allows a world to exclude certain locations by default. This also makes it easier to catch errors if a world author accidentally sets an invalid default. * Make a few more improvements and fixes * Randomize Path of the Dragon * Mark items that unlock checks as useful These items all unlock missable checks, but they're still good to ahve in the game for variety's sake. * Guarantee more NPC quests are completable * Fix a syntax error * Fix rule definition * Support enemy randomization * Support online Yhorm randomization * Remove a completed TODO * Fix tests * Fix force_unique * Add an option to smooth out upgrade item progression * Add helpers for setting location/entrance rules * Support smoother soul item progression * Fill extra smoothing items into conditional locations as well as other worlds * Add health item smoothing * Handle infusions at item generation time * Handle item upgrades at genreation time * Fix Grave Warden's Ashes * Don't overwrite old rules * Randomize items based on spheres instead of DS3 locations * Add a smoothing option for weapon upgrades * Add rules for crow trades * Small fixes * Fix a few more bugs * Fix more bugs * Try to prevent Path of the Dragon from going somewhere it doesn't work * Add the ability to provide enemy presets * Various fixes and features * Bug fixes * Better Coiled Sword placement * Structure DarkSouls3Location more like DarkSouls3Item * Add events to make DS3's spheres more even * Restructure locations to work like items do now * Add rules for more missable locations * Don't add two Storm Rulers * Place Hawk Ring in Farron Keep * Mark the Grass Crest Shield as useful * Mark new progression items * Fix a bug * Support newer better Path of the Dragon code * Don't lock the player out of Coiled Sword * Don't create events for missable locations * Don't throw strings * Don't smooth event items * Properly categorize Butcher Knife * Be more careful about placing Yhorm in low-randomization scenarios * Don't try to smooth DLC items with DLC disabled * Fix another Yhorm bug * Fix upgrade/infusion logic * Remove the PoolType option This distinction is no longer meaningful now that every location in the game of each type is randomized * Categorize HWL: Red Eye Orb as an NPC location * Don't place Storm Ruler on CA: Coiled Sword * Define flatten() locally to make this APWorld capable * Fix some more Leonhard weirdness * Fix unique item randomization * Don't double Twin Dragon Greatshield * Remove debugging print * Don't add double Storm Ruler Also remove now-redundant item sorting by category in create_items. * Don't add double Storm Ruler Also remove now-redundant item sorting by category in create_items. * Add a missing dlc_enabled check * Use nicer options syntax * Bump data_version * Mention where Yhorm is in which world * Better handle excluded events * Add a newline to Yhorm location * Better way of handling excluded unradomized progression locations * Fix a squidge of nondeterminism * Only smooth items from this world * Don't smooth progression weapons * Remove a location that doesn't actually exist in-game * Classify Power Within as useful * Clarify location names * Fix location requirements * Clean up randomization options * Properly name Coiled Sword location * Add an option for configuring how missable items are handled * Fix some bugs from location name updates * Fix location guide link * Fix a couple locations that were busted offline * Update detailed location descriptions * Fix some bugs when generating for a multiworld * Inject Large Leather Shield * Fix a few location issues * Don't allow progression_skip_balancing for unnecessary locs * Update some location info * Don't uniquify the wrong items * Fix some more location issues * More location fixes * Use hyphens instead of parens for location descriptions * Update and fix more locations * Fix Soul of Cinder boss name * Fix some logic issues * Add item groups and document item/location groups * Fix the display name for "Impatient Mimics" * Properly handle Transposing Kiln and Pyromancer's Flame * Testing * Some fixes to NPC quests, late basin, and transposing kiln * Improve a couple location names * Split out and improve missable NPC item logic * Don't allow crow trades to have foreign items * Fix a variable capture bug * Make sure early items are accessible early even with early Castle * Mark ID giant slave drops as missable * Make sure late basin means that early items aren't behind it * Make is_location_available explicitly private * Add an _add_item_rule utility that checks availability * Clear excluded items if excluded_locations == "unnecessary" * Don't allow upgrades/infusions in crow trades * Fix the documentation for deprecated options * Create events for all excluded locations This allows `can_reach` logic to work even if the locations are randomized. * Fix up Patches' and Siegward's logic based on some manual testing * Factor out more sub-methods for setting location rules * Oops, left these in * Fixing name * Left that in too * Changing to NamedRange to support special_range_names * Alphabetizing * Don't call _is_location_available on foreign locations * Add missing Leonhard items * Changing late basin to have a post-small-doll option * Update basin option, add logic for some of Leonhard Hawkwood and Orbeck * Simplifying an option, fixing a copy-paste error * Removing trailing whitespace * Changing lost items to go into start inventory * Revert Basin changes * Oops * Update Options.py * Reverting small doll changes * Farron Keep boss requirement logic * Add Scroll for late_dlc * Fixing excluded unnecessary locations * Adding Priestess Ring as being after UG boss * Removing missable from Corvian Titanite Slab * Adding KFF Yhorm boss locks * Screams about Creighton * Elite Knight Set isn't permanently missable * Adding Kiln requirement to KFF * fixing valid_keys and item groups * Fixing an option-checker * Throwing unplaceable Storm Ruler into start inventory * Update locations * Refactor item injection * Update setup doc * Small fixes * Fix another location name * Fix injection calculation * Inject guaranteed items along with progression items * Mark boss souls as required for access to regions This allows us to set quest requirements for boss souls and have them automatically propagated to regions, means we need less machinery for Yhorm bosses, and allows us to get rid of a few region-transition events. * Make sure Sirris's quest can be completed before Pontiff * Removing unused list * Changing dict to list * Removing unused test * Update __init__.py * self.multiworld.random -> self.random (#9) * Fix some miscellaneous location issues * Rewrite the DS3 intro page/FAQ * Removing modifying the itempool after fill (#7) Co-authored-by: Natalie Weizenbaum <nweiz@google.com> * Small fixes to the setup guide (#10) Small fixes, adding an example for connecting * Expanded Late Basin of Vows and Late DLC (#6) * Add proper requirements for CD: Black Eye Orb * Fix Aldrich's name * Document the differences with the 2.x.x branch * Don't crash if there are more items than locations in smoothing * Apply suggestions from code review Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Code review * Fix _replace_with_filler * Don't use the shared flatten function in SM * Track local items separately rather than iterating the multiworld * Various formatting/docs changes suggested by PyCharm (#12) * Drop deprecated options * Rename "offline randomizer" to "static randomizer" which is clearer * Move `enable_*_locations` under removed options. * Avoid excluded locations for locally-filled items * Adding Removed options to error (#14) * Changes for WebHost options display and the options overhaul * unpack iterators in item list (#13) * Allow worlds to add options to prebuilt groups Previously, this crashed because `typing.NamedTuple` fields such as `group.name` aren't assignable. Now it will only fail for group names that are actually incorrectly cased, and will fail with a better error message. * Style changes, rename exclude behavior options, remove guaranteed items option * Spacing/Formatting (ArchipelagoMW#18) * Various Fixes (ArchipelagoMW#19) * Universally Track Yhorm (ArchipelagoMW#20) * Account for excluded and missable * These are behaviors now * This is singular, apparently * Oops * Fleshing out the priority process * Missable Titanite Lizards and excluded locations (ArchipelagoMW#22) * Small style/efficiency changes * Final passthrough fixes (ArchipelagoMW#24) * Use rich option formatting * Make the behavior option values actual behaviors (ArchipelagoMW#25) * Use != * Remove unused flatten utility * Some changes from review (ArchipelagoMW#28) * Fixing determinism and making smooth faster (ArchipelagoMW#29) * Style change * PyCharm and Mypy fixes (ArchipelagoMW#26) Co-authored-by: Scipio Wright <scipiowright@gmail.com> * Change yhorm default (ArchipelagoMW#30) * Add indirect condition (ArchipelagoMW#27) * Update worlds/dark_souls_3/docs/locations_en.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Ship all item IDs to the client This avoids issues where items might get skipped if, for instance, they're only in the starting inventory. * Make sure to send AP IDs for infused/upgraded weapons * Make `RandomEnemyPresetOption` compatible with ArchipelagoMW#3280 (ArchipelagoMW#31) * Fix cast * More typing and small fixes (ArchipelagoMW#32) --------- Co-authored-by: Scipio Wright <scipiowright@gmail.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com> Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
GodlFire
added a commit
that referenced
this pull request
Sep 5, 2024
* - Add Unit test for all the fish that require a specific region to be reachable
* - Move the crimsonfish to the tide pools region
* - Improved the unit test to be more thorough, add extended family fish to the test
* - Moved the son of crimsonfish to the correct region as well
* FFMQ: Fix reset protection (#3710)
* Revert reset protection
* Fix reset protection
---------
Co-authored-by: alchav <alchav@jalchavware.com>
* - Take shipsanity moss out of shipsanity crops (#3709)
* sc2: Removing unused dependency in requirements.txt (#3697)
* sc2: Removing unused dependency in requirements.txt
* sc2: Add missing newline in requirements.txt
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---------
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* WebHost: Fix NamedRange values clamping to the range (#3613)
If a NamedRange has a `special_range_names` entry outside the
`range_start` and `range_end`, the HTML5 range input will clamp the
submitted value to the closest value in the range.
These means that, for example, Pokemon RB's "HM Compatibility" option's
"Vanilla (-1)" option would instead get posted as "0" rather than "-1".
This change updates NamedRange to behave like TextChoice, where the
select element has a `name` attribute matching the option, and there is
an additional element to be able to provide an option other than the
select element's choices.
This uses a different suffix of `-range` rather than `-custom` that
TextChoice uses. The reason is we need some way to decide whether to use
the custom value or the select value, and that method needs to work
without JavaScript. For TextChoice this is easy, if the custom field is
empty use the select element. For NamedRange this is more difficult as
the browser will always submit *something*. My choice was to only use
the value from the range if the select box is set to "custom". Since
this only happens with JS as "custom' is hidden, I made the range hidden
under no-JS. If it's preferred, I could make the select box hidden
instead. Let me know.
This PR also makes the `js-required` class set `display: none` with
`!important` as otherwise the class wouldn't work on any rule that
had `display: flex` with more specificity than a single class.
* Timespinner: migrate to new options api and correct random (#2485)
* Implemented new options system into Timespinner
* Fixed typo
* Fixed typo
* Fixed slotdata maybe
* Fixes
* more fixes
* Fixed failing unit tests
* Implemented options backwards comnpatibility
* Fixed option fallbacks
* Implemented review results
* Fixed logic bug
* Fixed python 3.8/3.9 compatibility
* Replaced one more multiworld option usage
* Update worlds/timespinner/Options.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Updated logging of options replacement to include player name and also write it to spoiler
Fixed generation bug
Implemented review results
---------
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Core: migrate item links out of main (#2914)
* Core: move item linking out of main
* add a test that item link option correctly validates
* remove unused fluff
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Core: Rework accessibility (#1481)
* rename locations accessibility to "full" and make old locations accessibility debug only
* fix a bug in oot
* reorder lttp tests to not override its overrides
* changed the wrong word in the dict
* :forehead:
* update the manual lttp yaml
* use __debug__
* update pokemon and messenger
* fix conflicts from 993
* fix stardew presets
* add that locations may be inaccessible to description
* use reST format and make the items description one line so that it renders correctly on webhost
* forgot i renamed that
* add aliases for back compat
* some cleanup
* fix imports
* fix test failure
* only check "items" players when the item is progression
* Revert "only check "items" players when the item is progression"
This reverts commit ecbf986145e6194aa99a39c481d8ecd0736d5a4c.
* remove some unnecessary diffs
* CV64: Add ItemsAccessibility
* put items description at the bottom of the docstring since that's it's visual order
* :
* rename accessibility reference in pokemon rb dexsanity
* make the rendered tooltips look nicer
* Shivers: New features and removes two missed options using the old options API (#3287)
* Adds an option to have pot pieces placed local/non-local/anywhere
Shivers nearly always finishes last in multiworld games due to the fact you need all 20 pot pieces to win and the pot pieces open very few location checks. This option allows the pieces to be placed locally. This should allow Shivers to be finished earlier.
* New option: Choose how many ixupi captures are needed for goal completion
New option: Choose how many ixupi captures are needed for goal completion
* Fixes rule logic for location 'puzzle solved three floor elevator'
Fixes rule logic for location 'puzzle solved three floor elevator'. Missing a parenthesis caused only the key requirement to be checked for the blue maze region.
* Merge branch 'main' of https://github.com/GodlFire/Shivers
* Revert "Merge branch 'main' of https://github.com/GodlFire/Shivers"
This reverts commit bb08c3f0c2ef148fd24d7c7820cdfe936f7196e2.
* Fixes issue with office elevator rule logic.
* Bug fix, missing logic requirement for location 'Final Riddle: Guillotine Dropped'
Bug fix, missing logic requirement for location 'Final Riddle: Guillotine Dropped'
* Moves plaque location to front for better tracker referencing.
* Tiki should be Shaman.
* Hanging should be Gallows.
* Merrick spelling.
* Clarity change.
* Changes new option to use new option API
Changes new option to use new option API
* Added sub regions for Ixupi
-Added sub regions for Ixupi and moved ixupi capture checks into the sub region.
-Added missing wax capture possible spot in Shaman room
* Adds option for ixupi captures to be priority locations
Adds option for ixupi captures to be priority locations
* Consistency
Consistency
* Changes ixupi captures priority to default on toggle
Changes ixupi captures priority to default on toggle
* Docs update
-Updated link to randomizer
-Update some text to reflect the latest functionality
-Replaced 'setting' with 'option'
* New features/bug fixes
-Adds an option to have completed pots in the item pool
-Moved subterranean world information plaque to maze staircase
* Cleanup
Cleanup
* Fixed name for moved location
When moving a location and renaming it I forgot to fix the name in a second spot.
* Squashed commit of the following:
commit 630a3bdfb9414d8c57154f29253fce0cf67b6436
Merge: 8477d3c8 5e579200
Author: GodlFire <46984098+GodlFire@users.noreply.github.com>
Date: Mon Apr 1 19:08:48 2024 -0600
Merge pull request #10 from ArchipelagoMW/main
Merge main into branch
commit 5e5792009cd3089ae61c5fdd208de1b79d183cb4
Author: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Mon Apr 1 12:08:21 2024 -0500
LttP: delete playerSettings.yaml (#3062)
commit 9aeeeb077a9e894cd2ace51b58d537bcf7607d5b
Author: CaitSith2 <d_good@caitsith2.com>
Date: Mon Apr 1 06:07:56 2024 -0700
ALttP: Re-mark light/dark world regions after applying plando connections (#2964)
commit 35458380e6e08eab85203942b6415fd964907c84
Author: Bryce Wilson <gyroscope15@gmail.com>
Date: Mon Apr 1 07:07:11 2024 -0600
Pokemon Emerald: Fix wonder trade race condition (#2983)
commit 4ac1866689d01dc6693866ee8b1236ad6fea114b
Author: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Mon Apr 1 08:06:31 2024 -0500
ALTTP: Skull Woods Inverted fix (#2980)
commit 4aa03da66e1a8c99fc31c163c1a23fb0bd772c15
Author: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Mon Apr 1 15:06:02 2024 +0200
Factorio: fix attempting to create savegame with not filename safe characters (#2842)
commit 24a03bc8b6b406c0925eedf415dcef47e17fdbaa
Author: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Mon Apr 1 08:02:26 2024 -0500
KDL3: fix shuffled animals not actually being random (#3060)
commit f813a7005fadb1c56bb93fee6147b63d9df2b720
Author: Aaron Wagener <mmmcheese158@gmail.com>
Date: Sun Mar 31 11:11:10 2024 -0500
The Messenger: update docs formatting and fix outdated info (#3033)
* The Messenger: update docs formatting and fix outdated info
* address review feedback
* 120 chars
commit 2a0b7e0def5c00cc2ac273b22581b3cde3b6f6a6
Author: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com>
Date: Sun Mar 31 09:55:55 2024 -0600
CV64: A couple of very small docs corrections. (#3057)
commit 03d47e460e434b897b313c2ba452d785ecbacebe
Author: Ixrec <ericrhitchcock@gmail.com>
Date: Sun Mar 31 16:55:08 2024 +0100
A Short Hike: Clarify installation instructions (#3058)
* Clarify installation instructions
* don't mention 'config' folder since it isn't created until the game starts
commit e546c0f7ff2456ddb919a1b65a437a1c61b07479
Author: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun Mar 31 10:50:31 2024 -0500
Yoshi's Island: add patch suffix (#3061)
commit 2ec93ba82a969865a8addc98feb076898978c8e3
Author: Bryce Wilson <gyroscope15@gmail.com>
Date: Sun Mar 31 09:48:59 2024 -0600
Pokemon Emerald: Fix inconsistent location name (#3065)
commit 4e3d3963941934c77573e6e0b699edf9e26cd647
Author: Aaron Wagener <mmmcheese158@gmail.com>
Date: Sun Mar 31 10:47:11 2024 -0500
The Messenger: Fix precollected notes not being removed from the itempool (#3066)
* The Messenger: fix precollected notes not being properly removed from pool
* The Messenger: bump required client version
commit 72c53513f8bdab5506ffa972c1bf6f8573f097d7
Author: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun Mar 31 03:57:59 2024 +0200
WebHost: fix /check creating broken yaml files if files don't end with a newline (#3063)
commit b7ac6a4cbd54d5f8e6672e4a6c6ea708e7e6d4de
Author: Aaron Wagener <mmmcheese158@gmail.com>
Date: Fri Mar 29 20:14:53 2024 -0500
The Messenger: Fix various portal shuffle issues (#2976)
* put constants in a bit more sensical order
* fix accidental incorrect scoping
* fix plando rules not being respected
* add docstrings for the plando functions
* fix the portal output pools being overwritten
* use shuffle and pop instead of removing by content so plando can go to the same area twice
* move portal pool rebuilding outside mapping creation
* remove plando_connection cleansing since it isn't shared with transition shuffle
commit 5f0112e78365d19f04e22af92d6ad1f52d264b1f
Author: Zach Parks <zach@alliware.com>
Date: Fri Mar 29 19:13:51 2024 -0500
Tracker: Add starting inventory to trackers and received items table. (#3051)
commit bb481256de2a511d3b114f164061d440026be4c4
Author: Aaron Wagener <mmmcheese158@gmail.com>
Date: Thu Mar 28 21:48:40 2024 -0500
Core: Make fill failure error more human parseable (#3023)
commit 301d9de9758e360ccec5399f3f9d922f1c034e45
Author: Aaron Wagener <mmmcheese158@gmail.com>
Date: Thu Mar 28 19:31:59 2024 -0500
Docs: adding games rework (#2892)
* Docs: complete adding games.md rework
* remove all the now unused images
* review changes
* address medic's review
* address more comments
commit 9dc708978bd00890afcd3426f829a5ac53cbe136
Author: Trevor L <80716066+TRPG0@users.noreply.github.com>
Date: Thu Mar 28 18:26:58 2024 -0600
Hylics 2: Fix invalid multiworld data, use `self.random` instead of `self.multiworld.random` (#3001)
* Hylics 2: Fixes
* Rewrite loop
commit 4391d1f4c13cdf2295481d8c51f9ef8f58bf8347
Author: Bryce Wilson <gyroscope15@gmail.com>
Date: Thu Mar 28 18:05:39 2024 -0600
Pokemon Emerald: Fix opponents learning non-randomized TMs (#3025)
commit 5d9d4ed9f1e44309f1b53f12413ad260f1b6c983
Author: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri Mar 29 01:01:31 2024 +0100
SoE: update to pyevermizer v0.48.0 (#3050)
commit c97215e0e755224593fdd00894731b59aa415e19
Author: Scipio Wright <scipiowright@gmail.com>
Date: Thu Mar 28 17:23:37 2024 -0400
TUNIC: Minor refactor of the vanilla_portals function (#3009)
* Remove unused, change an if to an elif
* Remove unused import
commit eb66886a908ad75bbe71fac9bb81a0177e05e816
Author: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Thu Mar 28 16:23:01 2024 -0500
SC2: Don't Filter Excluded Victory Locations (#3018)
commit de860623d17d274289e3e4ab13650f2382e2e0b8
Author: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Thu Mar 28 22:21:56 2024 +0100
Core: differentiate between unknown worlds and broken worlds in error message (#2903)
commit 74b2bf51613a968eb57a5b138a7ad191324b2dd8
Author: Bryce Wilson <gyroscope15@gmail.com>
Date: Thu Mar 28 15:20:55 2024 -0600
Pokemon Emerald: Exclude norman trainer location during norman goal (#3038)
commit 74ac66b03228988d0885cff556f962a04873cc54
Author: BadMagic100 <dempsey.sean@outlook.com>
Date: Thu Mar 28 08:49:19 2024 -0700
Hollow Knight: 0.4.5 doc revamp and default options tweaks (#2982)
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
commit 80d7ac416493a540548aad67981202a1483b5e53
Author: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu Mar 28 09:41:32 2024 -0500
KDL3: RC1 Fixes and Enhancement (#3022)
* fix cloudy park 4 rule, zero deathlink message
* remove redundant door_shuffle bool
when generic ER gets in, this whole function gets rewritten. So just clean it a little now.
* properly fix deathlink messages, fix fill error
* update docs
commit 77311719fa0fa5b67fe92f437c3cfed16bd5136f
Author: Ziktofel <ziktofel@gmail.com>
Date: Thu Mar 28 15:38:34 2024 +0100
SC2: Fix HERC upgrades (#3044)
commit cfc1541be9e92f1f59b21f4a81f96fc88f4d9f7e
Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Thu Mar 28 15:19:32 2024 +0100
Docs: Mention the "last received item index" paradigm in the network protocol docs (#2989)
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
commit 4d954afd9b2311248083fc389ac737995985be86
Author: Scipio Wright <scipiowright@gmail.com>
Date: Thu Mar 28 10:11:20 2024 -0400
TUNIC: Add link to AP plando guide to connection plando section of game page (#2993)
commit 17748a4bf1cfd5cc11c6596a09ffc1f01434340f
Author: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Thu Mar 28 10:00:10 2024 -0400
Launcher, Docs: Update UI and Set-Up Guide to Reference Options (#2950)
commit 9182fe563fc18ed4ccaa8370cfed88407140398e
Author: Entropynines <163603868+Entropynines@users.noreply.github.com>
Date: Thu Mar 28 06:56:35 2024 -0700
README: Remove outdated information about launchers (#2966)
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
commit bcf223081facd030aa706dc7430a72bcf2fdadc9
Author: t3hf1gm3nt <59876300+t3hf1gm3nt@users.noreply.github.com>
Date: Thu Mar 28 09:54:56 2024 -0400
TLOZ: Fix markdown issue with game info page (#2985)
commit fa93488f3fceac6c2f51851766543cab3ba121e6
Author: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu Mar 28 09:46:00 2024 -0400
Docs: Consistent naming for "connection plando" (#2994)
commit db15dd4bde442aad99048224bdb0d7dc28c26717
Author: chandler05 <66492208+chandler05@users.noreply.github.com>
Date: Thu Mar 28 08:45:19 2024 -0500
A Short Hike: Fix incorrect info in docs (#3016)
commit 01cdb0d761a82349afaeb7222b4b59cb1766f4a0
Author: PoryGone <98504756+PoryGone@users.noreply.github.com>
Date: Thu Mar 28 09:44:23 2024 -0400
SMW: Update World Doc for v2.0 Features (#3034)
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
commit d0ac2b744eac438570e6a2333e76fa212be66534
Author: panicbit <panicbit@users.noreply.github.com>
Date: Thu Mar 28 10:11:26 2024 +0100
LADX: fix local and non-local instrument placement (#2987)
* LADX: fix local and non-local instrument placement
* change confusing variable name
commit 14f5f0127eb753eaf0431a54bebc82f5e74a1cb9
Author: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
Date: Thu Mar 28 04:42:35 2024 -0400
Stardew Valley: Fix potential soft lock with vanilla tools and entrance randomizer + Performance improvement for vanilla tool/skills (#3002)
* fix vanilla tool fishing rod requiring metal bars
fix vanilla skill requiring previous level (it's always the same rule or more restrictive)
* add test to ensure fishing rod need fish shop
* fishing rod should be indexed from 0 like a mentally sane person would do.
* fishing rod 0 isn't real, but it definitely can hurt you.
* reeeeeeeee
commit cf133dde7275e171d388fb466b9ed719ab7ed7c8
Author: Bryce Wilson <gyroscope15@gmail.com>
Date: Thu Mar 28 02:32:27 2024 -0600
Pokemon Emerald: Fix typo (#3020)
commit ca1812181106a3645e7f7af417590024b377b25e
Author: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
Date: Thu Mar 28 04:27:49 2024 -0400
Stardew Valley: Fix generation fail with SVE and entrance rando when Wizard Tower is in place of Sprite Spring (#2970)
commit 1d4512590e0b78355e5c10174a9c6749e1098a72
Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed Mar 27 21:09:09 2024 +0100
requirements.txt: _ instead of - to make PyCharm happy (#3043)
commit f7b415dab00338443b68eba51f42614fc40b9152
Author: agilbert1412 <alexgilbert@yahoo.com>
Date: Tue Mar 26 19:40:58 2024 +0300
Stardew valley: Game version documentation (#2990)
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
commit 702f006c848c05b847e85f7dbedeef68b70cdcc6
Author: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com>
Date: Tue Mar 26 07:31:36 2024 -0600
CV64: Change all mentions of "settings" to "options" and fix a broken link (#3015)
commit 98ce8f8844fd0c62214a5774609382cf6a6bc829
Author: Yussur Mustafa Oraji <N00byKing@hotmail.de>
Date: Tue Mar 26 14:29:25 2024 +0100
sm64ex: New Options API and WebHost fix (#2979)
commit ea47b90367b4a220c346d8057f3aeb4207d226a1
Author: Scipio Wright <scipiowright@gmail.com>
Date: Tue Mar 26 09:25:41 2024 -0400
TUNIC: You can grapple down here without the ladder, neat (#3019)
commit bf3856866c5ea385d0ac58014c71addfdc92637e
Author: agilbert1412 <alexgilbert@yahoo.com>
Date: Sun Mar 24 23:53:49 2024 +0300
Stardew Valley: presets with some of the new available values for existing settings to make them more accurate (#3014)
commit c0368ae0d48b4b2807c5238aeb7b14937282fc3e
Author: Phaneros <31861583+MatthewMarinets@users.noreply.github.com>
Date: Sun Mar 24 13:53:20 2024 -0700
SC2: Fixed missing upgrade from custom tracker (#3013)
commit 36c83073ad8c2ae1912d390ee3976ba0e2eb3f4a
Author: Salzkorn <salzkitty@gmail.com>
Date: Sun Mar 24 21:52:41 2024 +0100
SC2 Tracker: Fix grouped items pointing at wrong item IDs (#2992)
commit 2b24539ea5b387a3b62063c8177c373e2e3f8389
Author: Ziktofel <ziktofel@gmail.com>
Date: Sun Mar 24 21:52:16 2024 +0100
SC2 Tracker: Use level tinting to let the player know which level he has of Replenishable Magazine (#2986)
commit 7e904a1c78c91fb502706fe030a1f1765f734de4
Author: Ziktofel <ziktofel@gmail.com>
Date: Sun Mar 24 21:51:46 2024 +0100
SC2: Fix Kerrigan presence resolving when deciding which races should be used (#2978)
commit bdd498db2321417374d572bff8beede083fef2b2
Author: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Fri Mar 22 15:36:27 2024 -0500
ALTTP: Fix #2290's crashes (#2973)
commit 355223b8f0af1ee729ffa8b53eb717aa5bf283a4
Author: PinkSwitch <52474902+PinkSwitch@users.noreply.github.com>
Date: Fri Mar 22 15:35:00 2024 -0500
Yoshi's Island: Implement New Game (#2141)
Co-authored-by: Silvris <58583688+Silvris@users.noreply.github.com>
Co-authored-by: Alchav <59858495+Alchav@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
commit aaa3472d5d8d8a7a710bd38386d9eb34046a5578
Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri Mar 22 21:30:51 2024 +0100
The Witness: Fix seed bleed issue (#3008)
commit 96d93c1ae313bb031e983c0d40d8be199b302df1
Author: chandler05 <66492208+chandler05@users.noreply.github.com>
Date: Fri Mar 22 15:30:23 2024 -0500
A Short Hike: Add option to customize filler coin count (#3004)
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
commit ca549df20a0a07c30ee2e1bbc2498492b919604d
Author: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Fri Mar 22 15:29:24 2024 -0500
CommonClient: fix hint tab overlapping (#2957)
Co-authored-by: Remy Jette <remy@remyjette.com>
commit 44988d430dc7d91eaeac7aad681dc024bc19ccce
Author: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri Mar 22 15:28:41 2024 -0500
Lingo: Add trap weights option (#2837)
commit 11b32f17abebc08a6140506a375179f8a46bcfe6
Author: Danaël V <104455676+ReverM@users.noreply.github.com>
Date: Fri Mar 22 12:46:14 2024 -0400
Docs: replacing "setting" to "option" in world docs (#2622)
* Update contributing.md
* Update contributing.md
* Update contributing.md
* Update contributing.md
* Update contributing.md
* Update contributing.md
Added non-AP World specific information
* Update contributing.md
Fixed broken link
* Some minor touchups
* Update Contributing.md
Draft for version with picture
* Update contributing.md
Small word change
* Minor updates for conciseness, mostly
* Changed all instances of settings to options in info and setup guides
I combed through all world docs and swapped "setting" to "option" when this was refering to yaml options.
I also changed a leftover "setting" in option.py
* Update contributing.md
* Update contributing.md
* Update setup_en.md
Woops I forgot one
* Update Options.py
Reverted changes regarding options.py
* Update worlds/noita/docs/en_Noita.md
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Update worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md
revert change waiting for that page to be updated
* Update worlds/witness/docs/setup_en.md
* Update worlds/witness/docs/en_The Witness.md
* Update worlds/soe/docs/multiworld_en.md
Fixed Typo
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Update worlds/witness/docs/en_The Witness.md
* Update worlds/adventure/docs/en_Adventure.md
* Update worlds/witness/docs/setup_en.md
* Updated Stardew valley to hopefully get rid of the merge conflicts
* Didn't work :dismay:
* Delete worlds/sc2wol/docs/setup_en.md
I think this will fix the merge issue
* Now it should work
* Woops
---------
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
commit 218cd45844f9d733618af9088941156cd79b80bc
Author: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Fri Mar 22 03:02:38 2024 -0500
APProcedurePatch: fix RLE/COPY incorrect sizing (#3006)
* change class variables to instance variables
* Update worlds/Files.py
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Update worlds/Files.py
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* move required_extensions to tuple
* fix missing tuple ellipsis
* fix classvar mixup
* rename tokens to _tokens. use hasattr
* type hint cleanup
* Update Files.py
* check using isinstance instead
* Update Files.py
---------
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
commit 4196bde597cdbb6186ff614294fd54ff043a0c99
Author: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu Mar 21 16:38:36 2024 -0400
Docs: Fixing special_range_names example (#3005)
commit 40f843f54d5970302caeb2a21b76a4845cf5c0ed
Author: Star Rauchenberger <fefferburbia@gmail.com>
Date: Thu Mar 21 11:00:53 2024 -0500
Lingo: Minor game data fixes (#3003)
commit da333fbb0c88feedd4821a7bade3f56028a02111
Author: GodlFire <46984098+GodlFire@users.noreply.github.com>
Date: Thu Mar 21 09:52:16 2024 -0600
Shivers: Adds missing logic rule for skull dial door location (#2997)
commit 43084da23c719133fcae672e20c9b046e6ef8067
Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Thu Mar 21 16:51:29 2024 +0100
The Witness: Fix newlines in Witness option tooltips (#2971)
commit 14816743fca366b52422ccb19add59d4960f17a3
Author: Scipio Wright <scipiowright@gmail.com>
Date: Thu Mar 21 11:50:07 2024 -0400
TUNIC: Shuffle Ladders option (#2919)
commit 30a0aa2c85a7015e2072b5781ed1078965f62f4b
Author: Star Rauchenberger <fefferburbia@gmail.com>
Date: Thu Mar 21 10:46:53 2024 -0500
Lingo: Add item/location groups (#2789)
commit f4b7c28a33bb163768871616023a8cf3879840b4
Author: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed Mar 20 17:45:32 2024 -0500
APProcedurePatch: hotfix changing class variables to instance variables (#2996)
* change class variables to instance variables
* Update worlds/Files.py
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Update worlds/Files.py
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* move required_extensions to tuple
* fix missing tuple ellipsis
* fix classvar mixup
* rename tokens to _tokens. use hasattr
* type hint cleanup
* Update Files.py
* check using isinstance instead
---------
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
commit 12864f7b24028fa56135e599f0fe1642c9d2d377
Author: chandler05 <66492208+chandler05@users.noreply.github.com>
Date: Wed Mar 20 22:44:09 2024 +0100
A Short Hike: Implement New Game (#2577)
commit db02e9d2aabc0f4c1302ac761b3f5547ef00c7c5
Author: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com>
Date: Wed Mar 20 15:03:25 2024 -0600
Castlevania 64: Implement New Game (#2472)
commit 32315776ac0ac1a714eb9d58688c479e2038c658
Author: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
Date: Wed Mar 20 16:57:45 2024 -0400
Stardew Valley: Fix extended family legendary fishes being locations with fishsanity set to exclude legendary (#2967)
commit e9620bea777ff1008a09c24a70bf523c94f22c29
Author: Magnemania <89949176+Magnemania@users.noreply.github.com>
Date: Wed Mar 20 16:56:00 2024 -0400
SM64: Goal Logic and Hint Bugfixes (#2886)
commit 183ca35bbaf6c805fdb53396d21d0cba34f9cc5e
Author: qwint <qwint.42@gmail.com>
Date: Wed Mar 20 08:39:37 2024 -0500
CommonClient: Port Casting Bug (#2975)
commit fcaaa197a19a3be03965c504ca78dd2c21ce1f84
Author: TheLX5 <luisyuregi@gmail.com>
Date: Wed Mar 20 05:56:19 2024 -0700
SMW: Fixes for Bowser being defeatable on Egg Hunt and CI2 DC room access (#2981)
commit 8f7b63a787a0ef05625ae2fad1768251aced0c87
Author: TheLX5 <luisyuregi@gmail.com>
Date: Wed Mar 20 05:56:04 2024 -0700
SMW: Blocksanity logic fixes (#2988)
commit 6f64bb98693556ac2635791381cc9651c365b324
Author: Scipio Wright <scipiowright@gmail.com>
Date: Wed Mar 20 08:46:31 2024 -0400
Noita: Remove newline from option description so it doesn't look bad on webhost (#2969)
commit d0a9d0e2d1df641668f4f806b45f9577e69229f6
Author: Bryce Wilson <gyroscope15@gmail.com>
Date: Wed Mar 20 06:43:13 2024 -0600
Pokemon Emerald: Bump required client version (#2963)
commit 94650a02de62956eee8e7e41f61e8a41506b5842
Author: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Tue Mar 19 17:08:29 2024 -0500
Core: implement APProcedurePatch and APTokenMixin (#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 <beauxq@users.noreply.github.com>
* pep8
---------
Co-authored-by: beauxq <beauxq@yahoo.com>
Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
* Changes pot_completed_list to a instance variable instead of global.
Changes pot_completed_list to a instance variable instead of global. The global variable was unintentional and was causing missmatch in pre_fill which would cause generation error.
* Removing deprecated options getter
* Adds back fix from main branch
Adds back fix from main branch
* Removing messenger changes that somehow got on my branch?
Removing messenger changes that somehow got on my branch?
* Removing messenger changes that are somehow on the Shivers branch
Removing messenger changes that are somehow on the Shivers branch
* Still trying to remove Messenger changes on Shivers branch
Still trying to remove Messenger changes on Shivers branch
* Review comments addressed. Early lobby access set as default.
Review comments addressed. Early lobby access set as default.
* Review comments addressed
Review comments addressed
* Review comments addressed. Option for priority locations removed.
Option to have ixupi captures a priority has been removed and can be added again if Priority Fill is changed. See Issues #3467.
* Minor Change
Minor Change
* Fixed ID 10 T Error
Fixed ID 10 T Error
* Front door option added to slot data
Front door option added to slot data
* Add missing .value on slot data
Add missing .value on slot data
* Small change to slot data
Small change to slot data
* Small change to slot data
Why didn't this change get pushed github...
* Forgot list
Forgot list
---------
Co-authored-by: Kory Dondzila <korydondzila@gmail.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Bomb Rush Cyberfunk: Fix Coil quest being in glitched logic too early (#3720)
* Update Rules.py
* Update Rules.py
* Options: Always verify keys for VerifyKeys options (#3280)
* Options: Always verify keys for VerifyKeys options
* fix PlandoTexts
* use OptionError and give a slightly better error message for which option it is
* add the player name to the error
* don't create an unnecessary list
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Docs: Add FFMQ French Setup Guide + Minor fixes to English Guide (#3590)
* Add docs
* Fix character
* Configuration
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* ajuster
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* inclure
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* doublon
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* remplissage
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* autre
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* pouvoir
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* mappemonde
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* apostrophes
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* virgule
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* fournir
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* apostrophes 2
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* snes9x
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* apostrophes 3
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* options
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* lien
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* de laquelle
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* Étape de génération
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* apostrophes 4
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* également
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* guillemets
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* guillemets 2
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* adresse
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* Connect
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* seed
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* Changer fichier yaml pour de configuration
* Fix capitalization
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Fix capitalization 2
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Fix typo+Add link to fr/en info page
---------
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Spire: Convert options, clean up random calls, and add DeathLink (#3704)
* Convert StS options
* probably a bad idea
* Update worlds/spire/Options.py
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---------
Co-authored-by: Kono Tyran <Kono@koifysh.dev>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Core: fix missing import for `MultiWorld.link_items()` (#3731)
* Pokemon R/B: Removing Floats from NamedRange #3717
* Docs: Missed Full Accessibility mention/conversion #3734
* ChecksFinder: Refactor/Cleaning (#3725)
* Update ChecksFinder
* minor cleanup
* Check for compatible name
* Enable APWorld
* Update setup_en.md
* Update en_ChecksFinder.md
* The client is getting updated instead
* Qwint suggestions, ' -> ", streamline fill_slot_data
* Oops, too many refactors
---------
Co-authored-by: SunCat <suncat.game@ya.ru>
* OSRS: Implement New Game (#1976)
* MMBN3: Press program now has proper color index when received remotely
* Initial commit of OSRS untangled from MMBN3 branch
* Fixes some broken region connections
* Removes some locations
* Rearranges locations to fill in slots left by removed locations
* Adds starting area rando
* Moves Oak and Willow trees to resource regions
* Fixes various PEP8 violations
* Refactor of regions
* Fixes variable capture issue with region rules
* Partial completion of brutal grind logic
* Finishes can_reach_skill function
* Adds skill requirements to location rules, fixes regions rules
* Adds documentation for OSRS
* Removes match statement
* Updates Data Version to test mode to prevent item name caching
* Fixes starting spawn logic for east varrock
* Fixes river lum crossing logic to not assume you can phase across water
* Prevents equipping items when you haven't unlocked them
* Changes canoe logic to not require huge levels
* Skeletoning out some data I'll need for variable task system
* Adds csvs and parser for logic
* Adds Items parsing
* Fixes the spawning logic to not default to Chunksanity when you didn't pick it
* Begins adding generation rules for data-driven logic
* Moves region handling and location creating to different methods
* Adds logic limits to Options
* Begun the location generation has
* Randomly generates tasks for each skill until populated
* Mopping up improper names, adding custom logic, and fixes location rolling
* Drastically cleans up the location rolling loop
* Modifies generation to properly use local variables and pass unit tests
* Game is now generating, but rules don't seem to work
* Lambda capture, my old nemesis. We meet again
* Fixes issue with Corsair Cove item requirement causing logic loop
* Okay one more fix, another variable capture
* On second thought lets not have skull sceptre tasks. 'Tis a silly place
* Removes QP from item pool (they're events not items)
* Removes Stronghold floor tasks, no varbit to track them
* Loads CSV with pkutil so it can be used in apworld
* Fixes logic of skill tasks and adds QP requirements to long grinds
* Fixes pathing in pkgutil call
* Better handling for empty task categories, no longer throws errors
* Fixes order for progressive tasks, removes un-checkable spider task
* Fixes logic issues related to stew and the Blurite caves
* Fixes issues generating causing tests to sporadically fail
* Adds missing task that caused off-by-one error
* Updates to new Options API
* Updates generation to function properly with the Universal Tracker (Thanks Faris)
* Replaces runtime CSV parsing with pre-made python files generated from CSVs
* Switches to self.random and uses random.choice instead of doing it manually
* Fixes to typing, variable names, iterators, and continue conditions
* Replaces Name classes with Enums
* Fixes parse error on region special rules
* Skill requirements check now returns an accessrule instead of being one that checks options
* Updates documentation and setup guide
* Adjusts maximum numbers for combat and general tasks
* Fixes region names so dictionary lookup works for chunksanity
* Update worlds/osrs/docs/en_Old School Runescape.md
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Update worlds/osrs/docs/en_Old School Runescape.md
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Updates readme.md and codeowners doc
* Removes erroneous East Varrock -> Al Kharid connection
* Changes to canoe logic to account for woodcutting level options
* Fixes embarassing typo on 'Edgeville'
* Moves Logic CSVs to separate repository, addresses suggested changes on PR
* Fixes logic error in east/west lumbridge regions. Fixes incorrect List typing in main
* Removes task types with weight 0 from the list of rollable tasks
* Missed another place that the task type had to be removed if 0 weight
* Prevents adding an empty task weight if levels are too restrictive for tasks to be added
* Removes giant blank space in error message
* Adds player name to error for not having enough available tasks
---------
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* TUNIC: Fix missing traversal req #3740
* TUNIC: Sort entrances in the spoiler log (#3733)
* Sort entrances in spoiler log
* Rearrange portal list to closer match the vanilla game order, for better spoiler and because I already did this mod-side
* Add break (thanks vi)
* KH2: Update the docs to support steam in the setup guide (#3711)
* doc updates
* add steam link
* Update worlds/kh2/docs/setup_en.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update setup_en.md
* Forgot to include these
* Consistent styling
* :)
* version 3.3.0
---------
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* RoR2: Remove recursion from explore mode access rules (#3681)
The access rules for "<Environment name> Chest n", "<Environment name>
Shrine n" etc. locations recursively called state.can_reach() for the
n-1 location name, with the n=1 location being the only location to have
the actual access rule set.
This patch removes the recursion, instead setting the actual access rule
directly on each location, increasing the performance of checking
accessibility of n>1 locations.
Risk of Rain 2 was already quite fast to generate despite the recursion
in the access rules, but with this patch, generating a multiworld with
200 copies of the template RoR2 yaml (and progression balancing
disabled through a meta.yaml) goes from about 18s to about 6s for me.
From generating the same seed before and after this patch, the same
result is produced.
* Aquaria: Logic bug fixes (#3679)
* Fixing logic bugs
* Require energy attack in the cathedral and energy form in the body
* King Jelly can be beaten easily with only the Dual Form
* I think that I have a problem with my left and right...
* There is a monster that is blocking the path, soo need attack to pass
* The Li cage is not accessible without the Sunken city boss
* Removing useless space.
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Two more minors logic modification
* Adapting tests to af9b6cd
* Reformat the Region file
---------
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* HK: add grub hunt goal (#3203)
* makes grub hunt goal option that calculates the total available grubs (including item link replacements) and requires all of them to be gathered for goal completion
* update slot data name for grub count
* add option to set number needed for grub hub
* updates to grub hunt goal based on review
* copy/paste fix
* account for 'any' goal and fix overriding non-grub goals
* making sure godhome is in logic for any and removing redundancy on completion condition
* fix typing
* i hate typing
* move to stage_pre_fill
* modify "any" goal so all goals are in logic under minimal settings
* rewrite grub counting to create lookups for grubs and groups that can be reused
* use generator instead of list comprehension
* fix whitespace merging wrong
* minor code cleanup
* DS3: Version 3.0.0 (#3128)
* Update worlds/dark_souls_3/Locations.py
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Fix Covetous Silver Serpent Ring location
* Update location groups
This should cover pretty much all of the seriously hidden items. It
also splits out miniboss drops, mimic drops, and hostile NPC drops.
* Remove the "Guarded by Keys" group
On reflection, I don't think this is actually that useful. It'll also
get a lot muddier once we can randomize shops and ashes become
pseudo-"keys".
* Restore Knight Slayer's Ring classification
* Support infusions/upgrades in the new DS3 mod system
* Support random starting loadouts
* Make an item's NPC status orthogonal to its category
* Track location groups with flags
* Track Archipelago/Offline mismatches on the server
Also fix a few incorrect item names.
* Add additional locations that are now randomizable
* Don't put soul and multiple items in shops
* Add an option to enable whether NG+ items/locations are included
* Clean up useful item categorization
There are so many weapons in the game now, it doesn't make sense to
treat them all as useful
* Add more variety to filler items
* Iron out a few bugs and incompatibilities
* Fix more silly bugs
* Get tests passing
* Update options to cover new item types
Also recategorize some items.
* Verify the default values of `Option`s.
Since `Option.verify()` can handle normalization of option names, this allows options to define defaults which rely on that normalization. For example, it allows a world to exclude certain locations by default.
This also makes it easier to catch errors if a world author accidentally sets an invalid default.
* Make a few more improvements and fixes
* Randomize Path of the Dragon
* Mark items that unlock checks as useful
These items all unlock missable checks, but they're still good to ahve in the game for variety's sake.
* Guarantee more NPC quests are completable
* Fix a syntax error
* Fix rule definition
* Support enemy randomization
* Support online Yhorm randomization
* Remove a completed TODO
* Fix tests
* Fix force_unique
* Add an option to smooth out upgrade item progression
* Add helpers for setting location/entrance rules
* Support smoother soul item progression
* Fill extra smoothing items into conditional locations as well as other worlds
* Add health item smoothing
* Handle infusions at item generation time
* Handle item upgrades at genreation time
* Fix Grave Warden's Ashes
* Don't overwrite old rules
* Randomize items based on spheres instead of DS3 locations
* Add a smoothing option for weapon upgrades
* Add rules for crow trades
* Small fixes
* Fix a few more bugs
* Fix more bugs
* Try to prevent Path of the Dragon from going somewhere it doesn't work
* Add the ability to provide enemy presets
* Various fixes and features
* Bug fixes
* Better Coiled Sword placement
* Structure DarkSouls3Location more like DarkSouls3Item
* Add events to make DS3's spheres more even
* Restructure locations to work like items do now
* Add rules for more missable locations
* Don't add two Storm Rulers
* Place Hawk Ring in Farron Keep
* Mark the Grass Crest Shield as useful
* Mark new progression items
* Fix a bug
* Support newer better Path of the Dragon code
* Don't lock the player out of Coiled Sword
* Don't create events for missable locations
* Don't throw strings
* Don't smooth event items
* Properly categorize Butcher Knife
* Be more careful about placing Yhorm in low-randomization scenarios
* Don't try to smooth DLC items with DLC disabled
* Fix another Yhorm bug
* Fix upgrade/infusion logic
* Remove the PoolType option
This distinction is no longer meaningful now that every location in
the game of each type is randomized
* Categorize HWL: Red Eye Orb as an NPC location
* Don't place Storm Ruler on CA: Coiled Sword
* Define flatten() locally to make this APWorld capable
* Fix some more Leonhard weirdness
* Fix unique item randomization
* Don't double Twin Dragon Greatshield
* Remove debugging print
* Don't add double Storm Ruler
Also remove now-redundant item sorting by category in create_items.
* Don't add double Storm Ruler
Also remove now-redundant item sorting by category in create_items.
* Add a missing dlc_enabled check
* Use nicer options syntax
* Bump data_version
* Mention where Yhorm is in which world
* Better handle excluded events
* Add a newline to Yhorm location
* Better way of handling excluded unradomized progression locations
* Fix a squidge of nondeterminism
* Only smooth items from this world
* Don't smooth progression weapons
* Remove a location that doesn't actually exist in-game
* Classify Power Within as useful
* Clarify location names
* Fix location requirements
* Clean up randomization options
* Properly name Coiled Sword location
* Add an option for configuring how missable items are handled
* Fix some bugs from location name updates
* Fix location guide link
* Fix a couple locations that were busted offline
* Update detailed location descriptions
* Fix some bugs when generating for a multiworld
* Inject Large Leather Shield
* Fix a few location issues
* Don't allow progression_skip_balancing for unnecessary locs
* Update some location info
* Don't uniquify the wrong items
* Fix some more location issues
* More location fixes
* Use hyphens instead of parens for location descriptions
* Update and fix more locations
* Fix Soul of Cinder boss name
* Fix some logic issues
* Add item groups and document item/location groups
* Fix the display name for "Impatient Mimics"
* Properly handle Transposing Kiln and Pyromancer's Flame
* Testing
* Some fixes to NPC quests, late basin, and transposing kiln
* Improve a couple location names
* Split out and improve missable NPC item logic
* Don't allow crow trades to have foreign items
* Fix a variable capture bug
* Make sure early items are accessible early even with early Castle
* Mark ID giant slave drops as missable
* Make sure late basin means that early items aren't behind it
* Make is_location_available explicitly private
* Add an _add_item_rule utility that checks availability
* Clear excluded items if excluded_locations == "unnecessary"
* Don't allow upgrades/infusions in crow trades
* Fix the documentation for deprecated options
* Create events for all excluded locations
This allows `can_reach` logic to work even if the locations are
randomized.
* Fix up Patches' and Siegward's logic based on some manual testing
* Factor out more sub-methods for setting location rules
* Oops, left these in
* Fixing name
* Left that in too
* Changing to NamedRange to support special_range_names
* Alphabetizing
* Don't call _is_location_available on foreign locations
* Add missing Leonhard items
* Changing late basin to have a post-small-doll option
* Update basin option, add logic for some of Leonhard Hawkwood and Orbeck
* Simplifying an option, fixing a copy-paste error
* Removing trailing whitespace
* Changing lost items to go into start inventory
* Revert Basin changes
* Oops
* Update Options.py
* Reverting small doll changes
* Farron Keep boss requirement logic
* Add Scroll for late_dlc
* Fixing excluded unnecessary locations
* Adding Priestess Ring as being after UG boss
* Removing missable from Corvian Titanite Slab
* Adding KFF Yhorm boss locks
* Screams about Creighton
* Elite Knight Set isn't permanently missable
* Adding Kiln requirement to KFF
* fixing valid_keys and item groups
* Fixing an option-checker
* Throwing unplaceable Storm Ruler into start inventory
* Update locations
* Refactor item injection
* Update setup doc
* Small fixes
* Fix another location name
* Fix injection calculation
* Inject guaranteed items along with progression items
* Mark boss souls as required for access to regions
This allows us to set quest requirements for boss souls and have them
automatically propagated to regions, means we need less machinery for
Yhorm bosses, and allows us to get rid of a few region-transition
events.
* Make sure Sirris's quest can be completed before Pontiff
* Removing unused list
* Changing dict to list
* Removing unused test
* Update __init__.py
* self.multiworld.random -> self.random (#9)
* Fix some miscellaneous location issues
* Rewrite the DS3 intro page/FAQ
* Removing modifying the itempool after fill (#7)
Co-authored-by: Natalie Weizenbaum <nweiz@google.com>
* Small fixes to the setup guide (#10)
Small fixes, adding an example for connecting
* Expanded Late Basin of Vows and Late DLC (#6)
* Add proper requirements for CD: Black Eye Orb
* Fix Aldrich's name
* Document the differences with the 2.x.x branch
* Don't crash if there are more items than locations in smoothing
* Apply suggestions from code review
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Code review
* Fix _replace_with_filler
* Don't use the shared flatten function in SM
* Track local items separately rather than iterating the multiworld
* Various formatting/docs changes suggested by PyCharm (#12)
* Drop deprecated options
* Rename "offline randomizer" to "static randomizer" which is clearer
* Move `enable_*_locations` under removed options.
* Avoid excluded locations for locally-filled items
* Adding Removed options to error (#14)
* Changes for WebHost options display and the options overhaul
* unpack iterators in item list (#13)
* Allow worlds to add options to prebuilt groups
Previously, this crashed because `typing.NamedTuple` fields such as
`group.name` aren't assignable. Now it will only fail for group names
that are actually incorrectly cased, and will fail with a better error
message.
* Style changes, rename exclude behavior options, remove guaranteed items option
* Spacing/Formatting (#18)
* Various Fixes (#19)
* Universally Track Yhorm (#20)
* Account for excluded and missable
* These are behaviors now
* This is singular, apparently
* Oops
* Fleshing out the priority process
* Missable Titanite Lizards and excluded locations (#22)
* Small style/efficiency changes
* Final passthrough fixes (#24)
* Use rich option formatting
* Make the behavior option values actual behaviors (#25)
* Use !=
* Remove unused flatten utility
* Some changes from review (#28)
* Fixing determinism and making smooth faster (#29)
* Style change
* PyCharm and Mypy fixes (#26)
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Change yhorm default (#30)
* Add indirect condition (#27)
* Update worlds/dark_souls_3/docs/locations_en.md
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Ship all item IDs to the client
This avoids issues where items might get skipped if, for instance,
they're only in the starting inventory.
* Make sure to send AP IDs for infused/upgraded weapons
* Make `RandomEnemyPresetOption` compatible with ArchipelagoMW/Archipelago#3280 (#31)
* Fix cast
* More typing and small fixes (#32)
---------
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Core: Check parent_region.can_reach first in Location.can_reach (#3724)
* Core: Check parent_region.can_reach first in Location.can_reach
The comment about self.access_rule computing faster on average appears
to no longer be correct with the current caching system for region
accessibility, resulting in self.parent_region.can_reach computing
faster on average.
Generation of template yamls for each game that does not require a rom
to generate, generated with `python -O .\Generate.py --seed 1`
(all durations averaged over at 4 or 5 generations):
Full generation with `spoiler: 1` and no progression balancing:
89.9s -> 72.6s
Only output from above case:
2.6s -> 2.2s
Full generation with `spoiler: 3` and no progression balancing:
769.9s -> 627.1s
Only playthrough calculation + paths from above case:
680.5s -> 555.3s
Full generation with `spoiler: 1` with default progression balancing:
123.5s -> 98.3s
Only progression balancing from above case:
11.3s -> 9.6s
* Update BaseClasses.py
* Update BaseClasses.py
* Update BaseClasses.py
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Core: Speed up CollectionState.copy() using built-in copy methods (#3678)
All the types being copied are built-in types with their own `copy()`
methods, so using the `copy` module was a bit overkill and also slower.
This patch replaces the use of the `copy` module in
`CollectionState.copy()` with using the built-in `.copy()` methods.
The copying of `reachable_regions` and `blocked_connections` was also
iterating the keys of each dictionary and then looking up the value in
the dictionary for that key. It is faster, and I think more readable, to
iterate the dictionary's `.items()` instead.
For me, when generating a multiworld including the template yaml of
every world with `python -O .\Generate.py --skip_output`, this patch
saves about 2.1s. The overall generation duration for these yamls varies
quite a lot, but averages around 160s for me, so on average this patch
reduced overall generation duration (excluding output duration) by
around 1.3%.
Timing comparisons were made by calling time.perf_counter() at the start
and end of `CollectionState.copy()`'s body, and summing the differences
between the starts and ends of the method body into a global variable
that was printed at the end of generation.
Additional timing comparisons were made, using the `timeit` module, of
the individual function calls or dictionary comprehensions used to
perform the copying.
The main performance cost was `copy.deepcopy()`, which gets slow as the
number of keys multiplied by the number of values within the
sets/Counters gets large, e.g., to deepcopy a `dict[int, Counter[str]]`
with 100 keys and where each Counter contains 100 keys was 30x slower
than most other tested copying methods. Increasing the number of dict
keys or Counter keys only makes it slower.
* HK: fix iterating all worlds instead of only HK worlds in stage_pre_fill (#3750)
Would cause generation to fail when generating with HK and another game.
Mistake in 6803c373e5ff.
* DOOM, DOOM II: Update steam URLs (#3746)
* TLOZ: world: multiworld (#3752)
* SoE: fix determinism (#3745)
Fixes randomly placed ingredients not being deterministic (depending on settings)
and in turn also fixes logic not being deterministic if they get replaced by fragments.
* Core: fix invalid __package__ of zipped worlds (#3686)
* fix invalid package fix
* add comment describing fix
* Clique: Update to new options API (#3759)
* Timespinner: Fix eels check logic #3777
* TUNIC: Add note to Universal Tracker stuff #3772
* Core: change start inventory from pool to warn when nothing to remove (#3158)
* makes start inventory from pool warn and fixes the itempool to match when it can not find a matching item to remove
* calc the difference correctly
* save new filler and non-removed items differently so we don't remove existing items at random
* Undertale: Fix slot_data and options.as_dict() (#3774)
* Undertale: Fixing slot_data
* Booleans were difficult
* Core: Error on empty options.as_dict (#3773)
* Error on empty options.as_dict
* ValueError instead
* Apply suggestions from code review
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
---------
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Core: Remove broken unused code from Options.py (#3781)
"Unused" is a baseless assertion, but this code path has been crashing on the first statement for 6 months and noone's complained
* Core: Two Small Fixes (#3782)
* Core: recontextualize `CollectionState.collect` (#3723)
* Core: renamed `CollectionState.collect` arg from `event` to `prevent_sweep` and remove forced collection
* Update TestDungeon.py
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Core: dump all item placements for generation failures. (#3237)
* Core: dump all item placements for generation failures
* pass the multiworld from remaining fill
* change how the args get handled to fix formatting
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Tests: fix the all games multiworld test (#3788)
* TUNIC: Swap from multiworld.get to world.get for applicable things (#3789)
* Swap from multiworld.get to world.get for applicable things
* Why was this even here in the first place?
* I have no idea (#3791)
* TUNIC: Add off and on aliases for the Entrance Rando option #3794
* Stardew Valley: Add Quality Bobber in the logic rules for fish quality gold and above #3792
* Core: Require excluded locations to be reachable with full/locations accessibility (#3802)
* Make excludeds reachable
* Update all_state tests
* Lingo: Fixed Initiated-side Eight Door not opening (#3793)
* TUNIC: Give the fox a gun (in logic) (very small PR) (#3790)
* Add bomb wall logic
* Remove option call from can_shop
* Gun for the envoy blocking Quarry
* has_sword -> can_shop on cube cave entrance region
* TLOZ: Fix non-deterministic item pool generation (#3779)
* TLOZ: Fix non-deterministic item pool generation
The way the item pool was constructed involved iterating unions of sets.
Sets are unordered, so the order of iteration of these combined sets
would be non-deterministic, resulting in the items in the item pool
being generated in a different order with the same seed.
Rather than creating unions of sets at all, the original code has been
replaced with using Counter objects. As a dict subclass, Counter
maintains insertion order, and its update() method makes it simple to
combine the separate item dictionaries into a single dictionary with the
total count of each item across each of the separate item dictionaries.
Fixes #3664 - After investigating more deeply, the only differences I
could find between generations of the same seed was the order of items
created by TLOZ, so this patch appears to fix the non-deterministic
generation issue. I did manage to reproduce the non-deterministic
behaviour with just TLOZ in the end, but it was very rare. I'm not
entirely sure why generating with SMZ3 specifically would cause the
non-deterministic behaviour in TLOZ to be frequently present, whereas
generating with other games or multiple TLOZ yamls would not.
* Change import order
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Docs: Update 'tag' documentation (#3632)
* Add tag docs for HintGame
* Apply suggestions from code review
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Make Tracker/TextOnly consistent with previous commit
* Apply suggestion
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* fix spacing
* Apply suggestion
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* apply suggestion correcting footnotes
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---------
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* [OSRS] Fixes Incorrect filler item names causing failures on tests. (#3768)
* Updates filler item names to match the actual item names
* Adds more descriptive error message in case this error comes back
* Properly raises exception instead of just text
* Replaces exception with assert
* Fix !remaining for cross-world items (#3732)
* Fix !remaining for other worlds
* Typing fixes for the previous change
* Update LocationStore test to match what get_remaining now returns
* Core: early_local != local_early #3780
* Pokemon Emerald: Ensure dig tutor is always usable (#3660)
* Pokemon Emerald: Ensure dig tutor is alw…
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.
Merge Main into branch