Add emp grenade (#14393)
This commit is contained in:
17
Content.Server/Emp/EmpOnTriggerComponent.cs
Normal file
17
Content.Server/Emp/EmpOnTriggerComponent.cs
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
namespace Content.Server.Emp;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Upon being triggered will EMP area around it.
|
||||||
|
/// </summary>
|
||||||
|
[RegisterComponent]
|
||||||
|
sealed class EmpOnTriggerComponent : Component
|
||||||
|
{
|
||||||
|
[DataField("range"), ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public float Range = 1.0f;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// How much energy will be consumed per battery in range
|
||||||
|
/// </summary>
|
||||||
|
[DataField("energyConsumption"), ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public float EnergyConsumption;
|
||||||
|
}
|
||||||
39
Content.Server/Emp/EmpSystem.cs
Normal file
39
Content.Server/Emp/EmpSystem.cs
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
using Content.Server.Explosion.EntitySystems;
|
||||||
|
using Robust.Shared.Map;
|
||||||
|
|
||||||
|
namespace Content.Server.Emp;
|
||||||
|
|
||||||
|
public sealed class EmpSystem : EntitySystem
|
||||||
|
{
|
||||||
|
[Dependency] private readonly EntityLookupSystem _lookup = default!;
|
||||||
|
|
||||||
|
public const string EmpPulseEffectPrototype = "EffectEmpPulse";
|
||||||
|
public const string EmpDisabledEffectPrototype = "EffectEmpDisabled";
|
||||||
|
|
||||||
|
public override void Initialize()
|
||||||
|
{
|
||||||
|
base.Initialize();
|
||||||
|
SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(HandleEmpTrigger);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption)
|
||||||
|
{
|
||||||
|
foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range))
|
||||||
|
{
|
||||||
|
var ev = new EmpPulseEvent(energyConsumption, false);
|
||||||
|
RaiseLocalEvent(uid, ref ev);
|
||||||
|
if (ev.Affected)
|
||||||
|
Spawn(EmpDisabledEffectPrototype, Transform(uid).Coordinates);
|
||||||
|
}
|
||||||
|
Spawn(EmpPulseEffectPrototype, coordinates);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleEmpTrigger(EntityUid uid, EmpOnTriggerComponent comp, TriggerEvent args)
|
||||||
|
{
|
||||||
|
EmpPulse(Transform(uid).Coordinates.ToMap(EntityManager), comp.Range, comp.EnergyConsumption);
|
||||||
|
args.Handled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[ByRefEvent]
|
||||||
|
public record struct EmpPulseEvent(float EnergyConsumption, bool Affected);
|
||||||
@@ -22,6 +22,7 @@ using Robust.Shared.Containers;
|
|||||||
using Robust.Shared.Player;
|
using Robust.Shared.Player;
|
||||||
using Robust.Shared.Timing;
|
using Robust.Shared.Timing;
|
||||||
using Content.Shared.DoAfter;
|
using Content.Shared.DoAfter;
|
||||||
|
using Content.Server.Emp;
|
||||||
|
|
||||||
namespace Content.Server.Light.EntitySystems
|
namespace Content.Server.Light.EntitySystems
|
||||||
{
|
{
|
||||||
@@ -63,6 +64,8 @@ namespace Content.Server.Light.EntitySystems
|
|||||||
SubscribeLocalEvent<PoweredLightComponent, PowerChangedEvent>(OnPowerChanged);
|
SubscribeLocalEvent<PoweredLightComponent, PowerChangedEvent>(OnPowerChanged);
|
||||||
|
|
||||||
SubscribeLocalEvent<PoweredLightComponent, DoAfterEvent>(OnDoAfter);
|
SubscribeLocalEvent<PoweredLightComponent, DoAfterEvent>(OnDoAfter);
|
||||||
|
|
||||||
|
SubscribeLocalEvent<PoweredLightComponent, EmpPulseEvent>(OnEmpPulse);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnInit(EntityUid uid, PoweredLightComponent light, ComponentInit args)
|
private void OnInit(EntityUid uid, PoweredLightComponent light, ComponentInit args)
|
||||||
@@ -421,5 +424,11 @@ namespace Content.Server.Light.EntitySystems
|
|||||||
|
|
||||||
args.Handled = true;
|
args.Handled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnEmpPulse(EntityUid uid, PoweredLightComponent component, ref EmpPulseEvent args)
|
||||||
|
{
|
||||||
|
args.Affected = true;
|
||||||
|
TryDestroyBulb(uid, component);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Content.Server.Emp;
|
||||||
using Content.Server.Popups;
|
using Content.Server.Popups;
|
||||||
using Content.Server.Power.Components;
|
using Content.Server.Power.Components;
|
||||||
using Content.Shared.Access.Components;
|
using Content.Shared.Access.Components;
|
||||||
@@ -44,6 +45,8 @@ namespace Content.Server.Power.EntitySystems
|
|||||||
SubscribeLocalEvent<ApcToolFinishedEvent>(OnToolFinished);
|
SubscribeLocalEvent<ApcToolFinishedEvent>(OnToolFinished);
|
||||||
SubscribeLocalEvent<ApcComponent, InteractUsingEvent>(OnInteractUsing);
|
SubscribeLocalEvent<ApcComponent, InteractUsingEvent>(OnInteractUsing);
|
||||||
SubscribeLocalEvent<ApcComponent, ExaminedEvent>(OnExamine);
|
SubscribeLocalEvent<ApcComponent, ExaminedEvent>(OnExamine);
|
||||||
|
|
||||||
|
SubscribeLocalEvent<ApcComponent, EmpPulseEvent>(OnEmpPulse);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change the APC's state only when the battery state changes, or when it's first created.
|
// Change the APC's state only when the battery state changes, or when it's first created.
|
||||||
@@ -247,5 +250,14 @@ namespace Content.Server.Power.EntitySystems
|
|||||||
? "apc-component-on-examine-panel-open"
|
? "apc-component-on-examine-panel-open"
|
||||||
: "apc-component-on-examine-panel-closed"));
|
: "apc-component-on-examine-panel-closed"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnEmpPulse(EntityUid uid, ApcComponent component, ref EmpPulseEvent args)
|
||||||
|
{
|
||||||
|
if (component.MainBreakerEnabled)
|
||||||
|
{
|
||||||
|
args.Affected = true;
|
||||||
|
ApcToggleBreaker(uid, component);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Content.Server.Cargo.Systems;
|
using Content.Server.Cargo.Systems;
|
||||||
|
using Content.Server.Emp;
|
||||||
using Content.Server.Power.Components;
|
using Content.Server.Power.Components;
|
||||||
using Content.Shared.Examine;
|
using Content.Shared.Examine;
|
||||||
using Content.Shared.Rejuvenate;
|
using Content.Shared.Rejuvenate;
|
||||||
@@ -17,6 +18,7 @@ namespace Content.Server.Power.EntitySystems
|
|||||||
SubscribeLocalEvent<PowerNetworkBatteryComponent, RejuvenateEvent>(OnNetBatteryRejuvenate);
|
SubscribeLocalEvent<PowerNetworkBatteryComponent, RejuvenateEvent>(OnNetBatteryRejuvenate);
|
||||||
SubscribeLocalEvent<BatteryComponent, RejuvenateEvent>(OnBatteryRejuvenate);
|
SubscribeLocalEvent<BatteryComponent, RejuvenateEvent>(OnBatteryRejuvenate);
|
||||||
SubscribeLocalEvent<BatteryComponent, PriceCalculationEvent>(CalculateBatteryPrice);
|
SubscribeLocalEvent<BatteryComponent, PriceCalculationEvent>(CalculateBatteryPrice);
|
||||||
|
SubscribeLocalEvent<BatteryComponent, EmpPulseEvent>(OnEmpPulse);
|
||||||
|
|
||||||
SubscribeLocalEvent<NetworkBatteryPreSync>(PreSync);
|
SubscribeLocalEvent<NetworkBatteryPreSync>(PreSync);
|
||||||
SubscribeLocalEvent<NetworkBatteryPostSync>(PostSync);
|
SubscribeLocalEvent<NetworkBatteryPostSync>(PostSync);
|
||||||
@@ -87,5 +89,11 @@ namespace Content.Server.Power.EntitySystems
|
|||||||
{
|
{
|
||||||
args.Price += component.CurrentCharge * component.PricePerJoule;
|
args.Price += component.CurrentCharge * component.PricePerJoule;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnEmpPulse(EntityUid uid, BatteryComponent component, ref EmpPulseEvent args)
|
||||||
|
{
|
||||||
|
args.Affected = true;
|
||||||
|
component.UseCharge(args.EnergyConsumption);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,6 +39,9 @@ uplink-c4-desc = Use it to breach walls, airlocks or sabotage equipment. It can
|
|||||||
uplink-c4-bundle-name = C-4 bundle
|
uplink-c4-bundle-name = C-4 bundle
|
||||||
uplink-c4-bundle-desc = Because sometimes quantity is quality. Contains 8 C-4 plastic explosives.
|
uplink-c4-bundle-desc = Because sometimes quantity is quality. Contains 8 C-4 plastic explosives.
|
||||||
|
|
||||||
|
uplink-emp-grenade-name = Emp Grenade
|
||||||
|
uplink-emp-grenade-desc = Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells.
|
||||||
|
|
||||||
# Ammo
|
# Ammo
|
||||||
uplink-pistol-magazine-name = Pistol Magazine (.35 auto)
|
uplink-pistol-magazine-name = Pistol Magazine (.35 auto)
|
||||||
uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with Viper.
|
uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with Viper.
|
||||||
|
|||||||
@@ -142,6 +142,16 @@
|
|||||||
categories:
|
categories:
|
||||||
- UplinkExplosives
|
- UplinkExplosives
|
||||||
|
|
||||||
|
- type: listing
|
||||||
|
id: UplinkEmpGrenade
|
||||||
|
name: uplink-emp-grenade-name
|
||||||
|
description: uplink-emp-grenade-desc
|
||||||
|
productEntity: EmpGrenade
|
||||||
|
cost:
|
||||||
|
Telecrystal: 4
|
||||||
|
categories:
|
||||||
|
- UplinkExplosives
|
||||||
|
|
||||||
# Ammo
|
# Ammo
|
||||||
|
|
||||||
- type: listing
|
- type: listing
|
||||||
|
|||||||
44
Resources/Prototypes/Entities/Effects/emp_effects.yml
Normal file
44
Resources/Prototypes/Entities/Effects/emp_effects.yml
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
- type: entity
|
||||||
|
id: EffectEmpPulse
|
||||||
|
noSpawn: true
|
||||||
|
components:
|
||||||
|
- type: TimedDespawn
|
||||||
|
lifetime: 0.8
|
||||||
|
- type: Sprite
|
||||||
|
netsync: false
|
||||||
|
drawdepth: Effects
|
||||||
|
noRot: true
|
||||||
|
layers:
|
||||||
|
- shader: unshaded
|
||||||
|
map: ["enum.EffectLayers.Unshaded"]
|
||||||
|
sprite: Effects/emp.rsi
|
||||||
|
state: emp_pulse
|
||||||
|
- type: EffectVisuals
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- HideContextMenu
|
||||||
|
- type: EmitSoundOnSpawn
|
||||||
|
sound:
|
||||||
|
path: /Audio/Effects/Lightning/lightningbolt.ogg
|
||||||
|
- type: AnimationPlayer
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: EffectEmpDisabled
|
||||||
|
noSpawn: true
|
||||||
|
components:
|
||||||
|
- type: TimedDespawn
|
||||||
|
lifetime: 0.4
|
||||||
|
- type: Sprite
|
||||||
|
netsync: false
|
||||||
|
drawdepth: Effects
|
||||||
|
noRot: true
|
||||||
|
layers:
|
||||||
|
- shader: unshaded
|
||||||
|
map: ["enum.EffectLayers.Unshaded"]
|
||||||
|
sprite: Effects/emp.rsi
|
||||||
|
state: emp_disable
|
||||||
|
- type: EffectVisuals
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- HideContextMenu
|
||||||
|
- type: AnimationPlayer
|
||||||
@@ -154,3 +154,21 @@
|
|||||||
enum.Trigger.TriggerVisualState.Unprimed: complete
|
enum.Trigger.TriggerVisualState.Unprimed: complete
|
||||||
- type: StaticPrice
|
- type: StaticPrice
|
||||||
price: 25
|
price: 25
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
name: emp grenade
|
||||||
|
description: Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells.
|
||||||
|
parent: GrenadeBase
|
||||||
|
id: EmpGrenade
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Objects/Weapons/Grenades/empgrenade.rsi
|
||||||
|
- type: EmpOnTrigger
|
||||||
|
range: 4
|
||||||
|
energyConsumption: 50000
|
||||||
|
- type: DeleteOnTrigger
|
||||||
|
- type: Appearance
|
||||||
|
visuals:
|
||||||
|
- type: TimerTriggerVisualizer
|
||||||
|
countdown_sound:
|
||||||
|
path: /Audio/Effects/countdown.ogg
|
||||||
|
|||||||
BIN
Resources/Textures/Effects/emp.rsi/emp_disable.png
Normal file
BIN
Resources/Textures/Effects/emp.rsi/emp_disable.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
Resources/Textures/Effects/emp.rsi/emp_pulse.png
Normal file
BIN
Resources/Textures/Effects/emp.rsi/emp_pulse.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
56
Resources/Textures/Effects/emp.rsi/meta.json
Normal file
56
Resources/Textures/Effects/emp.rsi/meta.json
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e52683d3872347af447bb0ff74c420d4a4e91ea8",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "emp_disable",
|
||||||
|
"directions": 4,
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "emp_pulse",
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 717 B |
Binary file not shown.
|
After Width: | Height: | Size: 288 B |
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e52683d3872347af447bb0ff74c420d4a4e91ea8",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "primed",
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "equipped-BELT",
|
||||||
|
"directions": 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 445 B |
Reference in New Issue
Block a user