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

Merge branch 'devel' into stat_cache_fix

Browse Source
This commit is contained in:
Hide_D
2024-02-17 00:01:40 +09:00
parent c5ed2d47fc af4401d9bb
commit 46f460c8ad
21 changed files with 1897 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/API/General/BuildNationCandidate.php
+3
View File
@@ -90,6 +90,9 @@ class BuildNationCandidate extends \sammo\BaseAPI
return '거병을 실패했습니다.';
}
$general->setVar('killturn', $env['killturn']);
$general->applyDB($db);
return null;
}
}
hwe/sammo/API/InheritAction/CalcResetTurnTimeRange.php
-68
View File
@@ -1,68 +0,0 @@
<?php
namespace sammo\API\InheritAction;
use DateTimeImmutable;
use sammo\Session;
use DateTimeInterface;
use sammo\DB;
use sammo\Enums\APIRecoveryType;
use sammo\Enums\RankColumn;
use sammo\GameConst;
use sammo\General;
use sammo\KVStorage;
use sammo\LiteHashDRBG;
use sammo\RandUtil;
use sammo\TimeUtil;
use sammo\UniqueConst;
use sammo\UserLogger;
use sammo\Util;
class CalcResetTurnTimeRange extends \sammo\BaseAPI
{
public function validateArgs(): ?string
{
return null;
}
public function getRequiredSessionMode(): int
{
return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
}
public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
{
$userID = $session->userID;
$generalID = $session->generalID;
$general = General::createObjFromDB($generalID);
if ($userID != $general->getVar('owner')) {
return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
}
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
[$turnTerm, $serverTurnTime] = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
$currTurnTime = new DateTimeImmutable($general->getTurnTime());
$serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);
$minTurnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($turnTerm * -30));
$maxTurnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($turnTerm * 30));
$timeDiff = $serverTurnTimeObj->diff($minTurnTime);
$timeDiffSec = TimeUtil::DateIntervalToSeconds($timeDiff);
if($timeDiffSec > 0){
$minTurnTime = $minTurnTime->add(TimeUtil::secondsToDateInterval($timeDiffSec));
$maxTurnTime = $maxTurnTime->add(TimeUtil::secondsToDateInterval($timeDiffSec));
}
return [
'result' => true,
'timeDiffSec' => $timeDiffSec,
'minTurnTime' => TimeUtil::format($minTurnTime, false),
'maxTurnTime' => TimeUtil::format($maxTurnTime, false),
];
}
}
hwe/sammo/API/InheritAction/ResetTurnTime.php
+6 -17
View File
@@ -52,7 +52,7 @@ class ResetTurnTime extends \sammo\BaseAPI
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
if($gameStor->isunited){
if ($gameStor->isunited) {
return '이미 천하가 통일되었습니다.';
}
$inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
@@ -62,36 +62,25 @@ class ResetTurnTime extends \sammo\BaseAPI
}
$gameStor = KVStorage::getStorage($db, 'game_env');
[$turnTerm, $serverTurnTime] = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
$turnTerm = $gameStor->getValue('turnterm');
$currTurnTime = new DateTimeImmutable($general->getTurnTime());
$serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);
$rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
UniqueConst::$hiddenSeed,
'ResetTurnTime',
$userID,
$general->getTurnTime()
$general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
)));
$afterTurn = $rng->nextRange($turnTerm * -60 / 2, $turnTerm * 60 / 2);
$afterTurn = $rng->nextFloat1() * $turnTerm * 60;
$userLogger = new UserLogger($userID);
if($afterTurn >= 0){
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv(Util::toInt($afterTurn), 60), $afterTurn%60), "inheritPoint");
}
else{
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(Util::toInt(-$afterTurn), 60), (-$afterTurn)%60), "inheritPoint");
}
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint");
$userLogger->flush();
$turnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($afterTurn));
if ($turnTime <= $serverTurnTimeObj && $serverTurnTimeObj <= $currTurnTime) {
$turnTime = $turnTime->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
}
$general->setVar('turntime', TimeUtil::format($turnTime, true));
$general->setAuxVar('inheritResetTurnTime', $nextLevel);
$general->setAuxVar('nextTurnTimeBase', $afterTurn);
$inheritStor->setValue('previous', [$previousPoint - $reqPoint, null]);
$general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqPoint);
$general->applyDB($db);
hwe/sammo/Auction.php
+1 -1
View File
@@ -267,7 +267,7 @@ abstract class Auction
if ($isRollback) {
$highestBid = $this->getHighestBid();
if ($highestBid !== null) {
$this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title} 경매가 취소되었습니다.");
$this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title}가 취소되었습니다.");
}
$this->rollbackAuction();
}
hwe/sammo/Command/General/che_하야.php
-3
View File
@@ -30,11 +30,8 @@ class che_하야 extends Command\GeneralCommand{
$this->setNation();
$relYear = $env['year'] - $env['startyear'];
$this->fullConditionConstraints=[
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::NotOpeningPart($relYear),
ConstraintHelper::NotLord(),
];
}
hwe/sammo/Command/Nation/che_불가침제의.php
+1
View File
@@ -117,6 +117,7 @@ class che_불가침제의 extends Command\NationCommand
ConstraintHelper::BeChief(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::ExistsDestNation(),
ConstraintHelper::DifferentDestNation(),
ConstraintHelper::DisallowDiplomacyBetweenStatus([
0 => '아국과 이미 교전중입니다.',
1 => '아국과 이미 선포중입니다.',
hwe/sammo/Command/Nation/che_이호경식.php
+1 -3
View File
@@ -164,9 +164,7 @@ class che_이호경식 extends Command\NationCommand
$nationGeneralLogger->flush();
}
$josaYiCommand = JosaUtil::pick($commandName, '이');
$broadcastMessage = "아국에 <M>{$commandName}</>{$josaYiCommand} 발동되었습니다.";
$broadcastMessage = "<D><b>{$nationName}</b></>{$josaYiNation} 아국에 <M>{$commandName}</>{$josaUl} 발동하였습니다.";
$destNationGeneralList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i', $destNationID);
foreach ($destNationGeneralList as $destNationGeneralID) {
hwe/sammo/Command/Nation/che_종전수락.php
+3
View File
@@ -179,10 +179,13 @@ class che_종전수락 extends Command\NationCommand
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYiGeneral} <D><b>{$destNationName}</b></>{$josaWa} <M>종전 합의</> 하였습니다.");
$logger->pushGlobalHistoryLog("<Y><b>【종전】</b></><D><b>{$nationName}</b></>{$josaYiNation} <D><b>{$destNationName}</b></>{$josaWa} <M>종전 합의</> 하였습니다.");
$josaWa = JosaUtil::pick($destNationName, '와');
$logger->pushNationalHistoryLog("<D><b>{$destNationName}</b></>{$josaWa} 종전");
$josaWa = JosaUtil::pick($nationName, '와');
$destLogger->pushGeneralActionLog("<D><b>{$nationName}</b></>{$josaWa} 종전에 성공했습니다.", ActionLogger::PLAIN);
$destLogger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaWa} 종전 성공");
$destLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>{$josaWa} 종전");
$general->applyDB($db);
$destLogger->flush();
hwe/sammo/Constraint/HasRouteWithEnemy.php
+6
View File
@@ -35,6 +35,12 @@ class HasRouteWithEnemy extends Constraint{
$allowedNationList[] = $this->general['nation'];
$allowedNationList[] = 0;
$destCityNation = $db->queryFirstField('SELECT nation FROM city WHERE city = %i', $this->destCity['city']);
if($destCityNation !== 0 && $destCityNation !== $this->general['nation'] && !in_array($destCityNation, $allowedNationList)){
$this->reason = "교전중인 국가가 아닙니다.";
return false;
}
$distanceList = \sammo\searchDistanceListToDest($this->general['city'], $this->destCity['city'], $allowedNationList);
if(!$distanceList){
$this->reason = "경로에 도달할 방법이 없습니다.";
hwe/sammo/General.php
+2 -2
View File
@@ -806,7 +806,7 @@ class General extends GeneralBase implements iAction
continue;
}
/** @var iAction $iObj */
$value = $iObj->onCalcStat($this, $statName, $value, $aux);
$value = $iObj->onCalcStat($general, $statName, $value, $aux);
}
return $value;
}
@@ -819,7 +819,7 @@ class General extends GeneralBase implements iAction
continue;
}
/** @var iAction $iObj */
$value = $iObj->onCalcOpposeStat($this, $statName, $value, $aux);
$value = $iObj->onCalcOpposeStat($general, $statName, $value, $aux);
}
return $value;
}
hwe/sammo/GeneralAI.php
+5 -1
View File
@@ -3439,8 +3439,12 @@ class GeneralAI
$cmd = buildGeneralCommandClass($this->rng->choice($candidate), $this->general, $this->env);
if (!$cmd->hasFullConditionMet()) {
return buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
$cmd = buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
if (!$cmd->hasFullConditionMet()) {
$cmd = buildGeneralCommandClass('che_견문', $this->general, $this->env);
}
}
return $cmd;
}
hwe/sammo/TurnExecutionHelper.php
+10
View File
@@ -216,6 +216,16 @@ class TurnExecutionHelper
}
$turntime = addTurn($general->getTurnTime(), $gameStor->turnterm);
$nextTurnTimeBase = $general->getAuxVar('nextTurnTimeBase');
if($nextTurnTimeBase !== null){
$turntime = cutTurn($turntime, $gameStor->turnterm);
$turntimeObj = new \DateTimeImmutable($turntime);
$turntimeObj = $turntimeObj->add(TimeUtil::secondsToDateInterval($nextTurnTimeBase));
$turntime = TimeUtil::format($turntimeObj, true);
$general->setAuxVar('nextTurnTimeBase', null);
}
$general->setVar('turntime', $turntime);
}