Skip to content

Merge Main (Aug 12)#4

Merged
benny-dreamly merged 189 commits intosims4-devfrom
main
Aug 12, 2025
Merged

Merge Main (Aug 12)#4
benny-dreamly merged 189 commits intosims4-devfrom
main

Conversation

@benny-dreamly
Copy link
Member

merge main for multiple reasons just to sync the branch

NewSoupVi and others added 30 commits May 23, 2025 23:47
…c" (ArchipelagoMW#3915)

* Fix playthrough

* oops

* oops 2

* I don't like this

* that should do it

* Update BaseClasses.py

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

* Update BaseClasses.py

---------

Co-authored-by: Doug Hoskisson <[email protected]>
…ndlers (ArchipelagoMW#4888)

* calc relevant components before opening the launcher app so it can be skipped for text client only uri launches

* generically passthrough the url arg

* Apply suggestions from code review

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

* flip if not else

* Update Launcher.py

* pluralize

---------

Co-authored-by: Aaron Wagener <[email protected]>
* The Messenger: more generous portal validation

* remove the while and just go for 20 attempts. hopefully that's enough
…bit (ArchipelagoMW#4782)

* refactor filler item creation for Raft, implement get_filler_item_name

* wrong indent

* Update worlds/raft/__init__.py

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

---------

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

* Add the shimmy modifier hack.

* Update the Increase Shimmy Speed option description.

---------

Co-authored-by: Exempt-Medic <[email protected]>
* Add descriptions to components

* Adhere to style guide

* Tweak BHC wording

* Trim Open Patch description

* Update text client description for consistency

Co-authored-by: Scipio Wright <[email protected]>

* Remove newlines

---------

Co-authored-by: Scipio Wright <[email protected]>
* Update OOT Guides

* Minor update per review
- Cleans up a few missed references in the setup guide.
- Refactors Options class to use metaclass and decorators to enforce friendly limits on multiple levels.    
  - Templates generated from the website, even ones with `random` should not fail generation because the website will only allow values inside the friendly limits. 
  - _Uploaded_ yamls to the website with `random`, should also now respect friendly limits without the need for `random-range` shenanigans.
  - _Uploaded_ yamls to the website, or yamls that are used to generate locally, that have hard-defined values outside the friendly limits, will be clamped/dragged/massaged into those limits (with logged warnings).
- Removed an early completion goal that was playing havoc with fill. Not enough people seem to use this goal, so its loss will not be mourned.
ArchipelagoMW#5058)

* move to playercontainer

* moves patch_file_ending handling to APPlayerContainer and updates the worlds using it to define their extensions

* give oot a patch_file_ending as well
The `Behind Rocks` and `Pickaxe Hard Cave` Entrances require being able
to reach the `Cut Content` region, but no indirect conditions were being
registered for this region.

The `set_lfod_self_obtained_items_rules` function was also using a
`world` parameter that was actually expecting a `MultiWorld` instance,
so I have renamed it for clarity and updated the function to use
`world.get_entrance()` rather than `multiworld.get_entrance()`.

Much of the rest of the file passes `MultiWorld` instances to `world`
parameters, but fixing all of these is out of the scope of the changes
in this patch, so has not been included.
A couple of Entrance access rules were checking for being able to reach
a Location, but a Location first checks for being able to reach its
parent Region, so it needs to be registered that access to that parent
Region can give access to the Entrance.
The client does not depend on Animation Frame anymore, so it can be backgrounded.
duckboycool and others added 28 commits July 31, 2025 22:33
* Remove redundant version checks/compatibility

* Change windows7 check

* Edit comments

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

---------

Co-authored-by: black-sliver <[email protected]>
…W#5276)

---------

Co-authored-by: Aaron Wagener <[email protected]>
Co-authored-by: qwint <[email protected]>
Co-authored-by: black-sliver <[email protected]>
* convert ladxr section to markdown, other adjustments
make links clickable
crow icon -> open tracker
adjust for removed sprite sheets
some adjustments in ladxr section for differences in the ap version:
we don't have a casual logic
we don't have stealing options

* fix link, and another correction
…5297)

* Make `use_cache` optional

* Pass all kwargs
- Update Dockerfile to specify "setuptools<81"
- Modify ModuleUpdate.py to install setuptools with version constraint
)

note: i swear the issue was an importerror but i could only get attributeerrors on the getattr() call, maybe we want to check for both?
* WebHost: redirect old tutorials to new URL

* WebHost: make comment in tutorial_redirect more accurate
@benny-dreamly benny-dreamly merged commit b6b11eb into sims4-dev Aug 12, 2025
20 of 28 checks passed
benny-dreamly pushed a commit that referenced this pull request Oct 22, 2025
* Cleaning up (#4)

Cleanup

* Added new paragraph for new games

* Update worlds/generic/docs/setup_en.md

Proofier-comitting

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

* Added a mention in the header of the games page to refer to this guide if needed.

* Small tweaks

* Added mention regarding alternate version of worlds

* Update WebHostLib/templates/supportedGames.html

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

* Update worlds/generic/docs/setup_en.md

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

* Edits for comments

* Slight alternate versions rewording

* Edit subheadings

* Adjust link text

* Replace alternate versions section and reword first

---------

Co-authored-by: Danaël V <[email protected]>
Co-authored-by: Rever <[email protected]>
Co-authored-by: Exempt-Medic <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.