빙의 금지 장수 포함

iconPath 재설정, 100에서 29로 숫자 조절
롤 시나리오 1.0으로 업데이트, 비급 and/or 파죽지세도 추가
2024-12-05 00:04:10 -08:00 · 2024-12-04 23:26:54 -08:00 · 2024-12-04 23:04:36 -08:00 · 2024-12-02 19:21:45 -08:00 · 2024-11-27 17:42:28 +09:00 · 2024-11-27 00:11:52 -08:00
131 changed files with 4661 additions and 434 deletions
@@ -32,8 +32,10 @@ if ($type <= 0 || $type > 15) {
 }

 $ownerNameList = [];
-foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
-    $ownerNameList[$ownerID] = $ownerName;
+if ($gameStor->isunited) {
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+        $ownerNameList[$ownerID] = $ownerName;
+    }
 }

 ?>
@@ -52,15 +54,6 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
    <?= WebUtil::printDist('vue', [], true) ?>
    <?= WebUtil::printDist('ts', 'common') ?>

-    <style>
-        .hidden {
-            display: none;
-        }
-
-        .generalName:hover > .hidden {
-            display: block;
-        }
-    </style>
 </head>

 <body>
@@ -175,11 +168,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
        $name = formatName($general['name'], $general['npc']);

        if (key_exists($general['owner'], $ownerNameList)) {
-            if ($gameStor->isunited) {
-                $name = $name . '<br><small class=\'userName\'>(' . $ownerNameList[$general['owner']] . ')</small>';
-            } else {
-                $name = $name . '<br><small class=\'userName hidden\'>(' . $ownerNameList[$general['owner']] . ')</small>';
-            }
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
        }

        $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
@@ -196,7 +185,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
        data-npc-type='{$general['npc']}'
    >
        <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
-        <td align=center class='generalName' onclick=''>$name</td>
+        <td align=center>$name</td>
        <td align=center>{$general['age']}세</td>
        <td align=center>" . displayCharInfo($general['personal']) . "</td>
        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
@@ -136,13 +136,21 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                                <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
                            <?php endforeach; ?>
                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>
-                            <?php if($changeDefence999Train != 0 || $changeDefence999Train != 0):
-                            ?>[<?=$changeDefence999Train!=0?"훈련 {$changeDefence999Train},":''?><?=$changeDefence999Atmos!=0?"사기 {$changeDefence999Atmos}":''
-                            ?>]<?php endif?></option>
+                                <?php if ($changeDefence999Train != 0 || $changeDefence999Train != 0) :
+                                ?>[<?= $changeDefence999Train != 0 ? "훈련 {$changeDefence999Train}," : '' ?><?= $changeDefence999Atmos != 0 ? "사기 {$changeDefence999Atmos}" : ''
+                                                                                                ?>]<?php endif ?></option>
                        </select>
                        】<br><br>
                        <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
                        ∞<span style='color:orange'>설정저장은 이달중 <?= $myset ?>회 남았습니다.</span><br><br>
+
+                        <?php if ($me->getPenaltyList()->count()) : ?>
+                            징계 목록(저장 시 갱신)<br>
+                            <?php foreach ($me->getPenaltyList() as $penaltyKey => $penalty) : ?>
+                                <span style='color:red'><?= $penaltyKey->getHelptext() ?> : <?= $penalty ?></span><br>
+                            <?php endforeach; ?>
+                            <br />
+                        <?php endif; ?>
                        <?php if (!($gameStor->autorun_user['limit_minutes'] ?? false)) : ?>
                            휴 가 신 청<br>
                            <button type="button" id='vacation' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>휴가 신청</button><br><br>
@@ -9,6 +9,7 @@ use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;
 use sammo\Enums\RankColumn;

 require_once 'process_war.php';
@@ -376,11 +377,11 @@ function myNationInfo(General $generalObj)
 function checkSecretMaxPermission($penalty)
 {
    $secretMax = 4;
-    if ($penalty['noTopSecret'] ?? false) {
+    if ($penalty[PenaltyKey::NoTopSecret->value] ?? false) {
        $secretMax = 1;
-    } else if ($penalty['noChief'] ?? false) {
+    } else if ($penalty[PenaltyKey::NoChief->value] ?? false) {
        $secretMax = 1;
-    } else if ($penalty['noAmbassador'] ?? false) {
+    } else if ($penalty[PenaltyKey::NoAmbassador->value] ?? false) {
        $secretMax = 2;
    }
    return $secretMax;
@@ -403,7 +404,7 @@ function checkSecretPermission(array $me, $checkSecretLimit = true)
    }


-    if ($penalty['noSecret'] ?? false) {
+    if ($penalty[PenaltyKey::NoChief->value] ?? false) {
        return 0;
    }

@@ -1106,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) {
@@ -1668,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;
@@ -1683,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)) {
@@ -3,6 +3,7 @@ namespace sammo;

 use sammo\Command\GeneralCommand;
 use sammo\Command\NationCommand;
+use sammo\Enums\PenaltyKey;

 function getGeneralTurnBrief(General $generalObj, array $turnList) {
    $result = [];
@@ -434,6 +435,13 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
        ];
    }

+    if($general->hasPenalty(PenaltyKey::NoChiefTurnInput)){
+        return [
+            'result'=>false,
+            'reason'=>'수뇌 턴 입력 불가능'
+        ];
+    }
+
    try{
        $commandObj = buildNationCommandClass($command, $general, $env, $general->getLastTurn(), $arg);
    }
@@ -473,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(),
@@ -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);
@@ -372,7 +372,7 @@ function postUpdateMonthly(RandUtil $rng)
            continue;
        }

-        //양측 기간 모두 0이 되는 상황이면 휴전
+        //양측 기간 모두 0이 되는 상황이면 종전
        $nation1 = getNationStaticInfo($me);
        $name1 = $nation1['name'];
        $nation2 = getNationStaticInfo($you);
@@ -381,7 +381,7 @@ function postUpdateMonthly(RandUtil $rng)
        $josaWa = JosaUtil::pick($name1, '와');
        $josaYi = JosaUtil::pick($name2, '이');

-        $globalLogger->pushGlobalHistoryLog("<R><b>【휴전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>휴전</>합니다.");
+        $globalLogger->pushGlobalHistoryLog("<R><b>【종전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>종전</>합니다.");
        $db->update('diplomacy', [
            'state' => 2,
            'term' => 0,
@@ -1,9 +1,12 @@
 <?php
+
 namespace sammo;

+use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\MessageType;
+use sammo\Enums\PenaltyKey;

 include "lib.php";
 include "func.php";
@@ -21,92 +24,99 @@ $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 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'] ?? '{}');

 //수뇌가 아니면 아무것도 할 수 없음
-if($myOfficerLevel < 5){
+if ($myOfficerLevel < 5) {
    Json::die([
-        'result'=>false,
-        'reason'=>'수뇌가 아닙니다.'
+        'result' => false,
+        'reason' => '수뇌가 아닙니다.'
    ]);
 }

-if($action === '추방' && $destGeneralID==0){
+if ($action === '추방' && $destGeneralID == 0) {
    Json::die([
-        'result'=>false,
-        'reason'=>'장수가 지정되지 않았습니다.'
+        'result' => false,
+        'reason' => '장수가 지정되지 않았습니다.'
    ]);
 }

-if($destGeneralID==0){
+if ($destGeneralID == 0) {
    $general = new DummyGeneral(true);
    $general->setVar('nation', $nationID);
-}
-else{
+} else {
    $general = General::createObjFromDB($destGeneralID);

-    if($general instanceof DummyGeneral){
+    if ($general instanceof DummyGeneral) {
        Json::die([
-            'result'=>false,
-            'reason'=>'올바르지 않은 장수입니다.'
+            'result' => false,
+            'reason' => '올바르지 않은 장수입니다.'
        ]);
    }

-    if($nationID != $general->getNationID()){
+    if ($nationID != $general->getNationID()) {
        Json::die([
-            'result'=>false,
-            'reason'=>'아국 장수가 아닙니다'
+            'result' => false,
+            'reason' => '아국 장수가 아닙니다'
        ]);
    }
 }

-if($officerLevel == 12){
+if ($officerLevel == 12) {
    Json::die([
-        'result'=>false,
-        'reason'=>'군주를 대상으로 할 수 없습니다.'
+        'result' => false,
+        'reason' => '군주를 대상으로 할 수 없습니다.'
    ]);
 }

-function do수뇌임명(General $general, int $targetOfficerLevel):?string{
+function do수뇌임명(General $general, int $targetOfficerLevel): ?string
+{
+    global $myPenalty;
+
+    if ($myPenalty[PenaltyKey::NoChiefChange->value] ?? false) {
+        return '수뇌를 임명할 수 없는 상태입니다.';
+    }
+
    $generalID = $general->getID();
    $nationID = $general->getNationID();

+    if($general->hasPenalty(PenaltyKey::NoChief)){
+        return '수뇌가 될 수 없는 상태입니다.';
+    }
+
    $db = DB::db();

-    [$chiefSet, $nationLevel] = $db->queryFirstList('SELECT chief_set,level FROM nation WHERE nation = %i',$nationID);
+    [$chiefSet, $nationLevel] = $db->queryFirstList('SELECT chief_set,level FROM nation WHERE nation = %i', $nationID);

-	// 임명가능 레벨
+    // 임명가능 레벨
    $lv = getNationChiefLevel($nationLevel);

-    if($targetOfficerLevel < $lv){
+    if ($targetOfficerLevel < $lv) {
        return '임명불가능한 관직입니다.';
    }

-    if(isOfficerSet($chiefSet, $targetOfficerLevel)){
+    if (isOfficerSet($chiefSet, $targetOfficerLevel)) {
        return '지금은 임명할 수 없습니다.';
    }

    //기존 장수 일반으로
    $db->update('general', [
-        'officer_level'=>1,
-        'officer_city'=>0,
+        'officer_level' => 1,
+        'officer_city' => 0,
    ], 'nation=%i AND officer_level=%i AND no!=%i', $nationID, $targetOfficerLevel, $generalID);

-    if($targetOfficerLevel === 11){
-
-    }
-    else if($targetOfficerLevel % 2 == 0){
-        if($general->getVar('strength') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 11) {
+    } else if ($targetOfficerLevel % 2 == 0) {
+        if ($general->getVar('strength') < GameConst::$chiefStatMin) {
            return '무력이 부족합니다.';
        }
-
-    }
-    else{
-        if($general->getVar('intel') < GameConst::$chiefStatMin){
+    } else {
+        if ($general->getVar('intel') < GameConst::$chiefStatMin) {
            return '지력이 부족합니다.';
        }
    }
@@ -115,52 +125,59 @@ function do수뇌임명(General $general, int $targetOfficerLevel):?string{
    $general->setVar('officer_level', $targetOfficerLevel);
    $general->setVar('officer_city', 0);
    $db->update('nation', [
-        'chief_set'=> $db->sqleval('chief_set | %i', doOfficerSet(0, $targetOfficerLevel)),
+        'chief_set' => $db->sqleval('chief_set | %i', doOfficerSet(0, $targetOfficerLevel)),
    ], 'nation=%i', $nationID);
    $general->applyDB($db);

    return null;
 }

-function do도시임명(General $general, int $cityID, int $targetOfficerLevel):?string{
+function do도시임명(General $general, int $cityID, int $targetOfficerLevel): ?string
+{
+    global $myPenalty;
+
    $nationID = $general->getNationID();

    $db = DB::db();

-    if(CityConst::byID($cityID) === null){
+    if (CityConst::byID($cityID) === null) {
        return '올바르지 않은 도시입니다';
    }

+    if ($general->getVar(GeneralColumn::officer_level) >= 4 && $myPenalty[PenaltyKey::NoChiefChange->value] ?? false) {
+        return '수뇌인 장수를 변경할 수 없는 상태입니다.';
+    }
+
    $officerSet = $db->queryFirstField('SELECT officer_set FROM city WHERE nation=%i AND city=%i', $nationID, $cityID);
-    if($officerSet === null){
+    if ($officerSet === null) {
        return '아국 도시가 아닙니다';
    }

-    if(isOfficerSet($officerSet, $targetOfficerLevel)){
+    if (isOfficerSet($officerSet, $targetOfficerLevel)) {
        return '이미 다른 장수가 임명되어있습니다';
    }

    //기존 장수 일반으로
    $db->update('general', [
-        'officer_level'=>1,
-        'officer_city'=>0,
+        'officer_level' => 1,
+        'officer_city' => 0,
    ], 'officer_level=%i AND officer_city=%i AND no!=%i', $targetOfficerLevel, $cityID, $general->getID());

-    if($general instanceof DummyGeneral){
+    if ($general instanceof DummyGeneral) {
        return null;
    }

-    if($targetOfficerLevel === 4 && $general->getVar('strength') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 4 && $general->getVar('strength') < GameConst::$chiefStatMin) {
        return '무력이 부족합니다.';
    }

-    if($targetOfficerLevel === 3 && $general->getVar('intel') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 3 && $general->getVar('intel') < GameConst::$chiefStatMin) {
        return '지력이 부족합니다.';
    }

    //신임 장수
    $db->update('city', [
-        'officer_set'=>$db->sqleval('officer_set | %i', doOfficerSet(0, $targetOfficerLevel)),
+        'officer_set' => $db->sqleval('officer_set | %i', doOfficerSet(0, $targetOfficerLevel)),
    ], 'city=%i AND nation=%i', $cityID, $nationID);
    $general->setVar('officer_level', $targetOfficerLevel);
    $general->setVar('officer_city', $cityID);
@@ -169,22 +186,25 @@ function do도시임명(General $general, int $cityID, int $targetOfficerLevel):
    return null;
 }

-function do추방(General $general, int $myOfficerLevel):?string{
+function do추방(General $general, int $myOfficerLevel): ?string
+{
    $generalID = $general->getID();
    $generalName = $general->getVar('name');
    $nationID = $general->getNationID();

-
+    if ($myPenalty[PenaltyKey::NoBanGeneral->value] ?? false) {
+        return '추방할 수 없는 상태입니다.';
+    }

    //추방할사람이 외교권자이면 불가
    $permission = checkSecretPermission($general->getRaw());
-    if($permission == 4){
+    if ($permission == 4) {
        return '외교권자는 추방할 수 없습니다.';
    }

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $env = $gameStor->getValues(['startyear','year','month','scenario']);
+    $env = $gameStor->getValues(['startyear', 'year', 'month', 'scenario']);

    $nation = $db->queryFirstRow('SELECT name,chief_set,color FROM nation WHERE nation=%i', $nationID);
    $nationName = $nation['name'];
@@ -192,17 +212,17 @@ function do추방(General $general, int $myOfficerLevel):?string{
    $logger = $general->getLogger();

    //이미 지정했다면 무시
-    if(isOfficerSet($nation['chief_set'], $myOfficerLevel) || ($myOfficerLevel == 0 && $myOfficerLevel == 12)) {
+    if (isOfficerSet($nation['chief_set'], $myOfficerLevel) || ($myOfficerLevel == 0 && $myOfficerLevel == 12)) {
        return '이미 추방 권한을 사용했습니다.';
    }
    $gold = 0;
    $rice = 0;
    // 금쌀1000이상은 남김
-    if($general->getVar('gold') > GameConst::$defaultGold) {
+    if ($general->getVar('gold') > GameConst::$defaultGold) {
        $gold = $general->getVar('gold') - GameConst::$defaultGold;
        $general->setVar('gold', GameConst::$defaultGold);
    }
-    if($general->getVar('rice') > GameConst::$defaultRice) {
+    if ($general->getVar('rice') > GameConst::$defaultRice) {
        $rice = $general->getVar('rice') - GameConst::$defaultRice;
        $general->setVar('rice', GameConst::$defaultRice);
    }
@@ -220,27 +240,26 @@ function do추방(General $general, int $myOfficerLevel):?string{
    $logger->pushGeneralActionLog("<D><b>{$nationName}</b></>에서 <R>추방</>당했습니다.", ActionLogger::PLAIN);

    // 명성/공헌 N*10%감소
-    if($env['year'] <= $env['startyear'] && $general->getNPCType() < 2){
+    if ($env['year'] <= $env['startyear'] && $general->getNPCType() < 2) {
        $general->setVar('makelimit', $oldMakeLimit);
-    }
-    else{
+    } else {
        $betrayCnt = $general->getVar('betray');
-        $general->addExperience(-$general->getVar('experience')*0.15*$betrayCnt);
-        $general->addDedication(-$general->getVar('dedication')*0.15*$betrayCnt);
+        $general->addExperience(-$general->getVar('experience') * 0.15 * $betrayCnt);
+        $general->addDedication(-$general->getVar('dedication') * 0.15 * $betrayCnt);
        $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
    }

    //부대장일 경우
-    if($general->getVar('troop') == $generalID){
+    if ($general->getVar('troop') == $generalID) {
        // 모두 탈퇴
        $db->update('general', [
-            'troop'=>0,
+            'troop' => 0,
        ], 'troop = %i', $generalID);
        $db->delete('troop', 'troop_leader=%i', $generalID);
    }
    $general->setVar('troop', 0);

-    if($general->getNPCType() >= 2){
+    if ($general->getNPCType() >= 2) {
        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
            UniqueConst::$hiddenSeed,
            'BanNPC',
@@ -279,24 +298,24 @@ function do추방(General $general, int $myOfficerLevel):?string{
        }
    }

-    if($env['year'] < $env['startyear']+3) {
+    if ($env['year'] < $env['startyear'] + 3) {
        //초반엔 군주 부상 증가(엔장 임관지양)
        $db->update('general', [
-            'injury'=>$db->sqleval('least(injury + 1, %i)', 80),
+            'injury' => $db->sqleval('least(injury + 1, %i)', 80),
        ], 'nation=%i AND officer_level=12', $nationID);

        $db->update('nation', [
-            'gennum'=>$db->sqleval('gennum - %i', $general->getNPCType()!=5?1:0),
-            'gold'=>$db->sqleval('gold + %i', $gold),
-            'rice'=>$db->sqleval('rice + %i', $rice),
+            'gennum' => $db->sqleval('gennum - %i', $general->getNPCType() != 5 ? 1 : 0),
+            'gold' => $db->sqleval('gold + %i', $gold),
+            'rice' => $db->sqleval('rice + %i', $rice),
        ], 'nation = %i', $nationID);
    } else {
        //이번분기는 추방불가(초반 제외)
        $db->update('nation', [
-            'chief_set'=>$db->sqleval('chief_set | %i', doOfficerSet(0, $myOfficerLevel)),
-            'gennum'=>$db->sqleval('gennum - %i', $general->getNPCType()!=5?1:0),
-            'gold'=>$db->sqleval('gold + %i', $gold),
-            'rice'=>$db->sqleval('rice + %i', $rice),
+            'chief_set' => $db->sqleval('chief_set | %i', doOfficerSet(0, $myOfficerLevel)),
+            'gennum' => $db->sqleval('gennum - %i', $general->getNPCType() != 5 ? 1 : 0),
+            'gold' => $db->sqleval('gold + %i', $gold),
+            'rice' => $db->sqleval('rice + %i', $rice),
        ], 'nation = %i', $nationID);
    }

@@ -308,62 +327,74 @@ function do추방(General $general, int $myOfficerLevel):?string{



-if($action == "임명") {
-    if(2 <= $officerLevel && $officerLevel <= 4){
-        if(!$destCityID){
+if ($action == "임명") {
+    if (2 <= $officerLevel && $officerLevel <= 4) {
+        if (!$destCityID) {
            Json::die([
-                'result'=>false,
-                'reason'=>'도시가 지정되지 않았습니다.'
+                'result' => false,
+                'reason' => '도시가 지정되지 않았습니다.'
            ]);
        }
        $result = do도시임명($general, $destCityID, $officerLevel);
-        if($result !== null){
+        if ($result !== null) {
            Json::die([
-                'result'=>false,
-                'reason'=>$result
+                'result' => false,
+                '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'
+            'result' => true,
+            'reason' => 'success'
        ]);
    }

-    if(5 <= $officerLevel && $officerLevel < 12){
+    if (5 <= $officerLevel && $officerLevel < 12) {
        $result = do수뇌임명($general, $officerLevel);
-        if($result !== null){
+        if ($result !== null) {
            Json::die([
-                'result'=>false,
-                'reason'=>$result
+                'result' => false,
+                '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'
+            'result' => true,
+            'reason' => 'success'
        ]);
    }

    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 지정입니다.'
+        'result' => false,
+        'reason' => '올바르지 않은 지정입니다.'
    ]);
 }

-if($action == "추방") {
+if ($action == "추방") {
    $result = do추방($general, $myOfficerLevel);
-    if($result !== null){
+    if ($result !== null) {
        Json::die([
-            'result'=>false,
-            'reason'=>$result
+            'result' => false,
+            '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'
+        'result' => true,
+        'reason' => 'success'
    ]);
 }

 Json::die([
-    'result'=>false,
-    'reason'=>'올바르지 않은 명령입니다.'
-]);
+    'result' => false,
+    'reason' => '올바르지 않은 명령입니다.'
+]);
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -24,14 +25,13 @@ if ($defence_train <= 40) {
    $defence_train = 40;
 }

-if($defence_train <= 90){
+if ($defence_train <= 90) {
    $defence_train = Util::round($defence_train, -1);
-}
-else{
+} else {
    $defence_train = 999;
 }

-if($tnmt < 0 || $tnmt > 1){
+if ($tnmt < 0 || $tnmt > 1) {
    $tnmt = 1;
 }

@@ -39,8 +39,8 @@ $db = DB::db();
 $me = General::createObjFromDB($generalID);


-if($defence_train !== $me->getVar('defence_train')){
-    if($defence_train == 999){
+if ($defence_train !== $me->getVar('defence_train')) {
+    if ($defence_train == 999) {
        $me->increaseVar('myset', -1);
        $me->setVar('defence_train', $defence_train);
        $affectedTrain = -3;
@@ -49,8 +49,7 @@ if($defence_train !== $me->getVar('defence_train')){
        $affectedAtmos = $me->onCalcDomestic('changeDefenceTrain', "atmos{$defence_train}", $affectedAtmos);
        $me->increaseVarWithLimit('train', $affectedTrain, 20, GameConst::$maxTrainByWar);
        $me->increaseVarWithLimit('atmos', $affectedAtmos, 20, GameConst::$maxAtmosByWar);
-    }
-    else{
+    } else {
        $me->increaseVar('myset', -1);
        $me->setVar('defence_train', $defence_train);
    }
@@ -60,21 +59,44 @@ $me->setAuxVar('use_treatment', Util::valueFit($use_treatment, 10, 100));
 $me->setAuxVar('use_auto_nation_turn', $use_auto_nation_turn);
 $me->setVar('tnmt', $tnmt);

-if($me->getNPCType() == 1 && $detachNPC){
+if ($me->getNPCType() == 1 && $detachNPC) {
    $turnterm = $gameStor->turnterm;

-    if($turnterm < 10){
+    if ($turnterm < 10) {
        $targetKillTurn = 30 / $turnterm;
-    }
-    else{
+    } else {
        $targetKillTurn = 60 / $turnterm;
    }
    $me->setVar('killturn', $targetKillTurn);
 }

+$rootDB = RootDB::db();
+//회원 테이블에서 정보확인
+$member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr, `penalty` FROM member WHERE no=%i', $userID);
+
+if (!$member) {
+    //이런 경우가 있나?
+    //TODO: 로그 남겨둘 것
+    Json::die([
+        'result' => false,
+        'reason' => '회원 정보를 찾을 수 없습니다.'
+    ]);
+}
+
+$memberPenalty = Json::decode($member['penalty'] ?? "{}");
+$penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
+$penalty = [];
+foreach ($penaltyInfo as $penaltyKey => $penaltyValue) {
+    if ($penaltyValue['expire'] ?? 0 > TimeUtil::now()) {
+        $penalty[$penaltyKey] = $penaltyValue['value'];
+    }
+}
+$me->setVar('penalty', Json::encode($penalty));
+
 $me->applyDB($db);

 Json::die([
-    'result'=>true,
-    'reason'=>'success'
-]);
+    'result' => true,
+    'reason' => 'success'
+]);
@@ -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();
            }

            //천도
@@ -0,0 +1,154 @@
+<?php
+
+namespace sammo\API\InheritAction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Enums\APIRecoveryType;
+use sammo\Enums\MessageType;
+use sammo\Enums\RankColumn;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\Message;
+use sammo\MessageTarget;
+use sammo\RootDB;
+use sammo\TimeUtil;
+use sammo\UserLogger;
+use sammo\Validator;
+
+use function sammo\GetImageURL;
+use function sammo\getNationStaticInfo;
+
+/**
+ *
+ * 유산 포인트 1000 포인트를 사용하면 지정한 상대의 본래 유저명을 확인 가능.
+ * 개인 메시지로 전달되며, 이 기능이 사용되었음을 상대에게도 알림.
+ */
+class CheckOwner extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'destGeneralID',
+        ])
+            ->rule('int', 'destGeneralID')
+            ->rule('min', 'destGeneralID', 1);
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null|string|array|APIRecoveryType
+    {
+        $userID = $session->userID;
+        $generalID = $session->generalID;
+
+        $destGeneralID = $this->args['destGeneralID'];
+        if ($generalID == $destGeneralID) {
+            return '자신의 정보는 확인할 수 없습니다.';
+        }
+
+        $general = General::createObjFromDB($generalID);
+        if ($userID != $general->getVar('owner')) {
+            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
+        }
+
+        $db = DB::db();
+        $destRawGeneral = $db->queryFirstRow('SELECT no,name,nation,owner,owner_name,imgsvr,picture FROM general WHERE no = %i', $destGeneralID);
+
+        if (!$destRawGeneral) {
+            return '대상 장수가 존재하지 않습니다.';
+        }
+
+        if (!$destRawGeneral['owner']) {
+            return '대상 장수는 NPC입니다.';
+        }
+
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        if ($gameStor->isunited) {
+            return '이미 천하가 통일되었습니다.';
+        }
+
+        $reqPoint = GameConst::$inheritCheckOwnerPoint;
+
+        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
+        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
+        if ($previousPoint < $reqPoint) {
+            return '충분한 유산 포인트를 가지고 있지 않습니다.';
+        }
+
+        $userLogger = new UserLogger($userID);
+        $userLogger->push("{$reqPoint} 포인트로 장수 소유자 확인", "inheritPoint");
+        $userLogger->flush();
+
+        $destGeneralName = $destRawGeneral['name'];
+        $destGeneralOwnerName = $destRawGeneral['owner_name'];
+        if (!$destGeneralOwnerName) {
+            $rootDB = RootDB::db();
+            $destGeneralOwnerName = $rootDB->queryFirstField('SELECT name FROM member WHERE no = %i', $destRawGeneral['owner']) ?? '알수없음';
+        }
+
+        $src = new MessageTarget(0, '', 0, 'System', '#000000');
+
+        if (true) {
+            $staticNation = $general->getStaticNation();
+            $dest = new MessageTarget(
+                $generalID,
+                $general->getName(),
+                $general->getNationID(),
+                $staticNation['name'],
+                $staticNation['color'],
+                GetImageURL($general->getVar('imgsvr'), $general->getVar('picture'))
+            );
+            $msg = new Message(
+                MessageType::private,
+                $src,
+                $dest,
+                "{$destGeneralName}의 소유자는 {$destGeneralOwnerName} 입니다.",
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            $msg->send(true);
+        }
+
+        $inheritStor->setValue('previous', [$previousPoint - $reqPoint, null]);
+        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqPoint);
+        $general->applyDB($db);
+
+        if(true){
+            $destStaticNation = getNationStaticInfo($destRawGeneral['nation']);
+            $dest = new MessageTarget(
+                $destGeneralID,
+                $destGeneralName,
+                $destRawGeneral['nation'],
+                $destStaticNation['name'],
+                $destStaticNation['color'],
+                GetImageURL($destRawGeneral['imgsvr'], $destRawGeneral['picture'])
+            );
+            $msg = new Message(
+                MessageType::private,
+                $src,
+                $dest,
+                "소유자명이 누군가에 의해 확인되었습니다.",
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            $msg->send(true);
+        }
+
+        return null;
+    }
+}
@@ -0,0 +1,179 @@
+<?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);
+
+
+        $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;
+    }
+}
@@ -7,6 +7,7 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\MessageType;
+use sammo\Enums\PenaltyKey;
 use sammo\Json;
 use sammo\Message;
 use sammo\MessageTarget;
@@ -191,6 +192,9 @@ class SendMessage extends \sammo\BaseAPI

    // 전체 메세지
    if ($mailbox === Message::MAILBOX_PUBLIC) {
+      if($penalty[PenaltyKey::NoSendPublicMsg->value] ?? 0) {
+        return '공개 메세지를 보낼 수 없습니다.';
+      }
      $msgID = $this->genPublicMessage($src, $text)->send();
      return [
        'msgType' => 'public',
@@ -231,7 +235,11 @@ class SendMessage extends \sammo\BaseAPI
      $lastMsg = new \DateTime($session->lastMsg ?? '0000-00-00');
      $msg_interval = $now->getTimestamp() - $lastMsg->getTimestamp();

-      $msg_min_interval = $penalty['sendPrivateMsgDelay'] ?? 2;
+      if($penalty[PenaltyKey::NoSendPrivateMsg->value] ?? 0) {
+        return '개인 메세지를 보낼 수 없습니다.';
+      }
+
+      $msg_min_interval = $penalty[PenaltyKey::SendPrivateMsgDelay->value] ?? 2;
      if ($msg_interval < $msg_min_interval) {
        return "개인메세지는 {$msg_min_interval}초당 1건만 보낼 수 있습니다!";
      }
@@ -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;
  }
@@ -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;
  }
@@ -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;
  }
 }
@@ -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;
  }
@@ -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;
  }
@@ -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,
@@ -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;
        }

@@ -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)
+        );
+    }
+}
@@ -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;
        }
@@ -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;
+    }
+}
@@ -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;
+}
@@ -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;
@@ -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;
@@ -7,7 +7,8 @@ use \sammo\{
    ActionLogger,
    GameConst, GameUnitConst,
    LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };


@@ -174,6 +175,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);
@@ -18,6 +18,8 @@ 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;
@@ -81,7 +83,8 @@ class che_건국 extends Command\GeneralCommand

        $this->minConditionConstraints = [
            ConstraintHelper::BeOpeningPart($relYear + 1),
-            ConstraintHelper::ReqNationValue('level', '국가규모', '==', 0, '정식 국가가 아니어야합니다.')
+            ConstraintHelper::ReqNationValue('level', '국가규모', '==', 0, '정식 국가가 아니어야합니다.'),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoFoundNation),
        ];
    }

@@ -102,6 +105,7 @@ class che_건국 extends Command\GeneralCommand
            ConstraintHelper::CheckNationNameDuplicate($nationName),
            ConstraintHelper::AllowJoinAction(),
            ConstraintHelper::ConstructableCity(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoFoundNation),
        ];
    }

@@ -199,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);

@@ -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);
@@ -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);
@@ -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);
@@ -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);

@@ -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);

@@ -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);
@@ -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);

@@ -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
 {
@@ -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);

@@ -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);

@@ -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;
@@ -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);

@@ -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);
@@ -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;
@@ -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;
    }
-
-
-}
+}
@@ -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);

@@ -21,6 +21,7 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
+use sammo\StaticEventHandler;

 class che_선양 extends Command\GeneralCommand
 {
@@ -138,6 +139,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);

@@ -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;
@@ -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);

@@ -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;
@@ -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);

@@ -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);
@@ -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;
@@ -9,7 +9,8 @@ use \sammo\{
    GameConst,
    LastTurn,
    Command,
-    KVStorage
+    KVStorage,
+    StaticEventHandler
 };

 use function \sammo\tryUniqueItemLottery;
@@ -17,6 +18,7 @@ use function \sammo\getNationStaticInfo;

 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;

 class che_임관 extends Command\GeneralCommand
 {
@@ -66,7 +68,8 @@ class che_임관 extends Command\GeneralCommand
        $this->minConditionConstraints = [
            ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
            ConstraintHelper::BeNeutral(),
-            ConstraintHelper::AllowJoinAction()
+            ConstraintHelper::AllowJoinAction(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoChosenAssignment),
        ];
    }

@@ -92,7 +95,8 @@ class che_임관 extends Command\GeneralCommand
            ConstraintHelper::BeNeutral(),
            ConstraintHelper::ExistsDestNation(),
            ConstraintHelper::AllowJoinDestNation($relYear),
-            ConstraintHelper::AllowJoinAction()
+            ConstraintHelper::AllowJoinAction(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoChosenAssignment),
        ];
    }

@@ -172,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);

@@ -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);

@@ -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);

@@ -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);

@@ -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);

@@ -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;
@@ -9,7 +9,8 @@ use \sammo\{
    LastTurn,
    GameUnitConst,
    Command,
-    RandUtil
+    RandUtil,
+    StaticEventHandler
 };

 use function \sammo\getDomesticExpLevelBonus;
@@ -188,6 +189,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);

@@ -9,7 +9,8 @@ use \sammo\{
    LastTurn,
    GameUnitConst,
    Command,
-    RandUtil
+    RandUtil,
+    StaticEventHandler
 };

 use function \sammo\getDomesticExpLevelBonus;
@@ -188,6 +189,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);

@@ -16,6 +16,7 @@ use \sammo\Command;
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\GeneralQueryMode;
+use sammo\StaticEventHandler;

 use function sammo\tryUniqueItemLottery;

@@ -170,6 +171,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);
@@ -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{
        $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);

@@ -16,6 +16,7 @@ use function sammo\getTechLevel;

 use \sammo\Constraint\ConstraintHelper;
 use sammo\MustNotBeReachedException;
+use sammo\StaticEventHandler;

 class che_징병 extends Command\GeneralCommand
 {
@@ -226,6 +227,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 ?? []);
        $general->setAuxVar('armType', $reqCrewType->armType);
        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);
@@ -16,6 +16,7 @@ use function \sammo\searchDistance;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 use sammo\Enums\InheritanceKey;
+use sammo\StaticEventHandler;

 class che_첩보 extends Command\GeneralCommand
 {
@@ -212,6 +213,7 @@ class che_첩보 extends Command\GeneralCommand
        $general->addDedication($ded);
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->checkStatChange();
        $general->applyDB($db);

@@ -22,6 +22,7 @@ use sammo\CityConst;
 use sammo\Enums\InheritanceKey;
 use sammo\LiteHashDRBG;
 use sammo\RandUtil;
+use sammo\StaticEventHandler;
 use sammo\UniqueConst;

 class che_출병 extends Command\GeneralCommand
@@ -253,6 +254,7 @@ class che_출병 extends Command\GeneralCommand

        processWar($warRngSeed, $general, $this->nation, $this->destCity);

+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

@@ -7,7 +7,8 @@ use \sammo\{
    ActionLogger,
    GameConst, GameUnitConst,
    LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };

 use \sammo\Constraint\Constraint;
@@ -122,6 +123,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 ?? []);
        $general->applyDB($db);

        return true;
@@ -10,6 +10,7 @@ use \sammo\{
    Command,
    Json,
    KVStorage,
+    StaticEventHandler,
    TurnExecutionHelper
 };

@@ -109,6 +110,7 @@ class che_해산 extends Command\GeneralCommand{
        foreach($nationGenerals as $oldGeneral){
            $oldGeneral->applyDB($db);
        }
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);

        // 이벤트 핸들러 동작
@@ -14,6 +14,7 @@ use \sammo\Command;

 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
+use sammo\StaticEventHandler;

 use function sammo\tryUniqueItemLottery;

@@ -146,6 +147,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);

@@ -18,6 +18,7 @@ use sammo\CityConst;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 use sammo\RandUtil;
+use sammo\StaticEventHandler;

 class che_화계 extends Command\GeneralCommand
 {
@@ -74,12 +75,15 @@ class che_화계 extends Command\GeneralCommand

        $maxGenScore = 0;
        $probCorrection = 0;
+        $affectGeneralCount = 0;
        foreach ($destCityGeneralList as $destGeneral) {
            /** @var General $destGeneral */
            if ($destGeneral->getNationID() != $destNationID) {
                continue;
            }

+            $affectGeneralCount++;
+
            if ($statType === 'leadership') {
                $genScore = $destGeneral->getLeadership();
            } else if ($statType === 'strength') {
@@ -95,7 +99,7 @@ class che_화계 extends Command\GeneralCommand

        $prob = $maxGenScore / GameConst::$sabotageProbCoefByStat;
        $prob += $probCorrection;
-        $prob += (log(count($destCityGeneralList) + 1, 2) - 1.25) * GameConst::$sabotageDefenceCoefByGeneralCnt;
+        $prob += (log($affectGeneralCount + 1, 2) - 1.25) * GameConst::$sabotageDefenceCoefByGeneralCnt;

        $prob += $destCity['secu'] / $destCity['secu_max'] / 5; //최대 20%p
        $prob += $destCity['supply'] ? 0.1 : 0;
@@ -329,6 +333,7 @@ class che_화계 extends Command\GeneralCommand
        $general->increaseVar($statType . '_exp', 1);
        $general->increaseRankVar(RankColumn::firenum, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->checkStatChange();
        $general->applyDB($db);

@@ -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;
@@ -17,66 +22,73 @@ 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;

        $this->setCity();
        $this->setNation();

-        $this->minConditionConstraints=[
+        $this->minConditionConstraints = [
            ConstraintHelper::NotBeNeutral(),
            ConstraintHelper::NotWanderingNation(),
            ConstraintHelper::OccupiedCity(),
        ];

-        $this->fullConditionConstraints=[
+        $this->fullConditionConstraints = [
            ConstraintHelper::NotBeNeutral(),
            ConstraintHelper::NotWanderingNation(),
            ConstraintHelper::OccupiedCity(),
            ConstraintHelper::ReqGeneralCrew(),
            ConstraintHelper::ReqGeneralTrainMargin(GameConst::$maxTrainByCommand),
        ];
-
    }

-    public function getCommandDetailTitle():string{
+    public function getCommandDetailTitle(): string
+    {
        $name = $this->getName();
        [$reqGold, $reqRice] = $this->getCost();

        $title = "{$name}(통솔경험";
-        if($reqGold > 0){
+        if ($reqGold > 0) {
            $title .= ", 자금{$reqGold}";
        }
-        if($reqRice > 0){
+        if ($reqRice > 0) {
            $title .= ", 군량{$reqRice}";
        }
        $title .= ')';
        return $title;
    }

-    public function getCost():array{
+    public function getCost(): array
+    {
        return [0, 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('불가능한 커맨드를 강제로 실행 시도');
        }

@@ -85,7 +97,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::$trainDelta);
+        $score = Util::clamp(
+            Util::round($general->getLeadership() * 100 / $general->getVar('crew') * GameConst::$trainDelta),
+            0,
+            Util::clamp(GameConst::$maxTrainByCommand - $general->getVar('train'), 0)
+        );
        $scoreText = number_format($score, 0);

        $sideEffect = Util::valueFit(intval($general->getVar('atmos') * GameConst::$atmosSideEffectByTraining), 0);
@@ -97,7 +113,7 @@ class che_훈련 extends Command\GeneralCommand{
        $exp = 100;
        $ded = 70;

-        $general->increaseVarWithLimit('train', $score, 0, GameConst::$maxTrainByCommand);
+        $general->increaseVar('train', $score);
        $general->setVar('atmos', $sideEffect);

        $general->addDex($general->getCrewTypeObj(), $score, false);
@@ -107,11 +123,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;
    }
-
-
-}
+}
@@ -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;
@@ -201,6 +202,7 @@ class cr_건국 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);

@@ -7,7 +7,8 @@ use \sammo\{
    ActionLogger,
    GameConst, GameUnitConst,
    LastTurn,
-    Command
+    Command,
+    StaticEventHandler
 };

 use function \sammo\tryUniqueItemLottery;
@@ -105,6 +106,7 @@ class cr_맹훈련 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);

@@ -6,6 +6,7 @@ use \sammo\Util;
 use \sammo\JosaUtil;
 use \sammo\LastTurn;
 use \sammo\DB;
+use sammo\StaticEventHandler;

 class 휴식 extends Command\GeneralCommand{
    static protected $actionName = '휴식';
@@ -39,6 +40,7 @@ class 휴식 extends Command\GeneralCommand{
        $logger->pushGeneralActionLog("아무것도 실행하지 않았습니다. <1>$date</>");

        $this->setResultTurn(new LastTurn());
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB(DB::db());
        return true;
    }
@@ -12,7 +12,8 @@ use \sammo\{
    MessageTarget,
    Message,
    CityConst,
-    CityHelper
+    CityHelper,
+    StaticEventHandler
 };

 use \sammo\Constraint\Constraint;
@@ -201,6 +202,7 @@ class che_감축 extends Command\NationCommand{
        $logger->pushGlobalHistoryLog("<M><b>【감축】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaUl} <M>감축</>하였습니다.");

        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
        $general->applyDB($db);

@@ -12,6 +12,7 @@ use function \sammo\GetNationColors;

 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
+use sammo\StaticEventHandler;

 class che_국기변경 extends Command\NationCommand
 {
@@ -136,6 +137,7 @@ class che_국기변경 extends Command\NationCommand
        $logger->pushGlobalHistoryLog("<S><b>【국기변경】</b></><D><b>{$nationName}</b></>{$josaYiNation} <span style='color:{$color};'><b>국기</b></span>를 변경하였습니다.");

        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
        $general->applyDB($db);
        return true;
@@ -21,6 +21,7 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
 use sammo\Event\Action;
+use sammo\StaticEventHandler;

 class che_국호변경 extends Command\NationCommand
 {
@@ -154,6 +155,7 @@ class che_국호변경 extends Command\NationCommand
        $logger->pushGlobalHistoryLog("<S><b>【국호변경】</b></><D><b>{$nationName}</b></>{$josaYiNation} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다.");

        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
        $general->applyDB($db);
        return true;
@@ -20,6 +20,7 @@ use function \sammo\getNationStaticInfo;

 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
+use sammo\StaticEventHandler;

 class che_급습 extends Command\NationCommand
 {
@@ -191,6 +192,7 @@ class che_급습 extends Command\NationCommand
        $db->update('diplomacy', [
            'term' => $db->sqleval('`term` - %i', 3),
        ], '(me = %i AND you = %i) OR (you = %i AND me = %i)', $nationID, $destNationID, $nationID, $destNationID);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->applyDB($db);

@@ -21,6 +21,7 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\MessageType;
+use sammo\StaticEventHandler;

 class che_몰수 extends Command\NationCommand
 {
@@ -212,6 +213,7 @@ class che_몰수 extends Command\NationCommand
        $logger->pushGeneralActionLog("<Y>{$destGeneral->getName()}</>에게서 {$resName} <C>$amountText</>{$josaUl} 몰수했습니다. <1>$date</>");

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destGeneral->applyDB($db);

@@ -20,6 +20,7 @@ use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
 use sammo\Event\Action;
 use sammo\Json;
+use sammo\StaticEventHandler;

 class che_무작위수도이전 extends Command\NationCommand
 {
@@ -159,6 +160,7 @@ class che_무작위수도이전 extends Command\NationCommand
        $logger->pushGlobalHistoryLog("<S><b>【무작위 수도 이전】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaRo} <M>수도 이전</>하였습니다.");

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        return true;
    }
@@ -15,6 +15,7 @@ use \sammo\{
    Command,
    Json,
    KVStorage,
+    StaticEventHandler,
    StringUtil
 };

@@ -255,6 +256,7 @@ class che_물자원조 extends Command\NationCommand
        $general->addExperience(5);
        $general->addDedication(5);

+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->applyDB($db);

@@ -14,6 +14,7 @@ use \sammo\{
    GameUnitConst,
    CityConst,
    Command,
+    StaticEventHandler,
    TimeUtil
 };

@@ -167,6 +168,7 @@ class che_발령 extends Command\NationCommand
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->applyDB($db);
        $destGeneral->applyDB($db);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);

        return true;
    }
@@ -15,7 +15,8 @@ use \sammo\{
    Command,
    MessageTarget,
    Message,
-    CityConst
+    CityConst,
+    StaticEventHandler
 };

 use \sammo\Constraint\Constraint;
@@ -164,6 +165,7 @@ class che_백성동원 extends Command\NationCommand
        ], 'nation=%i', $nationID);

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);

        return true;
@@ -0,0 +1,158 @@
+<?php
+
+namespace sammo\Command\Nation;
+
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+
+use \sammo\Constraint\Constraint;
+use \sammo\Constraint\ConstraintHelper;
+use sammo\Enums\GeneralQueryMode;
+use sammo\StaticEventHandler;
+
+class che_부대탈퇴지시 extends Command\NationCommand
+{
+    static protected $actionName = '부대 탈퇴 지시';
+    static public $reqArg = true;
+
+    protected function argTest(): bool
+    {
+        if ($this->arg === null) {
+            return false;
+        }
+        if (!key_exists('destGeneralID', $this->arg)) {
+            return false;
+        }
+        $destGeneralID = $this->arg['destGeneralID'];
+        if (!is_int($destGeneralID)) {
+            return false;
+        }
+        if ($destGeneralID <= 0) {
+            return false;
+        }
+        $this->arg = [
+            'destGeneralID' => $destGeneralID
+        ];
+        return true;
+    }
+
+    protected function init()
+    {
+        $this->setCity();
+        $this->setNation();
+
+        $this->minConditionConstraints = [
+            ConstraintHelper::NotBeNeutral(),
+            ConstraintHelper::BeChief(),
+        ];
+    }
+
+    public function getBrief(): string
+    {
+        $commandName = $this->getName();
+        $destGeneralName = $this->destGeneralObj->getName();
+        return "【{$destGeneralName}】{$commandName}";
+    }
+
+    protected function initWithArg()
+    {
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
+        $this->setDestGeneral($destGeneral);
+
+        if($this->arg['destGeneralID'] == $this->getGeneral()->getID()){
+            $this->fullConditionConstraints=[
+                ConstraintHelper::AlwaysFail('본인입니다')
+            ];
+            return;
+        }
+
+        $this->fullConditionConstraints = [
+            ConstraintHelper::NotBeNeutral(),
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::ExistsDestGeneral(),
+            ConstraintHelper::FriendlyDestGeneral()
+        ];
+    }
+
+    public function getCost(): array
+    {
+        return [0, 0];
+    }
+
+    public function getPreReqTurn(): int
+    {
+        return 0;
+    }
+
+    public function getPostReqTurn(): int
+    {
+        return 0;
+    }
+
+    public function run(\Sammo\RandUtil $rng): bool
+    {
+        if (!$this->hasFullConditionMet()) {
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+
+        $db = DB::db();
+
+        $general = $this->generalObj;
+        $generalName = $general->getName();
+
+        $destGeneral = $this->destGeneralObj;
+        $destGeneralName = $destGeneral->getName();
+        $logger = $this->getLogger();
+
+        $troopID = $destGeneral->getVar('troop');
+        if($troopID == 0){
+            $josaUn = JosaUtil::pick($destGeneralName, '은');
+            $logger->pushGeneralActionLog("<Y>{$destGeneralName}</>{$josaUn} 부대원이 아닙니다.");
+            $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+            return true;
+        }
+
+        if($troopID == $destGeneral->getID()){
+            $josaUn = JosaUtil::pick($destGeneralName, '은');
+            $logger->pushGeneralActionLog("<Y>{$destGeneralName}</>{$josaUn} 부대장입니다.");
+            $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+            return true;
+        }
+
+        $destGeneral->setVar('troop', 0);
+
+        $logger->pushGeneralActionLog("<Y>{$destGeneralName}</>에게 부대 탈퇴를 지시했습니다.");
+        $destGeneral->getLogger()->pushGeneralActionLog("<Y>{$generalName}</>에게 부대 탈퇴를 지시 받았습니다.");
+        
+        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
+        $general->applyDB($db);
+        $destGeneral->applyDB($db);
+
+        return true;
+    }
+
+    public function exportJSVars(): array
+    {
+        $db = DB::db();
+        $nationID = $this->getNationID();
+        $troops = Util::convertArrayToDict($db->query('SELECT * FROM troop WHERE nation=%i', $nationID), 'troop_leader');
+        $destRawGenerals = $db->queryAllLists('SELECT no,name,officer_level,npc,gold,rice,leadership,strength,intel,city,crew,train,atmos,troop FROM general WHERE nation = %i ORDER BY npc,binary(name)', $nationID);
+        return [
+            'procRes' => [
+                'troops' => $troops,
+                'generals' => $destRawGenerals,
+                'generalsKey' => ['no', 'name', 'officerLevel', 'npc', 'gold', 'rice', 'leadership', 'strength', 'intel', 'cityID', 'crew', 'train', 'atmos', 'troopID'],
+                'cities' => \sammo\JSOptionsForCities(),
+            ]
+        ];
+    }
+}
@@ -24,6 +24,7 @@ use sammo\Enums\GeneralQueryMode;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\RandUtil;
+use sammo\StaticEventHandler;

 class che_불가침수락 extends Command\NationCommand
 {
@@ -224,6 +225,7 @@ class che_불가침수락 extends Command\NationCommand
        $destLogger->pushGeneralActionLog("<D><b>{$nationName}</b></>{$josaWa} <C>$year</>년 <C>{$month}</>월까지 불가침에 성공했습니다.", ActionLogger::PLAIN);
        $destLogger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaWa} {$year}년 {$month}월까지 불가침 성공");

+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destLogger->flush();

@@ -23,6 +23,7 @@ use function \sammo\getNationStaticInfo;
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\MessageType;
+use sammo\StaticEventHandler;

 class che_불가침제의 extends Command\NationCommand
 {
@@ -220,6 +221,7 @@ class che_불가침제의 extends Command\NationCommand
        $msg->send();

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destLogger->flush();

@@ -22,6 +22,7 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\GeneralQueryMode;
 use sammo\RandUtil;
+use sammo\StaticEventHandler;

 class che_불가침파기수락 extends Command\NationCommand
 {
@@ -173,6 +174,7 @@ class che_불가침파기수락 extends Command\NationCommand
        $destLogger->pushGeneralActionLog("<D><b>{$nationName}</b></>{$josaWa}의 불가침 파기에 성공했습니다.", ActionLogger::PLAIN);
        $destLogger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaWa}의 불가침 파기 성공");

+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destLogger->flush();

@@ -12,6 +12,7 @@ use \sammo\{
    MessageTarget,
    DiplomaticMessage,
    Message,
+    StaticEventHandler,
 };

 use function \sammo\getAllNationStaticInfo;
@@ -166,6 +167,7 @@ class che_불가침파기제의 extends Command\NationCommand{
        $msg->send();

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destLogger->flush();

@@ -22,6 +22,7 @@ use function \sammo\GetImageURL;
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\MessageType;
+use sammo\StaticEventHandler;

 class che_선전포고 extends Command\NationCommand
 {
@@ -188,6 +189,7 @@ class che_선전포고 extends Command\NationCommand
        $msg->send();

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destLogger->flush();

@@ -15,7 +15,8 @@ use \sammo\{
    Command,
    MessageTarget,
    Message,
-    CityConst
+    CityConst,
+    StaticEventHandler
 };

 use function \sammo\getNationStaticInfo;
@@ -191,6 +192,7 @@ class che_수몰 extends Command\NationCommand
        ], 'nation=%i', $nationID);

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);

        return true;
@@ -15,7 +15,7 @@ use \sammo\KVStorage;

 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
-
+use sammo\StaticEventHandler;

 class che_의병모집 extends Command\NationCommand
 {
@@ -170,6 +170,7 @@ class che_의병모집 extends Command\NationCommand
        ], 'nation=%i', $nationID);

        $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;
@@ -20,6 +20,7 @@ use function \sammo\getNationStaticInfo;

 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
+use sammo\StaticEventHandler;

 class che_이호경식 extends Command\NationCommand
 {
@@ -193,6 +194,7 @@ class che_이호경식 extends Command\NationCommand


        $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;
@@ -16,6 +16,7 @@ use \sammo\{
    MessageTarget,
    DiplomaticMessage,
    Message,
+    StaticEventHandler,
 };

 use function \sammo\getNationStaticInfo;
@@ -188,6 +189,7 @@ class che_종전수락 extends Command\NationCommand
        $destLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>{$josaWa} 종전");

        $general->applyDB($db);
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $destLogger->flush();

        return true;
@@ -12,6 +12,7 @@ use \sammo\{
    MessageTarget,
    DiplomaticMessage,
    Message,
+    StaticEventHandler,
 };

 use function \sammo\getAllNationStaticInfo;
@@ -164,6 +165,7 @@ class che_종전제의 extends Command\NationCommand{
        $msg->send();

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destLogger->flush();

@@ -11,7 +11,8 @@ use \sammo\{
    Command,
    MessageTarget,
    Message,
-    CityConst
+    CityConst,
+    StaticEventHandler
 };

 use \sammo\Constraint\Constraint;
@@ -193,6 +194,7 @@ class che_증축 extends Command\NationCommand{
        $logger->pushGlobalHistoryLog("<C><b>【증축】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaUl} <M>증축</>하였습니다.");

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);

        return true;
@@ -19,6 +19,7 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
 use sammo\Event\Action;
+use sammo\StaticEventHandler;

 class che_천도 extends Command\NationCommand
 {
@@ -228,6 +229,7 @@ class che_천도 extends Command\NationCommand
        $logger->pushGlobalHistoryLog("<S><b>【천도】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaRo} <M>천도</>하였습니다.");

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        return true;
    }
@@ -12,7 +12,8 @@ use \sammo\{
    MessageTarget,
    Message,
    CityConst,
-    CityInitialDetail
+    CityInitialDetail,
+    StaticEventHandler
 };

 use \sammo\Constraint\Constraint;
@@ -196,6 +197,7 @@ class che_초토화 extends Command\NationCommand{
        $logger->pushGlobalHistoryLog("<S><b>【초토화】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaUl} <M>초토화</>하였습니다.");

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        return true;
    }
@@ -16,6 +16,7 @@ use \sammo\Command;
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\GeneralQueryMode;
+use sammo\StaticEventHandler;

 class che_포상 extends Command\NationCommand
 {
@@ -174,6 +175,7 @@ class che_포상 extends Command\NationCommand
        $logger->pushGeneralActionLog("<Y>{$destGeneral->getName()}</>에게 {$resName} <C>$amountText</>{$josaUl} 수여했습니다. <1>$date</>");

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);
        $destGeneral->applyDB($db);

@@ -15,7 +15,8 @@ use \sammo\{
    Command,
    KVStorage,
    Message,
-    MessageTarget
+    MessageTarget,
+    StaticEventHandler
 };

 use function \sammo\buildNationCommandClass;
@@ -240,6 +241,7 @@ class che_피장파장 extends Command\NationCommand
        $destDelay = max($destNationStor->getValue($cmd->getNextExecuteKey()) ?? 0, $yearMonth);
        $destNationStor->setValue($cmd->getNextExecuteKey(), $destDelay + static::$delayCnt);

+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);

        return true;
@@ -10,7 +10,8 @@ use \sammo\{
    GameUnitConst,
    Command,
    MessageTarget,
-    Message
+    Message,
+    StaticEventHandler
 };

 use \sammo\Constraint\Constraint;
@@ -121,6 +122,7 @@ class che_필사즉생 extends Command\NationCommand{
        ], 'nation=%i', $nationID);

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);

        return true;
@@ -21,6 +21,7 @@ use function \sammo\getNationStaticInfo;
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Event\Action;
+use sammo\StaticEventHandler;

 class che_허보 extends Command\NationCommand
 {
@@ -194,6 +195,7 @@ class che_허보 extends Command\NationCommand
        ], 'nation=%i', $nationID);

        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        $general->applyDB($db);

        return true;
@@ -19,6 +19,7 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
 use sammo\Event\Action;
+use sammo\StaticEventHandler;

 class cr_인구이동 extends Command\NationCommand
 {
@@ -179,6 +180,7 @@ class cr_인구이동 extends Command\NationCommand
    $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>{$josaRo} 인구 <C>{$amount}</>명을 옮겼습니다. <1>$date</>");

    $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
+    StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
    $general->applyDB($db);
    return true;
  }
@@ -5,6 +5,7 @@ use \sammo\Command;
 use \sammo\Util;
 use \sammo\JosaUtil;
 use sammo\LastTurn;
+use sammo\StaticEventHandler;

 class 휴식 extends Command\NationCommand{
    static protected $actionName = '휴식';
@@ -33,6 +34,7 @@ class 휴식 extends Command\NationCommand{

    public function run(\Sammo\RandUtil $rng):bool{
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
        return true;
    }
 }
@@ -1,9 +1,11 @@
 <?php
+
 namespace sammo\Constraint;

-abstract class Constraint{
-    private function __construct(){
-
+abstract class Constraint
+{
+    private function __construct()
+    {
    }

    const REQ_GENERAL = 0x10;
@@ -18,7 +20,8 @@ abstract class Constraint{
    const REQ_NUMERIC_ARG = self::REQ_ARG | 0x4000;
    const REQ_BOOLEAN_ARG = self::REQ_ARG | 0x8000;
    const REQ_ARRAY_ARG = self::REQ_ARG | 0x10000;
-    
+    const REQ_BACKED_ENUM_ARG = self::REQ_ARG | 0x20000;
+
    const REQ_VALUES = 0;

    protected $general = null;
@@ -37,182 +40,241 @@ abstract class Constraint{
    protected $tested = false;
    protected $reason = null;

-    abstract public function test():bool;
+    abstract public function test(): bool;


-    static public function requiredValueType():int{
+    static public function requiredValueType(): int
+    {
        return static::REQ_VALUES;
    }

-    public function setGeneral(array $general){
+    public function setGeneral(array $general)
+    {
        $this->general = $general;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setCity(array $city){
+    public function setCity(array $city)
+    {
        $this->city = $city;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setNation(array $nation){
+    public function setNation(array $nation)
+    {
        $this->nation = $nation;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setArg($arg){
+    public function setArg($arg)
+    {
        $this->arg = $arg;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setEnv($env){
+    public function setEnv($env)
+    {
        $this->env = $env;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setCmdArg($cmd_arg){
+    public function setCmdArg($cmd_arg)
+    {
        $this->cmd_arg = $cmd_arg;
        $this->tested = false;
        $this->reason = null;
    }

-    public function setDestGeneral(array $general){
+    public function setDestGeneral(array $general)
+    {
        $this->destGeneral = $general;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setDestCity(array $city){
+    public function setDestCity(array $city)
+    {
        $this->destCity = $city;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setDestNation(array $nation){
+    public function setDestNation(array $nation)
+    {
        $this->destNation = $nation;
        $this->tested = false;
        $this->reason = null;
    }

-    static public function build(array $input):self{
+    static public function build(array $input): self
+    {
        $self = new static();
-        foreach($input as $key=>$value){
-            if($value === null){
+        foreach ($input as $key => $value) {
+            if ($value === null) {
                continue;
            }
-            switch($key){
-                case 'general': $self->setGeneral($value); break;
-                case 'city': $self->setCity($value); break;
-                case 'nation': $self->setNation($value); break;
-                case 'cmd_arg': $self->setCmdArg($value); break;
+            switch ($key) {
+                case 'general':
+                    $self->setGeneral($value);
+                    break;
+                case 'city':
+                    $self->setCity($value);
+                    break;
+                case 'nation':
+                    $self->setNation($value);
+                    break;
+                case 'cmd_arg':
+                    $self->setCmdArg($value);
+                    break;

-                case 'destGeneral': $self->setDestGeneral($value); break;
-                case 'destCity': $self->setDestCity($value); break;
-                case 'destNation': $self->setDestNation($value); break;
+                case 'destGeneral':
+                    $self->setDestGeneral($value);
+                    break;
+                case 'destCity':
+                    $self->setDestCity($value);
+                    break;
+                case 'destNation':
+                    $self->setDestNation($value);
+                    break;
            }
        }
-        
+
        return $self;
    }

-    public function checkInputValues(bool $throwExeception=true):bool{
+    public function checkInputValues(bool $throwExeception = true): bool
+    {
        $valueType = static::requiredValueType();

-        if(($valueType&static::REQ_GENERAL) && $this->general === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_GENERAL) && $this->general === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require general');
        }

-        if(($valueType&static::REQ_CITY) && $this->city === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_CITY) && $this->city === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require city');
        }

-        if(($valueType&static::REQ_NATION) && $this->nation === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_NATION) && $this->nation === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require nation');
        }

-        if(($valueType&static::REQ_DEST_GENERAL) && $this->destGeneral === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_DEST_GENERAL) && $this->destGeneral === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require dest general');
        }

-        if(($valueType&static::REQ_DEST_CITY) && $this->destCity === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_DEST_CITY) && $this->destCity === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require dest city');
        }

-        if(($valueType&static::REQ_DEST_NATION) && $this->destNation === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_DEST_NATION) && $this->destNation === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require dest nation');
        }

-        if (!($valueType&static::REQ_ARG)) {
-           return true;
+        if (!($valueType & static::REQ_ARG)) {
+            return true;
        }

-        if($valueType === null){
-            if(!$throwExeception){return false; }
+        if ($valueType === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require arg');
        }

-        if((($valueType&static::REQ_STRING_ARG)===static::REQ_STRING_ARG) && !is_string($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_STRING_ARG) === static::REQ_STRING_ARG) && !is_string($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require string arg');
        }

-        if((($valueType&static::REQ_BOOLEAN_ARG)===static::REQ_BOOLEAN_ARG) && !is_bool($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_BOOLEAN_ARG) === static::REQ_BOOLEAN_ARG) && !is_bool($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require bool arg');
        }

-        if((($valueType&static::REQ_INT_ARG)===static::REQ_INT_ARG) && !is_int($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_INT_ARG) === static::REQ_INT_ARG) && !is_int($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require int arg');
        }

-        if((($valueType&static::REQ_NUMERIC_ARG)===static::REQ_NUMERIC_ARG) && !is_numeric($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_NUMERIC_ARG) === static::REQ_NUMERIC_ARG) && !is_numeric($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require numeric arg');
        }

-        if((($valueType&static::REQ_ARRAY_ARG)===static::REQ_ARRAY_ARG) && !is_array($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_ARRAY_ARG) === static::REQ_ARRAY_ARG) && !is_array($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require array arg');
        }

+        if ((($valueType & static::REQ_BACKED_ENUM_ARG) === static::REQ_BACKED_ENUM_ARG) && !($this->arg instanceof \BackedEnum)) {
+            if (!$throwExeception) {
+                return false;
+            }
+            throw new \InvalidArgumentException('require backed enum arg');
+        }
+
        return true;
    }

-    public function reason():?string{
-        if($this->tested === false){
-            throw new \RuntimeException(get_class($this).'::test가 실행되지 않음');
+    public function reason(): ?string
+    {
+        if ($this->tested === false) {
+            throw new \RuntimeException(get_class($this) . '::test가 실행되지 않음');
        }
        return $this->reason;
    }

-    public static function testAll(array $constraintPacks, array $input, array $env):?array{
-        foreach($constraintPacks as $constraintArgs){
-            if (!$constraintArgs){
+    public static function testAll(array $constraintPacks, array $input, array $env): ?array
+    {
+        foreach ($constraintPacks as $constraintArgs) {
+            if (!$constraintArgs) {
                continue;
            }

            $constraintName = $constraintArgs[0];
-            $method = __NAMESPACE__.'\\'.$constraintName.'::build';
+            $method = __NAMESPACE__ . '\\' . $constraintName . '::build';

            /** @var \sammo\Constraint\Constraint $contraint */
-            $constraint = call_user_func($method,$input);
+            $constraint = call_user_func($method, $input);

            assert($constraint instanceof Constraint);
            $constraint->setEnv($env);
-            if(count($constraintArgs) == 2){
+            if (count($constraintArgs) == 2) {
                $arg = $constraintArgs[1];
                $constraint->setArg($arg);
            }
-        

-            if(!$constraint->test()){

-                if($constraint->reason() === null){
-                    throw new \RuntimeException('Reason is not set:'.$constraintName);
+            if (!$constraint->test()) {
+
+                if ($constraint->reason() === null) {
+                    throw new \RuntimeException('Reason is not set:' . $constraintName);
                }
                return [$constraintName, $constraint->reason()];
            }
@@ -220,5 +282,4 @@ abstract class Constraint{

        return null;
    }
-
-}
+}
@@ -2,6 +2,8 @@

 namespace sammo\Constraint;

+use sammo\Enums\PenaltyKey;
+
 class ConstraintHelper{

    static function AdhocCallback(callable $callback):array{
@@ -176,6 +178,10 @@ class ConstraintHelper{
        return [__FUNCTION__];
    }

+    static function NoPenalty(PenaltyKey $penaltyKey):array{
+        return [__FUNCTION__, $penaltyKey];
+    }
+
    static function OccupiedCity(bool $allowNeutral=false):array{
        return [__FUNCTION__, $allowNeutral];
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sars	74f914488b	빙의 금지 장수 포함	2024-12-05 00:04:10 -08:00
sars	a8d219afec	iconPath 재설정, 100에서 29로 숫자 조절	2024-12-04 23:26:54 -08:00
sars	4b4a7ffdf0	롤 시나리오 1.0으로 업데이트, 비급 and/or 파죽지세도 추가	2024-12-04 23:04:36 -08:00
sars	05000ae954	리그오브레전드 베타 아이콘 추가	2024-12-02 19:21:45 -08:00
Hide_D	85bf53f317	챔피언들과 미니언들 시작날짜 조절 (#260 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/260	2024-11-27 17:42:28 +09:00
sars	d65407079e	챔피언들과 미니언들 시작날짜 조절 v2	2024-11-27 00:11:52 -08:00
sars	a8c9946aa9	챔피언들과 미니언들 시작날짜 조절	2024-11-26 23:59:35 -08:00
Hide_D	1e5b2de913	LoL 시나리오 생년월일 (#257 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/257	2024-11-27 16:26:34 +09:00
Hide_D	747ab3d563	LoL 시나리오 생년월일	2024-11-27 16:26:08 +09:00
sars	82ffbba661	수식을 수치로 수정해서 다시 변환시도	2024-11-26 23:18:01 -08:00
sars	3f08876079	리그오브레전드 시나리오 추가	2024-11-26 23:09:37 -08:00
Hide_D	5622839ffa	feat: 설문 게시자 표시	2024-09-28 13:09:51 +00:00
Hide_D	4b3ab5e31c	feat: 설문 등록 시 등록자 유저명 저장	2024-09-28 13:04:29 +00:00
Hide_D	f774a28e2a	fix: 로그인 시 세션에 저장되는 username을 id가 아니라 name값으로 변경	2024-09-28 13:03:00 +00:00
Hide_D	61bdb8da01	fix: 부대 이름 변경 오작동	2024-09-23 13:43:35 +00:00
Hide_D	c117ada117	fix: event 커맨드 수정 - 탑승즉시이동: 불필요한 추가 조사 제거 - 발령즉시집합: 발령자가 탑승중인 경우 변수값 변경 - 장수 커맨드 실행 시 cityID에 따라 다시 받아오므로 해당 변경으로 충분	2024-09-23 13:35:28 +00:00
Hide_D	1f0d0f992d	game: 부대탈퇴지시 ui	2024-09-18 16:30:01 +00:00
Hide_D	6445b77b90	game: 부대탑승후 이동 이벤트시 로그 기록	2024-09-18 16:17:24 +00:00
Hide_D	6d935733e6	game: 충차 도구 치안치 하향	2024-09-18 16:09:02 +00:00
Hide_D	cfd0a2d26f	game: 충차 도구 추가	2024-09-18 16:08:37 +00:00
Hide_D	749e8f673b	fix: StaticEventHandler 버그 수정	2024-09-18 16:08:25 +00:00
Hide_D	4812f324e0	fix: StaticEventHandler 버그 수정	2024-09-18 16:02:41 +00:00
Hide_D	085f34b307	feat: 부대탈퇴지시	2024-09-18 15:22:27 +00:00
Hide_D	622ce7b780	game: 축지 시나리오 벌점 제한 2배	2024-09-18 15:11:18 +00:00
Hide_D	34b1fc9c5e	feat: 벌점 제한 계수를 GameConst로 이동	2024-09-18 15:10:34 +00:00
Hide_D	9cc27c40aa	game: 축지 시나리오 수비 설정 제한 완화	2024-09-18 15:08:37 +00:00
Hide_D	eece1cbae5	feat: 수비 설정 제한을 GameConst로 이동	2024-09-18 15:08:21 +00:00
Hide_D	7e6770b5e7	game: 축지 시나리오 유닛세트	2024-09-18 15:02:38 +00:00
Hide_D	a0c032c2c6	game: 축지 이벤트 작업	2024-09-18 14:54:56 +00:00
Hide_D	3d12de3838	refac: API/Troop 의 $me를 GeneralLite로 변경 - StaticEventHandler 처리도 추가	2024-09-18 14:54:40 +00:00
Hide_D	477b77b59f	feat: StaticEventHandler 처리기 추가 - 커맨드 종료 시점에 호출 - pre, post 각각이 필요한지는 논의 필요 - 일단 용도에 따라 pre, post 둘중에 하나만 처리 - eventType으로는 full qualified class name 사용 - 꼭 그럴필요는 없지만, 커맨드에 한해서는 이렇게	2024-09-18 14:54:11 +00:00
Hide_D	04a7a34fcc	부대 이동 관련 초기 코드	2024-09-17 00:48:54 +09:00
Hide_D	86f1805160	fix: 병가 인구 상승률 버그 수정 (#255 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/255	2024-07-30 14:57:43 +09:00
jyp9	d573e9f98a	fix: 병가 인구 상승률 버그 수정 fix: 병가 인구 상승률 버그 수정	2024-07-30 14:55:40 +09:00
Hide_D	3ad16d96be	game: 긴급천도시 모든 장수에게 알림, - 수뇌에게는 집합 메시지도 남김	2024-07-16 13:09:43 +09:00
Hide_D	d8870caf29	feat: 포인트 초기화 추가 - 급하니까 일단 땜빵	2024-07-10 18:11:10 +00:00
Hide_D	7c9d5d34f6	feat: 스탯 초기화용 API 준비	2024-07-10 17:20:38 +00:00
Hide_D	5268ce9b71	game: 훈련, 사기진작 시 병력이 낮을 때도 숙련 상승량 조정	2024-07-10 17:00:35 +00:00
Hide_D	e395c98a6c	fix: 도시 주둔 장수 중 해당 국가 소속만 계략 확률 감소에 영향을 주도록 수정 (#254 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/254	2024-07-08 17:01:17 +09:00
Hide_D	d5897e2a49	fix: 건국 유니크 100% 수정	2024-06-22 15:42:58 +00:00
Hide_D	c82003f982	game: 건국시 확정 유니크, 유산 포인트 250점	2024-06-22 15:41:43 +00:00
Hide_D	5447274aa8	game: 사령턴 입력, 인사부 처리 시 삭턴 변경	2024-06-22 15:28:39 +00:00
Hide_D	688162ffbf	fix: 이벤트 클래식은 907이 아니라 908이었어야함	2024-06-20 12:31:49 +00:00
Hide_D	220d1d821d	fix: 삼황내문 로직 누락 수정	2024-06-19 13:23:07 +09:00
Hide_D	2b16c3c1a9	fix: 삼황내문을 새 저지 로직에 맞게 변경	2024-06-19 13:22:20 +09:00
Hide_D	d731acdaef	Revert "fix: 삼황내문을 새 저지 로직에 맞게 수정" This reverts commit `3511b159a8`.	2024-06-19 13:19:30 +09:00
Hide_D	3511b159a8	fix: 삼황내문을 새 저지 로직에 맞게 수정	2024-06-19 13:18:15 +09:00
Hide_D	28cea4ee09	fix: 메시지 수정	2024-06-08 18:55:48 +00:00
Hide_D	8e7227c29d	fix: DummyGeneral에 penaltyList	2024-06-08 18:52:47 +00:00
Hide_D	f0cc22d9d8	fix: NoChief 처리 부실	2024-06-08 18:48:46 +00:00
Hide_D	b6f19fa38b	feat: 유산포인트로 장수 소유자 확인	2024-06-08 18:42:39 +00:00
Hide_D	86305087f7	Revert "장수목록에서 장수명에 마우스를 올리면 본닉 공개" This reverts commit `a3d7ef30dd`.	2024-06-08 17:52:13 +00:00
Hide_D	7b6f64db61	fix: 유저장이 수뇌 금지 장수밖에 없을때 NPC 임명 동작	2024-06-08 17:47:35 +00:00
Hide_D	06f086bcf0	fix: penalty 오타	2024-06-08 17:37:43 +00:00
Hide_D	606c1664f2	feat: 내정보에 징계목록 출력	2024-06-08 17:37:33 +00:00
Hide_D	0c07060f4d	feat: 메시지 전송 페널티	2024-06-08 17:22:10 +00:00
Hide_D	8bd0cc1c64	feat: 건국 금지, 지정 임관 금지 패널티	2024-06-08 17:21:55 +00:00
Hide_D	f12262b946	feat: 건국 불가 페널티	2024-06-08 16:16:52 +00:00
Hide_D	9415d79a3a	feat: Constraint 시스템에 NoPaneltyKey 추가	2024-06-08 16:15:19 +00:00
Hide_D	ad223a9c75	feat: NPC 임명로직에 NoChief, NoAmbassador 반영	2024-06-08 16:06:22 +00:00
Hide_D	8737b19e79	fix: 이미 수뇌인 장수는 NPC에게 외교권을 못받는 버그 수정	2024-06-08 15:58:52 +00:00
Hide_D	552d73430c	feat: 유저장의 수뇌 임명 불가 penalty	2024-06-08 15:55:26 +00:00
Hide_D	fba5fbdb6b	feat: PenaltyKey::NoChiefTurnInput	2024-06-08 15:48:01 +00:00
Hide_D	3da11bf21c	feat: 내 정보 설정 저장지 페널티 갱신	2024-06-08 15:41:27 +00:00
Hide_D	c83f9a0465	game: 휴전 -> 종전	2024-06-08 14:43:40 +00:00
Hide_D	9f67ae1f4e	feat: General::penaltyList	2024-06-08 14:38:31 +00:00
Hide_D	383431b79f	feat: PenaltyKey enum	2024-06-08 14:06:12 +00:00
Hide_D	d5c0d16758	game: 저지 작동 방식 변경 - 최대 페이즈를 1 깎는 형태로 변경	2024-06-08 13:24:32 +00:00
devsamanddevsam	87294d5477	fix: 도시 주둔 장수 중 해당 국가 소속만 계략 확률 감소에 영향을 주도록 수정	2024-06-01 07:00:35 +09:00