devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

warning 수정

Browse Source
This commit is contained in:
Hide_D
2020-06-12 20:28:50 +09:00
parent b5705e6ec3
commit ec30c46d7e
3 changed files with 509 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_인재탐색.php
-8
View File
@@ -131,17 +131,9 @@ class che_인재탐색 extends Command\GeneralCommand
$nationID = $general->getNationID(); $nationID = $general->getNationID();
$nationCnt = count(getAllNationStaticInfo());
$totalGenCnt = $db->queryFirstField('SELECT count(no) FROM general WHERE npc <= 2'); $totalGenCnt = $db->queryFirstField('SELECT count(no) FROM general WHERE npc <= 2');
$totalNpcCnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE 3 <= npc AND npc <= 4'); $totalNpcCnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE 3 <= npc AND npc <= 4');
$genCnt = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc < 2', $nationID);
$npcCnt = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND 3 <= npc AND npc <= 4', $nationID);
$currCnt = Util::toInt($totalGenCnt + $totalNpcCnt / 2);
$avgCnt = $currCnt / $nationCnt;
$foundNpc = Util::randBool($this->calcFoundProp($env['maxgeneral'], $totalGenCnt, $totalNpcCnt)); $foundNpc = Util::randBool($this->calcFoundProp($env['maxgeneral'], $totalGenCnt, $totalNpcCnt));
$logger = $general->getLogger(); $logger = $general->getLogger();
hwe/sammo/GeneralAI.php
+2 -2
View File
@@ -534,7 +534,7 @@ class GeneralAI
if(!key_exists($userGeneral->getCityID(), $this->nationCities)){ if(!key_exists($userGeneral->getCityID(), $this->nationCities)){
continue; continue;
} }
$city = $this->supplyCities[$userGeneral->getCityID()]; $city = $this->nationCities[$userGeneral->getCityID()];
$troopLeaderID = $userGeneral->getVar('troop'); $troopLeaderID = $userGeneral->getVar('troop');
if(!$troopLeaderID || !key_exists($troopLeaderID, $this->troopLeaders)){ if(!$troopLeaderID || !key_exists($troopLeaderID, $this->troopLeaders)){
continue; continue;
@@ -2778,7 +2778,7 @@ class GeneralAI
if($city['city'] === $candidate['city']){ if($city['city'] === $candidate['city']){
continue; continue;
} }
$realDevelRate = 0; $realDevelRate = 0.0001; //하단의 나눗셈
foreach($this->calcCityDevelRate($candidate) as $develKey => [$develVal, $develType]){ foreach($this->calcCityDevelRate($candidate) as $develKey => [$develVal, $develType]){
if(!($this->genType & $develType)){ if(!($this->genType & $develType)){