slightly slower fire rate, change fire rate name
This commit is contained in:
parent
c5cba2dcd7
commit
d53a2a47e2
4 changed files with 8 additions and 8 deletions
|
|
@ -147,7 +147,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
|
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject
|
m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject
|
||||||
GlobalObjectIdHash: 1363936954
|
GlobalObjectIdHash: 280718094
|
||||||
InScenePlacedSourceGlobalObjectIdHash: 0
|
InScenePlacedSourceGlobalObjectIdHash: 0
|
||||||
DeferredDespawnTick: 0
|
DeferredDespawnTick: 0
|
||||||
Ownership: 1
|
Ownership: 1
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ namespace TD.Combat
|
||||||
private EnemyHealth currentTarget;
|
private EnemyHealth currentTarget;
|
||||||
|
|
||||||
// Attack cooldown decrements each server frame. When ≤ 0 and a target
|
// Attack cooldown decrements each server frame. When ≤ 0 and a target
|
||||||
// is in range, the tower fires and the timer resets to 1 / FireRate.
|
// is in range, the tower fires and the timer resets to 1 / AttacksPerSecond.
|
||||||
private float attackCooldown;
|
private float attackCooldown;
|
||||||
|
|
||||||
// Cached on OnNetworkSpawn — avoids GetComponent every Update.
|
// Cached on OnNetworkSpawn — avoids GetComponent every Update.
|
||||||
|
|
@ -129,7 +129,7 @@ namespace TD.Combat
|
||||||
if (!IsServer) return;
|
if (!IsServer) return;
|
||||||
|
|
||||||
TowerDefinition def = towerInstance?.Definition;
|
TowerDefinition def = towerInstance?.Definition;
|
||||||
if (def == null || def.Range <= 0f || def.FireRate <= 0f) return;
|
if (def == null || def.Range <= 0f || def.AttacksPerSecond <= 0f) return;
|
||||||
|
|
||||||
// Only fire during active gameplay.
|
// Only fire during active gameplay.
|
||||||
var ms = MatchState.Instance;
|
var ms = MatchState.Instance;
|
||||||
|
|
@ -252,7 +252,7 @@ namespace TD.Combat
|
||||||
attackCooldown -= Time.deltaTime;
|
attackCooldown -= Time.deltaTime;
|
||||||
if (attackCooldown > 0f) return;
|
if (attackCooldown > 0f) return;
|
||||||
|
|
||||||
float effectiveFireRate = def.FireRate
|
float effectiveFireRate = def.AttacksPerSecond
|
||||||
* (GetOwnerBuffManager()?.GetMultiplier(BuffStat.AttackSpeed) ?? 1f);
|
* (GetOwnerBuffManager()?.GetMultiplier(BuffStat.AttackSpeed) ?? 1f);
|
||||||
attackCooldown = 1f / effectiveFireRate;
|
attackCooldown = 1f / effectiveFireRate;
|
||||||
Fire(def);
|
Fire(def);
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ namespace TD.Towers
|
||||||
public float Range;
|
public float Range;
|
||||||
|
|
||||||
[Tooltip("Attacks per second.")]
|
[Tooltip("Attacks per second.")]
|
||||||
public float FireRate;
|
public float AttacksPerSecond;
|
||||||
|
|
||||||
[Header("Combat — Area")]
|
[Header("Combat — Area")]
|
||||||
[Tooltip("Radius of splash damage around the primary impact point. " +
|
[Tooltip("Radius of splash damage around the primary impact point. " +
|
||||||
|
|
|
||||||
|
|
@ -1290,7 +1290,7 @@ namespace TD.UI
|
||||||
{
|
{
|
||||||
if (def.Damage > 0) AddStatLine($"Damage: {def.Damage}");
|
if (def.Damage > 0) AddStatLine($"Damage: {def.Damage}");
|
||||||
if (def.Range > 0) AddStatLine($"Range: {def.Range:0.0}");
|
if (def.Range > 0) AddStatLine($"Range: {def.Range:0.0}");
|
||||||
if (def.FireRate > 0) AddStatLine($"Fire rate: {def.FireRate:0.0}/s");
|
if (def.AttacksPerSecond > 0) AddStatLine($"Fire rate: {def.AttacksPerSecond:0.0}/s");
|
||||||
if (def.SlowFactor < 1f)
|
if (def.SlowFactor < 1f)
|
||||||
AddStatLine($"Slow: {(1f - def.SlowFactor) * 100f:0}%");
|
AddStatLine($"Slow: {(1f - def.SlowFactor) * 100f:0}%");
|
||||||
}
|
}
|
||||||
|
|
@ -1427,8 +1427,8 @@ namespace TD.UI
|
||||||
if (def.Damage > 0 || def.Range > 0)
|
if (def.Damage > 0 || def.Range > 0)
|
||||||
{
|
{
|
||||||
ttStats.text = $"DMG: {def.Damage} · Range: {def.Range:0}";
|
ttStats.text = $"DMG: {def.Damage} · Range: {def.Range:0}";
|
||||||
if (def.FireRate > 0)
|
if (def.AttacksPerSecond > 0)
|
||||||
ttStats.text += $"\nFire rate: {def.FireRate:0.0}/s";
|
ttStats.text += $"\nFire rate: {def.AttacksPerSecond:0.0}/s";
|
||||||
if (def.SlowFactor < 1f)
|
if (def.SlowFactor < 1f)
|
||||||
ttStats.text += $"\nSlow: {(1f - def.SlowFactor) * 100f:0}%";
|
ttStats.text += $"\nSlow: {(1f - def.SlowFactor) * 100f:0}%";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue