Fix delay when creature dies and spawns ragdoll (#42)

daniellochner · Jul 4, 2023 · f7a350a · f7a350a
1 parent 8541365
commit f7a350a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 96 deletions.
diff --git a/Assets/CreatureCreator/Scripts/Runtime/Behaviours/Creature/Creature/Base/CreatureBase.cs b/Assets/CreatureCreator/Scripts/Runtime/Behaviours/Creature/Creature/Base/CreatureBase.cs
@@ -140,7 +140,8 @@ public virtual void Setup()
 
         public virtual void OnDie(DamageReason reason, string inflicter)
         {
-            Collider.enabled = false;
+            OnHide();
+
             MinimapIcon.enabled = false;
 
 #if USE_STATS

diff --git a/...reatureCreator/Scripts/Runtime/Behaviours/Creature/Creature/Player/CreaturePlayerLocal.cs b/...reatureCreator/Scripts/Runtime/Behaviours/Creature/Creature/Player/CreaturePlayerLocal.cs
@@ -69,17 +69,15 @@ public override void OnDie(DamageReason reason, string inflicter)
             Constructor.Body.gameObject.SetActive(false);
             Rigidbody.isKinematic = true;
 
+            Collider.enabled = false;
             Animator.enabled = false;
-
             Abilities.enabled = false;
             Mover.enabled = false;
             Interactor.enabled = false;
 
             Holder.DropAll();
             Holder.enabled = false;
 
-            Loader.HideFromOthers();
-
             Spawner.Despawn();
 
             EditorManager.Instance.SetVisibility(false);

diff --git a/...eatureCreator/Scripts/Runtime/Behaviours/Creature/Creature/Player/CreaturePlayerRemote.cs b/...eatureCreator/Scripts/Runtime/Behaviours/Creature/Creature/Player/CreaturePlayerRemote.cs
@@ -49,6 +49,12 @@ public override void Setup()
             }
         }
 
+        public override void OnDie(DamageReason reason, string inflicter)
+        {
+            base.OnDie(reason, inflicter);
+            Selectable.SetSelected(false, true);
+        }
+
         public override void OnShow()
         {
             base.OnShow();

diff --git a/Assets/Localization/Data/Windows/addressables_content_state.bin b/Assets/Localization/Data/Windows/addressables_content_state.bin
diff --git a/Assets/Resources/Fonts & Materials/NotoSans.asset b/Assets/Resources/Fonts & Materials/NotoSans.asset