Implement passive relics and six-family defense towers

2026-09-23 18:11:38 +09:00
parent 5d11288a6f
commit c94cbda1e6
21 changed files with 2882 additions and 152 deletions
@@ -339,6 +339,18 @@ namespace BumpCombat.Combat
                playerStats.CalculateDamage(rawDamage, damageTag),
                side,
                isOffsetHit);
+            finalDamage = PassiveRelicController.Instance?.ApplyTrophyBumpDamage(
+                finalDamage,
+                !isDash && string.IsNullOrEmpty(sourceId) && !artifactColor.HasValue)
+                ?? finalDamage;
+            float baseBumpDamage = !isDash
+                && string.IsNullOrEmpty(sourceId)
+                && !artifactColor.HasValue
+                    ? finalDamage
+                    : BumpCombatMath.ApplySideMultiplier(
+                        playerStats.CalculateDamage(baseDamage, DamageTag.Collision),
+                        side,
+                        isOffsetHit);
            finalDamage = PassiveRelicController.Instance?.ApplyOrdinaryBumpDamageMultiplier(
                finalDamage,
                !isDash && string.IsNullOrEmpty(sourceId),
@@ -494,7 +506,8 @@ namespace BumpCombat.Combat
                    playerHealth?.TryTakeDamage(
                        enemy.ContactDamage,
                        enemyToPlayer,
-                        enemy.PlayerKnockbackDistance);
+                        enemy.PlayerKnockbackDistance,
+                        fromEnemyAttack: false);
                }
                else if (side != HitSide.Front
                    && !enemy.IsCrowd
@@ -527,7 +540,8 @@ namespace BumpCombat.Combat
                launchSucceeded,
                artifactEffect.HasValue,
                artifactEffect.GetValueOrDefault(),
-                artifactEffect.HasValue && isStrongDash));
+                artifactEffect.HasValue && isStrongDash,
+                baseBumpDamage));
            return true;
        }