diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php index 2e3ecb50..afa24438 100644 --- a/hwe/b_myBossInfo.php +++ b/hwe/b_myBossInfo.php @@ -189,9 +189,6 @@ if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) { for($i=0; $i < $gencount; $i++) { $general = MYDB_fetch_array($result); - if($general['npc'] == 5){ - continue; - } echo " "; } diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index bcd8dbee..75a984bc 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -958,6 +958,7 @@ function updateNationState() { 999, sprintf('부대장%4d',$lastAssemblerID), null, $nation['nation'], null, 10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15, '은둔', '척사' ); + $npcObj->killturn = 70; $npcObj->gold=0; $npcObj->rice=0; $npcObj->npc = 5; diff --git a/hwe/j_myBossInfo.php b/hwe/j_myBossInfo.php index a666e133..e45711ce 100644 --- a/hwe/j_myBossInfo.php +++ b/hwe/j_myBossInfo.php @@ -177,11 +177,6 @@ function do추방(General $general, int $myOfficerLevel):?string{ return '외교권자는 추방할 수 없습니다.'; } - //NPC 부대장 추방 불가 - if($general->getVar('npc') == 5){ - return '부대장은 추방할 수 없습니다.'; - } - $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); $env = $gameStor->getValues(['startyear','year','month','scenario']); diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php index e0c01119..0cfaea6f 100644 --- a/hwe/sammo/GeneralAI.php +++ b/hwe/sammo/GeneralAI.php @@ -2626,6 +2626,12 @@ class GeneralAI { $general = $this->general; + if($general->getVar('npc') == 5){ + $newKillTurn = ($general->getVar('killturn') + Util::randRangeInt(2, 4)) % 5; + $newKillTurn += 70; + $general->setVar('killturn', $newKillTurn); + } + $cmd = buildGeneralCommandClass('che_집합', $general, $this->env); _setGeneralCommand($cmd, iterator_to_array(Util::range(GameConst::$maxTurn)));