Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename fields on Repairable traits #16266

Merged
merged 1 commit into from Mar 10, 2019

Conversation

@reaperrr
Copy link
Contributor

commented Mar 4, 2019

To bring them in line with Rearmable.RearmActors, Repairable.RepairBuildings and RepairableNear.Buildings have been renamed to *.RepairActors.
Additionally, their RA/C&C-specific internal defaults were removed and the FieldLoader now requires them to be set explicitly.

Split from future merge of RepairableNear into Repairable.

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Mar 4, 2019

This is also a (no matter how small) step towards completing my resupply refactor, which I absolutely want to finally get done and merged during the upcoming cycle, so the earlier a simple PR like this gets merged, the better.

@reaperrr reaperrr added this to the Next + 1 milestone Mar 4, 2019

@pchote pchote added the PR: Needs +2 label Mar 4, 2019

@reaperrr reaperrr force-pushed the reaperrr:RepairActors-field branch from 822ef75 to dfe4104 Mar 5, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Mar 5, 2019

Updated.

@pchote

This comment has been minimized.

Copy link
Member

commented Mar 9, 2019

My 👍 still stands, but needs a rebase now.

Rename fields on Repairable traits
To bring them in line with RearmActors,
Repairable.RepairBuildings and
RepairableNear.Buildings have been renamed
to RepairActors.
Additionally, their RA-specific internal
defaults were removed and the FieldLoader
now requires them to be set explicitly.

@reaperrr reaperrr force-pushed the reaperrr:RepairActors-field branch from dfe4104 to ff4b518 Mar 9, 2019

@reaperrr reaperrr removed the PR: Rebase me! label Mar 9, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Mar 9, 2019

Rebased.

@obrakmann obrakmann merged commit 5ec47b4 into OpenRA:bleed Mar 10, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@obrakmann

This comment has been minimized.

Copy link
Contributor

commented Mar 10, 2019

@reaperrr reaperrr deleted the reaperrr:RepairActors-field branch Apr 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.