This commit is contained in:
Ian Woods 2026-06-23 20:26:55 -07:00
parent 53f2a3e8a8
commit 8f394e1d92
2 changed files with 11 additions and 5 deletions

View file

@ -226,7 +226,6 @@ namespace TD.Combat
private PlayerBuffManager GetOwnerBuffManager()
{
if (buffManagerResolved) return ownerBuffManager;
buffManagerResolved = true;
var slot = towerInstance.Owner;
if (slot == PlayerSlot.None) return null;
@ -235,6 +234,7 @@ namespace TD.Combat
if (matchState == null) return null;
ownerBuffManager = matchState.GetComponent<PlayerBuffManager>();
buffManagerResolved = true;
return ownerBuffManager;
}
@ -434,7 +434,10 @@ namespace TD.Combat
private void HitEnemy(in CombatProfile p, EnemyHealth target, PlayerSlot owner)
{
float effectiveDamage = p.Damage * GetOwnerBuffManager()?.GetMultiplier(BuffStat.Damage) ?? 1f;
var multiplier = GetOwnerBuffManager()?.GetMultiplier(BuffStat.Damage) ?? 1f;
float effectiveDamage = p.Damage * multiplier;
Debug.Log("multiplier: " + multiplier);
Debug.Log("Effective damage: " + effectiveDamage);
target.TakeDamage(effectiveDamage, p.DamageType, owner);
ApplyStatusEffect(p, target, owner);
}
@ -478,7 +481,7 @@ namespace TD.Combat
* (GetOwnerBuffManager()?.GetMultiplier(BuffStat.Damage) ?? 1f);
proj.InitializeServer(
target,
p.Damage,
effectiveDamage,
p.DamageType,
p.TargetType,
p.SplashRadius,