Merge branch 'main' of https://github.com/ivozilkenat/distributed-sys…

…tems-io
ivozilkenat · Jul 18, 2024 · eead9e4 · eead9e4
2 parents 7e91863 + a71fa5f
commit eead9e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/services/game_server/backend/game/game.py b/services/game_server/backend/game/game.py
@@ -100,12 +100,12 @@ def check_collisions(self, players) -> None:
                 if projectile.is_collision(other_projectile):
                     projectile.destroy()
                     other_projectile.destroy()
-        for i in range(len(self.items) - 1, 0, -1):
+        for i in range(len(self.items) - 1, -1, -1):
             item = self.items[i]
-            for _, player in players:
+            for pid, player in players:
                 if player.is_collision(item):
                     item.on_collision(player)
-                    self.register_event("item", item.on_event_message())
+                    self.register_event("item", {"player": pid, "msg": item.on_event_message()})
                     self.items.pop(i)
 
 

diff --git a/services/game_server/backend/game/item.py b/services/game_server/backend/game/item.py
@@ -10,20 +10,19 @@ def __init__(self) -> None:
         self.item_type = "speed"
     def on_collision(self, player: Player):
         player.increase_speed_by(1)
-        print("Speed: " + str(player._speed))
 
     def on_event_message(self) -> str:
         return ""
 
+# Yeah its an health item. IDC
 class DamageItem(Entity):
     def __init__(self) -> None:
         super().__init__(Pos(0,0))
         self.item_type = "damage"
 
     def on_collision(self, player: Player):
-        player.hp = max(player.hp - 1, 1)
-
-        print("HP: " + str(player.hp))
+        player.hp = min(player.hp + 10, 100)
+
 
     def on_event_message(self) -> str:
         return ""
@@ -37,7 +36,6 @@ def __init__(self, weapon_type) -> None:
 
     def on_collision(self, player: Player):
         player.equipped_weapon = self.weapon_type
-        print("Weapon: " + str(self.weapon_type))
 
     def on_event_message(self) -> str:
         return self.weapon_type

diff --git a/services/game_server/frontend/src/game.ts b/services/game_server/frontend/src/game.ts
@@ -179,8 +179,8 @@ export class Game {
                 } else {
                     this.vfxHandler.addMessage(this.enemies[event_data["player"]].name + " is on a " + event_data["kills"] + " killstreak!", "white", 2000, 1);
                 }
-            } else if (event_type == "item") {
-                this.vfxHandler.addMessage(event_data, "purple", 2000, 0);
+            } else if (event_type == "item" && event_data["player"] === playerId) {
+                this.vfxHandler.addMessage(event_data["msg"], "purple", 2000, 0);
             }
         }
     }

diff --git a/services/matchmaking_server/frontend/html/index.html b/services/matchmaking_server/frontend/html/index.html
@@ -27,7 +27,7 @@ <h1 class="text-2xl font-bold mb-4 text-center">Game Server Browser</h1>
                         <th class="px-4 py-2 text-left">Action</th>
                     </tr>
                 </thead>
-                <tbody id="game-server-tbody" hx-get="/servers" hx-trigger="load" hx-swap="innerHTML">
+                <tbody id="game-server-tbody" hx-get="/servers" hx-trigger="load, every 5s" hx-swap="innerHTML">
                     <tr>
                         <td class="border px-4 py-2" colspan="2">Loading...</td>
                     </tr>
@@ -51,7 +51,7 @@ <h2 class="text-2xl font-bold py-4 text-center">Highscores (Top 5)</h2>
                         <th class="px-4 py-2 text-left">Time</th>
                     </tr>
                 </thead>
-                <tbody id="highscores-tbody" hx-get="/highscores_html" hx-trigger="load" hx-swap="innerHTML">
+                <tbody id="highscores-tbody" hx-get="/highscores_html" hx-trigger="load, every 5s" hx-swap="innerHTML">
                     <tr>
                         <td class="border px-4 py-2" colspan="5">Loading...</td>
                     </tr>