From 3064a0a5a07a1380260ea241e7ac2ad3a7a8b786 Mon Sep 17 00:00:00 2001
From: Marco <marco.giacomelli@kinship.io>
Date: Thu, 6 Mar 2025 11:42:45 +0100
Subject: [PATCH] Player owner

---
 Scenes/Maps/PlayerFSMTest.tscn                           | 2 +-
 Scripts/Components/FSM/Elevator/ElevatorMovementState.cs | 8 ++++----
 Scripts/GameManager.cs                                   | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn
index 1741d049..4209dfe6 100644
--- a/Scenes/Maps/PlayerFSMTest.tscn
+++ b/Scenes/Maps/PlayerFSMTest.tscn
@@ -43,7 +43,7 @@
 [sub_resource type="Resource" id="Resource_6wo78"]
 script = ExtResource("4_u1i8n")
 EggIndex = 0
-StartingEquipment = []
+StartingEquipment = Array[ExtResource("5_u1i8n")]([])
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"]
 size = Vector2(30, 52.5)
diff --git a/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs b/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs
index 37bdcd6b..b3b44e54 100644
--- a/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs
+++ b/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs
@@ -12,7 +12,7 @@ public abstract partial class ElevatorMovementState : BaseState<ElevatorState, E
 {
     
     protected GTween Tween;
-    protected Node2D OldPlayerParent;
+    //protected Node2D OldPlayerParent;
     
     protected abstract Vector2 StartingPosition { get; }
     protected abstract Vector2 EndingPosition { get; }
@@ -37,15 +37,15 @@ public abstract partial class ElevatorMovementState : BaseState<ElevatorState, E
     private void RestorePlayerParent()
     {
         if (PlayerBody is null) return;
-        PlayerBody.Reparent(OldPlayerParent);
-        OldPlayerParent = null;
+        PlayerBody.Reparent(PlayerBody.Owner);
+        //OldPlayerParent = null;
         MainObject.CachedPlayer?.StateMachine.SetState(PlayerState.Active);
     }
 
     private void CatchPlayer()
     {
         if (PlayerBody is null) return;
-        OldPlayerParent = PlayerBody.GetParent<Node2D>();
+        //OldPlayerParent = PlayerBody.GetParent<Node2D>();
         MainObject.CachedPlayer.StateMachine.SetState(PlayerState.Cutscene);
         PlayerBody.Reparent(MainObject);
     }
diff --git a/Scripts/GameManager.cs b/Scripts/GameManager.cs
index 3936960f..58328ae7 100644
--- a/Scripts/GameManager.cs
+++ b/Scripts/GameManager.cs
@@ -164,8 +164,11 @@ public partial class GameManager : Node2D
         //_player = this.CreateChild<PlayerMovement>(PlayerTemplate, PlayerSpawnMarker.Position );
         _player = PlayerTemplate.Instantiate<PlayerFSMProxy>();
 
-        this.CallDeferred("add_child", _player);
+        //this.CallDeferred("add_child", _player);
+        this.AddChild(_player);
+        _player.Owner = this;
         _player.Transform = this.GlobalTransform;
+        
 
         _player.GlobalPosition = GetStartPosition();