Merge remote-tracking branch 'upstream/master' into add-lockers-to-animate-blacklist

Author: imatsoup

Content.Shared/Magic/Events/CellularSmiteSpellEvent.cs

@@ -0,0 +1,13 @@
+using Content.Shared.Actions;
+using Content.Shared.Damage;
+
+namespace Content.Shared.Magic.Events;
+
+public sealed partial class CellularSmiteSpellEvent : EntityTargetActionEvent
+{
+    //<summary>
+    // Damage that the smite spell will do.
+    //</summary>
+    [DataField]
+    public DamageSpecifier smiteDamage = new();
+}

Content.Shared/Magic/SharedMagicSystem.cs

@@ -2,17 +2,23 @@
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Systems;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
+using Content.Shared.Jittering;
 using Content.Shared.Lock;
 using Content.Shared.Magic.Components;
 using Content.Shared.Magic.Events;
 using Content.Shared.Maps;
 using Content.Shared.Mind;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.Speech.Muting;
@@ -52,16 +58,19 @@ public abstract class SharedMagicSystem : EntitySystem
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly SharedDoorSystem _door = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedJitteringSystem _jittering = default!;
     [Dependency] private readonly LockSystem _lock = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
 
     private static readonly ProtoId<TagPrototype> InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell";
 
@@ -76,6 +85,7 @@ public override void Initialize()
         SubscribeLocalEvent<ProjectileSpellEvent>(OnProjectileSpell);
         SubscribeLocalEvent<ChangeComponentsSpellEvent>(OnChangeComponentsSpell);
         SubscribeLocalEvent<SmiteSpellEvent>(OnSmiteSpell);
+        SubscribeLocalEvent<CellularSmiteSpellEvent>(OnCellularSmiteSpell);
         SubscribeLocalEvent<KnockSpellEvent>(OnKnockSpell);
         SubscribeLocalEvent<ChargeSpellEvent>(OnChargeSpell);
         SubscribeLocalEvent<RandomGlobalSpawnSpellEvent>(OnRandomGlobalSpawnSpell);
@@ -391,6 +401,31 @@ private void OnSmiteSpell(SmiteSpellEvent ev)
         _body.GibBody(ev.Target, true, body);
     }
 
+    private void OnCellularSmiteSpell(CellularSmiteSpellEvent ev)
+    {
+        //Stacking genetic damage on people who are already downed or dead is cringe
+        if (TryComp<DamageableComponent>(ev.Target, out var damageable) &&
+        HasComp<MobStateComponent>(ev.Target)){
+            if(_mobStateSystem.IsCritical(ev.Target))
+                return;
+            if(_mobStateSystem.IsDead(ev.Target))
+                return;
+        }
+        if (ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer))
+            return;
+
+        ev.Handled = true;
+
+        // Given that this was intended to blow gibs everywhere, not suitable for this version of the spell (gets people stuck in walls)
+        // var direction = _transform.GetMapCoordinates(ev.Target, Transform(ev.Target)).Position - _transform.GetMapCoordinates(ev.Performer, Transform(ev.Performer)).Position;
+        // var impulseVector = direction * 5000;
+
+        //_physics.ApplyLinearImpulse(ev.Target, impulseVector);
+
+        _jittering.DoJitter(ev.Target, TimeSpan.FromSeconds(1f), false, 80f, 8f, true);
+        _damageableSystem.TryChangeDamage(ev.Target, ev.smiteDamage, true);
+    }
+
     // End Touch Spells
     #endregion
     #region Knock Spells

Resources/Locale/en-US/store/spellbook-catalog.ftl

@@ -41,6 +41,9 @@ spellbook-animate-description = Bring an inanimate object to life!
 spellbook-smite-name = Smite
 spellbook-smite-desc = Don't like them? EXPLODE them into giblets! Requires Wizard Robe & Hat.
 
+spellbook-cellular-smite-name = Smite
+spellbook-cellular-smite-desc = Don't like them? Smite em! Requires Wizard Robe & Hat.
+
 spellbook-cluwne-name = Cluwne's Curse
 spellbook-cluwne-desc = For when you really hate someone and Smite isn't enough. Requires Wizard Robe & Hat.
 

Resources/Maps/Ronstation/atlas-2.yml

@@ -60,9 +60,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 30

Resources/Maps/_Ronstation/atlas-2.yml

@@ -60,9 +60,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 30

Resources/Maps/_Ronstation/cluster-2.yml

@@ -6088,9 +6088,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AcousticGuitarInstrument
@@ -6100,75 +6098,6 @@ entities:
     - type: Transform
       pos: 3.5402613,7.6028175
       parent: 1
-- proto: ActionToggleBlock
-  entities:
-  - uid: 10629
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 10628
-    - type: InstantAction
-      originalIconColor: '#FFFFFFFF'
-      container: 10628
-- proto: ActionToggleInternals
-  entities:
-  - uid: 797
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 795
-    - type: InstantAction
-      originalIconColor: '#FFFFFFFF'
-      container: 795
-  - uid: 826
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 824
-    - type: InstantAction
-      originalIconColor: '#FFFFFFFF'
-      container: 824
-  - uid: 966
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 960
-    - type: InstantAction
-      originalIconColor: '#FFFFFFFF'
-      container: 960
-- proto: ActionToggleJetpack
-  entities:
-  - uid: 796
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 795
-    - type: InstantAction
-      originalIconColor: '#FFFFFFFF'
-      container: 795
-  - uid: 825
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 824
-    - type: InstantAction
-      originalIconColor: '#FFFFFFFF'
-      container: 824
-  - uid: 965
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 960
-    - type: InstantAction
-      originalIconColor: '#FFFFFFFF'
-      container: 960
 - proto: AirAlarm
   entities:
   - uid: 2084
@@ -63924,49 +63853,16 @@ entities:
     - type: Transform
       pos: 27.287785,23.77419
       parent: 1
-    - type: GasTank
-      toggleActionEntity: 797
-    - type: Jetpack
-      toggleActionEntity: 796
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 796
-          - 797
   - uid: 824
     components:
     - type: Transform
       pos: 27.298203,23.440857
       parent: 1
-    - type: GasTank
-      toggleActionEntity: 826
-    - type: Jetpack
-      toggleActionEntity: 825
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 825
-          - 826
   - uid: 960
     components:
     - type: Transform
       pos: 27.339869,23.576273
       parent: 1
-    - type: GasTank
-      toggleActionEntity: 966
-    - type: Jetpack
-      toggleActionEntity: 965
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 965
-          - 966
 - proto: KitchenMicrowave
   entities:
   - uid: 1813
@@ -74434,14 +74330,6 @@ entities:
     - type: Transform
       pos: 26.350285,23.71169
       parent: 1
-    - type: Blocking
-      blockingToggleActionEntity: 10629
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 10629
 - proto: RubberStampApproved
   entities:
   - uid: 4013