Skip to content

Fix NPC crashes with new SpellEffects and refactor healing & knockback logic #3

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

Merged
Kamusvalenzuela merged 2 commits into from
Dec 15, 2025
Merged

Fix NPC crashes with new SpellEffects and refactor healing & knockback logic #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
670bbb1
Fixed the logic of the spells
Dec 15, 2025
7dbc06f
Deleted the innecessary migration files
Dec 15, 2025
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
11 changes: 1 addition & 10 deletions Intersect.Server.Core/Entities/Combat/Status.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,7 @@ public Status(Entity en, Entity attacker, SpellDescriptor spell, SpellEffect typ

}

// If this is a Knockback effect, apply the displacement (push target away from attacker)
if (Type == SpellEffect.Knockback && spell.Combat.KnockbackTiles > 0)
{
// Calculate direction from attacker to target, then that's the direction to push
var knockbackDirection = Attacker.GetDirectionTo(en);
if (knockbackDirection != Direction.None)
{
var dash = new Dash(en, spell.Combat.KnockbackTiles, knockbackDirection, false, false, false, false);
}
}

}

public long[] Shield { get; set; } = new long[Enum.GetValues<Vital>().Length];
Expand Down
151 changes: 51 additions & 100 deletions Intersect.Server.Core/Entities/Entity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,34 +1575,36 @@ protected long ApplyHealingModifiers(long healAmount)
return healAmount;
}

// Find the latest applied status that is either HealingReduction or HealingBoost
var latestStatus = CachedStatuses
.Where(s => s.Type == SpellEffect.HealingReduction || s.Type == SpellEffect.HealingBoost)
.OrderByDescending(s => s.StartTime)
.FirstOrDefault();
// Multiplicative Stacking Logic
// 1. Calculate the strongest (highest %) Healing Boost currently active.
var maxBoost = 0;
var maxReduction = 0;

if (latestStatus == null)
foreach (var status in CachedStatuses)
{
return healAmount;
if (status.Type == SpellEffect.HealingBoost)
{
var val = status.Spell.Combat.PercentageEffect ?? 0;
if (val > maxBoost) maxBoost = val;
}
else if (status.Type == SpellEffect.HealingReduction)
{
var val = status.Spell.Combat.PercentageEffect ?? 0;
if (val > maxReduction) maxReduction = val;
}
}

var percentage = latestStatus.Spell.Combat.PercentageEffect ?? 0;
// 2. Apply Boost Multiplier (e.g. 50% boost -> 1.5x)
double boostMultiplier = 1.0 + (Math.Clamp(maxBoost, 0, 1000) / 100.0);

if (latestStatus.Type == SpellEffect.HealingReduction)
{
// Reduction: 0 to 100%
var reduction = Math.Clamp(percentage, 0, 100) / 100.0;
return (long)(healAmount * (1.0 - reduction));
}

if (latestStatus.Type == SpellEffect.HealingBoost)
{
// Boost: 0 to 1000%
var boost = Math.Clamp(percentage, 0, 1000) / 100.0;
return (long)(healAmount * (1.0 + boost));
}
// 3. Apply Reduction Multiplier (e.g. 40% reduction -> 0.6x)
// Clamp reduction to max 100% (multiplier 0.0) to prevents negative healing (damage)
double reductionMultiplier = 1.0 - (Math.Clamp(maxReduction, 0, 100) / 100.0);

return healAmount;
// 4. Final Calculation
// Result = Base * Boost * Reduction
// If reduction is 100%, multiplier is 0, result is 0.
return (long)(healAmount * boostMultiplier * reductionMultiplier);
}

public void SubVital(Vital vital, long amount)
Expand Down Expand Up @@ -1663,7 +1665,8 @@ public virtual void TryAttack(Entity target,

if (parentSpell != null)
{
TryAttack(target, parentSpell);
var willKnockback = projectile != null && projectile.Knockback > 0;
TryAttack(target, parentSpell, false, false, willKnockback);
}

var targetPlayer = target as Player;
Expand Down Expand Up @@ -1711,7 +1714,8 @@ public virtual void TryAttack(Entity target,
var s = projectile.Spell;
if (s != null)
{
HandleAoESpell(projectile.SpellId, s.Combat.HitRadius, target.MapId, target.X, target.Y, null);
var willKnockback = projectile.Knockback > 0;
HandleAoESpell(projectile.SpellId, s.Combat.HitRadius, target.MapId, target.X, target.Y, null, willKnockback ? target : null);
}

//Check that the npc has not been destroyed by the splash spell
Expand All @@ -1727,79 +1731,9 @@ public virtual void TryAttack(Entity target,
return;
}

if (projectile.HomingBehavior || projectile.DirectShotBehavior)
{
// we need to get the direction based on the shooter's position and the target's position and angle between them
double angle = 0;
if (target.MapId == MapId)
{
angle = Math.Atan2(target.Y - Y, target.X - X);
}
else
{
var grid = DbInterface.GetGrid(Map.MapGrid);
bool angleFound = false;

for (var y = Map.MapGridY - 1; y <= Map.MapGridY + 1; y++)
{
for (var x = Map.MapGridX - 1; x <= Map.MapGridX + 1; x++)
{
if (x < 0 || x >= grid.MapIdGrid.GetLength(0) || y < 0 || y >= grid.MapIdGrid.GetLength(1))
{
continue;
}

if (grid.MapIdGrid[x, y] == target.MapId)
{
int targetAbsoluteX = target.X + (x * Options.Instance.Map.MapWidth);
int targetAbsoluteY = target.Y + (y * Options.Instance.Map.MapHeight);
int playerAbsoluteX = X + (Map.MapGridX * Options.Instance.Map.MapWidth);
int playerAbsoluteY = Y + (Map.MapGridY * Options.Instance.Map.MapHeight);

angle = Math.Atan2(targetAbsoluteY - playerAbsoluteY, targetAbsoluteX - playerAbsoluteX);
angleFound = true;
break;
}
}

if (angleFound) break;
}
}

var angleDegrees = angle * (180 / Math.PI);
if (angleDegrees >= -30 && angleDegrees <= 30)
{
projectileDir = Direction.Right;
}
else if (angleDegrees >= 30 && angleDegrees <= 60)
{
projectileDir = Direction.DownRight;
}
else if (angleDegrees >= 60 && angleDegrees <= 120)
{
projectileDir = Direction.Down;
}
else if (angleDegrees >= 120 && angleDegrees <= 150)
{
projectileDir = Direction.DownLeft;
}
else if (angleDegrees >= 150 || angleDegrees <= -150)
{
projectileDir = Direction.Left;
}
else if (angleDegrees >= -150 && angleDegrees <= -120)
{
projectileDir = Direction.UpLeft;
}
else if (angleDegrees >= -120 && angleDegrees <= -60)
{
projectileDir = Direction.Up;
}
else if (angleDegrees >= -60 && angleDegrees <= -30)
{
projectileDir = Direction.UpRight;
}
}
// Logic removed: Trust the projectileDir passed from ProjectileSpawn, which knows the impact angle.
// Previously, this recalculated direction based on Shooter <-> Target, which caused incorrect knockback
// if the shooter moved or if the projectile curved (homing).

// If there is knock-back: knock them backwards.
if (projectile.Knockback > 0 && ((int)projectileDir < Options.Instance.Map.MovementDirections) && !target.Immunities.Contains(SpellEffect.Knockback))
Expand All @@ -1813,7 +1747,8 @@ public virtual void TryAttack(
Entity target,
SpellDescriptor spellDescriptor,
bool onHitTrigger = false,
bool trapTrigger = false
bool trapTrigger = false,
bool ignoreKnockback = false
)
{
if (target is Resource || target is EventPageInstance)
Expand Down Expand Up @@ -1979,6 +1914,21 @@ public virtual void TryAttack(
{
new Status(target, this, spellDescriptor, spellDescriptor.Combat.Effect, statBuffTime, "");

// Handle Knockback (moved here from Status.cs to prevent double-application)
if (spellDescriptor.Combat.Effect == SpellEffect.Knockback && !ignoreKnockback && !target.Immunities.Contains(SpellEffect.Knockback))
{
var knockbackDirection = GetDirectionTo(target);
if (knockbackDirection != Direction.None)
{
// Use Spell's KnockbackTiles configuration
var tiles = spellDescriptor.Combat.KnockbackTiles;
if (tiles > 0)
{
new Dash(target, tiles, knockbackDirection, false, false, false, false);
}
}
}

if (target is Npc npc)
{
npc.AssignTarget(this);
Expand Down Expand Up @@ -2749,7 +2699,8 @@ private void HandleAoESpell(
Guid startMapId,
int startX,
int startY,
Entity spellTarget
Entity spellTarget,
Entity knockbackExclusionTarget = null
)
{
var spellBase = SpellDescriptor.Get(spellId);
Expand Down Expand Up @@ -2778,7 +2729,7 @@ Entity spellTarget
}
}

TryAttack(entity, spellBase); //Handle damage
TryAttack(entity, spellBase, false, false, entity == knockbackExclusionTarget); //Handle damage
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions Intersect.Server.Core/Entities/Npc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,9 @@ private static bool PredicateStunnedOrSleeping(Status status)
case SpellEffect.Shield:
case SpellEffect.OnHit:
case SpellEffect.Taunt:
case SpellEffect.Knockback:
case SpellEffect.HealingReduction:
case SpellEffect.HealingBoost:
case null:
return false;

Expand Down Expand Up @@ -530,6 +533,9 @@ private static bool PredicateUnableToCastSpells(Status status)
case SpellEffect.Shield:
case SpellEffect.OnHit:
case SpellEffect.Taunt:
case SpellEffect.Knockback:
case SpellEffect.HealingReduction:
case SpellEffect.HealingBoost:
case null:
return false;

Expand Down
5 changes: 3 additions & 2 deletions Intersect.Server.Core/Entities/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,15 +1668,16 @@ public override void TryAttack(
Entity target,
SpellDescriptor spellDescriptor,
bool onHitTrigger = false,
bool trapTrigger = false
bool trapTrigger = false,
bool ignoreKnockback = false
)
{
if (!trapTrigger && !ValidTauntTarget(target)) //Traps ignore taunts.
{
return;
}

base.TryAttack(target, spellDescriptor, onHitTrigger, trapTrigger);
base.TryAttack(target, spellDescriptor, onHitTrigger, trapTrigger, ignoreKnockback);
}

/// <summary>
Expand Down
Loading