tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small tweak and cleanup of spells and actions (#15943)

Browse Source
This commit is contained in:
AJCM-git
2023-05-01 04:29:18 -04:00
committed by GitHub
parent 2e2cbe1f02
commit d5b3585c09
7 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ using Content.Server.Body.Systems;
using Content.Server.Chat.Systems;
using Content.Server.Coordinates.Helpers;
using Content.Server.Doors.Systems;
using Content.Server.Magic.Components;
using Content.Server.Magic.Events;
using Content.Server.Weapons.Ranged.Systems;
using Content.Shared.Actions;
@@ -72,7 +73,7 @@ public sealed class MagicSystem : EntitySystem
if (args.Handled || args.Cancelled)
return;
_actionsSystem.AddActions(args.Args.User, component.Spells, uid);
_actionsSystem.AddActions(args.Args.User, component.Spells, component.LearnPermanently ? null : uid);
args.Handled = true;
}
@@ -166,12 +167,14 @@ public sealed class MagicSystem : EntitySystem
{
// If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
var mapPos = pos.ToMap(EntityManager);
EntityCoordinates spawnCoords = _mapManager.TryFindGridAt(mapPos, out var grid)
var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var grid)
? pos.WithEntityId(grid.Owner, EntityManager)
: new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
var ent = Spawn(ev.Prototype, spawnCoords);
_gunSystem.ShootProjectile(ent, ev.Target.Position - mapPos.Position, userVelocity, ev.Performer);
var direction = ev.Target.ToMapPos(EntityManager, _transformSystem) -
spawnCoords.ToMapPos(EntityManager, _transformSystem);
_gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer);
}
}