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

Magic 4 (#345)

Browse Source 
* - fix: Fix teleport scroll.

* - add: Spell book.

* - add: Smite scroll & update shuttle.

* - tweak: Tweak cost.
This commit is contained in:
Aviu00
2024-06-10 10:57:32 +00:00
committed by GitHub
parent d8e71e4926
commit 01511adbb2
24 changed files with 650 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Magic/MagicSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Linq;
using System.Numerics;
using Content.Server._White.Wizard.Magic;
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Server.Chat.Systems;
@@ -44,6 +45,7 @@ public sealed class MagicSystem : EntitySystem
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly ChatSystem _chat = default!;
[Dependency] private readonly WizardSpellsSystem _wizardSpells = default!;
public override void Initialize()
{
@@ -157,7 +159,7 @@ public sealed class MagicSystem : EntitySystem
private void OnKnockSpell(KnockSpellEvent args)
{
if (args.Handled)
if (!_wizardSpells.CanCast(args)) // WD EDIT
return;
args.Handled = true;
@@ -180,7 +182,7 @@ public sealed class MagicSystem : EntitySystem
private void OnSmiteSpell(SmiteSpellEvent ev)
{
if (ev.Handled)
if (!_wizardSpells.CanCast(ev)) // WD EDIT
return;
ev.Handled = true;