From febabf00db646496277b3c718b76fa60ab9c06d1 Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Wed, 13 Nov 2024 15:31:31 -0800
Subject: [PATCH] must build port before destroyer

---
 .../graphics/layers/radial/BuildMenu.ts       | 38 ++++++++++++-------
 src/core/execution/NukeExecution.ts           |  6 +--
 src/core/game/Game.ts                         | 19 ++++++----
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/src/client/graphics/layers/radial/BuildMenu.ts b/src/client/graphics/layers/radial/BuildMenu.ts
index 43ac74632..0f174e941 100644
--- a/src/client/graphics/layers/radial/BuildMenu.ts
+++ b/src/client/graphics/layers/radial/BuildMenu.ts
@@ -1,7 +1,7 @@
 import { LitElement, html, css } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { EventBus } from '../../../../core/EventBus';
-import { Cell, Game, Item, Items, Player, UnitType } from '../../../../core/game/Game';
+import { Cell, Game, Item, BuildItems, Player, UnitType } from '../../../../core/game/Game';
 import { BuildUnitIntentEvent as BuildItemIntentEvent, BuildUnitIntentEvent, SendNukeIntentEvent } from '../../../Transport';
 import nukeIcon from '../../../../../resources/images/NukeIconWhite.svg';
 import destroyerIcon from '../../../../../resources/images/DestroyerIconWhite.svg';
@@ -17,9 +17,9 @@ interface BuildItem {
 
 const buildTable: BuildItem[][] = [
     [
-        { item: Items.Nuke, icon: nukeIcon },
-        { item: Items.Destroyer, icon: destroyerIcon },
-        { item: Items.Port, icon: portIcon }
+        { item: BuildItems.Nuke, icon: nukeIcon },
+        { item: BuildItems.Destroyer, icon: destroyerIcon },
+        { item: BuildItems.Port, icon: portIcon }
     ]
 ];
 
@@ -145,19 +145,29 @@ export class BuildMenu extends LitElement {
     @state()
     private _hidden = true;
 
-    private canAfford(item: BuildItem): boolean {
-        return this.myPlayer && this.myPlayer.gold() >= item.item.cost;
+    private canBuild(item: BuildItem): boolean {
+        if (!this.myPlayer || this.myPlayer.gold() < item.item.cost) {
+            return false
+        }
+        switch (item.item) {
+            case BuildItems.Destroyer:
+                return this.myPlayer.units(UnitType.Port).length > 0
+            default:
+                return true
+        }
     }
 
     public onBuildSelected = (item: BuildItem) => {
-        switch (item.item.name) {
-            case "Nuke":
+        switch (item.item) {
+            case BuildItems.Nuke:
                 this.eventBus.emit(new SendNukeIntentEvent(this.myPlayer, this.clickedCell, null))
                 break
-            case "Destroyer":
+            case BuildItems.Destroyer:
                 this.eventBus.emit(new BuildUnitIntentEvent(UnitType.Destroyer, this.clickedCell))
-            case "Port":
+                break
+            case BuildItems.Port:
                 this.eventBus.emit(new BuildUnitIntentEvent(UnitType.Port, this.clickedCell))
+                break
         }
         this.hideMenu()
     };
@@ -171,11 +181,11 @@ export class BuildMenu extends LitElement {
                        <button 
                            class="build-button" 
                            @click=${() => this.onBuildSelected(item)}
-                           ?disabled=${!this.canAfford(item)}
-                           title=${!this.canAfford(item) ? 'Not enough money' : ''}
+                           ?disabled=${!this.canBuild(item)}
+                           title=${!this.canBuild(item) ? 'Not enough money' : ''}
                        >
-                            <img src=${item.icon} alt="${item.item.name}" width="40" height="40">
-                            <span class="build-name">${item.item.name}</span>
+                            <img src=${item.icon} alt="${item.item.type}" width="40" height="40">
+                            <span class="build-name">${item.item.type}</span>
                             <span class="build-cost">
                                 ${renderNumber(item.item.cost)}
                                 <img src=${goldCoinIcon} alt="gold" width="12" height="12" style="vertical-align: middle;">
diff --git a/src/core/execution/NukeExecution.ts b/src/core/execution/NukeExecution.ts
index 8119101bc..5eea88886 100644
--- a/src/core/execution/NukeExecution.ts
+++ b/src/core/execution/NukeExecution.ts
@@ -1,4 +1,4 @@
-import { Cell, Execution, Items, MutableGame, MutablePlayer, PlayerID, Tile } from "../game/Game";
+import { Cell, Execution, BuildItems, MutableGame, MutablePlayer, PlayerID, Tile } from "../game/Game";
 import { PseudoRandom } from "../PseudoRandom";
 import { bfs, dist, euclideanDist, manhattanDist } from "../Util";
 
@@ -26,12 +26,12 @@ export class NukeExecution implements Execution {
     }
 
     tick(ticks: number): void {
-        if (this.sender.gold() < Items.Nuke.cost) {
+        if (this.sender.gold() < BuildItems.Nuke.cost) {
             console.warn(`player ${this.sender} insufficient gold for nuke`)
             this.active = false
             return
         }
-        this.sender.removeGold(Items.Nuke.cost)
+        this.sender.removeGold(BuildItems.Nuke.cost)
 
         const rand = new PseudoRandom(this.mg.ticks())
         const tile = this.mg.tile(this.cell)
diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts
index d002c308e..7a8b8d6a0 100644
--- a/src/core/game/Game.ts
+++ b/src/core/game/Game.ts
@@ -26,19 +26,22 @@ export enum GameMap {
 }
 
 export enum UnitType {
-    TransportShip,
-    Destroyer,
-    Port
+    TransportShip = "Transport",
+    Destroyer = "Destroyer",
+    Port = "Port",
+    Nuke = "Nuke",
 }
 
 export class Item {
-    constructor(public readonly name: string, public readonly cost: Gold) { }
+    constructor(public readonly type: UnitType,
+        public readonly cost: Gold
+    ) { }
 }
 
-export const Items = {
-    Nuke: new Item("Nuke", 1_000_000),
-    Destroyer: new Item("Destroyer", 10),
-    Port: new Item("Port", 0)
+export const BuildItems = {
+    Nuke: new Item(UnitType.Nuke, 1_000_000),
+    Destroyer: new Item(UnitType.Destroyer, 10),
+    Port: new Item(UnitType.Port, 0)
 } as const;
 
 export class Nation {