fix: InheritancePointManager 버그 수정

- 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

@@ -92,4 +92,14 @@ CREATE TABLE `login_token` (
 	INDEX `by_date` (`user_id`, `expire_date`)
 )
 COLLATE='utf8mb4_general_ci'
-ENGINE=Aria;
+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) : ?>
+        <?php if ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
-            <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) : ?>
             <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;
     }
 
@@ -923,6 +923,13 @@ function banner()
 
 function addTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
 {
+    if($turnterm < 0){
+        if($turnterm == -60){
+            return VarTurn60::fromDatetime(new \DateTimeImmutable(($date)))->addTurn($turn )->toDateStr($withFraction);
+        }
+        throw new \Exception("InvalidTurnTerm".$turnterm);
+    }
+
     $date = new \DateTime($date);
     $target = $turnterm * $turn;
     $date->add(new \DateInterval("PT{$target}M"));
@@ -934,6 +941,13 @@ function addTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
 
 function subTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
 {
+    if($turnterm < 0){
+        if($turnterm == -60){
+            return VarTurn60::fromDatetime(new \DateTimeImmutable(($date)))->addTurn($turn * -1)->toDateStr($withFraction);
+        }
+        throw new \Exception("InvalidTurnTerm".$turnterm);
+    }
+
     $date = new \DateTime($date);
     $target = $turnterm * $turn;
     $date->sub(new \DateInterval("PT{$target}M"));
@@ -945,6 +959,14 @@ function subTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
 
 function cutTurn($date, int $turnterm, bool $withFraction = true)
 {
+    if($turnterm < 0){
+        if($turnterm == -60){
+            [$baseDate, ] = VarTurn60::fromDatetime(new \DateTimeImmutable(($date)))->cutTurn($withFraction);
+            return $baseDate;
+        }
+        throw new \Exception("InvalidTurnTerm".$turnterm);
+    }
+
     $date = new \DateTime($date);
 
     $baseDate = new \DateTime($date->format('Y-m-d'));
@@ -963,6 +985,8 @@ function cutTurn($date, int $turnterm, bool $withFraction = true)
 
 function cutDay($date, int $turnterm, bool $withFraction = true)
 {
+    assert($turnterm > 0);
+
     $date = new \DateTime($date);
 
     $baseDate = new \DateTime($date->format('Y-m-d'));
@@ -1009,7 +1033,7 @@ function increaseRefresh($type = "", $cnt = 1)
     $isunited = $gameStor->isunited;
     $opentime = $gameStor->opentime;
 
-    if ($userGrade == 6) {
+    if ($userGrade >= 6) {
         return;
     }
     if ($isunited == 2) {
@@ -1106,6 +1130,7 @@ function CheckOverhead()
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     [$turnterm, $refreshLimit] = $gameStor->getValuesAsArray(['turnterm', 'refreshLimit']);
+    $turnterm = abs($turnterm);
 
     $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * GameConst::$refreshLimitCoef;
 
@@ -1153,7 +1178,7 @@ function timeover(): bool
     list($turnterm, $turntime) = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
     $diff = (new \DateTime())->getTimestamp() - (new \DateTime($turntime))->getTimestamp();
 
-    $t = min($turnterm, 5);
+    $t = min(abs($turnterm), 5);
 
     $term = $diff;
     if ($term >= $t || $term < 0) {
@@ -1175,6 +1200,12 @@ function checkDelay()
 
     // 1턴이상 갱신 없었으면 서버 지연
     $term = $gameStor->turnterm;
+
+    if($term < 0){
+        //가변 턴에는 수행 안함!
+        return;
+    }
+
     if ($term >= 20) {
         $threshold = 1;
     } else if ($term >= 10) {
@@ -1254,10 +1285,14 @@ function turnDate($curtime)
     $admin = $gameStor->getValues(['startyear', 'starttime', 'turnterm', 'year', 'month']);
 
     $turn = $admin['starttime'];
-    $curturn = cutTurn($curtime, $admin['turnterm']);
     $term = $admin['turnterm'];
-
+    if($term == -60){
-    $num = intdiv((strtotime($curturn) - strtotime($turn)), $term * 60);
+        $num = VarTurn60::calcTurnDiff(new \DateTimeImmutable($turn), new \DateTimeImmutable($curtime));
+    }
+    else{
+        $curturn = cutTurn($curtime, $admin['turnterm']);
+        $num = intdiv((strtotime($curturn) - strtotime($turn)), $term * 60);
+    }
 
     $date = $admin['startyear'] * 12;
     $date += $num;
@@ -2208,6 +2243,10 @@ function getRandTurn(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime = n
         throw new MustNotBeReachedException();
     }
 
+    if($term == -60){
+        [, $term] = VarTurn60::fromDatetime($baseDateTime)->cutTurn();
+    }
+
     $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
     $randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
 
@@ -2223,6 +2262,11 @@ function getRandTurn2(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime =
     } else {
         throw new MustNotBeReachedException();
     }
+
+    if($term == -60){
+        [, $term] = VarTurn60::fromDatetime($baseDateTime)->cutTurn();
+    }
+    
     $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
     $randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
 

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);
 
@@ -181,7 +181,12 @@ function info($type = 0)
 
     $admin = $gameStor->getValues(['year', 'month', 'turnterm', 'maxgeneral']);
 
-    $termtype = "{$admin['turnterm']}분 턴";
+    $turnTermText = $admin['turnterm'].'분';
+    if($admin['turnterm'] < 0){
+        $turnTermText = "가변 {$admin['turnterm']}분";
+    }
+
+    $termtype = "{$turnTermText}분 턴";
 
     $gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc < 2');
     $npccount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc >= 2');

hwe/func_tournament.php

@@ -10,6 +10,7 @@ use sammo\Enums\InheritanceKey;
  * @return int 토너먼트 초 단위
  */
 function calcTournamentTerm(int $turnTerm): int{
+    $turnTerm = abs($turnTerm);
     return Util::valueFit($turnTerm, 5, 120);
 }
 
@@ -138,6 +139,7 @@ function processTournament()
 
 function getTournamentTermText(int $turnTerm)
 {
+    $turnTerm = abs($turnTerm);
     $term = calcTournamentTerm($turnTerm);
 
     if ($term % 60 === 0) {
@@ -342,7 +344,7 @@ function startBetting($type)
 {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    [$year, $month, $startyear, $turnterm] = $gameStor->getValuesAsArray(['year', 'month', 'startyear', 'turnterm']);
+    [$year, $month, $startyear] = $gameStor->getValuesAsArray(['year', 'month', 'startyear']);
     pushGlobalHistoryLog([
         "<S>◆</>{$year}년 {$month}월:<B><b>【대회】</b></>우승자를 예상하는 <C>내기</>가 진행중입니다! 호사가의 참여를 기다립니다!"
     ], $year, $month);
@@ -1153,21 +1155,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.php

@@ -54,6 +54,7 @@ if ($session->userGrade < 5 && !$allowReset) {
                                 <label for="turnterm" class="col-sm-3 col-form-label">턴 시간(분)</label>
                                 <div class="col-sm-9">
                                     <div id="turnterm" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_var60" value="-60" checked><label for="turnterm_var60" class="btn btn-secondary">가변60</label>
                                         <input type="radio" class="btn-check" name="turnterm" id="turnterm_120" value="120"><label for="turnterm_120" class="btn btn-secondary">120</label>
                                         <input type="radio" class="btn-check" name="turnterm" id="turnterm_60" value="60" checked><label for="turnterm_60" class="btn btn-secondary">60</label>
                                         <input type="radio" class="btn-check" name="turnterm" id="turnterm_30" value="30"><label for="turnterm_30" class="btn btn-secondary">30</label>

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_get_select_npc_token.php

@@ -36,6 +36,7 @@ list(
     $turnterm,
     $npcmode
 ) = $gameStor->getValuesAsArray(['maxgeneral', 'turnterm', 'npcmode']);
+$turnterm = abs($turnterm);
 
 if($npcmode!=1){
     Json::die([

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_select_picked_general.php

@@ -121,7 +121,7 @@ $builder->setOwner($userID);
 $builder->setOwnerName($userNick);
 $builder->setKillturn(5);
 $builder->setNPCType(0);
-$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
+$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * abs($env['turnterm'])));
 $builder->fillRemainSpecAsZero($env);
 $builder->build($env);
 $generalID = $builder->getGeneralID();

hwe/j_set_my_setting.php

@@ -60,7 +60,7 @@ $me->setAuxVar('use_auto_nation_turn', $use_auto_nation_turn);
 $me->setVar('tnmt', $tnmt);
 
 if ($me->getNPCType() == 1 && $detachNPC) {
-    $turnterm = $gameStor->turnterm;
+    $turnterm = abs($gameStor->turnterm);
 
     if ($turnterm < 10) {
         $targetKillTurn = 30 / $turnterm;
@@ -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/j_update_picked_general.php

@@ -39,6 +39,7 @@ list(
     $npcmode,
     $turnterm
 ) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode', 'turnterm']);
+$turnterm = abs($turnterm);
 
 if($npcmode!=2){
     Json::die([

hwe/lib.php

@@ -51,8 +51,9 @@ function MessageBox($str)
 
 function LogText($prefix, $variable)
 {
-    $text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
+    return;
-    file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
+    //$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['def'] = GameConst::$defaultCityWall;
-        $query['wall'] = 1000;
+        $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

@@ -28,6 +28,7 @@ use sammo\UniqueConst;
 use sammo\UserLogger;
 use sammo\Util;
 use sammo\Validator;
+use sammo\VarTurn60;
 use sammo\WebUtil;
 
 use function sammo\addTurn;
@@ -99,7 +100,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 +158,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'];
             }
         }
@@ -355,20 +356,28 @@ class Join extends \sammo\BaseAPI
         }
 
         if ($inheritTurntimeZone !== null) {
-            $inheritTurntime = $inheritTurntimeZone * $admin['turnterm'];
+            $turnterm = abs($admin['turnterm']);
-            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($admin['turnterm'] - 1, 0));
+            $inheritTurntime = $inheritTurntimeZone * $turnterm;
+            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($turnterm - 1, 0));
 
             $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");
 
             $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
 
-            $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
+            $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $turnterm));
             $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
             $turntime = TimeUtil::format($turntime, true);
         } else {
-            $turntime = getRandTurn($rng, $admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
+            $turntime = getRandTurn($rng, abs($admin['turnterm']), new \DateTimeImmutable($admin['turntime']));
         }
 
+        if ($admin['turnterm'] == -60){
+            $baseObj = VarTurn60::fromDatetime(new \DateTimeImmutable($admin['turntime']));
+            $userTurnObj = VarTurn60::fromDatetime(new \DateTimeImmutable($turntime));
+            if($baseObj->turnIdx != $userTurnObj->turnIdx){
+                $turntime = $userTurnObj->addTurn(-1)->toDateStr();
+            }
+        }
 
         $now = TimeUtil::now(true);
         if ($now >= $turntime) {

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/InheritAction/ResetTurnTime.php

@@ -62,7 +62,7 @@ class ResetTurnTime extends \sammo\BaseAPI
         }
 
         $gameStor = KVStorage::getStorage($db, 'game_env');
-        $turnTerm = $gameStor->getValue('turnterm');
+        $turnTerm = abs($gameStor->getValue('turnterm'));
 
         $currTurnTime = new DateTimeImmutable($general->getTurnTime());
 

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/AbsFromUserPool.php

@@ -46,7 +46,7 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
 
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $result = [];
-        $validUntil = TimeUtil::nowAddMinutes(2 * $gameStor->turnterm);
+        $validUntil = TimeUtil::nowAddMinutes(2 * abs($gameStor->turnterm));
         while(count($result) < $pickCnt){
             $cand = $rng->choiceUsingWeightPair($pool);
             $poolID = $cand['id'];

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/Auction.php

@@ -164,7 +164,7 @@ abstract class Auction
     if ($date === null) {
       $db = DB::db();
       $gameStor = KVStorage::getStorage($db, 'game_env');
-      $turnTerm = $gameStor->getValue('turnterm');
+      $turnTerm = abs($gameStor->getValue('turnterm'));
       $date = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
         max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
       ));
@@ -324,7 +324,7 @@ abstract class Auction
     }
 
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $turnTerm = $gameStor->getValue('turnterm');
+    $turnTerm = abs($gameStor->getValue('turnterm'));
 
     if ($this->info->detail->availableLatestBidCloseDate !== null) {
       $extendedCloseDate = $now->add(TimeUtil::secondsToDateInterval(
@@ -437,7 +437,7 @@ abstract class Auction
     $general->increaseVar($resType->value, -$morePoint);
 
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $turnTerm = $gameStor->getValue('turnterm');
+    $turnTerm = abs($gameStor->getValue('turnterm'));
     $extendedCloseDate = $now->add(TimeUtil::secondsToDateInterval(
       max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
     ));
@@ -471,7 +471,7 @@ abstract class Auction
     if ($highestBid->aux->tryExtendCloseDate) {
       $db = DB::db();
       $gameStor = KVStorage::getStorage($db, 'game_env');
-      $turnTerm = $gameStor->getValue('turnterm');
+      $turnTerm = abs($gameStor->getValue('turnterm'));
 
       //연장 요청이 있었다.
       $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(

hwe/sammo/AuctionBasicResource.php

@@ -58,7 +58,7 @@ abstract class AuctionBasicResource extends Auction
 
     $now = new \DateTimeImmutable();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $turnTerm = $gameStor->getValue('turnterm');
+    $turnTerm = abs($gameStor->getValue('turnterm'));
     $closeDate = $now->add(TimeUtil::secondsToDateInterval($closeTurnCnt * $turnTerm * 60));
 
     $openResult = static::openAuction(new AuctionInfo(
@@ -246,7 +246,13 @@ abstract class AuctionBasicResource extends Auction
       $db = DB::db();
       $gameStor = KVStorage::getStorage($db, 'game_env');
       $turnTerm = $gameStor->getValue('turnterm');
-      $date = (new DateTimeImmutable())->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
+      if($turnTerm == -60){
+        $date = VarTurn60::fromDatetime(new \DateTimeImmutable())->addTurn(1)->toDateStr();
+      }
+      else{
+        $date = (new DateTimeImmutable())->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
+      }
+      
       $this->shrinkCloseDate($date);
     }
 

hwe/sammo/AuctionUniqueItem.php

@@ -75,6 +75,7 @@ class AuctionUniqueItem extends Auction
     $now = new DateTimeImmutable();
 
     [$turnTerm, $year, $month] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month']);
+    $turnTerm = abs($turnTerm);
 
     $closeDate = $now->add(TimeUtil::secondsToDateInterval(
       max(static::MIN_AUCTION_CLOSE_MINUTES, $turnTerm * static::COEFF_AUCTION_CLOSE_MINUTES) * 60
@@ -266,7 +267,7 @@ class AuctionUniqueItem extends Auction
     }
 
     if ($availableEquipUniqueCnt <= 0) {
-      $turnTerm = $gameStor->getValue('turnterm');
+      $turnTerm = abs($gameStor->getValue('turnterm'));
       //제한에 걸렸다면 자동 연장
       $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
         max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT) * 60
@@ -314,7 +315,7 @@ class AuctionUniqueItem extends Auction
 
     if (!$availableItemTypes) {
       if ($isExtendCloseDateRequired) {
-        $turnTerm = $gameStor->getValue('turnterm');
+        $turnTerm = abs($gameStor->getValue('turnterm'));
         //동일 부위 제한에 걸렸다면 자동 연장
         $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
           max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID) * 60

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) {
+        foreach (DB::db()->query('SELECT city, region, secu, level from city where nation = %i', $general->getNationID()) as $city) {
-            $ownCities[$city['city']] = 1;
+            $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;
+                /** @var ?\sammo\GameUnitConstraints\ReqTech */
-                $crewObj->reqYear = $unit->reqYear;
+                $reqTechObj = $unit->reqConstraints['ReqTech'] ?? null;
+                $crewObj->reqTech = $reqTechObj ? $reqTechObj->reqTech : 0;
 
-                /*
+                /** @var ?\sammo\GameUnitConstraint\ReqMinRelYear */
-                if ($unit->reqTech == 0) {
+                $reqMinRelYearObj = $unit->reqConstraints['reqMinRelYear'] ?? null;
-                    $crewObj->bgcolor = 'green';
+                $crewObj->reqYear = $reqMinRelYearObj ? $reqMinRelYearObj->reqMinRelYear : 0;
-                } else {
-                    $crewObj->bgcolor = 'limegreen';
-                }
-                */
 
-                $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

@@ -200,7 +200,7 @@ class che_불가침제의 extends Command\NationCommand
 
         $now = new \DateTime($date);
         $validUntil = new \DateTime($date);
-        $validMinutes = max(30, $env['turnterm'] * 3);
+        $validMinutes = max(30, abs($env['turnterm']) * 3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 
         $josaWa = JosaUtil::pick($nationName, '와');

hwe/sammo/Command/Nation/che_불가침파기제의.php

@@ -149,7 +149,7 @@ class che_불가침파기제의 extends Command\NationCommand{
 
         $now = new \DateTime($date);
         $validUntil = new \DateTime($date);
-        $validMinutes = max(30, $env['turnterm']*3);
+        $validMinutes = max(30, abs($env['turnterm'])*3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 
         $msg = new DiplomaticMessage(

hwe/sammo/Command/Nation/che_종전제의.php

@@ -147,7 +147,7 @@ class che_종전제의 extends Command\NationCommand{
 
         $now = new \DateTime($date);
         $validUntil = new \DateTime($date);
-        $validMinutes = max(30, $env['turnterm']*3);
+        $validMinutes = max(30, abs($env['turnterm'])*3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 
         $msg = new DiplomaticMessage(

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/che_행동지시.php

@@ -0,0 +1,204 @@
+<?php
+
+namespace sammo\Command\Nation;
+
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+
+use \sammo\Constraint\Constraint;
+use \sammo\Constraint\ConstraintHelper;
+use sammo\Enums\GeneralQueryMode;
+use sammo\StaticEventHandler;
+
+use function sammo\pullGeneralCommand;
+use function sammo\pushGeneralCommand;
+
+class che_행동지시 extends Command\NationCommand
+{
+    static protected $actionName = '행동 지시';
+    static public $reqArg = true;
+
+    protected function argTest(): bool
+    {
+        if ($this->arg === null) {
+            return false;
+        }
+        if (!key_exists('isPull', $this->arg)) {
+            return false;
+        }
+        if (!key_exists('amount', $this->arg)) {
+            return false;
+        }
+        if (!key_exists('destGeneralID', $this->arg)) {
+            return false;
+        }
+        $isPull = $this->arg['isPull'];
+        $amount = $this->arg['amount'];
+        $destGeneralID = $this->arg['destGeneralID'];
+        if (!is_numeric($amount)) {
+            return false;
+        }
+        
+        if ($amount <= 0) {
+            return false;
+        }
+        if (!is_bool($isPull)) {
+            return false;
+        }
+        if (!is_int($destGeneralID)) {
+            return false;
+        }
+        if ($destGeneralID <= 0) {
+            return false;
+        }
+        $amount = Util::clamp($amount, 1, 5);
+
+        $this->arg = [
+            'isPull' => $isPull,
+            'amount' => $amount,
+            'destGeneralID' => $destGeneralID
+        ];
+        return true;
+    }
+
+    protected function init()
+    {
+        $general = $this->generalObj;
+
+        $this->setCity();
+        $this->setNation();
+
+        $this->minConditionConstraints = [
+            ConstraintHelper::NotBeNeutral(),
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::SuppliedCity(),
+        ];
+    }
+
+    protected function initWithArg()
+    {
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
+        $this->setDestGeneral($destGeneral);
+
+        if($this->arg['destGeneralID'] == $this->getGeneral()->getID()){
+            $this->fullConditionConstraints=[
+                ConstraintHelper::AlwaysFail('본인입니다')
+            ];
+            return;
+        }
+
+        $this->fullConditionConstraints = [
+            ConstraintHelper::NotBeNeutral(),
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::SuppliedCity(),
+            ConstraintHelper::ExistsDestGeneral(),
+            ConstraintHelper::FriendlyDestGeneral()
+        ];
+    }
+
+    public function getCost(): array
+    {
+        return [0, 0];
+    }
+
+    public function getPreReqTurn(): int
+    {
+        return 0;
+    }
+
+    public function getPostReqTurn(): int
+    {
+        return 0;
+    }
+
+    public function getBrief(): string
+    {
+        $isPull = $this->arg['isPull'];
+        $amount = $this->arg['amount'];
+        $actSpecificName = $isPull ? '당기기' : '미루기';
+        $destGeneral = $this->destGeneralObj;
+        return "【{$destGeneral->getName()}】 {$amount}턴 {$actSpecificName}";
+    }
+
+
+    public function run(\Sammo\RandUtil $rng): bool
+    {
+        if (!$this->hasFullConditionMet()) {
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+
+        $db = DB::db();
+
+        $general = $this->generalObj;
+        $date = $general->getTurnTime($general::TURNTIME_HM);
+
+        $isPull = $this->arg['isPull'];
+        $amount = $this->arg['amount'];
+        $destGeneral = $this->destGeneralObj;
+
+        if($isPull){
+            pullGeneralCommand($destGeneral->getID(), $amount);
+        }
+        else{
+            pushGeneralCommand($destGeneral->getID(), $amount);
+        }
+
+        $logger = $general->getLogger();
+
+        $actDestText = $isPull ? '당겼습니다.' : '미루었습니다.';
+        $actText = $isPull ? '당기도록' : '미루도록';
+        $destGeneral->getLogger()->pushGeneralActionLog("<Y>{$general->getName()}</>의 지시로 <C>{$amount}</>턴을 {$actDestText}", ActionLogger::PLAIN);
+        $logger->pushGeneralActionLog("<Y>{$destGeneral->getName()}</>에게 <C>{$amount}</>턴을 {$actText} 지시했습니다. <1>$date</>");
+
+        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $general->applyDB($db);
+        $destGeneral->applyDB($db);
+
+        return true;
+    }
+
+    public function exportJSVars(): array
+    {
+        $db = DB::db();
+        $nationID = $this->getNationID();
+        $troops = Util::convertArrayToDict($db->query('SELECT * FROM troop WHERE nation=%i', $nationID), 'troop_leader');
+        $destRawGenerals = Util::convertArrayToDict($db->queryAllLists('SELECT no,name,officer_level,npc,gold,rice,leadership,strength,intel,city,crew,train,atmos,troop FROM general WHERE nation = %i ORDER BY npc,binary(name)', $nationID), 0);
+
+        if($destRawGenerals){
+            foreach ($db->queryAllLists(
+                'SELECT general_id, brief FROM general_turn WHERE general_id IN %li AND turn_idx = 0',
+                array_keys($destRawGenerals)
+            ) as [$generalID, $brief]) {
+                if (!key_exists($generalID, $destRawGenerals)) {
+                    continue;
+                }
+                $destRawGenerals[$generalID][] = $brief;
+            }
+        }
+
+        
+        
+        return [
+            'procRes' => [
+                'troops' => $troops,
+                'generals' => array_values($destRawGenerals),
+                'generalsKey' => ['no', 'name', 'officerLevel', 'npc', 'gold', 'rice', 'leadership', 'strength', 'intel', 'cityID', 'crew', 'train', 'atmos', 'troopID', 'turn0Brief'],
+                'cities' => \sammo\JSOptionsForCities(),
+                'amountGuide' => [1, 2, 3, 4, 5],
+                'minAmount' => 1,
+                'maxAmount' => 5,
+            ]
+        ];
+    }
+}

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){
+        foreach($db->query('SELECT city, region, secu, level FROM city WHERE nation = %i', $nationID) as $ownCity){
-            $ownCities[$ownCity] = 1;
+            $ownCityID = $ownCity['city'];
-            $ownRegions[CityConst::byId($ownCity)->region] = 1;
+            $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']);
+        $penaltyList = JSON::decode($this->general['penalty']);
-        if(!key_exists($checkKey->value, $peneltyList)){
+        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/Event/Action/RaiseInvader.php

@@ -120,7 +120,7 @@ class RaiseInvader extends \sammo\Event\Action
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $gameStor->setValue('isunited', 1);
 
-        $turnterm = $gameStor->turnterm;
+        $turnterm = abs($gameStor->turnterm);
         $generalCnt = $db->queryFirstField('SELECT count(*) FROM general');
 
         if ($npcEachCount < 0) {

hwe/sammo/Event/Action/UpdateNationLevel.php

@@ -134,7 +134,7 @@ class UpdateNationLevel extends \sammo\Event\Action
         if ($levelDiff) {
           //유니크 아이템 하나 돌리자
           $targetKillTurn = $env['killturn'];
-          $targetKillTurn -= 24 * 60 / $env['turnterm'];
+          $targetKillTurn -= 24 * 60 / abs($env['turnterm']);
           $nationGenIDList = $db->queryFirstColumn(
             'SELECT no FROM general WHERE nation = %i AND killturn >= %i AND npc < 2',
             $nation['nation'],

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;
 
@@ -376,6 +384,7 @@ class GameConstBase
             'che_포상',
             'che_몰수',
             'che_부대탈퇴지시',
+            'che_행동지시',
         ],
         '외교' => [
             'che_물자원조',