upstream merge 22/9 #1891
Merged
upstream merge 22/9 #1891
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
* Sprite&Meta * Marking_Prototype * Locale * Meta_copyright_change * Sprite_Change * New_Sprite * And_another_new_sprite * Change_Locale
* Update dev_map.yml * real mouse returned
* add test for lathe recipes having results * id --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Eoin Mcloughlin <[email protected]>
Joints were created with pivots at object origin, causing unintuitive behaviour when an object was not centered on the origin. Now puts the pivots at the COM. Joint limits were set based on fractions of the union of the AABB of objects, which did not make geometric sense. Now uses the pivot length with an additional [arbitrary] length. Joints were created with a very low spring stiffness, which had a negligible effect most of the time but caused very unintuitive behaviour when the pulled object had a low mass (#28028) - disable the spring limit, and just use the hard min/max limits. Co-authored-by: Eoin Mcloughlin <[email protected]>
oh shit here we go again
Add snakes to vents
* secure command intercom * Update intercom.yml
* clean up clothing lathe recipes * add result *--------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Use Transform instead of TryComp
Initial commit
* Localize RenameCommand and delegate most of the process to MetaDataSystem.SetEntityName() * Make renaming rely on the EntityRenamedEvent. Fix issue where renaming would keep old Examine text Requires engine change * Fix localisation strings * Make PDA search be based on a renamed entity's Uid instead of its old name To do this the pda component now has an PdaOwner field which gets assigned when it is given as a loadout to a player * Fix bad merge??? huh * Use AllEntityQuery
Instead of each mutation being a flag that gets checked at some unique point in BotanySystem somewhere, they're now EntityEffects that get applied when the mutation occurs and when produce is harvested. One new list was added to SeedData so that multiple other fields could be removed. All the non-stat-change mutations that have been rolled are added to the Mutations list, and get applied to the plant when the mutation occurs or when a seed with the mutation is planted. Produce get mutations applied at harvest if they apply to the produce, and carry all of the plant's mutations over as a seed. This gets rid of the one-off checks for things like Slippery, Bioluminescent, Sentient, etc. The base odds of a mutation applying should be equal to the odds of the original mutation check. It pretended to have 1 bit flip (on averge) per mutation power, and odds of each mutation was the odds of one of its bit being flipped (1 /275 * bits). The 'thermometer code' applied for numbers will be replaced with simple random rolls, as both average out to the middle value. The new checks are much easier to understand and don't obfuscate the actual changes of something happening behind 3 layers of math. The biggest player-facing change is that Potency will be able to get over 65 significantly more often than it did in the previous system, but it will be just as common to get low values as high ones. Mutation definitions have been moved to a .yml file. These include the odds per tick per mutagen strength of that mutation applying that tick, the effect applied, if it applies to the plant and/or its produce. This makes mutations simpler to add and edit. This PR is limited specifically to the mutation logic. Improving other aspects of the system will be done in other PRs per the design document. Mutations was chosen first because its got the largest amount of one-off checks scattered all over that could be consolidated. Once this is merged, mutations could be contributed to the codebase with minimal extra work for later botany refactor PRs.
Co-authored-by: deltanedas <@deltanedas:kde.org>
* localize skeleton accent * commit number 2 * remove that from this * this * babushka
* rat kings can butcher things * minor organization * fix * important comma
github-actions
bot
added
S: Needs Review
Changes: YML
|
RSI Diff Bot; head commit 936172c merging into 2a7611e Resources/Textures/Objects/Misc/bureaucracy.rsi
Resources/Textures/DeltaV/Objects/Misc/stamps.rsi
Resources/Textures/Decals/burnt.rsi
Resources/Textures/Mobs/Customization/gauze.rsi
Resources/Textures/Mobs/Pets/corgi.rsi
Resources/Textures/Objects/Devices/encryption_keys.rsi
Resources/Textures/Objects/Fun/toys.rsi
Resources/Textures/Objects/Misc/stamps.rsi
Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi
Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi
Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi
|
added 5 commits
September 22, 2024 03:39
TadJohnson00
approved these changes
Sep 22, 2024
|
RIP commit history; you squashmerged |
deltanedas
added a commit
that referenced
this pull request
Sep 22, 2024
This reverts commit fd398ea.
deltanedas
added a commit
that referenced
this pull request
Sep 22, 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.
Notable additions
Notable exclusions
Changelog
🆑