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

Refactor SupplyTruck/AcceptsSupplies to *Cash traits #13000

Merged
merged 2 commits into from Apr 18, 2017

Conversation

Projects
None yet
6 participants
@reaperrr
Contributor

reaperrr commented Mar 19, 2017

It's only used by our RA mod and no more likely to be used by any 3rd-party mod than any other RA-specific logic (less likely, in my opinion), so I think it can be moved to Mods.Cnc.

Renamed to more generic DeliversCash/AcceptsDeliveredCash and added Type/Stance tags instead.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Mar 19, 2017

Member

Actually, i'm using Supply Truck logic on the D2K map i was working on which is currently on bleed, but will keep it on release when it happens.

I wouldn't mind much if this won't effect the Next but Next + 1. I don't think i would update the map anyway when that happens.

Member

MustaphaTR commented Mar 19, 2017

Actually, i'm using Supply Truck logic on the D2K map i was working on which is currently on bleed, but will keep it on release when it happens.

I wouldn't mind much if this won't effect the Next but Next + 1. I don't think i would update the map anyway when that happens.

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Mar 19, 2017

Contributor

@MustaphaTR D2k currently needs the Mods.Cnc.dll anyway due to ProductionAirdrop, and I don't see that changing soon (not before Next+1 in any case).

Contributor

reaperrr commented Mar 19, 2017

@MustaphaTR D2k currently needs the Mods.Cnc.dll anyway due to ProductionAirdrop, and I don't see that changing soon (not before Next+1 in any case).

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Mar 19, 2017

Contributor

Alternatively, we could keep it in Common and rename the trait to SupplyActor or SupplyDeliverer or DeliversSupplies.

Contributor

reaperrr commented Mar 19, 2017

Alternatively, we could keep it in Common and rename the trait to SupplyActor or SupplyDeliverer or DeliversSupplies.

@GraionDilach

This comment has been minimized.

Show comment
Hide comment
@GraionDilach

GraionDilach Mar 19, 2017

Contributor

Considering that these could be used for the YR Grinder even, I'd say it just needs a tag property.

Contributor

GraionDilach commented Mar 19, 2017

Considering that these could be used for the YR Grinder even, I'd say it just needs a tag property.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Mar 20, 2017

Member

Yea, i keep forgetting that D2k read CnC dll.

But Graion is right, this is the closet thing we have to grinder. So keeping it on common, renaming it and adding a Type: support for AcceptsSupplies and SupplyTruck so multipile types can be used (both actual Supply Trucks and Grinder for example).

Member

MustaphaTR commented Mar 20, 2017

Yea, i keep forgetting that D2k read CnC dll.

But Graion is right, this is the closet thing we have to grinder. So keeping it on common, renaming it and adding a Type: support for AcceptsSupplies and SupplyTruck so multipile types can be used (both actual Supply Trucks and Grinder for example).

@reaperrr reaperrr changed the title from Move SupplyTruck logic to Mods.Cnc to Refactor SupplyTruck to DeliversSupplies Mar 20, 2017

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Mar 20, 2017

Contributor

Updated as suggested.

Contributor

reaperrr commented Mar 20, 2017

Updated as suggested.

@GraionDilach

This comment has been minimized.

Show comment
Hide comment
@GraionDilach

GraionDilach Mar 21, 2017

Contributor

Ah, I forgot this doesn't have a stance check. May you add that as well? 👍 after it.

Contributor

GraionDilach commented Mar 21, 2017

Ah, I forgot this doesn't have a stance check. May you add that as well? 👍 after it.

@GraionDilach

👍

@Iamgoofball

This comment has been minimized.

Show comment
Hide comment
@Iamgoofball
Contributor

Iamgoofball commented Mar 24, 2017

@pchote

"Supplies" is still a mod-specific name (what's a supply?). Can you please change these to DeliversCash and AcceptsDeliveredCash or something similar?

@pchote

This comment has been minimized.

Show comment
Hide comment
@pchote

pchote Apr 9, 2017

Member

This PR supersedes #5925, so that one can be dropped from the Future milestone after this is merged. It also checks another box from #6336.

Member

pchote commented Apr 9, 2017

This PR supersedes #5925, so that one can be dropped from the Future milestone after this is merged. It also checks another box from #6336.

@reaperrr reaperrr changed the title from Refactor SupplyTruck to DeliversSupplies to Refactor SupplyTruck/AcceptsSupplies to *Cash traits Apr 15, 2017

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Apr 15, 2017

Contributor

Updated.

Note: Removing AcceptsSupplies from TS instead of renaming is intentional, that looks like copy-pasta from the early days of the mod.

Contributor

reaperrr commented Apr 15, 2017

Updated.

Note: Removing AcceptsSupplies from TS instead of renaming is intentional, that looks like copy-pasta from the early days of the mod.

Requested renaming has been applied.

@GraionDilach

This comment has been minimized.

Show comment
Hide comment
@GraionDilach

GraionDilach Apr 17, 2017

Contributor

Probably you should also rename the DonateSupplies activity as well.

Contributor

GraionDilach commented Apr 17, 2017

Probably you should also rename the DonateSupplies activity as well.

reaperrr added some commits Mar 20, 2017

Refactor supply traits to *Cash traits
Adding 'Type' and 'Stances' support as well.
@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Apr 18, 2017

Contributor

Probably you should also rename the DonateSupplies activity as well.

Done.

Contributor

reaperrr commented Apr 18, 2017

Probably you should also rename the DonateSupplies activity as well.

Done.

@GraionDilach

👍 still stands.

@obrakmann

👍

@obrakmann obrakmann merged commit 843ac85 into OpenRA:bleed Apr 18, 2017

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.

Show comment
Hide comment
@obrakmann
Contributor

obrakmann commented Apr 18, 2017

@scskwirl scskwirl referenced this pull request Apr 18, 2017

Open

Rename the different traits that use original names? #6336

7 of 14 tasks complete

@reaperrr reaperrr deleted the reaperrr:supply-to-cnc branch Jul 23, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment