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

Magic staves + wands (#9070)

Browse Source
This commit is contained in:
Kara
2022-07-14 19:45:27 -07:00
committed by GitHub
parent 9608005db0
commit ad7889e8a9
85 changed files with 1299 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Projectiles/Components/ProjectileComponent.cs
View File

@@ -15,6 +15,9 @@ namespace Content.Server.Projectiles.Components
[DataField("deleteOnCollide")]
public bool DeleteOnCollide { get; } = true;
[DataField("ignoreResistances")]
public bool IgnoreResistances { get; } = false;
// Get that juicy FPS hit sound
[DataField("soundHit")] public SoundSpecifier? SoundHit;

2
Content.Server/Projectiles/SharedProjectileSystem.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Projectiles
var otherEntity = args.OtherFixture.Body.Owner;
var modifiedDamage = _damageableSystem.TryChangeDamage(otherEntity, component.Damage);
var modifiedDamage = _damageableSystem.TryChangeDamage(otherEntity, component.Damage, component.IgnoreResistances);
component.DamagedEntity = true;
if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))