From 55fca2337d7af4bbae54c7c867f3e94b1f973b42 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sun, 30 Jul 2023 13:25:53 +0000 Subject: [PATCH] =?UTF-8?q?refac:=20General=20create=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/_admin2_submit.php | 2 +- hwe/_admin7.php | 2 +- hwe/_admin_force_rehall.php | 2 +- hwe/b_betting.php | 5 +++-- hwe/b_myPage.php | 2 +- hwe/func.php | 4 ++-- hwe/func_command.php | 4 ++-- hwe/func_gamerule.php | 4 ++-- hwe/func_tournament.php | 4 ++-- hwe/j_myBossInfo.php | 7 ++++--- hwe/j_set_my_setting.php | 2 +- hwe/j_update_picked_general.php | 2 +- hwe/old_index.php | 2 +- hwe/process_war.php | 2 +- hwe/sammo/API/Auction/BidBuyRiceAuction.php | 2 +- hwe/sammo/API/Auction/BidSellRiceAuction.php | 2 +- hwe/sammo/API/Auction/BidUniqueAuction.php | 2 +- hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php | 2 +- hwe/sammo/API/Auction/OpenBuyRiceAuction.php | 2 +- hwe/sammo/API/Auction/OpenSellRiceAuction.php | 2 +- hwe/sammo/API/Auction/OpenUniqueAuction.php | 2 +- hwe/sammo/API/General/BuildNationCandidate.php | 2 +- hwe/sammo/API/General/DieOnPrestart.php | 2 +- hwe/sammo/API/General/DropItem.php | 2 +- hwe/sammo/API/General/GetCommandTable.php | 2 +- hwe/sammo/API/General/GetFrontInfo.php | 2 +- hwe/sammo/API/InheritAction/BuyHiddenBuff.php | 2 +- hwe/sammo/API/InheritAction/BuyRandomUnique.php | 2 +- hwe/sammo/API/InheritAction/ResetSpecialWar.php | 2 +- hwe/sammo/API/InheritAction/ResetTurnTime.php | 2 +- hwe/sammo/API/InheritAction/SetNextSpecialWar.php | 2 +- hwe/sammo/API/Nation/GetNationInfo.php | 2 +- hwe/sammo/API/NationCommand/GetReservedCommand.php | 2 +- hwe/sammo/API/Vote/AddComment.php | 2 +- hwe/sammo/API/Vote/Vote.php | 2 +- hwe/sammo/Auction.php | 4 ++-- hwe/sammo/AuctionBasicResource.php | 6 +++--- hwe/sammo/Betting.php | 2 +- hwe/sammo/Command/General/che_등용.php | 6 +----- hwe/sammo/Command/General/che_등용수락.php | 2 +- hwe/sammo/Command/General/che_모반시도.php | 2 +- hwe/sammo/Command/General/che_선양.php | 2 +- hwe/sammo/Command/General/che_장수대상임관.php | 2 +- hwe/sammo/Command/General/che_증여.php | 2 +- hwe/sammo/Command/General/che_화계.php | 2 +- hwe/sammo/Command/Nation/che_몰수.php | 2 +- hwe/sammo/Command/Nation/che_발령.php | 2 +- hwe/sammo/Command/Nation/che_불가침수락.php | 2 +- hwe/sammo/Command/Nation/che_불가침파기수락.php | 2 +- hwe/sammo/Command/Nation/che_종전수락.php | 2 +- hwe/sammo/Command/Nation/che_포상.php | 2 +- hwe/sammo/Command/Nation/che_필사즉생.php | 2 +- hwe/sammo/Command/Nation/che_허보.php | 2 +- hwe/sammo/DiplomaticMessage.php | 6 +++--- hwe/sammo/Event/Action/LostUniqueItem.php | 2 +- hwe/sammo/Event/Action/MergeInheritPointRank.php | 2 +- hwe/sammo/Event/Action/ProvideNPCTroopLeader.php | 2 +- hwe/sammo/Event/Action/UpdateNationLevel.php | 4 ++-- hwe/sammo/General.php | 4 ++-- hwe/sammo/GeneralAI.php | 2 +- hwe/sammo/GeneralLite.php | 4 ++-- hwe/sammo/RaiseInvaderMessage.php | 2 +- hwe/sammo/ScoutMessage.php | 6 +++--- hwe/sammo/TurnExecutionHelper.php | 2 +- hwe/v_NPCControl.php | 2 +- hwe/v_chiefCenter.php | 2 +- hwe/v_inheritPoint.php | 2 +- hwe/v_processing.php | 2 +- 68 files changed, 87 insertions(+), 89 deletions(-) diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index 968d34d4..1f946345 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -33,7 +33,7 @@ $src = MessageTarget::buildQuick($session->generalID); $genObjList = []; $env = []; if ($genlist) { - $genObjList = General::createGeneralObjListFromDB($genlist); + $genObjList = General::createObjListFromDB($genlist); $env = $gameStor->cacheAll(); } switch ($btn) { diff --git a/hwe/_admin7.php b/hwe/_admin7.php index e5035cb3..f62cad85 100644 --- a/hwe/_admin7.php +++ b/hwe/_admin7.php @@ -76,7 +76,7 @@ if (!$gen) { $gen = $generalBasicList[0]['no']; } -$generalObj = General::createGeneralObjFromDB($gen, null, GeneralQueryMode::FullWithAccessLog); +$generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAccessLog); ?> diff --git a/hwe/_admin_force_rehall.php b/hwe/_admin_force_rehall.php index b4bce2b8..3f64f3ac 100644 --- a/hwe/_admin_force_rehall.php +++ b/hwe/_admin_force_rehall.php @@ -26,7 +26,7 @@ foreach ($db->queryFirstColumn( } $inheritPointManager = InheritancePointManager::getInstance(); -foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){ +foreach(General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){ $inheritPointManager->mergeTotalInheritancePoint($genObj); $inheritPointManager->applyInheritanceUser($genObj->getVar('owner')); } \ No newline at end of file diff --git a/hwe/b_betting.php b/hwe/b_betting.php index a024be23..d6b234c3 100644 --- a/hwe/b_betting.php +++ b/hwe/b_betting.php @@ -2,6 +2,7 @@ namespace sammo; +use sammo\Enums\GeneralLiteQueryMode; use sammo\Enums\GeneralQueryMode; use sammo\Enums\RankColumn; @@ -564,10 +565,10 @@ if ($str3) { $winColumn = RankColumn::from("{$rankColumn}w"); $drawColumn = RankColumn::from("{$rankColumn}d"); $loseColumn = RankColumn::from("{$rankColumn}l"); - $tournamentRankerList = General::createGeneralObjListFromDB( + $tournamentRankerList = GeneralLite::createObjListFromDB( $db->queryFirstColumn('SELECT general_id FROM rank_data WHERE `type`= %s ORDER BY value DESC LIMIT 40', $gameColumn->value), [$prizeColumn->value, $gameColumn->value, $winColumn->value, $drawColumn->value, $loseColumn->value, 'leadership', 'strength', 'intel', 'no', 'npc', 'name'], - GeneralQueryMode::Core + GeneralLiteQueryMode::Core ); usort($tournamentRankerList, function (GeneralLite $lhs, GeneralLite $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) { $result = - ($lhs->getRankVar($gameColumn) <=> $rhs->getRankVar($gameColumn)); diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index 9859e0e2..110bc8cb 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -24,7 +24,7 @@ $gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']); increaseRefresh("내정보", 1); -$me = General::createGeneralObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog); +$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog); $myset = $me->getVar('myset'); if ($myset > 0) { diff --git a/hwe/func.php b/hwe/func.php index 0dbc7e78..e8b198e9 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -1324,7 +1324,7 @@ function CheckHall($no) ["betrate", 'calc'], ]; - $generalObj = General::createGeneralObjFromDB($no); + $generalObj = General::createObjFromDB($no); $ttw = $generalObj->getRankVar(RankColumn::ttw); $ttd = $generalObj->getRankVar(RankColumn::ttd); @@ -1714,7 +1714,7 @@ function deleteNation(General $lord, bool $applyDB): array $logger->pushGlobalHistoryLog("【멸망】{$nationName}{$josaUn} 멸망했습니다."); - $nationGeneralList = General::createGeneralObjListFromDB( + $nationGeneralList = General::createObjListFromDB( $db->queryFirstColumn( 'SELECT `no` FROM general WHERE nation=%i AND no != %i', $nationID, diff --git a/hwe/func_command.php b/hwe/func_command.php index dbdf1b31..eebd0ca2 100644 --- a/hwe/func_command.php +++ b/hwe/func_command.php @@ -350,7 +350,7 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command, $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); $env = $gameStor->getAll(); - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); try{ $commandObj = buildGeneralCommandClass($command, $general, $env, $arg); @@ -425,7 +425,7 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); $env = $gameStor->getAll(); - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); if($general->getVar('officer_level') < 5){ return [ diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 465c97eb..fdfae574 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -451,7 +451,7 @@ function checkWander(RandUtil $rng) $wanderers = $db->queryFirstColumn('SELECT general.`no` FROM general LEFT JOIN nation ON general.nation = nation.nation WHERE nation.`level` = 0 AND general.`officer_level` = 12'); - foreach (General::createGeneralObjListFromDB($wanderers) as $wanderer) { + foreach (General::createObjListFromDB($wanderers) as $wanderer) { $wanderCmd = buildGeneralCommandClass('che_해산', $wanderer, $admin); if ($wanderCmd->hasFullConditionMet()) { $logger = $wanderer->getLogger(); @@ -743,7 +743,7 @@ function checkEmperior() } $inheritPointManager = InheritancePointManager::getInstance(); - $allUserGenerals = General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2')); + $allUserGenerals = General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2')); foreach ($allUserGenerals as $genObj) { if ($genObj->getNationID() == $nationID) { if ($genObj->getVar('officer_level') > 4) { diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php index 4973f31a..9cac4a1b 100644 --- a/hwe/func_tournament.php +++ b/hwe/func_tournament.php @@ -882,7 +882,7 @@ function setGift($tnmt_type, $tnmt, $phase) //포상 장수 이름, 금액 $resultHelper[$generalID]['reward'] += $cost; $resultHelper[$generalID]['msg'] = "4강 진출"; - General::createGeneralObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10); + General::createObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10); } //결승자 명성 돈 $cost = $admin['develcost'] * 6; @@ -946,7 +946,7 @@ function setGift($tnmt_type, $tnmt, $phase) $winnerLogger->pushGlobalHistoryLog("【대회】{$tp} 대회에서 {$winner['name']}{$josaYiWinner} 우승, {$runnerUp['name']}{$josaYiRunnerUp} 준우승을 차지하여 천하에 이름을 떨칩니다!", ActionLogger::EVENT_YEAR_MONTH); $winnerLogger->pushGlobalHistoryLog("【대회】{$tp} 대회의 우승자에게는 {$winnerRewardText}, 준우승자에겐 {$runnerUpRewardText}의 상금과 약간의 명성이 주어집니다!", ActionLogger::EVENT_YEAR_MONTH); - $generalObjList = General::createGeneralObjListFromDB(array_keys($resultHelper)); + $generalObjList = General::createObjListFromDB(array_keys($resultHelper)); foreach ($resultHelper as $generalID => $general) { $rewardText = number_format($general['reward']); diff --git a/hwe/j_myBossInfo.php b/hwe/j_myBossInfo.php index 53f69dfd..867668cb 100644 --- a/hwe/j_myBossInfo.php +++ b/hwe/j_myBossInfo.php @@ -1,6 +1,7 @@ setVar('nation', $nationID); } else{ - $general = General::createGeneralObjFromDB($destGeneralID, [ + $general = GeneralLite::createObjFromDB($destGeneralID, [ 'name', 'leadership', 'strength', 'intel', 'gold','rice', 'troop','officer_level','npc','picture','imgsvr', 'permission','penalty','belong', 'crewtype', 'experience', 'dedication', 'betray', 'dedlevel', 'explevel', 'makelimit', 'aux', - ], GeneralQueryMode::Lite); + ], GeneralLiteQueryMode::Lite); - if($general instanceof DummyGeneral){ + if($general instanceof DummyGeneralLite){ Json::die([ 'result'=>false, 'reason'=>'올바르지 않은 장수입니다.' diff --git a/hwe/j_set_my_setting.php b/hwe/j_set_my_setting.php index 04d4e2b3..422b6670 100644 --- a/hwe/j_set_my_setting.php +++ b/hwe/j_set_my_setting.php @@ -36,7 +36,7 @@ if($tnmt < 0 || $tnmt > 1){ } $db = DB::db(); -$me = General::createGeneralObjFromDB($generalID); +$me = General::createObjFromDB($generalID); if($defence_train !== $me->getVar('defence_train')){ diff --git a/hwe/j_update_picked_general.php b/hwe/j_update_picked_general.php index 56c7a3fc..e5aac0d0 100644 --- a/hwe/j_update_picked_general.php +++ b/hwe/j_update_picked_general.php @@ -66,7 +66,7 @@ if(!$ownerInfo){ $info = Json::decode($info); -$generalObj = General::createGeneralObjFromDB($generalID); +$generalObj = General::createObjFromDB($generalID); $oldGeneralName = $generalObj->getName(); $db->update('select_pool', [ 'general_id'=>-$generalID, diff --git a/hwe/old_index.php b/hwe/old_index.php index a7b7d263..901a775c 100644 --- a/hwe/old_index.php +++ b/hwe/old_index.php @@ -59,7 +59,7 @@ if ($limitState >= 2) { exit(); } -$generalObj = General::createGeneralObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog); +$generalObj = General::createObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog); $generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID())); $scenario = $gameStor->scenario_text; diff --git a/hwe/process_war.php b/hwe/process_war.php index 1d65d37c..83a17c7c 100644 --- a/hwe/process_war.php +++ b/hwe/process_war.php @@ -38,7 +38,7 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke $city = new WarUnitCity($rng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear); $defenderIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and train>=defence_train and atmos>=defence_train', $city->getVar('nation'), $city->getVar('city')); - $defenderGeneralList = General::createGeneralObjListFromDB($defenderIDList, null); + $defenderGeneralList = General::createObjListFromDB($defenderIDList, null); /** @var WarUnit[] */ $defenderList = []; diff --git a/hwe/sammo/API/Auction/BidBuyRiceAuction.php b/hwe/sammo/API/Auction/BidBuyRiceAuction.php index 0771d7a1..249e9591 100644 --- a/hwe/sammo/API/Auction/BidBuyRiceAuction.php +++ b/hwe/sammo/API/Auction/BidBuyRiceAuction.php @@ -39,7 +39,7 @@ class BidBuyRiceAuction extends \sammo\BaseAPI $amount = $this->args['amount']; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); $auction = new AuctionBuyRice($auctionID, $general); $result = $auction->bid($amount, true); diff --git a/hwe/sammo/API/Auction/BidSellRiceAuction.php b/hwe/sammo/API/Auction/BidSellRiceAuction.php index 11549c42..66a78f54 100644 --- a/hwe/sammo/API/Auction/BidSellRiceAuction.php +++ b/hwe/sammo/API/Auction/BidSellRiceAuction.php @@ -38,7 +38,7 @@ class BidSellRiceAuction extends \sammo\BaseAPI $amount = $this->args['amount']; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); $auction = new AuctionSellRice($auctionID, $general); $result = $auction->bid($amount, true); diff --git a/hwe/sammo/API/Auction/BidUniqueAuction.php b/hwe/sammo/API/Auction/BidUniqueAuction.php index de637442..d026ad3a 100644 --- a/hwe/sammo/API/Auction/BidUniqueAuction.php +++ b/hwe/sammo/API/Auction/BidUniqueAuction.php @@ -41,7 +41,7 @@ class BidUniqueAuction extends \sammo\BaseAPI $tryExtendCloseDate = $this->args['extendCloseDate'] ?? false; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); $auction = new AuctionUniqueItem($auctionID, $general); $result = $auction->bid($amount, $tryExtendCloseDate); diff --git a/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php b/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php index b3f36e6f..16222fb9 100644 --- a/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php +++ b/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php @@ -77,7 +77,7 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI $inheritMgr = InheritancePointManager::getInstance(); //preveious라서 column을 최대한 비울 수 있다. $remainPoint = $inheritMgr->getInheritancePoint( - General::createGeneralObjFromDB($generalID, ['owner'], GeneralQueryMode::Core), + General::createObjFromDB($generalID, ['owner'], GeneralQueryMode::Core), InheritanceKey::previous ); diff --git a/hwe/sammo/API/Auction/OpenBuyRiceAuction.php b/hwe/sammo/API/Auction/OpenBuyRiceAuction.php index d9c71f1a..cc7e999d 100644 --- a/hwe/sammo/API/Auction/OpenBuyRiceAuction.php +++ b/hwe/sammo/API/Auction/OpenBuyRiceAuction.php @@ -66,7 +66,7 @@ class OpenBuyRiceAuction extends \sammo\BaseAPI $finishBidAmount = $this->args['finishBidAmount']; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); diff --git a/hwe/sammo/API/Auction/OpenSellRiceAuction.php b/hwe/sammo/API/Auction/OpenSellRiceAuction.php index 9eab113e..5ee12653 100644 --- a/hwe/sammo/API/Auction/OpenSellRiceAuction.php +++ b/hwe/sammo/API/Auction/OpenSellRiceAuction.php @@ -66,7 +66,7 @@ class OpenSellRiceAuction extends \sammo\BaseAPI $finishBidAmount = $this->args['finishBidAmount']; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); diff --git a/hwe/sammo/API/Auction/OpenUniqueAuction.php b/hwe/sammo/API/Auction/OpenUniqueAuction.php index 1b4425d3..955504a8 100644 --- a/hwe/sammo/API/Auction/OpenUniqueAuction.php +++ b/hwe/sammo/API/Auction/OpenUniqueAuction.php @@ -57,7 +57,7 @@ class OpenUniqueAuction extends \sammo\BaseAPI $generalID = $session->generalID; $itemObj = buildItemClass($itemID); - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); diff --git a/hwe/sammo/API/General/BuildNationCandidate.php b/hwe/sammo/API/General/BuildNationCandidate.php index 8ce2e797..5a4b2d1b 100644 --- a/hwe/sammo/API/General/BuildNationCandidate.php +++ b/hwe/sammo/API/General/BuildNationCandidate.php @@ -59,7 +59,7 @@ class BuildNationCandidate extends \sammo\BaseAPI $env = $gameStor->getAll(); - $generalObj = General::createGeneralObjFromDB($general['no']); + $generalObj = General::createObjFromDB($general['no']); $validCmd = false; foreach(GameConst::$availableGeneralCommand as $cmdList){ diff --git a/hwe/sammo/API/General/DieOnPrestart.php b/hwe/sammo/API/General/DieOnPrestart.php index ce5fa56b..e2c8552b 100644 --- a/hwe/sammo/API/General/DieOnPrestart.php +++ b/hwe/sammo/API/General/DieOnPrestart.php @@ -68,7 +68,7 @@ class DieOnPrestart extends \sammo\BaseAPI return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다."; } - $generalObj = General::createGeneralObjFromDB($general['no']); + $generalObj = General::createObjFromDB($general['no']); if ($generalObj instanceof DummyGeneral) { trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING); } diff --git a/hwe/sammo/API/General/DropItem.php b/hwe/sammo/API/General/DropItem.php index 1ab36005..cd4fc7e2 100644 --- a/hwe/sammo/API/General/DropItem.php +++ b/hwe/sammo/API/General/DropItem.php @@ -37,7 +37,7 @@ class DropItem extends \sammo\BaseAPI public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $generalID = $session->generalID; - $me = General::createGeneralObjFromDB($generalID); + $me = General::createObjFromDB($generalID); $itemType = $this->args['itemType']; $item = $me->getItem($itemType); diff --git a/hwe/sammo/API/General/GetCommandTable.php b/hwe/sammo/API/General/GetCommandTable.php index 7e0a4ee2..6acff92b 100644 --- a/hwe/sammo/API/General/GetCommandTable.php +++ b/hwe/sammo/API/General/GetCommandTable.php @@ -21,7 +21,7 @@ class GetCommandTable extends \sammo\BaseAPI{ public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $generalID = $session->generalID; - $me = General::createGeneralObjFromDB($generalID); + $me = General::createObjFromDB($generalID); $commandTable = getCommandTable($me); return [ diff --git a/hwe/sammo/API/General/GetFrontInfo.php b/hwe/sammo/API/General/GetFrontInfo.php index c0805c57..c36cd570 100644 --- a/hwe/sammo/API/General/GetFrontInfo.php +++ b/hwe/sammo/API/General/GetFrontInfo.php @@ -534,7 +534,7 @@ class GetFrontInfo extends \sammo\BaseAPI { $generalID = $session->generalID; //NOTE: 이 경우 staticNation 정보를 조회한다. - $general = General::createGeneralObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog); + $general = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog); $nationID = $general->getNationID(); $cityID = $general->getCityID(); diff --git a/hwe/sammo/API/InheritAction/BuyHiddenBuff.php b/hwe/sammo/API/InheritAction/BuyHiddenBuff.php index 91ce0917..097a260c 100644 --- a/hwe/sammo/API/InheritAction/BuyHiddenBuff.php +++ b/hwe/sammo/API/InheritAction/BuyHiddenBuff.php @@ -49,7 +49,7 @@ class BuyHiddenBuff extends \sammo\BaseAPI $type = $this->args['type']; $level = $this->args['level']; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); if ($userID != $general->getVar('owner')) { return '로그인 상태가 이상합니다. 다시 로그인해 주세요.'; } diff --git a/hwe/sammo/API/InheritAction/BuyRandomUnique.php b/hwe/sammo/API/InheritAction/BuyRandomUnique.php index 4a18a557..6e907b2e 100644 --- a/hwe/sammo/API/InheritAction/BuyRandomUnique.php +++ b/hwe/sammo/API/InheritAction/BuyRandomUnique.php @@ -31,7 +31,7 @@ class BuyRandomUnique extends \sammo\BaseAPI $userID = $session->userID; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); if($userID != $general->getVar('owner')){ return '로그인 상태가 이상합니다. 다시 로그인해 주세요.'; } diff --git a/hwe/sammo/API/InheritAction/ResetSpecialWar.php b/hwe/sammo/API/InheritAction/ResetSpecialWar.php index 428e9c55..e888b385 100644 --- a/hwe/sammo/API/InheritAction/ResetSpecialWar.php +++ b/hwe/sammo/API/InheritAction/ResetSpecialWar.php @@ -31,7 +31,7 @@ class ResetSpecialWar extends \sammo\BaseAPI $userID = $session->userID; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); if ($userID != $general->getVar('owner')) { return '로그인 상태가 이상합니다. 다시 로그인해 주세요.'; } diff --git a/hwe/sammo/API/InheritAction/ResetTurnTime.php b/hwe/sammo/API/InheritAction/ResetTurnTime.php index ba39d6bf..3ecb5c5f 100644 --- a/hwe/sammo/API/InheritAction/ResetTurnTime.php +++ b/hwe/sammo/API/InheritAction/ResetTurnTime.php @@ -36,7 +36,7 @@ class ResetTurnTime extends \sammo\BaseAPI $userID = $session->userID; $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); if ($userID != $general->getVar('owner')) { return '로그인 상태가 이상합니다. 다시 로그인해 주세요.'; } diff --git a/hwe/sammo/API/InheritAction/SetNextSpecialWar.php b/hwe/sammo/API/InheritAction/SetNextSpecialWar.php index 8d490f82..0e074ac9 100644 --- a/hwe/sammo/API/InheritAction/SetNextSpecialWar.php +++ b/hwe/sammo/API/InheritAction/SetNextSpecialWar.php @@ -44,7 +44,7 @@ class SetNextSpecialWar extends \sammo\BaseAPI $type = $this->args['type']; - $general = General::createGeneralObjFromDB($generalID); + $general = General::createObjFromDB($generalID); if ($userID != $general->getVar('owner')) { return '로그인 상태가 이상합니다. 다시 로그인해 주세요.'; } diff --git a/hwe/sammo/API/Nation/GetNationInfo.php b/hwe/sammo/API/Nation/GetNationInfo.php index 0dc1423f..be4a3d86 100644 --- a/hwe/sammo/API/Nation/GetNationInfo.php +++ b/hwe/sammo/API/Nation/GetNationInfo.php @@ -58,7 +58,7 @@ class GetNationInfo extends \sammo\BaseAPI ]; } - $generalObj = General::createGeneralObjFromDB($session->generalID, null, GeneralQueryMode::FullWithoutIAction); + $generalObj = General::createObjFromDB($session->generalID, null, GeneralQueryMode::FullWithoutIAction); $gameStor = KVStorage::getStorage($db, 'game_env'); $gameEnv = $gameStor->getValues(['year', 'month', 'startyear']); diff --git a/hwe/sammo/API/NationCommand/GetReservedCommand.php b/hwe/sammo/API/NationCommand/GetReservedCommand.php index 42f8a9ca..2523a05c 100644 --- a/hwe/sammo/API/NationCommand/GetReservedCommand.php +++ b/hwe/sammo/API/NationCommand/GetReservedCommand.php @@ -113,7 +113,7 @@ class GetReservedCommand extends \sammo\BaseAPI ]; } - $generalObj = General::createGeneralObjFromDB($session->generalID, null, GeneralQueryMode::FullWithoutIAction); + $generalObj = General::createObjFromDB($session->generalID, null, GeneralQueryMode::FullWithoutIAction); return [ diff --git a/hwe/sammo/API/Vote/AddComment.php b/hwe/sammo/API/Vote/AddComment.php index 417dd5de..5c386579 100644 --- a/hwe/sammo/API/Vote/AddComment.php +++ b/hwe/sammo/API/Vote/AddComment.php @@ -41,7 +41,7 @@ class AddComment extends \sammo\BaseAPI $text = mb_substr($this->args['text'], 0, 200); $generalID = $session->generalID; - $general = General::createGeneralObjFromDB($generalID, null, GeneralQueryMode::Core); + $general = General::createObjFromDB($generalID, null, GeneralQueryMode::Core); $generalName = $general->getName(); $nationID = $general->getNationID(); $nationName = $general->getStaticNation()['name']; diff --git a/hwe/sammo/API/Vote/Vote.php b/hwe/sammo/API/Vote/Vote.php index 090ad87c..fea230c3 100644 --- a/hwe/sammo/API/Vote/Vote.php +++ b/hwe/sammo/API/Vote/Vote.php @@ -106,7 +106,7 @@ class Vote extends \sammo\BaseAPI $gameStor = KVStorage::getStorage($db, 'game_env'); $voteReward = $gameStor->getValue('develcost') * 5; - $general = General::createGeneralObjFromDB($generalID, null, GeneralQueryMode::Full); + $general = General::createObjFromDB($generalID, null, GeneralQueryMode::Full); $general->increaseVar('gold', $voteReward); $uniqueRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize( UniqueConst::$hiddenSeed, diff --git a/hwe/sammo/Auction.php b/hwe/sammo/Auction.php index 7c393d84..b656ad64 100644 --- a/hwe/sammo/Auction.php +++ b/hwe/sammo/Auction.php @@ -218,7 +218,7 @@ abstract class Auction if ($bidItem->generalID === $this->general->getID()) { $oldBidder = $this->general; } else { - $oldBidder = General::createGeneralObjFromDB($bidItem->generalID); + $oldBidder = General::createObjFromDB($bidItem->generalID); } if ($this->info->reqResource === ResourceType::inheritancePoint) { @@ -485,7 +485,7 @@ abstract class Auction } } - $bidder = General::createGeneralObjFromDB($highestBid->generalID); + $bidder = General::createObjFromDB($highestBid->generalID); $failReason = $this->finishAuction($highestBid, $bidder); if ($failReason === null) { $this->closeAuction(); diff --git a/hwe/sammo/AuctionBasicResource.php b/hwe/sammo/AuctionBasicResource.php index dbc5dce5..4302a1b8 100644 --- a/hwe/sammo/AuctionBasicResource.php +++ b/hwe/sammo/AuctionBasicResource.php @@ -116,7 +116,7 @@ abstract class AuctionBasicResource extends Auction } else if ($this->info->hostGeneralID == 0) { $auctionHost = $this->genDummy(); } else { - $auctionHost = General::createGeneralObjFromDB($this->info->hostGeneralID); + $auctionHost = General::createObjFromDB($this->info->hostGeneralID); } $hostRes = static::$hostRes; @@ -164,7 +164,7 @@ abstract class AuctionBasicResource extends Auction } else if ($this->info->hostGeneralID == 0) { $auctionHost = $this->genDummy(); } else { - $auctionHost = General::createGeneralObjFromDB($this->info->hostGeneralID); + $auctionHost = General::createObjFromDB($this->info->hostGeneralID); } $highestBid = $this->getHighestBid(); @@ -175,7 +175,7 @@ abstract class AuctionBasicResource extends Auction if ($this->general->getID() === $highestBid->generalID) { $bidder = $this->general; } else { - $bidder = General::createGeneralObjFromDB($highestBid->generalID); + $bidder = General::createObjFromDB($highestBid->generalID); } $hostRes = static::$hostRes; diff --git a/hwe/sammo/Betting.php b/hwe/sammo/Betting.php index 4f7b9edf..2fab052a 100644 --- a/hwe/sammo/Betting.php +++ b/hwe/sammo/Betting.php @@ -402,7 +402,7 @@ class Betting $userLogger->flush(); } } else { - $generalList = General::createGeneralObjListFromDB(array_unique(Util::squeezeFromArray($rewardList, 'generalID')), ['gold', 'npc', 'betgold'], GeneralQueryMode::Lite); + $generalList = General::createObjListFromDB(array_unique(Util::squeezeFromArray($rewardList, 'generalID')), ['gold', 'npc', 'betgold'], GeneralQueryMode::Lite); foreach ($rewardList as $rewardItem) { $gambler = $generalList[$rewardItem['generalID']]; $reward = Util::round($rewardItem['amount']); diff --git a/hwe/sammo/Command/General/che_등용.php b/hwe/sammo/Command/General/che_등용.php index 0b4b035e..d8216008 100644 --- a/hwe/sammo/Command/General/che_등용.php +++ b/hwe/sammo/Command/General/che_등용.php @@ -7,11 +7,7 @@ use \sammo\{ Util, JosaUtil, General, - DummyGeneral, - ActionLogger, - GameConst, LastTurn, - GameUnitConst, Command, ScoutMessage }; @@ -77,7 +73,7 @@ class che_등용 extends Command\GeneralCommand protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['nation', 'experience', 'dedication'], GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID']); $this->setDestGeneral($destGeneral); [$reqGold, $reqRice] = $this->getCost(); diff --git a/hwe/sammo/Command/General/che_등용수락.php b/hwe/sammo/Command/General/che_등용수락.php index 959e66a0..dc608383 100644 --- a/hwe/sammo/Command/General/che_등용수락.php +++ b/hwe/sammo/Command/General/che_등용수락.php @@ -68,7 +68,7 @@ class che_등용수락 extends Command\GeneralCommand{ protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], null); $this->setDestGeneral($destGeneral); $this->setDestNation($this->arg['destNationID'], ['gennum', 'scout']); diff --git a/hwe/sammo/Command/General/che_모반시도.php b/hwe/sammo/Command/General/che_모반시도.php index c5e0d005..8e533cc7 100644 --- a/hwe/sammo/Command/General/che_모반시도.php +++ b/hwe/sammo/Command/General/che_모반시도.php @@ -67,7 +67,7 @@ class che_모반시도 extends Command\GeneralCommand{ $lordID = $db->queryFirstField('SELECT no FROM general WHERE nation = %i AND officer_level = 12', $nationID); - $lordGeneral = General::createGeneralObjFromDB($lordID); + $lordGeneral = General::createObjFromDB($lordID); $generalName = $general->getName(); $lordName = $lordGeneral->getName(); diff --git a/hwe/sammo/Command/General/che_선양.php b/hwe/sammo/Command/General/che_선양.php index 23be46a6..2c4d4ecf 100644 --- a/hwe/sammo/Command/General/che_선양.php +++ b/hwe/sammo/Command/General/che_선양.php @@ -66,7 +66,7 @@ class che_선양 extends Command\GeneralCommand protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'nation'], GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], ['gold', 'nation'], GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); $this->fullConditionConstraints = [ diff --git a/hwe/sammo/Command/General/che_장수대상임관.php b/hwe/sammo/Command/General/che_장수대상임관.php index 70bd734b..f33b8850 100644 --- a/hwe/sammo/Command/General/che_장수대상임관.php +++ b/hwe/sammo/Command/General/che_장수대상임관.php @@ -84,7 +84,7 @@ class che_장수대상임관 extends Command\GeneralCommand{ protected function initWithArg() { $destGeneralID = $this->arg['destGeneralID']; - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['nation'], GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], ['nation'], GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); $this->setDestNation($this->destGeneralObj->getVar('nation'), ['gennum', 'scout']); diff --git a/hwe/sammo/Command/General/che_증여.php b/hwe/sammo/Command/General/che_증여.php index c38493b4..97365920 100644 --- a/hwe/sammo/Command/General/che_증여.php +++ b/hwe/sammo/Command/General/che_증여.php @@ -87,7 +87,7 @@ class che_증여 extends Command\GeneralCommand protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'nation'], GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'nation'], GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); $this->fullConditionConstraints = [ diff --git a/hwe/sammo/Command/General/che_화계.php b/hwe/sammo/Command/General/che_화계.php index 1be84a5c..b07c77ef 100644 --- a/hwe/sammo/Command/General/che_화계.php +++ b/hwe/sammo/Command/General/che_화계.php @@ -269,7 +269,7 @@ class che_화계 extends Command\GeneralCommand $destCityGeneralList = []; $cityGeneralID = $db->queryFirstColumn('SELECT no FROM general WHERE city = %i AND nation = %i', $destCityID, $destNationID); - $destCityGeneralList = General::createGeneralObjListFromDB($cityGeneralID, ['name', 'city', 'nation', 'officer_level', 'leadership', 'horse', 'strength', 'weapon', 'intel', 'book', 'item', 'last_turn', 'injury', 'special', 'special2', 'injury', 'crewtype', 'crew', 'atmos', 'train']); + $destCityGeneralList = General::createObjListFromDB($cityGeneralID, ['name', 'city', 'nation', 'officer_level', 'leadership', 'horse', 'strength', 'weapon', 'intel', 'book', 'item', 'last_turn', 'injury', 'special', 'special2', 'injury', 'crewtype', 'crew', 'atmos', 'train']); foreach ($destCityGeneralList as &$destCityGeneral) { $destCityGeneral->setRawCity($this->destCity); unset($destCityGeneral); diff --git a/hwe/sammo/Command/Nation/che_몰수.php b/hwe/sammo/Command/Nation/che_몰수.php index 8b51bd94..df4ab98c 100644 --- a/hwe/sammo/Command/Nation/che_몰수.php +++ b/hwe/sammo/Command/Nation/che_몰수.php @@ -92,7 +92,7 @@ class che_몰수 extends Command\NationCommand protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'npc', 'nation', 'imgsvr', 'picture'], GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'npc', 'nation', 'imgsvr', 'picture'], GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); $env = $this->env; diff --git a/hwe/sammo/Command/Nation/che_발령.php b/hwe/sammo/Command/Nation/che_발령.php index ddc3369a..f7e6439a 100644 --- a/hwe/sammo/Command/Nation/che_발령.php +++ b/hwe/sammo/Command/Nation/che_발령.php @@ -72,7 +72,7 @@ class che_발령 extends Command\NationCommand { $this->setDestCity($this->arg['destCityID']); - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); if ($this->arg['destGeneralID'] == $this->getGeneral()->getID()) { diff --git a/hwe/sammo/Command/Nation/che_불가침수락.php b/hwe/sammo/Command/Nation/che_불가침수락.php index ec348ecd..75b1edc4 100644 --- a/hwe/sammo/Command/Nation/che_불가침수락.php +++ b/hwe/sammo/Command/Nation/che_불가침수락.php @@ -104,7 +104,7 @@ class che_불가침수락 extends Command\NationCommand $env = $this->env; $relYear = $env['year'] - $env['startyear']; - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); $this->setDestNation($this->arg['destNationID']); diff --git a/hwe/sammo/Command/Nation/che_불가침파기수락.php b/hwe/sammo/Command/Nation/che_불가침파기수락.php index a6962c7e..6f397ca6 100644 --- a/hwe/sammo/Command/Nation/che_불가침파기수락.php +++ b/hwe/sammo/Command/Nation/che_불가침파기수락.php @@ -78,7 +78,7 @@ class che_불가침파기수락 extends Command\NationCommand protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); $this->setDestNation($this->arg['destNationID']); diff --git a/hwe/sammo/Command/Nation/che_종전수락.php b/hwe/sammo/Command/Nation/che_종전수락.php index 9e42ac30..a5a4ae43 100644 --- a/hwe/sammo/Command/Nation/che_종전수락.php +++ b/hwe/sammo/Command/Nation/che_종전수락.php @@ -87,7 +87,7 @@ class che_종전수락 extends Command\NationCommand protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); $this->setDestNation($this->arg['destNationID']); diff --git a/hwe/sammo/Command/Nation/che_포상.php b/hwe/sammo/Command/Nation/che_포상.php index 790fd504..bded0d39 100644 --- a/hwe/sammo/Command/Nation/che_포상.php +++ b/hwe/sammo/Command/Nation/che_포상.php @@ -82,7 +82,7 @@ class che_포상 extends Command\NationCommand protected function initWithArg() { - $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'nation'], GeneralQueryMode::Lite); + $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'nation'], GeneralQueryMode::Lite); $this->setDestGeneral($destGeneral); if($this->arg['destGeneralID'] == $this->getGeneral()->getID()){ diff --git a/hwe/sammo/Command/Nation/che_필사즉생.php b/hwe/sammo/Command/Nation/che_필사즉생.php index 9d56addb..4383eab4 100644 --- a/hwe/sammo/Command/Nation/che_필사즉생.php +++ b/hwe/sammo/Command/Nation/che_필사즉생.php @@ -95,7 +95,7 @@ class che_필사즉생 extends Command\NationCommand{ $broadcastMessage = "{$generalName}{$josaYi} 필사즉생을 발동하였습니다."; $targetGeneralList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND no != %i', $nationID, $generalID); - foreach(General::createGeneralObjListFromDB($targetGeneralList, ['train', 'atmos'], GeneralQueryMode::Lite) as $targetGeneral){ + foreach(General::createObjListFromDB($targetGeneralList, ['train', 'atmos'], GeneralQueryMode::Lite) as $targetGeneral){ $targetGeneral->getLogger()->pushGeneralActionLog($broadcastMessage, ActionLogger::PLAIN); if($targetGeneral->getVar('train') < 100){ $targetGeneral->setVar('train', 100); diff --git a/hwe/sammo/Command/Nation/che_허보.php b/hwe/sammo/Command/Nation/che_허보.php index b3c201b7..c0b1ff38 100644 --- a/hwe/sammo/Command/Nation/che_허보.php +++ b/hwe/sammo/Command/Nation/che_허보.php @@ -163,7 +163,7 @@ class che_허보 extends Command\NationCommand $destNationCityList = $db->queryFirstColumn('SELECT city FROM city WHERE nation = %i AND supply = 1', $destNationID); $targetGeneralList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i', $destNationID, $destCityID); - foreach (General::createGeneralObjListFromDB($targetGeneralList) as $targetGeneralID => $targetGeneral) { + foreach (General::createObjListFromDB($targetGeneralList) as $targetGeneralID => $targetGeneral) { $targetLogger = $targetGeneral->getLogger(); $targetLogger->pushGeneralActionLog($destBroadcastMessage, ActionLogger::PLAIN); diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php index 1df2c596..dc08c81f 100644 --- a/hwe/sammo/DiplomaticMessage.php +++ b/hwe/sammo/DiplomaticMessage.php @@ -76,7 +76,7 @@ class DiplomaticMessage extends Message{ $gameStor = KVStorage::getStorage(DB::db(), 'game_env'); - $destGeneralObj = General::createGeneralObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite); + $destGeneralObj = General::createObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite); $commandObj = buildNationCommandClass('che_불가침수락', $destGeneralObj, $gameStor->getAll(true), new LastTurn(), [ 'destNationID'=>$this->src->nationID, @@ -100,7 +100,7 @@ class DiplomaticMessage extends Message{ protected function cancelNA(){ $gameStor = KVStorage::getStorage(DB::db(), 'game_env'); - $destGeneralObj = General::createGeneralObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite); + $destGeneralObj = General::createObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite); $commandObj = buildNationCommandClass('che_불가침파기수락', $destGeneralObj, $gameStor->getAll(true), new LastTurn(), [ 'destNationID'=>$this->src->nationID, @@ -122,7 +122,7 @@ class DiplomaticMessage extends Message{ protected function stopWar(){ $gameStor = KVStorage::getStorage(DB::db(), 'game_env'); - $destGeneralObj = General::createGeneralObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite); + $destGeneralObj = General::createObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite); $commandObj = buildNationCommandClass('che_종전수락', $destGeneralObj, $gameStor->getAll(true), new LastTurn(), [ 'destNationID'=>$this->src->nationID, diff --git a/hwe/sammo/Event/Action/LostUniqueItem.php b/hwe/sammo/Event/Action/LostUniqueItem.php index f3c9450a..21fbf7c8 100644 --- a/hwe/sammo/Event/Action/LostUniqueItem.php +++ b/hwe/sammo/Event/Action/LostUniqueItem.php @@ -28,7 +28,7 @@ class LostUniqueItem extends \sammo\Event\Action if (!$generalIDList) { return; } - $generals = General::createGeneralObjListFromDB($generalIDList); + $generals = General::createObjListFromDB($generalIDList); $lostItems = []; $totalLostCnt = 0; diff --git a/hwe/sammo/Event/Action/MergeInheritPointRank.php b/hwe/sammo/Event/Action/MergeInheritPointRank.php index 47a07880..7a8d75a1 100644 --- a/hwe/sammo/Event/Action/MergeInheritPointRank.php +++ b/hwe/sammo/Event/Action/MergeInheritPointRank.php @@ -18,7 +18,7 @@ class MergeInheritPointRank extends \sammo\Event\Action { $db = DB::db(); - $generals = General::createGeneralObjListFromDB(null, null); + $generals = General::createObjListFromDB(null, null); $points = new Map(); $points->allocate(count($generals)); diff --git a/hwe/sammo/Event/Action/ProvideNPCTroopLeader.php b/hwe/sammo/Event/Action/ProvideNPCTroopLeader.php index d8d4ab9f..50e06030 100644 --- a/hwe/sammo/Event/Action/ProvideNPCTroopLeader.php +++ b/hwe/sammo/Event/Action/ProvideNPCTroopLeader.php @@ -84,7 +84,7 @@ class ProvideNPCTroopLeader extends \sammo\Event\Action 'troop' => $npcID ], 'no=%i', $npcID); - $cmd = buildGeneralCommandClass('che_집합', General::createGeneralObjFromDB($npcID), $env); + $cmd = buildGeneralCommandClass('che_집합', General::createObjFromDB($npcID), $env); _setGeneralCommand($cmd, iterator_to_array(Util::range(GameConst::$maxTurn))); $NPCTroopLeaderCnt += 1; $gameStor->lastNPCTroopLeaderID = $lastNPCTroopLeaderID; diff --git a/hwe/sammo/Event/Action/UpdateNationLevel.php b/hwe/sammo/Event/Action/UpdateNationLevel.php index 72b7bc26..d92de942 100644 --- a/hwe/sammo/Event/Action/UpdateNationLevel.php +++ b/hwe/sammo/Event/Action/UpdateNationLevel.php @@ -140,7 +140,7 @@ class UpdateNationLevel extends \sammo\Event\Action $nation['nation'], $targetKillTurn ); - $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux']); + $nationGenList = General::createObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux']); $chiefID = null; $uniqueLotteryWeightList = []; @@ -215,7 +215,7 @@ class UpdateNationLevel extends \sammo\Event\Action } if ($chiefID) { - $chiefObj = General::createGeneralObjFromDB($chiefID, ['belong', 'npc', 'aux'], GeneralQueryMode::Lite); + $chiefObj = General::createObjFromDB($chiefID, ['belong', 'npc', 'aux'], GeneralQueryMode::Lite); $chiefObj->increaseInheritancePoint(InheritanceKey::unifier, 250 * $levelDiff); $chiefObj->applyDB($db); } diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index 3535600e..31a38b10 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -921,7 +921,7 @@ class General extends GeneralBase implements iAction * @return \sammo\General[] * @throws MustNotBeReachedException */ - static public function createGeneralObjListFromDB(?array $generalIDList, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): array + static public function createObjListFromDB(?array $generalIDList, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): array { if ($generalIDList === []) { return []; @@ -1007,7 +1007,7 @@ class General extends GeneralBase implements iAction return $result; } - static public function createGeneralObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): self + static public function createObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): self { $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php index 0a8a5018..7afb068a 100644 --- a/hwe/sammo/GeneralAI.php +++ b/hwe/sammo/GeneralAI.php @@ -3514,7 +3514,7 @@ class GeneralAI $db = DB::db(); $generalIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation = %i AND no != %i', $nationID, $this->general->getID()); - $nationGenerals = General::createGeneralObjListFromDB($generalIDList); + $nationGenerals = General::createObjListFromDB($generalIDList); $lastWar = \PHP_INT_MAX; foreach ($nationGenerals as $nationGeneral) { diff --git a/hwe/sammo/GeneralLite.php b/hwe/sammo/GeneralLite.php index 93b664b8..7a2b6626 100644 --- a/hwe/sammo/GeneralLite.php +++ b/hwe/sammo/GeneralLite.php @@ -68,7 +68,7 @@ class GeneralLite extends GeneralBase * @return \sammo\GeneralLite[] * @throws MustNotBeReachedException */ - static public function createGeneralLiteObjListFromDB(?array $generalIDList, ?array $column = null, GeneralLiteQueryMode $queryMode = GeneralLiteQueryMode::Full): array + static public function createObjListFromDB(?array $generalIDList, ?array $column = null, GeneralLiteQueryMode $queryMode = GeneralLiteQueryMode::Full): array { if ($generalIDList === []) { return []; @@ -136,7 +136,7 @@ class GeneralLite extends GeneralBase return $result; } - static public function createGeneralLiteObjFromDB(int $generalID, ?array $column = null, GeneralLiteQueryMode $queryMode = GeneralLiteQueryMode::Full): self + static public function createObjFromDB(int $generalID, ?array $column = null, GeneralLiteQueryMode $queryMode = GeneralLiteQueryMode::Full): self { $db = DB::db(); if ($queryMode->value > 0) { diff --git a/hwe/sammo/RaiseInvaderMessage.php b/hwe/sammo/RaiseInvaderMessage.php index 33b65e89..e70fee8e 100644 --- a/hwe/sammo/RaiseInvaderMessage.php +++ b/hwe/sammo/RaiseInvaderMessage.php @@ -66,7 +66,7 @@ class RaiseInvaderMessage extends Message } $gameStor = KVStorage::getStorage(DB::db(), 'game_env'); - $general = \sammo\General::createGeneralObjFromDB($receiverID); + $general = \sammo\General::createObjFromDB($receiverID); $logger = $general->getLogger(); diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php index bf954234..6b847d64 100644 --- a/hwe/sammo/ScoutMessage.php +++ b/hwe/sammo/ScoutMessage.php @@ -68,7 +68,7 @@ class ScoutMessage extends Message } $gameStor = KVStorage::getStorage(DB::db(), 'game_env'); - $general = \sammo\General::createGeneralObjFromDB($receiverID); + $general = \sammo\General::createObjFromDB($receiverID); $logger = $general->getLogger(); @@ -125,8 +125,8 @@ class ScoutMessage extends Message $now = TimeUtil::now(); //XXX: 뭔가 기존 쿼리가 애매하다. invalid 관련해서 다른 옵션이 가능한가? $rawMsgList = Util::convertArrayToDict($db->query( - 'SELECT * FROM `message` WHERE - `mailbox` = %i AND `type` = "private" AND `dest` = `mailbox` AND `valid_until` > %s AND + 'SELECT * FROM `message` WHERE + `mailbox` = %i AND `type` = "private" AND `dest` = `mailbox` AND `valid_until` > %s AND JSON_VALUE(message, "$.option.action") = %s', $generalID, $now, diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php index ca17ad71..482839b3 100644 --- a/hwe/sammo/TurnExecutionHelper.php +++ b/hwe/sammo/TurnExecutionHelper.php @@ -239,7 +239,7 @@ class TurnExecutionHelper return [true, $currentTurn]; } - $general = General::createGeneralObjFromDB($rawGeneral['no']); + $general = General::createObjFromDB($rawGeneral['no']); $nationStor = KVStorage::getStorage($db, $general->getNationID(), 'nation_env'); $turnObj = new static($general); diff --git a/hwe/v_NPCControl.php b/hwe/v_NPCControl.php index 59946efd..0ab1df23 100644 --- a/hwe/v_NPCControl.php +++ b/hwe/v_NPCControl.php @@ -43,7 +43,7 @@ $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env'); $nationStor->cacheValues(['npc_nation_policy', 'npc_general_policy']); $gameStor->cacheAll(); -$general = General::createGeneralObjFromDB($me['no']); +$general = General::createObjFromDB($me['no']); $rawServerPolicy = $gameStor->getValue('npc_nation_policy') ?? []; $rawNationPolicy = $nationStor->getValue('npc_nation_policy') ?? []; diff --git a/hwe/v_chiefCenter.php b/hwe/v_chiefCenter.php index 6193047b..c807f83d 100644 --- a/hwe/v_chiefCenter.php +++ b/hwe/v_chiefCenter.php @@ -7,7 +7,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); -$generalObj = General::createGeneralObjFromDB($session->generalID); +$generalObj = General::createObjFromDB($session->generalID); ?> diff --git a/hwe/v_inheritPoint.php b/hwe/v_inheritPoint.php index 24eeccd7..5acdef88 100644 --- a/hwe/v_inheritPoint.php +++ b/hwe/v_inheritPoint.php @@ -14,7 +14,7 @@ $generalID = $session->generalID; $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$me = General::createGeneralObjFromDB($generalID); +$me = General::createObjFromDB($generalID); diff --git a/hwe/v_processing.php b/hwe/v_processing.php index 15914ac4..eda86878 100644 --- a/hwe/v_processing.php +++ b/hwe/v_processing.php @@ -42,7 +42,7 @@ if ($isChiefTurn && !in_array($commandType, Util::array_flatten(GameConst::$avai $gameStor = KVStorage::getStorage($db, 'game_env')->turnOnCache(); $env = $gameStor->getAll(); -$general = General::createGeneralObjFromDB($session->generalID); +$general = General::createObjFromDB($session->generalID); if (!$isChiefTurn) { $commandObj = buildGeneralCommandClass($commandType, $general, $env);