refac: 신규/복귀 유저 유산 포인트 지급 로직을 조금더 최적화

- 이벤트 깃수 제외 500포인트
- 8기까지 적립

hwe/_admin_force_rehall.php

@@ -27,7 +27,6 @@ foreach ($db->queryFirstColumn(
 
 $inheritPointManager = InheritancePointManager::getInstance();
 foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
-    $inheritPointManager->mergeTotalInheritancePoint($genObj, true);
+    $inheritPointManager->mergeTotalInheritancePoint($genObj);
     $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
-    $inheritPointManager->clearInheritancePoint($genObj);
 }

hwe/func.php

@@ -1805,7 +1805,7 @@ function deleteNation(General $lord, bool $applyDB): array
             $nationID,
             $lordID
         ),
-        ['npc', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'belong', 'aux'],
+        ['npc', 'owner', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'belong', 'aux'],
         1
     );
     $nationGeneralList[$lordID] = $lord;
@@ -1823,13 +1823,16 @@ function deleteNation(General $lord, bool $applyDB): array
 
     // 전 장수 재야로
     foreach ($nationGeneralList as $general) {
-        $general->setAuxVar(
-            InheritanceKey::max_belong->value,
-            max(
-                $general->getVar('belong'),
-                $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
-            )
-        );
+        if($general->getNPCType() < 2){
+            $general->setAuxVar(
+                InheritanceKey::max_belong->value,
+                max(
+                    $general->getVar('belong'),
+                    $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
+                )
+            );
+        }
+
         $general->setVar('belong', 0);
         $general->setVar('troop', 0);
         $general->setVar('officer_level', 0);

hwe/func_gamerule.php

@@ -1092,9 +1092,8 @@ function checkEmperior()
     }
     processSumInheritPointRank();
     foreach ($allUserGenerals as $genObj) {
-        $inheritPointManager->mergeTotalInheritancePoint($genObj, true);
+        $inheritPointManager->mergeTotalInheritancePoint($genObj);
         $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
-        $inheritPointManager->clearInheritancePoint($genObj);
     }
 
     $gameStor->isunited = 2;

hwe/install.php

@@ -93,8 +93,8 @@ if ($session->userGrade < 5 && !$allowReset) {
                                 <label for="fiction" class="col-sm-3 col-form-label">NPC 상성</label>
                                 <div class="col-sm-9">
                                     <div id="fiction" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
-                                        <input type="radio" id="fiction_0" class="btn-check" name="fiction" value="0" checked><label for="fiction_0" class="btn btn-secondary"> 연의 </label>
-                                        <input type="radio" id="fiction_1" class="btn-check" name="fiction" value="1"><label for="fiction_1" class="btn btn-secondary"> 가상 </label>
+                                        <input type="radio" id="fiction_0" class="btn-check" name="fiction" value="0"><label for="fiction_0" class="btn btn-secondary"> 연의 </label>
+                                        <input type="radio" id="fiction_1" class="btn-check" name="fiction" value="1" checked><label for="fiction_1" class="btn btn-secondary"> 가상 </label>
                                     </div>
                                 </div>
                             </div>
@@ -135,13 +135,13 @@ if ($session->userGrade < 5 && !$allowReset) {
                                 <div class="col-sm-9">
                                     <div class="input-group">
                                         <div class="btn-group btn-group-toggle" data-bs-toggle="buttons">
-                                            <input type="checkbox" id="autorun_develop" class="autorun_user_chk btn-check" data-key="develop" name="autorun_user[]" value="develop"><label class="btn btn-secondary" for="autorun_develop">내정</label>
-                                            <input type="checkbox" id="autorun_warp" class="autorun_user_chk btn-check" data-key="warp" name="autorun_user[]" value="warp"><label class="btn btn-secondary" for="autorun_warp">순간이동</label>
-                                            <input type="checkbox" id="autorun_recruit" class="autorun_user_chk btn-check" data-key="recruit" name="autorun_user[]" value="recruit"><label class="btn btn-secondary" for="autorun_recruit">징병</label>
-                                            <input type="checkbox" id="autorun_recruit_high" class="autorun_user_chk btn-check" data-key="recruit_high" name="autorun_user[]" value="recruit_high"><label class="btn btn-secondary" for="autorun_recruit_high">모병</label>
-                                            <input type="checkbox" id="autorun_train" class="autorun_user_chk btn-check" data-key="train" name="autorun_user[]" value="train"><label class="btn btn-secondary" for="autorun_train">훈사</label>
-                                            <input type="checkbox" id="autorun_battle" class="autorun_user_chk btn-check" data-key="battle" name="autorun_user[]" value="battle"><label class="btn btn-secondary" for="autorun_battle">출병</label>
-                                            <input type="checkbox" id="autorun_chief" class="autorun_user_chk btn-check" data-key="chief" name="autorun_user[]" value="chief"><label class="btn btn-secondary" for="autorun_chief">기본 사령턴</label>
+                                            <input type="checkbox" id="autorun_develop" class="autorun_user_chk btn-check" data-key="develop" name="autorun_user[]" value="develop" checked><label class="btn btn-secondary" for="autorun_develop">내정</label>
+                                            <input type="checkbox" id="autorun_warp" class="autorun_user_chk btn-check" data-key="warp" name="autorun_user[]" value="warp" checked><label class="btn btn-secondary" for="autorun_warp">순간이동</label>
+                                            <input type="checkbox" id="autorun_recruit" class="autorun_user_chk btn-check" data-key="recruit" name="autorun_user[]" value="recruit" checked><label class="btn btn-secondary" for="autorun_recruit">징병</label>
+                                            <input type="checkbox" id="autorun_recruit_high" class="autorun_user_chk btn-check" data-key="recruit_high" name="autorun_user[]" value="recruit_high" checked><label class="btn btn-secondary" for="autorun_recruit_high">모병</label>
+                                            <input type="checkbox" id="autorun_train" class="autorun_user_chk btn-check" data-key="train" name="autorun_user[]" value="train" checked><label class="btn btn-secondary" for="autorun_train">훈사</label>
+                                            <input type="checkbox" id="autorun_battle" class="autorun_user_chk btn-check" data-key="battle" name="autorun_user[]" value="battle" checked><label class="btn btn-secondary" for="autorun_battle">출병</label>
+                                            <input type="checkbox" id="autorun_chief" class="autorun_user_chk btn-check" data-key="chief" name="autorun_user[]" value="chief" checked><label class="btn btn-secondary" for="autorun_chief">기본 사령턴</label>
                                         </div>
                                     </div>
                                 </div>
@@ -163,7 +163,7 @@ if ($session->userGrade < 5 && !$allowReset) {
                                             <option value="480">8시간</option>
                                             <option value="600">10시간</option>
                                             <option value="720">12시간</option>
-                                            <option value="1440">24시간</option>
+                                            <option value="1440" selected>24시간</option>
                                             <option value="2160">36시간</option>
                                             <option value="2880">48시간</option>
                                             <option value="3600">60시간</option>

hwe/j_myBossInfo.php

@@ -226,8 +226,8 @@ function do추방(General $general, int $myOfficerLevel):?string{
     }
     else{
         $betrayCnt = $general->getVar('betray');
-        $general->addExperience(-$general->getVar('experience')*0.1*$betrayCnt);
-        $general->addDedication(-$general->getVar('dedication')*0.1*$betrayCnt);
+        $general->addExperience(-$general->getVar('experience')*0.15*$betrayCnt);
+        $general->addDedication(-$general->getVar('dedication')*0.15*$betrayCnt);
         $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
     }
 

hwe/sammo/API/General/DieOnPrestart.php

@@ -67,7 +67,7 @@ class DieOnPrestart extends \sammo\BaseAPI
 
     $generalName = $generalObj->getName();
     $josaYi = JosaUtil::pick($generalName, '이');
-    $generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>");
+    $generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 홀연히 모습을 <R>감추었습니다</>");
 
     $session->logoutGame();
     return null;

hwe/sammo/API/General/Join.php

@@ -2,6 +2,7 @@
 
 namespace sammo\API\General;
 
+use Ds\Set;
 use sammo\ActionLogger;
 use sammo\CityConst;
 use sammo\DB;
@@ -84,6 +85,40 @@ class Join extends \sammo\BaseAPI
         return static::REQ_LOGIN | static::REQ_READ_ONLY;
     }
 
+    public function calcRestInheritPoint(int $userID): int
+    {
+        $db = DB::db();
+
+        if (Util::toInt(UniqueConst::$seasonIdx) < 1) {
+            //이벤트 시즌은 카운트하지 않음
+            return 0;
+        }
+
+        $gameID = UniqueConst::$serverID;
+        $alreadyJoined = $db->queryFirstField('SELECT count(*) FROM `storage` WHERE `namespace` = %s AND `key` LIKE %s', 'inheritance_result', "{$gameID}_{$userID}_%");
+        if ($alreadyJoined) {
+            //이미 받았음
+            return 0;
+        }
+
+        $targetBonusPointCnt = 0;
+        //정상적으로 끝난 깃수만 제공
+        $oldGames = $db->queryFirstColumn('SELECT server_id FROM ng_games WHERE `winner_nation` IS NOT NULL AND `server_id` != %s ORDER BY `date` DESC LIMIT 8', $gameID);
+
+        if(!$oldGames){
+            return 0;
+        }
+        //이전에 장수를 생성한 적이 있는지
+        $oldGamesCnt = new Set($db->queryFirstColumn('SELECT `server_id` FROM ng_old_generals WHERE server_id IN %ls AND `owner` = %i GROUP BY `server_id`', $oldGames, $userID));
+        foreach ($oldGames as $oldGameID) {
+            if($oldGamesCnt->contains($oldGameID)) {
+                break;
+            }
+            $targetBonusPointCnt += 1;
+        }
+        return $targetBonusPointCnt;
+    }
+
     public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
     {
         $userID = $session->userID;
@@ -105,7 +140,7 @@ class Join extends \sammo\BaseAPI
         $inheritCity = $this->args['inheritCity'] ?? null;
         $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;
 
-        if($inheritTurntime !== null && $inheritCity !== null){
+        if ($inheritTurntime !== null && $inheritCity !== null) {
             return '턴과 도시를 동시에 지정할 수 없습니다.';
         }
 
@@ -305,7 +340,7 @@ class Join extends \sammo\BaseAPI
         if ($inheritTurntime !== null) {
             $inheritTurntime = $inheritTurntime % ($admin['turnterm'] * 60);
 
-            $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime%60), "inheritPoint");
+            $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");
 
             $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
             $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
@@ -337,6 +372,11 @@ class Join extends \sammo\BaseAPI
         //상성 랜덤
         $affinity = $rng->nextRangeInt(1, 150);
 
+        $betray = 0;
+        if ($relYear >= 4) {
+            $betray += 2;
+        }
+
         ########## 회원정보 테이블에 입력값을 등록한다. ##########
         $db->insert('general', [
             'owner' => $userID,
@@ -365,6 +405,7 @@ class Join extends \sammo\BaseAPI
             'lastrefresh' => $now,
             'crewtype' => GameUnitConst::DEFAULT_CREWTYPE,
             'makelimit' => 0,
+            'betray' => $betray,
             'age' => $age,
             'startage' => $age,
             'personal' => $character,
@@ -402,19 +443,25 @@ class Join extends \sammo\BaseAPI
         if ($inheritRequiredPoint > 0) {
             $userLogger->push("장수 생성으로 포인트 {$inheritRequiredPoint} 소모", "inheritPoint");
             $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$userID}");
-            $inheritStor->setValue('previous', [$inheritTotalPoint - $inheritRequiredPoint, null]);
+            $inheritTotalPoint -= $inheritRequiredPoint;
+            $inheritStor->setValue('previous', [$inheritTotalPoint, null]);
             $userLogger->flush();
             $db->update('rank_data', [
-                'value'=>$db->sqleval('value + %i', $inheritRequiredPoint)
+                'value' => $db->sqleval('value + %i', $inheritRequiredPoint)
             ], 'general_id = %i AND type = %s', $generalID, RankColumn::inherit_point_spent_dynamic->value);
         }
 
-        $me = [
-            'no' => $generalID
-        ];
 
-        $log = [];
-        $mylog = [];
+        $restInheritPoint = $this->calcRestInheritPoint($userID) * 500;
+        if($restInheritPoint > 0){
+            $userLogger->push("신규/복귀 생성으로 포인트 {$restInheritPoint} 지급", "inheritPoint");
+            $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$userID}");
+            $inheritTotalPoint += $restInheritPoint;
+            $inheritStor->setValue('previous', [$inheritTotalPoint, null]);
+            $userLogger->flush();
+        }
+
+
 
         $logger = new ActionLogger($generalID, 0, $gameStor->year, $gameStor->month);
 

hwe/sammo/ActionItem/che_명마_12_옥란백용구.php

@@ -10,7 +10,7 @@ class che_명마_12_옥란백용구 extends \sammo\BaseStatItem{
     public function __construct()
     {
         parent::__construct();
-        $this->info .= "<br>[전투] 남은 병력이 적을수록 회피 확률 증가. 최대 +30%p";
+        $this->info .= "<br>[전투] 남은 병력이 적을수록 회피 확률 증가. 최대 +50%p";
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux = null)
@@ -20,7 +20,7 @@ class che_명마_12_옥란백용구 extends \sammo\BaseStatItem{
             $leadership = $general->getLeadership(true, true, true, false);
             $crewL = $general->getVar('crew') / 100;
 
-            return $value + \sammo\Util::valueFit((1 - $crewL / $leadership) * 0.3, 0, 0.3);
+            return $value + \sammo\Util::valueFit((1 - $crewL / $leadership) * 0.5, 0, 0.5);
         }
         return $value;
     }

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

@@ -9,7 +9,7 @@ class che_징병_낙주 extends \sammo\BaseItem{
 
     protected $rawName = '낙주';
     protected $name = '낙주(징병)';
-    protected $info = '[군사] 징·모병비 -30%, 통솔 순수 능력치 보정 +15%';
+    protected $info = '[군사] 징·모병비 -30%<br>[기타] 통솔 순수 능력치 보정 +15%, 징병/모병/소집해제 시 인구 변동 없음';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -18,6 +18,10 @@ class che_징병_낙주 extends \sammo\BaseItem{
             if($varType == 'cost') return $value * 0.7;
         }
 
+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
+        }
+
         return $value;
     }
 

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

@@ -9,7 +9,7 @@ class event_전투특기_징병 extends \sammo\BaseItem{
 
     protected $rawName = '비급';
     protected $name = '비급(징병)';
-    protected $info = '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +25%';
+    protected $info = '[군사] 징병/모병 시 훈사 70/84 제공<br>[기타] 통솔 순수 능력치 보정 +25%, 징병/모병/소집해제 시 인구 변동 없음';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -17,7 +17,18 @@ class event_전투특기_징병 extends \sammo\BaseItem{
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
         if(in_array($turnType, ['징병', '모병'])){
-            if($varType == 'cost') return $value * 0.5;
+            if($varType == 'train' || $varType == 'atmos'){
+                if($turnType === '징병'){
+                    return 70;
+                }
+                else{
+                    return 84;
+                }
+            }
+        }
+
+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
         }
 
         return $value;

hwe/sammo/ActionSpecialDomestic/che_event_징병.php

@@ -9,7 +9,7 @@ class che_event_징병 extends \sammo\BaseSpecial{
 
     protected $id = 72;
     protected $name = '징병';
-    protected $info = '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +25%';
+    protected $info = '[군사] 징병/모병 시 훈사 70/84 제공<br>[기타] 통솔 순수 능력치 보정 +25%, 징병/모병/소집해제 시 인구 변동 없음';
 
     static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
     static $selectWeight = 1;
@@ -21,9 +21,20 @@ class che_event_징병 extends \sammo\BaseSpecial{
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
         if(in_array($turnType, ['징병', '모병'])){
-            if($varType == 'cost') return $value * 0.5;
+            if($varType == 'train' || $varType == 'atmos'){
+                if($turnType === '징병'){
+                    return 70;
+                }
+                else{
+                    return 84;
+                }
+            }
         }
-        
+
+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
+        }
+
         return $value;
     }
 

hwe/sammo/ActionSpecialWar/che_징병.php

@@ -9,7 +9,7 @@ class che_징병 extends \sammo\BaseSpecial{
 
     protected $id = 72;
     protected $name = '징병';
-    protected $info = '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +25%';
+    protected $info = '[군사] 징병/모병 시 훈사 70/84 제공<br>[기타] 통솔 순수 능력치 보정 +25%, 징병/모병/소집해제 시 인구 변동 없음';
 
     static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
     static $selectWeight = 1;
@@ -21,9 +21,20 @@ class che_징병 extends \sammo\BaseSpecial{
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
         if(in_array($turnType, ['징병', '모병'])){
-            if($varType == 'cost') return $value * 0.5;
+            if($varType == 'train' || $varType == 'atmos'){
+                if($turnType === '징병'){
+                    return 70;
+                }
+                else{
+                    return 84;
+                }
+            }
         }
-        
+
+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
+        }
+
         return $value;
     }
 

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

@@ -179,6 +179,15 @@ class che_등용수락 extends Command\GeneralCommand{
         $db->update('nation', $setScoutNationValues, 'nation=%i', $destNationID);
 
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        if($general->getNPCType() < 2){
+            $general->setAuxVar(
+                InheritanceKey::max_belong->value,
+                max(
+                    $general->getVar('belong'),
+                    $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
+                )
+            );
+        }
         $general->setVar('permission', 'normal');
         $general->setVar('belong', 1);
         $general->setVar('officer_level', 1);

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

@@ -62,8 +62,6 @@ class che_소집해제 extends Command\GeneralCommand{
         $general = $this->generalObj;
         $date = $general->getTurnTime($general::TURNTIME_HM);
 
-        $crew = $general->getVar('crew');
-
         $logger = $general->getLogger();
 
         $logger->pushGeneralActionLog("병사들을 <R>소집해제</>하였습니다. <1>$date</>");
@@ -71,8 +69,10 @@ class che_소집해제 extends Command\GeneralCommand{
         $exp = 70;
         $ded = 100;
 
+        $crewUp = $general->onCalcDomestic('징집인구', 'score', $general->getVar('crew'));
+
         $db->update('city', [
-            'pop'=>$db->sqleval('pop + %i', $crew)
+            'pop'=>$db->sqleval('pop + %i', $crewUp)
         ], 'city=%i', $general->getCityID());
 
         $general->setVar('crew', 0);

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

@@ -10,6 +10,7 @@ use \sammo\{
 use \sammo\Constraint\ConstraintHelper;
 
 use function sammo\tryUniqueItemLottery;
+use function sammo\CheckHall;
 
 class che_은퇴 extends Command\GeneralCommand{
     static protected $actionName = '은퇴';
@@ -59,12 +60,17 @@ class che_은퇴 extends Command\GeneralCommand{
         }
 
         $db = DB::db();
+        $env = $this->env;
 
         $general = $this->generalObj;
         $date = $general->getTurnTime($general::TURNTIME_HM);
 
         $logger = $general->getLogger();
 
+        if ($env['isunited'] == 0) {
+            CheckHall($general->getID());
+        }
+
         $general->rebirth();
         $logger->pushGeneralActionLog("은퇴하였습니다. <1>$date</>");
 

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

@@ -184,10 +184,13 @@ class che_징병 extends Command\GeneralCommand
 
         $logger = $general->getLogger();
 
+        $setTrain = $general->onCalcDomestic(static::$actionName, 'train', static::$defaultTrain);
+        $setAtmos = $general->onCalcDomestic(static::$actionName, 'atmos', static::$defaultAtmos);
+
         if ($reqCrewType->id == $currCrewType->id && $currCrew > 0) {
             $logger->pushGeneralActionLog("{$crewTypeName} <C>{$reqCrewText}</>명을 추가{$this->getName()}했습니다. <1>$date</>");
-            $train = ($currCrew * $general->getVar('train') + $reqCrew * static::$defaultTrain) / ($currCrew + $reqCrew);
-            $atmos = ($currCrew * $general->getVar('atmos') + $reqCrew * static::$defaultAtmos) / ($currCrew + $reqCrew);
+            $train = ($currCrew * $general->getVar('train') + $reqCrew * $setTrain) / ($currCrew + $reqCrew);
+            $atmos = ($currCrew * $general->getVar('atmos') + $reqCrew * $setAtmos) / ($currCrew + $reqCrew);
 
             $general->increaseVar('crew', $reqCrew);
             $general->setVar('train', $train);
@@ -196,15 +199,17 @@ class che_징병 extends Command\GeneralCommand
             $logger->pushGeneralActionLog("{$crewTypeName} <C>{$reqCrewText}</>명을 {$this->getName()}했습니다. <1>$date</>");
             $general->setVar('crewtype', $reqCrewType->id);
             $general->setVar('crew', $reqCrew);
-            $general->setVar('train', static::$defaultTrain);
-            $general->setVar('atmos', static::$defaultAtmos);
+            $general->setVar('train', $setTrain);
+            $general->setVar('atmos', $setAtmos);
         }
 
-        $newTrust = Util::valueFit($this->city['trust'] - ($reqCrew / $this->city['pop']) / static::$costOffset * 100, 0);
+        $reqCrewDown = $general->onCalcDomestic('징집인구', 'score', $reqCrew);
+
+        $newTrust = Util::valueFit($this->city['trust'] - ($reqCrewDown / $this->city['pop']) / static::$costOffset * 100, 0);
 
         $db->update('city', [
             'trust' => $newTrust,
-            'pop' => $this->city['pop'] - $reqCrew
+            'pop' => $this->city['pop'] - $reqCrewDown
         ], 'city=%i', $general->getCityID());
 
         $exp = Util::round($reqCrew / 100);

hwe/sammo/Command/General/che_하야.php

@@ -113,6 +113,15 @@ class che_하야 extends Command\GeneralCommand{
         $general->setVar('troop', 0);
 
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        if($general->getNPCType() < 2){
+            $general->setAuxVar(
+                InheritanceKey::max_belong->value,
+                max(
+                    $general->getVar('belong'),
+                    $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
+                )
+            );
+        }
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();

hwe/sammo/Command/General/che_화계.php

@@ -94,6 +94,7 @@ class che_화계 extends Command\GeneralCommand
 
         $prob = $maxGenScore / GameConst::$sabotageProbCoefByStat;
         $prob += $probCorrection;
+        $prob += (sqrt(count($destCityGeneralList)) - 1) * GameConst::$sabotageDefenceCoefByGeneralCnt;
 
         $prob += $destCity['secu'] / $destCity['secu_max'] / 5; //최대 20%p
         $prob += $destCity['supply'] ? 0.1 : 0;

hwe/sammo/Command/Nation/che_불가침수락.php

@@ -112,7 +112,7 @@ class che_불가침수락 extends Command\NationCommand
         $month = $this->arg['month'];
 
         $currentMonth = $env['year'] * 12 + $env['month'] - 1;
-        $reqMonth = $year * 12 + $month - 1;
+        $reqMonth = $year * 12 + $month;
 
         $nationID = $this->nation['nation'];
 
@@ -199,7 +199,7 @@ class che_불가침수락 extends Command\NationCommand
         $destLogger = $this->destGeneralObj->getLogger();
 
         $currentMonth = $env['year'] * 12 + $env['month'] - 1;
-        $reqMonth = $year * 12 + $month - 1;
+        $reqMonth = $year * 12 + $month;
 
         $db->update(
             'diplomacy',

hwe/sammo/Command/Nation/che_피장파장.php

@@ -75,7 +75,7 @@ class che_피장파장 extends Command\NationCommand
         $env = $this->env;
 
         $this->setCity();
-        $this->setNation();
+        $this->setNation(['strategic_cmd_limit']);
 
         $this->minConditionConstraints = [
             ConstraintHelper::OccupiedCity(),
@@ -113,6 +113,7 @@ class che_피장파장 extends Command\NationCommand
                 [0, 1],
                 '선포, 전쟁중인 상대국에게만 가능합니다.'
             ),
+            ConstraintHelper::AvailableStrategicCommand(),
         ];
     }
 
@@ -120,8 +121,9 @@ class che_피장파장 extends Command\NationCommand
     {
         $name = $this->getName();
         $reqTurn = $this->getPreReqTurn() + 1;
+        $postReqTurn = $this->getPostReqTurn();
 
-        return "{$name}/{$reqTurn}턴(대상 재사용 대기 {$this->getTargetPostReqTurn()})";
+        return "{$name}/{$reqTurn}턴(재사용 대기 $postReqTurn, 대상 재사용 대기 {$this->getTargetPostReqTurn()})";
     }
 
     public function getCost(): array
@@ -136,7 +138,7 @@ class che_피장파장 extends Command\NationCommand
 
     public function getPostReqTurn(): int
     {
-        return 0;
+        return 8;
     }
 
     public function getTargetPostReqTurn(): int

hwe/sammo/Event/Action/AddGlobalBetray.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace sammo\Event\Action;
+
+use sammo\DB;
+
+class AddGlobalBetray extends \sammo\Event\Action
+{
+  public function __construct(private int $cnt = 1, private int $ifMax = 0)
+  {
+  }
+
+  public function run(array $env)
+  {
+    $db = DB::db();
+    $db->update('general', [
+      'betray' => $db->sqleval('betray + %i', $this->cnt),
+    ], 'betray <= %i', $this->ifMax);
+  }
+}

hwe/sammo/GameConstBase.php

@@ -46,6 +46,8 @@ class GameConstBase
     public static $sabotageDefaultProb = 0.35;
     /** @var int 계략시 확률 가중치(수치가 클수록 변화가 적음 : (지력차/$firing + $basefiring)*/
     public static $sabotageProbCoefByStat = 300;
+    /** @var float 인원수 별 계략 방어 가중치 */
+    public static $sabotageDefenceCoefByGeneralCnt = 0.05;
     /** @var int 계략시 최소 수치 감소량*/
     public static $sabotageDamageMin = 100;
     /** @var int 계략시 최대 수치 감소량*/
@@ -368,9 +370,9 @@ class GameConstBase
             'che_의병모집',
             'che_이호경식',
             'che_급습',
+            'che_피장파장',
         ],
         '기타' => [
-            'che_피장파장',
             'che_국기변경',
             'che_국호변경',
         ]
@@ -431,5 +433,13 @@ class GameConstBase
             ["NoticeToHistoryLog", "<S>출병 제한이 풀렸습니다.</>", ActionLogger::EVENT_YEAR_MONTH],
             ["DeleteEvent"]
         ],
+        [
+            "month", 2000,
+            ["DateRelative", "==", 4, 1],
+            ["NoticeToHistoryLog", "<S>이제부터 하야, 망명시 패널티가 적용됩니다.</>", ActionLogger::EVENT_YEAR_MONTH],
+            ["AddGlobalBetray", 1, 0],
+            ["AddGlobalBetray", 1, 1],
+            ["DeleteEvent"]
+        ],
     ];
 }

hwe/sammo/General.php

@@ -626,7 +626,6 @@ class General implements iAction
             $inheritPointManager = InheritancePointManager::getInstance();
             $inheritPointManager->mergeTotalInheritancePoint($this);
             $inheritPointManager->applyInheritanceUser($this->getVar('owner'));
-            $inheritPointManager->clearInheritancePoint($this);
         }
 
 
@@ -666,6 +665,8 @@ class General implements iAction
             'reserved_until' => null,
         ], 'general_id=%i', $generalID);
 
+        storeOldGeneral($generalID, $logger->getYear(), $logger->getMonth());
+
         $db->delete('general', 'no=%i', $generalID);
         $db->delete('general_turn', 'general_id=%i', $generalID);
         $db->delete('rank_data', 'general_id=%i', $generalID);
@@ -686,9 +687,8 @@ class General implements iAction
 
         $ownerID = $this->getVar('owner');
         if ($ownerID) {
-            $inheritPointManager->mergeTotalInheritancePoint($this);
+            $inheritPointManager->mergeTotalInheritancePoint($this, true);
             $inheritPointManager->applyInheritanceUser($ownerID, true);
-            $inheritPointManager->clearInheritancePoint($this);
         }
 
         $this->multiplyVarWithLimit('leadership', 0.85, 10);
@@ -1331,8 +1331,8 @@ class General implements iAction
         return InheritancePointManager::getInstance()->increaseInheritancePoint($this, $key, $value, $aux);
     }
 
-    public function mergeTotalInheritancePoint(bool $isEnd = false)
+    public function mergeTotalInheritancePoint(bool $isRebirth = false)
     {
-        InheritancePointManager::getInstance()->mergeTotalInheritancePoint($this, $isEnd);
+        InheritancePointManager::getInstance()->mergeTotalInheritancePoint($this, $isRebirth);
     }
 }

hwe/sammo/GeneralAI.php

@@ -11,8 +11,6 @@ class GeneralAI
 {
     protected RandUtil $rng;
 
-    /** @var General */
-    protected $general;
     protected array $city;
     protected array $nation;
     protected int $genType;
@@ -65,6 +63,9 @@ class GeneralAI
     /** @var General[] */
     protected $chiefGenerals;
 
+    /** @var bool */
+    protected $reqUpdateInstance = true;
+
     /** @var General[] */
     protected $lostGenerals;
     /** @var General[] 이번 턴에 '집합'하는 부대장 목록 */
@@ -80,15 +81,16 @@ class GeneralAI
     const d직전 = 3;
     const d전쟁 = 4;
 
-    //수뇌용
+    protected function updateInstance(): void{
+        if(!$this->reqUpdateInstance){
+            return;
+        }
+
+        $this->reqUpdateInstance = false;
 
-    public function __construct(General $general)
-    {
         $db = DB::db();
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $this->env = $gameStor->getAll(true);
         $this->baseDevelCost = $this->env['develcost'] * 12;
-        $this->general = $general;
+        $general = $this->general;
         $city = $general->getRawCity();
         if ($city === null) {
             $city = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $general->getCityID());
@@ -96,14 +98,6 @@ class GeneralAI
         }
         $this->city = $city;
 
-        $this->rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-            UniqueConst::$hiddenSeed,
-            'GeneralAI',
-            $this->env['year'],
-            $this->env['month'],
-            $general->getID(),
-        )));
-
         $this->nation = $db->queryFirstRow(
             'SELECT nation,name,color,capital,capset,gennum,gold,rice,bill,rate,rate_tmp,scout,war,strategic_cmd_limit,surlimit,tech,power,level,chief_set,type,aux FROM nation WHERE nation = %i',
             $general->getNationID()
@@ -123,8 +117,8 @@ class GeneralAI
         $nationStor = KVStorage::getStorage($db, $this->nation['nation'], 'nation_env');
         $nationStor->cacheValues(['npc_nation_policy', 'npc_general_policy', 'prev_income_gold', 'prev_income_rice']);
 
-        $this->nationPolicy = new AutorunNationPolicy($general, $this->env['autorun_user']['options'] ?? null, $nationStor->getValue('npc_nation_policy'), $gameStor->getValue('npc_nation_policy'), $this->nation, $this->env);
-        $this->generalPolicy = new AutorunGeneralPolicy($general, $this->env['autorun_user']['options'] ?? null, $nationStor->getValue('npc_general_policy'), $gameStor->getValue('npc_general_policy'), $this->nation, $this->env);
+        $this->nationPolicy = new AutorunNationPolicy($general, $this->env['autorun_user']['options'] ?? null, $nationStor->getValue('npc_nation_policy'), ($this->env['npc_nation_policy']) ?? null, $this->nation, $this->env);
+        $this->generalPolicy = new AutorunGeneralPolicy($general, $this->env['autorun_user']['options'] ?? null, $nationStor->getValue('npc_general_policy'), ($this->env['npc_general_policy']) ?? null, $this->nation, $this->env);
 
         $prevIncomeGold = $nationStor->prev_income_gold ?? 1000;
         $prevIncomeRice = $nationStor->prev_income_rice ?? 1000;
@@ -142,6 +136,25 @@ class GeneralAI
 
         $this->nation['aux'] = Json::decode($this->nation['aux'] ?? '{}');
 
+        $this->calcDiplomacyState();
+
+        $this->genType = $this->calcGenType($general);
+    }
+
+    public function __construct(protected General $general)
+    {
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $this->env = $gameStor->getAll(true);
+
+        $this->rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'GeneralAI',
+            $this->env['year'],
+            $this->env['month'],
+            $general->getID(),
+        )));
+
         $this->leadership = $general->getLeadership();
         $this->strength = $general->getStrength();
         $this->intel = $general->getIntel();
@@ -149,11 +162,6 @@ class GeneralAI
         $this->fullLeadership = $general->getLeadership(false);
         $this->fullStrength = $general->getStrength(false);
         $this->fullIntel = $general->getIntel(false);
-
-
-        $this->genType = $this->calcGenType($general);
-
-        $this->calcDiplomacyState();
     }
 
     public function getGeneralObj(): General
@@ -572,6 +580,9 @@ class GeneralAI
             if ($userGeneral->getVar('crew') >= $this->nationPolicy->minWarCrew) {
                 continue;
             }
+            if ($userGeneral->onCalcDomestic('징집인구', 'score', 100) <= 1) {
+                continue;
+            }
 
             $generalTurnTime = $userGeneral->getTurnTime();
             $troopTurnTime =  $troopLeader->getTurnTime();
@@ -665,6 +676,9 @@ class GeneralAI
             if ($userGeneral->getVar('crew') >= $this->nationPolicy->minWarCrew) {
                 continue;
             }
+            if ($userGeneral->onCalcDomestic('징집인구', 'score', 100) <= 1) {
+                continue;
+            }
             $generalCadidates[$generalID] = $userGeneral;
         }
 
@@ -678,10 +692,8 @@ class GeneralAI
 
         /** @var General */
         $pickedGeneral = $this->rng->choice($generalCadidates);
-        $minRecruitPop = $this->fullLeadership * 100 + GameConst::$minAvailableRecruitPop;
-        if (!$this->generalPolicy->can한계징병) {
-            $minRecruitPop = max($minRecruitPop, $this->fullLeadership * 100 + $this->nationPolicy->minNPCRecruitCityPopulation);
-        }
+        $pickedGeneralLeadership = $pickedGeneral->getLeadership(false, true, true, true);
+        $minRecruitPop = $pickedGeneralLeadership * 100 + GameConst::$minAvailableRecruitPop;
 
         $recruitableCityList = [];
 
@@ -964,6 +976,9 @@ class GeneralAI
             if ($npcGeneral->getVar('crew') >= $this->nationPolicy->minWarCrew) {
                 continue;
             }
+            if ($npcGeneral->onCalcDomestic('징집인구', 'score', 100) <= 1) {
+                continue;
+            }
             $generalCadidates[$generalID] = $npcGeneral;
         }
 
@@ -977,10 +992,9 @@ class GeneralAI
 
         /** @var General */
         $pickedGeneral = $this->rng->choice($generalCadidates);
-        $minRecruitPop = $this->fullLeadership * 100 + GameConst::$minAvailableRecruitPop;
-        if (!$this->generalPolicy->can한계징병) {
-            $minRecruitPop = max($minRecruitPop, $this->fullLeadership * 100 + $this->nationPolicy->minNPCRecruitCityPopulation);
-        }
+        $pickedGeneralLeadership = $pickedGeneral->getLeadership(false, true, true, true);
+        $minRecruitPop = $pickedGeneralLeadership * 100 + GameConst::$minAvailableRecruitPop;
+        $minRecruitPop = max($minRecruitPop, $pickedGeneralLeadership * 100 + $this->nationPolicy->minNPCRecruitCityPopulation);
 
         $recruitableCityList = [];
 
@@ -1289,6 +1303,7 @@ class GeneralAI
             return null;
         }
 
+        $this->reqUpdateInstance = true;
         return $cmd;
     }
 
@@ -1489,6 +1504,7 @@ class GeneralAI
             return null;
         }
 
+        $this->reqUpdateInstance = true;
         return $cmd;
     }
 
@@ -1951,6 +1967,7 @@ class GeneralAI
             return null;
         }
 
+        $this->reqUpdateInstance = true;
         return $cmd;
     }
 
@@ -1968,6 +1985,7 @@ class GeneralAI
             $cmd = buildNationCommandClass('che_천도', $this->general, $this->env, $lastTurn, $lastTurn->getArg());
             if ($cmd->hasFullConditionMet()) {
                 $nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];
+                $this->reqUpdateInstance = true;
                 return $cmd;
             }
         }
@@ -2090,6 +2108,7 @@ class GeneralAI
 
 
         $nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];
+        $this->reqUpdateInstance = true;
         return $cmd;
     }
 
@@ -2653,7 +2672,7 @@ class GeneralAI
         return $this->rng->choiceUsingWeightPair($cmdList);
     }
 
-    public function do소집해제(): ?GeneralCommand
+    protected function do소집해제(): ?GeneralCommand
     {
         if ($this->attackable) {
             return null;
@@ -2972,6 +2991,9 @@ class GeneralAI
         }
 
         foreach ($this->frontCities as $frontCity) {
+            if(!$frontCity['supply']){
+                continue;
+            }
             $candidateCities[$frontCity['city']] = $frontCity['important'];
         }
 
@@ -3454,7 +3476,7 @@ class GeneralAI
             }
             if ($nationCity['front']) {
                 $frontCities[$cityID] = $nationCity;
-            } else {
+            } else if($nationCity['supply']) {
                 $backupCities[$cityID] = $nationCity;
             }
 
@@ -3532,7 +3554,7 @@ class GeneralAI
             } else if ($nationGeneral->getVar('troop') === $generalID && $nationGeneral->getReservedTurn(0, $this->env)->getName() === 'che_집합') {
                 //비 NPC부대장임
                 $troopLeaders[$generalID] = $nationGeneral;
-            } else if ($nationGeneral->getVar('killturn') < 5) {
+            } else if ($nationGeneral->getVar('killturn') <= 5) {
                 //삭턴이 몇 안남은 장수는 '내정장 npc'로 처리
                 $npcCivilGenerals[$generalID] = $nationGeneral;
             } else if ($npcType < 2) {
@@ -3570,6 +3592,8 @@ class GeneralAI
 
     public function chooseNationTurn(NationCommand $reservedCommand): NationCommand
     {
+        $this->updateInstance();
+
         //TODO: NationTurn과 InstantNationTurn 구분 필요
         $lastTurn = $reservedCommand->getLastTurn();
         $general = $this->general;
@@ -3641,6 +3665,8 @@ class GeneralAI
             return $reservedCommand;
         }
 
+        $this->updateInstance();
+
         foreach ($this->nationPolicy->priority as $actionName) {
             /** @var ?NationCommand */
             if (!key_exists($actionName, $this->nationPolicy::$availableInstantTurn)) {
@@ -3663,6 +3689,8 @@ class GeneralAI
         $npcType = $general->getNPCType();
         $nationID = $general->getNationID();
 
+        $this->updateInstance();
+
         //특별 메세지 있는 경우 출력
         $term = $this->env['turnterm'];
         if ($general->getVar('npcmsg') && $this->rng->nextBool(GameConst::$npcMessageFreqByDay * $term / (60 * 24))) {

hwe/sammo/GeneralTrigger/che_병력군량소모.php

@@ -23,8 +23,9 @@ class che_병력군량소모 extends BaseGeneralTrigger{
             }
             else{
                 $db = DB::db();
+                $crewUp = $general->onCalcDomestic('징집인구', 'score', $general->getVar('crew'));
                 $db->update('city', [
-                    'pop'=>$db->sqleval('pop + %i', $general->getVar('crew'))
+                    'pop'=>$db->sqleval('pop + %i', $crewUp)
                 ], 'city=%i', $general->getCityID());
 
                 $general->setVar('crew', 0);

hwe/sammo/InheritancePointManager.php

@@ -17,18 +17,18 @@ class InheritancePointManager
   private function __construct()
   {
     $inheritanceKey = new Map();
-    $inheritanceKey->put(InheritanceKey::previous, new InheritancePointType(true, 1, '기존 포인트'));
-    $inheritanceKey->put(InheritanceKey::lived_month, new InheritancePointType(true, 1, '생존'));
-    $inheritanceKey->put(InheritanceKey::max_belong, new InheritancePointType(false, 10, '최대 임관년 수'));
-    $inheritanceKey->put(InheritanceKey::max_domestic_critical, new InheritancePointType(true, 1, '최대 연속 내정 성공'));
-    $inheritanceKey->put(InheritanceKey::active_action, new InheritancePointType(true, 3, '능동 행동 수'));
+    $inheritanceKey->put(InheritanceKey::previous, new InheritancePointType(true, 1, '기존 포인트', 1));
+    $inheritanceKey->put(InheritanceKey::lived_month, new InheritancePointType(true, 1, '생존', 1));
+    $inheritanceKey->put(InheritanceKey::max_belong, new InheritancePointType(false, 10, '최대 임관년 수', null));
+    $inheritanceKey->put(InheritanceKey::max_domestic_critical, new InheritancePointType(true, 1, '최대 연속 내정 성공', null));
+    $inheritanceKey->put(InheritanceKey::active_action, new InheritancePointType(true, 3, '능동 행동 수', 1));
     //$inheritanceKey->put(InheritanceKey::snipe_combat, new InheritancePointType(true, 10, '병종 상성 우위 횟수'));
-    $inheritanceKey->put(InheritanceKey::combat, new InheritancePointType(['rank', RankColumn::warnum], 5, '전투 횟수'));
-    $inheritanceKey->put(InheritanceKey::sabotage, new InheritancePointType(['rank', RankColumn::firenum], 20, '계략 성공 횟수'));
-    $inheritanceKey->put(InheritanceKey::unifier, new InheritancePointType(true, 1, '천통 기여'));
-    $inheritanceKey->put(InheritanceKey::dex, new InheritancePointType(false, 0.001, '숙련도'));
-    $inheritanceKey->put(InheritanceKey::tournament, new InheritancePointType(true, 1, '토너먼트'));
-    $inheritanceKey->put(InheritanceKey::betting, new InheritancePointType(false, 10, '베팅 당첨'));
+    $inheritanceKey->put(InheritanceKey::combat, new InheritancePointType(['rank', RankColumn::warnum], 5, '전투 횟수', 1));
+    $inheritanceKey->put(InheritanceKey::sabotage, new InheritancePointType(['rank', RankColumn::firenum], 20, '계략 성공 횟수', 1));
+    $inheritanceKey->put(InheritanceKey::unifier, new InheritancePointType(true, 1, '천통 기여', null));
+    $inheritanceKey->put(InheritanceKey::dex, new InheritancePointType(false, 0.001, '숙련도', 0.5));
+    $inheritanceKey->put(InheritanceKey::tournament, new InheritancePointType(true, 1, '토너먼트', 1));
+    $inheritanceKey->put(InheritanceKey::betting, new InheritancePointType(false, 10, '베팅 당첨', 1));
     $this->inheritanceKey = $inheritanceKey;
   }
 
@@ -258,9 +258,8 @@ class InheritancePointManager
     $inheritStor->setValue($key->value, [$newValue, $aux]);
   }
 
-  public function clearInheritancePoint(General $general)
+  public function clearInheritancePoint(?int $ownerID)
   {
-    $ownerID = $general->getVar('owner');
     if (!$ownerID) {
       return;
     }
@@ -281,7 +280,7 @@ class InheritancePointManager
     $inheritStor->setValue(InheritanceKey::previous->value, $previousPointInfo);
   }
 
-  public function mergeTotalInheritancePoint(General $general, bool $isEnd = false)
+  public function mergeTotalInheritancePoint(General $general, bool $isRebirth = false)
   {
     $ownerID = $general->getVar('owner');
     if (!$ownerID) {
@@ -296,7 +295,7 @@ class InheritancePointManager
     $gameStor->cacheValues(['year', 'startyear', 'month']);
 
     if ($general->getVar('npc') == 1) {
-      if (!$isEnd) {
+      if ($isRebirth) {
         return;
       }
 
@@ -331,18 +330,14 @@ class InheritancePointManager
   }
 
 
-  function applyInheritanceUser(int $userID, bool $isRebirth = false): float
+  function applyInheritanceUser(int $ownerID, bool $isRebirth = false): float
   {
-    if ($userID === 0) {
+    if ($ownerID === 0) {
       return 0;
     }
 
     //FIXME: 굳이 merge, apply, clean 3단계를 거쳐야 할 이유가 없음
-    /** @var Map<InheritanceKey,float> */
-    $rebirthDegraded = new Map();
-    $rebirthDegraded[InheritanceKey::dex] = 0.5;
-
-    $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$userID}");
+    $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}");
     $totalPoint = 0;
     /** @var array<string,array{0:float,1:string|float}> */
     $allPoints = $inheritStor->getAll();
@@ -355,15 +350,27 @@ class InheritancePointManager
       return $allPoints[InheritanceKey::previous->value][0];
     }
 
-    $userLogger = new UserLogger($userID);
+    $userLogger = new UserLogger($ownerID);
 
     $previousPoint = ($allPoints[InheritanceKey::previous->value] ?? [0, 0])[0];
 
-    foreach ($allPoints as $rKey => [$value,]) {
+    $keepValues = [];
+
+    foreach ($allPoints as $rKey => [$value, $auxV]) {
       $key = InheritanceKey::from($rKey);
-      if ($isRebirth && $rebirthDegraded->hasKey($key)) {
-        $value *= $rebirthDegraded[$key];
+
+      /** @var InheritancePointType */
+      $keyTypeObj = $this->inheritanceKey->get($key);
+
+      if ($isRebirth) {
+        if ($keyTypeObj->rebirthStoreCoeff === null) {
+          $keepValues[$rKey] = [$value, $auxV];
+          continue;
+        }
+
+        $value *= $keyTypeObj->rebirthStoreCoeff;
       }
+
       $keyText = $this->getInheritancePointType($key)->info;
       $userLogger->push("{$keyText} 포인트 {$value} 증가", "inheritPoint");
       $totalPoint += $value;
@@ -373,6 +380,10 @@ class InheritancePointManager
     $userLogger->flush();
 
     $inheritStor->resetValues();
+
+    foreach ($keepValues as $rKey => $pointPair) {
+      $inheritStor->setValue($rKey, $pointPair);
+    }
     $inheritStor->setValue(InheritanceKey::previous->value, [$totalPoint, null]);
     return $totalPoint;
   }

hwe/sammo/TurnExecutionHelper.php

@@ -195,7 +195,6 @@ class TurnExecutionHelper
                 $general->setVar('owner_name', null);
             } else {
                 $general->applyDB($db);
-                storeOldGeneral($generalID, $gameStor->year, $gameStor->month);
                 $general->kill($db);
                 return;
             }

hwe/sammo/VO/InheritancePointType.php

@@ -5,6 +5,7 @@ class InheritancePointType{
     public bool|array $storeType,
     public int|float $pointCoeff,
     public string $info,
+    public ?float $rebirthStoreCoeff,
   )
   {
 

oauth_kakao/j_login_oauth.php

@@ -78,6 +78,7 @@ if ($expires < $now) {
 }
 
 
+$oauthID = null;
 if (!$email) {
     $me = $restAPI->meWithEmail();
     $me['code'] = Util::array_get($me['code'], 0);
@@ -88,6 +89,7 @@ if (!$email) {
             'reason' => '카카오로그인이 정상적으로 수행되지 않았습니다.'
         ]);
     }
+    $oauthID = $me['id'];
 
     $kakao_account = $me['kakao_account'] ?? null;
     if (!$kakao_account) {
@@ -128,6 +130,31 @@ $userInfo = $RootDB->queryFirstRow(
     $email
 );
 
+if (!$userInfo) {
+    if(!$oauthID){
+        $me = $restAPI->meWithEmail();
+        if ($me['code']??0 < 0) {
+            Json::die([
+                'result' => false,
+                'reqOTP' => false,
+                'reason' => '카카오로그인이 정상적으로 수행되지 않았습니다.'
+            ]);
+        }
+        $oauthID = $me['id'];
+    }
+    //이메일 계정이 바뀐 것인가?
+    $userInfo = $RootDB->queryFirstRow(
+        'SELECT `no`, `id`, `name`, `grade`, `delete_after`, `acl`, oauth_info, token_valid_until from member where oauth_id=%i',
+        $oauthID
+    );
+    if($userInfo){
+        //이메일 계정이 바뀐 것이므로, 이메일 계정을 업데이트한다.
+        $RootDB->update('member', [
+            'email' => $email,
+        ], 'oauth_id=%i', $oauthID);
+    }
+}
+
 if (!$userInfo) {
     $restAPI->unlink();
     $session->access_token = null;

package.json

@@ -118,9 +118,6 @@
     "webpack-bundle-analyzer": "^4.6.1",
     "webpack-cli": "^4.10.0"
   },
-  "pre-commit": [
-    "lint"
-  ],
   "browserslist": [
     "last 3 versions",
     "> 0.4%",