Polish explosions somewhat.
Just makes them less ugly. Slightly.
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Content.Server.GameObjects.Components.Mobs;
|
||||||
using Robust.Server.Interfaces.GameObjects;
|
using Robust.Server.Interfaces.GameObjects;
|
||||||
using Robust.Server.GameObjects.EntitySystems;
|
using Robust.Server.GameObjects.EntitySystems;
|
||||||
using Robust.Shared.GameObjects.EntitySystemMessages;
|
using Robust.Shared.GameObjects.EntitySystemMessages;
|
||||||
@@ -15,6 +16,7 @@ using Robust.Shared.Serialization;
|
|||||||
using Content.Server.GameObjects.EntitySystems;
|
using Content.Server.GameObjects.EntitySystems;
|
||||||
using Content.Shared.GameObjects;
|
using Content.Shared.GameObjects;
|
||||||
using Content.Shared.Maps;
|
using Content.Shared.Maps;
|
||||||
|
using Robust.Server.Interfaces.Player;
|
||||||
|
|
||||||
namespace Content.Server.GameObjects.Components.Explosive
|
namespace Content.Server.GameObjects.Components.Explosive
|
||||||
{
|
{
|
||||||
@@ -118,7 +120,8 @@ namespace Content.Server.GameObjects.Components.Explosive
|
|||||||
var time = IoCManager.Resolve<IGameTiming>().CurTime;
|
var time = IoCManager.Resolve<IGameTiming>().CurTime;
|
||||||
var message = new EffectSystemMessage
|
var message = new EffectSystemMessage
|
||||||
{
|
{
|
||||||
EffectSprite = "Effects/explosion.png",
|
EffectSprite = "Effects/explosion.rsi",
|
||||||
|
RsiState = "explosionfast",
|
||||||
Born = time,
|
Born = time,
|
||||||
DeathTime = time + TimeSpan.FromSeconds(5),
|
DeathTime = time + TimeSpan.FromSeconds(5),
|
||||||
Size = new Vector2(FlashRange / 2, FlashRange / 2),
|
Size = new Vector2(FlashRange / 2, FlashRange / 2),
|
||||||
@@ -131,6 +134,32 @@ namespace Content.Server.GameObjects.Components.Explosive
|
|||||||
};
|
};
|
||||||
_entitySystemManager.GetEntitySystem<EffectSystem>().CreateParticle(message);
|
_entitySystemManager.GetEntitySystem<EffectSystem>().CreateParticle(message);
|
||||||
_entitySystemManager.GetEntitySystem<AudioSystem>().Play("/Audio/effects/explosion.ogg", Owner);
|
_entitySystemManager.GetEntitySystem<AudioSystem>().Play("/Audio/effects/explosion.ogg", Owner);
|
||||||
|
|
||||||
|
// Knock back cameras of all players in the area.
|
||||||
|
|
||||||
|
var playerManager = IoCManager.Resolve<IPlayerManager>();
|
||||||
|
var selfPos = Owner.Transform.WorldPosition;
|
||||||
|
foreach (var player in playerManager.GetAllPlayers())
|
||||||
|
{
|
||||||
|
if (player.AttachedEntity == null
|
||||||
|
|| player.AttachedEntity.Transform.MapID != mapGrid.ParentMapId
|
||||||
|
|| !player.AttachedEntity.TryGetComponent(out CameraRecoilComponent recoil))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var playerPos = player.AttachedEntity.Transform.WorldPosition;
|
||||||
|
var delta = selfPos - playerPos;
|
||||||
|
var distance = delta.LengthSquared;
|
||||||
|
|
||||||
|
var effect = 1 / (1 + 0.2f * distance);
|
||||||
|
if (effect > 0.01f)
|
||||||
|
{
|
||||||
|
var kick = -delta.Normalized * effect;
|
||||||
|
recoil.Kick(kick);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -55,7 +55,7 @@
|
|||||||
Size: 5
|
Size: 5
|
||||||
|
|
||||||
- type: OnUseTimerTrigger
|
- type: OnUseTimerTrigger
|
||||||
delay: 5
|
delay: 3.5
|
||||||
|
|
||||||
- type: Explosive
|
- type: Explosive
|
||||||
devastationRange: 3
|
devastationRange: 3
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 86 KiB |
BIN
Resources/Textures/Effects/explosion.rsi/explosionfast.png
Normal file
BIN
Resources/Textures/Effects/explosion.rsi/explosionfast.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
@@ -1,28 +1 @@
|
|||||||
{
|
{"version": 1, "size": {"x": 96, "y": 96}, "states": [{"name": "explosionfast", "directions": 1, "delays": [[0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06]]}]}
|
||||||
"version": 1,
|
|
||||||
"size": {
|
|
||||||
"x": 96,
|
|
||||||
"y": 96
|
|
||||||
},
|
|
||||||
"license": "CC-BY-SA-3.0",
|
|
||||||
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/icons/effects/96x96.dmi at commit 96d69b71a3a0549b4b668c0a095306580bd157c0",
|
|
||||||
"states": [
|
|
||||||
{
|
|
||||||
"name": "explosion",
|
|
||||||
"select": [],
|
|
||||||
"flags": {},
|
|
||||||
"directions": 1,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
0.2,
|
|
||||||
0.1,
|
|
||||||
0.1,
|
|
||||||
0.1,
|
|
||||||
0.1,
|
|
||||||
0.1,
|
|
||||||
0.1
|
|
||||||
]
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user