diff --git a/src/client/graphics/layers/PlayerInfoOverlay.ts b/src/client/graphics/layers/PlayerInfoOverlay.ts
index d401d4b94..f04b7032e 100644
--- a/src/client/graphics/layers/PlayerInfoOverlay.ts
+++ b/src/client/graphics/layers/PlayerInfoOverlay.ts
@@ -1,7 +1,7 @@
import { LitElement, html, css } from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
import { Layer } from './Layer';
-import { Game, GameType, Player, Unit, UnitType } from '../../../core/game/Game';
+import { Game, GameType, Player, PlayerType, Unit, UnitType } from '../../../core/game/Game';
import { ClientID } from '../../../core/Schemas';
import { EventBus } from '../../../core/EventBus';
import { TransformHandler } from '../TransformHandler';
@@ -110,13 +110,20 @@ export class PlayerInfoOverlay extends LitElement implements Layer {
}
private renderPlayerInfo(player: Player) {
- const isAlly = (this.myPlayer()?.isAlliedWith(player) || player == this.myPlayer()) ?? false;
+ const myPlayer = this.myPlayer();
+ const isAlly = (myPlayer?.isAlliedWith(player) || player == this.myPlayer()) ?? false;
+ let relation = null
+ if (player.type() == PlayerType.FakeHuman && myPlayer != null) {
+ // Don't create an HTML string, let Lit handle the templating
+ relation = html`
-
${player.name()}
-
Troops: ${renderTroops(player.troops())}
-
Gold: ${renderNumber(player.gold())}
-
+
+
${player.name()}
+
Troops: ${renderTroops(player.troops())}
+
Gold: ${renderNumber(player.gold())}
+ ${relation == null ? '' : relation}
+
`;
}
diff --git a/src/core/configuration/DevConfig.ts b/src/core/configuration/DevConfig.ts
index a604c1411..f7e40f486 100644
--- a/src/core/configuration/DevConfig.ts
+++ b/src/core/configuration/DevConfig.ts
@@ -40,11 +40,11 @@ export class DevConfig extends DefaultConfig {
// return 5000
// }
- numBots(): number {
- return 0
- }
- spawnNPCs(): boolean {
- return false
- }
+ // numBots(): number {
+ // return 0
+ // }
+ // spawnNPCs(): boolean {
+ // return false
+ // }
}
diff --git a/src/core/execution/AttackExecution.ts b/src/core/execution/AttackExecution.ts
index c7cbd35d1..033d45ab7 100644
--- a/src/core/execution/AttackExecution.ts
+++ b/src/core/execution/AttackExecution.ts
@@ -101,6 +101,7 @@ export class AttackExecution implements Execution {
// No updates should happen in init.
this.breakAlliance = true
}
+ this.target.updateRelation(this._owner, -500)
}
}
diff --git a/src/core/execution/FakeHumanExecution.ts b/src/core/execution/FakeHumanExecution.ts
index a5b52b186..c0d30c315 100644
--- a/src/core/execution/FakeHumanExecution.ts
+++ b/src/core/execution/FakeHumanExecution.ts
@@ -14,6 +14,7 @@ import { consolex } from "../Consolex";
import { CityExecution } from "./CityExecution";
import { NukeExecution } from "./NukeExecution";
import { MissileSiloExecution } from "./MissileSiloExecution";
+import { EmojiExecution } from "./EmojiExecution";
export class FakeHumanExecution implements Execution {
@@ -26,9 +27,6 @@ export class FakeHumanExecution implements Execution {
private enemy: Player | null = null
- private rejected: Set