Unlink **Resource Sharing Tax** and **Disable Unit Sharing** - #4433
Merged
Conversation
Removes automatic enabling and locking of unit sharing and assist construction settings when resource sharing tax is non-zero. Each setting now operates independently. gh beyond-all-reason#4415
keithharvey
changed the title
keithharvey
changed the title
- Remove redundant whitelist and AllowUnitTransfer implementation - Remove unused disable_unit_sharing and unitSharingMode variables - Rely solely on unitPrice unit rules parameter for transfer control - Clean up code to use standardized Spring unit rules parameter system This change simplifies the unit market code by removing redundant unit sharing checks that were previously used alongside the whitelist system. Now the market relies solely on the unitPrice unit rules parameter to handle unit transfers, which is properly checked by game_disable_unit_sharing.lua. This makes the code cleaner and removes potential conflicts between the two gadgets.
sprunk
reviewed
Mar 13, 2025
Co-authored-by: sprunk <spr.ng@o2.pl>
Collaborator
Author
|
@WatchTheFort would it be possible to review #4447 instead? That is a superset of this that and I think would make more sense to release both together. |
Member
If #4447 depends on this PR, then this PR should be reviewed first. |
WatchTheFort
requested changes
Mar 19, 2025
Co-authored-by: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com>
WatchTheFort
requested changes
Mar 24, 2025
WatchTheFort
left a comment
WatchTheFort
left a comment
Member
There was a problem hiding this comment.
Suggested rephrasing to reduce double negatives
Co-authored-by: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com>
Co-authored-by: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com>
WatchTheFort
approved these changes
Mar 24, 2025
8 tasks
mr-maxo-PDG
pushed a commit
to mr-maxo-PDG/Beyond-All-Reason
that referenced
this pull request
Jul 15, 2025
…all-reason#4433) Decouples resource sharing tax from unit sharing restrictions. Previously, setting a non-zero resource sharing tax would automatically enable and lock both "Disable Unit Sharing" and "Disable Assist Ally Construction" settings. This change removes that forced coupling, allowing these settings to be configured independently.
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
4 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.
closes #4415
Description
Decouples resource sharing tax from unit sharing restrictions. Previously, setting a non-zero resource sharing tax would automatically enable and lock both "Disable Unit Sharing" and "Disable Assist Ally Construction" settings. This change removes that forced coupling, allowing these settings to be configured independently.
Changes
Test steps
Before
After
Testers
This PR is contained in this branch and I would probably just test that once and then we can merge both PRs simultaneously.