atfatmc/AdamuSw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed frustum dynamic projectile index

Browse Source 
(cherry picked from commit 2b30d22c1f49ac3e8ec42815a48cef6fa646e119)
This commit is contained in:
ze-dom
2026-07-21 17:44:16 +01:00
committed by Acentech Dev
parent e3c2012ddb
commit 5e33f16cdd
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/GameLogic/PlayerActions/Skills/AreaSkillAttackAction.cs
View File

@@ -134,6 +134,7 @@ public class AreaSkillAttackAction
.GetAttackablesInRange(targetAreaCenter, range)
.Where(a => a != player)
.Where(a => !a.IsAtSafezone())
.Where(a => a.IsActive())
?? [];
if (skill.AreaSkillSettings is { UseFrustumFilter: true } areaSkillSettings)
@@ -239,6 +240,7 @@ public class AreaSkillAttackAction
var orderedTargets = targets.ToList();
FrustumBasedTargetFilter? filter = null;
var extraProjectiles = 0;
var projectileCount = 1;
var attackRounds = areaSkillSettings.MaximumNumberOfHitsPerTarget;
@@ -246,11 +248,12 @@ public class AreaSkillAttackAction
{
// Order targets by distance to process nearest targets first
orderedTargets.Sort((a, b) => player.GetDistanceTo(a).CompareTo(player.GetDistanceTo(b)));
projectileCount = areaSkillSettings.ProjectileCount + (int)(player.Attributes?[Stats.ExtraProjectiles] ?? 0);
filter = FrustumFilters.GetOrAdd(areaSkillSettings, static s => new FrustumBasedTargetFilter(s.FrustumStartWidth, s.FrustumEndWidth, s.FrustumDistance, s.ProjectileCount));
extraProjectiles += (int)player.Attributes![Stats.ExtraProjectiles];
projectileCount = areaSkillSettings.ProjectileCount + extraProjectiles;
attackRounds = 1; // One attack round per projectile
filter = FrustumFilters.GetOrAdd(areaSkillSettings, s => new FrustumBasedTargetFilter(s.FrustumStartWidth, s.FrustumEndWidth, s.FrustumDistance, projectileCount));
minAttacks = projectileCount;
maxAttacks = projectileCount;
minAttacks = projectileCount;
extraTarget = orderedTargets.FirstOrDefault(t => t.Id == extraTargetId);
if (extraTarget is not null)
@@ -296,7 +299,7 @@ public class AreaSkillAttackAction
}
// For multiple projectiles, check if this specific projectile can hit the target
if (filter != null && !filter.IsTargetWithinBounds(player, target, rotation, projectileIndex))
if (filter != null && !filter.IsTargetWithinBounds(player, target, rotation, projectileIndex, extraProjectiles))
{
continue; // This projectile cannot hit this target
}
@@ -345,6 +348,11 @@ public class AreaSkillAttackAction
}
});
}
if (filter != null)
{
break; // This projectile has hit, so we move on to the next projectile
}
}
currentDelay += areaSkillSettings.DelayBetweenHits;