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

Spell scrolls (#571)

Browse Source 
* scroll spells

* refactor magic system

* Update spawners.yml

* safe use

* Update magic-spells.ftl
This commit is contained in:
Ed
2024-11-09 17:55:16 +03:00
committed by GitHub
parent 6147740f3e
commit c8ab937cf0
17 changed files with 257 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.Actions.cs
View File

@@ -29,16 +29,18 @@ public abstract partial class CP14SharedMagicSystem
if (args is not ICP14DelayedMagicEffect delayedEffect)
return;
if (!CanCastSpell(args.Action, args.Performer))
if (!TryComp<CP14MagicEffectComponent>(args.Action, out var magicEffect))
return;
if (!TryComp<CP14MagicEffectComponent>(args.Action, out var magicEffect))
Entity<CP14MagicEffectComponent> spell = (args.Action, magicEffect);
if (!CanCastSpell(spell, args.Performer))
return;
if (args.CastDelay > 0)
{
var doAfter = new CP14DelayedInstantActionDoAfterEvent(args.Cooldown);
if (!TryCastSpellDelayed(delayedEffect, doAfter, args.Action, args.Performer))
if (!TryCastSpellDelayed(delayedEffect, doAfter, (args.Action, magicEffect), args.Performer))
return;
}
@@ -67,12 +69,15 @@ public abstract partial class CP14SharedMagicSystem
if (args is not ICP14DelayedMagicEffect delayedEffect)
return;
if (!CanCastSpell(args.Action, args.Performer))
return;
if (!TryComp<CP14MagicEffectComponent>(args.Action, out var magicEffect))
return;
Entity<CP14MagicEffectComponent> spell = (args.Action, magicEffect);
if (!CanCastSpell(spell, args.Performer))
return;
if (args.CastDelay > 0)
{
var doAfter = new CP14DelayedEntityWorldTargetActionDoAfterEvent(
@@ -80,7 +85,7 @@ public abstract partial class CP14SharedMagicSystem
EntityManager.GetNetEntity(args.Entity),
args.Cooldown);
if (!TryCastSpellDelayed(delayedEffect, doAfter, args.Action, args.Performer))
if (!TryCastSpellDelayed(delayedEffect, doAfter, (args.Action, magicEffect), args.Performer))
return;
}
@@ -109,10 +114,12 @@ public abstract partial class CP14SharedMagicSystem
if (args is not ICP14DelayedMagicEffect delayedEffect)
return;
if (!CanCastSpell(args.Action, args.Performer))
if (!TryComp<CP14MagicEffectComponent>(args.Action, out var magicEffect))
return;
if (!TryComp<CP14MagicEffectComponent>(args.Action, out var magicEffect))
Entity<CP14MagicEffectComponent> spell = (args.Action, magicEffect);
if (!CanCastSpell(spell, args.Performer))
return;
if (args.CastDelay > 0)
@@ -121,7 +128,7 @@ public abstract partial class CP14SharedMagicSystem
EntityManager.GetNetEntity(args.Target),
args.Cooldown);
if (!TryCastSpellDelayed(delayedEffect, doAfter, args.Action, args.Performer))
if (!TryCastSpellDelayed(delayedEffect, doAfter, (args.Action, magicEffect), args.Performer))
return;
}