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

Chaplain stuff (#98)

Browse Source 
* - add: Null rod.

* - add: Only chaplain can use holy weapons.

* - add: Chaplain is cult immune.

* - fix: Fix component granting.

* - add: Only chaplain can use null rod.

* - add: Armaments beacon.

* - add: Chaplain playtime requirement.
This commit is contained in:
Aviu00
2024-02-20 19:28:44 +09:00
committed by GitHub
parent e6b6274874
commit 03fed0caa7
158 changed files with 2342 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
View File

@@ -93,3 +93,8 @@ public record struct GetMeleeAttackRateEvent(EntityUid Weapon, float Rate, float
/// </summary>
[ByRefEvent]
public record struct GetHeavyDamageModifierEvent(EntityUid Weapon, FixedPoint2 DamageModifier, float Multipliers, EntityUid User);
// WD START
[ByRefEvent]
public record struct MeleeBlockAttemptEvent(EntityUid Attacker, bool Blocked = false);
// WD END

6
Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
View File

@@ -60,10 +60,14 @@ public sealed partial class MeleeWeaponComponent : Component
[ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
public bool Attacking = false;
// WD
// WD START
[ViewVariables(VVAccess.ReadWrite), DataField]
public bool CanHeavyAttack = true;
[ViewVariables(VVAccess.ReadWrite), DataField]
public bool IgnoreResistances;
// WD END
/// <summary>
/// If true, attacks will be repeated automatically without requiring the mouse button to be lifted.
/// </summary>

19
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -22,6 +22,7 @@ using Content.Shared.Weapons.Ranged.Components;
using Content.Shared.Weapons.Ranged.Events;
using Content.Shared.Weapons.Ranged.Systems;
using Content.Shared._White;
using Content.Shared._White.Chaplain;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
@@ -500,6 +501,13 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (hitEvent.Handled)
return;
// WD START
var blockEvent = new MeleeBlockAttemptEvent(user);
RaiseLocalEvent(target.Value, ref blockEvent);
if (blockEvent.Blocked)
return;
// WD END
var targets = new List<EntityUid>(1)
{
target.Value
@@ -519,7 +527,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
RaiseLocalEvent(target.Value, attackedEvent);
var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user);
var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, component.IgnoreResistances, origin:user); // WD EDIT
if (damageResult != null && damageResult.Any())
{
@@ -658,11 +666,18 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (!Blocker.CanAttack(user, entity, (weapon, component)))
continue;
// WD START
var blockEvent = new MeleeBlockAttemptEvent(user);
RaiseLocalEvent(entity, ref blockEvent);
if (blockEvent.Blocked)
continue;
// WD END
var attackedEvent = new AttackedEvent(meleeUid, user, GetCoordinates(ev.Coordinates));
RaiseLocalEvent(entity, attackedEvent);
var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user);
var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, component.IgnoreResistances, origin:user); // WD EDIT
if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
{