fix(misc): phan
This commit is contained in:
@@ -342,6 +342,7 @@ switch ($btn) {
|
||||
}
|
||||
break;
|
||||
case "랜덤턴":
|
||||
$turnterm = $gameStor->turnterm;
|
||||
foreach ($genlist as $generalID) {
|
||||
$turntime = getRandTurn($turnterm);
|
||||
$db->update('general', [
|
||||
|
||||
@@ -17,6 +17,7 @@ class BuySpecificUnique extends \sammo\BaseAPI
|
||||
{
|
||||
public function validateArgs(): ?string
|
||||
{
|
||||
$availableItems = [];
|
||||
foreach (GameConst::$allItems as $items) {
|
||||
foreach ($items as $itemKey => $amount) {
|
||||
if ($amount == 0) {
|
||||
|
||||
@@ -62,10 +62,10 @@ class ResetTurnTime extends \sammo\BaseAPI
|
||||
|
||||
$userLogger = new UserLogger($userID);
|
||||
if($afterTurn >= 0){
|
||||
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv($afterTurn, 60), $afterTurn%60), "inheritPoint");
|
||||
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv(Util::toInt($afterTurn), 60), $afterTurn%60), "inheritPoint");
|
||||
}
|
||||
else{
|
||||
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(-$afterTurn, 60), (-$afterTurn)%60), "inheritPoint");
|
||||
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(Util::toInt(-$afterTurn), 60), (-$afterTurn)%60), "inheritPoint");
|
||||
}
|
||||
$userLogger->flush();
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@ namespace sammo;
|
||||
|
||||
class CityHelper{
|
||||
//Just Helper
|
||||
private static $list = null;
|
||||
private static $listInv = null;
|
||||
private static $listByNation = null;
|
||||
private static ?array $list = null;
|
||||
private static ?array $listInv = null;
|
||||
private static ?array $listByNation = null;
|
||||
|
||||
private function __construct(){
|
||||
|
||||
@@ -25,7 +25,7 @@ class CityHelper{
|
||||
'@phan-var array<int,mixed>|null $list';
|
||||
'@phan-var array<string,mixed>|null $listInv';
|
||||
'@phan-var array<int,mixed>|null $listByNation';
|
||||
|
||||
|
||||
foreach (DB::db()->query('SELECT `city` as `id`, `name`, `level`, `nation` from city') as $city) {
|
||||
$id = $city['id'];
|
||||
$name = $city['name'];
|
||||
@@ -83,5 +83,5 @@ class CityHelper{
|
||||
return $city;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -218,7 +218,7 @@ class che_물자원조 extends Command\NationCommand{
|
||||
}
|
||||
|
||||
$josaRoSrc = JosaUtil::pick($nationName, '로');
|
||||
$destNationLogger = new ActionLogger(0, $destChiefID, $year, $month);
|
||||
$destNationLogger = new ActionLogger(0, $destNationID, $year, $month);
|
||||
$destNationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>{$josaRoSrc}부터 금<C>{$goldAmountText}</> 쌀<C>{$riceAmountText}</>을 지원 받음");
|
||||
|
||||
$destNationStor = KVStorage::getStorage(DB::db(), $destNationID, 'nation_env');
|
||||
|
||||
+771
-789
File diff suppressed because it is too large
Load Diff
@@ -15,7 +15,7 @@ class che_도시치료 extends BaseGeneralTrigger{
|
||||
/** @var \sammo\General $general */
|
||||
$general = $this->object;
|
||||
$logger = $general->getLogger();
|
||||
|
||||
|
||||
if($general->getVar('injury') > 0){
|
||||
$general->updateVar('injury', 0);
|
||||
$general->activateSkill('pre.부상경감', 'pre.치료');
|
||||
@@ -25,8 +25,8 @@ class che_도시치료 extends BaseGeneralTrigger{
|
||||
$db = DB::db();
|
||||
|
||||
$patients = $db->queryAllLists(
|
||||
'SELECT no,name,nation FROM general WHERE city=%i AND injury > 10 AND no != %i',
|
||||
$general->getCityID(),
|
||||
'SELECT no,name,nation FROM general WHERE city=%i AND injury > 10 AND no != %i',
|
||||
$general->getCityID(),
|
||||
$general->getID()
|
||||
);
|
||||
|
||||
@@ -56,7 +56,7 @@ class che_도시치료 extends BaseGeneralTrigger{
|
||||
return $env;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(count($cureList) == 1){
|
||||
$josaUl = JosaUtil::pick($curedPatientName, "을");
|
||||
$logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수 <Y>{$curedPatientName}</>{$josaUl} 치료합니다!", ActionLogger::PLAIN);
|
||||
|
||||
@@ -86,7 +86,7 @@ class SpecialityHelper{
|
||||
if($leadership > GameConst::$chiefStatMin){
|
||||
$myCond |= self::STAT_LEADERSHIP;
|
||||
}
|
||||
|
||||
|
||||
if($strength >= $intel * 0.95 && $strength > GameConst::$chiefStatMin){
|
||||
$myCond |= self::STAT_STRENGTH;
|
||||
}
|
||||
@@ -101,7 +101,7 @@ class SpecialityHelper{
|
||||
}
|
||||
if($strength < GameConst::$chiefStatMin){
|
||||
$myCond |= self::STAT_NOT_STRENGTH;
|
||||
}
|
||||
}
|
||||
if($intel < GameConst::$chiefStatMin){
|
||||
$myCond |= self::STAT_NOT_INTEL;
|
||||
}
|
||||
@@ -118,7 +118,7 @@ class SpecialityHelper{
|
||||
$myCond |= self::STAT_INTEL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $myCond;
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ class SpecialityHelper{
|
||||
$specialObj = buildGeneralSpecialWarClass(GameConst::$defaultSpecialWar);
|
||||
$result[GameConst::$defaultSpecialWar] = $specialObj;
|
||||
}
|
||||
|
||||
|
||||
foreach(GameConst::$availableSpecialWar as $specialID){
|
||||
$specialObj = buildGeneralSpecialWarClass($specialID);
|
||||
$result[$specialID] = $specialObj;
|
||||
@@ -220,7 +220,7 @@ class SpecialityHelper{
|
||||
if(in_array($specialID, $prevSpecials)){
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if($weightType === static::WEIGHT_PERCENT){
|
||||
$pAbs[$specialID] = $weight;
|
||||
@@ -229,7 +229,7 @@ class SpecialityHelper{
|
||||
$pRel[$specialID] = $weight;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if($pAbs){
|
||||
if($pRel){
|
||||
$pAbs[0] = max(0, 100 - array_sum($pAbs));
|
||||
@@ -280,7 +280,7 @@ class SpecialityHelper{
|
||||
if(in_array($specialID, $prevSpecials)){
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if($cond & self::REQ_DEXTERITY){
|
||||
$reqDex[$specialID] = $weight;
|
||||
@@ -296,7 +296,7 @@ class SpecialityHelper{
|
||||
if($reqDex){
|
||||
return Util::choiceRandomUsingWeight($reqDex);
|
||||
}
|
||||
|
||||
|
||||
if($pAbs){
|
||||
if($pRel){
|
||||
$pAbs[0] = max(0, 100 - array_sum($pAbs));
|
||||
|
||||
Reference in New Issue
Block a user