Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ELO according to ticks survived #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update ELO according to ticks survived #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions server/Game.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ export class Game extends EventEmitter {
#players: Player[]
#alivePlayerIds: number[]
#deadPlayerIds: number[]
#deadPlayerTicks: number[]
#width: number
#height: number
#fields: Array<Array<number>>
#state: GameState
#tickRate = baseTickrate
#startTime = Date.now()
#tick: 0

get alivePlayers(): Player[] {
return this.#alivePlayerIds.map(e => this.#players[e])
Expand Down Expand Up @@ -179,12 +181,14 @@ export class Game extends EventEmitter {
// If the player was not yet recognized as dead, add it
if (this.#deadPlayerIds.indexOf(playerIndex) === -1) {
this.#deadPlayerIds.push(playerIndex)
this.#deadPlayerTicks.push(this.#tick)
}

// If both people entered the field at the same time, kill both
if (fieldPlayer !== player && fieldPlayer.pos.x === x && fieldPlayer.pos.y === y) {
if (this.#deadPlayerIds.indexOf(fieldPlayerIndex) === -1) {
this.#deadPlayerIds.push(fieldPlayerIndex)
this.#deadPlayerTicks.push(this.#tick)
}
}
}
Expand Down Expand Up @@ -240,9 +244,22 @@ export class Game extends EventEmitter {
const losers = this.#deadPlayerIds.map(e => this.#players[e])

// Update ELO scores
if (winners.length && losers.length) {
if (winners.length || losers.length) {
// Rank dead players according to their survived ticks
const deadPlayerPlaces = [];
for (let i = 0; i < losers.length; i++) {
if (i == 0 && winners.length) {
deadPlayerPlaces.push(1);
} else if (i == 0 && !winners.length) {
deadPlayerPlaces.push(2);
} else if (this.#deadPlayerTicks[i] < this.#deadPlayerTicks[i - 1]) {
deadPlayerPlaces.push(deadPlayerPlaces[i - 1] + 1);
} else {
deadPlayerPlaces.push(deadPlayerPlaces[i - 1]);
}
}
const playersInOrder = [...winners, ...losers];
const placesInOrder = [...(winners.map(player => 1)), ...(losers.map(player => 2))];
const placesInOrder = [...(winners.map(player => 1)), ...deadPlayerPlaces];
const newEloScores = MultiElo.getNewRatings(playersInOrder.map(player => player.eloScore), placesInOrder);
for (let i = 0; i < playersInOrder.length; i++) {
playersInOrder[i].eloScore = newEloScores[i];
Expand All @@ -259,5 +276,7 @@ export class Game extends EventEmitter {

setTimeout(() => this.#onTick(), 1000 / this.#tickRate)
}

this.#tick++;
}
}