mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-30 00:42:19 +00:00
bug: lastEmojiSet is never used (#406)
## Description: In the existing code, lastEmojiSent can only ever be set if it is already set, causing it to never be used. This change updates the logic to work as intended. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: fake.neo Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
This commit is contained in:
@@ -254,22 +254,6 @@ export class FakeHumanExecution implements Execution {
|
||||
if (mostHated != null && mostHated.relation == Relation.Hostile) {
|
||||
this.enemy = mostHated.player;
|
||||
this.lastEnemyUpdateTick = this.mg.ticks();
|
||||
if (this.enemy.type() == PlayerType.Human) {
|
||||
let lastSent = -300;
|
||||
if (this.lastEmojiSent.has(this.enemy)) {
|
||||
lastSent = this.lastEmojiSent.get(this.enemy);
|
||||
this.lastEmojiSent.set(this.enemy, this.mg.ticks());
|
||||
}
|
||||
if (this.mg.ticks() - lastSent > 300) {
|
||||
this.mg.addExecution(
|
||||
new EmojiExecution(
|
||||
this.player.id(),
|
||||
this.enemy.id(),
|
||||
this.random.randElement(["🤡", "😡"]),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -278,6 +262,7 @@ export class FakeHumanExecution implements Execution {
|
||||
this.enemy = null;
|
||||
return;
|
||||
}
|
||||
this.maybeSendEmoji();
|
||||
this.maybeSendNuke(this.enemy);
|
||||
if (this.player.sharesBorderWith(this.enemy)) {
|
||||
this.sendAttack(this.enemy);
|
||||
@@ -288,6 +273,20 @@ export class FakeHumanExecution implements Execution {
|
||||
}
|
||||
}
|
||||
|
||||
private maybeSendEmoji() {
|
||||
if (this.enemy.type() != PlayerType.Human) return;
|
||||
const lastSent = this.lastEmojiSent.get(this.enemy) ?? -300;
|
||||
if (this.mg.ticks() - lastSent <= 300) return;
|
||||
this.lastEmojiSent.set(this.enemy, this.mg.ticks());
|
||||
this.mg.addExecution(
|
||||
new EmojiExecution(
|
||||
this.player.id(),
|
||||
this.enemy.id(),
|
||||
this.random.randElement(["🤡", "😡"]),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
private maybeSendNuke(other: Player) {
|
||||
if (
|
||||
this.player.units(UnitType.MissileSilo).length == 0 ||
|
||||
|
||||
Reference in New Issue
Block a user