Fix ghost shadows

SubmergedAmongUs · Mar 25, 2024 · 74652d0 · 74652d0
1 parent 17896fe
commit 74652d0
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ The table below lists the most recent Submerged release for each Among Us versio
 
 |                                       Among Us Version                                        | Submerged Version |                                        Links                                        |
 |:---------------------------------------------------------------------------------------------:|:-----------------:|:-----------------------------------------------------------------------------------:|
-|                                          `v2024.3.5`                                          |   `v2024.3.24`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2024.3.24/)  |
+|                                          `v2024.3.5`                                          |   `v2024.3.25`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2024.3.25/)  |
 |                                         `v2023.11.28`                                         |   `v2023.11.29`   | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.11.29/) |
 |                                         `v2023.10.24`                                         |   `v2023.11.2`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.11.2/)  |
 |                                 `v2023.7.12`<br>`v2023.7.11`                                  |    `v2023.8.2`    |  [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.8.2/)  |

diff --git a/Submerged/Floors/Objects/GenericShadowBehaviour.cs b/Submerged/Floors/Objects/GenericShadowBehaviour.cs
@@ -16,7 +16,9 @@ public sealed class GenericShadowBehaviour(nint ptr) : MonoBehaviour(ptr)
 
     static GenericShadowBehaviour()
     {
+        // Overrides added earlier have higher priority (smaller index goes first)
         ShadowTypeOverrides.Add(obj => obj.gameObject.GetComponentInParent<LongBoiPlayerBody>(true) ? typeof(LongPlayerShadowRenderer) : null);
+        ShadowTypeOverrides.Add(obj => obj.gameObject.GetComponentInParent<PlayerControl>() ? typeof(PlayerShadowRenderer) : null);
         ShadowTypeOverrides.Add(obj => obj.gameObject.GetComponent<DeadBody>() ? typeof(DeadBodyShadowRenderer) : null);
     }
 

diff --git a/Submerged/Floors/Objects/LongPlayerShadowRenderer.cs b/Submerged/Floors/Objects/LongPlayerShadowRenderer.cs
@@ -4,7 +4,7 @@
 namespace Submerged.Floors.Objects;
 
 [RegisterInIl2Cpp]
-public class LongPlayerShadowRenderer(nint ptr) : RelativeShadowRenderer(ptr)
+public class LongPlayerShadowRenderer(nint ptr) : PlayerShadowRenderer(ptr)
 {
     public LongBoiPlayerBody body;
 

diff --git a/Submerged/Floors/Objects/PlayerShadowRenderer.cs b/Submerged/Floors/Objects/PlayerShadowRenderer.cs
@@ -0,0 +1,17 @@
+using Reactor.Utilities.Attributes;
+
+namespace Submerged.Floors.Objects;
+
+[RegisterInIl2Cpp]
+public class PlayerShadowRenderer(nint ptr) : RelativeShadowRenderer(ptr)
+{
+    public PlayerControl player;
+
+    protected override void Start()
+    {
+        base.Start();
+        player = GetComponentInParent<PlayerControl>();
+    }
+
+    public override bool EnableShadow => player.isDummy || (!player.Data.IsDead && !player.Data.Disconnected);
+}
diff --git a/Submerged/Floors/Objects/RelativeShadowRenderer.cs b/Submerged/Floors/Objects/RelativeShadowRenderer.cs
@@ -20,6 +20,8 @@ public class RelativeShadowRenderer(nint ptr) : MonoBehaviour(ptr)
 
     private readonly Dictionary<Sprite, Sprite> _cachedSprites = [];
 
+    public virtual bool EnableShadow => true;
+
     protected virtual void Awake()
     {
         gameObject.layer = 4;
@@ -48,7 +50,7 @@ protected virtual void LateUpdate()
 
         if (targetRenderer)
         {
-            shadowRenderer.enabled = targetRenderer.enabled && targetRenderer.gameObject.activeInHierarchy;
+            shadowRenderer.enabled = targetRenderer.enabled && targetRenderer.gameObject.activeInHierarchy && EnableShadow;
             shadowRenderer.sprite = GetReplacementSprite(targetRenderer.sprite);
             shadowRenderer.SetColorAlpha(targetRenderer.color.a);
             shadowRenderer.flipX = targetRenderer.flipX;

diff --git a/Submerged/Submerged.csproj b/Submerged/Submerged.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <Version>2024.3.24</Version>
+        <Version>2024.3.25</Version>
         <Authors>Submerged Team</Authors>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/SubmergedAmongUs/Submerged</RepositoryUrl>