StarSystem

Stars With switching positions
(Bought stars are not saved or shown)

FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs

@@ -33,6 +33,12 @@ public class NoPlayablePlayer : Player
         diceScript = dice.GetComponent<Dice>();
     }
 
+    public void BuyStar()
+    {
+        GameObject.Find("StarPositions").GetComponent<StarController>().SwitchStar();
+        AddCoins(-20);
+    }
+    
     public void CoinFieldAction(int action)
     {
         if (action == 0)
@@ -153,4 +159,23 @@ public class NoPlayablePlayer : Player
         }
     }
 
+    private Star currentStar;
+    
+    private void OnTriggerEnter(Collider collider)
+    {
+        if (collider.name.Equals("ItemShopTrigger"))
+        {
+            base.OnTriggerEnter(collider);
+        }
+        else if (collider.name.Equals("StarTrigger"))
+        {
+            currentStar = collider.GetComponent<Star>();
+
+            if(currentStar.IsActive)
+            {
+                base.OnTriggerEnter(collider);
+            }
+        }
+    }
+
 }

FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs

@@ -208,29 +208,40 @@ public class PlayablePlayer : Player
     private Star currentStar = null;
     private void OnTriggerEnter(Collider collider)
     {
-        base.OnTriggerEnter(collider);
-        
         if (collider.name.Equals("ItemShopTrigger"))
         {
-            Layout2.SetActive(true);
+            base.OnTriggerEnter(collider);
+            uiHandler.ActivateLayout2(this);
         }
         else if (collider.name.Equals("StarTrigger"))
         {
             currentStar = collider.GetComponent<Star>();
 
-            uiHandler.ActivateLayoutBuyStar(this);
+            if(currentStar.IsActive)
+            {
+                base.OnTriggerEnter(collider);
+                uiHandler.ActivateLayoutBuyStar(this);
+            }
         }
     }
 
     public void BuyStar(bool buy)
     {
+        client.SendEventStopFinished();
+        
         if (buy)
         {
             currentStar.Buy(this);
+            client.SendBuyStar();
         }
         else
         {
             currentStar = null;
         }
     }
+
+    public void SkipShop()
+    {
+        client.SendEventStopFinished();
+    }
 }

FlufflParty/Assets/Scripts/Players/Player.cs

@@ -6,8 +6,6 @@ using UnityEngine;
 
 public abstract class Player : MonoBehaviour
 {
-    public GameObject Layout2; 
-    
     public string name = "";
     public bool activated = false;
     protected bool wurfelt = false;
@@ -55,7 +53,7 @@ public abstract class Player : MonoBehaviour
         Coin
     }
 
-    protected void AddCoins(int amount)
+    public void AddCoins(int amount)
     {
         coins += amount;
         if (coins < 0)