요양 깃수 추가

- 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) : ?>
-            <form method=post action=c_tournament.php>
-                <tr>
-                    <td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td>
-                </tr>
-                <tr>
-                    <td colspan=8>
-                        <button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button>
-                        <?php if ($admin['tournament'] == 0) : ?>
-                            <select name=trig size=1 style=color:white;background-color:black;>
-                                <option style=color:white; value=0 <?= !$admin['tnmt_trig'] ? 'selected' : '' ?>>수동진행</option>
-                                <option style=color:white; value=1 <?= $admin['tnmt_trig'] ? 'selected' : '' ?>>자동진행</option>
-                            </select>
-                            <input type=submit name=btn value='자동개최설정'>
-                        <?php else : ?>
-                            <input type=submit name=btn value='중단' onclick='return confirm("진짜 중단하시겠습니까?")'>
-                        <?php endif; ?>
-
-
-                        <?php switch ($admin['tournament']) {
-                            case 1:
-                                echo "<input type=submit name=btn value='랜덤투입'>";
-                                echo "<input type=submit name=btn value='랜덤전부투입'>";
-                                break;
-                            case 2:
-                                echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
-                                break;
-                            case 3:
-                                echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
-                                break;
-                            case 4:
-                                echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
-                                break;
-                            case 5:
-                                echo "<input type=submit name=btn value='배정'>";
-                                break;
-                            case 6:
-                                echo "<input type=submit name=btn value='베팅마감'>";
-                                break;
-                            case 7:
-                                echo "<input type=submit name=btn value='16강'>";
-                                break;
-                            case 8:
-                                echo "<input type=submit name=btn value='8강'>";
-                                break;
-                            case 9:
-                                echo "<input type=submit name=btn value='4강'>";
-                                break;
-                            case 10:
-                                echo "<input type=submit name=btn value='결승'>";
-                                break;
-                        } ?>
-
-                    </td>
-                </tr>
-            </form>
-        <?php elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
+        <?php if ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
             <form method=post action=c_tournament.php>
                 <tr>
                     <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button><button type="submit" class="btn btn-sammo-base2" onclick='return confirm("참가비 금<?= $admin['develcost'] ?>이 필요합니다. 참가하시겠습니까?")'>참가</button><input type='hidden' name='btn' value='참가'/></td>

hwe/func.php

@@ -112,7 +112,7 @@ function GetImageURL($imgsvr, $filepath = '')
 function checkLimit($refreshScore = null)
 {
     $session = Session::getInstance();
-    if ($session->userGrade >= 4) {
+    if ($session->userGrade >= 6) {
         return 0;
     }
 
@@ -1009,7 +1009,7 @@ function increaseRefresh($type = "", $cnt = 1)
     $isunited = $gameStor->isunited;
     $opentime = $gameStor->opentime;
 
-    if ($userGrade == 6) {
+    if ($userGrade >= 6) {
         return;
     }
     if ($isunited == 2) {
@@ -1047,7 +1047,7 @@ function increaseRefresh($type = "", $cnt = 1)
 
     $logDB = FileDB::db($logPath, $serverPath . '/../f_install/sql/api_log.sql');
 
-    $ip = $_SERVER['REMOTE_ADDR'] ?? 'local';
+    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'] ?? 'local';
     $date = date('Y-m-d H:i:s');
 
     $logDB->insert('api_log', [
@@ -1107,7 +1107,7 @@ function CheckOverhead()
     $gameStor = KVStorage::getStorage($db, 'game_env');
     [$turnterm, $refreshLimit] = $gameStor->getValuesAsArray(['turnterm', 'refreshLimit']);
 
-    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * 10;
+    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * GameConst::$refreshLimitCoef;
 
 
     if ($nextRefreshLimit != $refreshLimit) {
@@ -1669,8 +1669,6 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
         $prob = 1 / ($genCount * $itemTypeCnt * 0.7 / 3); // 투표율 70%, 설문조사 한번에 2~3개 등장
     } else if ($acquireType == '랜덤 임관') {
         $prob = 1 / ($genCount * $itemTypeCnt / 10 / 2); // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
-    } else if ($acquireType == '건국') {
-        $prob = 1 / ($genCount * $itemTypeCnt / 10 / 4); // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
     }
 
     $prob *= GameConst::$uniqueTrialCoef;
@@ -1684,6 +1682,9 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
         //포인트로 랜덤 유니크 획득
         $prob = 1;
     }
+    else if ($acquireType == '건국') {
+        $prob = 1; // 건국시 100%
+    }
 
     foreach (Util::range($maxCnt) as $_idx) {
         if ($rng->nextBool($prob)) {

hwe/func_command.php

@@ -481,6 +481,13 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
     }
 
     _setNationCommand($commandObj, $turnList);
+
+    if($general->getNPCType() < 2){
+        //유저장인 경우에는 턴 리필
+        $general->updateVarWithLimit('killturn', $env['killturn'], $general->getVar('killturn'));
+        $general->applyDB($db);
+    }
+    
     return [
         'result'=>true,
         'brief'=>$commandObj->getBrief(),

hwe/func_converter.php

@@ -457,6 +457,29 @@ function buildWarUnitTriggerClass(?string $type, WarUnit $unit, ?array $args = n
     return $class->newInstanceArgs(array_merge([$unit], $args));
 }
 
+function getStaticEventClass(string $type){
+    static $basePath = __NAMESPACE__.'\\StaticEvent\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    throw new \InvalidArgumentException("{$type}은 StaticEvent가 아님");
+}
+
+function buildStaticEventClass(?string $type):BaseStaticEvent{
+    static $cache = [];
+    if(key_exists($type, $cache)){
+        return $cache[$type];
+    }
+
+    $class = getStaticEventClass($type);
+    $obj = new $class();
+    $cache[$type] = $obj;
+    return $obj;
+}
+
 function getGeneralPoolClass(string $type){
     static $basePath = __NAMESPACE__.'\\GeneralPool\\';
     $classPath = ($basePath.$type);
@@ -663,7 +686,7 @@ function TechLimit($startYear, $year, $tech) : bool {
     $relYear = $year - $startYear;
 
     $relMaxTech = Util::valueFit(
-        floor($relYear / 5) + 1,
+        floor($relYear / GameConst::$techLevelIncYear) + GameConst::$initialAllowedTechLevel,
         1,
         GameConst::$maxTechLevel
     );

hwe/func_gamerule.php

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

hwe/func_legacy.php

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

hwe/func_tournament.php

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

hwe/install_db.php

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

hwe/j_get_city_list.php

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

hwe/j_myBossInfo.php

@@ -24,9 +24,9 @@ $userID = Session::getUserID();
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$gameStor->cacheValues(['startyear', 'year', 'month', 'scenario']);
+$gameStor->cacheValues(['startyear', 'year', 'month', 'scenario', 'killturn']);
 
-$me = $db->queryFirstRow('SELECT no,nation,officer_level,penalty from general where owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no,npc,nation,officer_level,penalty from general where owner=%i', $userID);
 $myOfficerLevel = $me['officer_level'];
 $nationID = $me['nation'];
 $myPenalty = Json::decode($me['penalty'] ?? '{}');
@@ -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 '수뇌인 장수를 변경할 수 없는 상태입니다.';
     }
 
@@ -342,6 +342,10 @@ if ($action == "임명") {
                 'reason' => $result
             ]);
         }
+        //수뇌의 삭턴 리필
+        $db->update('general', [
+            'killturn' => $db->sqleval('GREATEST(%b, %i)', 'killturn', $gameStor->getValue('killturn')),
+        ], 'no=%i', $me['no']);
         Json::die([
             'result' => true,
             'reason' => 'success'
@@ -356,6 +360,10 @@ if ($action == "임명") {
                 'reason' => $result
             ]);
         }
+        //수뇌의 삭턴 리필
+        $db->update('general', [
+            'killturn' => $db->sqleval('GREATEST(%b, %i)', 'killturn', $gameStor->getValue('killturn')),
+        ], 'no=%i', $me['no']);
         Json::die([
             'result' => true,
             'reason' => 'success'
@@ -376,6 +384,10 @@ if ($action == "추방") {
             'reason' => $result
         ]);
     }
+    //수뇌의 삭턴 리필
+    $db->update('general', [
+        'killturn' => $db->sqleval('GREATEST(%b, %i)', 'killturn', $gameStor->getValue('killturn')),
+    ], 'no=%i', $me['no']);
     Json::die([
         'result' => true,
         'reason' => 'success'

hwe/j_raise_event.php

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

hwe/j_select_npc.php

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

hwe/j_set_my_setting.php

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

hwe/lib.php

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

hwe/old_index.php

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

hwe/proc.php

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

hwe/process_war.php

@@ -526,7 +526,7 @@ function DeleteConflict($nation)
 function getConquerNation($city): int
 {
     $conflict = Json::decode($city['conflict']);
-    return Util::array_first_key($conflict);
+    return array_key_first($conflict);
 }
 
 function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
@@ -718,14 +718,17 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
             $attackerLogger->pushGlobalHistoryLog("<M><b>【긴급천도】</b></><D><b>{$defenderNationName}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} 긴급천도하였습니다.");
 
             $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} <M>긴급천도</>합니다.";
-            //아국 수뇌부에게 로그 전달
-            foreach ($db->queryFirstColumn(
-                'SELECT no FROM general WHERE nation=%i AND officer_level>=5',
+            foreach ($db->queryAllLists(
+                'SELECT no, officer_level FROM general WHERE nation=%i',
                 $defenderNationID
-            ) as $defenderChiefID) {
-                $chiefLogger = new ActionLogger($defenderChiefID, $defenderNationID, $year, $month);
-                $chiefLogger->pushGeneralActionLog($moveLog, ActionLogger::PLAIN);
-                $chiefLogger->flush();
+            ) as [$defenderGeneralID, $defenderGeneralChiefLevel]) {
+                $defenderLogger = new ActionLogger($defenderGeneralID, $defenderNationID, $year, $month);
+                $defenderLogger->pushGeneralActionLog($moveLog, ActionLogger::PLAIN);
+                if($defenderGeneralChiefLevel >= 5){
+                    $defenderLogger->pushGeneralActionLog("수뇌는 <G><b>{$minCityName}</b></>{$josaRo} 집합되었습니다.");
+                }
+
+                $defenderLogger->flush();
             }
 
             //천도
@@ -782,8 +785,8 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
         'officer_set' => 0,
     ];
     if ($city['level'] > 3) {
-        $query['def'] = 1000;
-        $query['wall'] = 1000;
+        $query['def'] = GameConst::$defaultCityWall;
+        $query['wall'] = GameConst::$defaultCityWall;
     } else {
         $query['def'] = $db->sqleval('def_max/2');
         $query['wall'] = $db->sqleval('wall_max/2');

hwe/sammo/API/General/Join.php

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

hwe/sammo/API/Global/GeneralList.php

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

hwe/sammo/API/InheritAction/ResetStat.php

@@ -0,0 +1,183 @@
+<?php
+
+namespace sammo\API\InheritAction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Enums\APIRecoveryType;
+use sammo\Enums\RankColumn;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\LiteHashDRBG;
+use sammo\RandUtil;
+use sammo\UniqueConst;
+use sammo\UserLogger;
+use sammo\Util;
+use sammo\Validator;
+
+class ResetStat extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'leadership',
+            'strength',
+            'intel',
+        ])
+            ->rule('int', [
+                'leadership',
+                'strength',
+                'intel',
+            ])
+            ->rule('min', [
+                'leadership',
+                'strength',
+                'intel'
+            ], GameConst::$defaultStatMin)
+            ->rule('max', [
+                'leadership',
+                'strength',
+                'intel'
+            ], GameConst::$defaultStatMax)
+            ->rule('integerArray', 'inheritBonusStat');
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        //General.aux 쓰므로 lock;
+        return static::REQ_GAME_LOGIN;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
+    {
+        $userID = $session->userID;
+        $generalID = $session->generalID;
+
+
+        $leadership = $this->args['leadership'];
+        $strength = $this->args['strength'];
+        $intel = $this->args['intel'];
+        $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;
+
+        if ($leadership + $strength + $intel != GameConst::$defaultStatTotal) {
+            return "능력치 총합이 " . GameConst::$defaultStatTotal . "이 아닙니다. 다시 입력해주세요!";
+        }
+
+        if ($inheritBonusStat) {
+            if (count($inheritBonusStat) != 3) {
+                return "보너스 능력치가 잘못 지정되었습니다. 다시 입력해주세요!";
+            }
+            foreach ($inheritBonusStat as $stat) {
+                if ($stat < 0) {
+                    return "보너스 능력치가 음수입니다. 다시 입력해주세요!";
+                }
+            }
+            $sum = array_sum($inheritBonusStat);
+            if ($sum == 0) {
+                $inheritBonusStat = null;
+            } else if ($sum < 3 || $sum > 5) {
+                return "보너스 능력치 합이 잘못 지정되었습니다. 다시 입력해주세요!";
+            }
+        }
+
+        $general = General::createObjFromDB($generalID);
+        if ($userID != $general->getVar('owner')) {
+            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
+        }
+        $userLogger = new UserLogger($userID);
+
+        if($general->getNPCType() != 0){
+            return 'NPC는 능력치 초기화를 할 수 없습니다.';
+        }
+
+
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $gameStor->cacheValues([
+            'isunited',
+            'season',
+        ]);
+        if ($gameStor->isunited) {
+            return '이미 천하가 통일되었습니다.';
+        }
+        $userStor = KVStorage::getStorage($db, "user_{$userID}");
+
+        $lastUserStatReset = $userStor->getValue('last_stat_reset') ?? [];
+        $gameSeason = $gameStor->getValue('season');
+
+        if (array_search($gameSeason, $lastUserStatReset) !== false) {
+            return '이번 시즌에 이미 능력치를 초기화하셨습니다.';
+        }
+
+
+        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
+        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
+        $reqAmount = 0;
+        if ($inheritBonusStat !== null) {
+            $reqAmount += GameConst::$inheritBornStatPoint;
+        }
+
+        if ($previousPoint < $reqAmount) {
+            return '충분한 유산 포인트를 가지고 있지 않습니다.';
+        }
+
+        $userLogger->push("통솔 {$leadership}, 무력 {$strength}, 지력 {$intel} 스탯 재설정", "inheritPoint");
+
+        if ($inheritBonusStat) {
+            $pleadership = $inheritBonusStat[0] ?? 0;
+            $pstrength = $inheritBonusStat[1] ?? 0;
+            $pintel = $inheritBonusStat[2] ?? 0;
+            $userLogger->push("{$reqAmount}로 통솔 {$pleadership}, 무력 {$pstrength}, 지력 {$pintel} 보너스 능력치 적용", "inheritPoint");
+        } else {
+            $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+                UniqueConst::$hiddenSeed,
+                'ResetStat',
+                $userID,
+            )));
+            $pleadership = 0;
+            $pstrength = 0;
+            $pintel = 0;
+            foreach (Util::range($rng->nextRangeInt(3, 5)) as $statIdx) {
+                switch ($rng->choiceUsingWeight([$leadership, $strength, $intel])) {
+                    case 0:
+                        $pleadership++;
+                        break;
+                    case 1:
+                        $pstrength++;
+                        break;
+                    case 2:
+                        $pintel++;
+                        break;
+                }
+            }
+            $userLogger->push("통솔 {$pleadership}, 무력 {$pstrength}, 지력 {$pintel} 보너스 능력치 적용", "inheritPoint");
+        }
+
+        $leadership += $pleadership;
+        $strength += $pstrength;
+        $intel += $pintel;
+
+        $lastUserStatReset[] = $gameSeason;
+
+
+        $general->setVar('leadership', $leadership);
+        $general->setVar('strength', $strength);
+        $general->setVar('intel', $intel);
+
+        $userLogger->flush();
+
+        $inheritStor->setValue('previous', [$previousPoint - $reqAmount, null]);
+        $userStor->setValue('last_stat_reset', $lastUserStatReset);
+        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqAmount);
+        $general->applyDB($db);
+        return null;
+    }
+}

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/API/Troop/ExitTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 
 class ExitTroop extends \sammo\BaseAPI
 {
@@ -24,23 +27,35 @@ class ExitTroop extends \sammo\BaseAPI
     $generalID = $session->generalID;
     $db = DB::db();
 
-    $troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
+    $me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    if (!$me) {
+      return '장수 정보를 불러올 수 없습니다.';
+    }
+
+    $troopID = $me->getVar('troop');
     if($troopID == 0){
       return '부대에 소속되어 있지 않습니다.';
     }
 
-    if($generalID != $troopID){
-      $db->update('general', [
-        'troop' => 0,
-      ], '`no` = %i', $generalID);
+    if($troopID != $generalID){
+      StaticEventHandler::handleEvent($me, null, $this::class, [
+        "isTroopLeader" => false,
+      ], $this->args);
+      $me->setVar('troop', 0);
+      $me->applyDB($db);
       return null;
     }
 
     //부대장이다.
+    StaticEventHandler::handleEvent($me, null, $this::class, [
+      "isTroopLeader" => true,
+    ], $this->args);
     $db->update('general', [
       'troop' => 0,
     ], '`troop` = %i', $troopID);
     $db->delete('troop', 'troop_leader = %i', $troopID);
+    $me->setVar('troop', 0);
+    $me->applyDB($db);
 
     return null;
   }

hwe/sammo/API/Troop/JoinTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\StringUtil;
 use sammo\Validator;
 
@@ -32,16 +35,22 @@ class JoinTroop extends \sammo\BaseAPI
 
   public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
   {
-    $userID = $session->userID;
+    $generalID = $session->generalID;
     $troopID = $this->args['troopID'];
 
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
-    if ($me['troop'] != 0) {
+
+    $me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    if(!$me){
+      return '장수 정보를 불러올 수 없습니다.';
+    }
+
+    if($me->getVar('troop') != 0){
       return '이미 부대에 소속되어 있습니다.';
     }
-    $nationID = $me['nation'];
-    if ($nationID == 0) {
+
+    $nationID = $me->getNationID();
+    if($nationID == 0){
       return '국가에 소속되어 있지 않습니다.';
     }
 
@@ -49,11 +58,10 @@ class JoinTroop extends \sammo\BaseAPI
     if (!$troopExists) {
       return '부대가 올바르지 않습니다.';
     }
-    $generalID = $me['no'];
 
-    $db->update('general', [
-      'troop' => $troopID,
-    ], '`no` = %i AND `troop` = %i', $generalID, 0);
+    $me->setVar('troop', $troopID);
+    StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
+    $me->applyDB($db);
 
     return null;
   }

hwe/sammo/API/Troop/KickFromTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\Validator;
 
 class KickFromTroop extends \sammo\BaseAPI
@@ -37,7 +40,8 @@ class KickFromTroop extends \sammo\BaseAPI
     $generalID = $this->args['generalID'];
     $db = DB::db();
 
-    $troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
+    $destGeneral = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    $troopID = $destGeneral->getVar('troop');
     if($troopID == 0){
       return '부대에 소속되어 있지 않습니다.';
     }
@@ -50,9 +54,10 @@ class KickFromTroop extends \sammo\BaseAPI
       return '부대장을 추방할 수 없습니다.';
     }
 
-    $db->update('general', [
-      'troop' => 0,
-    ], '`no` = %i AND `troop` = %i', $generalID, $troopID);
+    StaticEventHandler::handleEvent($destGeneral, null, $this::class, [], $this->args);
+    $destGeneral->setVar('troop', 0);
+    $destGeneral->applyDB($db);
+    
     return null;
   }
 }

hwe/sammo/API/Troop/NewTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\StringUtil;
 use sammo\Validator;
 
@@ -32,24 +35,23 @@ class NewTroop extends \sammo\BaseAPI
 
   public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
   {
-    $userID = $session->userID;
+    $generalID = $session->generalID;
     $troopName = StringUtil::neutralize($this->args['troopName']);
     if(!$troopName){
       return '부대 이름이 없습니다.';
     }
 
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
-    if($me['troop'] != 0){
+    $me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    $troopID = $me->getVar('troop');
+    if($troopID != 0){
       return '이미 부대에 소속되어 있습니다.';
     }
-    $nationID = $me['nation'];
+    $nationID = $me->getNationID();
     if($nationID == 0){
       return '국가에 소속되어 있지 않습니다.';
     }
 
-    $generalID = $me['no'];
-
     $db->insert('troop', [
       'name'=>$troopName,
       'troop_leader'=>$generalID,
@@ -60,9 +62,9 @@ class NewTroop extends \sammo\BaseAPI
       return '부대가 생성되지 않았습니다. 버그일 수 있습니다.';
     }
 
-    $db->update('general', [
-      'troop'=>$generalID
-    ], '`no` = %i', $generalID);
+    $me->setVar('troop', $generalID);
+    StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
+    $me->applyDB($db);
 
     return null;
   }

hwe/sammo/API/Troop/SetTroopName.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\StringUtil;
 use sammo\Validator;
 
@@ -36,13 +39,12 @@ class SetTroopName extends \sammo\BaseAPI
 
   public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
   {
-    $userID = $session->userID;
+    $generalID = $session->generalID;
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
-    $permission = checkSecretPermission($me, false);
+    $me = GeneralLite::createObjFromDB($generalID, ['troop', 'permission', 'penalty'], GeneralLiteQueryMode::Lite);
+    $permission = checkSecretPermission($me->getRaw(), false);
     $troopID = $this->args['troopID'];
 
-    $generalID = $me['no'];
     if($generalID != $troopID && $permission < 4){
       return "권한이 부족합니다.";
     }
@@ -52,7 +54,7 @@ class SetTroopName extends \sammo\BaseAPI
       return '부대 이름이 없습니다.';
     }
 
-    $nationID = $me['nation'];
+    $nationID = $me->getNationID();
     $db->update('troop', [
       'name'=>$troopName
     ], 'troop_leader=%i AND `nation`=%i',$troopID, $nationID);
@@ -60,6 +62,7 @@ class SetTroopName extends \sammo\BaseAPI
     if($db->affectedRows() == 0){
       return '부대가 없습니다.';
     }
+    StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
 
     return null;
   }

hwe/sammo/API/Vote/NewVote.php

@@ -7,6 +7,7 @@ use sammo\DB;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\KVStorage;
+use sammo\RootDB;
 use sammo\Session;
 use sammo\TimeUtil;
 use sammo\Util;
@@ -93,6 +94,8 @@ class NewVote extends \sammo\BaseAPI
             }
         }
 
+        $userName = $session->userName;
+
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
 
@@ -108,9 +111,11 @@ class NewVote extends \sammo\BaseAPI
 
         $multipleOptions = Util::valueFit($multipleOptions, 0, count($options));
 
+
         $voteInfo = new VoteInfo(
             id: $voteID,
             title: $title,
+            opener: $userName ?? '[SYSTEM]',
             multipleOptions: $multipleOptions,
             startDate: $now,
             endDate: $endDate,

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

@@ -19,10 +19,14 @@ class che_저지_삼황내문 extends \sammo\BaseItem{
         if($unit->isAttacker()){
             return null;
         }
-        if($unit->getPhase() >= 2){
+
+        if($unit->getPhase() > 0){
             return null;
         }
-        if($unit->getPhase() == 1 && $unit->rng->nextBool(0.5)){
+        if($unit->hasActivatedSkillOnLog('저지') >= 2){
+            return null;
+        }
+        if($unit->hasActivatedSkillOnLog('저지') == 1 && $unit->getPhase() == 0 && $unit->rng->nextBool(0.5)){
             return null;
         }
 

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/ActionItem/event_충차.php

@@ -0,0 +1,52 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\GameUnitConst;
+use \sammo\WarUnit;
+use \sammo\WarUnitCity;
+use sammo\RandUtil;
+use \sammo\WarUnitTriggerCaller;
+use \sammo\BaseWarUnitTrigger;
+use sammo\WarUnitTrigger\event_충차아이템소모;
+
+class event_충차 extends \sammo\BaseItem{
+
+    protected $rawName = '충차';
+    protected $name = '충차';
+    protected $info = '[전투] 성벽 공격 시 대미지 +50%, 2회용';
+    protected $cost = 2000;
+    protected $consumable = true;
+    protected $buyable = true;
+    protected $reqSecu = 3000;
+
+
+    const REMAIN_KEY = 'remain충차';
+
+    function onArbitraryAction(General $general, RandUtil $rng, string $actionType, ?string $phase = null, $aux = null): ?array
+    {
+        if($actionType != '장비매매'){
+            return $aux;
+        }
+        if($phase != '구매'){
+            return $aux;
+        }
+
+        $general->setAuxVar(static::REMAIN_KEY, 2);
+        return $aux;
+    }
+
+    public function getWarPowerMultiplier(WarUnit $unit):array{
+        if($unit->getOppose() instanceof WarUnitCity){
+            return [1.5, 1];
+        }
+        return [1, 1];
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new event_충차아이템소모($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM)
+        );
+    }
+}

hwe/sammo/ActionNationType/che_병가.php

@@ -29,7 +29,7 @@ class che_병가 extends \sammo\BaseNation{
         return $value;
     }
 
-    public function onCalcNationalIncome(string $type, $amount):int{
+    public function onCalcNationalIncome(string $type, $amount){
         if($type == 'pop' && $amount > 0){
             return $amount * 0.8;
         }

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/ActionScenarioEffect/event_UnlimitedDefenceThresholdChange.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace sammo\ActionScenarioEffect;
+
+use \sammo\iAction;
+
+class event_UnlimitedDefenceThresholdChange implements iAction
+{
+    use \sammo\DefaultAction;
+
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
+    {
+        if ($turnType == 'changeDefenceTrain') {
+            return 0;
+        }
+        return $value;
+    }
+}

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

@@ -0,0 +1,11 @@
+<?php
+namespace sammo;
+
+abstract class BaseStaticEvent {
+    
+    function __construct(){
+
+    }
+
+    abstract function run(GeneralLite|General $general, null|GeneralLite|General $destGeneral, array $env, array $params): bool | string;
+}

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_NPC능동.php

@@ -7,7 +7,8 @@ use \sammo\{
     CityConst,
     ActionLogger,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -96,6 +97,7 @@ class che_NPC능동 extends Command\GeneralCommand{
 
             $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         }
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_강행.php

@@ -12,8 +12,7 @@ use function sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
-
-
+use sammo\StaticEventHandler;
 
 class che_강행 extends Command\GeneralCommand
 {
@@ -158,8 +157,8 @@ class che_강행 extends Command\GeneralCommand
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
-
         $general->applyDB($db);
 
         return true;

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

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 
@@ -15,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;
@@ -44,6 +46,7 @@ class che_거병 extends Command\GeneralCommand{
             ConstraintHelper::BeNeutral(),
             ConstraintHelper::BeOpeningPart($relYear+1),
             ConstraintHelper::AllowJoinAction(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoFoundNation),
         ];
     }
 
@@ -174,6 +177,7 @@ class che_거병 extends Command\GeneralCommand{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);

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

@@ -19,6 +19,7 @@ use function \sammo\getAllNationStaticInfo;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\PenaltyKey;
+use sammo\StaticEventHandler;
 
 use function sammo\buildNationTypeClass;
 use function sammo\genGenericUniqueRNGFromGeneral;
@@ -182,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', [
@@ -202,8 +203,10 @@ class che_건국 extends Command\GeneralCommand
         refreshNationStaticInfo();
 
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        $general->increaseInheritancePoint(InheritanceKey::unifier, 250);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_견문.php

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -112,6 +113,7 @@ class che_견문 extends Command\GeneralCommand{
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);

hwe/sammo/Command/General/che_군량매매.php

@@ -9,7 +9,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -178,6 +179,7 @@ class che_군량매매 extends Command\GeneralCommand{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);

hwe/sammo/Command/General/che_귀환.php

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -95,6 +96,7 @@ class che_귀환 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);

hwe/sammo/Command/General/che_기술연구.php

@@ -6,7 +6,8 @@ use \sammo\{
     General,
     ActionLogger,
     LastTurn,
-    Command, GameConst
+    Command, GameConst,
+    StaticEventHandler
 };
 
 use function sammo\{
@@ -134,6 +135,7 @@ class che_기술연구 extends che_상업투자{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_단련.php

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 
@@ -126,6 +127,7 @@ class che_단련 extends Command\GeneralCommand{
         $general->increaseVar($incStat, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_등용.php

@@ -9,7 +9,8 @@ use \sammo\{
     General,
     LastTurn,
     Command,
-    ScoutMessage
+    ScoutMessage,
+    StaticEventHandler
 };
 
 use function \sammo\getAllNationStaticInfo;
@@ -169,6 +170,7 @@ class che_등용 extends Command\GeneralCommand
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);

hwe/sammo/Command/General/che_등용수락.php

@@ -6,6 +6,7 @@ use \sammo\{
     General,
     GameConst,
     Command,
+    StaticEventHandler,
 };
 
 use \sammo\Constraint\ConstraintHelper;
@@ -207,6 +208,7 @@ class che_등용수락 extends Command\GeneralCommand{
         }
 
 
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
         $destGeneral->applyDB($db);
 

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

@@ -22,8 +22,7 @@ use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 use sammo\Enums\InheritanceKey;
 use sammo\MustNotBeReachedException;
-
-
+use sammo\StaticEventHandler;
 
 class che_랜덤임관 extends Command\GeneralCommand
 {
@@ -182,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'
@@ -194,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'
@@ -209,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;
                 }
 
@@ -281,6 +280,7 @@ class che_랜덤임관 extends Command\GeneralCommand
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '랜덤 임관');
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_모반시도.php

@@ -8,7 +8,8 @@ use \sammo\{
     GameConst,
     LastTurn,
     GameUnitConst,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -97,6 +98,7 @@ class che_모반시도 extends Command\GeneralCommand{
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
         $lordGeneral->applyDB($db);
 

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

@@ -18,6 +18,7 @@ use function \sammo\getAllNationStaticInfo;
 
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
+use sammo\StaticEventHandler;
 
 use function sammo\buildNationTypeClass;
 use function sammo\genGenericUniqueRNGFromGeneral;
@@ -193,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;
 
@@ -216,6 +217,7 @@ class che_무작위건국 extends Command\GeneralCommand
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_물자조달.php

@@ -8,7 +8,8 @@ use \sammo\{
     GameConst,
     LastTurn,
     GameUnitConst,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use function \sammo\getDomesticExpLevelBonus;
@@ -148,6 +149,7 @@ class che_물자조달 extends Command\GeneralCommand{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);

hwe/sammo/Command/General/che_방랑.php

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -124,6 +125,7 @@ class che_방랑 extends Command\GeneralCommand{
         refreshNationStaticInfo();
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_사기진작.php

@@ -1,13 +1,18 @@
 <?php
+
 namespace sammo\Command\General;
 
 use \sammo\{
-    DB, Util, JosaUtil,
+    DB,
+    Util,
+    JosaUtil,
     General,
     ActionLogger,
-    GameConst, GameUnitConst,
+    GameConst,
+    GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use function \sammo\tryUniqueItemLottery;
@@ -16,15 +21,18 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
 
-class che_사기진작 extends Command\GeneralCommand{
+class che_사기진작 extends Command\GeneralCommand
+{
     static protected $actionName = '사기진작';
 
-    protected function argTest():bool{
+    protected function argTest(): bool
+    {
         $this->arg = null;
         return true;
     }
 
-    protected function init(){
+    protected function init()
+    {
 
         $general = $this->generalObj;
 
@@ -33,13 +41,13 @@ class che_사기진작 extends Command\GeneralCommand{
 
         [$reqGold, $reqRice] = $this->getCost();
 
-        $this->minConditionConstraints=[
+        $this->minConditionConstraints = [
             ConstraintHelper::NotBeNeutral(),
             ConstraintHelper::NotWanderingNation(),
             ConstraintHelper::OccupiedCity(),
         ];
 
-        $this->fullConditionConstraints=[
+        $this->fullConditionConstraints = [
             ConstraintHelper::NotBeNeutral(),
             ConstraintHelper::NotWanderingNation(),
             ConstraintHelper::OccupiedCity(),
@@ -48,31 +56,35 @@ class che_사기진작 extends Command\GeneralCommand{
             ConstraintHelper::ReqGeneralRice($reqRice),
             ConstraintHelper::ReqGeneralAtmosMargin(GameConst::$maxAtmosByCommand),
         ];
-
     }
 
-    public function getCommandDetailTitle():string{
+    public function getCommandDetailTitle(): string
+    {
         $name = $this->getName();
         //[$reqGold, $reqRice] = $this->getCost();
 
         return "{$name}(통솔경험, 자금↓)";
     }
 
-    public function getCost():array{
+    public function getCost(): array
+    {
         $general = $this->generalObj;
-        return [Util::round($general->getVar('crew')/100), 0];
+        return [Util::round($general->getVar('crew') / 100), 0];
     }
 
-    public function getPreReqTurn():int{
+    public function getPreReqTurn(): int
+    {
         return 0;
     }
 
-    public function getPostReqTurn():int{
+    public function getPostReqTurn(): int
+    {
         return 0;
     }
 
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
+    public function run(\Sammo\RandUtil $rng): bool
+    {
+        if (!$this->hasFullConditionMet()) {
             throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
         }
 
@@ -81,7 +93,11 @@ class che_사기진작 extends Command\GeneralCommand{
         $general = $this->generalObj;
         $date = $general->getTurnTime($general::TURNTIME_HM);
 
-        $score = Util::round($general->getLeadership() * 100 / $general->getVar('crew') * GameConst::$atmosDelta);
+        $score = Util::clamp(
+            Util::round($general->getLeadership() * 100 / $general->getVar('crew') * GameConst::$atmosDelta),
+            0,
+            Util::clamp(GameConst::$maxAtmosByCommand - $general->getVar('atmos'), 0),
+        );
         $scoreText = number_format($score, 0);
 
         $sideEffect = Util::valueFit(intval($general->getVar('train') * GameConst::$trainSideEffectByAtmosTurn), 0);
@@ -93,7 +109,7 @@ class che_사기진작 extends Command\GeneralCommand{
         $exp = 100;
         $ded = 70;
 
-        $general->increaseVarWithLimit('atmos', $score, 0, GameConst::$maxAtmosByCommand);
+        $general->increaseVar('atmos', $score);
         $general->setVar('train', $sideEffect);
 
         $general->addDex($general->getCrewTypeObj(), $score, false);
@@ -106,11 +122,10 @@ class che_사기진작 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;
     }
-
-
-}
+}

hwe/sammo/Command/General/che_상업투자.php

@@ -9,7 +9,8 @@ use \sammo\{
     LastTurn,
     GameUnitConst,
     Command,
-    RandUtil
+    RandUtil,
+    StaticEventHandler
 };
 
 use function \sammo\getDomesticExpLevelBonus;
@@ -218,6 +219,7 @@ class che_상업투자 extends Command\GeneralCommand{
         $general->increaseVar(static::$statKey.'_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

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

@@ -21,6 +21,9 @@ 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
 {
@@ -110,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();
@@ -138,6 +149,7 @@ class che_선양 extends Command\GeneralCommand
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
         $destGeneral->applyDB($db);
 

hwe/sammo/Command/General/che_소집해제.php

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -80,6 +81,7 @@ class che_소집해제 extends Command\GeneralCommand{
         $general->addDedication($ded);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_숙련전환.php

@@ -13,8 +13,7 @@ use function sammo\getDexLevelList;
 use function \sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\ConstraintHelper;
-
-
+use sammo\StaticEventHandler;
 
 class che_숙련전환 extends Command\GeneralCommand
 {
@@ -179,6 +178,7 @@ class che_숙련전환 extends Command\GeneralCommand
         $general->increaseVar('leadership_exp', 2);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

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

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\Constraint;
@@ -69,6 +70,7 @@ class che_요양 extends Command\GeneralCommand{
         $general->addDedication($ded);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_은퇴.php

@@ -4,7 +4,8 @@ namespace sammo\Command\General;
 use \sammo\{
     DB,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\ConstraintHelper;
@@ -75,6 +76,7 @@ class che_은퇴 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("은퇴하였습니다. <1>$date</>");
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_이동.php

@@ -12,8 +12,7 @@ use function sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
-
-
+use sammo\StaticEventHandler;
 
 class che_이동 extends Command\GeneralCommand
 {
@@ -164,6 +163,7 @@ class che_이동 extends Command\GeneralCommand
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);

hwe/sammo/Command/General/che_인재탐색.php

@@ -18,6 +18,7 @@ use function \sammo\pickGeneralFromPool;
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
+use sammo\StaticEventHandler;
 
 class che_인재탐색 extends Command\GeneralCommand
 {
@@ -218,6 +219,7 @@ class che_인재탐색 extends Command\GeneralCommand
         $general->increaseVar($incStat, 3);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
         return true;

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

@@ -9,7 +9,8 @@ use \sammo\{
     GameConst,
     LastTurn,
     Command,
-    KVStorage
+    KVStorage,
+    StaticEventHandler
 };
 
 use function \sammo\tryUniqueItemLottery;
@@ -175,6 +176,7 @@ class che_임관 extends Command\GeneralCommand
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_장비매매.php

@@ -14,7 +14,8 @@ use \sammo\{
     GameUnitConst,
     LastTurn,
     Command,
-    KVStorage
+    KVStorage,
+    StaticEventHandler
 };
 
 use function \sammo\buildItemClass;
@@ -196,6 +197,7 @@ class che_장비매매 extends Command\GeneralCommand
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_장수대상임관.php

@@ -9,7 +9,8 @@ use \sammo\{
     LastTurn,
     Command,
     Json,
-    KVStorage
+    KVStorage,
+    StaticEventHandler
 };
 
 use function sammo\getAllNationStaticInfo;
@@ -170,6 +171,7 @@ class che_장수대상임관 extends Command\GeneralCommand{
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_전투태세.php

@@ -8,7 +8,8 @@ use \sammo\{
     GameConst, GameUnitConst,
     LastTurn,
     Command,
-    MustNotBeReachedException
+    MustNotBeReachedException,
+    StaticEventHandler
 };
 
 use function \sammo\tryUniqueItemLottery;
@@ -121,6 +122,7 @@ class che_전투태세 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 3);
         $this->setResultTurn($turnResult);
         $general->checkStatChange();
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_전투특기초기화.php

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use function \sammo\tryUniqueItemLottery;
@@ -103,6 +104,7 @@ class che_전투특기초기화 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("새로운 {$specialName}를 가질 준비가 되었습니다. <1>$date</>");
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_접경귀환.php

@@ -7,7 +7,8 @@ use \sammo\{
     ActionLogger,
     GameConst, GameUnitConst,
     LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };
 
 use \sammo\Constraint\ConstraintHelper;
@@ -98,6 +99,7 @@ class che_접경귀환 extends Command\GeneralCommand{
         //TODO: InstantAction일때에만 설정하지 않는게 나은데..
         //$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
 
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
         $general->applyDB($db);
 
         return true;