From 87e57aea0eccec9b812a4048cfb069c6de7a0528 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Thu, 23 Feb 2023 23:48:09 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=A0=84=ED=88=AC=20=EC=8B=9C=EB=AE=AC?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=ED=84=B0=EC=97=90=20=EC=8B=9C=EB=93=9C=20?=
 =?UTF-8?q?=EA=B0=92=20=EC=9E=85=EB=A0=A5=20=EA=B0=80=EB=8A=A5=20-=20?=
 =?UTF-8?q?=EC=8B=9C=EB=93=9C=20=EA=B0=92=20=EC=9E=85=EB=A0=A5=EC=8B=9C=20?=
 =?UTF-8?q?=EB=B0=98=EB=B3=B5=20=ED=9A=9F=EC=88=98=EB=8A=94=201=ED=9A=8C?=
 =?UTF-8?q?=EB=A1=9C=20=EA=B3=A0=EC=A0=95=20-=20=EC=8A=A4=ED=82=AC=20?=
 =?UTF-8?q?=EC=84=B1=EA=B3=B5=20=EC=97=AC=EB=B6=80=EB=8A=94=20=EB=8F=99?=
 =?UTF-8?q?=EC=9D=BC=ED=95=98=EB=82=98,=20=EC=8B=A4=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=B9=98=EA=B0=80=20=EC=A1=B0=EA=B8=88=20=EB=8B=A4=EB=A5=B8=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EA=B0=80=20=EA=B4=80=EC=B8=A1=20=EC=9D=B4?=
 =?UTF-8?q?=EC=9C=A0=EB=8A=94=20=EC=B6=94=ED=9B=84=20=ED=99=95=EC=9D=B8=20?=
 =?UTF-8?q?-=20=ED=9E=88=EB=93=A0=20=EB=B2=84=ED=94=84=EB=8A=94=20?=
 =?UTF-8?q?=EC=95=84=EC=A7=81=20=EB=AF=B8=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/battle_simulator.php   | 14 +++++++++++---
 hwe/j_simulate_battle.php  | 14 +++++++++++---
 hwe/ts/battle_simulator.ts | 11 +++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/hwe/battle_simulator.php b/hwe/battle_simulator.php
index fc8491cb..384d3ed5 100644
--- a/hwe/battle_simulator.php
+++ b/hwe/battle_simulator.php
@@ -65,8 +65,8 @@ if ($nationID) {
                 전역 설정
             </div>
             <div class="card-body dragpad_battle">
-                <div class="row">
-                    <div class="col-sm-6">
+                <div class="row gx-0">
+                    <div class="col-sm-4">
                         <div class="input-group">
                             <input type="number" class="form-control" aria-describedby="text_year" value="<?= $startYear ?>" disabled>
                             <div class="input-group-text"> 년 시작 </div>
@@ -76,9 +76,13 @@ if ($nationID) {
                             <div class="input-group-text"> 월 </div>
                         </div>
                     </div>
-                    <div class="col-sm-6">
+                    <div class="col-sm-5 px-2">
                         <div class="btn-toolbar" role="toolbar">
                             <div class="input-group me-2" role="group">
+                                <div class="input-group-text">
+                                    시드
+                                </div>
+                                <input type="text" class="form-control" id="seed" aria-describedby="text_seed">
                                 <div class="input-group-text">
                                     반복 횟수
                                 </div>
@@ -87,6 +91,10 @@ if ($nationID) {
                                     <option value="1000">1000회 (요약 표기)</option>
                                 </select>
                             </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="btn-toolbar" role="toolbar">
                             <div class="btn-group me-2" role="group">
                                 <button type="button" class="btn btn-danger btn-begin_battle">전투</button>
                             </div>
diff --git a/hwe/j_simulate_battle.php b/hwe/j_simulate_battle.php
index e405be56..149288cc 100644
--- a/hwe/j_simulate_battle.php
+++ b/hwe/j_simulate_battle.php
@@ -84,6 +84,7 @@ $rawDefenderList = $query['defenderGenerals'];
 $rawDefenderCity = $query['defenderCity'];
 $rawDefenderNation = $query['defenderNation'];
 
+$warSeed = $query['seed'] ?? '';
 
 $generalCheck = [
     'required'=>[
@@ -297,10 +298,13 @@ function extractRankVar(array $rawVal):Map{
 function simulateBattle(
     $rawAttacker, $rawAttackerCity, $rawAttackerNation,
     $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-    $startYear, $year, $month
+    $startYear, $year, $month, $warSeed
 ){
 
-    $warSeed = bin2hex(random_bytes(16));
+    if(!$warSeed){
+        $warSeed = bin2hex(random_bytes(16));
+    }
+
     $warRng = new RandUtil(new LiteHashDRBG($warSeed));
 
     $attacker = new WarUnitGeneral(
@@ -400,12 +404,16 @@ $avgWar = 0;
 $attackerActivatedSkills = [];
 $defendersActivatedSkills = [];
 
+if($warSeed){
+    $repeatCnt = 1;
+}
+
 foreach(Util::range($repeatCnt) as $repeatIdx){
     /** @var WarUnit $attacker */
     [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice] = simulateBattle(
         $rawAttacker, $rawAttackerCity, $rawAttackerNation,
         $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-        $startYear, $year, $month
+        $startYear, $year, $month, $warSeed
     );
     $lastWarLog = Util::mapWithKey(function($key, $values){
         return ConvertLog(join('<br>', $values));
diff --git a/hwe/ts/battle_simulator.ts b/hwe/ts/battle_simulator.ts
index e47df0b0..9d5f98d0 100644
--- a/hwe/ts/battle_simulator.ts
+++ b/hwe/ts/battle_simulator.ts
@@ -84,6 +84,7 @@ type BattleInfo = {
     year: number,
     month: number,
     repeatCnt: number,
+    seed?: string,
 };
 
 type ExportedGeneralInfo = {
@@ -638,6 +639,12 @@ $(function ($) {
         const defenderCity = battleData.defenderCity;
         const defenderNation = battleData.defenderNation;
 
+        const seed = battleData.seed;
+
+        if(seed){
+            $('#seed').val(seed);
+        }
+
         $('#year').val(battleData.year);
         $('#month').val(battleData.month);
         $('#repeat_cnt').val(battleData.repeatCnt);
@@ -712,6 +719,8 @@ $(function ($) {
         const month = parseInt(unwrap_any<string>($('#month').val()));
         const repeatCnt = parseInt(unwrap_any<string>($('#repeat_cnt').val()));
 
+        const seed = unwrap_any<string>($('#seed').val());
+
         return {
             attackerGeneral: attackerGeneral,
             attackerCity: attackerCity,
@@ -724,6 +733,8 @@ $(function ($) {
             year: year,
             month: month,
             repeatCnt: repeatCnt,
+
+            seed,
         };
     }