Skip to content

fix #42

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

Merged
tsiklic1 merged 1 commit into from
Nov 12, 2025
Merged

fix #42

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
28 changes: 22 additions & 6 deletions apps/api/src/game/Game.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,17 @@ export class Game {
shotCard = true;
return shotCard;
}
if (position.equals(targetPos) && !p.isImmune) {
if (position.equals(targetPos) && !p.isImmune && !p.isDead) {
console.log(shooter.playerType, 'killed', p.playerType);
console.log('lastBulletHex', shooter.lastBulletHex);
p.isDead = true;
p.diedAtMove = this.moves;
p.lastSeenPos = new Hex(position.q, position.r);

if (!shooter.lastBulletHex) shooter.lastBulletHex = p.pos;
else {
if (!shooter.lastBulletHex) {
console.log('stavljamo na playera', position);
shooter.lastBulletHex = p.pos;
} else {
shooter.lastBulletHex =
shooter.lastBulletHex.distanceTo(shooter.pos) >
p.pos.distanceTo(shooter.pos)
Expand All @@ -115,11 +118,24 @@ export class Game {
}
}
}
if (!shooter.lastBulletHex) {
shooter.lastBulletHex = new Hex(position.q, position.r);
}
});

//if we didn't hit anyone, set lastBulletHex to the farthest point
if (!shooter.lastBulletHex) {
const current = shooter.pos;
let position = new Hex(current.q, current.r);
let prevPosition = position;
const dir = new Hex(
directionHex.q - current.q,
directionHex.r - current.r,
);
while (current.distanceTo(position) < RANGE && this.isInGrid(position)) {
prevPosition = position;
position = new Hex(position.q + dir.q, position.r + dir.r);
}

shooter.lastBulletHex = this.isInGrid(position) ? position : prevPosition;
}
return shotCard;
}

Expand Down