From fe220c4e4eb58171816243bc9f62ffd5ac15ebfc Mon Sep 17 00:00:00 2001
From: AliIbnAbiTalib <a.fistik14@gmail.com>
Date: Thu, 6 Apr 2023 23:02:36 +0200
Subject: [PATCH] Miau

---
 FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml | 6 ++----
 FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs  | 8 ++++++++
 FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs    | 8 ++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 9886c16..9dd6760 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -3,10 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Prefabs/Items/Trap.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Items/Trap.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -154,7 +152,7 @@
       <workItem from="1680459748883" duration="4859000" />
       <workItem from="1680539278905" duration="1085000" />
       <workItem from="1680546560659" duration="3839000" />
-      <workItem from="1680813239896" duration="874000" />
+      <workItem from="1680813239896" duration="1691000" />
     </task>
     <servers />
   </component>
diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
index e02269d..9e231d7 100644
--- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
@@ -169,6 +169,14 @@ public class NoPlayablePlayer : Player
                 //Der Spieler steht gerade
                 else
                 {
+                    if (currentField.placedItem != null)
+                    {
+                        Trap t = currentField.placedItem.GetComponent<Trap>();
+                        AddCoins(-3);
+                        t.target.AddCoins(3);
+                        Destroy(t);
+                        currentField.placedItem = null;
+                    }
                     Vector3 currentRotation = Quaternion.ToEulerAngles(transform.rotation);
                     currentRotation.y = -34;
                     transform.rotation = Quaternion.Euler(currentRotation);
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index 085975b..686d3fe 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -172,6 +172,14 @@ public class PlayablePlayer : Player
                 //Der Spieler steht gerade
                 else
                 {
+                    if (currentField.placedItem != null)
+                    {
+                        Trap t = currentField.placedItem.GetComponent<Trap>();
+                        AddCoins(-3);
+                        t.target.AddCoins(3);
+                        Destroy(t);
+                        currentField.placedItem = null;
+                    }
                     Vector3 currentRotation = Quaternion.ToEulerAngles(transform.rotation);
                     currentRotation.y = -34;
                     transform.rotation = Quaternion.Euler(currentRotation);