Gives Chaplain their Bible 🙏 (#6269)
This commit is contained in:
@@ -251,6 +251,7 @@ namespace Content.Client.Entry
|
|||||||
"ExplosionLaunched",
|
"ExplosionLaunched",
|
||||||
"BeingCloned",
|
"BeingCloned",
|
||||||
"Advertise",
|
"Advertise",
|
||||||
|
"Bible",
|
||||||
"PowerNetworkBattery",
|
"PowerNetworkBattery",
|
||||||
"BatteryCharger",
|
"BatteryCharger",
|
||||||
"UnpoweredFlashlight",
|
"UnpoweredFlashlight",
|
||||||
@@ -299,7 +300,7 @@ namespace Content.Client.Entry
|
|||||||
"ArtifactInteractionTrigger",
|
"ArtifactInteractionTrigger",
|
||||||
"Artifact",
|
"Artifact",
|
||||||
"RandomArtifactSprite",
|
"RandomArtifactSprite",
|
||||||
"EnergySword",
|
"EnergySword"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
92
Content.Server/Bible/BibleSystem.cs
Normal file
92
Content.Server/Bible/BibleSystem.cs
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
using System;
|
||||||
|
using Robust.Shared.GameObjects;
|
||||||
|
using Content.Shared.Interaction;
|
||||||
|
using Content.Shared.Inventory;
|
||||||
|
using Content.Shared.MobState.Components;
|
||||||
|
using Content.Shared.Damage;
|
||||||
|
using Content.Shared.Popups;
|
||||||
|
using Content.Server.Cooldown;
|
||||||
|
using Content.Server.Inventory;
|
||||||
|
using Content.Server.Mind.Components;
|
||||||
|
using Content.Server.Bible.Components;
|
||||||
|
using Content.Server.Popups;
|
||||||
|
using Robust.Shared.IoC;
|
||||||
|
using Robust.Shared.Random;
|
||||||
|
using Robust.Shared.Audio;
|
||||||
|
using Robust.Shared.Player;
|
||||||
|
using Robust.Shared.Localization;
|
||||||
|
using Robust.Shared.Timing;
|
||||||
|
|
||||||
|
|
||||||
|
namespace Content.Server.Bible
|
||||||
|
{
|
||||||
|
public class BibleSystem : EntitySystem
|
||||||
|
{
|
||||||
|
[Dependency] private readonly InventorySystem _invSystem = default!;
|
||||||
|
[Dependency] private readonly IRobustRandom _random = default!;
|
||||||
|
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
||||||
|
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
|
||||||
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
||||||
|
|
||||||
|
public override void Initialize()
|
||||||
|
{
|
||||||
|
base.Initialize();
|
||||||
|
|
||||||
|
SubscribeLocalEvent<BibleComponent, AfterInteractEvent>(OnAfterInteract);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnAfterInteract(EntityUid uid, BibleComponent component, AfterInteractEvent args)
|
||||||
|
{
|
||||||
|
var currentTime = _gameTiming.CurTime;
|
||||||
|
|
||||||
|
if (currentTime < component.CooldownEnd)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (args.Target == null || args.Target == args.User || !HasComp<MobStateComponent>(args.Target))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
component.LastAttackTime = currentTime;
|
||||||
|
component.CooldownEnd = component.LastAttackTime + TimeSpan.FromSeconds(component.CooldownTime);
|
||||||
|
RaiseLocalEvent(uid, new RefreshItemCooldownEvent(component.LastAttackTime, component.CooldownEnd), false);
|
||||||
|
|
||||||
|
if (!HasComp<BibleUserComponent>(args.User))
|
||||||
|
{
|
||||||
|
_popupSystem.PopupEntity(Loc.GetString("bible-sizzle"), args.User, Filter.Entities(args.User));
|
||||||
|
|
||||||
|
SoundSystem.Play(Filter.Pvs(args.User), "/Audio/Effects/lightburn.ogg");
|
||||||
|
_damageableSystem.TryChangeDamage(args.User, component.DamageOnUntrainedUse, true);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_invSystem.TryGetSlotEntity(args.Target.Value, "head", out var entityUid))
|
||||||
|
{
|
||||||
|
if (_random.Prob(component.FailChance))
|
||||||
|
{
|
||||||
|
var othersFailMessage = Loc.GetString("bible-heal-fail-others", ("user", args.User),("target", args.Target),("bible", uid));
|
||||||
|
_popupSystem.PopupEntity(othersFailMessage, args.User, Filter.Pvs(args.User).RemoveWhereAttachedEntity(puid => puid == args.User));
|
||||||
|
|
||||||
|
var selfFailMessage = Loc.GetString("bible-heal-fail-self", ("target", args.Target),("bible", uid));
|
||||||
|
_popupSystem.PopupEntity(selfFailMessage, args.User, Filter.Entities(args.User));
|
||||||
|
|
||||||
|
SoundSystem.Play(Filter.Pvs(args.Target.Value), "/Audio/Effects/hit_kick.ogg");
|
||||||
|
_damageableSystem.TryChangeDamage(args.Target.Value, component.DamageOnFail, true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var othersMessage = Loc.GetString("bible-heal-success-others", ("user", args.User),("target", args.Target),("bible", uid));
|
||||||
|
_popupSystem.PopupEntity(othersMessage, args.User, Filter.Pvs(args.User).RemoveWhereAttachedEntity(puid => puid == args.User));
|
||||||
|
|
||||||
|
var selfMessage = Loc.GetString("bible-heal-success-self", ("target", args.Target),("bible", uid));
|
||||||
|
_popupSystem.PopupEntity(selfMessage, args.User, Filter.Entities(args.User));
|
||||||
|
|
||||||
|
SoundSystem.Play(Filter.Pvs(args.Target.Value), "/Audio/Effects/holy.ogg");
|
||||||
|
_damageableSystem.TryChangeDamage(args.Target.Value, component.Damage, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
38
Content.Server/Bible/Components/BibleComponent.cs
Normal file
38
Content.Server/Bible/Components/BibleComponent.cs
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
using System;
|
||||||
|
using Robust.Shared.Analyzers;
|
||||||
|
using Robust.Shared.GameObjects;
|
||||||
|
using Content.Shared.Damage;
|
||||||
|
using Content.Shared.Damage.Prototypes;
|
||||||
|
using Robust.Shared.Serialization.Manager.Attributes;
|
||||||
|
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
|
||||||
|
using Robust.Shared.ViewVariables;
|
||||||
|
|
||||||
|
namespace Content.Server.Bible.Components
|
||||||
|
{
|
||||||
|
[RegisterComponent, ComponentProtoName("Bible")]
|
||||||
|
public sealed class BibleComponent : Component
|
||||||
|
{
|
||||||
|
|
||||||
|
// Damage that will be healed on a success
|
||||||
|
[DataField("damage", required: true)]
|
||||||
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public DamageSpecifier Damage = default!;
|
||||||
|
// Damage that will be dealt on a failure
|
||||||
|
[DataField("damageOnFail", required: true)]
|
||||||
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public DamageSpecifier DamageOnFail = default!;
|
||||||
|
// Damage that will be dealt when a non-chaplain attempts to heal
|
||||||
|
[DataField("damageOnUntrainedUse", required: true)]
|
||||||
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public DamageSpecifier DamageOnUntrainedUse = default!;
|
||||||
|
|
||||||
|
//Chance the bible will fail to heal someone with no helmet
|
||||||
|
[DataField("failChance", required:true)]
|
||||||
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public float FailChance = 0.34f;
|
||||||
|
|
||||||
|
public TimeSpan LastAttackTime;
|
||||||
|
public TimeSpan CooldownEnd;
|
||||||
|
public float CooldownTime { get; } = 1f;
|
||||||
|
}
|
||||||
|
}
|
||||||
8
Content.Server/Bible/Components/BibleUserComponent.cs
Normal file
8
Content.Server/Bible/Components/BibleUserComponent.cs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
using Robust.Shared.GameObjects;
|
||||||
|
using Robust.Shared.Analyzers;
|
||||||
|
|
||||||
|
namespace Content.Server.Bible.Components
|
||||||
|
{
|
||||||
|
[RegisterComponent, ComponentProtoName("BibleUser")]
|
||||||
|
public sealed class BibleUserComponent : Component {}
|
||||||
|
}
|
||||||
BIN
Resources/Audio/Effects/holy.ogg
Normal file
BIN
Resources/Audio/Effects/holy.ogg
Normal file
Binary file not shown.
@@ -16,3 +16,5 @@ poster_broken.ogg taken from https://github.com/tgstation/tgstation/blob/2834383
|
|||||||
poster_being_set.ogg taken from https://github.com/tgstation/tgstation/blob/2834383245d2129a106acef3afd17b81e1e64777/sound/items/poster_ripped.ogg
|
poster_being_set.ogg taken from https://github.com/tgstation/tgstation/blob/2834383245d2129a106acef3afd17b81e1e64777/sound/items/poster_ripped.ogg
|
||||||
|
|
||||||
fire.ogg taken and edited from https://freesound.org/people/raremess/sounds/222557/
|
fire.ogg taken and edited from https://freesound.org/people/raremess/sounds/222557/
|
||||||
|
|
||||||
|
holy.ogg taken from https://freesound.org/people/random_intruder/sounds/392172/ and edited
|
||||||
|
|||||||
5
Resources/Locale/en-US/chapel/bible.ftl
Normal file
5
Resources/Locale/en-US/chapel/bible.ftl
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
bible-heal-success-self = You hit {THE($target)} with {THE($bible)}, and their wounds close in a flash of holy light!
|
||||||
|
bible-heal-success-others = {CAPITALIZE(THE($user))} hits {THE($target)} with {THE($bible)}, and their wounds close in a flash of holy light!
|
||||||
|
bible-heal-fail-self = You hit {THE($target)} with {THE($bible)}, and it lands with a sad thwack, dazing them!
|
||||||
|
bible-heal-fail-others = {CAPITALIZE(THE$user))} hits {THE($target)} with {THE($bible)}, and it lands with a sad thack, dazing them!
|
||||||
|
bible-sizzle = The book sizzles in your hands!
|
||||||
@@ -102,3 +102,13 @@
|
|||||||
- type: StorageFill
|
- type: StorageFill
|
||||||
contents:
|
contents:
|
||||||
- id: BoxSurvival
|
- id: BoxSurvival
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
abstract: true
|
||||||
|
parent: ClothingBackpack
|
||||||
|
id: ClothingBackpackChaplainFilled
|
||||||
|
components:
|
||||||
|
- type: StorageFill
|
||||||
|
contents:
|
||||||
|
- id: BoxSurvival
|
||||||
|
- id: Bible
|
||||||
|
|||||||
@@ -81,3 +81,13 @@
|
|||||||
- type: StorageFill
|
- type: StorageFill
|
||||||
contents:
|
contents:
|
||||||
- id: BoxSurvival
|
- id: BoxSurvival
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
abstract: true
|
||||||
|
parent: ClothingBackpackDuffel
|
||||||
|
id: ClothingBackpackDuffelChaplainFilled
|
||||||
|
components:
|
||||||
|
- type: StorageFill
|
||||||
|
contents:
|
||||||
|
- id: BoxSurvival
|
||||||
|
- id: Bible
|
||||||
|
|||||||
@@ -81,3 +81,13 @@
|
|||||||
- type: StorageFill
|
- type: StorageFill
|
||||||
contents:
|
contents:
|
||||||
- id: BoxSurvival
|
- id: BoxSurvival
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
abstract: true
|
||||||
|
parent: ClothingBackpackSatchel
|
||||||
|
id: ClothingBackpackSatchelChaplainFilled
|
||||||
|
components:
|
||||||
|
- type: StorageFill
|
||||||
|
contents:
|
||||||
|
- id: BoxSurvival
|
||||||
|
- id: Bible
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
- type: entity
|
||||||
|
name: bible
|
||||||
|
description: New Interstellar Version 2340
|
||||||
|
parent: BaseItem
|
||||||
|
id: Bible
|
||||||
|
components:
|
||||||
|
- type: Bible
|
||||||
|
damage:
|
||||||
|
groups:
|
||||||
|
Brute: -7
|
||||||
|
Burn: -7
|
||||||
|
damageOnFail:
|
||||||
|
groups:
|
||||||
|
Brute: 4
|
||||||
|
Airloss: 6
|
||||||
|
damageOnUntrainedUse: ## What a non-chaplain takes when attempting to heal someone
|
||||||
|
groups:
|
||||||
|
Burn: 10
|
||||||
|
- type: ItemCooldown
|
||||||
|
- type: Sprite
|
||||||
|
netsync: false
|
||||||
|
sprite: Objects/Specific/Chapel/bible.rsi
|
||||||
|
state: icon
|
||||||
|
- type: Item
|
||||||
|
size: 15
|
||||||
|
sprite: Objects/Specific/Chapel/bible.rsi
|
||||||
|
prefix: inhand
|
||||||
|
- type: Storage
|
||||||
|
capacity: 10
|
||||||
|
storageSoundCollection:
|
||||||
|
collection: storageRustle
|
||||||
|
|
||||||
@@ -9,15 +9,18 @@
|
|||||||
access:
|
access:
|
||||||
- Chapel
|
- Chapel
|
||||||
- Maintenance
|
- Maintenance
|
||||||
|
special:
|
||||||
|
- !type:AddComponentSpecial
|
||||||
|
component: BibleUser #Lets them heal with bibles
|
||||||
|
|
||||||
- type: startingGear
|
- type: startingGear
|
||||||
id: ChaplainGear
|
id: ChaplainGear
|
||||||
equipment:
|
equipment:
|
||||||
jumpsuit: ClothingUniformJumpsuitChaplain
|
jumpsuit: ClothingUniformJumpsuitChaplain
|
||||||
back: ClothingBackpackFilled
|
back: ClothingBackpackChaplainFilled
|
||||||
shoes: ClothingShoesColorBlack
|
shoes: ClothingShoesColorBlack
|
||||||
id: ChaplainPDA
|
id: ChaplainPDA
|
||||||
ears: ClothingHeadsetService
|
ears: ClothingHeadsetService
|
||||||
innerclothingskirt: ClothingUniformJumpskirtChaplain
|
innerclothingskirt: ClothingUniformJumpskirtChaplain
|
||||||
satchel: ClothingBackpackSatchelFilled
|
satchel: ClothingBackpackSatchelChaplainFilled
|
||||||
duffelbag: ClothingBackpackDuffelFilled
|
duffelbag: ClothingBackpackDuffelChaplainFilled
|
||||||
|
|||||||
BIN
Resources/Textures/Objects/Specific/Chapel/bible.rsi/icon.png
Normal file
BIN
Resources/Textures/Objects/Specific/Chapel/bible.rsi/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 889 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-left",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-right",
|
||||||
|
"directions": 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user