From 03f9d92aab83269fe9fa68f4a1691f49c0eddb15 Mon Sep 17 00:00:00 2001
From: brausjonas <brausjonas@gmail.com>
Date: Mon, 27 Feb 2023 20:08:23 +0100
Subject: [PATCH] PlacementBugFixed

---
 .../.idea.FlufflParty/.idea/workspace.xml     |   2 --
 FlufflParty/Assets/Scenes/WesternMap.unity    |   4 ++--
 FlufflParty/Assets/Scripts/Client.cs          |  15 ++++++++++++++-
 FlufflParty/Packages/packages-lock.json       |   6 +++---
 .../ProjectSettings/ProjectSettings.asset     |   4 +---
 Server/out/artifacts/Server_jar/Server.jar    | Bin 10669 -> 10669 bytes
 Server/out/production/Server/Room.class       | Bin 5390 -> 5390 bytes
 Server/src/Room.java                          |   2 +-
 8 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 9abc25f..c0b29ef 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -2,9 +2,7 @@
 <project version="4">
   <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/Scripts/Players/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity
index fc8e81b..08d6f39 100644
--- a/FlufflParty/Assets/Scenes/WesternMap.unity
+++ b/FlufflParty/Assets/Scenes/WesternMap.unity
@@ -3632,7 +3632,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &584878063
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3668,7 +3668,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.92941177, b: 0.78039217, a: 0.84313726}
+  m_Color: {r: 0.5566038, g: 0.50850105, b: 0.4069509, a: 0.84313726}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs
index 45ba890..4d5312b 100644
--- a/FlufflParty/Assets/Scripts/Client.cs
+++ b/FlufflParty/Assets/Scripts/Client.cs
@@ -68,10 +68,12 @@ public class Client : MonoBehaviour
     public void CalculatePlacement()
     {
         Player[] temp = new Player[playerAmount];
+        bool[] samePlacement = new bool[playerAmount];
 
         for (int j = 0; j < temp.Length; j++)
         {
             temp[j] = players[j];
+            samePlacement[j] = false;
         }
         
         for (int i = 0; i < temp.Length - 1; i++)
@@ -86,16 +88,27 @@ public class Client : MonoBehaviour
                 {
                     (temp[f], temp[f + 1]) = (temp[f + 1], temp[f]);              
                 }
+                else if(temp[f].stars == temp[f + 1].stars && temp[f].coins == temp[f + 1].coins)
+                {
+                    samePlacement[f] = true;
+                }
             }
         }
 
+        int currentPlacement = 1;
         for (int j = 0; j < temp.Length; j++)
         {
             for (int i = 0; i < temp.Length; i++)
             {
                 if (temp[j] == players[i])
                 {
-                    playerInfoElements[i].textPlacement.text = j+1 + ".";
+                    // playerInfoElements[i].textPlacement.text = j+1 + ".";
+                    playerInfoElements[i].textPlacement.text = currentPlacement + ".";
+
+                    if (!samePlacement[j])
+                    {
+                        currentPlacement++;
+                    }
                 }
             }
         }
diff --git a/FlufflParty/Packages/packages-lock.json b/FlufflParty/Packages/packages-lock.json
index 8aa26df..f612085 100644
--- a/FlufflParty/Packages/packages-lock.json
+++ b/FlufflParty/Packages/packages-lock.json
@@ -47,8 +47,8 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.17",
-        "com.unity.ide.rider": "3.0.18",
+        "com.unity.ide.visualstudio": "2.0.16",
+        "com.unity.ide.rider": "3.0.16",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.1.1",
@@ -112,7 +112,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.7.0",
+      "version": "1.6.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset
index fcbf6d0..b33a346 100644
--- a/FlufflParty/ProjectSettings/ProjectSettings.asset
+++ b/FlufflParty/ProjectSettings/ProjectSettings.asset
@@ -137,9 +137,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets:
-  - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
-  - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar
index 7308849ff92a4b230dcf7db857051eb43f38b117..062574b7759c4927a76bab2fee4f66129ae3902b 100644
GIT binary patch
delta 113
zcmZ1*yf&C8z?+#xgn@&DgQ05PMxJhFrmA_9XELh-sm%wN)mcE?1I*%^I99QOgx2ux
zWo6v8IZIfGm1RP}o~F$W64&`aY9iIQfha)@QxN5$VF99=G%Pr(=0%5rR8Bsm@frX%
Cs3<G|

delta 113
zcmZ1*yf&C8z?+#xgn@&DgJJgUjXd4VOtWWCp2@5Vq&6R5R%Zcm4={^w;#kEB5?aH%
zmz8nP<}6_$R+i(AbFDTvNL=RwsfkqI2BHKtOhJ@~h6RXf(y-u|Jv%xKq;m2hjn@Ea
C{3zT2

diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class
index 38cfd02efdf683aa1ec59f34b1875b8dce0dee4a..3f55e3c29e86ba0ccbed860381b181ca2b49278e 100644
GIT binary patch
delta 14
VcmeCv>eJfb$HmCD*`I4a7XTvU1XTb4

delta 14
VcmeCv>eJfb$HmCH*`I4a7XTvO1XKV3

diff --git a/Server/src/Room.java b/Server/src/Room.java
index 8770f60..502d40f 100644
--- a/Server/src/Room.java
+++ b/Server/src/Room.java
@@ -10,7 +10,7 @@ import java.util.TimerTask;
 
 public class Room
 {
-    private Client[] players = new Client[2];
+    private Client[] players = new Client[3];
     private Vector3[] startPositions;
     private String roomCode;
     private Server server;