Fix/double tap full send

src/client/ClientGameRunner.ts

@@ -943,7 +943,8 @@ export class ClientGameRunner {
         this.eventBus.emit(
           new SendAttackIntentEvent(
             this.gameView.owner(tile).id(),
-            this.myPlayer!.troops() * this.renderer.uiState.attackRatio,
+            this.renderer.uiState.attackRatio,
+            this.myPlayer!.troops(),
           ),
         );
       } else if (this.canAutoBoat(actions.buildableUnits, tile)) {
@@ -1102,7 +1103,8 @@ export class ClientGameRunner {
         this.eventBus.emit(
           new SendAttackIntentEvent(
             this.gameView.owner(tile).id(),
-            this.myPlayer!.troops() * this.renderer.uiState.attackRatio,
+            this.renderer.uiState.attackRatio,
+            this.myPlayer!.troops(),
           ),
         );
       }
@@ -1136,12 +1138,14 @@ export class ClientGameRunner {
       mostRecentAttack.attackerID,
     ) as PlayerView;
     if (!attacker) return;
-
-    const counterTroops = Math.min(
-      mostRecentAttack.troops,
-      this.renderer.uiState.attackRatio * this.myPlayer.troops(),
+    this.eventBus.emit(
+      new SendAttackIntentEvent(
+        attacker.id(),
+        this.renderer.uiState.attackRatio,
+        this.myPlayer.troops(),
+        mostRecentAttack.troops,
+      ),
     );
-    this.eventBus.emit(new SendAttackIntentEvent(attacker.id(), counterTroops));
   }
 
   private doRequestAllianceUnderCursor(): void {
@@ -1226,7 +1230,8 @@ export class ClientGameRunner {
     this.eventBus.emit(
       new SendBoatAttackIntentEvent(
         tile,
-        this.myPlayer.troops() * this.renderer.uiState.attackRatio,
+        this.renderer.uiState.attackRatio,
+        this.myPlayer.troops(),
       ),
     );
   }

src/client/Transport.ts

@@ -71,14 +71,17 @@ export class SendSpawnIntentEvent implements GameEvent {
 export class SendAttackIntentEvent implements GameEvent {
   constructor(
     public readonly targetID: PlayerID | null,
-    public readonly troops: number,
+    public readonly troopRatio: number,
+    public readonly troopCount: number,
+    public readonly maxTroopCount: number | null = null,
   ) {}
 }
 
 export class SendBoatAttackIntentEvent implements GameEvent {
   constructor(
     public readonly dst: TileRef,
-    public readonly troops: number,
+    public readonly troopRatio: number,
+    public readonly troopCount: number,
   ) {}
 }
 
@@ -484,14 +487,17 @@ export class Transport {
     this.sendIntent({
       type: "attack",
       targetID: event.targetID,
-      troops: event.troops,
+      troopRatio: event.troopRatio,
+      troopCount: event.troopCount,
+      maxTroopSent: event.maxTroopCount ?? undefined,
     });
   }
 
   private onSendBoatAttackIntent(event: SendBoatAttackIntentEvent) {
     this.sendIntent({
       type: "boat",
-      troops: event.troops,
+      troopRatio: event.troopRatio,
+      troopCount: event.troopCount,
       dst: event.dst,
     });
   }

src/client/hud/layers/AttacksDisplay.ts

@@ -200,12 +200,14 @@ export class AttacksDisplay extends LitElement implements Controller {
 
     const myPlayer = this.game.myPlayer();
     if (!myPlayer) return;
-
-    const counterTroops = Math.min(
-      attack.troops,
-      this.uiState.attackRatio * myPlayer.troops(),
+    this.eventBus.emit(
+      new SendAttackIntentEvent(
+        attacker.id(),
+        this.uiState.attackRatio,
+        myPlayer.troops(),
+        attack.troops,
+      ),
     );
-    this.eventBus.emit(new SendAttackIntentEvent(attacker.id(), counterTroops));
   }
 
   private renderIncomingAttacks() {

src/client/hud/layers/PlayerActionHandler.ts

@@ -27,7 +27,8 @@ export class PlayerActionHandler {
     this.eventBus.emit(
       new SendAttackIntentEvent(
         targetId,
-        this.uiState.attackRatio * player.troops(),
+        this.uiState.attackRatio,
+        player.troops(),
       ),
     );
   }
@@ -36,7 +37,8 @@ export class PlayerActionHandler {
     this.eventBus.emit(
       new SendBoatAttackIntentEvent(
         targetTile,
-        this.uiState.attackRatio * player.troops(),
+        this.uiState.attackRatio,
+        player.troops(),
       ),
     );
   }

src/core/Schemas.ts

@@ -359,7 +359,10 @@ export const AllianceExtensionIntentSchema = z.object({
 export const AttackIntentSchema = z.object({
   type: z.literal("attack"),
   targetID: ID.nullable(),
-  troops: z.number().nonnegative().nullable(),
+  troopCount: z.number().nonnegative(),
+  troopRatio: z.number().gt(0).max(1),
+  // maxTroopSent present only for retaliation.
+  maxTroopSent: z.number().nonnegative().optional(),
 });
 
 export const SpawnIntentSchema = z.object({
@@ -369,7 +372,8 @@ export const SpawnIntentSchema = z.object({
 
 export const BoatAttackIntentSchema = z.object({
   type: z.literal("boat"),
-  troops: z.number().nonnegative(),
+  troopCount: z.number().nonnegative(),
+  troopRatio: z.number().gt(0).max(1),
   dst: z.number(),
 });
 

src/core/execution/ExecutionManager.ts

@@ -42,11 +42,57 @@ export class Executor {
     this.random = new PseudoRandom(simpleHash(gameID) + 1);
   }
 
+  private computeRatio(
+    remainingTroopRatio: number,
+    totalRatioUsage: number,
+  ): number {
+    return (1 - remainingTroopRatio) / totalRatioUsage;
+  }
+
   createExecs(turn: Turn): Execution[] {
-    return turn.intents.map((i) => this.createExec(i));
+    // In the rare case a client sends multiple troopRatio-orders,
+    // we need to "merge" their orders instead of executing them in parallel.
+    // (two 60% attacks should be one 84% attack, not one 120% attack)
+    // But, they may be of different types/on different targets
+    // (hence we do two (84/120)*60% = 42% attacks).
+    const remainingTroopRatio_perClientID = new Map<ClientID, number>();
+    const totalRatioUsage_perClientID = new Map<ClientID, number>();
+    for (const intent of turn.intents) {
+      switch (intent.type) {
+        case "boat":
+        case "attack": {
+          remainingTroopRatio_perClientID.set(
+            intent.clientID,
+            (remainingTroopRatio_perClientID.get(intent.clientID) ?? 1) *
+              (1 - intent.troopRatio),
+          );
+          totalRatioUsage_perClientID.set(
+            intent.clientID,
+            (totalRatioUsage_perClientID.get(intent.clientID) ?? 0) +
+              intent.troopRatio,
+          );
+        }
+      }
+    }
+
+    return turn.intents.map((intent) => {
+      switch (intent.type) {
+        case "boat":
+        case "attack":
+          return this.createExec(
+            intent,
+            this.computeRatio(
+              remainingTroopRatio_perClientID.get(intent.clientID)!,
+              totalRatioUsage_perClientID.get(intent.clientID)!,
+            ),
+          );
+        default:
+          return this.createExec(intent, undefined);
+      }
+    });
   }
 
-  createExec(intent: StampedIntent): Execution {
+  createExec(intent: StampedIntent, troopRatioFactor?: number): Execution {
     const player = this.mg.playerByClientID(intent.clientID);
     if (!player) {
       console.warn(`player with clientID ${intent.clientID} not found`);
@@ -57,7 +103,12 @@ export class Executor {
     switch (intent.type) {
       case "attack": {
         return new AttackExecution(
-          intent.troops,
+          Math.floor(
+            Math.min(
+              troopRatioFactor! * intent.troopRatio * intent.troopCount,
+              intent.maxTroopSent ?? intent.troopCount,
+            ),
+          ),
           player,
           intent.targetID,
           null,
@@ -72,7 +123,11 @@ export class Executor {
       case "spawn":
         return new SpawnExecution(this.gameID, player.info(), intent.tile);
       case "boat":
-        return new TransportShipExecution(player, intent.dst, intent.troops);
+        return new TransportShipExecution(
+          player,
+          intent.dst,
+          Math.floor(troopRatioFactor! * intent.troopRatio * intent.troopCount),
+        );
       case "allianceRequest":
         return new AllianceRequestExecution(player, intent.recipient);
       case "allianceReject":

tests/Attack.test.ts

@@ -21,10 +21,6 @@ let defender: Player;
 let defenderSpawn: TileRef;
 let attackerSpawn: TileRef;
 
-function sendBoat(target: TileRef, troops: number) {
-  game.addExecution(new TransportShipExecution(defender, target, troops));
-}
-
 const immunityPhaseTicks = 10;
 function waitForImmunityToEnd() {
   for (let i = 0; i < immunityPhaseTicks + 1; i++) {
@@ -110,7 +106,9 @@ describe("Attack", () => {
     constructionExecution(game, defender, 1, 1, UnitType.MissileSilo);
     expect(defender.units(UnitType.MissileSilo)).toHaveLength(1);
 
-    sendBoat(game.ref(15, 8), 100);
+    game.addExecution(
+      new TransportShipExecution(defender, game.ref(15, 8), 100),
+    );
 
     constructionExecution(game, defender, 0, 15, UnitType.AtomBomb, 3);
     const nuke = defender.units(UnitType.AtomBomb)[0];
@@ -129,7 +127,9 @@ describe("Attack", () => {
     const player_start_troops = defender.troops();
     const boat_troops = player_start_troops * 0.5;
 
-    sendBoat(game.ref(15, 8), boat_troops);
+    game.addExecution(
+      new TransportShipExecution(defender, game.ref(15, 8), boat_troops),
+    );
 
     game.executeNextTick();