Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

DamageSpecifier Total => GetTotal (#24160)

Browse Source 
* DamageSpecifier [Obsolete] Total => GetTotal()

* Remove obsolete Total member from DamageSpecifier.
This commit is contained in:
LordCarve
2024-01-22 02:59:14 +01:00
committed by GitHub
parent 0fbc815db6
commit c77eb8691d
19 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
View File

@@ -274,12 +274,12 @@ public sealed partial class GunSystem : SharedGunSystem
if (user != null)
{
Logs.Add(LogType.HitScanHit,
$"{ToPrettyString(user.Value):user} hit {hitName:target} using hitscan and dealt {dmg.Total:damage} damage");
$"{ToPrettyString(user.Value):user} hit {hitName:target} using hitscan and dealt {dmg.GetTotal():damage} damage");
}
else
{
Logs.Add(LogType.HitScanHit,
$"{hitName:target} hit by hitscan dealing {dmg.Total:damage} damage");
$"{hitName:target} hit by hitscan dealing {dmg.GetTotal():damage} damage");
}
}
}
@@ -371,7 +371,7 @@ public sealed partial class GunSystem : SharedGunSystem
// 3. Nothing
var playedSound = false;
if (!forceWeaponSound && modifiedDamage != null && modifiedDamage.Total > 0 && TryComp<RangedDamageSoundComponent>(otherEntity, out var rangedSound))
if (!forceWeaponSound && modifiedDamage != null && modifiedDamage.GetTotal() > 0 && TryComp<RangedDamageSoundComponent>(otherEntity, out var rangedSound))
{
var type = SharedMeleeWeaponSystem.GetHighestDamageSound(modifiedDamage, ProtoManager);