Sims4 dev - #30
Merged
Merged
Conversation
…s again) (ArchipelagoMW#5573) From Discord: Well, flask-compress updated and now our 3.11 CI is failing Why? They switched to a lib called backports.zstd And 3.11 pkg_resources can't handle that. pip finds it. But in our ModuleUpdate.py, we first pkg_resources.require packages, and this fails. I can't reproduce this locally yet, but in CI, it seems like even though backports.zstd is installed, it still fails on it and prompts installing it over and over in every unit test Now what do we do :KEKW: Black Sliver suggested pinning flask-compress for 3.11 But I would just like to point out that this means we can't unpin it until we drop 3.11 the real thing is we probably need to move away from pkg_resources? lol since it's been deprecated literally since the oldest version we support
…nit tests so we can test that (ArchipelagoMW#5541) * Fix webhost argparse with extra args * accidentally added line * WebHost: fix some typing B64 url conversion is used in test/hosting, so it felt appropriate to include this here. * Test: Hosting: also test autogen * Test: Hosting: simplify stop_* and leave a note about Windows compat * Test: Hosting: fix formatting error * Test: Hosting: add limitted Windows support There are actually some differences with MP on Windows that make it impossible to run this in CI. --------- Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Fix likely unintended concatenations * Yeah that makes sense why I thought there were more here
* Test: check game in world manifest * Update test/general/test_world_manifest.py Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com> * Test: rework finding expected manifest location * Test: fix doc comment * Test: fix wrong custom_worlds path in test_world_manifest Also simplifies the way we find ./worlds/. * Test: make test_world_manifest easier to extend * Test: check world_version in world manifest according to docs/apworld specification.md * Test: check no container version in source world manifest according what was added to docs/apworld specification.md in PR 5509 * Test: better assertion messages in test_world_manifest.py * Test: fix wording in world source manifest --------- Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com>
# Conflicts: # .github/workflows/release.yml # docs/apworld specification.md # setup.py # worlds/Files.py # worlds/LauncherComponents.py # worlds/__init__.py
merge main (again)
* implement StealingInLogic option * fix ladxr setting * adjust docs * option to disable stealing * indicate disabled stealing with shopkeeper dialog * merge upstream/main * Revert "merge upstream/main" This reverts commit c91d2d6. * fix * stealing in patch * logic reorder and fix sword to front for readability, but also can_farm condition was missing
…es with non ASCII characters (ArchipelagoMW#5584) * Fix Slot 2 Level Checks description * Fix encoding issue
Could have a really bad timeout if it goes through default route and packet is dropped.
... and update it to latest. This is being used in WebHostLib.options directly. A recent change bumped our required version, so this is actually a fix.
* Add a ruff.toml to the root directory * spell out C901 * Add target version * Add some more of the suggested rules * ignore PLC0415 * TC is bad * ignore B0011 * ignore N818 * Ignore some more rules * Add PLC1802 to ignore list * Update ruff.toml Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> * oops * R to RET and RSC * oops * Py311 * Update ruff.toml --------- Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
…MW#5588) * kvui: Fix audio on Linux * Update kvui.py
Beware: this has a bug, but it does not impact our CI.
…goMW#5576) * Multiple: resize FR RA network commands screenshot This is now more in line with the text (and the english version). * Multiple: optimize EN RA network commands screenshot The URL has changed, so it's a good time to optimize. * WebHost, Worlds: fix retroarch images not showing Implements a src/url replacement for relative paths. Moves the RA screenshots to worlds/generic since they are shared. Also now uses the FR version in ffmq. Also fixes the formatting that resultet in the list breaking. Also moves imports in render_markdown. Guides now also properly render on Github. * Factorio: optimize screenshots The URL has changed, so it's a good time to optimize. * Factorio: change guide screenshots to use relative URL * Test: markdown: fix tests on Windows We also can't use delete=True, delete_on_close=False because that's not supported in Py3.11. * Test: markdown: fix typo I hope that's it now. *sigh* * Landstalker: fix doc images not showing Change to relative img urls. * Landstalker: optimize doc PNGs The URL has changed, so it's a good time to optimize.
…pelagoMW#5590) * WebHost: Pin Flask-Compress to 1.18 for all versions of Python * oop
This fixes the problem of CI randomly breaking when upstream pushes updates and allows better reproducibility of builds.
…#5476) - Include flag and notice regarding asset rights in example config
…s field (ArchipelagoMW#5377) * update docs NetworkVersion * added in non-common-client version clarification * Update docs/network protocol.md Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com> --------- Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com>
* Fix editorial issues from Setup Guides * Fix editorial issues in documentations * Fix extra typos in documentations
Also move ci requirements to separate file for easier handling.
Co-authored-by: Katelyn Gigante <clockwork.singularity@gmail.com>
Sims 4: Rules Refactor Part 1
* Improve the docs * Added an example * fix styling/typo * Update setup instructions for Mods folder path Clarify instructions for setting the Mods folder path and specify the operating system in the example. --------- Co-authored-by: Benny D <78334662+benny-dreamly@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
#22) * Fix crash when launching directly client from command line * Add an additional check that /set_path was given an absolute path * Update worlds/sims4/Client.py Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
…t presumably got banned)
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. 🗂️ Base branches to auto review (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Please format your title with what portion of the project this pull request is
targeting and what it's changing.
ex. "MyGame4: implement new game" or "Docs: add new guide for customizing MyGame3"
What is this fixing or adding?
How was this tested?
If this makes graphical changes, please attach screenshots.