juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADAPTATION

Browse Source
This commit is contained in:
Ed
2025-07-08 11:46:35 +03:00
parent 7a8326d41e
commit 3f7bb1f5c6
17 changed files with 28 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.Checks.cs
View File

@@ -6,6 +6,7 @@ using Content.Shared._CP14.Religion.Systems;
using Content.Shared.CombatMode.Pacification;
using Content.Shared.Damage.Components;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Popups;
@@ -18,6 +19,7 @@ public abstract partial class CP14SharedMagicSystem
{
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly CP14SharedReligionGodSystem _god = default!;
[Dependency] private readonly SharedHandsSystem _hand = default!;
private void InitializeChecks()
{
@@ -89,14 +91,7 @@ public abstract partial class CP14SharedMagicSystem
{
if (TryComp<HandsComponent>(args.Performer, out var hands) || hands is not null)
{
var freeHand = 0;
foreach (var hand in hands.Hands)
{
if (hand.Value.IsEmpty)
freeHand++;
}
if (freeHand >= ent.Comp.FreeHandRequired)
if (_hand.CountFreeableHands((args.Performer, hands)) >= ent.Comp.FreeHandRequired)
return;
}