From 2988ac383924fd428823ee7125241cd27aaf8fb3 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 4 Jul 2024 17:11:01 +1000
Subject: [PATCH] Make vox roundstart (#29704)

* Make vox roundstart

I believe all the issues are fixed.

* Click detection bandaid
---
 Content.Client/Clickable/ClickableComponent.cs | 7 +++++--
 Resources/Prototypes/Species/vox.yml           | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs
index 6f75df4683..987473ca46 100644
--- a/Content.Client/Clickable/ClickableComponent.cs
+++ b/Content.Client/Clickable/ClickableComponent.cs
@@ -48,7 +48,7 @@ namespace Content.Client.Clickable
             Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
 
             // First we get `localPos`, the clicked location in the sprite-coordinate frame.
-            var entityXform = Matrix3Helpers.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
+            var entityXform = Matrix3Helpers.CreateInverseTransform(spritePos, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
             var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix);
 
             // Check explicitly defined click-able bounds
@@ -58,8 +58,11 @@ namespace Content.Client.Clickable
             // Next check each individual sprite layer using automatically computed click maps.
             foreach (var spriteLayer in sprite.AllLayers)
             {
-                if (!spriteLayer.Visible || spriteLayer is not Layer layer)
+                // TODO: Move this to a system and also use SpriteSystem.IsVisible instead.
+                if (!spriteLayer.Visible || spriteLayer is not Layer layer || layer.CopyToShaderParameters != null)
+                {
                     continue;
+                }
 
                 // Check the layer's texture, if it has one
                 if (layer.Texture != null)
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
index e3fdb2bf08..7419f3f277 100644
--- a/Resources/Prototypes/Species/vox.yml
+++ b/Resources/Prototypes/Species/vox.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Vox
   name: species-name-vox
-  roundStart: false # sad
+  roundStart: true
   prototype: MobVox
   sprites: MobVoxSprites
   markingLimits: MobVoxMarkingLimits
-- 
2.51.2