From fc59dfd10e06a97f999ee29d32dd2ab19d6ed698 Mon Sep 17 00:00:00 2001
From: Alec Jones <alecejones@noodoe.com>
Date: Sat, 26 Aug 2023 15:01:03 +0800
Subject: [PATCH] feat: add option to change round when house cards evolve

---
 .../src/client/EntireGameComponent.tsx        |  2 +-
 .../src/client/GameSettingsComponent.tsx      | 37 +++++++++++++++++++
 agot-bg-game-server/src/common/EntireGame.ts  |  3 +-
 .../PostCombatGameState.ts                    |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/agot-bg-game-server/src/client/EntireGameComponent.tsx b/agot-bg-game-server/src/client/EntireGameComponent.tsx
index c61a7b4fe..c321a92c4 100644
--- a/agot-bg-game-server/src/client/EntireGameComponent.tsx
+++ b/agot-bg-game-server/src/client/EntireGameComponent.tsx
@@ -199,7 +199,7 @@ export default class EntireGameComponent extends Component<EntireGameComponentPr
                     placement="auto"
                     overlay={
                         <Tooltip id="evolution-active-tooltip">
-                            From round <b>5</b> onwards, each house returns its alternative deck when the last house card has been played.
+                            From round <b>{this.settings.houseCardsEvolutionRound}</b> onwards, each house returns its alternative deck when the last house card has been played.
                         </Tooltip>}
                     popperConfig={{ modifiers: [preventOverflow] }}
                 >
diff --git a/agot-bg-game-server/src/client/GameSettingsComponent.tsx b/agot-bg-game-server/src/client/GameSettingsComponent.tsx
index 23ecf00c6..f08ac59ce 100644
--- a/agot-bg-game-server/src/client/GameSettingsComponent.tsx
+++ b/agot-bg-game-server/src/client/GameSettingsComponent.tsx
@@ -364,6 +364,29 @@ export default class GameSettingsComponent extends Component<GameSettingsCompone
                         onChange={() => this.changeGameSettings(() => this.gameSettings.houseCardsEvolution = !this.gameSettings.houseCardsEvolution)}
                     />
                 </Col>
+                {
+                    this.gameSettings.houseCardsEvolution && (
+                        <Col xs="12">
+                            <div>
+                                <select id="decks-evolution-setting-round"
+                                    value={this.gameSettings.houseCardsEvolutionRound}
+                                    onChange={(e) => this.onHouseCardsEvolutionRoundChange(e.target.value)}
+                                    style={{marginBottom: "8px"}}
+                                >
+                                    <option key="2" value={2}>2</option>
+                                    <option key="3" value={3}>3</option>
+                                    <option key="4" value={4}>4</option>
+                                    <option key="5" value={5}>5</option>
+                                    <option key="6" value={6}>6</option>
+                                    <option key="7" value={7}>7</option>
+                                    <option key="8" value={8}>8</option>
+                                    <option key="9" value={9}>9</option>
+                                    <option key="10" value={10}>10</option>
+                                </select>&nbsp;House Card Evolution Round
+                            </div>
+                        </Col>
+                    )
+                }
                 {this.props.entireGame.isCustomBalancingOptionAvailable(this.gameSettings) && <Col xs="12">
                     <FormCheck
                         id="custom-balancing-setting"
@@ -861,6 +884,20 @@ export default class GameSettingsComponent extends Component<GameSettingsCompone
         this.changeGameSettings();
     }
 
+    onHouseCardsEvolutionRoundChange(newVal: string): void {
+        if (!this.canChangeGameSettings) {
+            return;
+        }
+
+        if (!this.gameSettings.houseCardsEvolution) {
+            return;
+        }
+
+        this.gameSettings.houseCardsEvolutionRound = parseInt(newVal);
+
+        this.changeGameSettings();
+    }
+
     onRandomChosenHousesChange(): void {
         if (!this.entireGame.gameSettings.randomChosenHouses && this.entireGame.gameSettings.randomHouses) {
             return;
diff --git a/agot-bg-game-server/src/common/EntireGame.ts b/agot-bg-game-server/src/common/EntireGame.ts
index a1dc361ac..d3a9fbbc4 100644
--- a/agot-bg-game-server/src/common/EntireGame.ts
+++ b/agot-bg-game-server/src/common/EntireGame.ts
@@ -48,7 +48,7 @@ export default class EntireGame extends GameState<null, LobbyGameState | IngameG
     lastMessageReceivedAt: Date | null = null;
 
     @observable gameSettings: GameSettings = { setupId: "mother-of-dragons", playerCount: 8, pbem: true, onlyLive: false, startWhenFull: false, private: false,
-        addPortToTheEyrie: false, adwdHouseCards: false, asosHouseCards: false, houseCardsEvolution: false,
+        addPortToTheEyrie: false, adwdHouseCards: false, asosHouseCards: false, houseCardsEvolution: false, houseCardsEvolutionRound: 5,
         vassals: true, ironBank: true, seaOrderTokens: true, allowGiftingPowerTokens: true, randomVassalAssignment: false, customBalancing: false,
         randomHouses: false, randomChosenHouses: false, tidesOfBattle: false, removeTob3: false, removeTobSkulls: false, limitTob2: false,
         draftHouseCards: false, thematicDraft: false, limitedDraft: false, blindDraft: false,
@@ -798,6 +798,7 @@ export interface GameSettings {
     randomVassalAssignment: boolean;
     customBalancing: boolean;
     houseCardsEvolution: boolean;
+    houseCardsEvolutionRound: number;
     initialLiveClock: number;
     noPrivateChats: boolean;
     tournamentMode: boolean;
diff --git a/agot-bg-game-server/src/common/ingame-game-state/action-game-state/resolve-march-order-game-state/combat-game-state/post-combat-game-state/PostCombatGameState.ts b/agot-bg-game-server/src/common/ingame-game-state/action-game-state/resolve-march-order-game-state/combat-game-state/post-combat-game-state/PostCombatGameState.ts
index e24595c98..2fa692ac9 100644
--- a/agot-bg-game-server/src/common/ingame-game-state/action-game-state/resolve-march-order-game-state/combat-game-state/post-combat-game-state/PostCombatGameState.ts
+++ b/agot-bg-game-server/src/common/ingame-game-state/action-game-state/resolve-march-order-game-state/combat-game-state/post-combat-game-state/PostCombatGameState.ts
@@ -461,7 +461,7 @@ export default class PostCombatGameState extends GameState<
         if (house.houseCards.values.every(hc => hc.state == HouseCardState.USED)) {
             if (this.entireGame.gameSettings.houseCardsEvolution
                 && house.laterHouseCards != null
-                && this.combat.ingameGameState.game.turn >= 5) {
+                && this.combat.ingameGameState.game.turn >= this.entireGame.gameSettings.houseCardsEvolutionRound) {
 
                 // We need to swap to the new deck now
                 this.game.previousPlayerHouseCards.set(house, new BetterMap());