updated cocoon version

Author: SkaldetSkaeg

Content.Server/SS220/CultYogg/Corruption/CultYoggCocoonSystem.cs

@@ -4,22 +4,24 @@
 using Content.Shared.Interaction.Events;
 using Robust.Shared.Audio.Systems;
 using Content.Shared.SS220.CultYogg.Corruption;
-using Content.Shared.Inventory.Events;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+using JetBrains.FormatRipper.Elf;
 
 namespace Content.Server.SS220.CultYogg.Corruption;
 
 public sealed class CultYoggCocoonSystem : EntitySystem
 {
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<CultYoggCocoonComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<CultYoggWeaponComponent, DroppedEvent>(OnUnequip);
+        SubscribeLocalEvent<CultYoggWeaponComponent, EntGotRemovedFromContainerMessage>(OnRemove);
     }
     private void OnUseInHand(Entity<CultYoggCocoonComponent> ent, ref UseInHandEvent args)
     {
@@ -35,6 +37,7 @@ private void OnUseInHand(Entity<CultYoggCocoonComponent> ent, ref UseInHandEvent
             comp.SoftDeletedOriginalEntity = corruptComp.SoftDeletedOriginalEntity;
             comp.Recipe = corruptComp.Recipe;
         }
+
         EntityManager.DeleteEntity(ent);
         _hands.PickupOrDrop(args.User, newEnt);
         if (ent.Comp.Sound != null)
@@ -46,8 +49,34 @@ private void OnUseInHand(Entity<CultYoggCocoonComponent> ent, ref UseInHandEvent
 
         args.Handled = true;
     }
-    private void OnUnequip(Entity<CultYoggWeaponComponent> ent, ref DroppedEvent args)
+    private void OnRemove(Entity<CultYoggWeaponComponent> ent, ref EntGotRemovedFromContainerMessage args)
+    {
+        ent.Comp.BeforeCocooningTime = _timing.CurTime + ent.Comp.CocooningCooldown;
+    }
+    public override void Update(float frameTime)
     {
-        ;
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<CultYoggWeaponComponent>();
+        while (query.MoveNext(out var ent, out var comp))
+        {
+            if (comp.BeforeCocooningTime is null)
+                continue;
+
+            if (_timing.CurTime < comp.BeforeCocooningTime)
+                continue;
+
+            if (!TryComp<CultYoggCorruptedComponent>(ent, out var corruptComp))
+                return;
+
+            var coords = Transform(ent).Coordinates;
+            var newEnt = Spawn(comp.Item, coords);
+
+            var corrComp = EnsureComp<CultYoggCorruptedComponent>(newEnt);
+            corrComp.SoftDeletedOriginalEntity = corruptComp.SoftDeletedOriginalEntity;
+            corrComp.Recipe = corruptComp.Recipe;
+
+            EntityManager.DeleteEntity(ent);
+        }
     }
 }

Content.Server/SS220/CultYogg/Corruption/CultYoggWeaponComponent.cs

@@ -10,4 +10,16 @@ namespace Content.Server.SS220.CultYogg.Corruption;
 
 public sealed partial class CultYoggWeaponComponent : Component
 {
+    /// <summary>
+    /// how much time required to cocoon enity
+    /// </summary>
+    [DataField]
+    public TimeSpan CocooningCooldown = TimeSpan.FromSeconds(5);
+
+    public TimeSpan? BeforeCocooningTime;
+    /// <summary>
+    /// What kind of entity it will cocoon in.
+    /// </summary>
+    [DataField("item", required: true)]
+    public ProtoId<EntityPrototype>? Item { get; private set; }
 }

Resources/Prototypes/SS220/CultYogg/beach.yml

@@ -7,6 +7,8 @@
   suffix: CultYogg
   description: description
   components:
+  - type: CultYoggWeapon
+    item: CultYoggCocoonBeach
   - type: Sprite
     sprite: SS220/Objects/Weapons/Melee/cult_yogg_beach.rsi
     state: icon

Resources/Prototypes/SS220/CultYogg/claw.yml

@@ -1,12 +1,14 @@
 # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
 - type: entity
-  name: cult claw
+  name: Claw
   parent: BaseItem
   id: ClawCultYogg
   suffix: CultYogg
   description: description
   components:
+  - type: CultYoggWeapon
+    item: CultYoggCocoonClaw
   - type: Sprite
     sprite: SS220/Objects/Weapons/Melee/cult_yogg_claw.rsi
     state: icon

Resources/Prototypes/SS220/CultYogg/cultcocoon.yml

@@ -42,7 +42,7 @@
   suffix: Horn
   components:
   - type: CultYoggCocoon
-    item: HornCultYogg
+    item:
     sound:
       path: /Audio/Effects/unwrap.ogg
 

Resources/Prototypes/SS220/CultYogg/horn.yml

@@ -4,6 +4,8 @@
   id: HornCultYogg
   suffix: CultYogg
   components:
+    - type: CultYoggWeapon
+      item: CultYoggCocoonHorn
     - type: Gun
       soundGunshot: /Audio/Weapons/Guns/Gunshots/harpoon.ogg
       soundEmpty: null

Resources/Prototypes/SS220/CultYogg/spikegun.yml

@@ -5,6 +5,7 @@
   suffix: CultYogg
   components:
     - type: CultYoggWeapon
+      item: CultYoggCocoonSpikegun
     - type: AmmoCounter
     - type: Gun
       soundGunshot: /Audio/Weapons/Guns/Gunshots/harpoon.ogg

Resources/Prototypes/SS220/CultYogg/spitballer.yml

@@ -4,6 +4,8 @@
   suffix: CultYogg
   id: Spitballer
   components:
+    - type: CultYoggWeapon
+      item: CultYoggCocoonSpitballer
     - type: Gun
       cameraRecoilScalar: 1
       fireRate: 11