From 69ed3e56e2eea02881de0fb57721b6604c7c1714 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Sat, 12 Nov 2022 20:38:09 +0800
Subject: [PATCH] Fix kills

---
 bot.js             |  2 +-
 paper-io-bot.js    |  2 +-
 src/game-client.js | 18 ++++++++----------
 src/mode/player.js |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/bot.js b/bot.js
index fe8d517..6c8acbf 100644
--- a/bot.js
+++ b/bot.js
@@ -259,7 +259,7 @@ client.setRenderer({
 		const dt = (endFrame - startFrame);
 		startFrame = -1;
 		console.log(`[${new Date()}] I died... (survived for ${dt} frames.)`);
-		console.log(`[${new Date()}] I killed ${client.kills} player(s).`);
+		console.log(`[${new Date()}] I killed ${client.getKills()} player(s).`);
 		console.log("Coefficients: " + coeffs);
 
 		const mutation = Math.min(10, Math.pow(2, calcFavorability(params)));
diff --git a/paper-io-bot.js b/paper-io-bot.js
index 20777a4..b94d6f0 100644
--- a/paper-io-bot.js
+++ b/paper-io-bot.js
@@ -197,7 +197,7 @@ client.setRenderer({
 		startFrame = -1;
 
 		console.log(`[${new Date()}] I died... (survived for ${dt} frames.)`);
-		console.log(`[${new Date()}] I killed ${client.kills} player(s).`);
+		console.log(`[${new Date()}] I killed ${client.getKills()} player(s).`);
 		setTimeout(connect, 5000);
 	},
 	removePlayer: function(player) {
diff --git a/src/game-client.js b/src/game-client.js
index 2cc59ae..7f93d39 100644
--- a/src/game-client.js
+++ b/src/game-client.js
@@ -3,7 +3,7 @@ import { consts } from "../config.js";
 let running = false;
 let user, socket, frame;
 let players, allPlayers;
-let _kills;
+let kills;
 let timeout = undefined;
 let dirty = false;
 let deadFrames = 0;
@@ -231,7 +231,7 @@ function reset() {
 	grid.reset();
 	players = [];
 	allPlayers = [];
-	_kills = 0;
+	kills = 0;
 	invokeRenderer("reset");
 }
 
@@ -243,7 +243,7 @@ function setUser(player) {
 function update() {
 	const dead = [];
 	updateFrame(grid, players, dead, (killer, other) => { //addKill
-		if (players[killer] === user && killer !== other) _kills++;
+		if (players[killer] === user && killer !== other) kills++;
 	});
 	dead.forEach(val => {
 		console.log((val.name || "Unnamed") + " is dead");
@@ -261,8 +261,12 @@ function setAllowAnimation(allow) {
 	_allowAnimation = allow;
 }
 
+function getKills() {
+	return kills;
+}
+
 // Export stuff
-export { connectGame, changeHeading, getUser, getPlayers, getOthers, disconnect, setRenderer, setAllowAnimation };
+export { connectGame, changeHeading, getUser, getPlayers, getOthers, disconnect, setRenderer, setAllowAnimation, getKills };
 export const allowAnimation = {
 	get: function() {
 		return _allowAnimation;
@@ -273,9 +277,3 @@ export const allowAnimation = {
 	enumerable: true
 };
 export { grid };
-export const kills = {
-	get: function() {
-		return _kills;
-	},
-	enumerable: true
-};
diff --git a/src/mode/player.js b/src/mode/player.js
index e6a2544..e19ed53 100644
--- a/src/mode/player.js
+++ b/src/mode/player.js
@@ -170,7 +170,7 @@ function paintUIBar(ctx) {
 	ctx.fillText((userPortions * 100).toFixed(3) + "%", 5 + barOffset, consts.CELL_WIDTH - 5);
 
 	//Number of kills
-	const killsText = "Kills: " + client.kills;
+	const killsText = "Kills: " + client.getKills();
 	const killsOffset = 20 + BAR_WIDTH + barOffset;
 	ctx.fillText(killsText, killsOffset, consts.CELL_WIDTH - 5);