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

REOPENED - Integrate Revival Protocol Fixes in CHL #1237 #1399

Closed

Conversation

BlackDog86
Copy link
Contributor

@BlackDog86 BlackDog86 commented Oct 29, 2024

Fixes #1235

Reopening accidentally closed request.

Adds custom X2Condition to the RestoreActionPoints effect of Revival Protocol to prevent it from restoring APs to disoriented units. Updated the ability targetting condition to allow revival protocol to target stunned units, remove the stunned status and restore APs properly. Also integrated the additional targeting condition from RMs mod which allows the ability to target resistance soldiers. Discussion to be had over whether this part is required/necessary.

Still requires finessing & testing before merge.

@BlackDog86 BlackDog86 self-assigned this Oct 29, 2024
@BlackDog86 BlackDog86 added bug-basegame waiting-on-author A pull request is waiting on changes from the author labels Oct 29, 2024
@BlackDog86 BlackDog86 added this to the 1.29.0 milestone Oct 29, 2024
@Iridar
Copy link
Contributor

Iridar commented Nov 2, 2024

allows the ability to target resistance soldiers. Discussion to be had over whether this part is required/necessary.

In cases like this I would defer to in-game localization and reasonable player expectations.

Localization goes:

"Send the GREMLIN to an ally to remove any negative mental status effects: Disoriented, Stunned, Panicked, or Unconscious."

"an ally" would reasonably include any allied unit, including resistance soldiers.

The ability itself engages the GREMLIN to perform actions on a unit, requiring no special training or equipment from the unit, other than being human or close enough to a human (Skirmishers), so a reasonable person would expect it to be able to target resistance soldiers.

So I'd say yeah, valid change.

@Iridar
Copy link
Contributor

Iridar commented Nov 2, 2024

This PR seems to be missing the .x2proj change with addition of new files.

@BlackDog86
Copy link
Contributor Author

This PR seems to be missing the .x2proj change with addition of new files.

Resolved :)

@BlackDog86 BlackDog86 added ready-to-review A pull request is ready to be reviewed and removed waiting-on-author A pull request is waiting on changes from the author labels Nov 24, 2024
@Iridar
Copy link
Contributor

Iridar commented Nov 27, 2024

Sorry, but it needs to be in a separate commit.

@BlackDog86
Copy link
Contributor Author

That should do it


// Start Issue #1235
/// HL-Docs: ref:Bugfixes; issue:1235
/// Update the ability template to call recover from stun & add a new condition to the Restore Action Point effect
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, but I have to nitpick to these docs, they need to be user-facing and explain what specific bugs are getting fixed in plain terms.

/// HL-Docs: ref:Bugfixes; issue:1235
/// Update the ability template to call recover from stun & add a new condition to the Restore Action Point effect
Template.AddTargetEffect(class'X2StatusEffects'.static.CreateStunRecoverEffect());
/// Restore APs on the unit only if the new X2Condition is met
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment should be a simple double //

@BlackDog86
Copy link
Contributor Author

Updated the docs to be more descriptive and removed the errant /

@Iridar
Copy link
Contributor

Iridar commented Nov 28, 2024

Closing this in favor of #1415, which adds more bugfixes.

@Iridar Iridar closed this Nov 28, 2024
@Iridar Iridar removed this from the 1.29.0 milestone Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-basegame ready-to-review A pull request is ready to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revival Protocol restores action points to disoriented units
2 participants