도시 치료 결과가 이상하게 뜨는 버그 수정

This commit is contained in:
2020-06-16 00:26:45 +09:00
parent 7116efd65d
commit 76ce203272
+74 -72
View File
@@ -1,73 +1,75 @@
<?php <?php
namespace sammo\GeneralTrigger; namespace sammo\GeneralTrigger;
use sammo\BaseGeneralTrigger; use sammo\BaseGeneralTrigger;
use sammo\General; use sammo\General;
use sammo\ActionLogger; use sammo\ActionLogger;
use sammo\DB; use sammo\DB;
use sammo\Util; use sammo\Util;
use sammo\JosaUtil; use sammo\JosaUtil;
class che_도시치료 extends BaseGeneralTrigger{ class che_도시치료 extends BaseGeneralTrigger{
protected $priority = 10010; protected $priority = 10010;
public function action(?array $env=null, $arg=null):?array{ public function action(?array $env=null, $arg=null):?array{
/** @var \sammo\General $general */ /** @var \sammo\General $general */
$general = $this->object; $general = $this->object;
$logger = $general->getLogger(); $logger = $general->getLogger();
if($general->getVar('injury') > 0){ if($general->getVar('injury') > 0){
$general->updateVar('injury', 0); $general->updateVar('injury', 0);
$general->activateSkill('pre.부상경감', 'pre.치료'); $general->activateSkill('pre.부상경감', 'pre.치료');
$logger->pushGeneralActionLog('<C>의술</>을 펼쳐 스스로 치료합니다!', ActionLogger::PLAIN); $logger->pushGeneralActionLog('<C>의술</>을 펼쳐 스스로 치료합니다!', ActionLogger::PLAIN);
} }
$db = DB::db(); $db = DB::db();
$patients = $db->queryAllLists( $patients = $db->queryAllLists(
'SELECT no,name,nation FROM general WHERE city=%i AND injury > 10 AND no != %i', 'SELECT no,name,nation FROM general WHERE city=%i AND injury > 10 AND no != %i',
$general->getVar('city'), $general->getCityID(),
$general->getID() $general->getID()
); );
if(!$patients){ if(!$patients){
return $env; return $env;
} }
$generalName = $general->getName(); $generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이'); $josaYi = JosaUtil::pick($generalName, '이');
$cureList = []; $cureList = [];
foreach($patients as [$patientID, $patientName, $patientNationID]){ $curedPatientName = null;
if (!Util::randBool(0.5)) { foreach($patients as [$patientID, $patientName, $patientNationID]){
continue; if (!Util::randBool(0.5)) {
} continue;
}
$cureList[] = $patientID;
$patientLogger = new ActionLogger($patientID, $patientNationID, $logger->getYear(), $logger->getMonth()); $cureList[] = $patientID;
$patientLogger->pushGeneralActionLog("<Y>{$generalName}</>{$josaYi} <C>의술</>로써 치료해줍니다!", ActionLogger::PLAIN); $curedPatientName = $patientName;
$patientLogger->flush(); $patientLogger = new ActionLogger($patientID, $patientNationID, $logger->getYear(), $logger->getMonth());
} $patientLogger->pushGeneralActionLog("<Y>{$generalName}</>{$josaYi} <C>의술</>로써 치료해줍니다!", ActionLogger::PLAIN);
$patientLogger->flush();
if(!$cureList){ }
return $env;
} if(!$cureList){
return $env;
}
if(count($cureList) == 1){
$josaUl = JosaUtil::pick($patientName, "");
$logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수 <Y>{$patientName}</>{$josaUl} 치료합니다!", ActionLogger::PLAIN); if(count($cureList) == 1){
} $josaUl = JosaUtil::pick($curedPatientName, "");
else{ $logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수 <Y>{$curedPatientName}</>{$josaUl} 치료합니다!", ActionLogger::PLAIN);
$otherCount = count($cureList) - 1; }
$logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수들 <Y>{$patientName}</> 외 <C>{$otherCount}</>명을 치료합니다!", ActionLogger::PLAIN); else{
} $otherCount = count($cureList) - 1;
$logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수들 <Y>{$curedPatientName}</> 외 <C>{$otherCount}</>명을 치료합니다!", ActionLogger::PLAIN);
$db->update('general', [ }
'injury'=>0
], 'no IN %li', $cureList); $db->update('general', [
'injury'=>0
return $env; ], 'no IN %li', $cureList);
}
return $env;
}
} }