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

Make bible less annoying (#6396)

Browse Source
This commit is contained in:
Rane
2022-01-30 16:33:45 -05:00
committed by GitHub
parent 057a9ea4f3
commit 35076c4c0a
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Bible/BibleSystem.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Server.Bible
{ {
_popupSystem.PopupEntity(Loc.GetString("bible-sizzle"), args.User, Filter.Entities(args.User)); _popupSystem.PopupEntity(Loc.GetString("bible-sizzle"), args.User, Filter.Entities(args.User));
SoundSystem.Play(Filter.Pvs(args.User), "/Audio/Effects/lightburn.ogg"); SoundSystem.Play(Filter.Pvs(args.User), "/Audio/Effects/lightburn.ogg", args.User);
_damageableSystem.TryChangeDamage(args.User, component.DamageOnUntrainedUse, true); _damageableSystem.TryChangeDamage(args.User, component.DamageOnUntrainedUse, true);
return; return;
@@ -72,7 +72,7 @@ namespace Content.Server.Bible
var selfFailMessage = Loc.GetString("bible-heal-fail-self", ("target", args.Target),("bible", uid)); var selfFailMessage = Loc.GetString("bible-heal-fail-self", ("target", args.Target),("bible", uid));
_popupSystem.PopupEntity(selfFailMessage, args.User, Filter.Entities(args.User)); _popupSystem.PopupEntity(selfFailMessage, args.User, Filter.Entities(args.User));
SoundSystem.Play(Filter.Pvs(args.Target.Value), "/Audio/Effects/hit_kick.ogg"); SoundSystem.Play(Filter.Pvs(args.Target.Value), "/Audio/Effects/hit_kick.ogg", args.User);
_damageableSystem.TryChangeDamage(args.Target.Value, component.DamageOnFail, true); _damageableSystem.TryChangeDamage(args.Target.Value, component.DamageOnFail, true);
return; return;
} }
@@ -84,7 +84,7 @@ namespace Content.Server.Bible
var selfMessage = Loc.GetString("bible-heal-success-self", ("target", args.Target),("bible", uid)); var selfMessage = Loc.GetString("bible-heal-success-self", ("target", args.Target),("bible", uid));
_popupSystem.PopupEntity(selfMessage, args.User, Filter.Entities(args.User)); _popupSystem.PopupEntity(selfMessage, args.User, Filter.Entities(args.User));
SoundSystem.Play(Filter.Pvs(args.Target.Value), "/Audio/Effects/holy.ogg"); SoundSystem.Play(Filter.Pvs(args.Target.Value), "/Audio/Effects/holy.ogg", args.User);
_damageableSystem.TryChangeDamage(args.Target.Value, component.Damage, true); _damageableSystem.TryChangeDamage(args.Target.Value, component.Damage, true);
} }

2
Content.Server/Bible/Components/BibleComponent.cs
View File

@@ -33,6 +33,6 @@ namespace Content.Server.Bible.Components
public TimeSpan LastAttackTime; public TimeSpan LastAttackTime;
public TimeSpan CooldownEnd; public TimeSpan CooldownEnd;
public float CooldownTime { get; } = 1f; public float CooldownTime { get; } = 5f;
} }
} }

BIN
Resources/Audio/Effects/holy.ogg
View File

Binary file not shown.

10
Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
View File

@@ -7,15 +7,15 @@
- type: Bible - type: Bible
damage: damage:
groups: groups:
Brute: -7 Brute: -35
Burn: -7 Burn: -35
damageOnFail: damageOnFail:
groups: groups:
Brute: 4 Brute: 15
Airloss: 6 Airloss: 25
damageOnUntrainedUse: ## What a non-chaplain takes when attempting to heal someone damageOnUntrainedUse: ## What a non-chaplain takes when attempting to heal someone
groups: groups:
Burn: 10 Burn: 30
- type: ItemCooldown - type: ItemCooldown
- type: Sprite - type: Sprite
netsync: false netsync: false