Merge pull request #57 from Kirus59/BurglarBug-changes

Burglar bug changes

Author: SkaldetSkaeg

Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs

@@ -22,6 +22,7 @@ private void OnInit(Entity<StickyVisualizerComponent> ent, ref ComponentInit arg
             return;
 
         ent.Comp.OriginalDrawDepth = sprite.DrawDepth;
+        ent.Comp.OriginalNoRotation = sprite.NoRotation; // SS220 rotate ent face to the user
     }
 
     protected override void OnAppearanceChange(EntityUid uid, StickyVisualizerComponent comp, ref AppearanceChangeEvent args)
@@ -34,5 +35,10 @@ protected override void OnAppearanceChange(EntityUid uid, StickyVisualizerCompon
 
         var drawDepth = isStuck ? comp.StuckDrawDepth : comp.OriginalDrawDepth;
         args.Sprite.DrawDepth = drawDepth;
+
+        // SS220 rotate ent face to the user begin
+        var noRotation = isStuck ? comp.StuckNoRotation : comp.OriginalNoRotation;
+        args.Sprite.NoRotation = noRotation;
+        // SS220 rotate ent face to the user end
     }
 }

Content.Shared/Sticky/Components/StickyComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sticky.Systems;
+using Content.Shared.Sticky.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
@@ -87,4 +87,12 @@ public sealed partial class StickyComponent : Component
     /// </summary>
     [DataField]
     public SpriteSpecifier VerbIcon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png"));
+
+    // SS220 rotate ent face to the user begin
+    /// <summary>
+    /// Should the entity turn its face to the user when stuck
+    /// </summary>
+    [DataField]
+    public bool RotateFaceToUser = false;
+    // SS220 rotate ent face to the user end
 }

Content.Shared/Sticky/Components/StickyVisualizerComponent.cs

@@ -21,6 +21,17 @@ public sealed partial class StickyVisualizerComponent : Component
     /// </summary>
     [DataField]
     public int OriginalDrawDepth;
+
+    // SS220 rotate ent face to the user begin
+    /// <summary>
+    /// Is sprite not performing rotation when stuck
+    /// </summary>
+    [DataField]
+    public bool StuckNoRotation = false;
+
+    [DataField]
+    public bool OriginalNoRotation;
+    // SS220 rotate ent face to the user end
 }
 
 [Serializable, NetSerializable]

Content.Shared/Sticky/Systems/StickySystem.cs

@@ -18,6 +18,8 @@ public sealed class StickySystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!; // SS220 rotate ent face to the user
+    [Dependency] private readonly RotateToFaceSystem _rotateToFace = default!; // SS220 rotate ent face to the user
 
     private const string StickerSlotId = "stickers_container";
 
@@ -172,6 +174,14 @@ public void StickToEntity(Entity<StickyComponent> ent, EntityUid target, EntityU
         // send information to appearance that entity is stuck
         _appearance.SetData(uid, StickyVisuals.IsStuck, true);
 
+        // SS220 rotate ent face to the user begin
+        if (comp.RotateFaceToUser)
+        {
+            var userPosition = _transform.GetWorldPosition(user);
+            _rotateToFace.TryFaceCoordinates(uid, userPosition);
+        }
+        // SS220 rotate ent face to the user end
+
         comp.StuckTo = target;
         Dirty(uid, comp);
 

Resources/Prototypes/SS220/CultYogg/burglarbug.yml

@@ -6,14 +6,17 @@
   components:
     - type: Sprite
       sprite: SS220/Objects/CultYogg/burglarbug.rsi
-      state: icon
+      layers:
+        - map: ["base"]
+          state: icon
     - type: Icon
       sprite: SS220/Objects/CultYogg/burglarbug.rsi
       state: icon
     - type: Item
       size: Small
     - type: Appearance
     - type: Sticky
+      rotateFaceToUser: true
       stickDelay: 3
       unstickDelay: 3
       stickPopupSuccess: cult-yogg-burglar-bug-stick-success
@@ -26,6 +29,13 @@
       delay: 10
       examinable: false
     - type: StickyVisualizer
+      stuckNoRotation: true
+    - type: GenericVisualizer
+      visuals:
+        enum.StickyVisuals.IsStuck:
+          base:
+            True: { state: fox }
+            False: { state: icon }
     - type: BurglarBug
       timeToOpen: 10
       notActivatedStickPopupCancellation: cult-yogg-burglar-bug-notactivated-cancellation

Resources/Textures/SS220/Objects/CultYogg/burglarbug.rsi/fox.png

@@ -31,6 +31,10 @@
             0.3
           ]
         ]
-      }
+    },
+    {
+        "name": "fox",
+        "directions": 4
+    }
   ]
 }