Skip to content

Allow FreeKill to apply regardless of damage #1621

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

Open
M3r1st wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow FreeKill to apply regardless of damage #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion X2WOTCCommunityHighlander/Src/XComGame/Classes/X2Effect_ApplyWeaponDamage.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ var bool bIgnoreArmor;
var bool bBypassSustainEffects;
var array<name> HideVisualizationOfResultsAdditional;

// Issue #1620
var transient protectedwrite bool bDamageIsFreeKill;

// Issue #321
var config bool NO_MINIMUM_DAMAGE;
// Issue #743
Expand Down Expand Up @@ -95,7 +98,11 @@ simulated protected function OnEffectAdded(const out EffectAppliedData ApplyEffe
if (TargetUnit != none)
{
TotalToKill = TargetUnit.GetCurrentStat(eStat_HP) + TargetUnit.GetCurrentStat(eStat_ShieldHP);
if (TotalToKill > iDamage)
// Issue #1620
/// HL-Docs: ref:Bugfixes; issue:1620
/// Make FreeKill functions apply regardless of the current damage, and bypass sustaining effects.
// if (TotalToKill > iDamage)
if (TotalToKill > 0)
{
History = `XCOMHISTORY;
// check weapon upgrades for a free kill
Expand All @@ -107,7 +114,11 @@ simulated protected function OnEffectAdded(const out EffectAppliedData ApplyEffe
{
if (WeaponUpgradeTemplate.FreeKillFn != none && WeaponUpgradeTemplate.FreeKillFn(WeaponUpgradeTemplate, TargetUnit))
{
// Start Issue #1620
bDamageIsFreeKill = true;
TargetUnit.TakeEffectDamage(self, TotalToKill, 0, NewShred, ApplyEffectParameters, NewGameState, false, false, true, AppliedDamageTypes, SpecialDamageMessages);
bDamageIsFreeKill = false;
// End Issue #1620
if (TargetUnit.IsAlive())
{
`RedScreen("Somehow free kill upgrade failed to kill the target! -jbouscher @gameplay");
Expand All @@ -133,7 +144,11 @@ simulated protected function OnEffectAdded(const out EffectAppliedData ApplyEffe
// Single line for Issue #1615
if (EffectState.GetX2Effect().FreeKillOnDamage_CH(SourceUnit, TargetUnit, NewGameState, TotalToKill, ApplyEffectParameters, AppliedDamageTypes, iDamage, iMitigated, NewShred, NewRupture, bDoesDamageIgnoreShields))
{
// Start Issue #1620
bDamageIsFreeKill = true;
TargetUnit.TakeEffectDamage(self, TotalToKill, 0, NewShred, ApplyEffectParameters, NewGameState, false, false, true, AppliedDamageTypes, SpecialDamageMessages);
bDamageIsFreeKill = false;
// End Issue #1620
if (TargetUnit.IsAlive())
{
`RedScreen("Somehow free kill effect failed to kill the target! -jbouscher @gameplay");
Expand Down
6 changes: 4 additions & 2 deletions X2WOTCCommunityHighlander/Src/XComGame/Classes/XComGameState_Unit.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6638,7 +6638,8 @@ event TakeDamage( XComGameState NewGameState, const int DamageAmount, const int

if (bForceBleedOut || (bAllowBleedout && ShouldBleedOut( -OverkillDamage )))
{
if( DamageEffect == None || !DamageEffect.bBypassSustainEffects )
// Single line for Issue #1620
if( DamageEffect == None || (!DamageEffect.bBypassSustainEffects && !DamageEffect.bDamageIsFreeKill) )
{
if( `CHEATMGR == none || !`CHEATMGR.bSkipPreDeathCheckEffects )
{
Expand Down Expand Up @@ -6671,7 +6672,8 @@ event TakeDamage( XComGameState NewGameState, const int DamageAmount, const int
}
}

if( DamageEffect == None || !DamageEffect.bBypassSustainEffects )
// Single line for Issue #1620
if( DamageEffect == None || (!DamageEffect.bBypassSustainEffects && !DamageEffect.bDamageIsFreeKill) )
{
if( `CHEATMGR == none || !`CHEATMGR.bSkipPreDeathCheckEffects )
{
Expand Down
Loading