fix: stabilize S100 cooldowns and generated NPC growth

hwe/sammo/API/General/DieOnPrestart.php

@@ -39,6 +39,10 @@ class DieOnPrestart extends \sammo\BaseAPI
     $gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
 
     $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i AND npc = 0', $userID);
+    if (!$general) {
+      return '장수가 없습니다';
+    }
+
     $lastRefresh = $db->queryFirstField(
       'SELECT %b FROM general_access_log WHERE %b = %i',
       GeneralAccessLogColumn::lastRefresh->value,
@@ -46,8 +50,9 @@ class DieOnPrestart extends \sammo\BaseAPI
       $general['no']
     );
 
-    if (!$general) {
-      return '장수가 없습니다';
+    $generalObj = General::createObjFromDB($general['no']);
+    if ($generalObj instanceof DummyGeneral) {
+      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
     }
 
     increaseRefresh("장수 삭제", 1);
@@ -61,18 +66,23 @@ class DieOnPrestart extends \sammo\BaseAPI
       return '이미 국가에 소속되어있습니다.';
     }
 
+    $targetTime = $generalObj->getAuxVar('prestart_delete_after');
+    if (!is_string($targetTime) || $targetTime === '') {
+      $targetTime = addTurn(
+        $lastRefresh ?: TimeUtil::now(),
+        $gameStor->turnterm,
+        GameConst::$minTurnDieOnPrestart
+      );
+      $generalObj->setAuxVar('prestart_delete_after', $targetTime);
+      $generalObj->applyDB($db);
+    }
+
     //서버 가오픈시 할 수 있는 행동
-    $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
     if ($targetTime > TimeUtil::now()) {
       $targetTimeShort = substr($targetTime, 0, 19);
       return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
     }
 
-    $generalObj = General::createObjFromDB($general['no']);
-    if ($generalObj instanceof DummyGeneral) {
-      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
-    }
-
     $generalName = $generalObj->getName();
     $josaYi = JosaUtil::pick($generalName, '이');
     $generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 홀연히 모습을 <R>감추었습니다</>");

hwe/sammo/API/General/Join.php

@@ -435,6 +435,13 @@ class Join extends \sammo\BaseAPI
             'specage2' => $specage2,
             'special2' => $special2,
             'penalty' => Json::encode($penalty),
+            'aux' => Json::encode([
+                'prestart_delete_after' => addTurn(
+                    $now,
+                    $admin['turnterm'],
+                    GameConst::$minTurnDieOnPrestart
+                ),
+            ]),
         ]);
         $generalID = $db->insertId();
         $db->insert('general_access_log', [