misc: 토너먼트, 베팅장 버튼을 약간 더 크게

- 건국은 게임 개시 2턴째부터 가능

.gitignore

@@ -29,6 +29,7 @@ d_pic/*.png
 d_pic/*.webp
 d_pic/uploaded_image
 
+/dist_js
 */dist_misc/*
 */dist_js/*
 */dist_css/*

.phan/config.php

@@ -44,9 +44,7 @@ return [
         'hwe/a_npcList.php',
         'hwe/api.php',
         'hwe/a_traffic.php',
-        'hwe/a_vote.php',
         'hwe/battle_simulator.php',
-        'hwe/b_auction.php',
         'hwe/b_battleCenter.php',
         'hwe/b_betting.php',
         'hwe/v_chiefCenter.php',
@@ -61,9 +59,7 @@ return [
         'hwe/v_processing.php',
         'hwe/b_tournament.php',
         'hwe/b_troop.php',
-        'hwe/c_auction.php',
         'hwe/c_tournament.php',
-        'hwe/c_vote.php',
         'hwe/func_auction.php',
         'hwe/func_command.php',
         'hwe/func_converter.php',
@@ -87,7 +83,6 @@ return [
         'hwe/j_board_article_add.php',
         'hwe/j_board_comment_add.php',
         'hwe/j_board_get_articles.php',
-        'hwe/j_die_immediately.php',
         'hwe/j_diplomacy_destroy_letter.php',
         'hwe/j_diplomacy_get_letter.php',
         'hwe/j_diplomacy_respond_letter.php',

composer.json

@@ -8,28 +8,24 @@
     ],
     "config": {
         "platform": {
-            "php": "8.0"
+            "php": "8.1"
         }
     },
     "require": {
         "brandonwamboldt/utilphp": "^1.1",
         "sergeytsalkov/meekrodb": "^2.3",
         "league/plates": "^3.3",
-        "guzzlehttp/guzzle": "^6.3",
-        "monolog/monolog": "^1.23",
-        "firephp/firephp-core": "^0.4.0",
         "vlucas/valitron": "^1.4",
         "php-extended/php-tail": "^2.1",
         "pguardiario/phpuri": "^1.0",
-        "symfony/lock": "^4.1",
+        "symfony/lock": "^6.0",
         "ezyang/htmlpurifier": "^4.10",
         "xemlock/htmlpurifier-html5": "^0.1.7",
-        "catfan/medoo": "^1.5",
+        "catfan/medoo": "^2.1",
         "phan/phan": "^5.3",
-        "erusev/parsedown-extra": "^0.8.1",
         "nette/caching": "^3.0",
-        "illuminate/database": "^8.61",
-        "illuminate/events": "^8.61",
+        "illuminate/database": "^9.12",
+        "illuminate/events": "^9.12",
         "spatie/data-transfer-object": "^3.7",
         "php-ds/php-ds": "^1.4"
     },

css/config.css

@@ -81,23 +81,34 @@ a.just_link {
 
 button.with_skin {
     padding: 0 4px;
-    background-color: black;
+    background-color: #191919;
     color: white;
     font-size: 14px;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
 }
 
 button.with_skin:disabled {
-    background-color: #333333;
+    background-color: #333;
 }
 
 input.with_skin {
-    background-color: black;
+    background-color: #191919;
     color: white;
     font-size: 14px;
 }
 
+input.with_skin[type=button], input.with_skin[type=submit]{
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+}
+
 input.with_skin:disabled {
-    background-color: #333333;
+    background-color: #333;
 }
 
 .font0 {

css/entrance.css

@@ -36,16 +36,21 @@ body {
     height: 130px;
 }
 
-#user_info button {
+#user_info .btn {
     width: 200px;
-    height: 50px;
     margin: 10px 50px;
+    padding: 10px;
 }
 
 .center_ordered_items {
     text-align: center;
 }
 
+.server-action{
+    padding-top: 16px;
+    padding-bottom: 16px;
+}
+
 .Entrance_ServerList {
     width: 800px;
     height: 64px;

f_config/config.php

@@ -96,7 +96,8 @@ function logError(string $err, string $errstr, string $errpath, array $trace)
     $fdb = FileDB::db(ROOT . '/d_log/err_log.sqlite3', ROOT . '/f_install/sql/err_log.sql');
     $date = date("Ymd_His");
 
-    $err =str_replace(ROOT, '{ROOT}', $errpath);
+    $err = str_replace(ROOT, '{ROOT}', $err);
+    $errstr = str_replace(ROOT, '{ROOT}', $errstr);
     $errpath = str_replace(ROOT, '{ROOT}', $errpath);
     $trace = array_map(function (string $text) {
         return str_replace(ROOT, '{ROOT}', $text);

hwe/_119_b.php

@@ -50,9 +50,9 @@ switch ($btn) {
         $db->update('general', [
             'turntime' => $db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
         ], true);
-        $db->update('auction', [
-            'expire' => $db->sqleval('DATE_SUB(expire, INTERVAL %i MINUTE)', $minute)
-        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_SUB(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
         if ($locked) {
             unlock();
         }
@@ -78,9 +78,9 @@ switch ($btn) {
         $db->update('general', [
             'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
         ], true);
-        $db->update('auction', [
-            'expire' => $db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
-        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
         if ($locked) {
             unlock();
         }

hwe/_admin2.php

@@ -48,54 +48,25 @@ $db = DB::db();
                     <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
                 </td>
                 <td width=105 rowspan=12>
-                    <?php
+                    <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>
+                        <?php
+                        $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');
 
-                    echo "
-            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
-                    $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');
-
-                    foreach ($generalList as $general) {
-                        $style = "style=;";
-                        if ($general['block']         > 0) {
-                            $style .= "background-color:red;";
-                        }
-
-                        $npcColor = getNPCColor($general['npc']);
-                        if($npcColor !== null){
-                            $style .= "color:{$npcColor};";
-                        }
-
-                        echo "
-                <option value={$general['no']} $style>{$general['name']}</option>";
-                    }
-
-                    echo "
-            </select>
-        </td>
-        <td width=100 align=center>아이템 지급</td>
-        <td width=504>
-            <select name=weapon size=1 style='color:white;background-color:black;font-size:14px'>";
-                    foreach (GameConst::$allItems as $itemCategories) {
-                        foreach ($itemCategories as $item => $cnt) {
-                            if ($cnt == 0) {
-                                continue;
+                        foreach ($generalList as $general) {
+                            $style = "style=;";
+                            if ($general['block']         > 0) {
+                                $style .= "background-color:red;";
                             }
-                            $itemObj = buildItemClass($item);
-                            if ($itemObj->isBuyable()) {
-                                continue;
+
+                            $npcColor = getNPCColor($general['npc']);
+                            if ($npcColor !== null) {
+                                $style .= "color:{$npcColor};";
                             }
+
+                            echo "<option value={$general['no']} $style>{$general['name']}</option>";
                         }
-                    }
-                    for ($i = 0; $i < 27; $i++) {
-                        echo "
-                <option value={$i}>{$i}</option>";
-                    }
-                    ?>
+                        ?>
                     </select>
-                    <input type=submit name=btn value='무기지급'>
-                    <input type=submit name=btn value='책지급'>
-                    <input type=submit name=btn value='말지급'>
-                    <input type=submit name=btn value='도구지급'>
                 </td>
             </tr>
             <tr>
@@ -109,10 +80,6 @@ $db = DB::db();
                 <td align=center>강제 사망</td>
                 <td><input type=submit name=btn value='강제 사망'></td>
             </tr>
-            <tr>
-                <td align=center>이벤트</td>
-                <td><input type=submit name=btn value='특기 부여'><input type=submit name=btn value='공헌치1000'><input type=submit name=btn value='경험치1000'></td>
-            </tr>
             <tr>
                 <td align=center>이벤트2</td>
                 <td><input type=submit name=btn value='보숙10000'><input type=submit name=btn value='궁숙10000'><input type=submit name=btn value='기숙10000'><input type=submit name=btn value='귀숙10000'><input type=submit name=btn value='차숙10000'></td>
@@ -121,10 +88,6 @@ $db = DB::db();
                 <td align=center>접속제한</td>
                 <td><input type=submit name=btn value='접속 허용'><input type=submit name=btn value='접속 제한'></td>
             </tr>
-            <tr>
-                <td align=center>턴 시각 설정</td>
-                <td><input type=submit name=btn value='00턴'><input type=submit name=btn value='랜덤턴'></td>
-            </tr>
             <tr>
                 <td align=center>명령 설정</td>
                 <td><input type=submit name=btn value='하야입력'><input type=submit name=btn value='방랑해산'></td>

hwe/_admin2_submit.php

@@ -107,28 +107,6 @@ switch ($btn) {
             'arg' => '{}',
             'brief' => '휴식',
         ], 'general_id IN %li AND turn_idx = 0', $genlist);
-        break;
-    case "특기 부여":
-        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
-        $text = "특기 부여!";
-
-        foreach ($db->query("SELECT `no`,leadership,strength,intel,dex1,dex2,dex3,dex4,dex5 FROM general WHERE `no` IN %li", $genlist) as $general) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-
-            $specialWar = SpecialityHelper::pickSpecialWar($general);
-            $db->update('general', [
-                'specage2' => $db->sqleval('age'),
-                'special2' => $specialWar
-            ], 'no=%i', $general['no']);
-            $specialWarName = buildGeneralSpecialWarClass($specialWar)->getName();
-            $josaUl = JosaUtil::pick($specialWarName, '을');
-            $logger = new ActionLogger($general['no'], 0, $year, $month);
-            $logger->pushGeneralHistoryLog("특기 【<b><C>{$specialWarName}</></b>】{$josaUl} 습득");
-            $logger->pushGeneralActionLog("특기 【<b><L>{$specialWarName}</></b>】{$josaUl} 익혔습니다!",ActionLogger::PLAIN);
-            $logger->flush();
-        }
-
         break;
     case "경험치1000":
         $text = $btn . " 지급!";
@@ -222,95 +200,6 @@ switch ($btn) {
             $msg->send(true);
         }
         break;
-    case "무기지급":
-
-        if ($item == 'None') {
-            $text = "무기 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item === 'None') {
-            $db->update('general', [
-                'weapon' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'weapon' => $item
-            ], '`no` IN %li', $genlist, $item);
-        }
-        break;
-    case "책지급":
-        if ($item == 'None') {
-            $text = "책 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item == 'None') {
-            $db->update('general', [
-                'book' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'book' => $item
-            ], '`no` IN %li', $genlist);
-        }
-        break;
-    case "말지급":
-        if ($item == 'None') {
-            $text = "말 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item == 'None') {
-            $db->update('general', [
-                'horse' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'horse' => $item
-            ], '`no` IN %li', $genlist);
-        }
-        break;
-    case "도구지급":
-        if ($item == 'None') {
-            $text = "특수도구 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item == 'None') {
-            $db->update('general', [
-                'item' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'item' => $item
-            ], '`no` IN %li AND item < %i', $genlist, $item);
-        }
-        break;
     case "하야입력":
         $db->update('general_turn', [
             'action' => 'che_하야',
@@ -330,26 +219,6 @@ switch ($btn) {
             'brief' => '해산',
         ], 'general_id IN %li AND turn_idx = 1', $genlist);
         break;
-    case "00턴":
-        $turnterm = $gameStor->turnterm;
-
-        foreach ($genlist as $generalID) {
-            $turntime = getRandTurn($turnterm);
-            $cutTurn = cutTurn($turntime, $turnterm);
-            $db->update('general', [
-                'turntime' => $cutTurn
-            ], '`no` IN %li', $genlist);
-        }
-        break;
-    case "랜덤턴":
-        $turnterm = $gameStor->turnterm;
-        foreach ($genlist as $generalID) {
-            $turntime = getRandTurn($turnterm);
-            $db->update('general', [
-                'turntime' => $turntime
-            ], '`no` IN %li', $genlist);
-        }
-        break;
 }
 
 header('location:_admin2.php');

hwe/a_bestGeneral.php

@@ -2,7 +2,9 @@
 
 namespace sammo;
 
+use Ds\Set;
 use sammo\Enums\RankColumn;
+use sammo\Enums\AuctionType;
 
 include "lib.php";
 include "func.php";
@@ -19,6 +21,7 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("명장일람", 1);
 $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -326,6 +329,32 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
             }
         }
 
+
+        $dummyAuctionGeneral = [
+            'nation' => 0,
+            'no' => 0,
+            'ownerName' => '',
+            'pictureFullPath' => GetImageURL(0) . "/default.jpg",
+            'name' => '경매중',
+            'bgColor' => '#00582c',
+            'fgColor' => 'white',
+            'nationName' => '-',
+        ];
+
+        foreach ($db->queryFirstColumn(
+            'SELECT `target` FROM ng_auction WHERE `finished` = 0 AND `type` = %s',
+            AuctionType::UniqueItem->value
+        ) as $itemClassName) {
+            if(key_exists($itemClassName, $itemOwners)) {
+                $itemOwners[$itemClassName][] = $dummyAuctionGeneral;
+            }
+            else{
+                $itemOwners[$itemClassName] = [$dummyAuctionGeneral];
+            }
+        }
+
+
+
         foreach (GameConst::$allItems as $itemType => $itemList) {
             $itemNameType = $itemTypes[$itemType];
             $itemList = array_reverse($itemList, true);

hwe/a_vote.php

@@ -1,434 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("설문조사", 1);
-
-$isVoteAdmin = in_array('vote', $session->acl[DB::prefix()] ?? []);
-$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
-
-$me = $db->queryFirstRow('SELECT no,vote from general where owner=%i', $userID);
-
-$admin = $gameStor->getValues(['develcost', 'voteopen', 'vote_title', 'vote', 'votecomment']);
-$vote_title = $admin['vote_title'] ?? '-';
-$vote = $admin['vote'] ?: ['-'];
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title><?= UniqueConst::$serverName ?>: 설문조사</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <style>
-        .little_bar {
-            float: left;
-            position: relative;
-            height: 17px;
-            line-height: 17px;
-            text-align: center;
-        }
-    </style>
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printDist('ts', ['common']) ?>
-    <script type="text/javascript">
-        function captureKey(e) {
-            if (e.keyCode == 13 && e.srcElement.type == 'text') {
-                form1.btn.value = '댓글';
-                form1.btn.click();
-                return false;
-            }
-        }
-    </script>
-
-</head>
-
-<body>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td>설 문 조 사<br><?= closeButton() ?></td>
-        </tr>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <form name=form1 action=c_vote.php method=post>
-            <tr>
-                <td colspan=3 align=center class='bg2'>
-                    <font size=5>설 문 조 사 (<?= $admin['develcost'] * 5 ?>금과 추첨으로 유니크템 증정!)</font>
-                </td>
-            </tr>
-            <?php
-
-            if ($isVoteAdmin) {
-                echo "
-    <tr>
-        <td width=48  align=center><input type=submit name=btn value='알림'></td>
-        <td width=98  align=center><input type=submit name=btn value='수정'></td>
-        <td width=848 align=left><input type=text name=title style=width:848px;></td>
-    </tr>
-    ";
-            }
-
-            $vote_title = Tag2Code($vote_title);
-            echo "
-    <tr>
-        <td colspan=2 width=148 align=center class='bg1'>제 목</td>
-        <td width=848 align=left>&nbsp;{$vote_title}</td>
-    </tr>
-";
-
-            $voteCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote>0 AND npc<2');
-            $allCount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2');
-
-            $percentage = round($voteCount / $allCount * 100, 1);
-
-            $voteTypeCount = count($vote);
-            for ($i = 1; $i < $voteTypeCount; $i++) {
-                echo "
-    <tr>
-        <td width=48 align=center style=color:" . getNewColor($i) . "; bgcolor=" . getVoteColor($i) . ">{$i}.</td>
-        <td width=98 align=center>
-    ";
-                if ($me['vote'] == 0 && $me['no'] > 0) {
-                    echo "
-            <input type=radio name=sel value={$i}>
-        ";
-                } elseif ($admin['voteopen'] >= 1 || $isVoteAdmin) {
-                    $vCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote=%i', $i);
-
-                    $per = @round($vCount / $voteCount * 100, 1);
-                    echo "{$vCount} 표 ({$per}%)";
-                } else {
-                    echo "추후공개";
-                }
-                $vote[$i] = Tag2Code($vote[$i]);
-                echo "
-        </td>
-        <td align=left>&nbsp;{$vote[$i]}</td>
-    </tr>
-    ";
-            }
-
-            echo "
-    <tr>
-";
-            if ($me['vote'] == 0 && $me['no'] > 0) {
-                echo "
-        <td align=center>투표</td>
-        <td align=center><input type=submit name=btn value='투표'></td>
-    ";
-            } else {
-                echo "
-        <td colspan=2 align=center>결산</td>
-    ";
-            }
-            echo "
-        <td align=left>&nbsp;투표율 : {$voteCount} / {$allCount} ({$percentage} %)</td>
-    </tr>
-";
-
-            if ($isVoteAdmin) {
-                echo "
-    <tr>
-        <td align=center><input type=submit name=btn value='리셋'></td>
-        <td align=center><input type=submit name=btn value='추가'></td>
-        <td align=left><input type=text name=str style=width:848px;></td>
-    </tr>
-    ";
-            }
-
-            if ($admin['votecomment']) {
-                $comment = $admin['votecomment'];
-                $commentCount = count($comment);
-            } else {
-                $commentCount = 0;
-            }
-            echo "
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td colspan=4 align=center class='bg1'>댓 글</td>
-    </tr>
-";
-            for ($i = 0; $i < $commentCount; $i++) {
-                $cmt = $comment[$i];
-                $cmt[2] = Tag2Code($cmt[2]);
-                $j = $i + 1;
-                echo "
-    <tr>
-        <td width=28  align=center>{$j}.</td>
-        <td width=130  align=center>{$cmt[0]}</td>
-        <td width=130  align=center>{$cmt[1]}</td>
-        <td width=712 align=left>&nbsp;{$cmt[2]}</td>
-    </tr>
-    ";
-            }
-            if ($me['no'] > 0) {
-                echo "
-    <tr>
-        <td width=158 colspan=2 align=center>-</td>
-        <td width=130  align=center><input type=submit name=btn value='댓글'></td>
-        <td align=left><input type=text name=comment maxlength=60 style=width:700px; onkeydown='return captureKey(event)'></td>
-    </tr>
-    ";
-            }
-            ?>
-    </table>
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td colspan=3 align=center class='bg2'>
-                <font size=5>
-                    전 체 통 계
-                    <?php
-                    if ($isVoteAdmin) {
-                        echo "
-        <input type=submit name=btn value='숨김'>
-        <input type=submit name=btn value='전체통계만'>
-        <input type=submit name=btn value='전부'>";
-                    }
-                    echo "
-    </font></td></tr>";
-
-                    if ($admin['voteopen'] >= 1 || $isVoteAdmin) {
-                        echo "
-    <tr>
-        <td width=130  align=center>전 체</td>
-        <td width=128 align=center>{$voteCount} / {$allCount} ({$percentage} %)</td>
-        <td width=742>
-    ";
-
-                        $memCount = max(1, $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2'));
-
-                        $totalVote = [];
-                        $nationVoteCount = [];
-                        $nationVote = [];
-
-                        foreach ($db->query("SELECT nation, vote, count(`no`) as cnt FROM general WHERE npc<2 GROUP BY nation, vote") as $row) {
-                            $nation = $row['nation'];
-                            $ownVote = $row['vote'];
-                            $cnt = $row['cnt'];
-
-                            if (!isset($totalVote[$ownVote])) {
-                                $totalVote[$ownVote] = 0;
-                            }
-
-                            if (!isset($nationVoteCount[$nation])) {
-                                $nationVoteCount[$nation] = 0;
-                                $nationVote[$nation] = [];
-                            }
-
-                            if (!isset($nationVote[$nation][$ownVote])) {
-                                $nationVote[$nation][$ownVote] = 0;
-                            }
-
-                            $totalVote[$ownVote] += $cnt;
-                            $nationVoteCount[$nation] += $cnt;
-                            $nationVote[$nation][$ownVote] += $cnt;
-                        }
-
-                        $totalPer = 0;
-                        for ($i = 0; $i < $voteTypeCount; $i++) {
-                            $per = round(($totalVote[$i] ?? 0) * 100 / $memCount, 1);
-                            if ($i == $voteTypeCount - 1) {
-                                $per = 100 - $totalPer;
-                            } else {
-                                $totalPer += $per;
-                            }
-
-
-                            //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-                    ?>
-                            <?php if ($per == 0) : ?>
-                            <?php elseif ($per < 10) : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'></div>
-                            <?php else : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'><?= $totalVote[$i] ?></div>
-                            <?php endif; ?>
-                        <?php
-                        }
-
-                        echo "
-        </td>
-    </tr>
-    ";
-                    }
-
-                    if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
-                        $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=0 AND npc <2');
-                        if ($memCount == 0) {
-                            $memCount = 1;
-                        }
-
-                        if (!isset($nationVoteCount[0])) {
-                            $nationVoteCount[0] = 0;
-                        }
-                        $percentage = round($nationVoteCount[0] / $memCount * 100, 1);
-
-                        echo "
-    <tr>
-        <td align=center bgcolor=black>재 야</td>
-        <td align=center>{$nationVoteCount[0]} / {$memCount} ({$percentage} %)</td>
-        <td>
-    ";
-
-                        $totalPer = 0;
-                        for ($i = 0; $i < $voteTypeCount; $i++) {
-                            $per = round(Util::array_get($nationVote[0][$i], 0) / $memCount * 100, 1);
-                            if ($i == $voteTypeCount - 1) {
-                                $per = 100 - $totalPer;
-                            } else {
-                                $totalPer += $per;
-                            }
-                            //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-                        ?>
-                            <?php if ($per == 0) : ?>
-                            <?php elseif ($per < 10) : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'></div>
-                            <?php else : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'><?= $nationVote[0][$i] ?></div>
-                            <?php endif; ?>
-                            <?php
-                        }
-
-                        echo "
-        </td>
-    </tr>
-    ";
-
-                        foreach ($db->query('SELECT nation,color,name,gennum from nation order by gennum desc') as $i => $nation) {
-                            $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc<2', $nation['nation']);
-
-
-
-                            $voteCount = $nationVoteCount[$nation['nation']] ?? 0;
-                            if ($memCount == 0) {
-                                $percentage = 100;
-                            } else {
-                                $percentage = round($voteCount / $memCount * 100, 1);
-                            }
-
-
-                            echo "
-    <tr>
-        <td align=center style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}>{$nation['name']}</td>
-        <td align=center>{$voteCount} / {$memCount} ({$percentage} %)</td>
-        <td align=center>
-        ";
-
-                            $totalPer = 0;
-                            for ($k = 0; $k < $voteTypeCount; $k++) {
-                                if ($memCount == 0) {
-                                    $per = 0;
-                                    continue;
-                                }
-
-                                $per = round(($nationVote[$nation['nation']][$k] ?? 0) / $memCount * 100, 1);
-
-                                if ($i == $voteTypeCount - 1) {
-                                    $per = 100 - $totalPer;
-                                } else {
-                                    $totalPer += $per;
-                                }
-
-                                //            if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-                            ?>
-                                <?php if ($per == 0) : ?>
-                                <?php elseif ($per < 10) : ?>
-                                    <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($k) ?>;background-color:<?= getVoteColor($k) ?>;'></div>
-                                <?php else : ?>
-                                    <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($k) ?>;background-color:<?= getVoteColor($k) ?>;'><?= $nationVote[$nation['nation']][$k] ?? 0 ?></div>
-                                <?php endif; ?>
-                    <?php
-                            }
-
-                            echo "
-        </td>
-    </tr>
-        ";
-                        }
-                    }
-                    ?>
-                    </form>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
-</body>
-
-</html>
-
-<?php
-function getVoteColor($type)
-{
-    if ($type > 0) {
-        $type = (($type - 1) % 7) + 1;
-    }
-
-    switch ($type) {
-        default:
-        case 0:
-            $color = "black";
-            break;
-        case 1:
-            $color = "red";
-            break;
-        case 2:
-            $color = "orange";
-            break;
-        case 3:
-            $color = "yellow";
-            break;
-        case 4:
-            $color = "green";
-            break;
-        case 5:
-            $color = "blue";
-            break;
-        case 6:
-            $color = "navy";
-            break;
-        case 7:
-            $color = "purple";
-            break;
-    }
-
-    return $color;
-}
-
-function getNewColor($type)
-{
-    if ($type > 0) {
-        $type = (($type - 1) % 7) + 1;
-    }
-
-    switch ($type) {
-        case 2:
-            $color = "black";
-            break;
-        case 3:
-            $color = "black";
-            break;
-        default:
-            $color = "white";
-            break;
-    }
-
-    return $color;
-}

hwe/b_auction.php

@@ -1,306 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$msg = Util::getReq('msg');
-$msg2 = Util::getReq('msg2');
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("거래장", 2);
-
-$me = $db->queryFirstRow('SELECT no,special,con,turntime from general where owner=%i', $userID);
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']);
-$bidCount = $db->queryFirstField('SELECT count(no) FROM auction where no2=%i', $me['no']);
-
-$btCount = $tradeCount + $bidCount;
-
-if ($session->userGrade >= 5 || $btCount < 1) {
-    $btn = "submit";
-} else {
-    $btn = "hidden";
-}
-
-if ($msg == "") {
-    $msg = "-";
-}
-if ($msg2 == "") {
-    $msg2 = "-";
-}
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title><?= UniqueConst::$serverName ?>: 거래장</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printDist('ts', ['common']) ?>
-</head>
-
-<body>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td>거 래 장<br><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td align=center class='bg2'>
-                <font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick="location.replace('b_auction.php')">
-            </td>
-        </tr>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <form method=post action=c_auction.php>
-            <tr>
-                <td colspan=11 align=center bgcolor=orange>
-                    <font size=5>팝 니 다</font>
-                </td>
-            </tr>
-            <tr align=center class='bg1'>
-                <td width=68>거래번호</td>
-                <td width=48>선택</td>
-                <td width=98>판매자</td>
-                <td width=118>물품</td>
-                <td width=88>수량</td>
-                <td width=88>시작판매가</td>
-                <td width=88>현재판매가</td>
-                <td width=88>즉시판매가</td>
-                <td width=48>단가</td>
-                <td width=98>구매 예정자</td>
-                <td width=148>거래종료</td>
-            </tr>
-            <?php
-            $chk = 0;
-            foreach ($db->query('SELECT * from auction where type=0 order by expire') as $auction) {
-                $radio = "";
-                $alert = "";
-                $alert2 = "";
-                if ($auction['no1'] == $me['no']) {
-                    $radio = " disabled";
-                } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value']) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($auction['no2'] > 0 && $auction['topv'] <= $auction['value']) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($chk == 0) {
-                    $radio = " checked";
-                    $chk = 1;
-                }
-                $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-                $pv = substr((string)$pv, 0, 4);
-
-                echo "
-    <tr align=center>
-        <td>{$auction['no']}</td>
-        <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
-        <td>{$auction['name1']}</td>
-        <td>쌀</td>
-        <td>{$auction['amount']}</td>
-        <td>금 {$auction['cost']}</td>
-        <td>{$alert}금 {$auction['value']}{$alert2}</td>
-        <td>{$alert}금 {$auction['topv']}{$alert2}</td>
-        <td>{$alert}{$pv}{$alert2}</td>
-        <td>{$alert}{$auction['name2']}{$alert2}</td>
-        <td>{$auction['expire']}</td>
-    </tr>
-    ";
-            }
-            ?>
-            <tr height=25>
-                <td align=center class='bg1'>등록결과</td>
-                <td colspan=10><?= ConvertLog($msg) ?></td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>입찰등록</td>
-                <td colspan=10>
-                    　지불할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-                    <input type=<?= $btn ?> name=btn value='구매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>거래등록</td>
-                <td colspan=10>
-                    　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-                    　물품: 쌀
-                    　판매량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-                    　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=500>
-                    　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=2000>
-                    <input type=<?= $btn ?> name=btn value='판매' onclick='return confirm("정말 판매하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td colspan=11>
-                    ㆍ<font color=cyan>Hint</font>) 거래자가 판매(물품 판매, 금 수령), 입찰자가 구매(물품 구입, 금 지불).<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 판매자 유리.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 입찰자 유리.<br>
-                </td>
-            </tr>
-        </form>
-    </table>
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <form method=post action=c_auction.php>
-            <tr>
-                <td colspan=11 align=center bgcolor=skyblue>
-                    <font size=5>삽 니 다</font>
-                </td>
-            </tr>
-            <tr align=center class='bg1'>
-                <td width=68>거래번호</td>
-                <td width=48>선택</td>
-                <td width=98>구매자</td>
-                <td width=118>물품</td>
-                <td width=88>수량</td>
-                <td width=88>시작구매가</td>
-                <td width=88>현재구매가</td>
-                <td width=88>즉시구매가</td>
-                <td width=48>단가</td>
-                <td width=98>판매 예정자</td>
-                <td width=148>거래종료</td>
-            </tr>
-            <?php
-            $chk = 0;
-            foreach ($db->query('SELECT * from auction where type=1 order by expire') as $auction) {
-                $radio = "";
-                $alert = "";
-                $alert2 = "";
-                if ($auction['no1'] == $me['no']) {
-                    $radio = " disabled";
-                } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($auction['no2'] > 0 && $auction['topv'] >= $auction['value']) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($chk == 0) {
-                    $radio = " checked";
-                    $chk = 1;
-                }
-                $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-                $pv = substr((string)$pv, 0, 4);
-                echo "
-    <tr align=center>
-        <td>{$auction['no']}</td>
-        <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
-        <td>{$auction['name1']}</td>
-        <td>쌀</td>
-        <td>{$auction['amount']}</td>
-        <td>금 {$auction['cost']}</td>
-        <td>{$alert}금 {$auction['value']}{$alert2}</td>
-        <td>{$alert}금 {$auction['topv']}{$alert2}</td>
-        <td>{$alert}{$pv}{$alert2}</td>
-        <td>{$alert}{$auction['name2']}{$alert2}</td>
-        <td>{$auction['expire']}</td>
-    </tr>
-    ";
-            }
-            ?>
-            <tr height=25>
-                <td align=center class='bg1'>등록결과</td>
-                <td colspan=10><?= ConvertLog($msg2) ?></td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>입찰등록</td>
-                <td colspan=10>
-                    　수령할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-                    <input type=<?= $btn ?> name=btn value='판매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>거래등록</td>
-                <td colspan=10>
-                    　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-                    　물품: 쌀
-                    　구입량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-                    　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=2000>
-                    　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=500>
-                    <input type=<?= $btn ?> name=btn value='구매' onclick='return confirm("정말 구매하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td colspan=11>
-                    ㆍ<font color=cyan>Hint</font>) 거래자가 구매(물품 구매, 금 지불), 입찰자가 판매(물품 판매, 금 수령).<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 구매자 유리.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 입찰자 유리.<br>
-                </td>
-            </tr>
-        </form>
-    </table>
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td align=center class='bg2'>
-                <font size=5>최 근 기 록</font>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <?= getAuctionLogRecent(20) ?>
-            </td>
-        </tr>
-        <tr>
-            <td align=center class='bg2'>
-                <font size=5>도 움 말</font>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <font color=white size=2>
-                    ㆍ판매거래는 거래자가 판매할 물품을 거래하면, 구입을 희망하는 사람이 현재가보다 높게 입찰하여 구입하는 방식입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 입찰자가 많아서 자연스레 단가가 오르게 됩니다. (해당 물품을 사려는 가격이 오름)<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 초기 가격을 낮게 책정해야 판매가 가능할 겁니다.<br>
-                    ㆍ구매거래는 거래자가 구입할 물품을 거래하면, 판매를 희망하는 사람이 현재가보다 낮게 입찰하여 판매하는 방식입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 입찰자가 많아서 자연스레 단가가 내리게 됩니다. (해당 물품을 팔려는 가격이 내림)<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 초기 가격을 높게 책정해야 구입이 가능할 겁니다.<br>
-                    ㆍ마감임박때 입찰하는 경우 입찰후 1턴 후로 종료시간이 연장됩니다.<br>
-                    ㆍ즉시구매가로 입찰하는 경우 입찰후 1턴 후로 종료시간이 결정됩니다.<br>
-                    ㆍ악용 방지를 위해 50% ~ 200%의 가격에서 거래시작이 가능합니다.<br>
-                    ㆍ악용 방지를 위해 즉시판매가는 110% 이상, 즉시구매가는 90% 이하의 시세로 가능합니다.<br>
-                    ㆍ악용 방지를 위해 즉시판매가는 시작판매가의 110% 이상, 즉시구매가는 시작구매가의 90% 이하로 가능합니다.<br>
-                    ㆍ1인당 도합 1건의 거래와 입찰이 가능합니다.<br>
-                    ㆍ기본금쌀 1000은 거래에 사용되지 못합니다.<br>
-                    ㆍ유찰될 때는 거래 과실자에게 거래금의 1%가 벌금으로 부과됩니다.<br>
-                    ㆍ<font color=magenta>10단위로 거래가 가능합니다. 1자리는 반올림 처리 됩니다.</font><br>
-                    ㆍ<font color=red>★ 최고가 거래 ★</font> 혹은 <font color=red>★ 최저가 거래 ★</font> 는 암거래 및 악용의 가능성이니 감시 부탁드립니다.<br>
-                    ㆍ거래와 입찰은 취소가 불가능하니 주의하세요!<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가는 금/쌀로 쌀1을 거래하기 위한 금의 양입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 높으면(>1.00) 쌀이 비싸므로 판매가 이득입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 낮으면(<1.00) 금이 비싸므로 구매가 이득입니다.<br>
-                        ㆍ즐거운 거래!
-                </font>
-            </td>
-        </tr>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
-</body>
-
-</html>

hwe/b_battleCenter.php

@@ -197,7 +197,7 @@ $showGeneral = General::createGeneralObjFromDB($gen);
             <?php endif; ?>
         </div>
         <div class="row gx-0">
-            <div class="col "><?= backButton() ?></div>
+            <div class="col "><?= closeButton() ?></div>
         </div>
         <div class="row bg0 gx-0">
             <div class="col bg0"><?= banner() ?></div>

hwe/b_betting.php

@@ -23,8 +23,8 @@ $generalID = $session->generalID;
 
 $me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID);
 
-$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'develcost']);
-
+$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
+$turnTerm = $admin['turnterm'];
 $con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
@@ -99,7 +99,7 @@ $str2 = getTournamentTime();
 if ($str2) {
     $str2 = ', ' . $str2;
 }
-$str3 = getTournamentTermText();
+$str3 = getTournamentTermText($turnTerm);
 if ($str3) {
     $str3 = ', ' . $str3;
 }
@@ -135,7 +135,7 @@ if ($str3) {
     </table>
     <table align=center width=1120 class='tb_layout bg0'>
         <tr>
-            <td colspan=16><input type=button value='갱신' onclick='location.reload()'></td>
+            <td colspan=16><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button></td>
         </tr>
         <tr>
             <td colspan=16 align=center>
@@ -441,13 +441,13 @@ if ($str3) {
 
             if ($admin['tournament'] == 6) {
                 echo "
-    <tr align=center>";
+    <tr align=center style='height:2.5em;'>";
 
                 foreach (range(0, 15) as  $i) {
                     $key = $keyMap[$i] ?? -1;
                     echo "
         <td>
-            <select size=1 id='target_{$key}' style=color:white;background-color:black;>
+            <select size=1 id='target_{$key}' style='color:white;background-color:black;padding:0.2rem 0.1rem;'>
                 <option style=color:white; value=10>금10</option>
                 <option style=color:white; value=20>금20</option>
                 <option style=color:white; value=50>금50</option>
@@ -461,12 +461,12 @@ if ($str3) {
 
                 echo "
     </tr>
-    <tr align=center>";
+    <tr align=center style='height:2.2em;'>";
 
                 foreach (range(0, 15) as  $i) {
                     $key = $keyMap[$i] ?? -1;
                     echo "
-        <td><input type=button class='submitBtn' data-target='{$key}' value=베팅! style=width:100%;color:white;background-color:black;></td>";
+        <td><input type=button class='submitBtn' data-target='{$key}' value=베팅! style='width:100%;color:white;padding:0.2rem 0.1rem;background-color:black;'></td>";
                 }
 
                 echo "</tr>";

hwe/b_currentCity.php

@@ -13,9 +13,11 @@ $userID = Session::getUserID();
 $userGrade = Session::getUserGrade();
 
 $db = DB::db();
-
+$gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("현재도시", 1);
 
+$lastExecute = substr($gameStor->turntime, 5, 14);
+
 $me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID);
 $myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']) ?? [
     'nation' => 0,
@@ -446,7 +448,7 @@ $templates = new \League\Plates\Engine('templates');
                             <table align=center width=1000 class='tb_layout bg2'>
                                 <tr>
                                     <td colspan=11 align=center style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>'>【 <?= CityConst::$regionMap[$city['region']] ?> | <?= CityConst::$levelMap[$city['level']] ?> 】 <?= $city['name'] ?></td>
-                                    <td style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>' class='center'><?= date('m-d H:i:s') ?></td>
+                                    <td style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>' class='center'><?= $lastExecute ?></td>
                                 </tr>
                                 <tr>
                                     <td align=center width=48 class=bg1>주민</td>

hwe/b_myBossInfo.php

@@ -25,6 +25,17 @@ if ($meLevel == 0) {
 
 $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nation where nation=%i', $nationID); //국가정보
 
+if ($meLevel >= 5) {
+    $candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+    $candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+    $candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12  order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
+} else {
+    $candidateStrength = [];
+    $candidateIntel = [];
+    $candidateAny = [];
+}
+
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -180,61 +191,21 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
             <td colspan=5><?= $eaglestr ?></td>
         </tr>
     </table>
+
     <table align=center width=1000 class='tb_layout bg0'>
         <tr>
-            <td colspan=6 height=5></td>
+            <td colspan=4 height=5></td>
         </tr>
         <tr>
-            <td colspan=2 align=center bgcolor=red>추 방</td>
+            <td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td>
         </tr>
         <tr>
-            <td width=498 align=right class='bg1'>대상 장수</td>
-            <td width=498>
+            <?php $officerLevelText = getOfficerLevelText(11, $nation['level']); ?>
+            <td width=98 align=right class='bg1'><?= getOfficerLevelText(12, $nation['level']) ?></td>
+            <td width=398><?= $level[12]['name'] ?> 【<?= CityConst::byID($level[12]['city'])->name ?>】</td>
+            <td width=98 align=right class='bg1'><?= $officerLevelText ?></td>
+            <td width=398>
                 <?php
-
-                if ($meLevel >= 5) {
-                    $candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
-                    $candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
-                    $candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12  order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
-                } else {
-                    $candidateStrength = [];
-                    $candidateIntel = [];
-                    $candidateAny = [];
-                }
-
-
-                if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) {
-                    echo "
-            <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
-
-                    foreach ($candidateAny as $general) {
-                        if ($general['no'] === $me['no']) {
-                            continue;
-                        }
-                        echo "
-                <option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} <small>({$general['leadership']}/{$general['strength']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
-                    }
-
-                    echo "
-            </select>
-            <input type=$btn id='btn_kick' value=추방>";
-                }
-
-                $officerLevelText = getOfficerLevelText(11, $nation['level']);
-                echo "
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=4 height=5></td></tr>
-    <tr><td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td></tr>
-    <tr>
-        <td width=98  align=right class='bg1'>" . getOfficerLevelText(12, $nation['level']) . "</td>
-        <td width=398>{$level[12]['name']} 【" . CityConst::byID($level[12]['city'])->name . "】</td>
-        <td width=98  align=right class='bg1'>{$officerLevelText}</td>
-        <td width=398>
-";
-
                 if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
                     echo "
             <select id='genlist_11' size=1 maxlength=15 style=color:white;background-color:black;>
@@ -553,6 +524,34 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
                         <td colspan=5>※ <font color=orange>노란색</font>은 변경 불가능, 하얀색은 변경 가능 관직입니다.</td>
                     </tr>
                 </table>
+                <table align=center width=1000 class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=6 height=5></td>
+                    </tr>
+                    <tr>
+                        <td colspan=2 align=center bgcolor=red>추 방</td>
+                    </tr>
+                    <tr>
+                        <td width=498 align=right class='bg1'>대상 장수</td>
+                        <td width=498>
+                            <?php
+                            if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) : ?>
+
+                                <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
+
+                                    <?php foreach ($candidateAny as $general) : ?>
+                                        <?php if ($general['no'] === $me['no']) {
+                                            continue;
+                                        }
+                                        ?>
+                                        <option data-officer_level='<?= $general['officer_level'] ?>' data-name='<?= $general['name'] ?>' value='<?= $general['no'] ?>'><?= $general['name'] ?> <small>(<?= $general['leadership'] ?>/<?= $general['strength'] ?>/<?= $general['intel'] ?>, <?= $general['killturn'] ?>턴)</small></option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <input type=<?= $btn ?> id='btn_kick' value=추방>
+                            <?php endif; ?>
+                        </td>
+                    </tr>
+                </table>
                 <br>
                 <table align=center width=1000 class='tb_layout bg0'>
                     <tr>

hwe/b_myPage.php

@@ -5,8 +5,9 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
-$showDieImmediatelyBtn = false;
-$availableDieImmediately = false;
+$showDieOnPrestartBtn = false;
+$showBuildNationCandidateBtn = false;
+$availableDieOnPrestart = false;
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
@@ -31,12 +32,16 @@ if ($myset > 0) {
 $targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, 2);
 if ($gameStor->turntime <= $gameStor->opentime) {
     //서버 가오픈시 할 수 있는 행동
-    if ($me->getNPCType() == 0) {
-        $showDieImmediatelyBtn = true;
+    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
+        $showDieOnPrestartBtn = true;
         if ($targetTime <= TimeUtil::now()) {
-            $availableDieImmediately = true;
+            $availableDieOnPrestart = true;
         }
     }
+
+    if($me->getNationID() == 0){
+        $showBuildNationCandidateBtn = true;
+    }
 }
 
 $use_treatment = $me->getAuxVar('use_treatment') ?? 10;
@@ -51,7 +56,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
     <meta name="viewport" content="width=500" />
     <title><?= UniqueConst::$serverName ?>: 내정보</title>
     <?= WebUtil::printStaticValues([
-        'availableDieImmediately' => $availableDieImmediately,
+        'availableDieOnPrestart' => $availableDieOnPrestart,
         'staticValues' => [
             'items' => Util::mapWithKey(fn (string $key, BaseItem $item) => [
                 'name' => $item->getName(),
@@ -122,9 +127,14 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                         <!--빙의 해제용 삭턴 조절<br>
             <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>빙의 해체 요청</button></a>-->
 
-                        <?php if ($showDieImmediatelyBtn) : ?>
+                        <?php if ($showDieOnPrestartBtn) : ?>
                             가오픈 기간 내 장수 삭제 (<?= substr($targetTime, 0, 19) ?> 부터)<br>
-                            <a href="c_die_immediately.php" id='die_immediately'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button></a><br><br>
+                            <button type="button" id='dieOnPrestart' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button><br><br>
+                        <?php endif; ?>
+
+                        <?php if ($showBuildNationCandidateBtn) : ?>
+                            서버 개시 이전 거병(2턴부터 건국 가능)<br>
+                            <button type="button" id='buildNationCandidate' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>사전 거병</button><br><br>
                         <?php endif; ?>
 
                         <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>

hwe/b_tournament.php

@@ -17,7 +17,8 @@ TurnExecutionHelper::executeAllCommand();
 $me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
 $generalID = $session->generalID;
 
-$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
+$admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
+$turnTerm = $admin['turnterm'];
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -120,128 +121,80 @@ $globalBetTotal = array_sum($globalBet);
         </tr>
     </table>
     <table align=center class='tb_layout bg0'>
-        <?php
-        if ($session->userGrade >= 5) {
-            $sel = [];
-            echo "
-<form method=post action=c_tournament.php>
-    <tr><td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td></tr>
-    <tr><td colspan=8>
-        <input type=button value='갱신' onclick='location.reload()'>";
+        <?php if ($session->userGrade >= 5) : ?>
+            <form method=post action=c_tournament.php>
+                <tr>
+                    <td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td>
+                </tr>
+                <tr>
+                    <td colspan=8>
+                        <button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button>
+                        <?php if ($admin['tournament'] == 0) : ?>
+                            <select name=auto size=1 style=color:white;background-color:black;>
+                                <option style=color:white; value=0 <?= !$admin['tnmt_trig'] ? 'selected' : '' ?>>수동진행</option>
+                                <option style=color:white; value=1 <?= $admin['tnmt_trig'] ? 'selected' : '' ?>>자동진행</option>
+                            </select>
+                            <input type=submit name=btn value='자동개최설정'>
+                        <?php else : ?>
+                            <input type=submit name=btn value='중단' onclick='return confirm("진짜 중단하시겠습니까?")'>
+                        <?php endif; ?>
 
-            switch ($admin['tnmt_trig']) {
-                case 0:
-                    $sel[0] = "selected";
-                    break;
-                case 1:
-                    $sel[1] = "selected";
-                    break;
-                case 2:
-                    $sel[2] = "selected";
-                    break;
-                case 3:
-                    $sel[3] = "selected";
-                    break;
-                case 4:
-                    $sel[4] = "selected";
-                    break;
-                case 5:
-                    $sel[5] = "selected";
-                    break;
-                case 6:
-                    $sel[6] = "selected";
-                    break;
-                case 7:
-                    $sel[7] = "selected";
-                    break;
-            }
 
-            if ($admin['tournament'] == 0) {
-        ?>
-                <select name=auto size=1 style=color:white;background-color:black;>
-                    <option style=color:white; value=0>수동진행</option>
-                    <option style=color:white; value=1>12분 05일</option>
-                    <option style=color:white; value=2>07분 10시</option>
-                    <option style=color:white; value=3>03분 04시</option>
-                    <option style=color:white; value=4>01분 82분</option>
-                    <option style=color:white; value=5>30초 41분</option>
-                    <option style=color:white; value=6>15초 21분</option>
-                    <option style=color:white; value=7>05초 07분</option>
-                </select>
-                <select name=type size=1 style=color:white;background-color:black;>
-                    <option style=color:white; value=0>전력전</option>
-                    <option style=color:white; value=1>통솔전</option>
-                    <option style=color:white; value=2>일기토</option>
-                    <option style=color:white; value=3>설전</option>
-                </select>
-                <input type=submit name=btn value='개최'>
-                <select name=trig size=1 style=color:white;background-color:black;>
-                    <option style=color:white; value=0 <?= $sel[0] ?? '' ?>>수동진행</option>
-                    <option style=color:white; value=1 <?= $sel[1] ?? '' ?>>12분 05일</option>
-                    <option style=color:white; value=2 <?= $sel[2] ?? '' ?>>07분 10시</option>
-                    <option style=color:white; value=3 <?= $sel[3] ?? '' ?>>03분 04시</option>
-                    <option style=color:white; value=4 <?= $sel[4] ?? '' ?>>01분 82분</option>
-                    <option style=color:white; value=5 <?= $sel[5] ?? '' ?>>30초 41분</option>
-                    <option style=color:white; value=6 <?= $sel[6] ?? '' ?>>15초 21분</option>
-                    <option style=color:white; value=7 <?= $sel[7] ?? '' ?>>05초 07분</option>
-                </select>
-                <input type=submit name=btn value='자동개최설정'>
-                <input type=submit name=btn value='포상'>
-                <input type=submit name=btn value='회수'>
-        <?php
-            } else {
-                echo "<input type=submit name=btn value='중단' onclick='return confirm(\"진짜 중단하시겠습니까?\")'>";
-            }
+                        <?php switch ($admin['tournament']) {
+                            case 1:
+                                echo "<input type=submit name=btn value='랜덤투입'>";
+                                echo "<input type=submit name=btn value='랜덤전부투입'>";
+                                break;
+                            case 2:
+                                echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
+                                break;
+                            case 3:
+                                echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
+                                break;
+                            case 4:
+                                echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
+                                break;
+                            case 5:
+                                echo "<input type=submit name=btn value='배정'>";
+                                break;
+                            case 6:
+                                echo "<input type=submit name=btn value='베팅마감'>";
+                                break;
+                            case 7:
+                                echo "<input type=submit name=btn value='16강'>";
+                                break;
+                            case 8:
+                                echo "<input type=submit name=btn value='8강'>";
+                                break;
+                            case 9:
+                                echo "<input type=submit name=btn value='4강'>";
+                                break;
+                            case 10:
+                                echo "<input type=submit name=btn value='결승'>";
+                                break;
+                        } ?>
 
-            switch ($admin['tournament']) {
-                case 1:
-                    echo "<input type=submit name=btn value='랜덤투입'>";
-                    echo "<input type=submit name=btn value='랜덤전부투입'>";
-                    break;
-                case 2:
-                    echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
-                    break;
-                case 3:
-                    echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
-                    break;
-                case 4:
-                    echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
-                    break;
-                case 5:
-                    echo "<input type=submit name=btn value='배정'>";
-                    break;
-                case 6:
-                    echo "<input type=submit name=btn value='베팅마감'>";
-                    break;
-                case 7:
-                    echo "<input type=submit name=btn value='16강'>";
-                    break;
-                case 8:
-                    echo "<input type=submit name=btn value='8강'>";
-                    break;
-                case 9:
-                    echo "<input type=submit name=btn value='4강'>";
-                    break;
-                case 10:
-                    echo "<input type=submit name=btn value='결승'>";
-                    break;
-            }
-
-            echo "
-    </td></tr>
-</form>";
-        } elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) {
-            echo "<form method=post action=c_tournament.php><tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'><input type=submit name=btn value='참가' onclick='return confirm(\"참가비 금{$admin['develcost']}이 필요합니다. 참가하시겠습니까?\")'></td></tr></form>";
-        } else {
-            echo "<tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'></td></tr>";
-        }
+                    </td>
+                </tr>
+            </form>
+        <?php elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
+            <form method=post action=c_tournament.php>
+                <tr>
+                    <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button><button type="submit" class="btn btn-sammo-base2" onclick='return confirm("참가비 금<?= $admin['develcost'] ?>이 필요합니다. 참가하시겠습니까?")'>참가</button><input type='hidden' name='btn' value='참가'/></td>
+                </tr>
+            </form>
+        <?php else : ?>
+            <tr>
+                <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button></td>
+            </tr>
+        <?php endif;
 
         $str1 = getTournament($admin['tournament']);
         $str2 = getTournamentTime();
         if ($str2) {
             $str2 = ', ' . $str2;
         }
-        $str3 = getTournamentTermText();
+        $str3 = getTournamentTermText($turnTerm);
         if ($str3) {
             $str3 = ', ' . $str3;
         }

hwe/b_troop.php

@@ -12,7 +12,8 @@ $db = DB::db();
 
 increaseRefresh("부대편성", 1);
 
-$me = $db->queryFirstRow('SELECT no,nation,troop FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no,nation,troop,`officer_level`,permission,penalty FROM general WHERE owner=%i', $userID);
+$permission = checkSecretPermission($me, false);
 
 $troops = [];
 foreach ($db->query('SELECT troop_leader,name FROM troop WHERE nation = %i', $me['nation']) as $rawTroop) {
@@ -204,17 +205,37 @@ uasort($troops, function ($lhs, $rhs) {
 
         </table>
         <br>
-        <table width=1000 class='tb_layout bg0'>
-            <tr>
-                <td width=80 class='bg1'>부 대 명</td>
-                <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='nameplate'></td>
-                <?php if ($me['troop'] == 0) : ?>
-                    <td><input type=button id='btnCreateTroop' value='부 대 창 설'></td>
-                <?php else : ?>
-                    <td><input type=button id='btnChangeTroopName' value='부 대 변 경'></td>
-                <?php endif; ?>
-            </tr>
-        </table>
+        <div class="row">
+            <?php if($me['troop'] == 0): ?>
+                <div class="col-6"><?php /*TODO: 모바일 */ ?>
+                    <div class="row gx-0 bg0">
+                        <div class="bg1 col d-grid"><span class="align-self-center center">부대명</span></div>
+                        <div class="col d-grid"><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='newTroopName'></div>
+                        <div class="col d-grid"><button type='button' id="btnCreateTroop" class='btn btn-sm btn-secondary'>부대 창설</button></div>
+                    </div>
+                </div>
+            <?php endif; ?>
+            <?php if($troops && ($me['troop'] == $me['no'] || $permission == 4)): ?>
+                <div class="col-6">
+                    <div class="row gx-0 bg0">
+                        <div class="bg1 col d-grid"><span class="align-self-center center">부대명</span></div>
+                        <div class="col d-grid"><select class="form-select" id="changeNameTroopID">
+                            <?php if($permission != 4): ?>
+                                <option value="<?=$me['troop']?>"><?=$troops[$me['troop']]['name']?></option>
+                            <?php else: ?>
+                                <?php foreach ($troops as $troopNo => $troop): ?>
+                                    <option value="<?=$troopNo?>"><?=$troop['name']?></option>
+                                <?php endforeach; ?>
+                            <?php endif; ?>
+                        </select>
+                        </div>
+                        <div class="col d-grid"><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='changeTroopName'></div>
+                        <div class="col d-grid"><button type='button' id="btnChangeTroopName" class='btn btn-sm btn-secondary'>이름 변경</button></div>
+                    </div>
+                </div>
+            <?php endif; ?>
+        </div>
+
 
         <table width=1000 class='tb_layout bg0'>
             <tr>

hwe/c_auction.php

@@ -1,247 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$v = new Validator($_POST + $_GET);
-$v->rule('integer', [
-    'amount',
-    'cost',
-    'topv',
-    'value',
-    'term',
-    'sel'
-]);
-
-$btn = Util::getPost('btn');
-$amount = Util::getPost('amount', 'int');
-$cost = Util::getPost('cost', 'int');
-$topv = Util::getPost('topv', 'int');
-$value = Util::getPost('value', 'int');
-$term = Util::getPost('term', 'int');
-$sel = Util::getPost('sel', 'int');
-
-$msg = '';
-$msg2 = '';
-
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("입찰", 1);
-
-$turnterm = $gameStor->turnterm;
-
-$me = $db->queryFirstRow('SELECT no,name,gold,rice,special from general where owner=%i', $userID);
-
-$tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']);
-$bidCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no2=%i', $me['no']);
-
-$btCount = $tradeCount + $bidCount;
-
-$unit = $turnterm * 60;
-
-$amount = Util::round($amount, -1);
-$cost = Util::round($cost, -1);
-$topv = Util::round($topv, -1);
-$value = Util::round($value, -1);
-if ($term > 24) {
-    $term = 24;
-}
-
-$valid = 1;
-if ($session->userGrade >= 5 || $btCount < 1) {
-} else {
-    $msg = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
-    $msg2 = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
-    $valid = 0;
-    $btn = "hidden";
-}
-
-if ($btn == "판매") {
-    if ($term < 0 || $term > 24) {
-        $msg = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount < 100 || $amount > 10000) {
-        $msg = "ㆍ<span class='ev_warning'>거래량은 100 ~ 10000 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $amount * 2 || $cost * 2 < $amount) {
-        $msg = "ㆍ<span class='ev_warning'>시작판매가는 50% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv * 10 < $amount * 11 || $topv > $amount * 2) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 110% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv * 10 < $cost * 11) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 시작판매가의 110% 이상이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount > $me['rice'] - GameConst::$defaultRice) {
-        $msg = "ㆍ<span class='ev_warning'>기본 군량 ".GameConst::$defaultRice."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg = "ㆍ<span class='ev_success'>등록 성공.</span>";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-        $db->insert('auction', [
-            'type'=>0,
-            'no1'=>$me['no'],
-            'name1'=>$me['name'],
-            'amount'=>$amount,
-            'cost'=>$cost,
-            'value'=>$cost,
-            'topv'=>$topv,
-            'expire'=>$date
-        ]);
-    }
-} elseif ($btn == "구매시도") {
-    $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel);
-
-    if ($value == $auction['topv']) {
-        $valid = 2;
-    }
-    if (!$auction) {
-        $msg = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
-        $valid = 0;
-    }
-    if ($auction['no2'] > 0 && $value <= $auction['value']) {
-        $msg = "ㆍ<span class='ev_warning'>현재판매가보다 높게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value < $auction['value']) {
-        $msg = "ㆍ<span class='ev_warning'>현재판매가보다 높게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $auction['topv']) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가보다 높을 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $me['gold'] - GameConst::$defaultGold) {
-        $msg = "ㆍ<span class='ev_warning'>기본 자금 ".GameConst::$defaultGold."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg = "ㆍ<span class='ev_success'>입찰 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-        if ($auction['expire'] > $date) {
-            $date = $auction['expire'];
-        }
-        
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    } elseif ($valid == 2) {
-        $msg = "ㆍ<span class='ev_success'>즉시판매 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    }
-} elseif ($btn == "구매") {
-    if ($term < 0 || $term > 24) {
-        $msg2 = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount < 100 || $amount > 10000) {
-        $msg2 = "ㆍ<span class='ev_warning'>거래량은 100 ~ 10000 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $amount * 2 || $cost * 2 < $amount) {
-        $msg2 = "ㆍ<span class='ev_warning'>시작구매가는 50% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv < $amount * 0.5 || $topv > $amount * 0.9) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가는 50% ~ 90% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv > $cost * 0.9) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가는 시작구매가의 90% 이하이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $me['gold'] - GameConst::$defaultGold) {
-        $msg2 = "ㆍ<span class='ev_warning'>기본 자금 ".GameConst::$defaultGold."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg2 = "ㆍ<span class='ev_success'>등록 성공.</span>";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-
-        $db->insert('auction', [
-            'type'=>1,
-            'no1'=>$me['no'],
-            'name1'=>$me['name'],
-            'amount'=>$amount, 
-            'cost'=>$cost, 
-            'value'=>$cost, 
-            'topv'=>$topv, 
-            'expire'=>$date
-        ]);
-    }
-} elseif ($btn == "판매시도") {
-    $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel);
-
-    if ($value == $auction['topv']) {
-        $valid = 2;
-    }
-    if (!$auction) {
-        $msg2 = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
-        $valid = 0;
-    }
-    if ($auction['no2'] > 0 && $value >= $auction['value']) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재구매가보다 낮게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $auction['value']) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재구매가보다 낮게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value < $auction['topv']) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가보다 낮을 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $me['rice'] - GameConst::$defaultRice) {
-        $msg2 = "ㆍ<span class='ev_warning'>기본 군량 ".GameConst::$defaultRice."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg2 = "ㆍ<span class='ev_success'>입찰 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-        if ($auction['expire'] > $date) {
-            $date = $auction['expire'];
-        }
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    } elseif ($valid == 2) {
-        $msg2 = "ㆍ<span class='ev_success'>즉시구매 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    }
-}
-
-Submit("b_auction.php", $msg, $msg2);

hwe/c_tournament.php

@@ -113,11 +113,11 @@ if($session->userGrade < 5) {
 }
 
 if($btn == "자동개최설정") {
-    $gameStor->tnmt_trig = $trig;
+    $gameStor->tnmt_trig = !!$trig;
 } elseif($btn == "개최") {
     startTournament($auto, $type);
 } elseif($btn == "중단") {
-    $gameStor->tnmt_auto = 0;
+    $gameStor->tnmt_auto = false;
     $gameStor->tournament = 0;
     $gameStor->phase = 0;
 } elseif($btn == "랜덤투입") {

hwe/c_vote.php

@@ -1,91 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$btn = Util::getPost('btn');
-$sel = Util::getPost('sel', 'int');
-$comment = Util::getPost('comment');
-$title = Util::getPost('title');
-$str = Util::getPost('str');
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
-$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-$admin = $gameStor->getValues(['develcost', 'cost', 'vote_title', 'vote', 'votecomment']);
-
-$generalID = Session::getGeneralID();
-
-$general = General::createGeneralObjFromDB($generalID, ['vote','horse','weapon','book','item','npc','imgsvr','picture','aux'], 2);
-
-if($btn == "투표" && $general->getVar('vote') == 0 && $sel > 0) {
-    $develcost = $admin['develcost'] * 5;
-    $db->update('general', [
-        'gold'=>$db->sqleval('gold + %i', $develcost),
-        'vote'=>$sel
-    ], 'owner=%i', $userID);
-
-    if(tryUniqueItemLottery($general, '설문조사')){
-        $general->applyDB($db);
-    }
-}
-else if($btn == "댓글" && trim($comment) != "") {
-    $comment = StringUtil::neutralize($comment);
-
-    $nation = $general->getStaticNation();
-
-    if(!$admin['votecomment']){
-        $admin['votecomment'] = [];
-    }
-    $admin['votecomment'][] = [$nation['name'],$general->getName(),$comment];
-    $gameStor->votecomment = $admin['votecomment'];
-}
-
-if(!$isVoteAdmin){
-    header('location:a_vote.php', true, 303);
-    die();
-}
-
-
-if($btn == "수정") {
-    if($title != "") {
-        $gameStor->vote_title = WebUtil::htmlPurify($title);
-    }
-} elseif($btn == "추가") {
-    if($str != "") {
-        if(!$admin['vote']){
-            $admin['vote'] = [];
-        }
-        $admin['vote'][] = WebUtil::htmlPurify($str);
-        $gameStor->vote=$admin['vote'];
-    }
-} elseif($btn == "리셋") {
-    $gameStor->voteopen=1;
-    $gameStor->vote=['-'];
-    $gameStor->vote_title = '-';
-    $gameStor->votecomment=[];
-
-    $db->update('general', [
-        'vote'=>0
-    ], true);
-} elseif($btn == "알림") {
-    $db->update('general', [
-        'newvote'=>1
-    ], 'vote=0');
-} elseif($btn == "숨김") {
-    $gameStor->voteopen = 0;
-} elseif($btn == "전체통계만") {
-    $gameStor->voteopen = 1;
-} elseif($btn == "전부") {
-    $gameStor->voteopen = 2;
-}
-
-header('location:a_vote.php', true, 303);

hwe/d_setting/UniqueConst.orig.php

@@ -5,6 +5,7 @@ class UniqueConst{
     public static $serverID = '_tK_serverID_';
     public static $serverName = '_tK_serverName_';
     public static $seasonIdx = '_tK_seasonIdx_';
+    public static $hiddenSeed = '_tK_hiddenSeed_';
 
     private function __construct(){}
 

hwe/func.php

@@ -3,6 +3,8 @@
 namespace sammo;
 
 use DateTime;
+use Ds\Set;
+use sammo\Enums\AuctionType;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
 use sammo\Event\Action;
@@ -135,11 +137,11 @@ function getBlockLevel()
     return DB::db()->queryFirstField('select block from general where no = %i', Session::getInstance()->generalID);
 }
 
-function getRandGenName()
+function getRandGenName(RandUtil $rng)
 {
-    $firstname = Util::choiceRandom(GameConst::$randGenFirstName);
-    $middlename = Util::choiceRandom(GameConst::$randGenMiddleName);
-    $lastname = Util::choiceRandom(GameConst::$randGenLastName);
+    $firstname = $rng->choice(GameConst::$randGenFirstName);
+    $middlename = $rng->choice(GameConst::$randGenMiddleName);
+    $lastname = $rng->choice(GameConst::$randGenLastName);
 
     return "{$firstname}{$middlename}{$lastname}";
 }
@@ -1204,9 +1206,9 @@ function checkDelay()
         $db->update('general', [
             'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
         ], 'turntime<=DATE_ADD(turntime, INTERVAL %i MINUTE)', $term);
-        $db->update('auction', [
-            'expire' => $db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
-        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
     }
 }
 
@@ -1247,7 +1249,7 @@ function updateOnline()
     $gameStor->online_nation = join(', ', $onlineNation);
 }
 
-function addAge()
+function addAge(RandUtil $rng)
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -1268,6 +1270,7 @@ function addAge()
         foreach ($db->query('SELECT no,name,nation,leadership,strength,intel,aux from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general) {
             $generalID = $general['no'];
             $special = SpecialityHelper::pickSpecialDomestic(
+                $rng,
                 $general,
                 (Json::decode($general['aux'])['prev_types_special']) ?? []
             );
@@ -1295,6 +1298,7 @@ function addAge()
                 $updateVars['aux'] = Json::encode($generalAux);
             } else {
                 $special2 = SpecialityHelper::pickSpecialWar(
+                    $rng,
                     $general,
                     ($generalAux['prev_types_special2']) ?? []
                 );
@@ -1343,7 +1347,7 @@ function turnDate($curtime)
 }
 
 
-function triggerTournament()
+function triggerTournament(RandUtil $rng)
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -1354,10 +1358,10 @@ function triggerTournament()
     if ($tournament != 0) {
         return;
     }
-    if ($tnmt_trig == 0) {
+    if (!$tnmt_trig) {
         return;
     }
-    if (!Util::randBool(0.4)) {
+    if (!$rng->nextBool(0.4)) {
         return;
     }
 
@@ -1370,7 +1374,7 @@ function triggerTournament()
 
     $tnmt_type = array_pop($tnmt_pattern);
     $gameStor->setValue('tnmt_pattern', $tnmt_pattern);
-    startTournament($tnmt_trig, $tnmt_type);
+    startTournament($tnmt_type);
 }
 
 function CheckHall($no)
@@ -1552,9 +1556,10 @@ function CheckHall($no)
     }
 }
 
-function giveRandomUniqueItem(General $general, string $acquireType): bool
+function giveRandomUniqueItem(RandUtil $rng, General $general, string $acquireType): bool
 {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     //아이템 습득 상황
     $availableUnique = [];
 
@@ -1586,6 +1591,18 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
         }
     }
 
+    $auctionItems = $db->queryFirstColumn(
+        'SELECT `target` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0',
+        AuctionType::UniqueItem->value
+    );
+    foreach ($auctionItems as $itemCode) {
+        if (key_exists($itemCode, $occupiedUnique)) {
+            $occupiedUnique[$itemCode]++;
+        } else {
+            $occupiedUnique[$itemCode] = 1;
+        }
+    }
+
     foreach ($db->queryAllLists('SELECT namespace, count(*) as cnt FROM `storage` WHERE namespace LIKE "ut_%" GROUP BY namespace') as [$uniqueNS, $cnt]) {
         $itemCode = substr($uniqueNS, 3);
         $itemClass = buildItemClass($itemCode);
@@ -1629,10 +1646,7 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
         return false;
     }
 
-
-
     if ($general->getAuxVar('inheritRandomUnique')) {
-        $gameStor = KVStorage::getStorage($db, 'game_env');
         [$year, $month, $initYear, $initMonth] = $gameStor->getValuesAsArray(['year', 'month', 'init_year', 'init_month']);
 
         $relMonthByInit = Util::joinYearMonth($year, $month) - Util::joinYearMonth($initYear, $initMonth);
@@ -1643,7 +1657,7 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
         }
     }
 
-    [$itemType, $itemCode] = Util::choiceRandomUsingWeightPair($availableUnique);
+    [$itemType, $itemCode] = $rng->choiceUsingWeightPair($availableUnique);
 
     $nationName = $general->getStaticNation()['name'];
     $generalName = $general->getName();
@@ -1666,211 +1680,7 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
     return true;
 }
 
-function rollbackInheritUniqueTrial(General $general, string $itemKey, string $reason)
-{
-
-    $ownerID = $general->getVar('owner');
-
-    $db = DB::db();
-
-    $itemTrials = $general->getAuxVar('inheritUniqueTrial');
-    LogText("선택유니크 롤백:{$ownerID}", [$itemKey, $itemTrials]);
-    unset($itemTrials[$itemKey]);
-    if (count($itemTrials) == 0) {
-        $itemTrials = null;
-    }
-    $general->setAuxVar('inheritUniqueTrial', $itemTrials);
-
-
-    $trialStor = KVStorage::getStorage($db, "ut_{$itemKey}");
-    $ownTrial = $trialStor->getValue("u{$ownerID}");
-
-    $itemObj = buildItemClass($itemKey);
-    $itemName = $itemObj->getName();
-
-    if ($ownTrial) {
-        //두 값이 general, KVStorage 둘다 있고, 이중에선 KVStorage 값을 기준으로 하자 따르자
-        [,, $amount] = $ownTrial;
-        $trialStor->deleteValue("u{$ownerID}");
-        $general->increaseInheritancePoint(InheritanceKey::previous, $amount);
-        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, -$amount);
-        LogText("선택유니크 롤백포인트:{$ownerID}", $amount);
-
-        $userLogger = new UserLogger($ownerID);
-        $userLogger->push("{$itemName} 입찰에 사용한 {$amount} 포인트 반환", "inheritPoint");
-    }
-
-    //메시지
-
-    $staticNation = $general->getStaticNation();
-
-    $unlimited = new \DateTime('9999-12-31');
-    $src = new MessageTarget(0, '', 0, 'System', '#000000');
-    $dest = new MessageTarget($general->getID(), $general->getName(), $general->getNationID(), $staticNation['name'], $staticNation['color'], GetImageURL($general->getVar('imgsvr'), $general->getVar('picture')));
-    $josaUl = JosaUtil::pick($itemName, '을');
-    $msg = new Message(
-        Message::MSGTYPE_PRIVATE,
-        $src,
-        $dest,
-        "{$itemName}{$josaUl} 얻지 못했습니다. {$reason}",
-        new DateTime(),
-        $unlimited,
-        []
-    );
-
-    $general->applyDB($db);
-    $msg->send(true);
-}
-
-function tryRollbackInheritUniqueItem(General $general): void
-{
-    tryInheritUniqueItem($general, 'Rollback', true);
-}
-
-function tryInheritUniqueItem(General $general, string $acquireType = '아이템', bool $justRollback = false): bool
-{
-    $ownerID = $general->getVar('owner');
-    if (!$ownerID) {
-        LogText("선택유니크 실패???: {$ownerID}", $general->getName());
-        return false;
-    }
-
-    $itemTrials = $general->getAuxVar('inheritUniqueTrial') ?? [];
-    arsort($itemTrials);
-    LogText("선택유니크항목: {$ownerID}", $itemTrials);
-
-    $db = DB::db();
-
-    $ownTarget = null;
-    $ownType = null;
-
-    foreach ($itemTrials as $itemKey => $amount) {
-        $availableItemTypes = [];
-        $reasons = [];
-        foreach (GameConst::$allItems as $itemType => $itemList) {
-            //아직은 그런 경우는 없지만 동일 유니크를 여러 부위에 장착할 수 있을지도 모름
-            if (!key_exists($itemKey, $itemList)) {
-                continue;
-            }
-
-            $ownItem = $general->getItem($itemType);
-            if ($ownItem->getRawClassName() == $itemKey) {
-                $reasons[] = '이미 그 유니크를 가지고 있습니다.';
-                continue;
-            }
-
-            if (!$ownItem->isBuyable()) {
-                $reasons[] = '이미 다른 유니크를 가지고 있습니다.';
-                continue;
-            }
-
-            $availableCnt = $itemList[$itemKey];
-            $occupiedCnt = $db->queryFirstField('SELECT count(*) FROM general WHERE %b = %s', $itemType, $itemKey);
-            if ($occupiedCnt >= $availableCnt) {
-                $reasons[] = '그 유니크는 모두 점유되었습니다.';
-                continue;
-            }
-            $availableItemTypes[] = $itemType;
-        }
-
-        if (!$availableItemTypes) {
-            rollbackInheritUniqueTrial($general, $itemKey, join(' ', $reasons));
-            continue;
-        }
-        $reasons = [];
-
-        $itemType = Util::choiceRandom($availableItemTypes);
-
-        $trialStor = KVStorage::getStorage($db, "ut_{$itemKey}"); //혹시 itemKey의 크기가 37이 넘을 수 있을까?
-        $anyTrials = $trialStor->getAll();
-        if (!$anyTrials) {
-            //순서가 꼬였던 모양, 실제 값은 storage를 우선시하자
-            rollbackInheritUniqueTrial($general, $itemKey, '절차상의 오류입니다.');
-            continue;
-        }
-
-        //XXX: 정렬할 필요 없지 않나?
-        usort($anyTrials, function ($lhsTrial, $rhsTrial) {
-            [,, $lhsAmount] = $lhsTrial;
-            [,, $rhsAmount] = $rhsTrial;
-            return $rhsAmount <=> $lhsAmount; //큰 값이 앞에 오도록
-        });
-
-        LogText("선택유니크상태 {$ownerID} {$itemKey}", $anyTrials);
-
-        //공동 1등인데 본인이 있을 수도 있다.
-        [,, $topAmount] = $anyTrials[0];
-        if ($amount < $topAmount) {
-            $compAmount = $topAmount / $amount;
-            if ($compAmount > 2.0) {
-                $compText = '엄청난 차이로 ';
-            } else if ($compAmount > 1.2) {
-                $compText = '큰 차이로 ';
-            } else if ($compAmount > 1.05) {
-                $compText = '';
-            } else {
-                $compText = '아슬아슬한 차이로 ';
-            }
-            rollbackInheritUniqueTrial($general, $itemKey, "{$compText}상위 입찰한 장수가 있습니다.");
-            continue;
-        }
-
-        //내가 1위다
-        if ($ownTarget !== null) {
-            //이미 다른 아이템을 얻기로 되어있다.
-            continue;
-        }
-        $ownTarget = $itemKey;
-        $ownType = $itemType;
-    }
-    unset($itemKey);
-    unset($itemType);
-
-    if ($ownTarget === null) {
-        return false;
-    }
-    if ($justRollback) {
-        return false;
-    }
-
-    LogText("선택유니크획득{$ownerID}", $ownTarget);
-
-    $trialStor = KVStorage::getStorage($db, "ut_{$ownTarget}");
-    $trialStor->deleteValue("u{$ownerID}");
-
-    //rollbackInheritUniqueTrial 과정 때문에 새로 받아와야함
-    $itemTrials = $general->getAuxVar('inheritUniqueTrial');
-    unset($itemTrials[$ownTarget]);
-    $general->setAuxVar('inheritUniqueTrial', $itemTrials);
-
-    $nationName = $general->getStaticNation()['name'];
-    $generalName = $general->getName();
-    $josaYi = JosaUtil::pick($generalName, '이');
-    $itemObj = buildItemClass($ownTarget);
-    $itemName = $itemObj->getName();
-    $itemRawName = $itemObj->getRawName();
-    $josaUl = JosaUtil::pick($itemRawName, '을');
-
-
-    $general->setVar($ownType, $ownTarget);
-
-
-    $logger = $general->getLogger();
-
-    $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 습득했습니다!");
-    $logger->pushGeneralHistoryLog("<C>{$itemName}</>{$josaUl} 습득");
-    $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <C>{$itemName}</>{$josaUl} 습득했습니다!");
-    $logger->pushGlobalHistoryLog("<C><b>【{$acquireType}】</b></><D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} <C>{$itemName}</>{$josaUl} 습득했습니다!");
-
-    $general->applyDB($db);
-
-    //같은 종류의 유니크를 입찰했을 수 있으니 한번 더 검사한다.
-    tryRollbackInheritUniqueItem($general);
-
-    return true;
-}
-
-function tryUniqueItemLottery(General $general, string $acquireType = '아이템'): bool
+function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireType = '아이템'): bool
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -1915,18 +1725,9 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
             $userLogger = new UserLogger($general->getVar('owner'));
             $userLogger->push(sprintf("유니크를 얻을 공간이 없어 %d 포인트 반환", GameConst::$inheritItemRandomPoint), "inheritPoint");
         }
-        tryRollbackInheritUniqueItem($general);
         return false;
     }
 
-    $inheritUnique = $general->getAuxVar('inheritUniqueTrial');
-    if ($acquireType != '설문조사' && $inheritUnique && count($inheritUnique) && $availableBuyUnique) {
-        $trialResult = tryInheritUniqueItem($general, $acquireType);
-        if ($trialResult) {
-            return true;
-        }
-    }
-
     $scenario = $gameStor->scenario;
     $genCount = $db->queryFirstField('SELECT count(*) FROM general WHERE npc<2');
 
@@ -1956,7 +1757,7 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
     }
 
     foreach (Util::range($maxCnt) as $_idx) {
-        if (Util::randBool($prob)) {
+        if ($rng->nextBool($prob)) {
             $result = true;
             break;
         }
@@ -1968,7 +1769,7 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
     }
     LogText("{$general->getName()}, {$general->getID()} 유니크 성공 {$maxCnt}", $prob);
 
-    return giveRandomUniqueItem($general, $acquireType);
+    return giveRandomUniqueItem($rng, $general, $acquireType);
 }
 
 function getAdmin()
@@ -2085,13 +1886,31 @@ function nextRuler(General $general)
 
     //npc or npc유저인 경우 후계 찾기
     if (!$fiction && $general->getNPCType() > 0) {
-        $candidate = $db->queryFirstRow(
-            'SELECT no,name,officer_level,IF(ABS(affinity-%i)>75,150-ABS(affinity-%i),ABS(affinity-%i)) as npcmatch2 from general where nation=%i and officer_level!=12 and 1 <= npc and npc<=3 order by npcmatch2,rand() LIMIT 1',
+        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'NextNPCRuler',
+            $year,
+            $month,
+            $general->getID(),
+        )));
+        $rawCandidates = $db->query(
+            'SELECT no,name,officer_level,IF(ABS(affinity-%i)>75,150-ABS(affinity-%i),ABS(affinity-%i)) as npcmatch2 from general where nation=%i and officer_level!=12 and 1 <= npc and npc<=3 order by npcmatch2 asc',
             $general->getVar('affinity'),
             $general->getVar('affinity'),
             $general->getVar('affinity'),
             $nationID
         );
+        if ($rawCandidates) {
+            $candidates = [];
+            $minNPCMatch = $rawCandidates[0]['npcmatch2'];
+            foreach ($rawCandidates as $candidate) {
+                if (!$candidate['npcmatch2'] == $minNPCMatch) {
+                    break;
+                }
+                $candidates[] = $candidate;
+            }
+            $candidate = $rng->choice($candidates);
+        }
     }
     if (!$candidate) {
         $candidate = $db->queryFirstRow(
@@ -2415,7 +2234,7 @@ function isNeighbor(int $nation1, int $nation2, bool $includeNoSupply = true)
     return false;
 }
 
-function SabotageInjury(array $cityGeneralList, string $reason): int
+function SabotageInjury(RandUtil $rng, array $cityGeneralList, string $reason): int
 {
     $injuryCount = 0;
     $josaRo = JosaUtil::pick($reason, '로');
@@ -2427,12 +2246,12 @@ function SabotageInjury(array $cityGeneralList, string $reason): int
         /** @var General $general */
         $injuryProb = 0.3;
         $injuryProb = $general->onCalcStat($general, 'injuryProb', $injuryProb);
-        if (!Util::randBool($injuryProb)) {
+        if (!$rng->nextBool($injuryProb)) {
             continue;
         }
         $general->getLogger()->pushGeneralActionLog($text);
 
-        $general->increaseVarWithLimit('injury', Util::randRangeInt(1, 16), 0, 80);
+        $general->increaseVarWithLimit('injury', $rng->nextRangeInt(1, 16), 0, 80);
         $general->multiplyVar('crew', 0.98);
         $general->multiplyVar('atmos', 0.98);
         $general->multiplyVar('train', 0.98);
@@ -2445,7 +2264,7 @@ function SabotageInjury(array $cityGeneralList, string $reason): int
     return $injuryCount;
 }
 
-function getRandTurn($term, ?\DateTimeInterface $baseDateTime = null)
+function getRandTurn(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime = null)
 {
     if ($baseDateTime === null) {
         $baseDateTime = new \DateTimeImmutable();
@@ -2457,13 +2276,13 @@ function getRandTurn($term, ?\DateTimeInterface $baseDateTime = null)
         throw new MustNotBeReachedException();
     }
 
-    $randSecond = Util::randRangeInt(0, 60 * $term - 1);
-    $randFraction = Util::randRangeInt(0, 999999) / 1000000; //6자리 소수
+    $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
+    $randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
 
     return TimeUtil::format($baseDateTime->add(TimeUtil::secondsToDateInterval($randSecond + $randFraction)), true);
 }
 
-function getRandTurn2($term, ?\DateTimeInterface $baseDateTime = null)
+function getRandTurn2(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime = null)
 {
     if ($baseDateTime === null) {
         $baseDateTime = new \DateTimeImmutable();
@@ -2472,8 +2291,8 @@ function getRandTurn2($term, ?\DateTimeInterface $baseDateTime = null)
     } else {
         throw new MustNotBeReachedException();
     }
-    $randSecond = Util::randRangeInt(0, 60 * $term - 1);
-    $randFraction = Util::randRangeInt(0, 999999) / 1000000; //6자리 소수
+    $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
+    $randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
 
     return $baseDateTime->sub(TimeUtil::secondsToDateInterval($randSecond + $randFraction))->format('Y-m-d H:i:s.u');
 }

hwe/func_auction.php

@@ -1,247 +1,90 @@
 <?php
+
 namespace sammo;
 
-function registerAuction() {
+use sammo\Enums\AuctionType;
+
+function registerAuction(RandUtil $rng)
+{
     $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-
-    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'turnterm']);
-
-    $unit = 60 * $admin['turnterm'];
 
     // 장수들 평금,평쌀
-    $general = $db->queryFirstRow('SELECT avg(gold) as gold, avg(rice) as rice,max(gold) as maxgold from general where npc<2');
+    [$avgGold, $avgRice] = $db->queryFirstList('SELECT avg(gold), avg(rice) from general where npc<2');
+    $avgGold = Util::valueFit($avgGold, 1000, 20000);
+    $avgRice = Util::valueFit($avgRice, 1000, 20000);
 
-    if($general['gold'] <  1000) { $general['gold'] =  1000; }
-    if($general['gold'] > 20000) { $general['gold'] = 20000; }
-    if($general['rice'] <  1000) { $general['rice'] =  1000; }
-    if($general['rice'] > 20000) { $general['rice'] = 20000; }
+    $neutralAuctionCnt = Util::convertPairArrayToDict($db->queryAllLists(
+        'SELECT `type`, count(*) FROM ng_auction WHERE `type` IN %ls AND `host_general_id`=0 GROUP BY `type`',
+        [AuctionType::BuyRice->value, AuctionType::SellRice->value],
+    ));
+
+    $neutralbuyRiceCnt = $neutralAuctionCnt[AuctionType::BuyRice->value];
 
-    $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=0 AND no1=0');
-    $count += 5;
     // 판매건 등록
-    if(Util::randBool(1/$count)) {
+    if ($rng->nextBool(1 / ($neutralbuyRiceCnt + 5))) {
         //평균 쌀의 5% ~ 25%
-        $mul = rand() % 5 + 1;
-        $amount = $general['rice'] / 20 * $mul;
-        $cost = $general['gold'] / 20 * 0.9 * $mul;
+        $mul = $rng->nextRangeInt(1, 5);
+        $amount = $avgRice / 20 * $mul;
+        $cost = $avgGold / 20 * 0.9 * $mul;
         $topv = $amount * 2;
-        if($cost <= $amount*0.8) { $cost = $amount*0.8; }
-        if($cost >= $amount*1.2) { $cost = $amount*1.2; }
+        $cost = Util::valueFit($cost, $amount * 0.8, $amount * 1.2);
 
         $amount = Util::round($amount, -1);
         $cost = Util::round($cost, -1);
         $topv = Util::round($topv, -1);
 
-        $term = 3 + rand() % 10;
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-        $db->insert('auction', [
-            'type'=>0,
-            'no1'=>0,
-            'name1'=>'ⓝ상인',
-            'amount'=>$amount,
-            'cost'=>$cost,
-            'value'=>$cost,
-            'topv'=>$topv,
-            'expire'=>$date
-        ]);
+        $term = $rng->nextRangeInt(3, 12);
+        $dummyGeneral = AuctionBasicResource::genDummy();
+        AuctionBuyRice::openResourceAuction($dummyGeneral, $amount, $term, $cost, $topv);
     }
 
-    $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=1 AND no1=0');
-    $count += 5;
+    $neutralSellRiceCnt = $neutralAuctionCnt[AuctionType::SellRice->value];
     // 구매건 등록
-    if(Util::randBool(1/$count)) {
+    if ($rng->nextBool(1 / ($neutralSellRiceCnt + 5))) {
         //평균 쌀의 5% ~ 25%
-        $mul = Util::randRangeInt(1, 5);
-        $amount = $general['rice'] / 20 * $mul;
-        $cost = $general['gold'] / 20 * 1.1 * $mul;
-        $topv = $amount * 0.5;
-        if($cost <= $amount*0.8) { $cost = $amount*0.8; }
-        if($cost >= $amount*1.2) { $cost = $amount*1.2; }
+        $mul = $rng->nextRangeInt(1, 5);
+        $amount = $avgGold / 20 * $mul;
+        $cost = $avgRice / 20 * 1.1 * $mul;
+        $topv = $amount * 2;
+        $cost = Util::valueFit($cost, $amount * 0.8, $amount * 1.2);
 
         $amount = Util::round($amount, -1);
         $cost = Util::round($cost, -1);
         $topv = Util::round($topv, -1);
 
-        $term = Util::randRangeInt(3, 12);
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-        $db->insert('auction', [
-            'type'=>1,
-            'no1'=>0,
-            'name1'=>'ⓝ상인',
-            'amount'=>$amount,
-            'cost'=>$cost,
-            'value'=>$cost,
-            'topv'=>$topv,
-            'expire'=>$date
-        ]);
+        $term = $rng->nextRangeInt(3, 12);
+        $dummyGeneral = AuctionBasicResource::genDummy();
+        AuctionSellRice::openResourceAuction($dummyGeneral, $amount, $term, $cost, $topv);
     }
 }
 
-function processAuction() {
+function processAuction()
+{
     $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $date = TimeUtil::now();
-    [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+    $now = TimeUtil::now();
 
-    $admin = $gameStor->getValues(['year', 'month']);
+    $auctionList = $db->queryAllLists(
+        'SELECT id, `type` FROM ng_auction WHERE `close_date` <= %s AND finished = 0',
+        $now
+    );
 
-    foreach($db->query('SELECT * from auction where expire<=%s', $date) as $auction){
-        $josaYi1 = JosaUtil::pick($auction['name1'], '이');
-        $josaYi2 = JosaUtil::pick($auction['name2'], '이');
-
-        // 쌀 처리
-        if($auction['no2'] == 0) {
-            // 상인건수가 아닌것만 출력
-            if($auction['no1'] != 0) {
-                $traderID = $db->queryFirstField('SELECT no FROM general WHERE no=%i', $auction['no1']);
-                $logger = new ActionLogger($traderID, 0, $year, $month);
-                $logger->pushGeneralActionLog("입찰자 부재로 {$auction['no']}번 거래 <M>유찰</>!", ActionLogger::EVENT_PLAIN);
-                $logger->flush();
-
-                $auctionLog = [];
-                if($auction['type'] == 0) {
-                    $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                    $auctionLog[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 판매, 그러나 입찰자 부재";
-                } else {
-                    $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                    $auctionLog[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <S>구매</> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 구매, 그러나 입찰자 부재";
-                }
-
-                pushAuctionLog($auctionLog);
-            }
-            continue;
-        }
-
-        if($auction['no1'] == 0) {
-            $trader = [
-                'no'=>0,
-                'name'=>'ⓝ상인',
-                'gold'=>99999,
-                'rice'=>99999
-            ];
-        } else {
-            $trader = $db->queryFirstRow('SELECT no,name,gold,rice from general where no=%i', $auction['no1']);
-        }
-
-        $bidder = $db->queryFirstRow('SELECT no,name,gold,rice from general where no=%i', $auction['no2']);
-
-        $traderLogger = new ActionLogger($trader['no'], 0, $year, $month, false);
-        $bidderLogger = new ActionLogger($bidder['no'], 0, $year, $month, false);
-
-        $auctionLog = [];
-
-        
-        //판매거래
-        if($auction['type'] == 0) {
-            if($auction['amount'] > $trader['rice'] - 1000) {
-                $gold = Util::round($auction['value'] * 0.01);
-                $db->update('general', [
-                    'gold'=>Util::valueFit($trader['gold'] - $gold, 0)
-                ], 'no=%i', $trader['no']);
-
-                $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                $josaRo = JosaUtil::pick($auction['value'], '로');
-                $traderLogger->pushGeneralActionLog("판매자의 군량 부족으로 {$auction['no']}번 거래 <M>유찰</>! 벌금 <C>{$gold}</>", ActionLogger::EVENT_PLAIN);
-                $bidderLogger->pushGeneralActionLog("판매자의 군량 부족으로 {$auction['no']}번 거래 <M>유찰</>!", ActionLogger::EVENT_PLAIN);
-                $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 판매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 입찰, 그러나 판매자 군량부족, 벌금 <C>{$gold}</>";
-            } elseif($auction['value'] > $bidder['gold'] - 1000) {
-                $gold = Util::round($auction['value'] * 0.01);
-                $db->update('general', [
-                    'gold'=>Util::valueFit($bidder['gold'] - $gold, 0)
-                ], 'no=%i', $bidder['no']);
-
-                $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                $josaRo = JosaUtil::pick($auction['value'], '로');
-                $traderLogger->pushGeneralActionLog("입찰자의 자금 부족으로 {$auction['no']}번 거래 <M>유찰</>!", ActionLogger::EVENT_PLAIN);
-                $bidderLogger->pushGeneralActionLog("입찰자의 자금 부족으로 {$auction['no']}번 거래 <M>유찰</>! 벌금 <C>{$gold}</>", ActionLogger::EVENT_PLAIN);
-                $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 판매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 입찰, 그러나 입찰자 자금부족, 벌금 <C>{$gold}</>";
-            } else {
-                $josaUlGold = JosaUtil::pick($auction['value'], '을');
-                $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                $josaRo = JosaUtil::pick($auction['value'], '로');
-                $traderLogger->pushGeneralActionLog("{$auction['no']}번 거래 <C>성사</>로 쌀 <C>{$auction['amount']}</>{$josaUlRice} 판매, 금 <C>{$auction['value']}</>{$josaUlGold} 획득!", ActionLogger::EVENT_PLAIN);
-                $bidderLogger->pushGeneralActionLog("{$auction['no']}번 거래 <C>성사</>로 금 <C>{$auction['value']}</>{$josaUlGold} 지불, 쌀 <C>{$auction['amount']}</>{$josaUlRice} 구입!", ActionLogger::EVENT_PLAIN);
-                $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <C>성사</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 판매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 구매";
-                if($auction['value'] >= $auction['amount'] * 2) {
-                    $auctionLog[0] .= " <R>★ 최고가 거래 ★</>";
-                } elseif($auction['value'] >= $auction['topv']) {
-                    $auctionLog[0] .= " <M>★ 즉시구매가 거래 ★</>";
-                } elseif($auction['value'] * 2 <= $auction['amount']) {
-                    $auctionLog[0] .= " <R>★ 최저가 거래 ★</>";
-
-                }
-
-                $db->update('general', [
-                    'gold'=>$db->sqleval('gold + %i', $auction['value']),
-                    'rice'=>$db->sqleval('rice - %i', $auction['amount']),
-                ], 'no=%i', $auction['no1']);
-                $db->update('general', [
-                    'gold'=>$db->sqleval('gold - %i', $auction['value']),
-                    'rice'=>$db->sqleval('rice + %i', $auction['amount']),
-                ], 'no=%i', $auction['no2']);
-            }
-            pushAuctionLog($auctionLog);
-        //구매거래
-        } else {
-            if($auction['amount'] > $bidder['rice'] - 1000) {
-                $gold = Util::round($auction['value'] * 0.01);
-                $db->update('general', [
-                    'gold'=>Util::valueFit($bidder['gold'] - $gold, 0)
-                ], 'no=%i', $bidder['no']);
-
-                $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                $josaRo = JosaUtil::pick($auction['value'], '로');
-                $traderLogger->pushGeneralActionLog("입찰자의 군량 부족으로 {$auction['no']}번 거래 <M>유찰</>!", ActionLogger::EVENT_PLAIN);
-                $bidderLogger->pushGeneralActionLog("입찰자의 군량 부족으로 {$auction['no']}번 거래 <M>유찰</>! 벌금 <C>{$gold}</>", ActionLogger::EVENT_PLAIN);
-                $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <S>구매</> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 구매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 입찰, 그러나 입찰자 군량부족, 벌금 <C>{$gold}</>";
-            } elseif($auction['value'] > $trader['gold'] - 1000) {
-                $gold = Util::round($auction['value'] * 0.01);
-                $db->update('general', [
-                    'gold'=>Util::valueFit($trader['gold'] - $gold, 0)
-                ], 'no=%i', $trader['no']);
-
-                $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                $josaRo = JosaUtil::pick($auction['value'], '로');
-                $traderLogger->pushGeneralActionLog("구매자의 자금 부족으로 {$auction['no']}번 거래 <M>유찰</>! 벌금 <C>{$gold}</>", ActionLogger::EVENT_PLAIN);
-                $bidderLogger->pushGeneralActionLog("구매자의 자금 부족으로 {$auction['no']}번 거래 <M>유찰</>!", ActionLogger::EVENT_PLAIN);
-                $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <S>구매</> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 구매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 입찰, 그러나 구매자 자금부족, 벌금 <C>{$gold}</>";
-            } else {
-                $josaUlGold = JosaUtil::pick($auction['value'], '을');
-                $josaUlRice = JosaUtil::pick($auction['amount'], '을');
-                $josaRo = JosaUtil::pick($auction['value'], '로');
-                $traderLogger->pushGeneralActionLog(
-                    "{$auction['no']}번 거래 <C>성사</>로 금 <C>{$auction['value']}</>{$josaUlGold} 지불, 쌀 <C>{$auction['amount']}</>{$josaUlRice} 구입!", ActionLogger::EVENT_PLAIN
-                );
-                $bidderLogger->pushGeneralActionLog("{$auction['no']}번 거래 <C>성사</>로 쌀 <C>{$auction['amount']}</>{$josaUlRice} 판매, 금 <C>{$auction['value']}</>{$josaUlGold} 획득!", ActionLogger::EVENT_PLAIN);
-                $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <S>구매</> <C>성사</> : <Y>{$auction['name1']}</>{$josaYi1} 쌀 <C>{$auction['amount']}</>{$josaUlRice} 구매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 판매";
-                if($auction['value'] >= $auction['amount'] * 2) {
-                    $auctionLog[0] .= " <R>★ 최고가 거래 ★</>";
-                } elseif($auction['value'] * 2 <= $auction['amount']) {
-                    $auctionLog[0] .= " <R>★ 최저가 거래 ★</>";
-                } elseif($auction['value'] <= $auction['topv']) {
-                    $auctionLog[0] .= " <M>★ 즉시구매가 거래 ★</>";
-                }
-
-                $db->update('general', [
-                    'gold'=>$db->sqleval('gold - %i', $auction['value']),
-                    'rice'=>$db->sqleval('rice + %i', $auction['amount']),
-                ], 'no=%i', $auction['no1']);
-                $db->update('general', [
-                    'gold'=>$db->sqleval('gold + %i', $auction['value']),
-                    'rice'=>$db->sqleval('rice - %i', $auction['amount']),
-                ], 'no=%i', $auction['no2']);
-            }
-            $traderLogger->flush();
-            $bidderLogger->flush();
-            pushAuctionLog($auctionLog);
-        }
-
-        $traderLogger->flush();
-        $bidderLogger->flush();
+    if (!$auctionList) {
+        return;
     }
 
-    $db->delete('auction', 'expire <= %s', $date);
+    $dummyGeneral = AuctionBasicResource::genDummy();
+    foreach ($auctionList as [$auctionID, $rawAuctionType]) {
+        $auctionType = AuctionType::from($rawAuctionType);
+        if ($auctionType === AuctionType::BuyRice) {
+            $auction = new AuctionBuyRice($auctionID, $dummyGeneral);
+        } else if ($auctionType === AuctionType::SellRice) {
+            $auction = new AuctionSellRice($auctionID, $dummyGeneral);
+        } else if ($auctionType === AuctionType::UniqueItem) {
+            $auction = new AuctionUniqueItem($auctionID, $dummyGeneral);
+        } else {
+            throw new \Exception('Unknown auction type');
+        }
+        $auction->tryFinish();
+    }
 }
-

hwe/func_command.php

@@ -266,7 +266,7 @@ function checkCommandArg(?array $arg):?string{
         /*'string'=>[
             'nationName', 'optionText', 'itemType', 'nationType', 'commandType',
         ],*/
-        'integer'=>[
+        'int'=>[
             'crewType', 'destGeneralID', 'destCityID', 'destNationID',
             'amount', 'colorType',
             'srcArmType', 'destArmType', //숙련전환 전용

hwe/func_converter.php

@@ -405,10 +405,10 @@ function getGeneralPoolClass(string $type){
  * @param null|string $prefix
  * @return AbsGeneralPool[]
  */
-function pickGeneralFromPool(\MeekroDB $db, int $owner, int $pickCnt, ?string $prefix=null):array{
+function pickGeneralFromPool(\MeekroDB $db, RandUtil $rng, int $owner, int $pickCnt, ?string $prefix=null):array{
     /** @var AbsGeneralPool */
     $class = getGeneralPoolClass(GameConst::$targetGeneralPool);
-    return $class::pickGeneralFromPool($db, $owner, $pickCnt, $prefix);
+    return $class::pickGeneralFromPool($db, $rng, $owner, $pickCnt, $prefix);
 }
 
 function countPureGeneralFromRawList(?array $rawGeneralList=null):int{

hwe/func_gamerule.php

@@ -2,7 +2,6 @@
 
 namespace sammo;
 
-use Monolog\Logger;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
 
@@ -334,7 +333,7 @@ EOD),
 }
 
 // 외교 로그처리, 외교 상태 처리
-function postUpdateMonthly()
+function postUpdateMonthly(RandUtil $rng)
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -397,7 +396,7 @@ function postUpdateMonthly()
 
         //약간의 랜덤치 부여 (95% ~ 105%)
 
-        $nation['power'] = Util::round($nation['power'] * (rand() % 101 + 950) / 1000);
+        $nation['power'] = Util::round($nation['power'] * $rng->nextRange(0.95, 1.05));
         $powerValues['maxPower'] = max($powerValues['maxPower'] ?? 0, $nation['power']);
         $powerValues['maxCrew'] = max($powerValues['maxCrew'] ?? 0, Util::toInt($nation['totalCrew']));
 
@@ -486,12 +485,12 @@ function postUpdateMonthly()
     $availableWarSettingCnt = KVStorage::getValuesFromInterNamespace($db, 'nation_env', 'available_war_setting_cnt');
     foreach ($nations as $nation) {
         $nationID = $nation['nation'];
-        if(!key_exists($nationID, $availableWarSettingCnt)){
+        if (!key_exists($nationID, $availableWarSettingCnt)) {
             $availableWarSettingCnt[$nationID] = 0;
         }
     }
-    foreach($availableWarSettingCnt as $nationID=>$cnt){
-        if($cnt >= GameConst::$maxAvailableWarSettingCnt){
+    foreach ($availableWarSettingCnt as $nationID => $cnt) {
+        if ($cnt >= GameConst::$maxAvailableWarSettingCnt) {
             continue;
         }
         $cnt = Util::valueFit($cnt + GameConst::$incAvailableWarSettingCnt, 0, GameConst::$maxAvailableWarSettingCnt);
@@ -500,7 +499,7 @@ function postUpdateMonthly()
 
     //초반이후 방랑군 자동 해체
     if ($admin['year'] >= $admin['startyear'] + 2) {
-        checkWander();
+        checkWander($rng);
     }
     // 작위 업데이트
     updateNationState();
@@ -509,9 +508,9 @@ function postUpdateMonthly()
     // 천통여부 검사
     checkEmperior();
     //토너먼트 개시
-    triggerTournament();
+    triggerTournament($rng);
     // 시스템 거래건 등록
-    registerAuction();
+    registerAuction($rng);
     //전방설정
     foreach (getAllNationStaticInfo() as $nation) {
         if ($nation['level'] <= 0) {
@@ -522,7 +521,7 @@ function postUpdateMonthly()
 }
 
 
-function checkWander()
+function checkWander(RandUtil $rng)
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -536,7 +535,7 @@ function checkWander()
         if ($wanderCmd->hasFullConditionMet()) {
             $logger = $wanderer->getLogger();
             $logger->pushGeneralActionLog('초반 제한후 방랑군은 자동 해산됩니다.', ActionLogger::PLAIN);
-            $wanderCmd->run();
+            $wanderCmd->run($rng);
             $wanderCmd->setNextAvailable();
         }
     }
@@ -553,6 +552,9 @@ function updateNationState()
 
     $history = array();
     $admin = $gameStor->getValues(['killturn', 'year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm', 'turntime']);
+    $year = $admin['year'];
+    $month = $admin['month'];
+    $startYear = $admin['startyear'];
 
     $assemblerCnts = [];
     foreach ($db->queryAllLists('SELECT nation,count(no) FROM general WHERE npc = 5 GROUP BY nation') as [$nationID, $assemblerCnt]) {
@@ -561,7 +563,9 @@ function updateNationState()
 
     foreach ($db->query('SELECT nation,name,level,tech,aux FROM nation') as $nation) {
         //TODO: level이 진관수이소중대특 체계를 벗어날 수 있음
-        $citycount = $db->queryFirstField('SELECT count(*) FROM city WHERE nation=%i AND level>=4', $nation['nation']);
+        $nationID = $nation['nation'];
+        $citycount = $db->queryFirstField('SELECT count(*) FROM city WHERE nation=%i AND level>=4', $nationID);
+
 
         if ($citycount == 0) {
             $nationlevel = 0;   // 방랑군
@@ -595,26 +599,26 @@ function updateNationState()
             switch ($nationlevel) {
                 case 7:
                     $josaUl = JosaUtil::pick(getNationLevel($nationlevel), '을');
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>{$josaUl} 자칭하였습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>{$josaUl} 자칭"]);
+                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>{$josaUl} 자칭하였습니다.";
+                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>{$josaUl} 자칭"]);
                     $auxVal = Json::decode($nation['aux']);
                     $auxVal['can_국기변경'] = 1;
                     $auxVal['can_국호변경'] = 1;
                     $updateVals['aux'] = Json::encode($auxVal);
                     break;
                 case 6:
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 등극하였습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 등극"]);
+                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 등극하였습니다.";
+                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 등극"]);
                     break;
                 case 5:
                 case 4:
                 case 3:
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 임명되었습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 임명됨"]);
+                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 임명되었습니다.";
+                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 임명됨"]);
                     break;
                 case 2:
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 독립하여 <Y>" . getNationLevel($nationlevel) . "</>로 나섰습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>로 나서다"]);
+                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 독립하여 <Y>" . getNationLevel($nationlevel) . "</>로 나섰습니다.";
+                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>로 나서다"]);
                     break;
             }
 
@@ -649,7 +653,6 @@ function updateNationState()
 
                 $uniqueLotteryWeightList = [];
 
-                [$startYear, $year] = $gameStor->getValuesAsArray(['startyear', 'year']);
                 $relYear = $year - $startYear;
                 $maxTrialCountByYear = 1;
                 foreach (GameConst::$maxUniqueItemLimit as $tmpVals) {
@@ -685,20 +688,37 @@ function updateNationState()
                         $score += 15;
                     }
 
-                    $score *= 2**$trialCnt;
+                    $score *= 2 ** $trialCnt;
 
                     $uniqueLotteryWeightList[$nationGen->getID()] = [$nationGen, $score];
                 }
 
+                $nationLevelUpRNG = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+                    UniqueConst::$hiddenSeed,
+                    'nationLevelUp',
+                    $year,
+                    $month,
+                    $nationID
+                )));
+
                 foreach (Util::range($levelDiff) as $idx) {
                     if (!$uniqueLotteryWeightList) {
                         break;
                     }
 
                     /** @var General */
-                    $winnerObj = Util::choiceRandomUsingWeightPair($uniqueLotteryWeightList);
+                    $winnerObj = $nationLevelUpRNG->choiceUsingWeightPair($uniqueLotteryWeightList);
                     unset($uniqueLotteryWeightList[$winnerObj->getID()]);
-                    giveRandomUniqueItem($winnerObj, '작위보상');
+
+                    $givenUniqueRNG = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+                        UniqueConst::$hiddenSeed,
+                        'givenUnique',
+                        $year,
+                        $month,
+                        $nationID,
+                        $winnerObj->getID(),
+                    )));
+                    giveRandomUniqueItem($givenUniqueRNG, $winnerObj, '작위보상');
                     $winnerObj->applyDB($db);
                 }
 
@@ -724,9 +744,18 @@ function updateNationState()
         if ($assemblerCnt < $maxAssemblerCnt) {
             $lastAssemblerID = $gameStor->assembler_id ?? 0;
 
+            $troopLeaderRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+                UniqueConst::$hiddenSeed,
+                'troopLeader',
+                $year,
+                $month,
+                $nationID
+            )));
+
             while ($assemblerCnt < $maxAssemblerCnt) {
                 $lastAssemblerID += 1;
                 $npcObj = new Scenario\GeneralBuilder(
+                    $troopLeaderRng,
                     sprintf('부대장%4d', $lastAssemblerID),
                     false,
                     null,
@@ -1184,7 +1213,8 @@ function checkEmperior()
         'aux' => $statGeneral['aux']
     ]);
 
-    $history = ["<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【통일】</b></><D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다."];
+    $hiddenSeed = UniqueConst::$hiddenSeed;
+    $history = ["<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【통일】</b></><D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다. <span class='hidden_but_copyable'>(서버시드: $hiddenSeed})</span>"];
     pushGlobalHistoryLog($history, $admin['year'], $admin['month']);
 
     //연감 월결산
@@ -1202,3 +1232,26 @@ function updateMaxDomesticCritical(General $general, $score)
         $general->setInheritancePoint(InheritanceKey::max_domestic_critical, $maxDomesticCritical);
     }
 }
+
+function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
+{
+    return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        'unique',
+        $year,
+        $month,
+        $generalID
+    )));
+}
+
+function genGenericUniqueRNGFromGeneral(General $general): RandUtil
+{
+    $logger = $general->getLogger();
+    if (!$logger) {
+        throw new \Exception('정식 초기화된 객체가 아닙니다.');
+    }
+    $year = $logger->getYear();
+    $month = $logger->getMonth();
+    $generalID = $general->getID();
+    return genGenericUniqueRNG($year, $month, $generalID);
+}

hwe/func_history.php

@@ -90,8 +90,8 @@ function pushAuctionLog($log) {
     pushRawFileLog(__DIR__."/logs/".UniqueConst::$serverID."/_auctionlog.txt", $log);
 }
 
-function getAuctionLogRecent(int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent(__DIR__."/logs/".UniqueConst::$serverID."/_auctionlog.txt", $count, 300)));
+function getAuctionLogRecent(int $count): array {
+    return array_reverse(getRawFileLogRecent(__DIR__."/logs/".UniqueConst::$serverID."/_auctionlog.txt", $count, 300));
 }
 
 //DB-based

hwe/func_process.php

@@ -3,10 +3,10 @@ namespace sammo;
 
 /**
  * 내정 커맨드 사용시 성공 확률 계산
- * 
+ *
  * @param General $general 장수 정보
  * @param string $type 내정 커맨드 타입, 'leadership' = 통솔 기반, 'strength' = 무력 기반, 'intel' = 지력 기반
- * 
+ *
  * @return array 계산된 실패, 성공 확률 ('success' => 성공 확률, 'fail' => 실패 확률)
  */
 function CriticalRatioDomestic(General $general, string $type) {
@@ -24,7 +24,7 @@ function CriticalRatioDomestic(General $general, string $type) {
       506040(33%/30%), 505050(43%/40%), 504060(50%/50%)
 
     * 통솔 내정 기준
-      756510(25%/22%), 707010(31%/28%), 657510(38%,35%), 
+      756510(25%/22%), 707010(31%/28%), 657510(38%,35%),
       505050(50%,50%), 107070(50%,50%)
     */
     switch($type) {
@@ -60,13 +60,12 @@ function calcLeadershipBonus($officerLevel, $nationLevel):int{
     return $lbonus;
 }
 
-function CriticalScoreEx(string $type):float {
+function CriticalScoreEx(RandUtil $rng, string $type):float {
     if ($type == 'success') {
-        return Util::randRange(2.2, 3.0);
+        return $rng->nextRange(2.2, 3.0);
     }
     if ($type == 'fail') {
-        return  Util::randRange(0.2, 0.4);
+        return $rng->nextRange(0.2, 0.4);
     }
     return 1;
 }
-

hwe/func_template.php

@@ -60,7 +60,8 @@ function chiefTurnTable()
 ";
 }
 
-function templateLimitMsg(string $turntime): string{
+function templateLimitMsg(string $turntime): string
+{
     return "이미 너무 많은 접속을 하셨습니다. 다음 턴에 다시 시도해주세요. (턴시간: {$turntime})";
 }
 
@@ -129,7 +130,7 @@ function allButton(bool $seizeNPCMode, array $opts = [])
         $site = "a_npcList.php";
         $call = "빙의일람";
     } else {
-        $site = "a_vote.php";
+        $site = "v_vote.php";
         $call = "설문조사";
     }
 
@@ -165,7 +166,7 @@ function commandButton(array $opts = [])
         'color' => '#000000'
     ];
 
-    $bgColor = Util::array_get($nation['color']) ?: '#000000';
+    $bgColor = $nation['color'] ?? '#000000';
     $fgColor = newColor($bgColor);
 
     $templates = new \League\Plates\Engine(__DIR__ . '/templates');
@@ -173,16 +174,16 @@ function commandButton(array $opts = [])
     $permission = checkSecretPermission($me);
     $btnClassForTournament = $opts['btnClass'];
     if ($opts['isTournamentApplicationOpen']) {
-      if ($btnClassForTournament != 'dropdown-item') {
-        $btnClassForTournament = 'toolbarButton2';
-      }
+        if ($btnClassForTournament != 'dropdown-item') {
+            $btnClassForTournament = 'toolbarButton2';
+        }
     }
 
     $btnClassForBetting = $opts['btnClass'];
     if ($opts['isBettingActive']) {
-      if ($btnClassForTournament != 'dropdown-item') {
-        $btnClassForBetting = 'toolbarButton2';
-      }
+        if ($btnClassForTournament != 'dropdown-item') {
+            $btnClassForBetting = 'toolbarButton2';
+        }
     }
 
     if ($permission >= 1) {
@@ -246,7 +247,7 @@ function getMapHtml(?string $mapName = null)
 {
     $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
-    if($mapName === null){
+    if ($mapName === null) {
         $mapName = GameConst::$mapName;
     }
 

hwe/func_time_event.php

@@ -513,7 +513,7 @@ function getOutcome(float $billRate, array $generalList) {
     return $outcome;
 }
 
-function tradeRate() {
+function tradeRate(RandUtil $rng) {
     $db = DB::db();
 
     foreach($db->query('SELECT city,level FROM city') as $city){
@@ -528,8 +528,8 @@ function tradeRate() {
             7=>0.8,
             8=>1
         ][$city['level']];
-        if($prob > 0 && Util::randBool($prob)) {
-            $trade = Util::randRangeInt(95, 105);
+        if($prob > 0 && $rng->nextBool($prob)) {
+            $trade = $rng->nextRangeInt(95, 105);
         } else {
             $trade = null;
         }
@@ -539,7 +539,7 @@ function tradeRate() {
     }
 }
 
-function disaster() {
+function disaster(RandUtil $rng) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
@@ -560,7 +560,7 @@ function disaster() {
         10=>0
     ];
 
-    $isGood = Util::randBool($boomingRate[$month]);
+    $isGood = $rng->nextBool($boomingRate[$month]);
 
 
     $targetCityList = [];
@@ -575,7 +575,7 @@ function disaster() {
             $raiseProp = 0.06 - ($city['secu'] / $city['secu_max']) * 0.05; // 1 ~ 6%
         }
 
-        if(Util::randBool($raiseProp)) {
+        if($rng->nextBool($raiseProp)) {
             $targetCityList[] = $city;
         }
     }
@@ -621,7 +621,7 @@ function disaster() {
         10 => null
     ];
 
-    [$logTitle, $stateCode, $logBody] = Util::choiceRandom(($isGood?$boomingTextList:$disasterTextList)[$month]);
+    [$logTitle, $stateCode, $logBody] = $rng->choice(($isGood?$boomingTextList:$disasterTextList)[$month]);
 
     $logger = new ActionLogger(0, 0, $year, $month, false);
 
@@ -653,7 +653,7 @@ function disaster() {
                 $generalListByCity[$city['city']]??[]
             );
 
-            SabotageInjury($generalList, '재난');
+            SabotageInjury($rng, $generalList, '재난');
         }
     }
     else{

hwe/func_tournament.php

@@ -5,17 +5,25 @@ namespace sammo;
 use sammo\DTO\BettingInfo;
 use sammo\Enums\InheritanceKey;
 
+/**
+ * @param int $turnTerm 서버 턴 단위
+ * @return int 토너먼트 초 단위
+ */
+function calcTournamentTerm(int $turnTerm): int{
+    return Util::valueFit($turnTerm, 5, 120);
+}
+
 function processTournament()
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time', 'last_tournament_betting_id']);
+    $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time', 'turnterm', 'last_tournament_betting_id']);
     $now = new \DateTime();
     $offset = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
 
     //수동일땐 무시
-    if ($admin['tnmt_auto'] == 0) {
+    if (!$admin['tnmt_auto']) {
         return;
     }
 
@@ -28,18 +36,7 @@ function processTournament()
     }
 
     //현시간이 스탬프 지나친경우
-    $unit = [
-        1 => 720,
-        2 => 420,
-        3 => 180,
-        4 => 60,
-        5 => 30,
-        6 => 15,
-        7 => 5,
-    ][$admin['tnmt_auto']] ?? null;
-    if($unit === null){
-        throw new MustNotBeReachedException();
-    }
+    $unit = calcTournamentTerm($admin['turnterm']);
 
     //업데이트 횟수
     $iter = intdiv($offset, $unit) + 1;
@@ -123,10 +120,7 @@ function processTournament()
 
         //베팅은 무조건 60페이즈후 진행(최대 1시간)
         if ($tnmt == 6) {
-            $betTerm = $unit * 60;
-            if ($betTerm > 3600) {
-                $betTerm = 3600;
-            }
+            $betTerm = Util::valueFit($unit * 60, null, 3600);
             //처리 초 더한 날짜
             $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i + $betTerm);
             $gameStor->tournament = $tnmt;
@@ -134,20 +128,6 @@ function processTournament()
             $gameStor->tnmt_time = $dt;
             return;
         }
-
-        if ($admin['tnmt_auto'] == 1) {
-            //처리 초 더한 날짜
-            $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i);
-            $hr = substr($dt, 11, 2);
-            //지정시간대 넘어가면 중단 20~24시
-            if ($hr < 20) {
-                $dt = substr($dt, 0, 11) . "20:00:00";
-                $gameStor->tournament = $tnmt;
-                $gameStor->phase = $phase;
-                $gameStor->tnmt_time = $dt;
-                return;
-            }
-        }
     }
 
     $second = $unit * $iter;
@@ -156,35 +136,9 @@ function processTournament()
     $gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
 }
 
-function getTournamentTerm(): ?int
+function getTournamentTermText(int $turnTerm)
 {
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-
-    $tnmt_auto = $gameStor->tnmt_auto;
-    if ($tnmt_auto === null) {
-        $tnmt_auto = $gameStor->tnmt_trig;
-    }
-
-    return [
-        0 => null,
-        1 => 12 * 60,
-        2 => 7 * 60,
-        3 => 3 * 60,
-        4 => 1 * 60,
-        5 => 30,
-        6 => 15,
-        7 => 5,
-    ][$tnmt_auto] ?? null;
-}
-
-function getTournamentTermText()
-{
-    $term = getTournamentTerm();
-
-    if ($term === null) {
-        return '수동';
-    }
+    $term = calcTournamentTerm($turnTerm);
 
     if ($term % 60 === 0) {
         $termMin = intdiv($term, 60);
@@ -320,26 +274,18 @@ function printFighting($tournament, $phase)
     }
 }
 
-function startTournament($auto, $type)
+function startTournament($type)
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     eraseTnmtFightLogAll();
 
-    $unit = [
-        1 => 60,
-        2 => 60,
-        3 => 60,
-        4 => 60,
-        5 => 30,
-        6 => 15,
-        7 => 5,
-    ][$auto] ?? 60;
+    $admin = $gameStor->getValues(['year', 'month', 'turnterm']);
+    $turnTerm = $admin['turnterm'];
+    $unit = calcTournamentTerm($turnTerm);
 
-    $admin = $gameStor->getValues(['year', 'month']);
-
-    $gameStor->tnmt_auto = $auto;
+    $gameStor->tnmt_auto = true;
     $gameStor->tnmt_time = (new \DateTimeImmutable())->add(new \DateInterval("PT{$unit}M"))->format('Y-m-d H:i:s');
     $gameStor->tournament = 1;
     $gameStor->tnmt_type = $type;
@@ -383,14 +329,16 @@ function getDummyBettingInfo(string $tnmt_type): BettingInfo
         name: $tnmt_type,
         finished: true,
         selectCnt: 1,
+        isExclusive: null,
         reqInheritancePoint: false,
         openYearMonth: 0,
         closeYearMonth: 0,
-        candidates: []
+        candidates: [],
+        winner: null,
     );
 }
 
-function startBetting($type, $unit)
+function startBetting($type)
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -425,10 +373,10 @@ function startBetting($type, $unit)
         $candidates[$general['no']] = new \sammo\DTO\SelectItem(
             title: $general['name'],
             info: "{$statName}: {$general[$statKey]}",
+            isHtml: null,
             aux: $general
         );
     }
-    $candidateCnt = count($candidates);
 
     Betting::openBetting(new BettingInfo(
         id: $bettingID,
@@ -436,10 +384,12 @@ function startBetting($type, $unit)
         name: $typeText,
         finished: false,
         selectCnt: 1,
+        isExclusive: null,
         reqInheritancePoint: false,
         openYearMonth: $openYearMonth,
         closeYearMonth: $closeYearMonth,
         candidates: $candidates,
+        winner: null,
     ));
 
     $betting = new Betting($bettingID);
@@ -448,12 +398,18 @@ function startBetting($type, $unit)
 
     $betGold = Util::valueFit(floor((3 + $year - $startyear) * 0.334) * 10, 10);
 
+    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        'OpenBettingTournament',
+        $bettingID,
+    )));
+
     $npcList = $db->queryFirstColumn('SELECT no FROM general WHERE npc >= 2 AND gold >= (500 + %i)', $betGold);
     $npcBet = [];
 
     $targetList = array_keys($candidates);
     foreach ($npcList as $npcID) {
-        $target = Util::choiceRandom($targetList);
+        $target = $rng->choice($targetList);
         $npcBet[] = [$npcID, $target];
     }
 
@@ -971,7 +927,7 @@ function setGift($tnmt_type, $tnmt, $phase)
     }
 
     //자동진행 끝
-    $gameStor->tnmt_auto = 0;
+    $gameStor->tnmt_auto = false;
 
     //장수열전 기록
     /** @var ActionLogger */
@@ -1030,7 +986,7 @@ function setRefund()
     }
 
     //자동진행 끝
-    $gameStor->tnmt_auto = 0;
+    $gameStor->tnmt_auto = false;
 }
 
 //10차이 1.1, 50 차이 1.17, 100차이 1.2

hwe/index.php

@@ -2,6 +2,8 @@
 
 namespace sammo;
 
+use sammo\DTO\VoteInfo;
+
 include "lib.php";
 include "func.php";
 
@@ -86,7 +88,7 @@ $color = "cyan";
 $serverName = UniqueConst::$serverName;
 $serverCnt = $gameStor->server_cnt;
 
-$auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
+$auctionCount = $db->queryFirstField('SELECT count(*) FROM ng_auction WHERE finished = 0');
 $isTournamentActive = $gameStor->tournament > 0;
 $isTournamentApplicationOpen = $gameStor->tournament == 1;
 $isBettingActive = $gameStor->tournament == 6;
@@ -109,6 +111,16 @@ if (!$otherTextInfo) {
 } else {
     $otherTextInfo = join(', ', $otherTextInfo);
 }
+
+$lastVoteID = $gameStor->lastVote;
+$lastVote = null;
+if ($lastVoteID) {
+    $voteStor = KVStorage::getStorage($db, 'vote');
+    $lastVote = VoteInfo::fromArray($voteStor->getValue("vote_{$lastVoteID}"));
+    if ($lastVote->endDate && $lastVote->endDate < TimeUtil::now()) {
+        $lastVote = null;
+    }
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -178,7 +190,7 @@ if (!$otherTextInfo) {
                     NPC선택 : <?= $npcmode ?>
                 </div>
                 <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
-                    토너먼트 : <?= getTournamentTermText() ?>
+                    토너먼트 : <?= getTournamentTermText($gameStor->turnterm) ?>
                 </div>
                 <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
                     기타 설정: <?= $otherTextInfo ?>
@@ -207,13 +219,11 @@ if (!$otherTextInfo) {
                 </div>
                 <div class="s-border-t py-2 col col-6 col-md-4 vote-cell">
                     <?php
-                    $vote = $gameStor->vote ?: [''];
-                    $vote_title = Tag2Code($gameStor->vote_title ?? '-');
                     ?>
-                    <?php if ($vote[0] == "") : ?>
+                    <?php if ($lastVote === null) : ?>
                         <span style='color:magenta'>진행중 설문 없음</span>
                     <?php else : ?>
-                        <span style='color:cyan'>설문 진행중</span> : <span><?= $vote_title ?></span>
+                        <span style='color:cyan'>설문 진행중</span> : <span><?= $lastVote->title ?></span>
                     <?php endif; ?>
                 </div>
             </div>
@@ -272,7 +282,21 @@ if (!$otherTextInfo) {
                 <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
                 <div id="general-position"><?php generalInfo($generalObj); ?></div>
                 <div id="generalCommandButton" class="row gx-0">
-                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?></div>
+                    <div class="buttonPlate bg2">
+                        <?= commandButton([
+                            'splitBtnBegin' => '<div class="btn-group">',
+                            'splitBtnEnd' => '</div>',
+                            'splitZoneSign' => '<button type="button" class="btn btn-sammo-nation dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"><span class="visually-hidden">Toggle Dropdown</span></button>',
+                            'splitZoneBegin' => '<ul class="dropdown-menu dropdown-menu-end">',
+                            'splitZoneEnd' => '</ul>',
+                            'splitSubBtnBegin' => '<li>',
+                            'splitSubBtnEnd' => '</li>',
+                            'btnClass' => 'btn btn-sammo-nation',
+                            'btnSplitClass' => 'dropdown-item',
+                            'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                            'isBettingActive' => $isBettingActive
+                        ])
+                        ?></div>
                 </div>
             </div>
         </div>
@@ -372,7 +396,18 @@ if (!$otherTextInfo) {
                             국가 메뉴
                         </div>
                         <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?>
+                            <?= commandButton([
+                                'btnBegin' => '<li>',
+                                'btnEnd' => '</li>',
+                                'splitMainBegin' => '<div class="d-none">',
+                                'splitMainEnd' => '</div>',
+                                'splitSubBtnBegin' => '<li>',
+                                'splitSubBtnEnd' => '</li>',
+                                'btnClass' => 'dropdown-item',
+                                'btnSplitClass' => 'dropdown-item',
+                                'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                                'isBettingActive' => $isBettingActive
+                            ]) ?>
                         </ul>
                     </li>
                     <li class="nav-item dropup">

hwe/install.php

@@ -194,17 +194,11 @@ if ($session->userGrade < 5 && !$allowReset) {
                             </div>
 
                             <div class="form-group row">
-                                <label for="tournament_trig" class="col-sm-3 col-form-label"><span class="text-nowrap">토너먼트 자동 시작</span> <span class="text-nowrap">경기 단위</span></label>
+                                <label for="tournament_trig" class="col-sm-3 col-form-label"><span class="text-nowrap">토너먼트 자동 시작</span></label>
                                 <div class="col-sm-9" id="tournament_trig">
                                     <div id="tournament_trig" class="btn-group-toggle btn-group flex-wrap" data-bs-toggle="buttons">
-                                        <input type="radio" class="btn-check" id="tournament_trig_0" name="tournament_trig" value="0"><label for="tournament_trig_0" class="btn btn-secondary w-25">안함</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_1" name="tournament_trig" value="1"><label for="tournament_trig_1" class="btn btn-secondary w-25">12분(총 5일)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_2" name="tournament_trig" value="2"><label for="tournament_trig_2" class="btn btn-secondary w-25">7분(총 10시간)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_3" name="tournament_trig" value="3"><label for="tournament_trig_3" class="btn btn-secondary w-25">3분(총 4시간)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_4" name="tournament_trig" value="4" checked><label for="tournament_trig_4" class="btn btn-secondary w-25">1분(총 82분)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_5" name="tournament_trig" value="5"><label for="tournament_trig_5" class="btn btn-secondary w-25">30초(총 41분)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_6" name="tournament_trig" value="6"><label for="tournament_trig_6" class="btn btn-secondary w-25">15초(총 21분)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_7" name="tournament_trig" value="7"><label for="tournament_trig_7" class="btn btn-secondary w-25">5초(총 7분)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_0" name="tournament_trig" value="0"><label for="tournament_trig_0" class="btn btn-secondary w-25">수동</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_1" name="tournament_trig" checked value="1"><label for="tournament_trig_1" class="btn btn-secondary w-25">자동</label>
                                     </div>
                                 </div>
                             </div>

hwe/j_autoreset.php

@@ -56,7 +56,7 @@ else if(
     $status = 'closed';
 }
 else if(
-    $isUnited > 0 && 
+    $isUnited > 0 &&
     $now->getTimestamp() - $lastTurn->getTimestamp() > ($reservedDate->getTimestamp() - $now->getTimestamp()) * 2
 ){
     //천통 & 비정지 상태 & 2/3 넘음
@@ -88,7 +88,7 @@ $result = ResetHelper::buildScenario(
     $options['block_general_create'],
     $options['npcmode'],
     $options['show_img_level'],
-    $options['tournament_trig'],
+    !!$options['tournament_trig'],
     $options['join_mode'],
     $options['starttime'],
     $options['autorun_user']?:null

hwe/j_die_immediately.php

@@ -1,61 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-
-WebUtil::requireAJAX();
-
-$availableDieImmediately = false;
-
-//로그인 검사
-$session = Session::requireGameLogin();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-$general = $db->queryFirstRow('SELECT no,name,owner_name,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
-
-if(!$general){
-    Json::die([
-        'result'=>false,
-        'reason'=>'장수가 없습니다.'
-    ]);
-}
-
-increaseRefresh("장수 삭제", 1);
-$gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
-
-if($gameStor->turntime > $gameStor->opentime){
-    Json::die([
-        'result'=>false,
-        'reason'=>'이미 서버가 시작되었습니다.'
-    ]);
-}
-
-
-$targetTime = addTurn($general['lastrefresh'], $gameStor->turnterm, 2);
-if($targetTime > TimeUtil::now()){
-    $targetTimeShort = substr($targetTime, 0, 19);
-    Json::die([
-        'result'=>false,
-        'reason'=>"아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다."
-    ]);
-}
-
-
-$generalObj = General::createGeneralObjFromDB($general['no']);
-if($generalObj instanceof DummyGeneral){
-    trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
-}
-$generalName = $generalObj->getName();
-$josaYi = JosaUtil::pick($generalName, '이');
-$generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>");
-
-$session->logoutGame();
-Json::die([
-    'result'=>true,
-    'reason'=>'success'
-]);

hwe/j_get_select_npc_token.php

@@ -110,16 +110,23 @@ foreach($db->queryFirstColumn('SELECT pick_result FROM select_npc_token WHERE `o
     }
 }
 
+$rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+    UniqueConst::$hiddenSeed,
+    'SelectNPCToken',
+    $userID,
+    $now,
+)));
+
 $pickLimit = min(count($candidates), 5);
 
 while(count($pickResult) < $pickLimit){
-    $generalID = Util::choiceRandomUsingWeight($weight);
+    $generalID = $rng->choiceUsingWeight($weight);
     if(!key_exists($generalID, $pickResult)){
         $pickResult[$generalID] = $candidates[$generalID];
     }
 }
 
-$newNonce = mt_rand(0, 0xfffffff);
+$newNonce = random_int(0, 0xfffffff);
 
 $validSecond = max(VALID_SECOND, $turnterm*40);
 $pickMoreSecond = max(PICK_MORE_SECOND, Util::round(pow($turnterm, 0.672)*8));

hwe/j_get_select_pool.php

@@ -74,9 +74,13 @@ if($tokens){
     ]);
 }
 
+$rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+    UniqueConst::$hiddenSeed, 'selectPool', $userID, $now
+)));
+
 $pick = [];
 $valid_until = null;
-foreach(pickGeneralFromPool($db, $userID, 14) as $pickObj){
+foreach(pickGeneralFromPool($db, $rng, $userID, 14) as $pickObj){
     $valid_until = $pickObj->getValidUntil();
     $info = $pickObj->getInfo();
     putInfoText($info);

hwe/j_install.php

@@ -4,8 +4,6 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
-WebUtil::requireAJAX();
-
 $session = Session::requireLogin([])->setReadOnly();
 
 if(!class_exists('\\sammo\\DB')){
@@ -113,7 +111,7 @@ $extend = (int)$_POST['extend'];
 $npcmode = (int)$_POST['npcmode'];
 $block_general_create = (bool)$_POST['block_general_create'];
 $show_img_level = (int)$_POST['show_img_level'];
-$tournament_trig = (int)$_POST['tournament_trig'];
+$tournament_trig = !!(int)$_POST['tournament_trig'];
 $join_mode = $_POST['join_mode'];
 $autorun_user_minutes = (int)$_POST['autorun_user_minutes'];
 $autorun_user_options = [];
@@ -144,7 +142,7 @@ $autorun_user = $autorun_user_minutes?[
 if($reserve_open){
     $reserve_open = new \DateTime($reserve_open);
     $db = DB::db();
-    
+
     if (!$db->queryFirstField("SHOW TABLES LIKE 'storage'")) {
         $clearResult = ResetHelper::clearDB();
         if(!$clearResult['result']){
@@ -159,7 +157,9 @@ if($reserve_open){
         ]);
     }
 
-    $scenarioObj = new Scenario($scenario, true);
+    $rng = new RandUtil(new LiteHashDRBG(random_bytes(16)));
+
+    $scenarioObj = new Scenario($rng, $scenario, true);
     $open_date = $reserve_open->format('Y-m-d H:i:s');
 
     $reserveInfo = [
@@ -179,14 +179,14 @@ if($reserve_open){
         'autorun_user'=>$autorun_user
     ];
 
-    
+
     if($pre_reserve_open){
         $pre_reserve_open = new \DateTime($pre_reserve_open);
         $open_date = $pre_reserve_open->format('Y-m-d H:i:s');
     }
 
 
-    
+
     $db->delete('reserved_open', true);
     $db->insert('reserved_open', [
         'options'=>Json::encode($reserveInfo),
@@ -208,7 +208,7 @@ Json::die(ResetHelper::buildScenario(
     $block_general_create,
     $npcmode,
     $show_img_level,
-    $tournament_trig,
+    !!$tournament_trig,
     $join_mode,
     TimeUtil::now(),
     $autorun_user

hwe/j_myBossInfo.php

@@ -241,34 +241,43 @@ function do추방(General $general, int $myOfficerLevel):?string{
     }
     $general->setVar('troop', 0);
 
-    if($general->getNPCType() >= 2 && Util::randBool(GameConst::$npcBanMessageProb)) {
+    if($general->getNPCType() >= 2){
+        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'BanNPC',
+            $env['year'],
+            $env['month'],
+            $general->getID(),
+        )));
+        if ($rng->nextBool(GameConst::$npcBanMessageProb)) {
 
-        $str = Util::choiceRandom([
-            '날 버리다니... 곧 전장에서 복수해주겠다...',
-            '추방이라... 내가 무얼 잘못했단 말인가...',
-            '어디 추방해가면서 잘되나 보자... 꼭 복수하겠다...',
-            '인덕이 제일이거늘... 추방이 웬말인가... 저주한다!',
-            '날 추방했으니 그 복수로 적국에 정보를 팔아 넘겨야겠군요. 그럼 이만.'
-        ]);
+            $str = $rng->choice([
+                '날 버리다니... 곧 전장에서 복수해주겠다...',
+                '추방이라... 내가 무얼 잘못했단 말인가...',
+                '어디 추방해가면서 잘되나 보자... 꼭 복수하겠다...',
+                '인덕이 제일이거늘... 추방이 웬말인가... 저주한다!',
+                '날 추방했으니 그 복수로 적국에 정보를 팔아 넘겨야겠군요. 그럼 이만.'
+            ]);
 
-        $src = new MessageTarget(
-            $generalID,
-            $generalName,
-            $nationID,
-            $nation['name'],
-            $nation['color'],
-            GetImageURL($general->getVar('imgsvr'), $general->getVar('picture'))
-        );
-        $msg = new Message(
-            Message::MSGTYPE_PUBLIC,
-            $src,
-            $src,
-            $str,
-            new \DateTime(),
-            new \DateTime('9999-12-31'),
-            []
-        );
-        $msg->send();
+            $src = new MessageTarget(
+                $generalID,
+                $generalName,
+                $nationID,
+                $nation['name'],
+                $nation['color'],
+                GetImageURL($general->getVar('imgsvr'), $general->getVar('picture'))
+            );
+            $msg = new Message(
+                Message::MSGTYPE_PUBLIC,
+                $src,
+                $src,
+                $str,
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            $msg->send();
+        }
     }
 
     if($env['year'] < $env['startyear']+3) {

hwe/j_select_picked_general.php

@@ -103,7 +103,7 @@ foreach(GameConst::$generalPoolAllowOption as $allowOption){
     }
     else if($allowOption == 'ego'){
         if(!$personal || $personal == 'Random'){
-            $personal = Util::choiceRandom(GameConst::$availablePersonality);
+            $personal =  Util::choiceRandom(GameConst::$availablePersonality);
         }
         if(!array_search($personal, GameConst::$availablePersonality)){
             Json::die([

hwe/j_simulate_battle.php

@@ -300,12 +300,17 @@ function simulateBattle(
     $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
     $startYear, $year, $month, $cityRate
 ){
+
+    $warSeed = bin2hex(random_bytes(16));
+    $warRng = new RandUtil(new LiteHashDRBG($warSeed));
+
     $attacker = new WarUnitGeneral(
+        $warRng,
         new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month),
         $rawAttackerNation,
         true
     );
-    $city = new WarUnitCity($rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
+    $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
 
     $iterDefender = new \ArrayIterator($rawDefenderList);
     $iterDefender->rewind();
@@ -316,7 +321,7 @@ function simulateBattle(
     $defenderRice = 0;
 
     $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext)
-        use ($iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice) {
+        use ($warRng, $iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice) {
         if($prevDefender !== null){
             $prevDefender->getLogger()->rollback();
             $battleResult[] = $prevDefender;
@@ -341,6 +346,7 @@ function simulateBattle(
         $defenderRice += $defenderObj->getVar('rice');
 
         $retVal = new WarUnitGeneral(
+            $warRng,
             $defenderObj,
             $rawDefenderNation,
             false
@@ -349,7 +355,7 @@ function simulateBattle(
         return $retVal;
     };
 
-    $conquerCity = processWar_NG($attacker, $getNextDefender, $city, $year - $startYear);
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
 
     $rawDefenderCity = $city->getRaw();
     $updateAttackerNation = [];

hwe/j_troop.php

@@ -53,32 +53,6 @@ if($action == '부대창설'){
     ]);
 }
 
-if($action == '부대변경'){
-    $name = StringUtil::neutralize($name);
-    if(!$name){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대 이름이 없습니다.'
-        ]);
-    }
-
-    $db->update('troop', [
-        'name'=>$name
-    ], 'troop_leader=%i',$generalID);
-
-    if($db->affectedRows() == 0){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대장이 아닙니다.'
-        ]);
-    }
-
-    Json::die([
-        'result'=>true,
-        'reason'=>'success'
-    ]);
-}
-
 if($action == '부대추방'){
     if (!$gen){
         Json::die([

hwe/process_war.php

@@ -3,9 +3,10 @@
 namespace sammo;
 
 
-function processWar(General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity)
+function processWar(string $warSeed, General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity)
 {
 
+    $rng = new RandUtil(new LiteHashDRBG($warSeed));
     $db = DB::db();
 
     $attackerNationID = $attackerGeneral->getNationID();
@@ -30,9 +31,9 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     $gameStor = KVStorage::getStorage($db, 'game_env');
     [$startYear, $year, $month, $cityRate, $joinMode] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'city_rate', 'join_mode']);
 
-    $attacker = new WarUnitGeneral($attackerGeneral, $rawAttackerNation, true);
+    $attacker = new WarUnitGeneral($rng, $attackerGeneral,$rawAttackerNation, true);
 
-    $city = new WarUnitCity($rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
+    $city = new WarUnitCity($rng, $rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
 
     $defenderIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and train>=defence_train and atmos>=defence_train', $city->getVar('nation'), $city->getVar('city'));
     $defenderList = General::createGeneralObjListFromDB($defenderIDList, null, 2);
@@ -44,7 +45,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     $iterDefender = new \ArrayIterator($defenderList);
     $iterDefender->rewind();
 
-    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
+    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($rng, $iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
         if ($prevDefender !== null) {
             $prevDefender->applyDB($db);
         }
@@ -65,6 +66,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
 
 
         $retVal = new WarUnitGeneral(
+            $rng,
             $nextDefender,
             $rawDefenderNation,
             false
@@ -73,7 +75,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
         return $retVal;
     };
 
-    $conquerCity = processWar_NG($attacker, $getNextDefender, $city, $year - $startYear);
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
 
     $attacker->applyDB($db);
 
@@ -206,6 +208,7 @@ function extractBattleOrder(General $general)
 }
 
 function processWar_NG(
+    string $warSeed,
     WarUnitGeneral $attacker,
     callable $getNextDefender,
     WarUnitCity $city,
@@ -228,8 +231,8 @@ function processWar_NG(
     $josaRo = JosaUtil::pick($city->getName(), '로');
     $josaYi = JosaUtil::pick($attacker->getName(), '이');
 
-    $logger->pushGlobalActionLog("<D><b>{$attacker->getNationVar('name')}</b></>의 <Y>{$attacker->getName()}</>{$josaYi} <G><b>{$city->getName()}</b></>{$josaRo} 진격합니다.");
-    $logger->pushGeneralActionLog("<G><b>{$city->getName()}</b></>{$josaRo} <M>진격</>합니다. <1>$date</>");
+    $logger->pushGlobalActionLog("<D><b>{$attacker->getNationVar('name')}</b></>의 <Y>{$attacker->getName()}</>{$josaYi} <G><b>{$city->getName()}</b></>{$josaRo} 진격합니다.<span class='hidden_but_copyable'>(전투시드: {$warSeed})</span>");
+    $logger->pushGeneralActionLog("<G><b>{$city->getName()}</b></>{$josaRo} <M>진격</>합니다.<span class='hidden_but_copyable'>(전투시드: {$warSeed})</span> <1>$date</>");
 
     $logWritten = false;
 
@@ -309,7 +312,7 @@ function processWar_NG(
             $initCaller = $attacker->getGeneral()->getBattleInitSkillTriggerList($attacker);
             $initCaller->merge($defender->getGeneral()->getBattleInitSkillTriggerList($defender));
 
-            $initCaller->fire([], [$attacker, $defender]);
+            $initCaller->fire($attacker->rng, [], [$attacker, $defender]);
         }
 
         $attacker->beginPhase();
@@ -318,7 +321,7 @@ function processWar_NG(
         $battleCaller = $attacker->getGeneral()->getBattlePhaseSkillTriggerList($attacker);
         $battleCaller->merge($defender->getGeneral()->getBattlePhaseSkillTriggerList($defender));
 
-        $battleCaller->fire([], [$attacker, $defender]);
+        $battleCaller->fire($attacker->rng, [], [$attacker, $defender]);
 
         $deadDefender = $attacker->calcDamage();
         $deadAttacker = $defender->calcDamage();
@@ -510,6 +513,16 @@ function ConquerCity(array $admin, General $general, array $city)
     $cityID = $city['city'];
     $cityName = $city['name'];
 
+    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        'ConquerCity',
+        $year,
+        $month,
+        $attackerNationID,
+        $attackerID,
+        $cityID
+    )));
+
     $defenderNationID = $city['nation'];
     $defenderStaticNation = getNationStaticInfo($defenderNationID);
     $defenderNationName = $defenderStaticNation['name'];
@@ -577,8 +590,8 @@ function ConquerCity(array $admin, General $general, array $city)
         $loseGeneralGold = 0;
         $loseGeneralRice = 0;
         foreach ($oldNationGenerals as $oldGeneral) {
-            $loseGold = intdiv($oldGeneral->getVar('gold') * (rand() % 30 + 20), 100);
-            $loseRice = intdiv($oldGeneral->getVar('rice') * (rand() % 30 + 20), 100);
+            $loseGold = Util::toInt($oldGeneral->getVar('gold') * $rng->nextRange(0.2, 0.5));
+            $loseRice = Util::toInt($oldGeneral->getVar('rice') * $rng->nextRange(0.2, 0.5));
             $oldGeneral->getLogger()->pushGeneralActionLog(
                 "도주하며 금<C>$loseGold</> 쌀<C>$loseRice</>을 분실했습니다.",
                 ActionLogger::PLAIN
@@ -594,7 +607,7 @@ function ConquerCity(array $admin, General $general, array $city)
             $oldGeneral->applyDB($db);
 
             //모두 등용장 발부
-            if ($admin['join_mode'] != 'onlyRandom' && Util::randBool(0.5)) {
+            if ($admin['join_mode'] != 'onlyRandom' && $rng->nextBool(0.5)) {
                 $msg = ScoutMessage::buildScoutMessage($attackerID, $oldGeneral->getID());
                 if ($msg) {
                     $msg->send(true);
@@ -603,11 +616,11 @@ function ConquerCity(array $admin, General $general, array $city)
 
             //NPC인 경우 일정 확률로 임관(엔장, 인재, 의병)
             $npcType = $oldGeneral->getNPCType();
-            if ($admin['join_mode'] != 'onlyRandom' && 2 <= $npcType && $npcType <= 8 && $npcType != 5 && Util::randBool(GameConst::$joinRuinedNPCProp)) {
+            if ($admin['join_mode'] != 'onlyRandom' && 2 <= $npcType && $npcType <= 8 && $npcType != 5 && $rng->nextBool(GameConst::$joinRuinedNPCProp)) {
                 $cmd = buildGeneralCommandClass('che_임관', $oldGeneral, $admin, [
                     'destNationID' => $attackerNationID
                 ]);
-                $joinTurn = Util::randRangeInt(0, 12);
+                $joinTurn = $rng->nextRangeInt(0, 12);
                 if ($joinTurn) {
                     _setGeneralCommand(buildGeneralCommandClass('che_견문', $oldGeneral, $admin), iterator_to_array(Util::range($joinTurn)));
                 }

hwe/sammo/API/Auction/BidBuyRiceAuction.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionBuyRice;
+use sammo\AuctionUniqueItem;
+use sammo\Validator;
+use sammo\General;
+
+class BidBuyRiceAuction extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'auctionID',
+      'amount',
+    ])
+      ->rule('int', 'amount')
+      ->rule('int', 'auctionID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $auctionID = $this->args['auctionID'];
+    $amount = $this->args['amount'];
+
+    $generalID = $session->generalID;
+    $general = General::createGeneralObjFromDB($generalID);
+    $auction = new AuctionBuyRice($auctionID, $general);
+    $result = $auction->bid($amount, true);
+
+    if (is_string($result)) {
+      return $result;
+    }
+
+    return null;
+  }
+}

hwe/sammo/API/Auction/BidSellRiceAuction.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionSellRice;
+use sammo\Validator;
+use sammo\General;
+
+class BidSellRiceAuction extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'auctionID',
+      'amount',
+    ])
+      ->rule('int', 'amount')
+      ->rule('int', 'auctionID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $auctionID = $this->args['auctionID'];
+    $amount = $this->args['amount'];
+
+    $generalID = $session->generalID;
+    $general = General::createGeneralObjFromDB($generalID);
+    $auction = new AuctionSellRice($auctionID, $general);
+    $result = $auction->bid($amount, true);
+
+    if (is_string($result)) {
+      return $result;
+    }
+
+    return null;
+  }
+}

hwe/sammo/API/Auction/BidUniqueAuction.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionUniqueItem;
+use sammo\Validator;
+use sammo\GameConst;
+use sammo\General;
+
+class BidUniqueAuction extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'auctionID',
+      'amount',
+    ])
+      ->rule('int', 'amount')
+      ->rule('int', 'auctionID')
+      ->rule('boolean', 'extendCloseDate');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $auctionID = $this->args['auctionID'];
+    $amount = $this->args['amount'];
+    $tryExtendCloseDate = $this->arg['extendCloseDate'] ?? false;
+
+    $generalID = $session->generalID;
+    $general = General::createGeneralObjFromDB($generalID);
+    $auction = new AuctionUniqueItem($auctionID, $general);
+    $result = $auction->bid($amount, $tryExtendCloseDate);
+
+    if (is_string($result)) {
+      return $result;
+    }
+
+    return null;
+  }
+}

hwe/sammo/API/Auction/GetActiveResourceAuctionList.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionSellRice;
+use sammo\DB;
+use sammo\DTO\AuctionBidItem;
+use sammo\DTO\AuctionInfo;
+use sammo\Enums\AuctionType;
+use sammo\Validator;
+use sammo\General;
+use sammo\Json;
+use sammo\TimeUtil;
+use sammo\Util;
+
+use function sammo\getAuctionLogRecent;
+
+class GetActiveResourceAuctionList extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $db = DB::db();
+
+    $buyRiceList = [];
+    $sellRiceList = [];
+    /** @var AuctionInfo[] */
+    $auctions = array_map(fn ($raw) => AuctionInfo::fromArray($raw), $db->query(
+      'SELECT * FROM `ng_auction` WHERE `type` IN %ls AND `finished` = 0 ORDER BY `close_date` ASC',
+      [
+        AuctionType::BuyRice->value,
+        AuctionType::SellRice->value,
+      ]
+    ));
+
+    $recentLogs = getAuctionLogRecent(20);
+
+
+    if (!$auctions) {
+      return [
+        'result' => true,
+        'buyRice' => $buyRiceList,
+        'sellRice' => $sellRiceList,
+        'recentLogs' => $recentLogs,
+        'generalID' => $session->generalID,
+      ];
+    }
+
+    $auctionIDList = [];
+    foreach ($auctions as $auction) {
+      $auctionIDList[] = $auction->id;
+    }
+
+
+    $rawHighestBids = Util::convertArrayToDict($db->query(
+      'SELECT bid.* FROM `ng_auction_bid` bid INNER JOIN (
+        SELECT `auction_id`, MAX(`amount`) as `max_amount`
+        FROM `ng_auction_bid`
+        WHERE `auction_id` IN %li
+        GROUP BY `auction_id`
+        ORDER BY `amount`
+      ) AS max_bid
+      ON bid.`auction_id` = max_bid.`auction_id` AND bid.`amount` = max_bid.`max_amount`',
+      $auctionIDList,
+    ) ?? [], 'auction_id');
+    /** @var array<int,AuctionBidItem> */
+    $highestBids = Util::mapWithKey(
+      fn ($auctionID, $bid) => AuctionBidItem::fromArray($bid),
+      $rawHighestBids
+    );
+
+    foreach ($auctions as $auction) {
+      $rawAuction = [
+        'id' => $auction->id,
+        'type' => $auction->type->value,
+        'hostGeneralID' => $auction->hostGeneralID,
+        'hostName' => $auction->detail->hostName,
+        'openDate' => TimeUtil::format($auction->openDate, false),
+        'closeDate' => TimeUtil::format($auction->closeDate, false),
+        'amount' => $auction->detail->amount,
+        'startBidAmount' => $auction->detail->startBidAmount,
+        'finishBidAmount' => $auction->detail->finishBidAmount,
+      ];
+
+      $highestBid = $highestBids[$rawAuction['id']] ?? null;
+      if ($highestBid === null) {
+        $rawAuction['highestBid'] = null;
+      } else {
+        $rawAuction['highestBid'] = [
+          'amount' => $highestBid->amount,
+          'date' => TimeUtil::format($highestBid->date, false),
+          'generalID' => $highestBid->generalID,
+          'generalName' => $highestBid->aux->generalName,
+        ];
+      }
+
+      if ($rawAuction['type'] == AuctionType::BuyRice->value) {
+        $buyRiceList[] = $rawAuction;
+      } else {
+        $sellRiceList[] = $rawAuction;
+      }
+    }
+
+    return [
+      'result' => true,
+      'buyRice' => $buyRiceList,
+      'sellRice' => $sellRiceList,
+      'recentLogs' => $recentLogs,
+      'generalID' => $session->generalID,
+    ];
+  }
+}

hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionUniqueItem;
+use sammo\DB;
+use sammo\DTO\AuctionBidItem;
+use sammo\DTO\AuctionInfo;
+use sammo\Enums\AuctionType;
+use sammo\Enums\InheritanceKey;
+use sammo\InheritancePointManager;
+use sammo\TimeUtil;
+use sammo\Validator;
+use sammo\General;
+
+class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'auctionID',
+    ])
+      ->rule('integer', 'auctionID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    $this->args['auctionID'] = (int)$this->args['auctionID'];
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $db = DB::db();
+
+    $generalID = $session->generalID;
+    $auctionID = $this->args['auctionID'];
+
+    $rawAuction = $db->queryFirstRow(
+      'SELECT * FROM `ng_auction` WHERE `type` = %s AND `id` = %i',
+      AuctionType::UniqueItem->value,
+      $auctionID
+    );
+
+    if (!$rawAuction) {
+      return '선택한 경매가 없습니다.';
+    }
+
+    $auction = AuctionInfo::fromArray($rawAuction);
+
+    /** @var AuctionBidItem[] */
+    $bidList = array_map(fn ($raw) => AuctionBidItem::fromArray($raw), $db->query(
+      'SELECT * FROM `ng_auction_bid` WHERE `auction_id` = %s ORDER BY `amount` DESC',
+      $auctionID
+    ) ?? []);
+
+    $responseBid = [];
+    foreach ($bidList as $bid) {
+      $responseBid[] = [
+        'generalName' => $bid->aux->generalName,
+        'amount' => $bid->amount,
+        'isCallerHighestBidder' => $bid->generalID === $generalID,
+        'date' => TimeUtil::format($bid->date, false),
+      ];
+    }
+
+    $inheritMgr = InheritancePointManager::getInstance();
+    //preveious라서 column을 최대한 비울 수 있다.
+    $remainPoint = $inheritMgr->getInheritancePoint(
+      General::createGeneralObjFromDB($generalID, ['owner'], 0),
+      InheritanceKey::previous
+    );
+
+    $obfuscatedName = AuctionUniqueItem::genObfuscatedName($generalID);
+
+    return [
+      'result' => true,
+      'auction' => [
+        'id' => $auction->id,
+        'finished' => $auction->finished,
+        'title' => $auction->detail->title,
+        'target' => $auction->target,
+        'isCallerHost' => $auction->hostGeneralID === $generalID,
+        'hostName' => $auction->detail->hostName,
+        'closeDate' => TimeUtil::format($auction->closeDate, false),
+        'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
+        'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
+      ],
+      'bidList' => $responseBid,
+      'obfuscatedName' => $obfuscatedName,
+      'remainPoint' => $remainPoint,
+    ];
+  }
+}

hwe/sammo/API/Auction/GetUniqueItemAuctionList.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionUniqueItem;
+use sammo\DB;
+use sammo\DTO\AuctionBidItem;
+use sammo\DTO\AuctionInfo;
+use sammo\Enums\AuctionType;
+use sammo\TimeUtil;
+use sammo\Util;
+
+class GetUniqueItemAuctionList extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $db = DB::db();
+
+    $generalID = $session->generalID;
+
+    /** @var AuctionInfo[] */
+    $auctions = array_map(fn($raw)=>AuctionInfo::fromArray($raw), $db->query(
+      'SELECT * FROM `ng_auction` WHERE `type` = %s ORDER BY `close_date` ASC',
+      AuctionType::UniqueItem->value
+    ) ?? []);
+
+    $obfuscatedName = AuctionUniqueItem::genObfuscatedName($generalID);
+
+    if(!$auctions){
+      return [
+        'result' => true,
+        'list' => [],
+        'obfuscatedName' => $obfuscatedName,
+      ];
+    }
+
+
+    $auctionIDList = [];
+    foreach ($auctions as $auction) {
+      $auctionIDList[] = $auction->id;
+    }
+
+    $rawHighestBids = Util::convertArrayToDict($db->query(
+      'SELECT bid.* FROM `ng_auction_bid` bid INNER JOIN (
+        SELECT `auction_id`, MAX(`amount`) as `max_amount`
+        FROM `ng_auction_bid`
+        WHERE `auction_id` IN %li
+        GROUP BY `auction_id`
+        ORDER BY `amount`
+      ) AS max_bid
+      ON bid.`auction_id` = max_bid.`auction_id` AND bid.`amount` = max_bid.`max_amount`',
+      $auctionIDList,
+    ) ?? [], 'auction_id');
+    /** @var array<int,AuctionBidItem> */
+    $highestBids = Util::mapWithKey(
+      fn ($auctionID, $bid) => AuctionBidItem::fromArray($bid),
+      $rawHighestBids
+    );
+
+    $response = [];
+    foreach ($auctions as $auction) {
+      $auctionID = $auction->id;
+      $highestBid = $highestBids[$auctionID] ?? null;
+      if($highestBid === null){
+        continue;
+      }
+
+      $response[] = [
+        'id' => $auctionID,
+        'finished' => $auction->finished,
+        'title' => $auction->detail->title,
+        'target' => $auction->target,
+        'isCallerHost' => $auction->hostGeneralID === $generalID,
+        'hostName' => $auction->detail->hostName,
+        'closeDate' => TimeUtil::format($auction->closeDate, false),
+        'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
+        'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
+        'highestBid' => [
+          'generalName' => $highestBid->aux->generalName,
+          'amount' => $highestBid->amount,
+          'isCallerHighestBidder' => $highestBid->generalID === $generalID,
+          'date' => $highestBid->date,
+        ],
+      ];
+    }
+
+    return [
+      'result' => true,
+      'list' => $response,
+      'obfuscatedName' => $obfuscatedName,
+    ];
+  }
+}

hwe/sammo/API/Auction/OpenBuyRiceAuction.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionBuyRice;
+use sammo\DB;
+use sammo\Validator;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+
+class OpenBuyRiceAuction extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $availableItems = [];
+    foreach (GameConst::$allItems as $items) {
+      foreach ($items as $itemKey => $amount) {
+        if ($amount == 0) {
+          continue;
+        }
+        $availableItems[$itemKey] = $amount;
+      }
+    }
+
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'amount',
+      'closeTurnCnt',
+      'startBidAmount',
+      'finishBidAmount',
+    ])
+      ->rule('int', 'amount')
+      ->rule('int', 'closeTurnCnt')
+      ->rule('min', 'amount', 100)
+      ->rule('max', 'amount', 10000)
+      ->rule('int', 'startBidAmount')
+      ->rule('int', 'finishBidAmount');
+
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    /** @var int */
+    $amount = $this->args['amount'];
+    /** @var int */
+    $closeTurnCnt = $this->args['closeTurnCnt'];
+
+    /** @var int */
+    $startBidAmount = $this->args['startBidAmount'];
+    /** @var int */
+    $finishBidAmount = $this->args['finishBidAmount'];
+    $generalID = $session->generalID;
+
+    $general = General::createGeneralObjFromDB($generalID);
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$initYear, $initMonth, $year, $month] = $gameStor->getValuesAsArray(['init_year', 'init_month', 'year', 'month']);
+    $initYearMonth = Util::joinYearMonth($initYear, $initMonth);
+    $yearMonth = Util::joinYearMonth($year, $month);
+
+    if($yearMonth < $initYearMonth + 3){
+      return '시작 후 3개월이 지나야 경매를 열 수 있습니다.';
+    }
+
+    $auctionResult = AuctionBuyRice::openResourceAuction(
+      $general,
+      $amount,
+      $closeTurnCnt,
+      $startBidAmount,
+      $finishBidAmount
+    );
+
+    if (is_string($auctionResult)) {
+      return $auctionResult;
+    }
+
+    return [
+      'result' => true,
+      'auctionID' => $auctionResult->getInfo()->id,
+    ];
+  }
+}

hwe/sammo/API/Auction/OpenSellRiceAuction.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionSellRice;
+use sammo\DB;
+use sammo\Validator;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+
+class OpenSellRiceAuction extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $availableItems = [];
+    foreach (GameConst::$allItems as $items) {
+      foreach ($items as $itemKey => $amount) {
+        if ($amount == 0) {
+          continue;
+        }
+        $availableItems[$itemKey] = $amount;
+      }
+    }
+
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'amount',
+      'closeTurnCnt',
+      'startBidAmount',
+      'finishBidAmount',
+    ])
+      ->rule('int', 'amount')
+      ->rule('int', 'closeTurnCnt')
+      ->rule('min', 'amount', 100)
+      ->rule('max', 'amount', 10000)
+      ->rule('int', 'startBidAmount')
+      ->rule('int', 'finishBidAmount');
+
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    /** @var int */
+    $amount = $this->args['amount'];
+    /** @var int */
+    $closeTurnCnt = $this->args['closeTurnCnt'];
+
+    /** @var int */
+    $startBidAmount = $this->args['startBidAmount'];
+    /** @var int */
+    $finishBidAmount = $this->args['finishBidAmount'];
+    $generalID = $session->generalID;
+
+    $general = General::createGeneralObjFromDB($generalID);
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$initYear, $initMonth, $year, $month] = $gameStor->getValuesAsArray(['init_year', 'init_month', 'year', 'month']);
+    $initYearMonth = Util::joinYearMonth($initYear, $initMonth);
+    $yearMonth = Util::joinYearMonth($year, $month);
+
+    if($yearMonth < $initYearMonth + 3){
+      return '시작 후 3개월이 지나야 경매를 열 수 있습니다.';
+    }
+
+    $auctionResult = AuctionSellRice::openResourceAuction(
+      $general,
+      $amount,
+      $closeTurnCnt,
+      $startBidAmount,
+      $finishBidAmount
+    );
+
+    if (is_string($auctionResult)) {
+      return $auctionResult;
+    }
+
+    return [
+      'result' => true,
+      'auctionID' => $auctionResult->getInfo()->id,
+    ];
+  }
+}

hwe/sammo/API/Auction/OpenUniqueAuction.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace sammo\API\Auction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AuctionUniqueItem;
+use sammo\DB;
+use sammo\Validator;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+
+use function sammo\buildItemClass;
+
+class OpenUniqueAuction extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $availableItems = [];
+    foreach (GameConst::$allItems as $items) {
+      foreach ($items as $itemKey => $amount) {
+        if ($amount == 0) {
+          continue;
+        }
+        $availableItems[$itemKey] = $amount;
+      }
+    }
+
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'itemID',
+      'amount'
+    ])
+      ->rule('int', 'amount')
+      ->rule('min', 'amount', GameConst::$inheritItemUniqueMinPoint)
+      ->rule('keyExists', 'itemID', $availableItems);
+
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $itemID = $this->args['itemID'];
+    $amount = $this->args['amount'];
+    $generalID = $session->generalID;
+
+    $itemObj = buildItemClass($itemID);
+    $general = General::createGeneralObjFromDB($generalID);
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$initYear, $initMonth, $year, $month] = $gameStor->getValuesAsArray(['init_year', 'init_month', 'year', 'month']);
+    $initYearMonth = Util::joinYearMonth($initYear, $initMonth);
+    $yearMonth = Util::joinYearMonth($year, $month);
+
+    if($yearMonth < $initYearMonth + 3){
+      return '시작 후 3개월이 지나야 경매를 열 수 있습니다.';
+    }
+
+    $auctionResult = AuctionUniqueItem::openItemAuction($itemObj, $general, $amount);
+
+    if(is_string($auctionResult)) {
+      return $auctionResult;
+    }
+
+    return [
+      'result' => true,
+      'auctionID' => $auctionResult->getInfo()->id,
+    ];
+  }
+}

hwe/sammo/API/Betting/Bet.php

@@ -23,9 +23,9 @@ class Bet extends \sammo\BaseAPI
             'bettingType',
             'amount'
         ])
-            ->rule('integer', 'bettingID')
+            ->rule('int', 'bettingID')
             ->rule('integerArray', 'bettingType')
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', 1);
 
         if (!$v->validate()) {

hwe/sammo/API/Betting/GetBettingDetail.php

@@ -23,6 +23,7 @@ class GetBettingDetail extends \sammo\BaseAPI
         if (!$v->validate()) {
             return $v->errorStr();
         }
+        $this->args['betting_id'] = (int)$this->args['betting_id'];
         return null;
     }
 
@@ -46,7 +47,7 @@ class GetBettingDetail extends \sammo\BaseAPI
         }
 
         try{
-            $bettingInfo = new BettingInfo($rawBettingInfo);
+            $bettingInfo = BettingInfo::fromArray($rawBettingInfo);
         }
         catch(\Error $e){
             return $e->getMessage();

hwe/sammo/API/Betting/GetBettingList.php

@@ -49,7 +49,7 @@ class GetBettingList extends \sammo\BaseAPI
 
         $bettingList = [];
         foreach ($bettingStor->getAll() as $_key => $rawItem) {
-            $item = new BettingInfo($rawItem);
+            $item = BettingInfo::fromArray($rawItem);
             if ($reqType !== null && $item->type != $reqType) {
                 continue;
             }

hwe/sammo/API/Command/PushCommand.php

@@ -16,7 +16,7 @@ class PushCommand extends \sammo\BaseAPI
         $v->rule('required', [
             'amount',
         ])
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', -12)
             ->rule('max', 'amount', 12);
 

hwe/sammo/API/Command/RepeatCommand.php

@@ -16,7 +16,7 @@ class RepeatCommand extends \sammo\BaseAPI
         $v->rule('required', [
             'amount',
         ])
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', 1)
             ->rule('max', 'amount', 12);
 

hwe/sammo/API/General/BuildNationCandidate.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace sammo\API\General;
+
+use sammo\Command\General\che_거병;
+use sammo\DB;
+use sammo\Validator;
+
+use sammo\Session;
+use sammo\GameConst;
+use sammo\General;
+use sammo\JosaUtil;
+use sammo\KVStorage;
+use sammo\LiteHashDRBG;
+use sammo\RandUtil;
+use sammo\UniqueConst;
+use sammo\Util;
+
+use function sammo\increaseRefresh;
+
+class BuildNationCandidate extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $gameStor->cacheValues(['opentime', 'turntime']);
+
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i', $userID);
+
+    if (!$general) {
+      return '장수가 없습니다';
+    }
+
+    $generalID = $general['no'];
+
+    increaseRefresh("사전 거병", 1);
+
+    if ($gameStor->turntime > $gameStor->opentime) {
+      return '게임이 시작되었습니다.';
+    }
+
+    if ($general['nation'] != 0) {
+      return '이미 국가에 소속되어있습니다.';
+    }
+
+    $env = $gameStor->getAll();
+
+    $generalObj = General::createGeneralObjFromDB($general['no']);
+
+    $validCmd = false;
+    foreach(GameConst::$availableGeneralCommand as $cmdList){
+      if(in_array('che_거병', $cmdList)){
+        $validCmd = true;
+        break;
+      }
+    }
+
+    if(!$validCmd){
+      return '거병할 수 없는 모드입니다.';
+    }
+
+    $cmd = new che_거병($generalObj, $env);
+    $failReason = $cmd->testFullConditionMet();
+    if ($failReason !== null) {
+      return $failReason;
+    }
+
+    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+      UniqueConst::$hiddenSeed,
+      'BuildNationCandidate',
+      $generalID,
+    )));
+    $result = $cmd->run($rng);
+
+    if(!$result){
+      return '거병을 실패했습니다.';
+    }
+
+    return null;
+  }
+}

hwe/sammo/API/General/DieOnPrestart.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace sammo\API\General;
+
+use sammo\DB;
+use sammo\DummyGeneral;
+
+use sammo\Session;
+use sammo\General;
+use sammo\JosaUtil;
+use sammo\KVStorage;
+use sammo\TimeUtil;
+
+use function sammo\addTurn;
+use function sammo\increaseRefresh;
+
+class DieOnPrestart extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    //로그인 검사
+    $userID = $session->userID;
+
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
+
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
+
+    if (!$general) {
+      return '장수가 없습니다';
+    }
+
+    increaseRefresh("장수 삭제", 1);
+
+
+    if ($gameStor->turntime > $gameStor->opentime) {
+      return '게임이 시작되었습니다.';
+    }
+
+    if ($general['nation'] != 0){
+      return '이미 국가에 소속되어있습니다.';
+    }
+
+    //서버 가오픈시 할 수 있는 행동
+    $targetTime = addTurn($general['lastrefresh'], $gameStor->turnterm, 2);
+    if ($targetTime > TimeUtil::now()) {
+      $targetTimeShort = substr($targetTime, 0, 19);
+      return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
+    }
+
+    $generalObj = General::createGeneralObjFromDB($general['no']);
+    if ($generalObj instanceof DummyGeneral) {
+      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
+    }
+
+    $generalName = $generalObj->getName();
+    $josaYi = JosaUtil::pick($generalName, '이');
+    $generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>");
+
+    $session->logoutGame();
+    return null;
+  }
+}

hwe/sammo/API/General/DropItem.php

@@ -2,6 +2,7 @@
 
 namespace sammo\API\General;
 
+use Ds\Set;
 use sammo\DB;
 use sammo\Validator;
 
@@ -9,6 +10,7 @@ use sammo\Session;
 use sammo\GameConst;
 use sammo\General;
 use sammo\JosaUtil;
+use sammo\KVStorage;
 
 class DropItem extends \sammo\BaseAPI
 {
@@ -49,17 +51,20 @@ class DropItem extends \sammo\BaseAPI
     $generalName = $me->getName();
     $josaYi = JosaUtil::pick($generalName, '이');
 
+
     $itemName = $item->getName();
-    $josaUl = JosaUtil::pick($itemName, '을');
+    $itemRawName = $item->getRawName();
+    $josaUl = JosaUtil::pick($itemRawName, '을');
     $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 버렸습니다.");
 
     $nationName = $me->getStaticNation()['name'];
+    $db = DB::db();
     if (!$item->isBuyable()) {
       $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <C>{$itemName}</>{$josaUl} 잃었습니다!");
       $logger->pushGlobalHistoryLog("<R><b>【망실】</b></><D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} <C>{$itemName}</>{$josaUl} 잃었습니다!");
     }
 
-    $me->applyDB(DB::db());
+    $me->applyDB($db);
 
     return null;
   }

hwe/sammo/API/General/GetGeneralLog.php

@@ -20,7 +20,7 @@ class GetGeneralLog extends GetNationGeneralLog
             ->rule('required', [
                 'type',
             ])
-            ->rule('integer', [
+            ->rule('int', [
                 'reqTo',
             ])
             ->rule('in', 'type', [

hwe/sammo/API/General/Join.php

@@ -13,11 +13,14 @@ use sammo\InheritancePointManager;
 use sammo\JosaUtil;
 use sammo\Json;
 use sammo\KVStorage;
+use sammo\LiteHashDRBG;
+use sammo\RandUtil;
 use sammo\RootDB;
 use sammo\Session;
 use sammo\SpecialityHelper;
 use sammo\StringUtil;
 use sammo\TimeUtil;
+use sammo\UniqueConst;
 use sammo\UserLogger;
 use sammo\Util;
 use sammo\Validator;
@@ -43,7 +46,7 @@ class Join extends \sammo\BaseAPI
                 'pic',
                 'character',
             ])
-            ->rule('integer', [
+            ->rule('int', [
                 'leadership',
                 'strength',
                 'intel',
@@ -72,6 +75,7 @@ class Join extends \sammo\BaseAPI
         if (!$v->validate()) {
             return $v->errorStr();
         }
+
         return null;
     }
 
@@ -101,6 +105,10 @@ class Join extends \sammo\BaseAPI
         $inheritCity = $this->args['inheritCity'] ?? null;
         $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;
 
+        if($inheritTurntime !== null && $inheritCity !== null){
+            return '턴과 도시를 동시에 지정할 수 없습니다.';
+        }
+
         $rootDB = RootDB::db();
         //회원 테이블에서 정보확인
         $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr FROM member WHERE no=%i', $userID);
@@ -162,6 +170,14 @@ class Join extends \sammo\BaseAPI
 
         $userLogger = new UserLogger($userID, $admin['year'], $admin['month'], false);
 
+        $now = TimeUtil::now(false);
+        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'MakeGeneral',
+            $userID,
+            $now
+        )));
+
         if ($inheritCity !== null) {
             $inheritRequiredPoint += GameConst::$inheritBornCityPoint;
         }
@@ -193,7 +209,7 @@ class Join extends \sammo\BaseAPI
             $genius = true;
         } else {
             // 현재 1%
-            $genius = Util::randBool(0.01);
+            $genius = $rng->nextBool(0.01);
         }
 
         if ($genius && $gameStor->genius > 0) {
@@ -208,10 +224,11 @@ class Join extends \sammo\BaseAPI
             $city = $inheritCity;
         } else {
             // 공백지에서만 태어나게
-            $city = $db->queryFirstField("select city from city where level>=5 and level<=6 and nation=0 order by rand() limit 0,1");
-            if (!$city) {
-                $city = $db->queryFirstField("select city from city where level>=5 and level<=6 order by rand() limit 0,1");
+            $cities = $db->queryFirstColumn('SELECT city FROM city where `level`>=5 and `level`<=6 and nation=0');
+            if (!$cities) {
+                $cities = $db->queryFirstColumn('SELECT city FROM city where `level`>=5 and `level`<=6');
             }
+            $city = $rng->choice($cities);
         }
 
         if ($inheritBonusStat) {
@@ -221,8 +238,8 @@ class Join extends \sammo\BaseAPI
             $pleadership = 0;
             $pstrength = 0;
             $pintel = 0;
-            foreach (Util::range(Util::randRangeInt(3, 5)) as $statIdx) {
-                switch (Util::choiceRandomUsingWeight([$leadership, $strength, $intel])) {
+            foreach (Util::range($rng->nextRangeInt(3, 5)) as $statIdx) {
+                switch ($rng->choiceUsingWeight([$leadership, $strength, $intel])) {
                     case 0:
                         $pleadership++;
                         break;
@@ -242,14 +259,14 @@ class Join extends \sammo\BaseAPI
 
         $relYear = Util::valueFit($admin['year'] - $admin['startyear'], 0);
 
-        $age = 20 + ($pleadership + $pstrength + $pintel) * 2 - (mt_rand(0, 1));
+        $age = 20 + ($pleadership + $pstrength + $pintel) * 2 - $rng->nextRangeInt(0, 1);
         // 아직 남았고 천재등록상태이면 특기 부여
         if ($genius) {
             $specage2 = $age;
             if ($inheritSpecial) {
                 $special2 = $inheritSpecial;
             } else {
-                $special2 = SpecialityHelper::pickSpecialWar([
+                $special2 = SpecialityHelper::pickSpecialWar($rng, [
                     'leadership' => $leadership,
                     'strength' => $strength,
                     'intel' => $intel,
@@ -290,12 +307,12 @@ class Join extends \sammo\BaseAPI
 
             $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime%60), "inheritPoint");
 
-            $inheritTurntime += Util::randRangeInt(0, 999999) / 1000000;
+            $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
             $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
             $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
             $turntime = TimeUtil::format($turntime, true);
         } else {
-            $turntime = getRandTurn($admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
+            $turntime = getRandTurn($rng, $admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
         }
 
 
@@ -315,10 +332,10 @@ class Join extends \sammo\BaseAPI
 
         //성격 랜덤시
         if (!in_array($character, GameConst::$availablePersonality)) {
-            $character = Util::choiceRandom(GameConst::$availablePersonality);
+            $character = $rng->choice(GameConst::$availablePersonality);
         }
         //상성 랜덤
-        $affinity = rand() % 150 + 1;
+        $affinity = $rng->nextRangeInt(1, 150);
 
         ########## 회원정보 테이블에 입력값을 등록한다. ##########
         $db->insert('general', [

hwe/sammo/API/Global/GetHistory.php

@@ -33,6 +33,8 @@ class GetHistory extends \sammo\BaseAPI
     if (!$this->args['serverID']) {
       $this->args['serverID'] = UniqueConst::$serverID;
     }
+    $this->args['year'] = (int)$this->args['year'];
+    $this->args['month'] = (int)$this->args['month'];
     return null;
   }
 

hwe/sammo/API/InheritAction/BuyHiddenBuff.php

@@ -23,7 +23,7 @@ class BuyHiddenBuff extends \sammo\BaseAPI
             'type',
             'level',
         ])
-            ->rule('integer', 'level')
+            ->rule('int', 'level')
             ->rule('min', 'level', 1)
             ->rule('max', 'level', TriggerInheritBuff::MAX_STEP)
             ->rule('keyExists', 'type', TriggerInheritBuff::BUFF_KEY_TEXT);

hwe/sammo/API/InheritAction/BuySpecificUnique.php

@@ -1,104 +0,0 @@
-<?php
-
-namespace sammo\API\InheritAction;
-
-use sammo\Session;
-use DateTimeInterface;
-use sammo\DB;
-use sammo\Enums\RankColumn;
-use sammo\GameConst;
-use sammo\General;
-use sammo\KVStorage;
-use sammo\UserLogger;
-use sammo\Validator;
-
-use function sammo\buildItemClass;
-
-class BuySpecificUnique extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        $availableItems = [];
-        foreach (GameConst::$allItems as $items) {
-            foreach ($items as $itemKey => $amount) {
-                if ($amount == 0) {
-                    continue;
-                }
-                $availableItems[$itemKey] = $amount;
-            }
-        }
-
-        $v = new Validator($this->args);
-        $v->rule('required', [
-            'item',
-            'amount',
-        ])
-            ->rule('integer', 'amount')
-            ->rule('min', 'amount', GameConst::$inheritItemUniqueMinPoint)
-            ->rule('keyExists', 'item', $availableItems);
-
-        if (!$v->validate()) {
-            return $v->errorStr();
-        }
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        //KVStrorage, General.aux 모두 쓰므로 lock;
-        return static::REQ_GAME_LOGIN;
-    }
-
-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
-    {
-        $itemKey = $this->args['item'];
-        $amount = $this->args['amount'];
-
-        $userID = $session->userID;
-        $generalID = $session->generalID;
-
-        $general = General::createGeneralObjFromDB($generalID);
-        if ($userID != $general->getVar('owner')) {
-            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
-        }
-
-        $itemTrials = $general->getAuxVar('inheritUniqueTrial') ?? [];
-        if (key_exists($itemKey, $itemTrials)) {
-            return '이미 입찰한 아이템입니다. 다음 턴에 시도해 주세요.';
-        }
-
-        foreach(GameConst::$allItems as $itemType => $items){
-            if(!key_exists($itemKey, $items)){
-                continue;
-            }
-
-            $prevItem = $general->getItem($itemType);
-            if(!$prevItem->isBuyable()){
-                return '이미 같은 자리에 유니크를 보유하고 있습니다.';
-            }
-
-            break;
-        }
-
-        $db = DB::db();
-        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
-        $trialStor = KVStorage::getStorage($db, "ut_{$itemKey}");
-        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
-        if ($previousPoint < $amount) {
-            return '충분한 유산 포인트를 가지고 있지 않습니다.';
-        }
-
-        $itemObj = buildItemClass($itemKey);
-        $userLogger = new UserLogger($userID);
-        $userLogger->push("{$amount} 포인트로 유니크 {$itemObj->getName()} 구입 시도", "inheritPoint");
-        $userLogger->flush();
-
-        $itemTrials[$itemKey] = $amount;
-        $general->setAuxVar('inheritUniqueTrial', $itemTrials);
-        $inheritStor->setValue('previous', [$previousPoint - $amount, null]);
-        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $amount);
-        $trialStor->setValue("u{$userID}", [$userID, $generalID, $amount]);
-        $general->applyDB($db);
-        return null;
-    }
-}

hwe/sammo/API/InheritAction/GetMoreLog.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace sammo\API\InheritAction;
+
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Session;
+use sammo\Validator;
+use sammo\Util;
+
+class GetMoreLog extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('integer', 'lastID');
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    $this->args['lastID'] = Util::toInt($this->args['lastID']);
+    return null;
+  }
+  function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $lastID = $this->args['lastID'];
+    $db = DB::db();
+    $lastInheritPointLogs = $db->query('SELECT id, server_id, year, month, date, text FROM user_record WHERE log_type = %s AND `user_id` = %i AND id < %i ORDER BY id desc LIMIT 30', "inheritPoint", $userID, $lastID);
+
+    return [
+      'result'=> true,
+      'log' => $lastInheritPointLogs,
+    ];
+  }
+}

hwe/sammo/API/InheritAction/ResetTurnTime.php

@@ -10,7 +10,10 @@ use sammo\Enums\RankColumn;
 use sammo\GameConst;
 use sammo\General;
 use sammo\KVStorage;
+use sammo\LiteHashDRBG;
+use sammo\RandUtil;
 use sammo\TimeUtil;
+use sammo\UniqueConst;
 use sammo\UserLogger;
 use sammo\Util;
 
@@ -59,7 +62,14 @@ class ResetTurnTime extends \sammo\BaseAPI
         $currTurnTime = new DateTimeImmutable($general->getTurnTime());
         $serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);
 
-        $afterTurn = Util::randRange($turnTerm * -60 / 2, $turnTerm * 60 / 2);
+        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'ResetTurnTime',
+            $userID,
+            $general->getTurnTime()
+        )));
+
+        $afterTurn = $rng->nextRange($turnTerm * -60 / 2, $turnTerm * 60 / 2);
 
         $userLogger = new UserLogger($userID);
         if($afterTurn >= 0){

hwe/sammo/API/Nation/SetBill.php

@@ -19,7 +19,7 @@ class SetBill extends \sammo\BaseAPI
         $v->rule('required', [
             'amount',
         ])
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', 20)
             ->rule('max', 'amount', 200);
 

hwe/sammo/API/Nation/SetRate.php

@@ -19,7 +19,7 @@ class SetRate extends \sammo\BaseAPI
         $v->rule('required', [
             'amount',
         ])
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', 5)
             ->rule('max', 'amount', 30);
 

hwe/sammo/API/Nation/SetSecretLimit.php

@@ -19,7 +19,7 @@ class SetSecretLimit extends \sammo\BaseAPI
         $v->rule('required', [
             'amount',
         ])
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', 1)
             ->rule('max', 'amount', 99);
 

hwe/sammo/API/Nation/SetTroopName.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace sammo\API\Nation;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\StringUtil;
+use sammo\Validator;
+
+use function sammo\checkSecretPermission;
+
+class SetTroopName extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopID',
+      'troopName',
+    ])
+      ->rule('stringWidthBetween', 'troopName', 1, 18)
+      ->rule('integer', 'troopID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $db = DB::db();
+    $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+    $permission = checkSecretPermission($me, false);
+    $troopID = $this->args['troopID'];
+
+    $generalID = $me['no'];
+    if($generalID != $troopID && $permission < 4){
+      return "권한이 부족합니다.";
+    }
+
+    $troopName = StringUtil::neutralize($this->args['troopName']);
+    if(!$troopName){
+      return '부대 이름이 없습니다.';
+    }
+
+    $nationID = $me['nation'];
+    $db->update('troop', [
+      'name'=>$troopName
+    ], 'troop_leader=%i AND `nation`=%i',$troopID, $nationID);
+
+    if($db->affectedRows() == 0){
+      return '부대가 없습니다.';
+    }
+
+    return null;
+  }
+}

hwe/sammo/API/NationCommand/PushCommand.php

@@ -17,7 +17,7 @@ class PushCommand extends \sammo\BaseAPI
         $v->rule('required', [
             'amount',
         ])
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', -12)
             ->rule('max', 'amount', 12);
 

hwe/sammo/API/NationCommand/RepeatCommand.php

@@ -17,7 +17,7 @@ class RepeatCommand extends \sammo\BaseAPI
         $v->rule('required', [
             'amount',
         ])
-            ->rule('integer', 'amount')
+            ->rule('int', 'amount')
             ->rule('min', 'amount', 1)
             ->rule('max', 'amount', 12);
 

hwe/sammo/API/Vote/AddComment.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace sammo\API\Vote;
+
+use DateTimeInterface;
+use sammo\DB;
+use sammo\DTO\VoteComment;
+use sammo\General;
+use sammo\Session;
+use sammo\TimeUtil;
+use sammo\Validator;
+
+class AddComment extends \sammo\BaseAPI
+{
+  function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'voteID',
+      'text',
+    ])->rule('lengthMin', 'text', 1)
+      ->rule('int', 'voteID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    $this->args['voteID'] = (int)$this->args['voteID'];
+    return null;
+  }
+
+  function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $voteID = $this->args['voteID'];
+    $text = mb_substr($this->args['text'], 0, 200);
+
+    $generalID = $session->generalID;
+    $general = General::createGeneralObjFromDB($generalID, [], 0);
+    $generalName = $general->getName();
+    $nationID = $general->getNationID();
+    $nationName = $general->getStaticNation()['name'];
+    $date = TimeUtil::now();
+
+
+    $comment = new VoteComment(
+      id: null,
+      voteID: $voteID,
+      generalID: $generalID,
+      nationID: $nationID,
+      nationName: $nationName,
+      generalName: $generalName,
+      text: $text,
+      date: $date
+    );
+
+    $db = DB::db();
+    $db->insert('vote_comment', $comment->toArray());
+
+    return null;
+  }
+}

hwe/sammo/API/Vote/GetVoteDetail.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace sammo\API\Vote;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\DTO\VoteComment;
+use sammo\DTO\VoteInfo;
+use sammo\Json;
+use sammo\KVStorage;
+use sammo\Validator;
+
+class GetVoteDetail extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', 'voteID')
+      ->rule('integer', 'voteID');
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    $this->args['voteID'] = (int)$this->args['voteID'];
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $voteID = $this->args['voteID'];
+    $db = DB::db();
+
+    $voteStor = KVStorage::getStorage($db, 'vote');
+    $rawVote = $voteStor->getValue("vote_{$voteID}");
+    if (!$rawVote) {
+      return '설문조사가 없습니다.';
+    }
+    $voteInfo = VoteInfo::fromArray($rawVote);
+
+
+    $votes = array_map(fn ($arr) => [Json::decode($arr[0]), $arr[1]], $db->queryAllLists(
+      'SELECT selection, count(*) AS cnt FROM vote WHERE vote_id = %i GROUP BY selection',
+      $voteID
+    ));
+
+    $comments = array_map(fn ($arr) => VoteComment::fromArray($arr), $db->query('SELECT * FROM vote_comment WHERE vote_id = %i ORDER BY `id` ASC', $voteID));
+
+    $myVote = null;
+    if ($session->isGameLoggedIn()) {
+      $generalID = $session->generalID;
+      $rawMyVote = $db->queryFirstField('SELECT selection FROM vote WHERE vote_id = %i AND general_id = %i', $voteID, $generalID);
+      if ($rawMyVote) {
+        $myVote = Json::decode($rawMyVote);
+      }
+    }
+
+    $userCnt = $db->queryFirstField('SELECT count(*) FROM general WHERE npc < 2');
+
+
+    return [
+      'result' => true,
+      'voteInfo' => $voteInfo,
+      'votes' => $votes,
+      'comments' => $comments,
+      'myVote' => $myVote,
+      'userCnt' => $userCnt,
+    ];
+  }
+}

hwe/sammo/API/Vote/GetVoteList.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace sammo\API\Vote;
+
+use DateTimeInterface;
+use sammo\DB;
+use sammo\DTO\VoteInfo;
+use sammo\KVStorage;
+use sammo\Session;
+
+class GetVoteList extends \sammo\BaseAPI
+{
+
+  public function validateArgs(): ?string
+  {
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $db = DB::db();
+
+    $voteStor = KVStorage::getStorage($db, 'vote');
+
+    $votes = [];
+    foreach($voteStor->getAll() as $voteKey => $rawVote){
+      if(!str_starts_with($voteKey, 'vote_')){
+        continue;
+      }
+      $voteID = (int)substr($voteKey, 5);
+      $votes[$voteID] = VoteInfo::fromArray($rawVote);
+    }
+
+    return [
+      'result'=>true,
+      'votes'=>$votes
+    ];
+  }
+}

hwe/sammo/API/Vote/NewVote.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace sammo\API\Vote;
+
+use DateTimeInterface;
+use sammo\DB;
+use sammo\DTO\VoteInfo;
+use sammo\KVStorage;
+use sammo\Session;
+use sammo\TimeUtil;
+use sammo\Util;
+use sammo\Validator;
+
+class NewVote extends \sammo\BaseAPI
+{
+    function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN;
+    }
+
+    function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'title',
+        ])->rule('lengthMin', 'title', 1)
+            ->rule('int', 'multipleOptions')
+            ->rule('date', 'endDate')
+            ->rule('stringArray', 'options')
+            ->rule('boolean', 'keepOldVote');
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    function closeOldVote(int $voteID, KVStorage $voteStor)
+    {
+        $db = DB::db();
+        $voteStor = KVStorage::getStorage($db, 'vote');
+        $rawLastVoteInfo = $voteStor->getValue("vote_{$voteID}");
+        if (!$rawLastVoteInfo) {
+            return;
+        }
+        $lastVoteInfo = VoteInfo::fromArray($rawLastVoteInfo);
+        if ($lastVoteInfo->endDate) {
+            return;
+        }
+
+        $lastVoteInfo->endDate = TimeUtil::now();
+        $voteStor->setValue("vote_{$voteID}", $lastVoteInfo->toArray());
+    }
+
+    function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()] ?? []);
+        $isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
+
+        if (!$isVoteAdmin) {
+            return "권한이 부족합니다.";
+        }
+
+        /** @var string */
+        $title = $this->args['title'];
+        /** @var int */
+        $multipleOptions = $this->args['multipleOptions'] ?? 1;
+        if ($multipleOptions < 0) {
+            $multipleOptions = 0;
+        }
+
+        $now = TimeUtil::now();
+        /** @var ?string */
+        $endDate = $this->args['endDate'] ?? null;
+        /** @var string[] */
+        $options = $this->args['options'] ?? [];
+
+        if(!$options){
+            return '항목이 없습니다.';
+        }
+
+        if($endDate !== null){
+            try{
+                $oNow = new \DateTimeImmutable($now);
+                $oEndDate = new \DateTimeImmutable($endDate);
+                if($oEndDate < $oNow){
+                    return '종료일이 이미 지났습니다.';
+                }
+            }
+            catch(\Throwable $e){
+                return '종료일이 잘못되었습니다.'.$e->getMessage();
+            }
+        }
+
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+
+
+        $lastVote = $gameStor->getValue('lastVote') ?? 0;
+        $voteID = $lastVote + 1;
+
+        $voteStor = KVStorage::getStorage($db, 'vote');
+
+        if (!($this->args['keepOldVote'] ?? false)) {
+            $this->closeOldVote($lastVote, $voteStor);
+        }
+
+        $multipleOptions = Util::valueFit($multipleOptions, 0, count($options));
+
+        $voteInfo = new VoteInfo(
+            id: $voteID,
+            title: $title,
+            multipleOptions: $multipleOptions,
+            startDate: $now,
+            endDate: $endDate,
+            options: $options,
+        );
+
+        $voteStor->setValue("vote_{$voteID}", $voteInfo->toArray());
+        $gameStor->setValue('lastVote', $voteID);
+
+        $db->update('general', [
+            'newvote' => 1
+        ], true);
+
+        return [
+            'result' => true
+        ];
+    }
+}

hwe/sammo/API/Vote/Vote.php

@@ -0,0 +1,124 @@
+<?php
+
+namespace sammo\API\Vote;
+
+use DateTimeInterface;
+use sammo\DB;
+use sammo\DTO\VoteInfo;
+use sammo\General;
+use sammo\Json;
+use sammo\KVStorage;
+use sammo\LiteHashDRBG;
+use sammo\RandUtil;
+use sammo\Session;
+use sammo\UniqueConst;
+use sammo\Util;
+use sammo\Validator;
+use Symfony\Component\Lock\LockFactory;
+use Symfony\Component\Lock\Store\SemaphoreStore;
+
+use function sammo\tryUniqueItemLottery;
+
+class Vote extends \sammo\BaseAPI
+{
+    function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'voteID',
+            'selection'
+        ])->rule('lengthMin', 'title', 1)
+            ->rule('int', 'voteID')
+            ->rule('integerArray', 'seletion');
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+
+        $voteID = $this->args['voteID'];
+        /** @var int[] */
+        $selection = $this->args['selection'];
+        if (!$selection) {
+            return '선택한 항목이 없습니다.';
+        }
+        $db = DB::db();
+        $voteStor = KVStorage::getStorage($db, 'vote');
+
+        $rawVoteInfo = $voteStor->getValue("vote_{$voteID}");
+        if (!$rawVoteInfo) {
+            return '설문조사가 없습니다.';
+        }
+        $voteInfo = VoteInfo::fromArray($rawVoteInfo);
+
+        if ($voteInfo->endDate && $voteInfo->endDate < new \DateTimeImmutable()) {
+            return '설문조사가 종료되었습니다.';
+        }
+
+        if ($voteInfo->multipleOptions >= 1 && count($selection) > $voteInfo->multipleOptions) {
+            return '선택한 항목이 너무 많습니다.';
+        }
+
+        $optionsCnt = count($voteInfo->options);
+        foreach ($selection as $sel) {
+            if ($sel >= $optionsCnt) {
+                return '선택한 항목이 없습니다.';
+            }
+        }
+
+        sort($selection, SORT_NUMERIC);
+
+        $userID = $session->userID;
+        $generalID = $session->generalID;
+
+        $serverPrefix = DB::prefix();
+        $lockFactory = new LockFactory(new SemaphoreStore());
+
+        $nationID = $db->query('SELECT nation FROM general WHERE no = %i', $generalID);
+
+
+        $lock = $lockFactory->createLock("api_{$serverPrefix}_{$userID}");
+        $lock->acquire(true);
+
+
+        $db->insertIgnore('vote', [
+            'vote_id' => $voteID,
+            'general_id' => $generalID,
+            'nation_id' => $nationID,
+            'selection' => Json::encode($selection),
+        ]);
+
+        if ($db->affectedRows() == 0) {
+            return '이미 설문조사를 완료하였습니다.';
+        }
+
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $voteReward = $gameStor->getValue('develcost') * 5;
+
+        $general = General::createGeneralObjFromDB($generalID, ['gold', 'horse', 'weapon', 'book', 'item', 'npc', 'imgsvr', 'picture', 'aux'], 2);
+        $general->increaseVar('gold', $voteReward);
+        $uniqueRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'voteUnique',
+            $voteID,
+            $generalID
+        )));
+        $wonLottery = tryUniqueItemLottery($uniqueRng, $general, '설문조사');
+
+        $general->applyDB($db);
+
+        return [
+            'result' => true,
+            'wonLottery' => $wonLottery,
+        ];
+    }
+}

hwe/sammo/AbsFromUserPool.php

@@ -24,7 +24,7 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
         return $db->affectedRows()!=0;
     }
 
-    static public function pickGeneralFromPool(\MeekroDB $db, int $owner, int $pickCnt, ?string $prefix=null):array{
+    static public function pickGeneralFromPool(\MeekroDB $db, RandUtil $rng, int $owner, int $pickCnt, ?string $prefix=null):array{
         $oNow = new \DateTimeImmutable();
         $now = $oNow->format('Y-m-d H:i:s');
 
@@ -48,7 +48,7 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
         $result = [];
         $validUntil = TimeUtil::nowAddMinutes(2 * $gameStor->turnterm);
         while(count($result) < $pickCnt){
-            $cand = Util::choiceRandomUsingWeightPair($pool);
+            $cand = $rng->choiceUsingWeightPair($pool);
             $poolID = $cand['id'];
             if(key_exists($poolID, $result)){
                 continue;
@@ -64,7 +64,7 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
             if($db->affectedRows()==0){
                 continue;
             }
-            $result[$poolID] = new static($db, $candInfo, $validUntil);
+            $result[$poolID] = new static($db, $rng, $candInfo, $validUntil);
         }
 
         return array_values($result);

hwe/sammo/AbsGeneralPool.php

@@ -20,27 +20,28 @@ abstract class AbsGeneralPool{
      * generalName
      * imgsvr
      * picture
-     * 
+     *
      * leadership
      * strength
      * intel
-     * 
+     *
      * experience
      * dedication
-     * 
+     *
      * dex[5]
-     * 
+     *
      * specialDomestic
      * specialWar
      */
 
-    public function __construct(\MeekroDB $db, array $info, string $validUntil)
+    public function __construct(\MeekroDB $db, RandUtil $rng, array $info, string $validUntil)
     {
         $this->db = $db;
         $this->info = $info;
         $this->uniqueName = $info['uniqueName'];
         $this->generalName = $info['generalName'];
         $this->builder = new GeneralBuilder(
+            $rng,
             $info['generalName'],
             $info['imgsvr'],
             $info['picture'],
@@ -97,14 +98,14 @@ abstract class AbsGeneralPool{
 
     /**
      * @param \MeekroDB $db
-     * @param int $owner 
-     * @param int $pickCnt 
+     * @param int $owner
+     * @param int $pickCnt
      * @param null|string $prefix
      * @return AbsGeneralPool[]
      */
-    static abstract public function pickGeneralFromPool(\MeekroDB $db, int $owner, int $pickCnt, ?string $prefix=null):array;
+    static abstract public function pickGeneralFromPool(\MeekroDB $db, RandUtil $rng, int $owner, int $pickCnt, ?string $prefix=null):array;
     abstract public function occupyGeneralName():bool;
-    
+
 
     abstract public static function getPoolName():string;
     abstract public static function initPool(\MeekroDB $db);

hwe/sammo/ActionItem/che_간파_노군입산부.php

@@ -7,13 +7,13 @@ class che_간파_노군입산부 extends \sammo\BaseItem{
 
     protected $rawName = '노군입산부';
     protected $name = '노군입산부(간파)';
-    protected $info = '[전투] 상대 회피 확률 -30%p, 상대 필살 확률 -10%p';
+    protected $info = '[전투] 상대 회피 확률 -25%p, 상대 필살 확률 -10%p';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcOpposeStat(General $general, string $statName, $value, $aux=null){
         if($statName === 'warAvoidRatio'){
-            return $value - 0.30;
+            return $value - 0.25;
         }
         if($statName === 'warCriticalRatio'){
             return $value - 0.10;

hwe/sammo/ActionItem/che_격노_구정신단경.php

@@ -12,10 +12,15 @@ class che_격노_구정신단경 extends \sammo\BaseItem{
 
     protected $rawName = '구정신단경';
     protected $name = '구정신단경(격노)';
-    protected $info = '[전투] 상대방 필살 시 격노(필살) 발동, 회피 시도시 25% 확률로 격노 발동, 공격 시 일정 확률로 진노(1페이즈 추가)';
+    protected $info = '[전투] 상대방 필살 시 격노(필살) 발동, 회피 시도시 25% 확률로 격노 발동, 공격 시 일정 확률로 진노(1페이즈 추가), 격노마다 대미지 5% 추가 중첩';
     protected $cost = 200;
     protected $consumable = false;
 
+    public function getWarPowerMultiplier(WarUnit $unit):array{
+        $activatedCnt = $unit->hasActivatedSkillOnLog('격노');
+        return [1 + 0.05*$activatedCnt, 1];
+    }
+
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_격노시도($unit, che_격노시도::TYPE_ITEM),

hwe/sammo/ActionItem/che_내정_납금박산로.php

@@ -8,13 +8,13 @@ class che_내정_납금박산로 extends \sammo\BaseItem{
 
     protected $rawName = '납금박산로';
     protected $name = '납금박산로(내정)';
-    protected $info = '[내정] 내정 성공률 +20%p';
+    protected $info = '[내정] 내정 성공률 +15%p';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcStrategic(string $turnType, string $varType, $value){
         if(in_array($turnType, ['상업', '농업', '기술', '성벽', '수비', '치안', '민심', '인구'])){
-            if($varType == 'success') return $value + 0.2;
+            if($varType == 'success') return $value + 0.15;
         }
         return $value;
     }

hwe/sammo/ActionItem/che_능력치_무력_두강주.php

@@ -12,7 +12,7 @@ class che_능력치_무력_두강주 extends \sammo\BaseItem{
 
     protected $rawName = '두강주';
     protected $name = '두강주(무력)';
-    protected $info = '[능력치] 무력 +5 +(5년마다 +1)';
+    protected $info = '[능력치] 무력 +5 +(4년마다 +1)';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -21,7 +21,7 @@ class che_능력치_무력_두강주 extends \sammo\BaseItem{
             $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
             [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
             $relYear = $year - $startYear;
-            return $value + 5 + Util::valueFit(intdiv($relYear, 5), 0, GameConst::$maxTechLevel);
+            return $value + 5 + Util::valueFit(intdiv($relYear, 4), 0, GameConst::$maxTechLevel);
         }
         return $value;
     }

hwe/sammo/ActionItem/che_능력치_지력_이강주.php

@@ -12,7 +12,7 @@ class che_능력치_지력_이강주 extends \sammo\BaseItem{
 
     protected $rawName = '이강주';
     protected $name = '이강주(지력)';
-    protected $info = '[능력치] 지력 +5 +(5년마다 +1)';
+    protected $info = '[능력치] 지력 +5 +(4년마다 +1)';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -21,7 +21,7 @@ class che_능력치_지력_이강주 extends \sammo\BaseItem{
             $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
             [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
             $relYear = $year - $startYear;
-            return $value + 5 + Util::valueFit(intdiv($relYear, 5), 0, GameConst::$maxTechLevel);
+            return $value + 5 + Util::valueFit(intdiv($relYear, 4), 0, GameConst::$maxTechLevel);
         }
         return $value;
     }

hwe/sammo/ActionItem/che_능력치_통솔_보령압주.php

@@ -12,7 +12,7 @@ class che_능력치_통솔_보령압주 extends \sammo\BaseItem{
 
     protected $rawName = '보령압주';
     protected $name = '보령압주(통솔)';
-    protected $info = '[능력치] 통솔 +5 +(5년마다 +1)';
+    protected $info = '[능력치] 통솔 +5 +(4년마다 +1)';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -21,7 +21,7 @@ class che_능력치_통솔_보령압주 extends \sammo\BaseItem{
             $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
             [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
             $relYear = $year - $startYear;
-            return $value + 5 + Util::valueFit(intdiv($relYear, 5), 0, GameConst::$maxTechLevel);
+            return $value + 5 + Util::valueFit(intdiv($relYear, 4), 0, GameConst::$maxTechLevel);
         }
         return $value;
     }

hwe/sammo/ActionItem/che_명성_구석.php

@@ -7,13 +7,13 @@ class che_명성_구석 extends \sammo\BaseItem{
 
     protected $rawName = '구석';
     protected $name = '구석(명성)';
-    protected $info = '명성 +15%';
+    protected $info = '명성 +20%';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
         if($statName == 'experience'){
-            return $value * 1.15;
+            return $value * 1.20;
         }
         return $value;
     }

hwe/sammo/ActionItem/che_보물_도기.php

@@ -6,6 +6,7 @@ use sammo\DB;
 use \sammo\iAction;
 use \sammo\General;
 use sammo\KVStorage;
+use sammo\RandUtil;
 use sammo\Util;
 
 class che_보물_도기 extends \sammo\BaseItem
@@ -13,11 +14,11 @@ class che_보물_도기 extends \sammo\BaseItem
 
     protected $rawName = '도기';
     protected $name = '도기(보물)';
-    protected $info = '[개인] 판매 시 장수 소지금과 국고에 금, 쌀 중 하나를 추가 (총 +10,000, 5년마다 +10,000)';
+    protected $info = '[개인] 판매 시 장수 소지금과 국고에 금, 쌀 중 하나를 추가 (총 +10,000, 2년마다 +5,000)';
     protected $cost = 200;
     protected $consumable = false;
 
-    public function onArbitraryAction(General $general, string $actionType, ?string $phase = null, $aux = null): ?array
+    public function onArbitraryAction(General $general, RandUtil $rng, string $actionType, ?string $phase = null, $aux = null): ?array
     {
         if ($aux === null){
             return $aux;
@@ -37,9 +38,9 @@ class che_보물_도기 extends \sammo\BaseItem
         [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
         $relYear = $year - $startYear;
 
-        $score = 10000 * (1 + Util::valueFit(intdiv($relYear, 5), 0));
+        $score = 10000 + 5000 * Util::valueFit(intdiv($relYear, 2), 0);
 
-        [$resName, $resKey] = Util::choiceRandom([
+        [$resName, $resKey] = $rng->choice([
             ['금', 'gold'],
             ['쌀', 'rice']
         ]);

hwe/sammo/ActionItem/che_불굴_상편.php

@@ -14,7 +14,7 @@ class che_불굴_상편 extends \sammo\BaseItem
 
     protected $rawName = '상편';
     protected $name = '상편(불굴)';
-    protected $info = '[전투] 남은 병력이 적을수록 공격력 증가. 최대 +50%';
+    protected $info = '[전투] 남은 병력이 적을수록 공격력 증가. 최대 +60%';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -25,7 +25,7 @@ class che_불굴_상편 extends \sammo\BaseItem
 
         $crewRatio = Util::valueFit($crew / ($leadership * 100), 0, 1);
         return new WarUnitTriggerCaller(
-            new 전투력보정($unit, 1 + 0.5 * (1 - $crewRatio))
+            new 전투력보정($unit, 1 + 0.6 * (1 - $crewRatio))
         );
     }
 }

hwe/sammo/ActionItem/che_숙련_동작.php

@@ -7,13 +7,13 @@ class che_숙련_동작 extends \sammo\BaseItem{
 
     protected $rawName = '동작';
     protected $name = '동작(숙련)';
-    protected $info = '숙련 +15%';
+    protected $info = '숙련 +20%';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
         if($statName == 'addDex'){
-            return $value * 1.15;
+            return $value * 1.20;
         }
         return $value;
     }

hwe/sammo/ActionItem/che_저지_삼황내문.php

@@ -22,7 +22,7 @@ class che_저지_삼황내문 extends \sammo\BaseItem{
         if($unit->getPhase() >= 2){
             return null;
         }
-        if($unit->getPhase() == 1 && Util::randBool(0.5)){
+        if($unit->getPhase() == 1 && $unit->rng->nextBool(0.5)){
             return null;
         }
 

hwe/sammo/ActionItem/che_전략_평만지장도.php

@@ -8,13 +8,13 @@ class che_전략_평만지장도 extends \sammo\BaseItem{
 
     protected $rawName = '평만지장도';
     protected $name = '평만지장도(전략)';
-    protected $info = '[전략] 국가전략 사용시 재사용 대기 기간 -15%';
+    protected $info = '[전략] 국가전략 사용시 재사용 대기 기간 -20%';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcStrategic(string $turnType, string $varType, $value){
         if($varType == 'delay'){
-            return Util::round($value * 0.85);
+            return Util::round($value * 0.80);
         }
         return $value;
     }

hwe/sammo/ActionItem/che_진압_박혁론.php

@@ -7,17 +7,17 @@ use sammo\WarUnitTrigger\che_저지발동;
 use sammo\WarUnitTrigger\WarActivateSkills;
 use sammo\WarUnitTriggerCaller;
 
-class che_반계저지_박혁론 extends \sammo\BaseItem{
+class che_진압_박혁론 extends \sammo\BaseItem{
 
     protected $rawName = '박혁론';
-    protected $name = '박혁론(반계저지)';
-    protected $info = '[전투] 상대의 계략 되돌림 불가';
+    protected $name = '박혁론(진압)';
+    protected $info = '[전투] 상대의 계략 되돌림, 격노 불가';
     protected $cost = 200;
     protected $consumable = false;
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '반계불가'),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '반계불가', '격노불가'),
         );
     }
 }

hwe/sammo/ActionItem/che_징병_낙주.php

@@ -9,13 +9,13 @@ class che_징병_낙주 extends \sammo\BaseItem{
 
     protected $rawName = '낙주';
     protected $name = '낙주(징병)';
-    protected $info = '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +15%';
+    protected $info = '[군사] 징·모병비 -30%, 통솔 순수 능력치 보정 +15%';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
         if(in_array($turnType, ['징병', '모병'])){
-            if($varType == 'cost') return $value * 0.5;
+            if($varType == 'cost') return $value * 0.7;
         }
 
         return $value;

hwe/sammo/ActionItem/che_치료_환약.php

@@ -4,6 +4,7 @@ use \sammo\iAction;
 use \sammo\General;
 use \sammo\GeneralTrigger;
 use \sammo\GeneralTriggerCaller;
+use sammo\RandUtil;
 
 class che_치료_환약 extends \sammo\BaseItem{
 
@@ -23,7 +24,7 @@ class che_치료_환약 extends \sammo\BaseItem{
         );
     }
 
-    function onArbitraryAction(General $general, string $actionType, ?string $phase = null, $aux = null): ?array
+    function onArbitraryAction(General $general, RandUtil $rng, string $actionType, ?string $phase = null, $aux = null): ?array
     {
         if($actionType != '장비매매'){
             return $aux;

hwe/sammo/ActionItem/che_필살_둔갑천서.php

@@ -7,13 +7,13 @@ class che_필살_둔갑천서 extends \sammo\BaseItem{
 
     protected $rawName = '둔갑천서';
     protected $name = '둔갑천서(필살)';
-    protected $info = '[전투] 필살 확률 +25%p';
+    protected $info = '[전투] 필살 확률 +20%p';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
         if($statName === 'warCriticalRatio'){
-            return $value + 0.25;
+            return $value + 0.20;
         }
         return $value;
     }