diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 3035a7bb..b97d230c 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -1022,7 +1022,7 @@ function checkEmperior() $nationLogger = new ActionLogger(0, $nationID, $admin['year'], $admin['month']); $nationLogger->pushNationalHistoryLog("{$nationName}{$josaYi} 전토를 통일"); - foreach (General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj) { + foreach (General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2')) as $genObj) { if ($genObj->getNationID() == $nationID) { if ($genObj->getVar('officer_level') > 4) { $genObj->increaseInheritancePoint('unifier', 2000); diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php index 0c1c1f8f..8b2e8fd4 100644 --- a/hwe/func_tournament.php +++ b/hwe/func_tournament.php @@ -858,8 +858,10 @@ function setGift($tnmt_type, $tnmt, $phase) { foreach(General::createGeneralObjListFromDB(Util::squeezeFromArray($gambleResult, 'general_id'), ['gold'], 1) as $gambler){ $reward = Util::round($gambleResult[$gambler->getID()]['bet'] * $rewardRate); $gambler->increaseVar('gold', $reward); - $gambler->increaseRankVar('betwingold', $reward); - $gambler->increaseRankVar('betwin', 1); + if(($gambler->getNPCType() == 0) || ($gambler->getNPCType()==1 && $gambler->getRankVar('betgold') > 0)){ + $gambler->increaseRankVar('betwingold', $reward); + $gambler->increaseRankVar('betwin', 1); + } $rewardText = number_format($reward); $gambler->getLogger()->pushGeneralActionLog("{$tp} 대회의 베팅 당첨으로 {$rewardText}의 금 획득!", ActionLogger::EVENT_PLAIN); $gambler->applyDB($db);