Fixes bug on leaderboard placement (#117)

* Fixes bug on leaderboard placement * new gameplay pic
MaxEdwards20 · Apr 19, 2024 · eedea1e · eedea1e
1 parent 8747315
commit eedea1e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 39 deletions.
diff --git a/gameplay.png b/gameplay.png
diff --git a/src/Client/ClientMain.cs b/src/Client/ClientMain.cs
@@ -46,10 +46,10 @@ public ClientMain()
         protected override void Initialize()
         {
             // For Graders: You can change the resolution here
-            // m_graphics.PreferredBackBufferWidth = 1920;
-            // m_graphics.PreferredBackBufferHeight = 1080;
-            m_graphics.PreferredBackBufferWidth = 1920/2;
-            m_graphics.PreferredBackBufferHeight = 1080/2;
+            m_graphics.PreferredBackBufferWidth = 1920;
+            m_graphics.PreferredBackBufferHeight = 1080;
+            // m_graphics.PreferredBackBufferWidth = 1920/2;
+            // m_graphics.PreferredBackBufferHeight = 1080/2;
             m_graphics.ApplyChanges();
 
             // Load the controls

diff --git a/src/Client/GameModel.cs b/src/Client/GameModel.cs
@@ -29,7 +29,6 @@ public class GameModel
     private Systems.Interpolation m_systemInterpolation;
     private Systems.Renderer m_renderer;
     private Shared.Systems.WormMovement m_systemWormMovement;
-    private Shared.Systems.GrowthHandler m_systemGrowthHandler;
     private Controls m_controls;
     private GraphicsDeviceManager m_graphics;
     private SpriteFont m_font;
@@ -65,7 +64,6 @@ public void update(TimeSpan elapsedTime)
     {
         m_systemNetwork.update(elapsedTime, MessageQueueClient.instance.getMessages(), m_playerData);
         m_systemKeyboardInput.update(elapsedTime);
-        m_systemGrowthHandler.update(elapsedTime);
         m_systemWormMovement.update(elapsedTime);
         m_systemInterpolation.update(elapsedTime);
         m_systemCamera.update(elapsedTime);
@@ -110,7 +108,6 @@ public bool initialize(ContentManager contentManager, Controls controls, Graphic
         m_systemCamera = new Systems.Camera(new Vector2(graphics.PreferredBackBufferWidth, graphics.PreferredBackBufferHeight), m_playerData);
 
         m_renderer = new Systems.Renderer(m_systemCamera, graphics, m_font, m_fontSmall, m_sand, m_contentManager);
-        m_systemGrowthHandler = new Shared.Systems.GrowthHandler();
         m_systemWormMovement = new Shared.Systems.WormMovement();
         m_systemNetwork = new Systems.Network(m_playerName, m_playerData);
 
@@ -300,7 +297,6 @@ private void addEntity(Entity entity)
         // NOTE: Update the systems we use here
         m_entities[entity.id] = entity;
         m_systemKeyboardInput.add(entity);
-        m_systemGrowthHandler.add(entity);
         m_systemWormMovement.add(entity);
         m_renderer.add(entity);
         m_systemNetwork.add(entity);
@@ -320,7 +316,6 @@ private void removeEntity(uint id)
         m_systemScore.SaveScore(m_entities[id]); // We call this every time
         m_entities.Remove(id);
         m_systemKeyboardInput.remove(id);
-        m_systemGrowthHandler.remove(id);
         m_systemWormMovement.remove(id);
         m_systemNetwork.remove(id);
         m_renderer.remove(id);

diff --git a/src/Client/Systems/Network.cs b/src/Client/Systems/Network.cs
@@ -249,6 +249,7 @@ private void handleUpdateEntity(TimeSpan elapsedTime, UpdateEntity message, Play
                             }
                         }
                         heads.Sort((a, b) => a.get<Stats>().Score.CompareTo(b.get<Stats>().Score));
+                        heads.Reverse(); // Largest to smallest
                         playerData.addPosition(heads.IndexOf(entity) + 1);
                     }
                 }

diff --git a/src/Server/GameModel.cs b/src/Server/GameModel.cs
@@ -16,7 +16,6 @@ public class GameModel
     private readonly Dictionary<int, uint> m_clientToEntityId = new();
     private readonly WormMovement m_systemWormMovement = new();
     private readonly CollisionDetection m_systemCollisionDetection = new();
-    private readonly GrowthHandler m_SystemGrowthHandler = new();
     private readonly Network m_systemNetwork = new();
     private readonly SpiceGen m_systemSpiceGen = new(MapSize.MAP_SIZE - 200, 300);
     private const int wallSize = 100;
@@ -30,7 +29,6 @@ public void update(TimeSpan elapsedTime)
     {
         m_systemNetwork.update(elapsedTime, MessageQueueServer.instance.getMessages());
         m_systemCollisionDetection.update(elapsedTime);
-        m_SystemGrowthHandler.update(elapsedTime);
         m_systemWormMovement.update(elapsedTime);
         m_systemSpiceGen.update(elapsedTime);
     }
@@ -105,7 +103,6 @@ private void addEntity(Entity entity)
         m_entities[entity.id] = entity;
         m_systemNetwork.add(entity);
         m_systemCollisionDetection.add(entity);
-        m_SystemGrowthHandler.add(entity);
         m_systemWormMovement.add(entity);
         m_systemSpiceGen.add(entity);
     }
@@ -121,7 +118,6 @@ private void removeEntity(uint id)
         m_entities.Remove(id);
         m_systemNetwork.remove(id);
         m_systemCollisionDetection.remove(id);
-        m_SystemGrowthHandler.remove(id);
         m_systemWormMovement.remove(id);
         m_systemSpiceGen.remove(id);
     }

diff --git a/src/Server/Systems/CollisionDetection.cs b/src/Server/Systems/CollisionDetection.cs
@@ -61,17 +61,18 @@ public override void update(TimeSpan elapsedTime)
                 {
                     continue;
                 }
-                if (entity.contains<SpicePower>() && !entity.contains<Worm>() )
+
+                if (entity.contains<Shared.Components.Wall>())
                 {
-                    wormToSpice(elapsedTime, head, entity);
+                    wormToWall(entity, head, worm);
                 }
                 else if (entity.contains<Worm>())
                 {
                     wormToWorm(head, worm, entity);
                 }
-                else if (entity.contains<Shared.Components.Wall>())
+                else if (entity.contains<SpicePower>() && !entity.contains<Worm>() )
                 {
-                    wormToWall(entity, head, worm);
+                    wormToSpice(elapsedTime, head, entity);
                 }
             }
         }

diff --git a/src/Shared/Entities/PlayerData.cs b/src/Shared/Entities/PlayerData.cs
@@ -7,7 +7,7 @@ public class PlayerData
 {
     public int clientId { get; set; }
 
-    public int highestPosition { get; private set; } = 1;
+    public int highestPosition { get; private set; } = 9999;
 
     public int kills { get; private set; }
     [DataMember(Name = "score")] public int score { get; set; }

diff --git a/src/Shared/Systems/GrowthHandler.cs b/src/Shared/Systems/GrowthHandler.cs
-Original file line number
+Diff line change
@@ Expand Up @@
                                 }
                             }
                             heads.Sort((a, b) => a.get<Stats>().Score.CompareTo(b.get<Stats>().Score));
+                            heads.Reverse(); // Largest to smallest
                             playerData.addPosition(heads.IndexOf(entity) + 1);
                         }
                     }
@@ Expand Down @@