Skip to content

Update PartyDamageOverridden rule #583

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
TheGrayAlien wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update PartyDamageOverridden rule #583

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
34 changes: 30 additions & 4 deletions HouseRules.Essentials/Rules/PartyDamageOverriddenRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
public sealed class PartyDamageOverriddenRule : Rule, IConfigWritable<bool>, IPatchable,
IMultiplayerSafe
{
public override string Description => "Some player attacks and stuns/effects won't affect other players or pets";
public override string Description => "Electrical attacks won't affect other players, pets, or player made constructs";

private static bool _isActivated;
private static Piece? _targetPiece;

public PartyDamageOverriddenRule(bool value)
{
Expand All @@ -33,6 +34,31 @@ private static void Patch(Harmony harmony)
prefix: new HarmonyMethod(
typeof(PartyDamageOverriddenRule),
nameof(Damage_DealDamage_Prefix)));

harmony.Patch(
original: AccessTools.Method(typeof(Piece), "EnableEffectState"),
postfix: new HarmonyMethod(
typeof(PartyDamageOverriddenRule),
nameof(Piece_EnableEffectState_Postfix)));
}

private static void Piece_EnableEffectState_Postfix()
{
if (!_isActivated)
{
return;
}

if (_targetPiece != null)
{
if (!_targetPiece.IsImmuneToStatusEffect(EffectStateType.Stunned))
{
_targetPiece.DisableEffectState(EffectStateType.Stunned);
_targetPiece.effectSink.SubtractHealth(0);
}
}

_targetPiece = null;
}

private static bool Damage_DealDamage_Prefix(Target target, Damage damage, Target attacker)
Expand All @@ -51,12 +77,12 @@ private static bool Damage_DealDamage_Prefix(Target target, Damage damage, Targe
Piece attackerPiece = attacker.piece;
if (attackerPiece != null)
{
if (attackerPiece.IsPlayer() && (targetPiece.IsPlayer() || targetPiece.IsBot()) && damage.HasTag(DamageTag.Electricity))
if (attackerPiece.IsPlayer() && (targetPiece.IsPlayer() || targetPiece.IsBot() || targetPiece.HasEffectState(EffectStateType.ConfusedPermanentVisualOnly)) && damage.HasTag(DamageTag.Electricity))
{
targetPiece.effectSink.SubtractHealth(0);
if (!targetPiece.HasEffectState(EffectStateType.Invulnerable3) && !targetPiece.HasEffectState(EffectStateType.Stunned) && !targetPiece.HasEffectState(EffectStateType.Frozen) && damage.AbilityKey == AbilityKey.Zap)
if (!targetPiece.HasEffectState(EffectStateType.Stunned))
{
targetPiece.EnableEffectState(EffectStateType.Invulnerable1);
_targetPiece = targetPiece;
}

return false;
Expand Down