Stardew Valley: Fix Crimsonfish region #3687
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
agilbert1412
added
is: bug/fix
|
Would son of crimsonfish not require the same changes? |
Excellent catch, fixed it, and added all the legendaries to the test |
|
Test failure is OC2 and unrelated to the PR |
Exempt-Medic
approved these changes
Jul 25, 2024
agilbert1412
added
waiting-on: core-review
|
apparently this has conflicts now. |
Exempt-Medic
added
the
waiting-on: author
* Revert reset protection * Fix reset protection --------- Co-authored-by: alchav <[email protected]>
* sc2: Removing unused dependency in requirements.txt * sc2: Add missing newline in requirements.txt Co-authored-by: Exempt-Medic <[email protected]> --------- Co-authored-by: Exempt-Medic <[email protected]>
) 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.
…goMW#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 <[email protected]> * 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 <[email protected]>
* Core: move item linking out of main * add a test that item link option correctly validates * remove unused fluff --------- Co-authored-by: NewSoupVi <[email protected]>
* 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 ecbf986. * 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
…tions API (ArchipelagoMW#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 bb08c3f. * 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 630a3bd Merge: 8477d3c 5e57920 Author: GodlFire <[email protected]> Date: Mon Apr 1 19:08:48 2024 -0600 Merge pull request #10 from ArchipelagoMW/main Merge main into branch commit 5e57920 Author: Alchav <[email protected]> Date: Mon Apr 1 12:08:21 2024 -0500 LttP: delete playerSettings.yaml (ArchipelagoMW#3062) commit 9aeeeb0 Author: CaitSith2 <[email protected]> Date: Mon Apr 1 06:07:56 2024 -0700 ALttP: Re-mark light/dark world regions after applying plando connections (ArchipelagoMW#2964) commit 3545838 Author: Bryce Wilson <[email protected]> Date: Mon Apr 1 07:07:11 2024 -0600 Pokemon Emerald: Fix wonder trade race condition (ArchipelagoMW#2983) commit 4ac1866 Author: Alchav <[email protected]> Date: Mon Apr 1 08:06:31 2024 -0500 ALTTP: Skull Woods Inverted fix (ArchipelagoMW#2980) commit 4aa03da Author: Fabian Dill <[email protected]> Date: Mon Apr 1 15:06:02 2024 +0200 Factorio: fix attempting to create savegame with not filename safe characters (ArchipelagoMW#2842) commit 24a03bc Author: Silvris <[email protected]> Date: Mon Apr 1 08:02:26 2024 -0500 KDL3: fix shuffled animals not actually being random (ArchipelagoMW#3060) commit f813a70 Author: Aaron Wagener <[email protected]> Date: Sun Mar 31 11:11:10 2024 -0500 The Messenger: update docs formatting and fix outdated info (ArchipelagoMW#3033) * The Messenger: update docs formatting and fix outdated info * address review feedback * 120 chars commit 2a0b7e0 Author: LiquidCat64 <[email protected]> Date: Sun Mar 31 09:55:55 2024 -0600 CV64: A couple of very small docs corrections. (ArchipelagoMW#3057) commit 03d47e4 Author: Ixrec <[email protected]> Date: Sun Mar 31 16:55:08 2024 +0100 A Short Hike: Clarify installation instructions (ArchipelagoMW#3058) * Clarify installation instructions * don't mention 'config' folder since it isn't created until the game starts commit e546c0f Author: Silvris <[email protected]> Date: Sun Mar 31 10:50:31 2024 -0500 Yoshi's Island: add patch suffix (ArchipelagoMW#3061) commit 2ec93ba Author: Bryce Wilson <[email protected]> Date: Sun Mar 31 09:48:59 2024 -0600 Pokemon Emerald: Fix inconsistent location name (ArchipelagoMW#3065) commit 4e3d396 Author: Aaron Wagener <[email protected]> Date: Sun Mar 31 10:47:11 2024 -0500 The Messenger: Fix precollected notes not being removed from the itempool (ArchipelagoMW#3066) * The Messenger: fix precollected notes not being properly removed from pool * The Messenger: bump required client version commit 72c5351 Author: Fabian Dill <[email protected]> Date: Sun Mar 31 03:57:59 2024 +0200 WebHost: fix /check creating broken yaml files if files don't end with a newline (ArchipelagoMW#3063) commit b7ac6a4 Author: Aaron Wagener <[email protected]> Date: Fri Mar 29 20:14:53 2024 -0500 The Messenger: Fix various portal shuffle issues (ArchipelagoMW#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 5f0112e Author: Zach Parks <[email protected]> Date: Fri Mar 29 19:13:51 2024 -0500 Tracker: Add starting inventory to trackers and received items table. (ArchipelagoMW#3051) commit bb48125 Author: Aaron Wagener <[email protected]> Date: Thu Mar 28 21:48:40 2024 -0500 Core: Make fill failure error more human parseable (ArchipelagoMW#3023) commit 301d9de Author: Aaron Wagener <[email protected]> Date: Thu Mar 28 19:31:59 2024 -0500 Docs: adding games rework (ArchipelagoMW#2892) * Docs: complete adding games.md rework * remove all the now unused images * review changes * address medic's review * address more comments commit 9dc7089 Author: Trevor L <[email protected]> Date: Thu Mar 28 18:26:58 2024 -0600 Hylics 2: Fix invalid multiworld data, use `self.random` instead of `self.multiworld.random` (ArchipelagoMW#3001) * Hylics 2: Fixes * Rewrite loop commit 4391d1f Author: Bryce Wilson <[email protected]> Date: Thu Mar 28 18:05:39 2024 -0600 Pokemon Emerald: Fix opponents learning non-randomized TMs (ArchipelagoMW#3025) commit 5d9d4ed Author: black-sliver <[email protected]> Date: Fri Mar 29 01:01:31 2024 +0100 SoE: update to pyevermizer v0.48.0 (ArchipelagoMW#3050) commit c97215e Author: Scipio Wright <[email protected]> Date: Thu Mar 28 17:23:37 2024 -0400 TUNIC: Minor refactor of the vanilla_portals function (ArchipelagoMW#3009) * Remove unused, change an if to an elif * Remove unused import commit eb66886 Author: Alchav <[email protected]> Date: Thu Mar 28 16:23:01 2024 -0500 SC2: Don't Filter Excluded Victory Locations (ArchipelagoMW#3018) commit de86062 Author: Fabian Dill <[email protected]> Date: Thu Mar 28 22:21:56 2024 +0100 Core: differentiate between unknown worlds and broken worlds in error message (ArchipelagoMW#2903) commit 74b2bf5 Author: Bryce Wilson <[email protected]> Date: Thu Mar 28 15:20:55 2024 -0600 Pokemon Emerald: Exclude norman trainer location during norman goal (ArchipelagoMW#3038) commit 74ac66b Author: BadMagic100 <[email protected]> Date: Thu Mar 28 08:49:19 2024 -0700 Hollow Knight: 0.4.5 doc revamp and default options tweaks (ArchipelagoMW#2982) Co-authored-by: Exempt-Medic <[email protected]> commit 80d7ac4 Author: Silvris <[email protected]> Date: Thu Mar 28 09:41:32 2024 -0500 KDL3: RC1 Fixes and Enhancement (ArchipelagoMW#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 7731171 Author: Ziktofel <[email protected]> Date: Thu Mar 28 15:38:34 2024 +0100 SC2: Fix HERC upgrades (ArchipelagoMW#3044) commit cfc1541 Author: NewSoupVi <[email protected]> Date: Thu Mar 28 15:19:32 2024 +0100 Docs: Mention the "last received item index" paradigm in the network protocol docs (ArchipelagoMW#2989) Co-authored-by: Exempt-Medic <[email protected]> commit 4d954af Author: Scipio Wright <[email protected]> Date: Thu Mar 28 10:11:20 2024 -0400 TUNIC: Add link to AP plando guide to connection plando section of game page (ArchipelagoMW#2993) commit 17748a4 Author: Nicholas Saylor <[email protected]> Date: Thu Mar 28 10:00:10 2024 -0400 Launcher, Docs: Update UI and Set-Up Guide to Reference Options (ArchipelagoMW#2950) commit 9182fe5 Author: Entropynines <[email protected]> Date: Thu Mar 28 06:56:35 2024 -0700 README: Remove outdated information about launchers (ArchipelagoMW#2966) Co-authored-by: Exempt-Medic <[email protected]> commit bcf2230 Author: t3hf1gm3nt <[email protected]> Date: Thu Mar 28 09:54:56 2024 -0400 TLOZ: Fix markdown issue with game info page (ArchipelagoMW#2985) commit fa93488 Author: Exempt-Medic <[email protected]> Date: Thu Mar 28 09:46:00 2024 -0400 Docs: Consistent naming for "connection plando" (ArchipelagoMW#2994) commit db15dd4 Author: chandler05 <[email protected]> Date: Thu Mar 28 08:45:19 2024 -0500 A Short Hike: Fix incorrect info in docs (ArchipelagoMW#3016) commit 01cdb0d Author: PoryGone <[email protected]> Date: Thu Mar 28 09:44:23 2024 -0400 SMW: Update World Doc for v2.0 Features (ArchipelagoMW#3034) Co-authored-by: Scipio Wright <[email protected]> commit d0ac2b7 Author: panicbit <[email protected]> Date: Thu Mar 28 10:11:26 2024 +0100 LADX: fix local and non-local instrument placement (ArchipelagoMW#2987) * LADX: fix local and non-local instrument placement * change confusing variable name commit 14f5f01 Author: Jérémie Bolduc <[email protected]> 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 (ArchipelagoMW#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 cf133dd Author: Bryce Wilson <[email protected]> Date: Thu Mar 28 02:32:27 2024 -0600 Pokemon Emerald: Fix typo (ArchipelagoMW#3020) commit ca18121 Author: Jérémie Bolduc <[email protected]> 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 (ArchipelagoMW#2970) commit 1d45125 Author: NewSoupVi <[email protected]> Date: Wed Mar 27 21:09:09 2024 +0100 requirements.txt: _ instead of - to make PyCharm happy (ArchipelagoMW#3043) commit f7b415d Author: agilbert1412 <[email protected]> Date: Tue Mar 26 19:40:58 2024 +0300 Stardew valley: Game version documentation (ArchipelagoMW#2990) Co-authored-by: Exempt-Medic <[email protected]> commit 702f006 Author: LiquidCat64 <[email protected]> Date: Tue Mar 26 07:31:36 2024 -0600 CV64: Change all mentions of "settings" to "options" and fix a broken link (ArchipelagoMW#3015) commit 98ce8f8 Author: Yussur Mustafa Oraji <[email protected]> Date: Tue Mar 26 14:29:25 2024 +0100 sm64ex: New Options API and WebHost fix (ArchipelagoMW#2979) commit ea47b90 Author: Scipio Wright <[email protected]> Date: Tue Mar 26 09:25:41 2024 -0400 TUNIC: You can grapple down here without the ladder, neat (ArchipelagoMW#3019) commit bf38568 Author: agilbert1412 <[email protected]> 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 (ArchipelagoMW#3014) commit c0368ae Author: Phaneros <[email protected]> Date: Sun Mar 24 13:53:20 2024 -0700 SC2: Fixed missing upgrade from custom tracker (ArchipelagoMW#3013) commit 36c8307 Author: Salzkorn <[email protected]> Date: Sun Mar 24 21:52:41 2024 +0100 SC2 Tracker: Fix grouped items pointing at wrong item IDs (ArchipelagoMW#2992) commit 2b24539 Author: Ziktofel <[email protected]> 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 (ArchipelagoMW#2986) commit 7e904a1 Author: Ziktofel <[email protected]> Date: Sun Mar 24 21:51:46 2024 +0100 SC2: Fix Kerrigan presence resolving when deciding which races should be used (ArchipelagoMW#2978) commit bdd498d Author: Alchav <[email protected]> Date: Fri Mar 22 15:36:27 2024 -0500 ALTTP: Fix ArchipelagoMW#2290's crashes (ArchipelagoMW#2973) commit 355223b Author: PinkSwitch <[email protected]> Date: Fri Mar 22 15:35:00 2024 -0500 Yoshi's Island: Implement New Game (ArchipelagoMW#2141) Co-authored-by: Silvris <[email protected]> Co-authored-by: Alchav <[email protected]> Co-authored-by: NewSoupVi <[email protected]> Co-authored-by: Exempt-Medic <[email protected]> commit aaa3472 Author: NewSoupVi <[email protected]> Date: Fri Mar 22 21:30:51 2024 +0100 The Witness: Fix seed bleed issue (ArchipelagoMW#3008) commit 96d93c1 Author: chandler05 <[email protected]> Date: Fri Mar 22 15:30:23 2024 -0500 A Short Hike: Add option to customize filler coin count (ArchipelagoMW#3004) Co-authored-by: Exempt-Medic <[email protected]> commit ca549df Author: Silvris <[email protected]> Date: Fri Mar 22 15:29:24 2024 -0500 CommonClient: fix hint tab overlapping (ArchipelagoMW#2957) Co-authored-by: Remy Jette <[email protected]> commit 44988d4 Author: Star Rauchenberger <[email protected]> Date: Fri Mar 22 15:28:41 2024 -0500 Lingo: Add trap weights option (ArchipelagoMW#2837) commit 11b32f1 Author: Danaël V <[email protected]> Date: Fri Mar 22 12:46:14 2024 -0400 Docs: replacing "setting" to "option" in world docs (ArchipelagoMW#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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: black-sliver <[email protected]> commit 218cd45 Author: Silvris <[email protected]> Date: Fri Mar 22 03:02:38 2024 -0500 APProcedurePatch: fix RLE/COPY incorrect sizing (ArchipelagoMW#3006) * change class variables to instance variables * Update worlds/Files.py Co-authored-by: black-sliver <[email protected]> * Update worlds/Files.py Co-authored-by: black-sliver <[email protected]> * 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 <[email protected]> commit 4196bde Author: Exempt-Medic <[email protected]> Date: Thu Mar 21 16:38:36 2024 -0400 Docs: Fixing special_range_names example (ArchipelagoMW#3005) commit 40f843f Author: Star Rauchenberger <[email protected]> Date: Thu Mar 21 11:00:53 2024 -0500 Lingo: Minor game data fixes (ArchipelagoMW#3003) commit da333fb Author: GodlFire <[email protected]> Date: Thu Mar 21 09:52:16 2024 -0600 Shivers: Adds missing logic rule for skull dial door location (ArchipelagoMW#2997) commit 43084da Author: NewSoupVi <[email protected]> Date: Thu Mar 21 16:51:29 2024 +0100 The Witness: Fix newlines in Witness option tooltips (ArchipelagoMW#2971) commit 1481674 Author: Scipio Wright <[email protected]> Date: Thu Mar 21 11:50:07 2024 -0400 TUNIC: Shuffle Ladders option (ArchipelagoMW#2919) commit 30a0aa2 Author: Star Rauchenberger <[email protected]> Date: Thu Mar 21 10:46:53 2024 -0500 Lingo: Add item/location groups (ArchipelagoMW#2789) commit f4b7c28 Author: Silvris <[email protected]> Date: Wed Mar 20 17:45:32 2024 -0500 APProcedurePatch: hotfix changing class variables to instance variables (ArchipelagoMW#2996) * change class variables to instance variables * Update worlds/Files.py Co-authored-by: black-sliver <[email protected]> * Update worlds/Files.py Co-authored-by: black-sliver <[email protected]> * 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 <[email protected]> commit 12864f7 Author: chandler05 <[email protected]> Date: Wed Mar 20 22:44:09 2024 +0100 A Short Hike: Implement New Game (ArchipelagoMW#2577) commit db02e9d Author: LiquidCat64 <[email protected]> Date: Wed Mar 20 15:03:25 2024 -0600 Castlevania 64: Implement New Game (ArchipelagoMW#2472) commit 3231577 Author: Jérémie Bolduc <[email protected]> Date: Wed Mar 20 16:57:45 2024 -0400 Stardew Valley: Fix extended family legendary fishes being locations with fishsanity set to exclude legendary (ArchipelagoMW#2967) commit e9620be Author: Magnemania <[email protected]> Date: Wed Mar 20 16:56:00 2024 -0400 SM64: Goal Logic and Hint Bugfixes (ArchipelagoMW#2886) commit 183ca35 Author: qwint <[email protected]> Date: Wed Mar 20 08:39:37 2024 -0500 CommonClient: Port Casting Bug (ArchipelagoMW#2975) commit fcaaa19 Author: TheLX5 <[email protected]> Date: Wed Mar 20 05:56:19 2024 -0700 SMW: Fixes for Bowser being defeatable on Egg Hunt and CI2 DC room access (ArchipelagoMW#2981) commit 8f7b63a Author: TheLX5 <[email protected]> Date: Wed Mar 20 05:56:04 2024 -0700 SMW: Blocksanity logic fixes (ArchipelagoMW#2988) commit 6f64bb9 Author: Scipio Wright <[email protected]> Date: Wed Mar 20 08:46:31 2024 -0400 Noita: Remove newline from option description so it doesn't look bad on webhost (ArchipelagoMW#2969) commit d0a9d0e Author: Bryce Wilson <[email protected]> Date: Wed Mar 20 06:43:13 2024 -0600 Pokemon Emerald: Bump required client version (ArchipelagoMW#2963) commit 94650a0 Author: Silvris <[email protected]> Date: Tue Mar 19 17:08:29 2024 -0500 Core: implement APProcedurePatch and APTokenMixin (ArchipelagoMW#2536) * initial work on procedure patch * more flexibility load default procedure for version 5 patches add args for procedure add default extension for tokens and bsdiff allow specifying additional required extensions for generation * pushing current changes to go fix tloz bug * move tokens into a separate inheritable class * forgot the commit to remove token from ProcedurePatch * further cleaning from bad commit * start on docstrings * further work on docstrings and typing * improve docstrings * fix incorrect docstring * cleanup * clean defaults and docstring * define interface that has only the bare minimum required for `Patch.create_rom_file` * change to dictionary.get * remove unnecessary if statement * update to explicitly check for procedure, restore compatible version and manual override * Update Files.py * remove struct uses * ensure returning bytes, add token type checking * Apply suggestions from code review Co-authored-by: Doug Hoskisson <[email protected]> * pep8 --------- Co-authored-by: beauxq <[email protected]> Co-authored-by: Doug Hoskisson <[email protected]> * 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 ArchipelagoMW#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 <[email protected]> Co-authored-by: Exempt-Medic <[email protected]>
…ArchipelagoMW#3720) * Update Rules.py * Update Rules.py
* 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 <[email protected]>
…hipelagoMW#3590) * Add docs * Fix character * Configuration Co-authored-by: Jérémie Bolduc <[email protected]> * ajuster Co-authored-by: Jérémie Bolduc <[email protected]> * inclure Co-authored-by: Jérémie Bolduc <[email protected]> * doublon Co-authored-by: Jérémie Bolduc <[email protected]> * remplissage Co-authored-by: Jérémie Bolduc <[email protected]> * autre Co-authored-by: Jérémie Bolduc <[email protected]> * pouvoir Co-authored-by: Jérémie Bolduc <[email protected]> * mappemonde Co-authored-by: Jérémie Bolduc <[email protected]> * apostrophes Co-authored-by: Jérémie Bolduc <[email protected]> * virgule Co-authored-by: Jérémie Bolduc <[email protected]> * fournir Co-authored-by: Jérémie Bolduc <[email protected]> * apostrophes 2 Co-authored-by: Jérémie Bolduc <[email protected]> * snes9x Co-authored-by: Jérémie Bolduc <[email protected]> * apostrophes 3 Co-authored-by: Jérémie Bolduc <[email protected]> * options Co-authored-by: Jérémie Bolduc <[email protected]> * lien Co-authored-by: Jérémie Bolduc <[email protected]> * de laquelle Co-authored-by: Jérémie Bolduc <[email protected]> * Étape de génération Co-authored-by: Jérémie Bolduc <[email protected]> * apostrophes 4 Co-authored-by: Jérémie Bolduc <[email protected]> * également Co-authored-by: Jérémie Bolduc <[email protected]> * guillemets Co-authored-by: Jérémie Bolduc <[email protected]> * guillemets 2 Co-authored-by: Jérémie Bolduc <[email protected]> * adresse Co-authored-by: Jérémie Bolduc <[email protected]> * Connect Co-authored-by: Jérémie Bolduc <[email protected]> * seed Co-authored-by: Jérémie Bolduc <[email protected]> * Changer fichier yaml pour de configuration * Fix capitalization Co-authored-by: Nicholas Saylor <[email protected]> * Fix capitalization 2 Co-authored-by: Nicholas Saylor <[email protected]> * Fix typo+Add link to fr/en info page --------- Co-authored-by: Jérémie Bolduc <[email protected]> Co-authored-by: Nicholas Saylor <[email protected]>
…hipelagoMW#3704) * Convert StS options * probably a bad idea * Update worlds/spire/Options.py Co-authored-by: Scipio Wright <[email protected]> --------- Co-authored-by: Kono Tyran <[email protected]> Co-authored-by: Scipio Wright <[email protected]>
* initial (broken) commit * small work on init * Update Items.py * beginning work, some rom patches * commit progress from bh branch * deathlink, fix soft-reset kill, e-tank loss * begin work on targeting new bhclient * write font * definitely didn't forget to add the other two hashes no * update to modern options, begin colors * fix 6th letter bug * palette shuffle + logic rewrite * fix a bunch of pointers * fix color changes, deathlink, and add wily 5 req * adjust weapon weakness generation * Update Rules.py * attempt wily 5 softlock fix * add explicit test for rbm weaknesses * fix difficulty and hard reset * fix connect deathlink and off by one item color * fix atomic fire again * de-jank deathlink * rewrite wily5 rule * fix rare solo-gen fill issue, hopefully * Update Client.py * fix wily 5 requirements * undo fill hook * fix picopico-kun rules * for real this time * update minimum damage requirement * begin move to procedure patch * finish move to APPP, allow rando boobeam, color updates * fix color bug, UT support? * what do you mean I forgot the procedure * fix UT? * plando weakness and fixes * sfx when item received, more time stopper edge cases * Update test_weakness.py * fix rules and color bug * fix color bug, support reduced flashing * major world overhaul * Update Locations.py * fix first found bugs * mypy cleanup * headerless roms * Update Rom.py * further cleanup * work on energylink * el fixes * update to energylink 2.0 packet * energylink balancing * potentially break other clients, more balancing * Update Items.py * remove startup change from basepatch we write that in patch, since we also need to clean the area before applying * el balancing and feedback * hopefully less test failures? * implement world version check * add weapon/health option * Update Rom.py * x/x2 * specials * Update Color.py * Update Options.py * finally apply location groups * bump minor version number instead * fix duplicate stage sends * validate wily 5, tests * see if renaming fixes * add shuffled weakness * remove passwords * refresh rbm select, fix wily 5 validation * forgot we can't check 0 * oops I broke the basepatch (remove failing test later) * fix solo gen fill error? * fix webhost patch recognition * fix imports, basepatch * move to flexibility metric for boss validation * special case boobeam trap * block strobe on stage select init * more energylink balancing * bump world version * wily HP inaccurate in validation * fix validation edge case * save last completed wily to data storage * mypy and pep8 cleanup * fix file browse validation * fix test failure, add enemy weakness * remove test seed * update enemy damage * inno setup * Update en_Mega Man 2.md * setup guide * Update en_Mega Man 2.md * finish plando weakness section * starting rbm edge case * remove * imports * properly wrap later weakness additions in regen playthrough * fix import * forgot readme * remove time stopper special casing since we moved to proper wily 5 validation, this special casing is no longer important * properly type added locations * Update CODEOWNERS * add animation reduction * deprioritize Time Stopper in rush checks * special case wily phase 1 * fix key error * forgot the test * music and general cleanup * the great rename * fix import * thanks pycharm * reorder palette shuffle * account for alien on shuffled weakness * apply suggestions * fix seedbleed * fix invalid buster passthrough * fix weakness landing beneath required amount * fix failsafe * finish music * fix Time Stopper on Flash/Alien * asar pls * Apply suggestions from code review Co-authored-by: Exempt-Medic <[email protected]> * world helpers * init cleanup * apostrophes * clearer wording * mypy and cleanup * options doc cleanup * Update rom.py * rules cleanup * Update __init__.py * Update __init__.py * move to defaultdict * cleanup world helpers * Update __init__.py * remove unnecessary line from fill hook * forgot the other one * apply code review * remove collect * Update rules.py * forgot another --------- Co-authored-by: Exempt-Medic <[email protected]>
* Blasphemous: WIP overhaul * Entrance rule mistake * stuff * Getting closer * Real?? Maybe?? * Don't fail me now 🙏 * Add starting location tests * More tests (it still doesn't work actually 😔) * REAL * Add unreachable regions to test_reachability.py * PR ready - Remove unused functions from init - Use group exclusive functions in rules - Style changes * Bump required client version * Clean up unused imports * Change slot data * Review fixes - Prevent strength calculations from including excess items - Add new lines to ends of files - Fix missed deprecated option and random usage in init * Update option docstrings, add groups * Add preprocessor files * Update option docstrings again actually * Update player strength calculation * Rename group methods * Fix missing logic for RESCUED_CHERUB_06 * Register indirect conditions * Register indirect conditions (part 2) * Update extracted logic, change slot data key * Add region to excluded list * A capital letter * Use camelCase keys in preprocessor * Write some of new setup guide * Remove indents before list points * Change locationinfo to list of dictonaries * Finish docs, update extractor config and data * Mark region_data.py as generated * Suggested changes * More suggested changes * Suggested changes again - Use OptionError - Create list of disabled locations before looping - Check if options are equal to str instead of int - Clean up start location override - Reword some of setup guide - Organize location list - Remove unnecessary escaped quotes from option docstrings - Add world type to test base * C# moment * Requested changes * Update .gitattributes --------- Co-authored-by: NewSoupVi <[email protected]>
* fix time stopper rule * that was the entirely wrong rule actually
* Add the yacht dice (from other git) world to the yacht dice fork * Update .gitignore * Removed zillion because it doesn't work * Update .gitignore * added zillion again... * Now you can have 0 extra fragments * Added alt categories, also options * Added item categories * Extra categories are now working! 🐶 * changed options and added exceptions * Testing if I change the generate.py * Revert "Testing if I change the generate.py" This reverts commit 7c2b3df. * ignore gitignore * Delete .gitignore * Update .gitignore * Update .gitignore * Update logic, added multiplicative categories * Changed difficulties * Update offline mode so that it works again * Adjusted difficulty * New version of the apworld, with 1000 as final score, always Will still need to check difficulty and weights of adding items. Website is not ready yet, so this version is not usable yet :) * Changed yaml and small bug fixes Fix when goal and max are same Options: changed chance to weight * no changes, just whitespaces * changed how logic works Now you put an array of mults and the cpu gets a couple of tries * Changed logic, tweaked a bit too * Preparation for 2.0 * logic tweak * Logic for alt categories properly now * Update setup_en.md * Update en_YachtDice.md * Improve performance of add_distributions * Formatting style * restore gitignore to APMW * Tweaked generation parameters and methods * Version 2.0.3 manual input option max score in logic always 2.0.3 faster gen * Comments and editing * Renamed setup guide * Improved create_items code * init of locations: remove self.event line * Moved setting early items to generate_early * Add my name to CODEOWNERS * Added Yacht Dice to the readme in list of games * Improve performance of Yacht Dice * newline * Improve typing * This is actually just slower lol * Update worlds/yachtdice/Items.py Co-authored-by: Exempt-Medic <[email protected]> * Apply suggestions from code review Co-authored-by: Exempt-Medic <[email protected]> * Update Options.py * Styling * finished text whichstory option * removed roll and rollfragments; not used * import; worlds not world :) * Option groups! * ruff styling, fix * ruff format styling! * styling and capitalization of options * small comment * Cleaned up the "state_is_a_list" a little bit * RUFF 🐶 * Changed filling the itempool for efficiency Now, we start with 17 extra items in the item pool, it's quite likely you need at least 17 items (~80%?). And then afterwards, we delete items if we overshoot the target of 1000, and add items if we haven't reached an achievable score of 1000 yet. Also, no need to recompute the entire logic when adding points. * 🐶 * Removed plando "fix" * Changed indent of score multiplier * faster location function * Comments to docstrings * fixed making location closest to goal_score be goal_score * options format * iterate keys and values of a dict together * small optimization ListState * faster collection of categories * return arguments instead of making a list (will 🐶 later) * Instead of turning it into a tuple, you can just make a tuple literal * remove .keys() * change .random and used enumerate * some readability improvements * Remove location "0", we don't use that one * Remove lookup_id_to_name entirely I for sure don't use it, and as far as I know it's not one of the mandatory functions for AP, these are item_name_to_id and location_name_to_id. * .append instead of += for single items, percentile function changed Also an extra comment for location ids. * remove ) too many * Removed sorted from category list * Hash categories (which makes it slower :( ) Maybe I messed up or misunderstood... I'll revert this right away since it is 2x slower, probably because of sorted instead of sort? * Revert "Hash categories (which makes it slower :( )" This reverts commit 34f2c1a. * temporary push: 40% faster generation test Small changes in logic make the generation 40% faster. I'll have to think about how big the changes are. I suspect they are rather limited. If this is the way to go, I'll remove the temp file and redo the YachtWeights file, I'll remove the functions there and just put the new weights here. * Add Points item category * Reverse changes of bad idea :) * ruff 🐶 * Use numpy and pmf function to speed up gen Numpy has a built-in way to sum probability mass functions (pmf). This shaves of 60% of the generation time :D * Revert "Use numpy and pmf function to speed up gen" This reverts commit 9290191. * Step inbetween to change the weights * Changed the weights to make it faster 135 -> 81 seconds on 100 random yamls * Adjusted max_dist, split dice_simulation function * Removed nonlocal and pass arguments instead * Change "weight-lists" to Dict[str, float] * Removed the return from ini_locations. Also added explanations to cat_weights * Choice options; dont'use .value (will ruff later) * Only put important options in slotdata * 🐶 * Add Dict import * Split the cache per player, limit size to 400. * 🐶 * added , because of style * Update apworld version to 2.0.6 2.0.5 is the apworld I released on github to be tested I never separately released 2.0.4. * Multiple smaller code improvements - changed names in YachtWeights so we don't need to translate them in Rules anymore - we now remember which categories are present in the game, and also put this in slotdata. This we do because only one of two categories is present in a game. If for some reason both are present (plando/getitem/startinventory), we now know which category to ignore - * 🐶 ruff * Mostly minimize_extra_items improvements - Change logic, generation is now even faster (0.6s per default yaml). - Made the option 'minimize_extra_items' do a lot more, hopefully this makes the impact of Yacht Dice a little bit less, if you want that. Here's what is also does now: - you start with 2 dice and 2 rolls - there will be less locations/items at the start of you game * ruff 🐶 * Removed printing options * Reworded some option descriptions --------- Co-authored-by: NewSoupVi <[email protected]> Co-authored-by: Exempt-Medic <[email protected]>
On the installation page, link to the latest release, instead of the page with all releases
* Tweak ALTTP Adjuster padding/size to accommodate resizing
- Set minsize so the actions buttons on bottom are always visible.
- Added a minor amount of padding around the top level objects.
- Increased the size of the entry fields for roms to match general
button size.
- Updated layout calls so vertical spacing doesn't increase
between fields when maximizing the window
- Added a little bit of spacing on the rom label so it more closely
lines up with the other rom selection field
* Tweak ALTTP Adjuster padding/size to accommodate resizing
- Set minsize so the actions buttons on bottom are always visible.
- Added a minor amount of padding around the top level objects.
- Increased the size of the entry fields for roms to match general
button size.
- Updated layout calls so vertical spacing doesn't increase
between fields when maximizing the window
- Added a little bit of spacing on the rom label so it more closely
lines up with the other rom selection field
When triforce_pieces_mode is set to "extra", the number of Triforce pieces in the pool should be equal to the number required plus the number extra. The number available was being used in this calculation, instead of the number required.
* excluded panels should not be picked by panel hunt * ban excluded panels from panel hunt * Get rid of an unused variable
…rchipelagoMW#3571) * Rename sweep_for_events to sweep_for_advancements * more event->advancement renames * oops accidentally deleted the deprecation thing in the force push * Update TestDungeon.py * Update BaseClasses.py * Update BaseClasses.py * oops * utils.deprecate * treble, you had no idea how right you were * Update test_panel_hunt.py * Update BaseClasses.py Co-authored-by: Fabian Dill <[email protected]> --------- Co-authored-by: Fabian Dill <[email protected]>
* Core: some typing and cleaning in `BaseClasses.py` * more backwards `__repr__` * double-quote string * remove some end-of-line whitespace
* Town Pet the Dog * Add shuffle dog to options presets * I cri evritim * I guess it's as good a time as any * :( * fix the soft conflict * add all the shuffle dog options to some of the unit tests bc why not * Laser Panels are just 'General' now, I'm pretty sure * Could I really call it allsanity?
* lint * player_name * oops lmao * shorten
…ld for a game in main (ArchipelagoMW#3607)
…wValley/FixCrimsonfishRegion
|
I have clearly messed up something with git trying to fix the conflict.... But I think it's fixed now. Not sure what to do about the 700 commits and authors that are now in the history of the PR, but they aren't in the files changed at least... |
agilbert1412
removed request for
Berserker66,
ThePhar,
NewSoupVi and
black-sliver
agilbert1412
removed
affects: core
Berserker66
approved these changes
Aug 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this fixing or adding?
This has apparently been overlooked ever since 3.x.x (update that added fishsanity). Not sure how nobody noticed it until now lol.
The crimsonfish must be caught from the east pier on the beach (the region is called "Tide Pools), which requires the bridge repair to reach. It was in the "Beach" region instead.
How was this tested?
I added a test for the fish that are behind a "not-always-reachable" region, including the crimsonfish, and saw it failing, before simply moving the fish to the correct region.
Ran the other tests too of course