요양 깃수 추가

- storage에 의미없이 쌓이는 데이터 이관

.gitignore

@@ -29,6 +29,7 @@ d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
 d_pic/*.webp
+d_pic/*.avif
 d_pic/uploaded_image
 
 /dist_js

composer.json

@@ -12,7 +12,6 @@
         }
     },
     "require": {
-        "brandonwamboldt/utilphp": "^1.1",
         "sergeytsalkov/meekrodb": "^2.5",
         "league/plates": "^3.5",
         "vlucas/valitron": "^1.4",

composer.lock

@@ -4,58 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "deed9afdc95bc42f84784df67d295223",
+    "content-hash": "7edae9b6be35e66ffd0d180f5fac6679",
     "packages": [
-        {
-            "name": "brandonwamboldt/utilphp",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/brandonwamboldt/utilphp.git",
-                "reference": "36c32efc4f0679c05163464a550f45c8d83fe683"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/brandonwamboldt/utilphp/zipball/36c32efc4f0679c05163464a550f45c8d83fe683",
-                "reference": "36c32efc4f0679c05163464a550f45c8d83fe683",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "satooshi/php-coveralls": "dev-master"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "utilphp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Brandon Wamboldt",
-                    "email": "brandon.wamboldt@gmail.com"
-                }
-            ],
-            "description": "util.php is a collection of useful functions and snippets that you need or could use every day, designed to avoid conflicts with existing projects",
-            "homepage": "https://github.com/brandonwamboldt/utilphp",
-            "keywords": [
-                "collection",
-                "helpers",
-                "php",
-                "utility"
-            ],
-            "support": {
-                "issues": "https://github.com/brandonwamboldt/utilphp/issues",
-                "source": "https://github.com/brandonwamboldt/utilphp/tree/master"
-            },
-            "time": "2015-02-02T17:56:14+00:00"
-        },
         {
             "name": "brick/math",
             "version": "0.12.1",
@@ -5721,5 +5671,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

f_config/config.php

@@ -99,7 +99,10 @@ function logError(string $err, string $errstr, string $errpath, array $trace)
     $err = str_replace(ROOT, '{ROOT}', $err);
     $errstr = str_replace(ROOT, '{ROOT}', $errstr);
     $errpath = str_replace(ROOT, '{ROOT}', $errpath);
-    $trace = array_map(function (string $text) {
+    $trace = array_map(function (string|array $text) {
+        if (is_array($text)) {
+            $text = Json::encode($text);
+        }
         return str_replace(ROOT, '{ROOT}', $text);
     }, $trace);
 

f_install/j_create_admin.php

@@ -56,7 +56,7 @@ $rootDB->insert('member', [
     'token_valid_until' => '2999-01-01 00:00:00',
     'pw' => $finalPassword,
     'salt' => $userSalt,
-    'grade' => 6,
+    'grade' => 7,
     'name' => $nickname,
     'reg_date' => $nowDate
 ]);

f_install/sql/common_schema.sql

@@ -93,3 +93,13 @@ CREATE TABLE `login_token` (
 )
 COLLATE='utf8mb4_general_ci'
 ENGINE=Aria;
+
+CREATE TABLE `banned_member` (
+	`no` INT NOT NULL AUTO_INCREMENT,
+	`hashed_email` VARCHAR(128) NOT NULL COLLATE 'utf8mb4_general_ci' COMMENT 'SHA512(salt | email | salt )',
+	`info` TEXT NULL COLLATE 'utf8mb4_general_ci' COMMENT '부가정보',
+	PRIMARY KEY (`no`),
+	UNIQUE INDEX `email` (`hashed_email`(128))
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE = Aria;

hwe/_admin1.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if($session->userGrade < 5) {
+if($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin1_submit.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin1.php');
     die();
 }

hwe/_admin2.php

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin2_submit.php

@@ -15,7 +15,7 @@ $msg = Util::getPost('msg', 'string');
 //로그인 검사
 $session = Session::requireLogin()->loginGame()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin2.php');
 }
 

hwe/_admin5.php

@@ -20,7 +20,7 @@ if ($type2 < 0 || $type2 > 6) {
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin5_submit.php

@@ -12,7 +12,7 @@ $nation = Util::getPost('nation', 'int');
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin5.php');
     die();
 }

hwe/_admin7.php

@@ -31,13 +31,13 @@ $queryMap = [
 ];
 
 if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
-    $reqQueryType = Util::array_first_key($queryMap);
+    $reqQueryType = array_key_first($queryMap);
 }
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin8.php

@@ -12,7 +12,7 @@ $type = 0;
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin_force_rehall.php

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die('권한 부족');
 }
 

hwe/b_currentCity.php

@@ -177,7 +177,7 @@ $templates = new \League\Plates\Engine('templates');
                                 $valid = 1;
                             }
 
-                            if ($userGrade >= 5) {
+                            if ($userGrade >= 6) {
                                 $valid = true;
                                 $showDetailedInfo = true;
                             }
@@ -275,7 +275,7 @@ $templates = new \League\Plates\Engine('templates');
                                     $ourGeneral = false;
                                 }
 
-                                if ($userGrade == 6) {
+                                if ($userGrade == 7) {
                                     $ourGeneral = true;
                                 }
 

hwe/b_tournament.php

@@ -125,63 +125,7 @@ $globalBetTotal = array_sum($globalBet);
         </tr>
     </table>
     <table align=center class='tb_layout bg0'>
-        <?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=trig 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; ?>
-
-
-                        <?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;
-                        } ?>
-
-                    </td>
-                </tr>
-            </form>
-        <?php elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
+        <?php if ($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>

hwe/func.php

@@ -112,7 +112,7 @@ function GetImageURL($imgsvr, $filepath = '')
 function checkLimit($refreshScore = null)
 {
     $session = Session::getInstance();
-    if ($session->userGrade >= 4) {
+    if ($session->userGrade >= 6) {
         return 0;
     }
 
@@ -1009,7 +1009,7 @@ function increaseRefresh($type = "", $cnt = 1)
     $isunited = $gameStor->isunited;
     $opentime = $gameStor->opentime;
 
-    if ($userGrade == 6) {
+    if ($userGrade >= 6) {
         return;
     }
     if ($isunited == 2) {
@@ -1047,7 +1047,7 @@ function increaseRefresh($type = "", $cnt = 1)
 
     $logDB = FileDB::db($logPath, $serverPath . '/../f_install/sql/api_log.sql');
 
-    $ip = $_SERVER['REMOTE_ADDR'] ?? 'local';
+    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'] ?? 'local';
     $date = date('Y-m-d H:i:s');
 
     $logDB->insert('api_log', [

hwe/func_converter.php

@@ -686,7 +686,7 @@ function TechLimit($startYear, $year, $tech) : bool {
     $relYear = $year - $startYear;
 
     $relMaxTech = Util::valueFit(
-        floor($relYear / 5) + 1,
+        floor($relYear / GameConst::$techLevelIncYear) + GameConst::$initialAllowedTechLevel,
         1,
         GameConst::$maxTechLevel
     );

hwe/func_gamerule.php

@@ -559,7 +559,7 @@ function checkStatistic()
 
     $nationHist = '';
     foreach (GameConst::$availableNationType as $nationType) {
-        if (!Util::array_get($nationHists[$nationType])) {
+        if (!($nationHists[$nationType] ?? null)) {
             $nationHists[$nationType] = '-';
         }
         $nationHist .= getNationType($nationType) . "({$nationHists[$nationType]}), ";

hwe/func_legacy.php

@@ -138,7 +138,7 @@ function JSCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): array{
     $distanceList = searchDistance($cityNo, $maxDistance, true);
     $result = [];
     for ($dist = 1; $dist <= $maxDistance; $dist++) {
-        $result[$dist] = Util::array_get($distanceList[$dist], []);
+        $result[$dist] = $distanceList[$dist] ?? [];
     }
     return $result;
 }
@@ -152,7 +152,7 @@ function printCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): string
     for ($dist = 1; $dist <= $maxDistance; $dist++) {
         $cityList = array_map(function ($cityID) {
             return CityConst::byID($cityID)->name;
-        }, Util::array_get($distanceList[$dist], []));
+        }, $distanceList[$dist] ?? []);
 
         $cityStr = join(', ', $cityList);
 

hwe/func_tournament.php

@@ -1153,21 +1153,25 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type)
         ];
 
         //막판 분노
+        $factor1 = 1.0;
+        $factor2 = 1.0;
         $ratio = rand() % 300;
         if ($e1 / 5 > $energy1 && $damage1 > $damage2 && $gen1[$tp] >= $ratio) {
-            $damage2 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor2 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
             $critical1 = 1;
             $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
             $log[] = "<S>●</> <Y>{$gen1['name']}</>의 분노의 <M>{$str}</> 공격!";
         }
         $ratio = rand() % 300;
         if ($e2 / 5 > $energy2 && $damage2 > $damage1 && $gen2[$tp] >= $ratio) {
-            $damage1 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor1 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
             $critical2 = 1;
-
             $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
             $log[] = "<S>●</> <Y>{$gen2['name']}</>의 분노의 <M>{$str}</> 공격!";
         }
+        $damage1 *= $factor1;
+        $damage2 *= $factor2;
+        
         //1합 승부
         if ($phase == 1) {
 

hwe/install_db.php

@@ -7,10 +7,10 @@ include "func.php";
 
 $session = Session::requireLogin();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die('관리자 아님');
 }
-if ($session->userGrade == 5) {
+if ($session->userGrade == 6) {
     die('DB 리셋 권한을 가지고 있지 않습니다.');
 }
 

hwe/j_get_city_list.php

@@ -18,7 +18,7 @@ else{
     $availableNextCall = $session->availableNextCallGetCityList??'2000-01-01 00:00:00';
     $now = new \DateTimeImmutable();
 
-    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5){
+    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 6){
         Json::die([
             'result'=>false,
             'reason'=>"도시 목록은 10초에 한번 갱신 가능합니다.\n다음 시간 : ".$availableNextCall

hwe/j_myBossInfo.php

@@ -144,7 +144,7 @@ function do도시임명(General $general, int $cityID, int $targetOfficerLevel):
         return '올바르지 않은 도시입니다';
     }
 
-    if ($general->getVar(GeneralColumn::officer_level) >= 4 && $myPenalty[PenaltyKey::NoChiefChange->value] ?? false) {
+    if ($general->getVar(GeneralColumn::officer_level) >= 4 && ($myPenalty[PenaltyKey::NoChiefChange->value] ?? false)) {
         return '수뇌인 장수를 변경할 수 없는 상태입니다.';
     }
 

hwe/j_raise_event.php

@@ -8,7 +8,7 @@ include('func.php');
 
 $session = Session::requireLogin([])->setReadOnly();
 
-if(Session::getInstance()->userGrade < 5){
+if(Session::getInstance()->userGrade < 6){
     Json::die([
         'reason'=>'권한이 부족합니다.'
     ]);

hwe/j_select_npc.php

@@ -41,7 +41,7 @@ $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefi
 
 $penalty = [];
 foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-    if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+    if(($penaltyValue['expire'] ?? 0) > TimeUtil::now()){
         $penalty[$penaltyKey] = $penaltyValue['value'];
     }
 }

hwe/j_set_my_setting.php

@@ -88,7 +88,7 @@ $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefi
 
 $penalty = [];
 foreach ($penaltyInfo as $penaltyKey => $penaltyValue) {
-    if ($penaltyValue['expire'] ?? 0 > TimeUtil::now()) {
+    if (($penaltyValue['expire'] ?? 0) > TimeUtil::now()) {
         $penalty[$penaltyKey] = $penaltyValue['value'];
     }
 }

hwe/lib.php

@@ -51,8 +51,9 @@ function MessageBox($str)
 
 function LogText($prefix, $variable)
 {
-    $text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
-    file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
+    return;
+    //$text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
+    //file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
 }
 
 function prepareDir(string $dirPath, bool $forceCreate=true):bool{

hwe/old_index.php

@@ -1,430 +0,0 @@
-<?php
-
-namespace sammo;
-
-use sammo\DTO\VoteInfo;
-use sammo\Enums\GeneralQueryMode;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireLogin()->loginGame()->setReadOnly();
-$userID = Session::getUserID();
-
-increaseRefresh("메인", 1);
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-if (!$userID) {
-    header('Location:..');
-    die();
-}
-
-//턴 실행.
-TurnExecutionHelper::executeAllCommand();
-
-if (!$session->isGameLoggedIn()) {
-    header('Location:..');
-    die();
-}
-
-$me = $db->queryFirstRow(
-    'SELECT no,refresh_score,turntime,newmsg,newvote,`officer_level` FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i',
-    $userID
-);
-
-//그새 사망이면
-if ($me === null) {
-    $session->logoutGame();
-    header('Location: ../');
-    die();
-}
-
-$gameStor->cacheAll(true);
-
-if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
-    $db->update('general', [
-        'newmsg' => 0,
-        'newvote' => 0
-    ], 'owner=%i', $userID);
-}
-
-$plock = boolval($db->queryFirstField('SELECT plock FROM plock WHERE `type`="GAME" LIMIT 1'));
-
-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$generalObj = General::createObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog);
-$generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID()));
-$scenario = $gameStor->scenario_text;
-
-$nationID = $generalObj->getNationID();
-if ($nationID) {
-    $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-    $nationStor->cacheAll();
-}
-
-if ($gameStor->extended_general == 0) {
-    $extend = "표준";
-} else {
-    $extend = "확장";
-}
-if ($gameStor->fiction == 0) {
-    $fiction = "사실";
-} else {
-    $fiction = "가상";
-}
-if ($gameStor->npcmode == 0) {
-    $npcmode = "불가능";
-} else if ($gameStor->npcmode == 1) {
-    $npcmode = "가능";
-} else {
-    $npcmode = "선택 생성";
-}
-$color = "cyan";
-$serverName = UniqueConst::$serverName;
-$serverCnt = $gameStor->server_cnt;
-
-$auctionCount = $db->queryFirstField('SELECT count(*) FROM ng_auction WHERE finished = 0');
-$isTournamentActive = $gameStor->tournament > 0;
-$isTournamentApplicationOpen = $gameStor->tournament == 1;
-$isBettingActive = $gameStor->tournament == 6;
-
-$myNationStatic = getNationStaticInfo($generalObj->getNationID());
-$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
-
-$autorunUser = ($gameStor->autorun_user) ?? [];
-$otherTextInfo = [];
-
-if ($gameStor->join_mode == 'onlyRandom') {
-    $otherTextInfo[] = '랜덤 임관 전용';
-}
-if ($autorunUser['limit_minutes'] ?? false) {
-    $otherTextInfo[] = getAutorunInfo($autorunUser);
-}
-
-if (!$otherTextInfo) {
-    $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>
-
-<head>
-    <title><?= $serverName ?>: 메인</title>
-    <meta charset="UTF-8">
-    <meta name="color-scheme" content="dark">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=500" />
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printDist('vue', 'v_main', true) ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/map.css') ?>
-    <?= WebUtil::printStaticValues([
-        //deprecated, staticValues를 이용할 것
-        'serverName' => $serverName,
-        'serverCnt' => $serverCnt,
-        'serverNick' => DB::prefix(),
-        'serverID' => UniqueConst::$serverID,
-        'maxTurn' => GameConst::$maxTurn,
-        'maxPushTurn' => 12,
-        'serverNow' => TimeUtil::now(false),
-        'lastExecuted' => $gameStor->turntime,
-        'isLocked' => $plock,
-        'isTournamentActive' => $isTournamentActive,
-        'isBettingActive' => $isBettingActive,
-        'staticValues' => [
-            'serverName' => $serverName,
-            'serverCnt' => $serverCnt,
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-            'maxTurn' => GameConst::$maxTurn,
-            'maxPushTurn' => 12,
-            'serverNow' => TimeUtil::now(false),
-            'lastExecuted' => $gameStor->turntime,
-            'isLocked' => $plock,
-            'isTournamentActive' => $isTournamentActive,
-            'isBettingActive' => $isBettingActive,
-            'mapName' => GameConst::$mapName,
-            'unitSet' => GameConst::$unitSet,
-        ]
-    ]) ?>
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
-</head>
-
-<body class="img_back sam-color-<?= $nationColorType ?>">
-    <div id="container" class="bg0">
-        <div class="row toolbars gx-0">
-            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></button></div>
-        </div>
-        <div class="tb_layout row gx-0">
-            <div id="server_title" class="row py-2 center">
-                <h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 <span class="avoid-wrap">(<font color=cyan><?= $scenario ?></font>)</span></h3>
-            </div>
-
-            <div class="row center gx-0">
-                <div class="s-border-t col py-2 col-8 col-lg-4" style="color:<?= $color ?>;">
-                    <?= $scenario ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    NPC 수, 상성 : <?= $extend ?>,<?= $fiction ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    NPC선택 : <?= $npcmode ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    토너먼트 : <?= getTournamentTermText($gameStor->turnterm) ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    기타 설정: <?= $otherTextInfo ?>
-                </div>
-
-                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(2) ?></div>
-                <div class="s-border-t col py-2 col-4 col-lg-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
-                <div class="s-border-t col py-2 col-4 col-lg-2">턴당 갱신횟수 : <?= $gameStor->refreshLimit ?>회</div>
-                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(3) ?></div>
-                <div class="s-border-t py-2 col col-6 col-lg-4">
-                    <?php if ($isTournamentActive) : ?>
-                        ↑<span style='color:cyan'><?= (['전력전', '통솔전', '일기토', '설전',])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
-                    <?php else : ?>
-                        <span style='color:magenta'>현재 토너먼트 경기 없음</span>
-                    <?php endif; ?>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-lg-2">
-                    <div style="display:inline-block;"><?= $plock ? ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-lg-2">
-                    <?php if ($auctionCount > 0) : ?>
-                        <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
-                    <?php else : ?>
-                        <span style='color:magenta'>진행중 거래 없음</span>
-                    <?php endif; ?>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-lg-4 vote-cell">
-                    <?php
-                    ?>
-                    <?php if ($lastVote === null) : ?>
-                        <span style='color:magenta'>진행중 설문 없음</span>
-                    <?php else : ?>
-                        <span style='color:cyan'>설문 진행중</span> : <span><?= $lastVote->title ?></span>
-                    <?php endif; ?>
-                </div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">접속중인 국가: <?= $gameStor->online_nation ?></div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">운영자 메세지 : <span style='color:yellow;'><?= $gameStor->msg ?></span></div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t py-2" id="nation-msg-position">
-                    <div class="px-2">【 국가방침 】</div>
-                    <div id='nation-msg-box'>
-                        <div id='nation-msg'><?= nationMsg($generalObj) ?></div>
-                    </div>
-                </div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">
-                    【 접속자 】<?= onlinegen($generalObj) ?>
-                </div>
-            </div>
-            <?php if ($session->userGrade >= 5) : ?>
-                <div class="row">
-                    <div class="col">
-                        <a href='_admin1.php' target='_blank'><button type='button'>게임관리</button></a>
-                        <a href='_admin2.php' target='_blank'><button type='button'>회원관리</button></a>
-                        <a href='_admin4.php' target='_blank'><button type='button'>멀티관리</button></a>
-                        <a href='_admin5.php' target='_blank'><button type='button'>일제정보</button></a>
-                        <a href='_admin7.php' target='_blank'><button type='button'>로그정보</button></a>
-                        <a href='_admin8.php' target='_blank'><button type='button'>외교정보</button></a>
-                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-                    </div>
-                </div>
-            <?php elseif ($session->userGrade == 4) : ?>
-                <div class="row">
-                    <div class="col">
-                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-                    </div>
-                </div>
-            <?php endif; ?>
-            <div id="map_view" class="gx-0">
-                <div id="mapZone" class="view-item"><?= getMapHtml() ?></div>
-                <div class="view-item" id="reservedCommandZone">
-                    <div id="reservedCommandList"></div>
-                    <div id="actionMiniPlate" class="gx-0 row">
-                        <div class="col">
-                            <div class="gx-1 row">
-                                <div class="col-8 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
-                                <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
-                <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">
-                        ?></div>
-                </div>
-            </div>
-        </div>
-        <div id="actionMiniPlateSub" class="gx-0 row">
-            <div class="col">
-                <div class="gx-1 row">
-                    <div class="col-3 d-grid"><button type='button' class="btn btn-dark" onclick="scrollHardTo('reservedCommandList')">명령으로</button></div>
-                    <div class="col-5 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
-                    <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
-                </div>
-            </div>
-        </div>
-        <div class="row gx-0">
-            <div class="col-lg-6" id="general_public_record-position">
-                <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
-                <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
-            </div>
-            <div class="col-lg-6" id="general_log-position">
-                <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
-                <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
-            </div>
-            <div class="col-12" id="world_history-position">
-                <div class="bg1 center s-border-tb"><b>중원 정세</b></div>
-                <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
-            </div>
-        </div>
-        <div class="row toolbars gx-0">
-            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div>
-
-            <div id="message_board" class="row gx-0">
-                <div class="message_input_form bg0 gx-0 row">
-                    <div id="mailbox_list-col" class="col-6 col-lg-2 d-grid">
-                        <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
-                        </select>
-                    </div>
-                    <div id="msg_input-col" class="col-12 col-lg-8 d-grid">
-                        <input type="text" id="msg_input" maxlength="99" class="form-control">
-                    </div>
-                    <div id="msg_submit-col" class="col-6 col-lg-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="public_talk_position"></a>
-                    <div class="board_header bg0">전체 메시지(최고99자)</div>
-                    <section class="public_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="national_talk_position"></a>
-                    <div class="board_header bg0">국가 메시지(최고99자)</div>
-                    <section class="national_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="private_talk_position"></a>
-                    <div class="board_header bg0">개인 메시지(최고99자)</div>
-                    <section class="private_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="diplomacy_talk_position"></a>
-                    <div class="board_header bg0">외교 메시지(최고99자)</div>
-                    <section class="diplomacy_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-            </div>
-            <div class="row toolbars gx-0">
-                <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div><?= banner() ?>
-            </div>
-        </div>
-        <?php
-        if ($limitState == 1) {
-            MessageBox("접속제한이 얼마 남지 않았습니다!");
-        }
-        if ($me['newmsg'] == 1) {
-            MessageBox("새로운 서신이 도착했습니다!");
-        }
-        if ($me['newvote'] == 1) {
-            $develcost = $gameStor->develcost * 5;
-            MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)");
-        }
-        ?>
-    </div>
-    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-lg-none p-0" id="navbar500">
-        <div class="container-fluid px-0">
-            <div class="collapse navbar-collapse">
-                <ul class="navbar-nav me-auto mx-auto">
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle text-white btn btn-sammo-base2" id="navbarGlobal" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            외부 메뉴
-                        </div>
-                        <ul class="dropdown-menu dropdown-menu-start" aria-labelledby="navbarGlobal" id="navbarGlobalItems">
-                            <?= allButton($gameStor->npcmode == 1, ['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item']) ?>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle btn btn-sammo-nation" id="navbarNation" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            국가 메뉴
-                        </div>
-                        <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                        </ul>
-                    </li>
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle text-white btn btn-dark" id="navbarQuick" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            빠른 이동
-                        </div>
-                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown" id="navbarQuickItems">
-                            <li><a class="dropdown-item disabled">국가 정보</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('nation-msg-position')" class="dropdown-item">방침</button></li>
-                            <li><button type="button" onclick="scrollHardTo('reservedCommandList')" class="dropdown-item">명령</button></li>
-                            <li><button type="button" onclick="scrollHardTo('nation-position')" class="dropdown-item">국가</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general-position')" class="dropdown-item">장수</button></li>
-                            <li><button type="button" onclick="scrollHardTo('cityInfo')" class="dropdown-item">도시</button></li>
-                            <li><a class="dropdown-item disabled">동향 정보</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('mapZone')" class="dropdown-item">지도</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general_public_record-position')" class="dropdown-item">동향</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general_log-position')" class="dropdown-item">개인</button></li>
-                            <li><button type="button" onclick="scrollHardTo('world_history-position')" class="dropdown-item">정세</button></li>
-                            <li><span>&nbsp;</span></li>
-                            <li><a class="dropdown-item disabled">메시지</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('public_talk_position')" class="dropdown-item">전체</button></li>
-                            <li><button type="button" onclick="scrollHardTo('national_talk_position')" class="dropdown-item">국가</button></li>
-                            <li><button type="button" onclick="scrollHardTo('private_talk_position')" class="dropdown-item">개인</button></li>
-                            <li><button type="button" onclick="scrollHardTo('diplomacy_talk_position')" class="dropdown-item">외교</button></li>
-                            <li><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></li>
-                        </ul>
-                    </li>
-                    <li class="nav-item">
-                        <a class="refreshPage btn btn-sammo-base2 text-white" role="button">갱신</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-</body>
-
-</html>

hwe/proc.php

@@ -8,4 +8,12 @@ $session = Session::getInstance()->setReadOnly();
 
 $db = DB::db();
 
-TurnExecutionHelper::executeAllCommand();
+$updated = false;
+$locked = false;
+$lastExecuted = TurnExecutionHelper::executeAllCommand($updated, $locked);
+Json::die([
+    'result' => true,
+    'updated' => $updated,
+    'locked' => $locked,
+    'lastExecuted' => $lastExecuted,
+]);

hwe/process_war.php

@@ -526,7 +526,7 @@ function DeleteConflict($nation)
 function getConquerNation($city): int
 {
     $conflict = Json::decode($city['conflict']);
-    return Util::array_first_key($conflict);
+    return array_key_first($conflict);
 }
 
 function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
@@ -785,8 +785,8 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
         'officer_set' => 0,
     ];
     if ($city['level'] > 3) {
-        $query['def'] = 1000;
-        $query['wall'] = 1000;
+        $query['def'] = GameConst::$defaultCityWall;
+        $query['wall'] = GameConst::$defaultCityWall;
     } else {
         $query['def'] = $db->sqleval('def_max/2');
         $query['wall'] = $db->sqleval('wall_max/2');

hwe/sammo/API/General/Join.php

@@ -99,7 +99,7 @@ class Join extends \sammo\BaseAPI
         }
 
         $gameID = UniqueConst::$serverID;
-        $alreadyJoined = $db->queryFirstField('SELECT count(*) FROM `storage` WHERE `namespace` = %s AND `key` LIKE %s', 'inheritance_result', "{$gameID}_{$userID}_%");
+        $alreadyJoined = $db->queryFirstField('SELECT COUNT(*) FROM `inheritance_result` WHERE `server_id` = %s AND `owner` = %i', $gameID, $userID);
         if ($alreadyJoined) {
             //이미 받았음
             return 0;
@@ -157,7 +157,7 @@ class Join extends \sammo\BaseAPI
 
         $penalty = [];
         foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-            if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+            if(($penaltyValue['expire'] ?? 0) > TimeUtil::now()){
                 $penalty[$penaltyKey] = $penaltyValue['value'];
             }
         }

hwe/sammo/API/Global/GeneralList.php

@@ -54,7 +54,7 @@ class GeneralList extends \sammo\BaseAPI
             $availableNextCall = $session->availableNextCallGetGeneralList ?? '2000-01-01 00:00:00';
             $now = new \DateTimeImmutable();
 
-            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5) {
+            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 6) {
                 return "장수 리스트는 10초에 한번 갱신 가능합니다.\n다음 시간 : " . $availableNextCall;
             }
 

hwe/sammo/API/InheritAction/ResetStat.php

@@ -94,6 +94,10 @@ class ResetStat extends \sammo\BaseAPI
         }
         $userLogger = new UserLogger($userID);
 
+        if($general->getNPCType() != 0){
+            return 'NPC는 능력치 초기화를 할 수 없습니다.';
+        }
+
 
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');

hwe/sammo/API/Misc/UploadImage.php

@@ -50,7 +50,7 @@ class UploadImage extends \sammo\BaseAPI
         }
 
         $extension = ltrim($contentType, 'image/');
-        $validExtensions = ['png', 'jpeg', 'jpg', 'gif', 'webp'];
+        $validExtensions = ['png', 'jpeg', 'jpg', 'gif', 'webp', 'avif'];
         if (!in_array(strtolower($extension), $validExtensions)) {
             return '지원하지 않는 이미지 파일입니다: ' . $contentType;
         }

hwe/sammo/ActionItem/che_척사_오악진형도.php

@@ -15,7 +15,7 @@ class che_척사_오악진형도 extends \sammo\BaseItem{
 
     public function getWarPowerMultiplier(WarUnit $unit):array{
         $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
+        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
             return [1.15, 0.85];
         }
         return [1, 1];

hwe/sammo/ActionItem/event_전투특기_공성.php

@@ -33,7 +33,7 @@ class event_전투특기_공성 extends \sammo\BaseItem{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_SIEGE;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionItem/event_전투특기_궁병.php

@@ -28,7 +28,7 @@ class event_전투특기_궁병 extends \sammo\BaseItem{
         if($statName === 'warAvoidRatio'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_ARCHER;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionItem/event_전투특기_귀병.php

@@ -28,7 +28,7 @@ class event_전투특기_귀병 extends \sammo\BaseItem{
         if($statName === 'warMagicSuccessProb'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_WIZARD;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionItem/event_전투특기_기병.php

@@ -32,7 +32,7 @@ class event_전투특기_기병 extends \sammo\BaseItem{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_CAVALRY;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionItem/event_전투특기_보병.php

@@ -33,7 +33,7 @@ class event_전투특기_보병 extends \sammo\BaseItem{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_FOOTMAN;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionItem/event_전투특기_척사.php

@@ -17,7 +17,7 @@ class event_전투특기_척사 extends \sammo\BaseItem{
 
     public function getWarPowerMultiplier(WarUnit $unit):array{
         $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
+        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
             return [1.2, 0.8];
         }
         return [1, 1];

hwe/sammo/ActionScenarioEffect/event_MoreEffect.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace sammo\ActionScenarioEffect;
+
+use \sammo\iAction;
+use sammo\Util;
+use sammo\WarUnit;
+use sammo\WarUnitCity;
+use sammo\WarUnitTrigger\che_전멸시페이즈증가;
+use sammo\WarUnitTriggerCaller;
+
+class event_MoreEffect implements iAction
+{
+    use \sammo\DefaultAction;
+
+    public function getWarPowerMultiplier(WarUnit $unit): array
+    {
+        if ($unit->isAttacker()) {
+            return [1.4, 0.7143];
+        }
+        return [1, 1];
+    }
+
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
+    {
+        $scoreMap = [
+            '상업' => 2,
+            '농업' => 2,
+            '치안' => 2,
+            '기술' => 2,
+            '성벽' => 2,
+            '수비' => 2,
+            '인구' => 2,
+            '민심' => 2,
+        ];
+        if ($turnType == 'changeDefenceTrain') {
+            return 0;
+        }
+        if ($varType === 'score' && key_exists($turnType, $scoreMap)) {
+            $multiplier = $scoreMap[$turnType];
+            $value *= $multiplier;
+            return $value;
+        }
+
+        return $value;
+    }
+
+    public function onCalcNationalIncome(string $type, $amount){
+        if($type == 'gold'){
+            return $amount * 2;
+        }
+        if($type == 'rice'){
+            return $amount * 2;
+        }
+        if($type == 'pop' && $amount > 0){
+            return $amount * 2;
+        }
+        
+        return $amount;
+    }
+
+    public function getBattlePhaseSkillTriggerList(\sammo\WarUnit $unit): ?WarUnitTriggerCaller
+    {
+        return new WarUnitTriggerCaller(
+            new che_전멸시페이즈증가($unit),
+        );
+    }
+}

hwe/sammo/ActionSpecialDomestic/che_event_공성.php

@@ -35,7 +35,7 @@ class che_event_공성 extends \sammo\BaseSpecial{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_SIEGE;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialDomestic/che_event_궁병.php

@@ -31,7 +31,7 @@ class che_event_궁병 extends \sammo\BaseSpecial{
         if($statName === 'warAvoidRatio'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_ARCHER;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialDomestic/che_event_귀병.php

@@ -30,7 +30,7 @@ class che_event_귀병 extends \sammo\BaseSpecial{
         if($statName === 'warMagicSuccessProb'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_WIZARD;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialDomestic/che_event_기병.php

@@ -35,7 +35,7 @@ class che_event_기병 extends \sammo\BaseSpecial{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_CAVALRY;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialDomestic/che_event_보병.php

@@ -35,7 +35,7 @@ class che_event_보병 extends \sammo\BaseSpecial{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_FOOTMAN;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialDomestic/che_event_척사.php

@@ -21,7 +21,7 @@ class che_event_척사 extends \sammo\BaseSpecial{
 
     public function getWarPowerMultiplier(WarUnit $unit):array{
         $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
+        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
             return [1.2, 0.8];
         }
         return [1, 1];

hwe/sammo/ActionSpecialWar/che_공성.php

@@ -35,7 +35,7 @@ class che_공성 extends \sammo\BaseSpecial{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_SIEGE;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialWar/che_궁병.php

@@ -31,7 +31,7 @@ class che_궁병 extends \sammo\BaseSpecial{
         if($statName === 'warAvoidRatio'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_ARCHER;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialWar/che_귀병.php

@@ -30,7 +30,7 @@ class che_귀병 extends \sammo\BaseSpecial{
         if($statName === 'warMagicSuccessProb'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_WIZARD;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialWar/che_기병.php

@@ -35,7 +35,7 @@ class che_기병 extends \sammo\BaseSpecial{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_CAVALRY;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialWar/che_보병.php

@@ -35,7 +35,7 @@ class che_보병 extends \sammo\BaseSpecial{
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_FOOTMAN;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialWar/che_척사.php

@@ -21,7 +21,7 @@ class che_척사 extends \sammo\BaseSpecial{
 
     public function getWarPowerMultiplier(WarUnit $unit):array{
         $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
+        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
             return [1.2, 0.8];
         }
         return [1, 1];

hwe/sammo/Command/BaseCommand.php

@@ -5,6 +5,7 @@ use \sammo\{
     Util, JosaUtil, DB,
     General, GameConst,
     ActionLogger,
+    Json,
     LastTurn,
     NotInheritedMethodException,
     RandUtil
@@ -118,6 +119,7 @@ abstract class BaseCommand{
         $nationID = $this->generalObj->getNationID();
         if($nationID == 0){
             $this->nation = $this->generalObj->getStaticNation();
+            $this->nation['aux'] = [];
             return;
         }
 
@@ -138,7 +140,8 @@ abstract class BaseCommand{
             'gold'=>0,
             'rice'=>2000,
             'tech'=>0,
-            'gennum'=>1
+            'gennum'=>1,
+            'aux'=>'{}',
         ];
 
         if($this->nation && $this->nation['nation'] === $nationID){
@@ -170,6 +173,10 @@ abstract class BaseCommand{
         else{
             $this->nation = $nation;
         }
+
+        if(is_string($this->nation['aux'] ?? null)){
+            $this->nation['aux'] = Json::decode($this->nation['aux']);
+        }
     }
 
     protected function setDestGeneral(General $destGeneralObj){
@@ -312,12 +319,12 @@ abstract class BaseCommand{
 
         $this->generalObj->unpackAux();
         $constraintInput = [
-            'general'=>$this->generalObj->getRaw(),
+            'general'=>$this->generalObj,
             'city'=>$this->city,
             'nation'=>$this->nation,
             'cmd_arg'=>$this->arg,
 
-            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
+            'destGeneral'=>$this->destGeneralObj??null,
             'destCity'=>$this->destCity,
             'destNation'=>$this->destNation,
         ];
@@ -346,12 +353,12 @@ abstract class BaseCommand{
 
         $this->generalObj->unpackAux();
         $constraintInput = [
-            'general'=>$this->generalObj->getRaw(),
+            'general'=>$this->generalObj,
             'city'=>$this->city,
             'nation'=>$this->nation,
             'cmd_arg'=>$this->arg,
 
-            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
+            'destGeneral'=>$this->destGeneralObj??null,
             'destCity'=>$this->destCity,
             'destNation'=>$this->destNation,
         ];
@@ -384,12 +391,12 @@ abstract class BaseCommand{
 
         $this->generalObj->unpackAux();
         $constraintInput = [
-            'general'=>$this->generalObj->getRaw(),
+            'general'=>$this->generalObj,
             'city'=>$this->city,
             'nation'=>$this->nation,
             'cmd_arg'=>$this->arg,
 
-            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
+            'destGeneral'=>$this->destGeneralObj??null,
             'destCity'=>$this->destCity,
             'destNation'=>$this->destNation,
         ];

hwe/sammo/Command/General/che_거병.php

@@ -16,6 +16,7 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;
 
 use function sammo\refreshNationStaticInfo;
 use function sammo\getAllNationStaticInfo;
@@ -45,6 +46,7 @@ class che_거병 extends Command\GeneralCommand{
             ConstraintHelper::BeNeutral(),
             ConstraintHelper::BeOpeningPart($relYear+1),
             ConstraintHelper::AllowJoinAction(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoFoundNation),
         ];
     }
 

hwe/sammo/Command/General/che_건국.php

@@ -183,7 +183,7 @@ class che_건국 extends Command\GeneralCommand
         $general->addExperience($exp);
         $general->addDedication($ded);
 
-        $aux = Json::decode($this->nation['aux']) ?? [];
+        $aux = $this->nation['aux'];
         $aux['can_국기변경'] = 1;
 
         $db->update('city', [

hwe/sammo/Command/General/che_랜덤임관.php

@@ -181,7 +181,7 @@ class che_랜덤임관 extends Command\GeneralCommand
             if ($notIn) {
 
                 $rawGeneralsCnt = $db->query(
-                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
+                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 50000)/(rb.value + 50000)*(CASE WHEN g.`npc` < 2 THEN 1.15 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
                 FROM general AS g
                 LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person'
                 LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person'
@@ -193,7 +193,7 @@ class che_랜덤임관 extends Command\GeneralCommand
                 );
             } else {
                 $rawGeneralsCnt = $db->query(
-                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 100)/(rb.value + 100)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
+                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 50000)/(rb.value + 50000)*(CASE WHEN g.`npc` < 2 THEN 1.15 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
                 FROM general AS g
                 LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person'
                 LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person'
@@ -208,7 +208,7 @@ class che_랜덤임관 extends Command\GeneralCommand
             foreach ($rawGeneralsCnt as $nation) {
                 $calcCnt = $nation['warpower'] + $nation['develpower'];
 
-                if ($general->getNPCType() < 2 && Util::starts_with($nation['name'], 'ⓤ')) {
+                if ($general->getNPCType() < 2 && str_starts_with($nation['name'], 'ⓤ')) {
                     $calcCnt *= 100;
                 }
 

hwe/sammo/Command/General/che_무작위건국.php

@@ -194,7 +194,7 @@ class che_무작위건국 extends Command\GeneralCommand
         $general->addExperience($exp);
         $general->addDedication($ded);
 
-        $aux = Json::decode($this->nation['aux']) ?? [];
+        $aux = $this->nation['aux'];
         $aux['can_국기변경'] = 1;
         $aux['can_무작위수도이전'] = 1;
 

hwe/sammo/Command/General/che_선양.php

@@ -21,6 +21,8 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;
+use sammo\Json;
 use sammo\StaticEventHandler;
 
 class che_선양 extends Command\GeneralCommand
@@ -111,6 +113,14 @@ class che_선양 extends Command\GeneralCommand
         $date = $general->getTurnTime($general::TURNTIME_HM);
 
         $destGeneral = $this->destGeneralObj;
+        $destGeneralPenaltyList = JSON::decode($destGeneral->getVar('penalty'));
+        $penaltyKeyList = [PenaltyKey::NoChief, PenaltyKey::NoFoundNation, PenaltyKey::NoAmbassador];
+        foreach ($penaltyKeyList as $penaltyKey) {
+            if (key_exists($penaltyKey->value, $destGeneralPenaltyList)) {
+                $general->getLogger()->pushGeneralActionLog("선양할 수 없는 장수입니다.");
+                return false;
+            }
+        }
 
         $generalName = $general->getName();
         $destGeneralName = $destGeneral->getName();

hwe/sammo/Command/General/che_징병.php

@@ -79,7 +79,7 @@ class che_징병 extends Command\GeneralCommand
     protected function init()
     {
         $this->setCity();
-        $this->setNation(['tech']);
+        $this->setNation(['tech', 'aux']);
 
         $this->minConditionConstraints = [
             ConstraintHelper::NotBeNeutral(),
@@ -256,8 +256,11 @@ class che_징병 extends Command\GeneralCommand
         $ownCities = [];
         $ownRegions = [];
 
-        foreach (DB::db()->query('SELECT city, region from city where nation = %i', $general->getNationID()) as $city) {
-            $ownCities[$city['city']] = 1;
+        foreach (DB::db()->query('SELECT city, region, secu, level from city where nation = %i', $general->getNationID()) as $city) {
+            $ownCities[$city['city']] = [
+                'secu' => $city['secu'],
+                'level' => $city['level'],
+            ];
             $ownRegions[$city['region']] = 1;
         }
 
@@ -273,23 +276,19 @@ class che_징병 extends Command\GeneralCommand
                 'values' => [],
             ];
 
-            $crewTypes = [];
             foreach (GameUnitConst::byType($armType) as $unit) {
                 $crewObj = new \stdClass;
 
                 $crewObj->id = $unit->id;
-                $crewObj->reqTech = $unit->reqTech;
-                $crewObj->reqYear = $unit->reqYear;
+                /** @var ?\sammo\GameUnitConstraints\ReqTech */
+                $reqTechObj = $unit->reqConstraints['ReqTech'] ?? null;
+                $crewObj->reqTech = $reqTechObj ? $reqTechObj->reqTech : 0;
 
-                /*
-                if ($unit->reqTech == 0) {
-                    $crewObj->bgcolor = 'green';
-                } else {
-                    $crewObj->bgcolor = 'limegreen';
-                }
-                */
+                /** @var ?\sammo\GameUnitConstraint\ReqMinRelYear */
+                $reqMinRelYearObj = $unit->reqConstraints['reqMinRelYear'] ?? null;
+                $crewObj->reqYear = $reqMinRelYearObj ? $reqMinRelYearObj->reqMinRelYear : 0;
 
-                $crewObj->notAvailable = !$unit->isValid($ownCities, $ownRegions, $relativeYear, $tech);
+                $crewObj->notAvailable = !$unit->isValid($general, $ownCities, $ownRegions, $relativeYear, $tech, $this->nation['aux']);
 
                 $crewObj->baseRice = $general->onCalcDomestic($this->getName(), 'rice', $unit->riceWithTech($tech), ['armType' => $unit->armType]);
                 $crewObj->baseCost = $general->onCalcDomestic($this->getName(), 'cost', $unit->costWithTech($tech), ['armType' => $unit->armType]);

hwe/sammo/Command/General/che_출병.php

@@ -164,7 +164,7 @@ class che_출병 extends Command\GeneralCommand
 
         $currDist = 999;
 
-        $minDist = Util::array_first_key($distanceList);
+        $minDist = array_key_first($distanceList);
         do {
             //1: 최단 거리 도시 중 공격 대상이 있는가 확인
             //2: 최단 거리 + 1 도시 중 공격 대상이 있는가 확인

hwe/sammo/Command/General/cr_건국.php

@@ -180,7 +180,7 @@ class cr_건국 extends Command\GeneralCommand
         $general->addExperience($exp);
         $general->addDedication($ded);
 
-        $aux = Json::decode($this->nation['aux']) ?? [];
+        $aux = $this->nation['aux'];
         $aux['can_국기변경'] = 1;
 
         $db->update('city', [

hwe/sammo/Command/Nation/che_국기변경.php

@@ -122,7 +122,7 @@ class che_국기변경 extends Command\NationCommand
         $josaYi = JosaUtil::pick($generalName, '이');
         $josaYiNation = JosaUtil::pick($nationName, '이');
 
-        $aux = Json::decode($this->nation['aux']);
+        $aux = $this->nation['aux'];
         $aux["can_{$actionName}"] = 0;
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_국호변경.php

@@ -140,7 +140,7 @@ class che_국호변경 extends Command\NationCommand
         $josaYi = JosaUtil::pick($generalName, '이');
         $josaYiNation = JosaUtil::pick($nationName, '이');
 
-        $aux = Json::decode($this->nation['aux']);
+        $aux = $this->nation['aux'];
         $aux["can_{$actionName}"] = 0;
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_무작위수도이전.php

@@ -119,7 +119,7 @@ class che_무작위수도이전 extends Command\NationCommand
         $josaYi = JosaUtil::pick($generalName, '이');
         $josaYiNation = JosaUtil::pick($nationName, '이');
 
-        $aux = Json::decode($this->nation['aux']);
+        $aux = $this->nation['aux'];
         $aux["can_무작위수도이전"] -= 1;
 
         $db->update('city', [

hwe/sammo/Command/Nation/che_초토화.php

@@ -13,12 +13,14 @@ use \sammo\{
     Message,
     CityConst,
     CityInitialDetail,
+    Json,
     StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
 use sammo\Event\Action;
 
 class che_초토화 extends Command\NationCommand{
@@ -52,7 +54,7 @@ class che_초토화 extends Command\NationCommand{
         $env = $this->env;
 
         $this->setCity();
-        $this->setNation(['surlimit', 'gold', 'rice', 'capital']);
+        $this->setNation(['surlimit', 'gold', 'rice', 'capital', 'aux']);
 
         $this->minConditionConstraints=[
             ConstraintHelper::OccupiedCity(),
@@ -157,6 +159,11 @@ class che_초토화 extends Command\NationCommand{
         $josaYiNation = JosaUtil::pick($nationName, '이');
 
         $amount = $this->calcReturnAmount($destCity);
+        $aux = $this->nation['aux'];
+
+        if($destCity['level'] >= 8){
+            $aux[NationAuxKey::did_특성초토화->value] = ($aux[NationAuxKey::did_특성초토화->value] ?? 0) + 1;
+        }
 
         $db->update('general', [
             'experience'=>$db->sqleval('experience * 0.9')
@@ -184,6 +191,7 @@ class che_초토화 extends Command\NationCommand{
             'gold' => $db->sqleval('gold + %i', $amount),
             'rice' => $db->sqleval('rice + %i', $amount),
             'surlimit' => $db->sqleval('surlimit + %i', $this->getPostReqTurn()),
+            'aux' => Json::encode($aux),
         ], 'nation=%i', $nationID);
 
         \sammo\refreshNationStaticInfo();

hwe/sammo/Command/Nation/event_극병연구.php

@@ -0,0 +1,108 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_극병연구 extends Command\NationCommand{
+    static protected $actionName = '극병 연구';
+    static protected $auxType = NationAuxKey::can_극병사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 23;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [100000, 100000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_대검병연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_대검병연구 extends Command\NationCommand{
+    static protected $actionName = '대검병 연구';
+    static protected $auxType = NationAuxKey::can_대검병사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 11;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [50000, 50000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_무희연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_무희연구 extends Command\NationCommand{
+    static protected $actionName = '무희 연구';
+    static protected $auxType = NationAuxKey::can_무희사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 23;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [100000, 100000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_산저병연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_산저병연구 extends Command\NationCommand{
+    static protected $actionName = '산저병 연구';
+    static protected $auxType = NationAuxKey::can_산저병사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 11;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [50000, 50000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_상병연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_상병연구 extends Command\NationCommand{
+    static protected $actionName = '상병 연구';
+    static protected $auxType = NationAuxKey::can_상병사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 23;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [100000, 100000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_원융노병연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_원융노병연구 extends Command\NationCommand{
+    static protected $actionName = '원융노병 연구';
+    static protected $auxType = NationAuxKey::can_원융노병사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 23;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [100000, 100000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_음귀병연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_음귀병연구 extends Command\NationCommand{
+    static protected $actionName = '음귀병 연구';
+    static protected $auxType = NationAuxKey::can_음귀병사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 11;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [50000, 50000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_화륜차연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_화륜차연구 extends Command\NationCommand{
+    static protected $actionName = '화륜차 연구';
+    static protected $auxType = NationAuxKey::can_화륜차사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+    
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 23;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [100000, 100000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Command/Nation/event_화시병연구.php

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\Command;
+use sammo\Constraint\ConstraintHelper;
+use sammo\DB;
+use sammo\Enums\InheritanceKey;
+use sammo\Enums\NationAuxKey;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\Json;
+use sammo\LastTurn;
+use sammo\StaticEventHandler;
+use sammo\GameConst;
+
+class event_화시병연구 extends Command\NationCommand{
+    static protected $actionName = '화시병 연구';
+    static protected $auxType = NationAuxKey::can_화시병사용;
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        $this->setCity();
+        $this->setNation(['gold','rice','aux']);
+        $this->fullConditionConstraints=[];
+
+        $name = static::$actionName;
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $this->minConditionConstraints = [
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
+        ];
+
+        $this->fullConditionConstraints = $this->minConditionConstraints;
+    }
+
+    public function getCommandDetailTitle():string{
+        $name = $this->getName();
+
+        [$reqGold, $reqRice] = $this->getCost();
+        $reqTurn = $this->getPreReqTurn()+1;
+
+        $reqGoldD5 = number_format($reqGold / 10000);
+        $reqRiceD5 = number_format($reqRice / 10000);
+
+        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
+    }
+
+    public function getPreReqTurn():int{
+        return 11;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [50000, 50000];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+        
+        $db = DB::db();
+        $general = $this->generalObj;
+        $nationID = $general->getNationID();
+
+        $actionName = static::$actionName;
+        
+        $aux = $this->nation['aux'];
+        $aux[static::$auxType->value] = 1;
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $logger = $general->getLogger();
+
+        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
+        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
+
+        $generalName = $general->getName();
+        $josaYi = JosaUtil::pick($generalName, '이');
+        
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold - %i', $reqGold),
+            'rice' => $db->sqleval('rice - %i', $reqRice),
+            'aux' => Json::encode($aux),
+        ], 'nation=%i', $nationID);
+
+        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
+        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
+
+        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        $general->applyDB($db);
+        
+        return true;
+    }
+}

hwe/sammo/Constraint/AllowJoinDestNation.php

@@ -50,7 +50,7 @@ class AllowJoinDestNation extends Constraint{
             return false;
         }
 
-        if(($this->general['npc']??2 < 2) && \str_starts_with($this->destNation['name'], 'ⓤ')){
+        if((($this->general['npc']??2) < 2) && \str_starts_with($this->destNation['name'], 'ⓤ')){
             $this->reason = "유저장은 태수국에 임관할 수 없습니다.";
             return false;
         }

hwe/sammo/Constraint/AvailableRecruitCrewType.php

@@ -6,9 +6,10 @@ use \sammo\GameUnitConst;
 use \sammo\DB;
 use \sammo\KVStorage;
 use \sammo\CityConst;
+use sammo\Json;
 
 class AvailableRecruitCrewType extends Constraint{
-    const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_INT_ARG;
+    const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NATION|Constraint::REQ_INT_ARG;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
@@ -47,13 +48,22 @@ class AvailableRecruitCrewType extends Constraint{
 
         $ownCities = [];
         $ownRegions = [];
-        foreach($db->queryFirstColumn('SELECT city FROM city WHERE nation = %i', $nationID) as $ownCity){
-            $ownCities[$ownCity] = 1;
-            $ownRegions[CityConst::byId($ownCity)->region] = 1;
+        foreach($db->query('SELECT city, region, secu, level FROM city WHERE nation = %i', $nationID) as $ownCity){
+            $ownCityID = $ownCity['city'];
+            $ownCities[$ownCityID] = [
+                'secu'=>$ownCity['secu'],
+                'level'=>$ownCity['level'],
+            ];
+            $ownRegions[CityConst::byId($ownCityID)->region] = 1;
+        }
+
+        $nationAux = $this->nation['aux'] ?? null;
+        if($nationAux === null){
+            $nationAux = Json::decode($db->queryFirstField('SELECT aux FROM nation WHERE id = %i', $nationID) ?? "{}");
         }
 
         $crewType = GameUnitConst::byID($this->arg);
-        if($crewType->isValid($ownCities, $ownRegions, $year - $startyear, $tech)){
+        if($crewType->isValid($this->generalObj, $ownCities, $ownRegions, $year - $startyear, $tech, $nationAux)){
             return true;
         }
 

hwe/sammo/Constraint/Constraint.php

@@ -2,6 +2,8 @@
 
 namespace sammo\Constraint;
 
+use sammo\General;
+
 abstract class Constraint
 {
     private function __construct()
@@ -24,6 +26,8 @@ abstract class Constraint
 
     const REQ_VALUES = 0;
 
+    /** @var ?General */
+    protected $generalObj = null;
     protected $general = null;
     protected $city = null;
     protected $nation = null;
@@ -33,6 +37,8 @@ abstract class Constraint
 
     protected $cmd_arg = null;
 
+    /** @var ?General */
+    protected $destGeneralObj = null;
     protected $destGeneral = null;
     protected $destCity = null;
     protected $destNation = null;
@@ -48,9 +54,10 @@ abstract class Constraint
         return static::REQ_VALUES;
     }
 
-    public function setGeneral(array $general)
+    public function setGeneral(General $general)
     {
-        $this->general = $general;
+        $this->generalObj = $general;
+        $this->general = $general->getRaw();
         $this->tested = false;
         $this->reason = null;
     }
@@ -85,9 +92,10 @@ abstract class Constraint
         $this->reason = null;
     }
 
-    public function setDestGeneral(array $general)
+    public function setDestGeneral(General $general)
     {
-        $this->destGeneral = $general;
+        $this->destGeneralObj = $general;
+        $this->destGeneral = $general->getRaw();
         $this->tested = false;
         $this->reason = null;
     }

hwe/sammo/Constraint/NoPenalty.php

@@ -33,12 +33,12 @@ class NoPenalty extends Constraint{
         /** @var PenaltyKey */
         $checkKey = $this->arg;
 
-        $peneltyList = JSON::decode($this->general['penalty']);
-        if(!key_exists($checkKey->value, $peneltyList)){
+        $penaltyList = JSON::decode($this->general['penalty']);
+        if(!key_exists($checkKey->value, $penaltyList)){
             return true;
         }
 
-        $this->reason = "징계 사유: {$peneltyList[$checkKey->value]}";
+        $this->reason = "징계 사유: {$penaltyList[$checkKey->value]}";
         return false;
     }
 }

hwe/sammo/Enums/NationAuxKey.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace sammo\Enums;
+
+// Nation['aux'] 에서 지정될 수 있는 키
+
+enum NationAuxKey: string
+{
+    case can_국기변경 = 'can_국기변경';
+    case can_국호변경 = 'can_국호변경';
+    case did_특성초토화 = 'did_특성초토화';
+
+
+    // 이벤트
+    case can_무작위수도이전 = 'can_무작위수도이전';
+
+    case can_대검병사용 = 'can_대검병사용';
+    case can_극병사용 = 'can_극병사용';
+    case can_화시병사용 = 'can_화시병사용';
+    case can_원융노병사용 = 'can_원융노병사용';
+    case can_산저병사용 = 'can_산저병사용';
+    case can_상병사용 = 'can_상병사용';
+    case can_음귀병사용 = 'can_음귀병사용';
+    case can_무희사용 = 'can_무희사용';
+    case can_화륜차사용 = 'can_화륜차사용';
+}

hwe/sammo/Event/Action/ChangeCity.php

@@ -14,6 +14,13 @@ class ChangeCity extends \sammo\Event\Action{
         'def'=>true,
         'wall'=>true,
         'trade'=>true,
+        
+        'pop_max'=>true,
+        'agri_max'=>true,
+        'comm_max'=>true,
+        'secu_max'=>true,
+        'def_max'=>true,
+        'wall_max'=>true,
     ];
     const REGEXP_PERCENT = '/^(\d+(\.\d+)?)%$/';// 123.5%   [1]=float
     const REGEXP_MATH = '/^([\+\-\/\*])(\d+(\.\d+)?)$/'; //+30 [1]=기호, [2]=float
@@ -120,6 +127,16 @@ class ChangeCity extends \sammo\Event\Action{
             return DB::db()->sqleval('ROUND(%b * %d, 0)', $keyMax, $value/100);
         }
 
+        if(str_ends_with($key, '_max') && preg_match(self::REGEXP_MATH, $value, $matches)){
+            //key가 아예 최대치에 대한 값이면 연산은 결과값이 0보다만 높게.
+            $op = $matches[1];
+            $value = $matches[2];
+            if($op == '/' && $value == 0){
+                throw new \InvalidArgumentException('0으로 나눌 수 없습니다.');
+            }
+            return DB::db()->sqleval('greatest(0, ROUND(%b '.$op.' %i, 0))', $key, $value);
+        }
+
         if(preg_match(self::REGEXP_MATH, $value, $matches)){
             $op = $matches[1];
             $value = $matches[2];

hwe/sammo/GameConstBase.php

@@ -94,6 +94,11 @@ class GameConstBase
     /** @var int 최대 레벨 */
     public static $maxLevel = 255;
 
+    /** @var int 기술등급 허용 증가 단위 년 */
+    public static $techLevelIncYear = 5;
+    /** @var int 초기 기술등급 */
+    public static $initialAllowedTechLevel = 1;
+
     /** @var int 최소 인구 증가량 */
     public static $basePopIncreaseAmount = 5000;
     /** @var int 증축시 인구 증가량 */
@@ -109,6 +114,9 @@ class GameConstBase
     /** @var int 징병 허용 최소 인구 */
     public static $minAvailableRecruitPop = 30000;
 
+    /** @var int 점령 후 일반 도시 성벽 */
+    public static $defaultCityWall = 1000;
+
     /** @var int 초기 제한시 장수 제한 */
     public static $initialNationGenLimit = 10;
 

hwe/sammo/GameUnitConstBase.php

@@ -1,6 +1,13 @@
 <?php
 namespace sammo;
 
+use sammo\GameUnitConstraint\Impossible;
+use sammo\GameUnitConstraint\ReqTech;
+use sammo\GameUnitConstraint\ReqCities;
+use sammo\GameUnitConstraint\ReqRegions;
+use sammo\GameUnitConstraint\ReqMinRelYear;
+
+
 class GameUnitConstBase{
     protected function __construct(){
 
@@ -21,8 +28,6 @@ class GameUnitConstBase{
 
     protected static $constID = [];
     protected static $constName = [];
-    protected static $constCity = [];
-    protected static $constRegion = [];
     protected static $constType = [];
 
     protected static $typeData = [
@@ -33,12 +38,13 @@ class GameUnitConstBase{
         self::T_SIEGE => '차병',
     ];
 
-    protected static $_buildData = [
+    protected static function getBuildData(): array {
+        return [
             [
                 1000, self::T_CASTLE, '성벽',
                 100, 100, 7, 0, 0,   99,  9,
-            999999, null,     null,     999999,
-            [],//성벽은 공격할 수 없다.
+                [new Impossible()],
+                [], // 성벽은 공격할 수 없다.
                 [self::T_FOOTMAN=>1.2],
                 ['성벽입니다.','생성할 수 없습니다.'],
                 null, ['che_선제사격시도', 'che_선제사격발동'], null
@@ -47,7 +53,7 @@ class GameUnitConstBase{
             [
                 1100, self::T_FOOTMAN, '보병',
                 100, 150, 7, 10, 0,   9,  9,
-            0, null,     null,     0,
+                [],
                 [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
                 [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
                 ['표준적인 보병입니다.','보병은 방어특화이며,','상대가 회피하기 어렵습니다.'],
@@ -56,7 +62,7 @@ class GameUnitConstBase{
             [
                 1101, self::T_FOOTMAN, '청주병',
                 100, 200, 7, 10, 0,  10, 11,
-            1000, null,     ['중원'], 0,
+                [new ReqTech(1000), new ReqRegions('중원')],
                 [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
                 [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
                 ['저렴하고 튼튼합니다.'],
@@ -65,7 +71,7 @@ class GameUnitConstBase{
             [
                 1102, self::T_FOOTMAN, '수병',
                 150, 150, 7, 10, 0,  11, 10,
-            1000, null,     ['오월'], 0,
+                [new ReqTech(1000), new ReqRegions('오월')],
                 [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
                 [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
                 ['저렴하고 강력합니다.'],
@@ -74,7 +80,7 @@ class GameUnitConstBase{
             [
                 1103, self::T_FOOTMAN, '자객병',
                 100, 150, 8, 20, 0,  10, 10,
-            2000, ['저'],   null,     0,
+                [new ReqTech(2000), new ReqCities('저')],
                 [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
                 [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
                 ['은밀하고 날쌥니다.'],
@@ -83,7 +89,7 @@ class GameUnitConstBase{
             [
                 1104, self::T_FOOTMAN, '근위병',
                 150, 200, 7, 10, 0,  12, 12,
-            3000, ['낙양'], null,     0,
+                [new ReqTech(3000), new ReqCities('낙양')],
                 [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
                 [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
                 ['최강의 보병입니다.'],
@@ -92,7 +98,7 @@ class GameUnitConstBase{
             [
                 1105, self::T_FOOTMAN, '등갑병',
                 100, 225, 7,  5, 0,  13, 10,
-            1000, null,     ['남중'], 0,
+                [new ReqTech(1000), new ReqRegions('남중')],
                 [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
                 [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
                 ['등갑을 두른 보병입니다.'],
@@ -101,7 +107,7 @@ class GameUnitConstBase{
             [
                 1106, self::T_FOOTMAN, '백이병',
                 175, 175, 7, 5, 0,  13, 11,
-            3000, ['성도'], null,     0,
+                [new ReqTech(3000), new ReqCities('성도')],
                 [self::T_ARCHER=>1.1, self::T_CAVALRY=>0.9, self::T_SIEGE=>1.1],
                 [self::T_ARCHER=>0.9, self::T_CAVALRY=>1.1, self::T_SIEGE=>0.9],
                 ['정예 보병입니다. 불리한 싸움도 버텨냅니다.'],
@@ -111,7 +117,7 @@ class GameUnitConstBase{
             [
                 1200, self::T_ARCHER, '궁병',
                 100, 100, 7, 10, 0,  10, 10,
-            0, null,     null,     0,
+                [],
                 [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
                 [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
                 ['표준적인 궁병입니다.','궁병은 선제사격을 하는 병종입니다.'],
@@ -120,7 +126,7 @@ class GameUnitConstBase{
             [
                 1201, self::T_ARCHER, '궁기병',
                 100, 100, 8, 20, 0,  11, 12,
-            1000, null,     ['동이'], 0,
+                [new ReqTech(1000), new ReqRegions('동이')],
                 [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.9, self::T_SIEGE=>1.2],
                 [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.1, self::T_SIEGE=>0.8],
                 ['말을 타고 잘 피합니다. 특히 다른 궁병보다 보병에게 조금 더 강합니다.'],
@@ -129,7 +135,7 @@ class GameUnitConstBase{
             [
                 1202, self::T_ARCHER, '연노병',
                 150, 100, 8, 10, 0,  12, 11,
-            1000, null,     ['서촉'], 0,
+                [new ReqTech(1000), new ReqRegions('서촉')],
                 [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
                 [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
                 ['화살을 연사합니다.'],
@@ -138,7 +144,7 @@ class GameUnitConstBase{
             [
                 1203, self::T_ARCHER, '강궁병',
                 150, 150, 7, 10, 0,  13, 13,
-            3000, ['양양'], null,     0,
+                [new ReqTech(3000), new ReqCities('양양')],
                 [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
                 [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
                 ['강건한 궁병입니다.'],
@@ -147,7 +153,7 @@ class GameUnitConstBase{
             [
                 1204, self::T_ARCHER, '석궁병',
                 200, 100, 7, 10, 0,  13, 13,
-            3000, ['건업'], null,     0,
+                [new ReqTech(3000), new ReqCities('건업')],
                 [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
                 [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
                 ['강력한 화살을 쏩니다.'],
@@ -157,7 +163,7 @@ class GameUnitConstBase{
             [
                 1300, self::T_CAVALRY, '기병',
                 150, 100, 7,  5, 0,  11, 11,
-            0, null,     null,     0,
+                [],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['표준적인 기병입니다.','기병은 공격특화입니다.'],
@@ -166,7 +172,7 @@ class GameUnitConstBase{
             [
                 1301, self::T_CAVALRY, '백마병',
                 200, 100, 7,  5, 0,  12, 13,
-            1000, null,     ['하북'], 0,
+                [new ReqTech(1000), new ReqRegions('하북')],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['백마의 위용을 보여줍니다.'],
@@ -175,7 +181,7 @@ class GameUnitConstBase{
             [
                 1302, self::T_CAVALRY, '중장기병',
                 150, 150, 7,  5, 0,  13, 12,
-            1000, null,     ['서북'], 0,
+                [new ReqTech(1000), new ReqRegions('서북')],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['갑주를 두른 기병입니다.'],
@@ -184,7 +190,7 @@ class GameUnitConstBase{
             [
                 1303, self::T_CAVALRY, '돌격기병',
                 200, 100, 8,  5, 0,  13, 11,
-            2000, ['흉노'], null,     0,
+                [new ReqTech(2000), new ReqCities('흉노')],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['저돌적으로 공격합니다.'],
@@ -192,8 +198,8 @@ class GameUnitConstBase{
             ],
             [
                 1304, self::T_CAVALRY, '철기병',
-            100, 200, 7,  5, 0,  11, 13,
-            2000, ['강'],   null,     0,
+                100, 250, 7,  5, 0,  11, 13,
+                [new ReqTech(2000), new ReqCities('강')],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['철갑을 두른 기병입니다.'],
@@ -202,7 +208,7 @@ class GameUnitConstBase{
             [
                 1305, self::T_CAVALRY, '수렵기병',
                 150, 100, 8, 15, 0,  12, 12,
-            2000, ['산월'], null,     0,
+                [new ReqTech(2000), new ReqCities('산월')],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['날쎄고 빠른 기병입니다.'],
@@ -211,7 +217,7 @@ class GameUnitConstBase{
             [
                 1306, self::T_CAVALRY, '맹수병',
                 250, 175, 6,  0, 0,  16, 16,
-            2000, ['남만'], null,     0,
+                [new ReqTech(2000), new ReqCities('남만')],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['어느 누구보다 강력합니다.'],
@@ -220,7 +226,7 @@ class GameUnitConstBase{
             [
                 1307, self::T_CAVALRY, '호표기병',
                 200, 150, 7,  5, 0,  14, 14,
-            3000, ['허창'], null,     0,
+                [new ReqTech(3000), new ReqCities('허창')],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
                 ['정예 기병입니다.'],
@@ -230,7 +236,7 @@ class GameUnitConstBase{
             [
                 1400, self::T_WIZARD, '귀병',
                 80,  80, 7,  5, 0.5,  9,  9,
-            0, null,     null,     0,
+                [],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['계략을 사용하는 병종입니다.'],
@@ -239,7 +245,7 @@ class GameUnitConstBase{
             [
                 1401, self::T_WIZARD, '신귀병',
                 80,  80, 7, 20, 0.6, 10, 10,
-            1000, null,     ['초'],   0,
+                [new ReqTech(1000), new ReqRegions('초')],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['신출귀몰한 귀병입니다.'],
@@ -248,7 +254,7 @@ class GameUnitConstBase{
             [
                 1402, self::T_WIZARD, '백귀병',
                 80, 130, 7,  5, 0.6,  9, 11,
-            2000, ['오환'], null,     0,
+                [new ReqTech(2000), new ReqCities('오환')],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['저렴하고 튼튼합니다.'],
@@ -257,7 +263,7 @@ class GameUnitConstBase{
             [
                 1403, self::T_WIZARD, '흑귀병',
                 130,  80, 7,  5, 0.6, 11,  9,
-            2000, ['왜'],   null,     0,
+                [new ReqTech(2000), new ReqCities('왜')],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['저렴하고 강력합니다.'],
@@ -266,7 +272,7 @@ class GameUnitConstBase{
             [
                 1404, self::T_WIZARD, '악귀병',
                 130, 130, 7,  0, 0.6, 12, 12,
-            3000, ['장안'], null,     0,
+                [new ReqTech(3000), new ReqCities('장안')],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['백병전에도 능숙합니다.'],
@@ -275,7 +281,7 @@ class GameUnitConstBase{
             [
                 1405, self::T_WIZARD, '남귀병',
                 60,  60, 7, 10, 0.8,  8,  8,
-            1000, null,     null,     0,
+                [new ReqTech(1000)],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['전투를 포기하고 계략에 몰두합니다.'],
@@ -284,7 +290,7 @@ class GameUnitConstBase{
             [
                 1406, self::T_WIZARD, '황귀병',
                 110, 110, 7,  0, 0.8, 13, 10,
-            3000, ['낙양'], null,     0,
+                [new ReqTech(3000), new ReqCities('낙양')],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['고도로 훈련된 귀병입니다.'],
@@ -293,7 +299,7 @@ class GameUnitConstBase{
             [
                 1407, self::T_WIZARD, '천귀병',
                 80, 130, 7, 15, 0.6, 11, 12,
-            3000, ['성도'], null,     0,
+                [new ReqTech(3000), new ReqCities('성도')],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['갑주를 두른 귀병입니다.'],
@@ -302,7 +308,7 @@ class GameUnitConstBase{
             [
                 1408, self::T_WIZARD, '마귀병',
                 130,  80, 7, 15, 0.6, 12, 11,
-            3000, ['업'],   null,     0,
+                [new ReqTech(3000), new ReqCities('업')],
                 [self::T_SIEGE=>1.2],
                 [self::T_SIEGE=>0.8],
                 ['날카로운 무기를 가진 귀병입니다.'],
@@ -312,7 +318,7 @@ class GameUnitConstBase{
             [
                 1500, self::T_SIEGE, '정란',
                 100, 100, 6,  0, 0,  14,  5,
-            0, null,     null,     3,
+                [new ReqMinRelYear(3)],
                 [self::T_FOOTMAN=>1.25, self::T_ARCHER=>1.25, self::T_CAVALRY=>1.25, self::T_WIZARD=>1.25, self::T_CASTLE=>1.8, 1106=>1.112],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2, 1106=>1.067],
                 ['높은 구조물 위에서 공격합니다. 첫 공격은 성벽을 향합니다.'],
@@ -321,7 +327,7 @@ class GameUnitConstBase{
             [
                 1501, self::T_SIEGE, '충차',
                 150, 100, 6,  0, 0,  18,  5,
-            1000, null,     null,     3,
+                [new ReqTech(1000), new ReqMinRelYear(3)],
                 [self::T_FOOTMAN=>0.8, self::T_ARCHER=>0.8, self::T_CAVALRY=>0.8, self::T_WIZARD=>0.8, self::T_CASTLE=>2.4],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2],
                 ['엄청난 위력으로 성벽을 부수어버립니다.'],
@@ -330,7 +336,7 @@ class GameUnitConstBase{
             [
                 1502, self::T_SIEGE, '벽력거',
                 150, 100, 6,  5, 0,  20,  5,
-            3000, ['업'],   null,     0,
+                [new ReqTech(3000), new ReqCities('업')],
                 [self::T_FOOTMAN=>1.25, self::T_ARCHER=>1.25, self::T_CAVALRY=>1.25, self::T_WIZARD=>1.25, self::T_CASTLE=>1.8, 1106=>1.112],
                 [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2, 1106=>1.067],
                 ['상대에게 돌덩이를 날립니다. 첫 공격은 성벽을 향합니다.'],
@@ -339,13 +345,15 @@ class GameUnitConstBase{
             [
                 1503, self::T_SIEGE, '목우',
                 50, 200, 5,  0, 0,  15,  5,
-            3000, ['성도'], null,     0,
+                [new ReqTech(3000), new ReqCities('성도')],
                 [self::T_FOOTMAN=>1, self::T_ARCHER=>1, self::T_CAVALRY=>1, self::T_WIZARD=>1, self::T_CASTLE=>1.8],
                 [self::T_FOOTMAN=>1, self::T_ARCHER=>1, self::T_CAVALRY=>1, self::T_WIZARD=>1, 1106=>1],
                 ['상대를 저지하는 특수병기입니다.'],
                 ['che_성벽부상무효'], ['che_저지시도', 'che_저지발동'], null
             ]
         ];    
+    }
+    
 
     public static function addGameUnit(GameUnitDetail $unitType){
         static::_generate();
@@ -357,22 +365,6 @@ class GameUnitConstBase{
             static::$constType[$unitType->armType] = [];
         }
         static::$constType[$unitType->armType][] = $unitType;
-
-        foreach($unitType->reqCities as $reqCity){
-            if(!key_exists($reqCity, static::$constCity)){
-                static::$constCity[$reqCity] = [];
-            }
-            static::$constCity[$reqCity][] = $unitType;
-        }
-
-        if($unitType->reqRegions){
-            foreach($unitType->reqRegions as $reqRegion){
-                if(!key_exists($reqRegion, static::$constRegion)){
-                    static::$constRegion[$reqRegion] = [];
-                }
-                static::$constRegion[$reqRegion][] = $unitType;
-            }
-        }
     }
 
     /**
@@ -400,22 +392,6 @@ class GameUnitConstBase{
         return static::$constName[$name]??null;
     }
 
-    /**
-     * @return \sammo\GameUnitDetail[]
-     */
-    public static function byCity(int $city): array{
-        static::_generate();
-        return static::$constCity[$city]??[];
-    }
-
-    /**
-     * @return \sammo\GameUnitDetail[]
-     */
-    public static function byRegion(int $region): array{
-        static::_generate();
-        return static::$constRegion[$region]??[];
-    }
-
 
     /**
      * @return \sammo\GameUnitDetail[]
@@ -435,17 +411,17 @@ class GameUnitConstBase{
 
     protected static function _generate(){
 
-        if(static::$constID || static::$constName || static::$constCity || static::$constRegion || static::$constType){
+        if(static::$constID || static::$constName || static::$constType){
             return;
         }
 
         $constID = [];
         $constName = [];
-        $constCity = [];
-        $constRegion = [];
         $constType = [];
 
-        foreach(static::$_buildData as $rawUnit){
+        $buildData = static::getBuildData();
+
+        foreach($buildData as $rawUnit){
             [
                 $id,
                 $armType,
@@ -457,10 +433,7 @@ class GameUnitConstBase{
                 $magicCoef,
                 $cost,
                 $rice,
-                $reqTech,
-                $reqCities,
-                $reqRegions,
-                $reqYear,
+                $reqConstraints,
                 $attackCoef,
                 $defenceCoef,
                 $info,
@@ -469,26 +442,9 @@ class GameUnitConstBase{
                 $iActionList,
              ] = $rawUnit;
 
-            if($reqYear > 0){
-                $info[] = "{$reqYear}년 경과 후 사용 가능";
-            }
-
-            if($reqTech > 0){
-                $info[] = "기술력 {$reqTech} 이상 필요";
-            }
-
-            if($reqCities !== null){
-                $reqCities = array_map(function($reqCity) use (&$info){
-                    $info[] = "{$reqCity} 소유시 가능";
-                    return CityConst::byName($reqCity)->id;
-                }, $reqCities);
-            }
-
-            if($reqRegions !== null){
-                $reqRegions = array_map(function($reqRegion) use (&$info){
-                    $info[] = "{$reqRegion} 지역 소유시 가능";
-                    return CityConst::$regionMap[$reqRegion];
-                }, $reqRegions);
+            foreach($reqConstraints as $constraint){
+                /** @var \sammo\GameUnitConstraint\BaseGameUnitConstraint $constraint */
+                $info[] = $constraint->getInfo();
             }
 
             $unit = new GameUnitDetail(
@@ -502,16 +458,13 @@ class GameUnitConstBase{
                 $magicCoef,
                 $cost,
                 $rice,
-                $reqTech,
-                $reqCities,
-                $reqRegions,
-                $reqYear,
+                $reqConstraints,
                 $attackCoef,
                 $defenceCoef,
                 $info,
                 $initSkillTrigger,
                 $phaseSkillTrigger,
-                $iActionList,
+                $iActionList
             );
 
             $constID[$id] = $unit;
@@ -521,31 +474,10 @@ class GameUnitConstBase{
             }
             $constType[$armType][$id] = $unit;
 
-            if($unit->reqCities){
-                foreach($unit->reqCities as $reqCity){
-                    if(!key_exists($reqCity, $constCity)){
-                        $constCity[$reqCity] = [];
-                    }
-                    $constCity[$reqCity][$id] = $unit;
-                }
-            }
-
-
-            if($unit->reqRegions){
-                foreach($unit->reqRegions as $reqRegion){
-                    if(!key_exists($reqRegion, $constRegion)){
-                        $constRegion[$reqRegion] = [];
-                    }
-                    $constRegion[$reqRegion][$id] = $unit;
-                }
-            }
-
         }
 
         static::$constID = $constID;
         static::$constName = $constName;
-        static::$constCity = $constCity;
-        static::$constRegion = $constRegion;
         static::$constType = $constType;
 
         static::_generateOptional();

hwe/sammo/GameUnitConstraint/BaseGameUnitConstraint.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\General;
+
+abstract class BaseGameUnitConstraint {
+    public abstract function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool;
+
+    public abstract function getInfo(): string;
+}

hwe/sammo/GameUnitConstraint/Impossible.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\General;
+
+class Impossible extends BaseGameUnitConstraint {
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        return false;
+    }
+
+    public function getInfo(): string
+    {
+        return "불가능";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqChief.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\General;
+
+class ReqChief extends BaseGameUnitConstraint
+{
+    public function __construct()
+    {
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        if($general->getVar('officer_level') >= 5){
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getInfo(): string
+    {
+        return "군주 및 수뇌부만 가능";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqCities.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\CityConst;
+use sammo\General;
+
+class ReqCities extends BaseGameUnitConstraint
+{
+
+    public readonly array $reqCities;
+    public function __construct(...$reqCities)
+    {
+        $dstReqCities = [];
+        if (count($reqCities) == 0) {
+            $this->reqCities = [];
+            return;
+        }
+
+        foreach ($reqCities as $city) {
+            $dstReqCities[CityConst::byName($city)->id] = $city;
+        }
+        $this->reqCities = $dstReqCities;
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        foreach ($this->reqCities as $cityID => $cityName) {
+            if (key_exists($cityID, $ownCities)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function getInfo(): string
+    {
+        $cityNameText = implode(', ', $this->reqCities);
+        return "{$cityNameText} 소유시 가능";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqCitiesWithCityLevel.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\CityConst;
+use sammo\General;
+
+use function sammo\getCityLevelList;
+
+class ReqCitiesWithCityLevel extends BaseGameUnitConstraint
+{
+
+    public readonly array $reqCities;
+    public function __construct(
+        public readonly int $reqCityLevel,
+        ...$reqCities)
+    {
+        $dstReqCities = [];
+        if (count($reqCities) == 0) {
+            $this->reqCities = [];
+            return;
+        }
+
+        foreach ($reqCities as $city) {
+            $dstReqCities[CityConst::byName($city)->id] = $city;
+        }
+        $this->reqCities = $dstReqCities;
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        foreach ($this->reqCities as $cityID => $cityName) {
+            if (!key_exists($cityID, $ownCities)) {
+                continue;
+            }
+
+            if($ownCities[$cityID]['level'] >= $this->reqCityLevel) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function getInfo(): string
+    {
+        $cityLevelText = getCityLevelList()[$this->reqCityLevel];
+        $cityNameText = implode(', ', $this->reqCities);
+        return "{$cityNameText} {$cityLevelText}성 소유시 가능";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqHighLevelCities.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\General;
+
+use function sammo\getCityLevelList;
+
+class ReqHighLevelCities extends BaseGameUnitConstraint
+{
+
+    public readonly array $reqCities;
+    public function __construct(
+        public readonly int $reqCityLevel,
+        public readonly int $reqCityCount
+    ) {}
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        $cnt = 0;
+        foreach ($ownCities as $cityItem) {
+            if ($cityItem['level'] >= $this->reqCityLevel) {
+                $cnt++;
+            }
+        }
+
+        if($cnt >= $this->reqCityCount) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getInfo(): string
+    {
+        $cityLevelText = getCityLevelList()[$this->reqCityLevel];
+        return "{$cityLevelText}성 {$this->reqCityCount}개 이상 소유시 가능";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqMinRelYear.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\General;
+
+class ReqMinRelYear extends BaseGameUnitConstraint {
+
+    public function __construct(public readonly int $reqMinRelYear)
+    {
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        return $relativeYear >= $this->reqMinRelYear;
+    }
+
+    public function getInfo(): string
+    {
+        return "{$this->reqMinRelYear}년 경과 후 사용 가능";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqNationAux.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\CityConst;
+use sammo\Enums\NationAuxKey;
+use sammo\General;
+
+class ReqNationAux extends BaseGameUnitConstraint
+{
+
+    const AVAILABLE_CMP = [
+        '==' => true,
+        '!=' => true,
+        '<' => true,
+        '>' => true,
+        '<=' => true,
+        '>=' => true,
+    ];
+
+    public function __construct(
+        public readonly NationAuxKey $reqNationAuxKey,
+        public readonly string $cmp,
+        public readonly int|float $value
+    ) {
+        if (!array_key_exists($cmp, self::AVAILABLE_CMP)) {
+            throw new \InvalidArgumentException('올바르지 않은 비교연산자입니다');
+        }
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+
+        $lhs = $nationAux[$this->reqNationAuxKey->value] ?? 0;
+        $rhs = $this->value;
+
+        $value = false;
+        switch ($this->cmp) {
+            case '==':
+                $value = ($lhs == $rhs);
+                break;
+            case '!=':
+                $value = ($lhs != $rhs);
+                break;
+            case '<=':
+                $value = ($lhs <= $rhs);
+                break;
+            case '>=':
+                $value = ($lhs >= $rhs);
+                break;
+            case '<':
+                $value = ($lhs < $rhs);
+                break;
+            case '>':
+                $value = ($lhs > $rhs);
+                break;
+        }
+
+        return $value;
+    }
+
+    public function getInfo(): string
+    {
+        //Enum별 특수한 경우
+        switch ($this->reqNationAuxKey) {
+            case NationAuxKey::can_대검병사용:
+                if ($this->cmp == "==" && $this->value == 1) return "대검병 연구 시 가능";
+                break;
+            case NationAuxKey::can_극병사용:
+                if ($this->cmp == "==" && $this->value == 1) return "극병 연구 시 가능";
+                break;
+            case NationAuxKey::can_화시병사용:
+                if ($this->cmp == "==" && $this->value == 1) return "화시병 연구 시 가능";
+                break;
+            case NationAuxKey::can_원융노병사용:
+                if ($this->cmp == "==" && $this->value == 1) return "원융노병 연구 시 가능";
+                break;
+            case NationAuxKey::can_산저병사용:
+                if ($this->cmp == "==" && $this->value == 1) return "산저병 연구 시 가능";
+                break;
+            case NationAuxKey::can_상병사용:
+                if ($this->cmp == "==" && $this->value == 1) return "상병 연구 시 가능";
+                break;
+            case NationAuxKey::can_음귀병사용:
+                if ($this->cmp == "==" && $this->value == 1) return "음귀병 연구 시 가능";
+                break;
+            case NationAuxKey::can_무희사용:
+                if ($this->cmp == "==" && $this->value == 1) return "무희 연구 시 가능";
+                break;
+            case NationAuxKey::can_화륜차사용:
+                if ($this->cmp == "==" && $this->value == 1) return "화륜차 연구 시 가능";
+                break;
+            case NationAuxKey::did_특성초토화:
+                if ($this->cmp == ">=" && $this->value == 1) return "특성 초토화 시 가능";
+                break;
+        }
+
+        //범용
+        switch ($this->cmp) {
+            case '==': {
+                    if ($this->value == 0) {
+                        return "{$this->reqNationAuxKey->value} 없을 때";
+                    }
+                    if ($this->value == 1) {
+                        return "{$this->reqNationAuxKey->value} 있을 때";
+                    }
+                    return "{$this->reqNationAuxKey->value} = {$this->value} 일 때";
+                };
+            case '!=': {
+                    if ($this->value == 0) {
+                        return "{$this->reqNationAuxKey->value} 없을 때";
+                    }
+                    if ($this->value == 1) {
+                        return "{$this->reqNationAuxKey->value} 있을 때";
+                    }
+                    return "{$this->reqNationAuxKey->value} != {$this->value} 일 때";
+                };
+            default:
+                return "{$this->reqNationAuxKey->value} {$this->cmp} {$this->value} 일 때";
+        }
+    }
+}

hwe/sammo/GameUnitConstraint/ReqNotChief.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\General;
+
+class ReqNotChief extends BaseGameUnitConstraint
+{
+    public function __construct()
+    {
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        if($general->getVar('officer_level') < 5){
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getInfo(): string
+    {
+        return "군주 및 수뇌부는 불가";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqRegions.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\CityConst;
+use sammo\General;
+
+class ReqRegions extends BaseGameUnitConstraint
+{
+
+    public readonly array $reqRegions;
+    public function __construct(...$reqRegions)
+    {
+        $dstReqRegions = [];
+        if (count($reqRegions) == 0) {
+            $this->reqRegions = [];
+            return;
+        }
+
+        foreach ($reqRegions as $region) {
+            $dstReqRegions[CityConst::$regionMap[$region]] = $region;
+        }
+
+        $this->reqRegions = $dstReqRegions;
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        foreach ($this->reqRegions as $regionID => $regionText) {
+            if (key_exists($regionID, $ownRegions)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function getInfo(): string
+    {
+        $regionNameText = implode(', ', $this->reqRegions);
+        return "{$regionNameText} 지역 소유시 가능";
+    }
+}

hwe/sammo/GameUnitConstraint/ReqTech.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace sammo\GameUnitConstraint;
+
+use sammo\General;
+use sammo\KVStorage;
+
+class ReqTech extends BaseGameUnitConstraint {
+
+    public function __construct(public readonly int $reqTech)
+    {
+    }
+
+    public function test(General $general, array $ownCities, array $ownRegions, int $relativeYear, int $tech, array $nationAux): bool
+    {
+        if ($tech < $this->reqTech) {
+            return false;
+        }
+        return true;
+    }
+
+    public function getInfo(): string
+    {
+        return "기술력 {$this->reqTech} 이상 필요";
+    }
+}

hwe/sammo/GameUnitDetail.php

@@ -2,6 +2,8 @@
 
 namespace sammo;
 
+use sammo\GameUnitConstraint\BaseGameUnitConstraint;
+
 class GameUnitDetail implements iAction
 {
     use DefaultAction;
@@ -16,17 +18,14 @@ class GameUnitDetail implements iAction
     public $magicCoef;
     public $cost;
     public $rice;
-    public $reqTech;
-    public $reqCities;
-    public $reqRegions;
-    public $reqYear;
     public $attackCoef;
     public $defenceCoef;
-    public $info;
     public $initSkillTrigger;
     public $phaseSkillTrigger;
     /** @var iAction[]|null iActionList */
     public $iActionList;
+    public array $reqConstraints;
+
 
     public function __construct(
         int $id,
@@ -39,13 +38,10 @@ class GameUnitDetail implements iAction
         float $magicCoef,
         int $cost,
         int $rice,
-        int $reqTech,
-        ?array $reqCities,
-        ?array $reqRegions,
-        int $reqYear,
+        array $reqConstraints,
         array $attackCoef,
         array $defenceCoef,
-        array $info,
+        public readonly array $info,
         ?array $initSkillTrigger,
         ?array $phaseSkillTrigger,
         ?array $iActionList,
@@ -60,13 +56,18 @@ class GameUnitDetail implements iAction
         $this->magicCoef = $magicCoef;
         $this->cost = $cost;
         $this->rice = $rice;
-        $this->reqTech = $reqTech;
-        $this->reqCities = $reqCities;
-        $this->reqRegions = $reqRegions;
-        $this->reqYear = $reqYear;
+        $this->reqConstraints = [];
+        foreach($reqConstraints as $constraint){
+            $className = Util::getClassNameFromObj($constraint);
+            if(!key_exists($className, $this->reqConstraints)){
+                $this->reqConstraints[$className] = $constraint;
+            }
+            else{
+                $this->reqConstraints[] = $constraint;
+            }
+        }
         $this->attackCoef = $attackCoef;
         $this->defenceCoef = $defenceCoef;
-        $this->info = $info;
         $this->initSkillTrigger = $initSkillTrigger;
         $this->phaseSkillTrigger = $phaseSkillTrigger;
         $this->iActionList = [];
@@ -79,6 +80,33 @@ class GameUnitDetail implements iAction
         }
     }
 
+    public function reqTech(): int {
+        $reqTechObj = $this->reqConstraints['ReqTech'] ?? null;
+
+        if($reqTechObj === null){
+            return 0;
+        }
+        return $reqTechObj->reqTech;
+    }
+
+    public function reqRegions(): ?array {
+        $reqRegionsObj = $this->reqConstraints['ReqRegions'] ?? null;
+
+        if($reqRegionsObj === null){
+            return null;
+        }
+        return $reqRegionsObj->reqRegions;
+    }
+
+    public function reqCities(): ?array {
+        $reqCitiesObj = $this->reqConstraints['ReqCities'] ?? null;
+
+        if($reqCitiesObj === null){
+            return null;
+        }
+        return $reqCitiesObj->reqCities;
+    }
+
     public function getInfo(): string
     {
         return join("\n<br>", $this->info);
@@ -193,41 +221,13 @@ class GameUnitDetail implements iAction
         return $defaultWar;
     }
 
-    public function isValid($ownCities, $ownRegions, $relativeYear, $tech)
+    public function isValid(General $general, $ownCities, $ownRegions, $relativeYear, $tech, $nationAux)
     {
         //음수 없음
         $relativeYear = max(0, $relativeYear);
 
-        if ($relativeYear < $this->reqYear) {
-            return false;
-        }
-
-        if ($tech < $this->reqTech) {
-            return false;
-        }
-
-        if ($this->reqCities !== null) {
-            $valid = false;
-            foreach ($this->reqCities as $reqCity) {
-                if (\key_exists($reqCity, $ownCities)) {
-                    $valid = true;
-                    break;
-                }
-            }
-            if (!$valid) {
-                return false;
-            }
-        }
-
-        if ($this->reqRegions !== null) {
-            $valid = false;
-            foreach ($this->reqRegions as $reqRegion) {
-                if (\key_exists($reqRegion, $ownRegions)) {
-                    $valid = true;
-                    break;
-                }
-            }
-            if (!$valid) {
+        foreach($this->reqConstraints as $constraint){
+            if(!$constraint->test($general, $ownCities, $ownRegions, $relativeYear, $tech, $nationAux)){
                 return false;
             }
         }

hwe/sammo/GeneralAI.php

@@ -2084,7 +2084,7 @@ class GeneralAI
             }
         }
 
-        $finalCityID = Util::array_first_key($cityScoreList);
+        $finalCityID = array_key_first($cityScoreList);
         $dist = $distanceList[$capital][$finalCityID];
         $targetCityID = $finalCityID;
         if ($dist > 1) {
@@ -2558,8 +2558,11 @@ class GeneralAI
         $cities = [];
         $regions = [];
 
-        foreach ($db->queryAllLists('SELECT city, region FROM city WHERE nation = %i', $nationID) as [$cityID, $regionID]) {
-            $cities[$cityID] = true;
+        foreach ($db->queryAllLists('SELECT city, region, secu, level FROM city WHERE nation = %i', $nationID) as [$cityID, $regionID, $secu, $level]) {
+            $cities[$cityID] = [
+                'secu' => $secu,
+                'level' => $level,
+            ];
             $regions[$regionID] = true;
         }
         $relYear = Util::valueFit($env['year'] - $env['startyear'], 0);
@@ -2567,7 +2570,7 @@ class GeneralAI
 
         $types = [];
         foreach (GameUnitConst::byType($armType) as $crewtype) {
-            if ($crewtype->isValid($cities, $regions, $relYear, $tech)) {
+            if ($crewtype->isValid($general, $cities, $regions, $relYear, $tech, $this->nation['aux'])) {
                 $score = $crewtype->pickScore($tech);
                 $types[$crewtype->id] = $score;
             }
@@ -2581,15 +2584,19 @@ class GeneralAI
 
         if ($this->generalPolicy->can고급병종) {
             $currCrewType = $general->getCrewTypeObj();
-            if ($currCrewType->isValid($cities, $regions, $relYear, $tech)) {
-                if ($currCrewType->reqTech >= 2000) {
+            if ($currCrewType->isValid($general, $cities, $regions, $relYear, $tech, $this->nation['aux'])) {
+                $reqTechObj = $currCrewType->reqConstraints['ReqTech'] ?? null;
+                if($reqTechObj){
+                    $reqTech = $reqTechObj->reqTech;
+                    if ($reqTech >= 2000) {
                         $type = $currCrewType->id;
-                } else if ($currCrewType->armType != $armType && $currCrewType->reqTech >= 1000) {
+                    } else if ($currCrewType->armType != $armType && $reqTech >= 1000) {
                         //굳이 뽑은 이유가 있겠지
                         $type = $currCrewType->id;
                     }
                 }
             }
+        }
 
         //XXX: 훈련, 사기진작 금액을 하드코딩으로 계산중
         $gold = $general->getVar('gold');
@@ -3122,9 +3129,15 @@ class GeneralAI
         $db = DB::db();
 
         $dupLord = $db->queryFirstField('SELECT COUNT(*) FROM general WHERE officer_level = 12 AND city = %i', $this->general->getCityID());
-        if($dupLord <= 1 && !in_array($this->general->getRawCity()['level'], [5, 6])) {
+        if($dupLord <= 1) {
+            if ($this->general->getRawCity() === null) {
+                $rawCity = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $this->general->getCityID());
+                $this->general->setRawCity($rawCity);
+            }
+            if (in_array($this->general->getRawCity()['level'], [5, 6])) {
                 return null;
             }
+        }
 
         $general = $this->general;
         $lordCities = $db->queryFirstColumn('SELECT city.city as city FROM general LEFT JOIN city ON general.city = city.city WHERE general.officer_level = 12 AND city.nation = 0');
@@ -4036,7 +4049,7 @@ class GeneralAI
                 if ($general->getVar('belong') < $minBelong) {
                     continue;
                 }
-                if ($general->getVar('officer_level') !== 1) {
+                if ($general->getVar('officer_level') > 4) {
                     continue;
                 }
                 $nextChiefs[11] = $general;
@@ -4093,7 +4106,7 @@ class GeneralAI
 
             $newChief = null;
             foreach ($generals as $general) {
-                if ($general->getVar('officer_level') !== 1) {
+                if ($general->getVar('officer_level') > 4) {
                     continue;
                 }
                 if ($general->getNPCType() < 2 && $general->getVar('killturn') < $minUserKillturn) {

hwe/sammo/GeneralTrigger/che_도시치료.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace sammo\GeneralTrigger;
+
 use sammo\BaseGeneralTrigger;
 use sammo\General;
 use sammo\ActionLogger;
@@ -7,16 +9,18 @@ use sammo\DB;
 use sammo\Util;
 use sammo\JosaUtil;
 
-class che_도시치료 extends BaseGeneralTrigger{
+class che_도시치료 extends BaseGeneralTrigger
+{
     protected $priority = 10010;
 
-    public function action(\sammo\RandUtil $rng, ?array $env=null, $arg=null):?array{
+    public function action(\sammo\RandUtil $rng, ?array $env = null, $arg = null): ?array
+    {
 
         /** @var \sammo\General $general */
         $general = $this->object;
         $logger = $general->getLogger();
 
-        if($general->getVar('injury') > 0){
+        if ($general->getVar('injury') > 0) {
             $general->updateVar('injury', 0);
             $general->activateSkill('pre.부상경감', 'pre.치료');
             $logger->pushGeneralActionLog('<C>의술</>을 펼쳐 스스로 치료합니다!', ActionLogger::PLAIN);
@@ -24,14 +28,27 @@ class che_도시치료 extends BaseGeneralTrigger{
 
         $db = DB::db();
 
+        if ($general->getNationID() == 0) {
+            /** @var array{int,string,string}[] $patients */
+            $patients = $db->queryAllLists(
+                'SELECT no,name,nation FROM general WHERE city=%i AND nation=%i AND injury > 10 AND no != %i',
+                $general->getCityID(),
+                0,
+                $general->getID()
+            );
+        }
+        else {
             /** @var array{int,string,string}[] $patients */
             $patients = $db->queryAllLists(
                 'SELECT no,name,nation FROM general WHERE city=%i AND injury > 10 AND no != %i',
                 $general->getCityID(),
                 $general->getID()
             );
+        }
 
-        if(!$patients){
+
+
+        if (!$patients) {
             return $env;
         }
 
@@ -42,7 +59,7 @@ class che_도시치료 extends BaseGeneralTrigger{
 
         /** @var string|null */
         $curedPatientName = null;
-        foreach($patients as [$patientID, $patientName, $patientNationID]){
+        foreach ($patients as [$patientID, $patientName, $patientNationID]) {
             if (!$rng->nextBool(0.5)) {
                 continue;
             }
@@ -54,26 +71,25 @@ class che_도시치료 extends BaseGeneralTrigger{
             $patientLogger->flush();
         }
 
-        if(!$cureList){
+        if (!$cureList) {
             return $env;
         }
 
-        if($curedPatientName === null){
+        if ($curedPatientName === null) {
             throw new \sammo\MustNotBeReachedException();
         }
 
 
-        if(count($cureList) == 1){
+        if (count($cureList) == 1) {
             $josaUl = JosaUtil::pick($curedPatientName, "을");
             $logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수 <Y>{$curedPatientName}</>{$josaUl} 치료합니다!", ActionLogger::PLAIN);
-        }
-        else{
+        } else {
             $otherCount = count($cureList) - 1;
             $logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수들 <Y>{$curedPatientName}</> 외 <C>{$otherCount}</>명을 치료합니다!", ActionLogger::PLAIN);
         }
 
         $db->update('general', [
-            'injury'=>0
+            'injury' => 0
         ], 'no IN %li', $cureList);
 
         return $env;