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

Integrate Revival Protocol Fixes in CHL #1237

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

BlackDog86
Copy link
Contributor

@BlackDog86 BlackDog86 commented Aug 12, 2023

Fixes #1235 - Adds a new 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. Tested & confirmed working in-game.

May break compatibility with the original mod - requires further testing & documentation.

@BlackDog86 BlackDog86 self-assigned this Aug 12, 2023
@BlackDog86 BlackDog86 requested a review from Iridar August 12, 2023 15:44
@Iridar Iridar added this to the 1.27.0 milestone Aug 14, 2023
@Iridar Iridar added bug-basegame ready-to-review A pull request is ready to be reviewed labels Aug 14, 2023
Copy link
Contributor

@Iridar Iridar left a comment

Choose a reason for hiding this comment

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

All Highlander submissions must be marked by comments with the issue number.

For single line changes:

SomeCodehere; // Single line for Issue #000

For multiple lines:

// Start Issue #000
some code
blah blah code
way more code
// End Issue #000

@Iridar Iridar added waiting-on-author A pull request is waiting on changes from the author and removed ready-to-review A pull request is ready to be reviewed labels Oct 29, 2023
@Iridar Iridar modified the milestones: 1.27.0, 1.28.0 Oct 29, 2023
@BlackDog86 BlackDog86 force-pushed the 1235-Revival-Protocol-Fix branch 2 times, most recently from 81b502a to 6b9b159 Compare December 19, 2023 18:17
@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 Dec 19, 2023
@Iridar Iridar modified the milestones: 1.28.0, 1.29.0 May 1, 2024
@Iridar Iridar added waiting-on-author A pull request is waiting on changes from the author and removed ready-to-review A pull request is ready to be reviewed labels Sep 5, 2024
@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 Sep 6, 2024
@BlackDog86
Copy link
Contributor Author

Changes made

return 'AA_UnitIsNotImpaired';
}

event name CallMeetsConditionWithSource(XComGameState_BaseObject kTarget, XComGameState_BaseObject kSource)
Copy link
Contributor

Choose a reason for hiding this comment

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

On second look, this whole bit is unnecessary. The X2Condition_RevivalProtocol on the ability template already ensures the ability can target only friendly units. This optimized version of CallMeetsConditionWithSource() should be moved there instead.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also I'm afraid that with current conditions if the unit is both stunned and panicked, they're gonna get a double amount of AP, needs testing.

/// 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.

Would be more useful if the comment gave a brief summary of what the condition checks for.

@Iridar Iridar added waiting-on-author A pull request is waiting on changes from the author and removed ready-to-review A pull request is ready to be reviewed labels Sep 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-basegame waiting-on-author A pull request is waiting on changes from the author
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revival Protocol restores action points to disoriented units
2 participants