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

Use Typical Weapon Action Cost for Banish and Sting #1335

Merged
merged 1 commit into from
May 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,11 @@ static function X2AbilityTemplate SoulReaper()
`CREATE_X2ABILITY_TEMPLATE(Template, 'SoulReaper');

ActionPointCost = new class'X2AbilityCost_ActionPoints';
ActionPointCost.iNumPoints = 1;

/// HL-Docs: ref:Bugfixes; issue:1334
/// Use Weapon Typical Action Cost for Banish.
ActionPointCost.bAddWeaponTypicalCost = true;

ActionPointCost.bConsumeAllPoints = true;
Template.AbilityCosts.AddItem(ActionPointCost);

Expand Down Expand Up @@ -1260,7 +1264,28 @@ static function X2AbilityTemplate Sting()
local X2AbilityCharges Charges;
local X2AbilityCost_Charges ChargeCost;

// Start Issue #1334
local X2AbilityCost_ActionPoints ActionPointCost;
local X2AbilityCost AbilityCost;
// End Issue #1334

Template = class'X2Ability_WeaponCommon'.static.Add_StandardShot('Sting', false, false, false);

// Start Issue #1334
/// HL-Docs: ref:Bugfixes; issue:1334
/// Use Weapon Typical Action Cost for Sting.
foreach Template.AbilityCosts(AbilityCost)
{
ActionPointCost = X2AbilityCost_ActionPoints(AbilityCost);
if (ActionPointCost == none)
continue;

ActionPointCost.iNumPoints = 0;
ActionPointCost.bAddWeaponTypicalCost = true;
break;
}
// End Issue #1334

Template.SuperConcealmentLoss = 0;
Template.ConcealmentRule = eConceal_Always;
Template.ShotHUDPriority = class'UIUtilities_Tactical'.const.CLASS_CAPTAIN_PRIORITY;
Expand Down
Loading