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

Шейдер ударной волны для взрывов (#633)

Browse Source 
* Adds shock wave shader (#2631)

Co-authored-by: DOOM <N/A>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>

* add explosive shockwave

* add shockwave to fireball

* wd edit

* cleanup

* remove exgreande beeping sound

---------

Co-authored-by: Vero <73014819+vero5123@users.noreply.github.com>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
This commit is contained in:
ThereDrD
2024-08-17 23:59:11 +03:00
committed by GitHub
parent ad5ebecbd6
commit 3a6b3ee1f4
36 changed files with 468 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Projectiles/ProjectileSystem.cs
View File

@@ -69,16 +69,18 @@ public sealed class ProjectileSystem : SharedProjectileSystem
var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage * DamageModifier, component.IgnoreResistances, origin: component.Shooter);
var deleted = Deleted(target);
if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
if (modifiedDamage is not null && (EntityManager.EntityExists(component.Shooter) || EntityManager.EntityExists(component.Weapon)))
{
if (modifiedDamage.Any() && !deleted)
{
_color.RaiseEffect(Color.Red, new List<EntityUid> { target }, Filter.Pvs(target, entityManager: EntityManager));
}
var shooterOrWeapon = EntityManager.EntityExists(component.Shooter) ? component.Shooter!.Value : component.Weapon!.Value;
_adminLogger.Add(LogType.BulletHit,
HasComp<ActorComponent>(target) ? LogImpact.Extreme : LogImpact.High,
$"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {modifiedDamage.GetTotal():damage} damage");
$"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(shooterOrWeapon):source} hit {otherName:target} and dealt {modifiedDamage.GetTotal():damage} damage");
}
if (!deleted)