diff --git a/services/game_server/backend/game/player.py b/services/game_server/backend/game/player.py index 8cbb406..bec46e1 100644 --- a/services/game_server/backend/game/player.py +++ b/services/game_server/backend/game/player.py @@ -53,7 +53,7 @@ def take_damage(self, damage, source): self.hp -= damage if self.hp <= 0: if isinstance(source, Player): - source.killed(self) + self.killed_by(source) total_kills_before_respawn = self.kills seconds_alive = self.respawn_and_get_survival_time() self.game.server.matchmaking_api.addHighscore(self.name, total_kills_before_respawn, round(seconds_alive.total_seconds())) diff --git a/services/game_server/data/weapons.json b/services/game_server/data/weapons.json index 491a475..3f40d81 100644 --- a/services/game_server/data/weapons.json +++ b/services/game_server/data/weapons.json @@ -10,7 +10,7 @@ "damage": 100, "cooldown": 1, "range": 2000, - "speed": 100, + "speed": 70, "spread": 0 }, "MP5": { @@ -24,7 +24,7 @@ "damage": 100, "cooldown": 1.5, "range": 3000, - "speed": 100, + "speed": 70, "spread": 0 }, "Flamethrower": { @@ -52,7 +52,7 @@ "damage": 40, "cooldown": 0.2, "range": 1500, - "speed": 200, + "speed": 70, "spread": 0.1 } }