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

Unique artifacts (#859)

Browse Source 
* unique artifacts

* Update demiplane_keys.yml

* shadow staff

* fixes

* rename solution

* Update CP14UniqueLootSystem.cs

* try fix

* Update CP14UniqueLootSystem.cs
This commit is contained in:
Ed
2025-02-08 17:29:29 +03:00
committed by GitHub
parent 9ed582d7e4
commit 88c1569266
36 changed files with 1318 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs
View File

@@ -67,12 +67,17 @@ public abstract partial class CP14SharedMagicSystem
if (_doAfter.IsRunning(action.Comp.ActiveDoAfter))
return;
// event may return an empty entity with id = 0, which causes bugs
var _target = entityTarget;
if (_target is not null && _target.Value.Id == 0)
_target = null;
var evStart = new CP14StartCastMagicEffectEvent(performer);
RaiseLocalEvent(action, ref evStart);
var fromItem = action.Comp.SpellStorage is not null;
var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, toggleable.CastTime, doAfter, action, used: action.Comp.SpellStorage, target: entityTarget)
var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, toggleable.CastTime, doAfter, action, used: action.Comp.SpellStorage, target: _target)
{
BreakOnMove = toggleable.BreakOnMove,
BreakOnDamage = toggleable.BreakOnDamage,
@@ -92,7 +97,7 @@ public abstract partial class CP14SharedMagicSystem
toggled.DoAfterId = doAfterId;
toggled.Cooldown = toggleable.Cooldown;
toggled.EntityTarget = entityTarget;
toggled.EntityTarget = _target;
toggled.WorldTarget = worldTarget;
action.Comp.ActiveDoAfter = doAfterId;