add difficulties

src/client/ClientGame.ts

@@ -1,5 +1,5 @@
 import { Executor } from "../core/execution/ExecutionManager";
-import {Cell, MutableGame, PlayerEvent, PlayerID, MutablePlayer, TileEvent, Player, Game, BoatEvent, Tile, PlayerType, GameMap} from "../core/game/Game";
+import { Cell, MutableGame, PlayerEvent, PlayerID, MutablePlayer, TileEvent, Player, Game, BoatEvent, Tile, PlayerType, GameMap, Difficulty } from "../core/game/Game";
 import { createGame } from "../core/game/GameImpl";
 import { EventBus } from "../core/EventBus";
 import { Config, getConfig } from "../core/configuration/Config";
@@ -21,13 +21,14 @@ export interface LobbyConfig {
     gameID: GameID
     ip: string | null
     map: GameMap | null
+    difficulty: Difficulty | null
 }
 
 export interface GameConfig {
     map: GameMap
+    difficulty: Difficulty
     clientID: ClientID,
     gameID: GameID,
-    ip: string | null,
 }
 
 export function joinLobby(lobbyConfig: LobbyConfig, onjoin: () => void): () => void {
@@ -35,11 +36,11 @@ export function joinLobby(lobbyConfig: LobbyConfig, onjoin: () => void): () => v
     const playerID = uuidv4()
     const eventBus = new EventBus()
     const config = getConfig()
-    const transport = new Transport(lobbyConfig.isLocal, eventBus, lobbyConfig.gameID, clientID, playerID, config, lobbyConfig.playerName)
+    const transport = new Transport(lobbyConfig.isLocal, eventBus, lobbyConfig.gameID, lobbyConfig.ip, clientID, playerID, config, lobbyConfig.playerName)
 
     const onconnect = () => {
         console.log('Joined game lobby!');
-        transport.joinGame(clientID, 0)
+        transport.joinGame(0)
     };
     const onmessage = (message: ServerMessage) => {
         if (message.type == "start") {
@@ -47,6 +48,7 @@ export function joinLobby(lobbyConfig: LobbyConfig, onjoin: () => void): () => v
             onjoin()
             const gameConfig = {
                 map: message.config?.gameMap || lobbyConfig.map,
+                difficulty: message.config?.difficulty || lobbyConfig.difficulty,
                 clientID: clientID,
                 gameID: lobbyConfig.gameID,
                 ip: lobbyConfig.ip,
@@ -71,14 +73,16 @@ export async function createClientGame(gameConfig: GameConfig, eventBus: EventBu
     const canvas = createCanvas()
     let gameRenderer = createRenderer(canvas, game, eventBus, gameConfig.clientID)
 
+
+    console.log(`creating private game got difficulty: ${gameConfig.difficulty}`)
+
     return new GameRunner(
-        gameConfig.clientID,
-        gameConfig.ip,
+        gameConfig,
         eventBus,
         game,
         gameRenderer,
         new InputHandler(canvas, eventBus),
-        new Executor(game, gameConfig.gameID),
+        new Executor(game, gameConfig.difficulty, gameConfig.gameID),
         transport,
     )
 }
@@ -96,8 +100,7 @@ export class GameRunner {
     private hasJoined = false
 
     constructor(
-        private id: ClientID,
-        private clientIP: string | null,
+        private gameConfig: GameConfig,
         private eventBus: EventBus,
         private gs: Game,
         private renderer: GameRenderer,
@@ -122,7 +125,7 @@ export class GameRunner {
 
         const onconnect = () => {
             console.log('Connected to game server!');
-            this.transport.joinGame(this.clientIP, this.turns.length)
+            this.transport.joinGame(this.turns.length)
         };
         const onmessage = (message: ServerMessage) => {
             if (message.type == "start") {
@@ -170,7 +173,7 @@ export class GameRunner {
 
     private playerEvent(event: PlayerEvent) {
         console.log('received new player event!')
-        if (event.player.clientID() == this.id) {
+        if (event.player.clientID() == this.gameConfig.clientID) {
             console.log('setting name')
             this.myPlayer = event.player
         }

src/client/HostLobbyModal.ts

@@ -1,12 +1,13 @@
 import { LitElement, html, css } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
-import {GameMap} from '../core/game/Game';
+import { Difficulty, GameMap } from '../core/game/Game';
 import { Lobby } from '../core/Schemas';
 
 @customElement('host-lobby-modal')
 export class HostLobbyModal extends LitElement {
   @state() private isModalOpen = false;
   @state() private selectedMap: GameMap = GameMap.World;
+  @state() private selectedDiffculty: Difficulty = Difficulty.Medium;
   @state() private lobbyId = 'a345d';
   @state() private copySuccess = false;
 
@@ -120,6 +121,18 @@ export class HostLobbyModal extends LitElement {
                 `)}
             </select>
           </div>
+          <div>
+            <label for="map-select">Difficulty: </label>
+            <select id="map-select" @change=${this.handleDifficultyChange}>
+              ${Object.entries(Difficulty)
+        .filter(([key]) => isNaN(Number(key)))
+        .map(([key, value]) => html`
+                  <option value=${value} ?selected=${this.selectedDiffculty === value}>
+                    ${key}
+                  </option>
+                `)}
+            </select>
+          </div>
           <button @click=${this.startGame}>Start Game</button>
         </div>
       </div>
@@ -138,6 +151,7 @@ export class HostLobbyModal extends LitElement {
             id: this.lobbyId,
           },
           map: this.selectedMap,
+          difficulty: this.selectedDiffculty,
         },
         bubbles: true,
         composed: true
@@ -155,15 +169,25 @@ export class HostLobbyModal extends LitElement {
   private async handleMapChange(e: Event) {
     this.selectedMap = Number((e.target as HTMLSelectElement).value) as GameMap;
     console.log(`updating map to ${this.selectedMap}`)
+    this.putGameConfig()
+  }
+
+  private async handleDifficultyChange(e: Event) {
+    this.selectedDiffculty = Number((e.target as HTMLSelectElement).value) as Difficulty;
+    console.log(`updating difficulty to ${this.selectedDiffculty}`)
+    this.putGameConfig()
+  }
+
+  private async putGameConfig() {
     const response = await fetch(`/private_lobby/${this.lobbyId}`, {
       method: 'PUT',
       headers: {
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify({gameMap: this.selectedMap})
+      body: JSON.stringify({ gameMap: this.selectedMap, difficulty: this.selectedDiffculty })
     });
-
   }
+
   private async startGame() {
     console.log(`Starting private game with map: ${GameMap[this.selectedMap]}`);
     this.close();

src/client/Main.ts

@@ -77,6 +77,7 @@ class Client {
                 gameID: lobby.id,
                 ip: clientIP,
                 map: event.detail.map,
+                difficulty: event.detail.difficulty,
             },
             () => this.joinModal.close()
         );

src/client/PublicLobby.ts

@@ -1,7 +1,7 @@
 import { LitElement, html, css } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { Lobby } from "../core/Schemas";
-import {GameMap} from '../core/game/Game';
+import { Difficulty, GameMap } from '../core/game/Game';
 
 @customElement('public-lobby')
 export class PublicLobby extends LitElement {
@@ -113,6 +113,7 @@ export class PublicLobby extends LitElement {
                     lobby: lobby,
                     singlePlayer: false,
                     map: GameMap.World,
+                    difficulty: Difficulty.Medium,
                 },
                 bubbles: true,
                 composed: true

src/client/SinglePlayerModal.ts

@@ -1,11 +1,12 @@
 import { LitElement, html, css } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
-import {GameMap} from '../core/game/Game';
+import { Difficulty, GameMap } from '../core/game/Game';
 
 @customElement('single-player-modal')
 export class SinglePlayerModal extends LitElement {
   @state() private isModalOpen = false;
   @state() private selectedMap: GameMap = GameMap.World;
+  @state() private selectedDifficulty: Difficulty = Difficulty.Medium;
 
   static styles = css`
     .modal-overlay {
@@ -87,6 +88,19 @@ export class SinglePlayerModal extends LitElement {
                 `)}
             </select>
           </div>
+          <div>
+            <label for="map-select">Difficulty: </label>
+            <select id="map-select" @change=${this.handleDifficultyChange}>
+              ${Object.entries(Difficulty)
+        .filter(([key]) => isNaN(Number(key)))
+        .map(([key, value]) => html`
+                  <option value=${value} ?selected=${this.selectedDifficulty === value}>
+                    ${key}
+                  </option>
+                `)}
+            </select>
+          </div>
+
           <button @click=${this.startGame}>Start Game</button>
         </div>
       </div>
@@ -104,7 +118,9 @@ export class SinglePlayerModal extends LitElement {
   private handleMapChange(e: Event) {
     this.selectedMap = Number((e.target as HTMLSelectElement).value) as GameMap;
   }
-
+  private handleDifficultyChange(e: Event) {
+    this.selectedDifficulty = Number((e.target as HTMLSelectElement).value) as Difficulty;
+  }
   private startGame() {
     console.log(`Starting single player game with map: ${GameMap[this.selectedMap]}`);
     this.dispatchEvent(new CustomEvent('join-lobby', {
@@ -114,6 +130,7 @@ export class SinglePlayerModal extends LitElement {
           id: "LOCAL",
         },
         map: this.selectedMap,
+        difficulty: this.selectedDifficulty
       },
       bubbles: true,
       composed: true

src/client/Transport.ts

@@ -91,6 +91,7 @@ export class Transport {
         private isLocal: boolean,
         private eventBus: EventBus,
         private gameID: GameID,
+        private clientIP: string | null,
         private clientID: ClientID,
         private playerID: PlayerID,
         private config: Config,
@@ -156,14 +157,14 @@ export class Transport {
         }
     }
 
-    joinGame(clientIP: string | null, numTurns: number) {
+    joinGame(numTurns: number) {
         this.sendMsg(
             JSON.stringify(
                 ClientJoinMessageSchema.parse({
                     type: "join",
                     gameID: this.gameID,
                     clientID: this.clientID,
-                    clientIP: clientIP,
+                    clientIP: this.clientIP,
                     lastTurn: numTurns
                 })
             )

src/client/index.html

@@ -28,7 +28,7 @@
 			</svg>
 		</a>
 		<h1 class="text-7xl sm:text-5xl md:text-6xl lg:text-7xl mb-2">OpenFront.io</h1>
-		<h2 class="text-3xl sm:text-4xl md:text-5xl lg:text-6xl mb-4">(v0.7.1)</h2>
+		<h2 class="text-3xl sm:text-4xl md:text-5xl lg:text-6xl mb-4">(v0.7.2)</h2>
 		<div class="flex justify-center items-start">
 			<div class="w-full max-w-3xl p-4 space-y-4">
 				<username-input></username-input>

src/core/Schemas.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import {GameMap, PlayerType} from './game/Game';
+import { Difficulty, GameMap, PlayerType } from './game/Game';
 
 export type GameID = string
 export type ClientID = string
@@ -53,7 +53,8 @@ export interface Lobby {
 }
 
 const GameConfigSchema = z.object({
-    gameMap: z.nativeEnum(GameMap)
+    gameMap: z.nativeEnum(GameMap),
+    difficulty: z.nativeEnum(Difficulty)
 })
 
 const EmojiSchema = z.string().refine(

src/core/configuration/DefaultConfig.ts

@@ -125,7 +125,7 @@ export class DefaultConfig implements Config {
             return 10000
         }
         if (playerInfo.playerType == PlayerType.FakeHuman) {
-            return 25000
+            return 2500 // start troops * strength * difficulty
         }
         return 25000
     }

src/core/execution/ExecutionManager.ts

@@ -1,4 +1,4 @@
-import {Cell, Execution, MutableGame, Game, MutablePlayer, PlayerInfo, TerraNullius, Tile, PlayerType, Alliance, AllianceRequestReplyEvent} from "../game/Game";
+import {Cell, Execution, MutableGame, Game, MutablePlayer, PlayerInfo, TerraNullius, Tile, PlayerType, Alliance, AllianceRequestReplyEvent, Difficulty} from "../game/Game";
 import {AttackIntent, BoatAttackIntentSchema, GameID, Intent, Turn} from "../Schemas";
 import {AttackExecution} from "./AttackExecution";
 import {SpawnExecution} from "./SpawnExecution";
@@ -26,7 +26,7 @@ export class Executor {
     // private random = new PseudoRandom(999)
     private random: PseudoRandom = null
 
-    constructor(private gs: Game, private gameID: GameID) {
+    constructor(private gs: Game, private difficulty: Difficulty, private gameID: GameID) {
         // Add one to avoid id collisions with bots.
         this.random = new PseudoRandom(simpleHash(gameID) + 1)
     }
@@ -98,7 +98,7 @@ export class Executor {
                     this.random.nextID()
                 ),
                 nation.cell,
-                nation.strength
+                nation.strength * this.difficulty
             ))
         }
         return execs

src/core/execution/FakeHumanExecution.ts

@@ -7,6 +7,8 @@ import {SpawnExecution} from "./SpawnExecution";
 
 export class FakeHumanExecution implements Execution {
 
+    private firstMove = true
+
     private active = true
     private random: PseudoRandom;
     private attackRate: number
@@ -56,6 +58,11 @@ export class FakeHumanExecution implements Execution {
                 this.player.setTroops(this.player.troops() * this.strength)
             }
         }
+        if (this.firstMove) {
+            this.firstMove = false
+            this.sendAttack(this.mg.terraNullius())
+            return
+        }
 
         if (this.player.troops() < this.mg.config().maxTroops(this.player) / 4) {
             return

src/core/game/Game.ts

@@ -12,6 +12,13 @@ export type Currency = number
 
 export const AllPlayers = "AllPlayers" as const;
 
+export enum Difficulty {
+    Easy = 1,
+    Medium = 3,
+    Hard = 6,
+    Impossible = 12,
+}
+
 export enum GameMap {
     World,
     Europe

src/server/GameManager.ts

@@ -3,7 +3,7 @@ import {ClientID, GameConfig, GameID} from "../core/Schemas";
 import { v4 as uuidv4 } from 'uuid';
 import { Client } from "./Client";
 import { GamePhase, GameServer } from "./GameServer";
-import {GameMap} from "../core/game/Game";
+import { Difficulty, GameMap } from "../core/game/Game";
 
 
 
@@ -39,7 +39,7 @@ export class GameManager {
 
     createPrivateGame(): string {
         const id = genSmallGameID()
-        this.games.push(new GameServer(id, Date.now(), false, this.config, {gameMap: GameMap.World}))
+        this.games.push(new GameServer(id, Date.now(), false, this.config, { gameMap: GameMap.World, difficulty: Difficulty.Medium }))
         return id
     }
 
@@ -68,7 +68,7 @@ export class GameManager {
         if (now > this.lastNewLobby + this.config.gameCreationRate()) {
             this.lastNewLobby = now
             const id = uuidv4()
-            lobbies.push(new GameServer(id, now, true, this.config, {gameMap: GameMap.World}))
+            lobbies.push(new GameServer(id, now, true, this.config, { gameMap: GameMap.World, difficulty: Difficulty.Medium }))
         }
 
         active.filter(g => !g.hasStarted() && g.isPublic).forEach(g => {

src/server/GameServer.ts

@@ -30,12 +30,16 @@ export class GameServer {
         public readonly isPublic: boolean,
         private config: Config,
         private gameConfig: GameConfig,
+        
     ) { }
 
     public updateGameConfig(gameConfig: GameConfig): void {
         if (gameConfig.gameMap != null) {
             this.gameConfig.gameMap = gameConfig.gameMap
         }
+        if(gameConfig.difficulty != null) {
+            this.gameConfig.difficulty = gameConfig.difficulty
+        }
     }
 
     public addClient(client: Client, lastTurn: number) {

src/server/Server.ts

@@ -49,7 +49,7 @@ app.post('/start_private_lobby/:id', (req, res) => {
 
 app.put('/private_lobby/:id', (req, res) => {
     const lobbyID = req.params.id
-    gm.updateGameConfig(lobbyID, {gameMap: req.body.gameMap})
+    gm.updateGameConfig(lobbyID, {gameMap: req.body.gameMap, difficulty: req.body.difficulty})
 });
 
 app.get('/lobby/:id/exists', (req, res) => {