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.

Sign up for GitHub

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

Jump to bottom

Added diplomatic stances to JamsRadar #11926

Merged
merged 1 commit into from Sep 20, 2016
Merged

Added diplomatic stances to JamsRadar #11926

merged 1 commit into from Sep 20, 2016

Conversation

abc013
Copy link
Contributor

@abc013 abc013 commented Aug 30, 2016

No description provided.

GraionDilach
GraionDilach reviewed Aug 30, 2016
View reviewed changes
OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
@@ -18,6 +18,9 @@ public class JamsRadarInfo : TraitInfo<JamsRadar>
{
[Desc("Range for jamming.")]
public readonly WDist Range = WDist.Zero;

[Desc("What diplomatic stances are affected.")]
public readonly Stance JamsRadarStances = Stance.Ally | Stance.Neutral | Stance.Enemy;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make this default to Neutral | Enemy or add an upgrade rule because this regresses third-party mods as-is.

@abc013
Copy link
Contributor Author

abc013 commented Aug 30, 2016

updated.

GraionDilach
GraionDilach reviewed Aug 30, 2016
View reviewed changes
OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
@@ -18,6 +18,9 @@ public class JamsRadarInfo : TraitInfo<JamsRadar>
{
[Desc("Range for jamming.")]
public readonly WDist Range = WDist.Zero;

[Desc("What diplomatic stances are affected.")]
public readonly Stance JamsRadarStances = Stance.Ally | Stance.Neutral;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uhm, you did this wrong. Neutral | Enemy, not Ally | Neutral was my request (you can remove the YAML definition thenafter as well.)

Copy link
Contributor Author

@abc013 abc013 Aug 30, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, sry :/

@abc013
Copy link
Contributor Author

abc013 commented Aug 30, 2016

@GraionDilach fixed.

GraionDilach
GraionDilach reviewed Aug 30, 2016
View reviewed changes
mods/ra/rules/vehicles.yaml
@@ -544,6 +544,7 @@ MRJ:
Offset: -256,0,256
JamsRadar:
Range: 15c0
JamsRadarStances: Enemy, Neutral
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This became redundant now.

@abc013
Copy link
Contributor Author

abc013 commented Aug 30, 2016

And changed again.

@phrohdoh
Copy link
Member

phrohdoh commented Sep 4, 2016

👍

abcdefg30
abcdefg30 requested changes Sep 14, 2016
View reviewed changes
Copy link
Member

@abcdefg30 abcdefg30 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs the same change as JamsMissiles did: #11983

@abc013
Copy link
Contributor Author

abc013 commented Sep 17, 2016

Updated.

@reaperrr
Copy link
Contributor

reaperrr commented Sep 18, 2016 •
edited

@phrohdoh There were some changes since your review, could you 'refresh' your +1?

👍 from me, but this needs another +1 or a 'refresh' from @phrohdoh.

phrohdoh
phrohdoh reviewed Sep 18, 2016
View reviewed changes
Copy link
Member

@phrohdoh phrohdoh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return statement is quite complex and the All doesn't seem right to me, but I can't spend much time trying to make heads or tails of it currently, so won't be able to approve this.

OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
{
[Desc("Range for jamming.")]
public readonly WDist Range = WDist.Zero;

[Desc("What diplomatic stances are affected.")]
public readonly Stance JamsRadarStances = Stance.Enemy | Stance.Neutral;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/What/Which
And this should be named Stances (the JamsRadar part is implied).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have DeflectionStances in JamsMissiles, so JamStances here for "consistency"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically you're right, though. It doesn't make much sense to include more than just Stances.

@abc013
Copy link
Contributor Author

abc013 commented Sep 19, 2016

Should I do the same change for DeflectionStances?

obrakmann
obrakmann reviewed Sep 19, 2016
View reviewed changes
OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
{
[Desc("Range for jamming.")]
public readonly WDist Range = WDist.Zero;

[Desc("What diplomatic stances are affected.")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Which"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed.

@obrakmann
Copy link
Contributor

Looks good except for the typo, 👍

Should I do the same change for DeflectionStances?

I'd say no. It's unnecessary churn for now.

@abc013
Copy link
Contributor Author

abc013 commented Sep 20, 2016

Updated.

@obrakmann obrakmann merged commit 57ceda3 into OpenRA:bleed Sep 20, 2016
@obrakmann
Copy link
Contributor

Changelog

@abc013 abc013 deleted the JamsRadarStances branch September 21, 2016 12:14
@abc013 abc013 mentioned this pull request Oct 21, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@obrakmann obrakmann obrakmann left review comments

@phrohdoh phrohdoh phrohdoh left review comments

@abcdefg30 abcdefg30 abcdefg30 requested changes

Assignees
No one assigned
Labels
PR: Needs +2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@abc013 @phrohdoh @reaperrr @obrakmann @pchote @GraionDilach @abcdefg30