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

Add CargoCondition(s) to Passenger #15066

Merged
merged 1 commit into from May 6, 2018

Conversation

Projects
None yet
5 participants
@MustaphaTR
Copy link
Member

MustaphaTR commented Apr 18, 2018

This was wanted to make infantry in pillbox not gain veterancy for a while, i coded that to make Internet Center work on Generals Alpha, wanted to get to upstream too, as this can be pretty useful for modders.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:passenger-cargo-condition branch from 2c1a77d to fbe8d92 Apr 18, 2018

@GraionDilach

This comment has been minimized.

Copy link
Contributor

GraionDilach commented Apr 25, 2018

Can't you shift this to an interface instead of ticking constantly?

@pchote

This comment has been minimized.

Copy link
Member

pchote commented Apr 25, 2018

Yes, please do that. You can call the interface from Cargo when the passenger is added/removed.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:passenger-cargo-condition branch from fbe8d92 to d2725d5 Apr 27, 2018

@MustaphaTR

This comment has been minimized.

Copy link
Member Author

MustaphaTR commented Apr 27, 2018

Updated.

@abcdefg30
Copy link
Member

abcdefg30 left a comment

Seems like you forgot to push the changes made to call the new interfaces.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:passenger-cargo-condition branch from d2725d5 to 980d233 Apr 27, 2018

@MustaphaTR

This comment has been minimized.

Copy link
Member Author

MustaphaTR commented Apr 29, 2018

I forgot to say "updated" here again, so writing in case this got missed.

@pchote

This comment has been minimized.

Copy link
Member

pchote commented Apr 29, 2018

Ping @Smittytron: Do we want to use this to disable or reduce experience for units in RA pillboxes?

@GraionDilach
Copy link
Contributor

GraionDilach left a comment

👍

@Smittytron

This comment has been minimized.

Copy link
Contributor

Smittytron commented Apr 29, 2018

Ping @Smittytron: Do we want to use this to disable or reduce experience for units in RA pillboxes?

That's a very common request from players. I'd like to at least test disabling xp gain in pillboxes.

@pchote pchote added this to the Next release milestone May 4, 2018

@pchote
Copy link
Member

pchote left a comment

👍 after one minor fix:

string specificCargoCondition;
if (conditionManager != null)
{
if (anyCargoToken == ConditionManager.InvalidConditionToken && Info.CargoCondition != null)

This comment has been minimized.

@pchote

pchote May 6, 2018

Member

This should use string.IsNullOrEmpty() instead of checking null directly.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:passenger-cargo-condition branch from 980d233 to 4d07ffc May 6, 2018

@MustaphaTR

This comment has been minimized.

Copy link
Member Author

MustaphaTR commented May 6, 2018

Updated.

@pchote

pchote approved these changes May 6, 2018

@pchote pchote merged commit 6c5c4a1 into OpenRA:bleed May 6, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.