Compare commits
104
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10c4814f34 | ||
|
|
fe221a7bd9 | ||
|
|
8cdc9c9b84 | ||
|
|
df189f4408 | ||
|
|
47fa7885c5 | ||
|
|
004dbb39b4 | ||
|
|
cd94c15137 | ||
|
|
eeb965353e | ||
|
|
6dd09bd4b4 | ||
|
|
a73189a604 | ||
|
|
4341341a07 | ||
|
|
4b82f0b35c | ||
|
|
b417e117ad | ||
|
|
85e435e99d | ||
|
|
e48c13a92f | ||
|
|
4495f0c06e | ||
|
|
312711b7ed | ||
|
|
3e8c18b8d3 | ||
|
|
fb0f768f2c | ||
|
|
5fc230d89b | ||
|
|
5fd1a6c752 | ||
|
|
76a5ea273a | ||
|
|
3d0a5a4be8 | ||
|
|
23309113ec | ||
|
|
1a1bc541f5 | ||
|
|
20060a89fd | ||
|
|
24f788d1a0 | ||
|
|
813957479d | ||
|
|
cdf58c54e0 | ||
|
|
6399134380 | ||
|
|
eb49e6f8ff | ||
|
|
ef855eb2cc | ||
|
|
c970e6586d | ||
|
|
6eaa529048 | ||
|
|
fe39241a90 | ||
|
|
d936d93be8 | ||
|
|
89127c0258 | ||
|
|
57aa07453e | ||
|
|
0722f6ab5e | ||
|
|
b9c51da782 | ||
|
|
c290404e42 | ||
|
|
cc0f965cb4 | ||
|
|
64736d194e | ||
|
|
963b04e8b0 | ||
|
|
e58ffab2a2 | ||
|
|
de29e2e157 | ||
|
|
7aa1b1889c | ||
|
|
618cfe5720 | ||
|
|
a8cecf8ec2 | ||
|
|
d858c64a3c | ||
|
|
f49b1d26a5 | ||
|
|
92e5f2472d | ||
|
|
11144f1f88 | ||
|
|
34c9a9b53e | ||
|
|
84d9cf9eb4 | ||
|
|
8a4cc5df21 | ||
|
|
df0b8ccebe | ||
|
|
ac47bc58bd | ||
|
|
570ef6f005 | ||
|
|
7eecde62fa | ||
|
|
4e0e5c9cd7 | ||
|
|
18abcde0d5 | ||
|
|
6176b64c28 | ||
|
|
3bae1157b6 | ||
|
|
5a51ad5699 | ||
|
|
312d20269c | ||
|
|
178d6f042b | ||
|
|
3352b64d0f | ||
|
|
e7d86a16d5 | ||
|
|
820c25d8dc | ||
|
|
f2dcb4d4d1 | ||
|
|
de357cfe95 | ||
|
|
0f333f8c96 | ||
|
|
93e8adadac | ||
|
|
8f98626075 | ||
|
|
a321eb1362 | ||
|
|
1a17fad0a5 | ||
|
|
c74efbb372 | ||
|
|
66f79ca5d2 | ||
|
|
f42f844f17 | ||
|
|
aee98e15d7 | ||
|
|
0936dabc9e | ||
|
|
39b209caf0 | ||
|
|
07867b3aaf | ||
|
|
de1f74cb44 | ||
|
|
65c97107c6 | ||
|
|
d796eda13c | ||
|
|
2a9029470f | ||
|
|
254364bab8 | ||
|
|
0319410ade | ||
|
|
6b64f6f8ed | ||
|
|
62fcb2e987 | ||
|
|
ff3ef4e4f3 | ||
|
|
008b0e416c | ||
|
|
bf96849027 | ||
|
|
1b035e4a42 | ||
|
|
47dec60c2b | ||
|
|
c03a28be93 | ||
|
|
d1ab2b0450 | ||
|
|
fe9ae97821 | ||
|
|
98e0a676cb | ||
|
|
2bb1387bc4 | ||
|
|
af382c541e | ||
|
|
8616a094e5 |
+2
-5
@@ -13,9 +13,6 @@ $db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
[$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$turntimeDisplay = $clock->formatTick(Util::toInt($turntime), true);
|
||||
$tnmtTimeDisplay = $tnmt_time === null ? '-' : $clock->formatTick(Util::toInt($tnmt_time), true);
|
||||
|
||||
$plock = $db->queryFirstField('SELECT plock FROM plock WHERE `type` ="GAME"');
|
||||
?>
|
||||
@@ -33,8 +30,8 @@ $plock = $db->queryFirstField('SELECT plock FROM plock WHERE `type` ="GAME"');
|
||||
</head>
|
||||
<body>
|
||||
<form action=_119_b.php method=post>
|
||||
시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$turntimeDisplay?> (tick <?=$turntime?>)<br>
|
||||
시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$tnmtTimeDisplay?> (tick <?=$tnmt_time?>)<br>
|
||||
시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$turntime?><br>
|
||||
시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$tnmt_time?><br>
|
||||
봉급지급 : <input type=submit name=btn value='금지급'><input type=submit name=btn value='쌀지급'><br>
|
||||
락 풀 기 : <input type=submit name=btn value='락걸기'><input type=submit name=btn value='락풀기'> 현재 : <?=$plock>0?"동결중":"가동중"?><br>
|
||||
</form>
|
||||
|
||||
+36
-9
@@ -38,9 +38,21 @@ switch ($btn) {
|
||||
usleep(500000);
|
||||
}
|
||||
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
// 스케줄 전체를 벽시계에서 빼지 않고 논리 현재 tick만 앞으로 이동합니다.
|
||||
$clock->advance($gameStor, $clock->ticksFromMinutes($minute));
|
||||
$gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
|
||||
$turntime = (new \DateTimeImmutable($gameStor->turntime))->sub(new \DateInterval("PT{$minute}M"));
|
||||
$starttime = (new \DateTimeImmutable($gameStor->starttime))->sub(new \DateInterval("PT{$minute}M"));
|
||||
$tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->sub(new \DateInterval("PT{$minute}M"));
|
||||
|
||||
$gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
|
||||
$gameStor->starttime = $starttime->format('Y-m-d H:i:s');
|
||||
$gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
|
||||
|
||||
$db->update('general', [
|
||||
'turntime' => $db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
|
||||
], true);
|
||||
$db->update('ng_auction', [
|
||||
'close_date' => $db->sqleval('DATE_SUB(close_date, INTERVAL %i MINUTE)', $minute)
|
||||
], 'finished = 0');
|
||||
if ($locked) {
|
||||
unlock();
|
||||
}
|
||||
@@ -54,19 +66,34 @@ switch ($btn) {
|
||||
}
|
||||
usleep(500000);
|
||||
}
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$clock->advance($gameStor, -$clock->ticksFromMinutes($minute));
|
||||
$gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
|
||||
$turntime = (new \DateTimeImmutable($gameStor->turntime))->add(new \DateInterval("PT{$minute}M"));
|
||||
$starttime = (new \DateTimeImmutable($gameStor->starttime))->add(new \DateInterval("PT{$minute}M"));
|
||||
$tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->add(new \DateInterval("PT{$minute}M"));
|
||||
|
||||
$gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
|
||||
$gameStor->starttime = $starttime->format('Y-m-d H:i:s');
|
||||
$gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
|
||||
|
||||
$db->update('general', [
|
||||
'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
|
||||
], true);
|
||||
$db->update('ng_auction', [
|
||||
'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
|
||||
], 'finished = 0');
|
||||
if ($locked) {
|
||||
unlock();
|
||||
}
|
||||
break;
|
||||
case "토너분당김":
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$gameStor->tnmt_time = Util::toInt($gameStor->tnmt_time) - $clock->ticksFromMinutes($minute2);
|
||||
$tnmt_time = new \DateTime($gameStor->tnmt_time);
|
||||
$tnmt_time->sub(new \DateInterval("PT{$minute2}M"));
|
||||
$gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
|
||||
break;
|
||||
case "토너분지연":
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$gameStor->tnmt_time = Util::toInt($gameStor->tnmt_time) + $clock->ticksFromMinutes($minute2);
|
||||
$tnmt_time = new \DateTimeImmutable($gameStor->tnmt_time);
|
||||
$tnmt_time->add(new \DateInterval("PT{$minute2}M"));
|
||||
$gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
|
||||
break;
|
||||
case "금지급":
|
||||
processGoldIncome();
|
||||
|
||||
+2
-2
@@ -40,7 +40,7 @@ $admin = getAdmin();
|
||||
</tr>
|
||||
<tr>
|
||||
<td width=110 align=right>시작시간변경</td>
|
||||
<td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime_display'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
|
||||
<td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width=110 align=right>최대 장수</td>
|
||||
@@ -52,7 +52,7 @@ $admin = getAdmin();
|
||||
<td width=110 align=right>시작 년도</td>
|
||||
<td width=285><input type=text size=3 maxlength=3 style=color:white;background-color:black;text-align:right; name=startyear value='<?=$admin['startyear']?>'><input type=submit name=btn value=변경4></td>
|
||||
<td width=110 align=right>최근 갱신 시간</td>
|
||||
<td width=285> <?=$admin['turntime_display']?> (tick <?=$admin['turntime']?>)</td>
|
||||
<td width=285> <?=$admin['turntime']?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width=110 align=right>턴시간</td>
|
||||
|
||||
@@ -43,12 +43,7 @@ switch ($btn) {
|
||||
pushGlobalHistoryLog(["<R>★</><S>{$log}</>"]);
|
||||
break;
|
||||
case "변경1":
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$gameStor->clock_base_time = TimeUtil::format(GameClock::baseTimeForProjection(
|
||||
new \DateTimeImmutable($starttime),
|
||||
Util::toInt($gameStor->starttime),
|
||||
$clock->getTurnTermMinutes(),
|
||||
), true);
|
||||
$gameStor->starttime = (new \DateTime($starttime))->format('Y-m-d H:i:s');
|
||||
break;
|
||||
case "변경2":
|
||||
$gameStor->maxgeneral = $maxgeneral;
|
||||
@@ -83,4 +78,4 @@ switch ($btn) {
|
||||
break;
|
||||
}
|
||||
|
||||
header('location:_admin1.php');
|
||||
header('location:_admin1.php');
|
||||
@@ -99,7 +99,7 @@ switch ($btn) {
|
||||
], '`no` IN %li', $genlist);
|
||||
break;
|
||||
case "강제 사망":
|
||||
$date = GameClock::fromStorage($gameStor)->nowTick();
|
||||
$date = TimeUtil::now(true);
|
||||
$db->update('general', [
|
||||
'killturn' => 0,
|
||||
'turntime' => $date,
|
||||
|
||||
+2
-3
@@ -42,7 +42,6 @@ if ($session->userGrade < 6) {
|
||||
}
|
||||
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
|
||||
if ($btn == '정렬하기') {
|
||||
$gen = 0;
|
||||
@@ -112,7 +111,7 @@ $generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAcc
|
||||
대상장수 :
|
||||
<select name=gen size=1>
|
||||
<?php foreach ($generalBasicList as $general) : ?>
|
||||
<option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['name'] ?> (<?= substr($clock->formatTick(Util::toInt($general['turntime'])), 14, 5) ?>)</option>
|
||||
<option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['name'] ?> (<?= substr($general['turntime'], 14, 5) ?>)</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
<input type=submit name=btn value='조회하기'>
|
||||
@@ -180,4 +179,4 @@ $generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAcc
|
||||
</table>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
@@ -16,7 +16,7 @@ $db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
increaseRefresh("현재도시", 1);
|
||||
|
||||
$lastExecute = substr(GameClock::fromStorage($gameStor)->formatTick(Util::toInt($gameStor->turntime)), 5, 14);
|
||||
$lastExecute = substr($gameStor->turntime, 5, 14);
|
||||
|
||||
$me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID);
|
||||
$myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']) ?? [
|
||||
@@ -537,4 +537,4 @@ $templates = new \League\Plates\Engine('templates');
|
||||
</table>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
+1
-3
@@ -129,7 +129,6 @@ $templates = new \League\Plates\Engine('templates');
|
||||
);
|
||||
|
||||
$generalTurnList = [];
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
|
||||
foreach ($db->queryAllLists(
|
||||
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
|
||||
@@ -143,7 +142,6 @@ $templates = new \League\Plates\Engine('templates');
|
||||
|
||||
$genCntEff = 0;
|
||||
foreach ($generals as &$general) {
|
||||
$general['turntime'] = $clock->formatTick(Util::toInt($general['turntime']), true);
|
||||
$general['cityText'] = CityConst::byID($general['city'])->name;
|
||||
$general['troopText'] = $troopName[$general['troop']] ?? '-';
|
||||
|
||||
@@ -286,4 +284,4 @@ $templates = new \League\Plates\Engine('templates');
|
||||
</table>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
+12
-30
@@ -19,10 +19,10 @@ $userID = Session::getUserID();
|
||||
$generalID = $session->generalID;
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$nowTick = $clock->nowTick();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
|
||||
|
||||
increaseRefresh("내정보", 1);
|
||||
|
||||
$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
|
||||
|
||||
@@ -41,30 +41,12 @@ $lastRefresh = $db->queryFirstField(
|
||||
$generalID
|
||||
);
|
||||
|
||||
$nextChange = $me->getAuxVar('next_change');
|
||||
if (!is_int($nextChange)) {
|
||||
$nextChange = null;
|
||||
}
|
||||
$nextChangeDisplay = $nextChange === null ? null : $clock->formatTick($nextChange);
|
||||
|
||||
increaseRefresh("내정보", 1);
|
||||
if ($gameStor->turntime <= $gameStor->opentime) {
|
||||
$targetTime = $me->getAuxVar('prestart_delete_after');
|
||||
if (!is_int($targetTime)) {
|
||||
$targetTime = addTurn(
|
||||
$lastRefresh === null ? $nowTick : Util::toInt($lastRefresh),
|
||||
$gameStor->turnterm,
|
||||
GameConst::$minTurnDieOnPrestart
|
||||
);
|
||||
$me->setAuxVar('prestart_delete_after', $targetTime);
|
||||
$me->applyDB($db);
|
||||
}
|
||||
$targetTimeDisplay = $clock->formatTick($targetTime);
|
||||
|
||||
//서버 가오픈시 할 수 있는 행동
|
||||
if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
|
||||
$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
|
||||
if ($gameStor->turntime <= $gameStor->opentime) {
|
||||
//서버 가오픈시 할 수 있는 행동
|
||||
if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
|
||||
$showDieOnPrestartBtn = true;
|
||||
if ($targetTime <= $nowTick) {
|
||||
if ($targetTime <= TimeUtil::now()) {
|
||||
$availableDieOnPrestart = true;
|
||||
}
|
||||
}
|
||||
@@ -177,7 +159,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
|
||||
<a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>빙의 해체 요청</button></a>-->
|
||||
|
||||
<?php if ($showDieOnPrestartBtn) : ?>
|
||||
가오픈 기간 내 장수 삭제 (<?= $targetTimeDisplay ?> 부터)<br>
|
||||
가오픈 기간 내 장수 삭제 (<?= substr($targetTime, 0, 19) ?> 부터)<br>
|
||||
<button type="button" id='dieOnPrestart' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button><br><br>
|
||||
<?php endif; ?>
|
||||
|
||||
@@ -192,7 +174,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
|
||||
다른 장수 선택 (<?= $nextChangeDisplay ?? '지금' ?>부터)<br>
|
||||
다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
|
||||
<a href="select_general_from_pool.php" id='select_general_from_pool'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>다른 장수 선택</button></a><br><br>
|
||||
<?php endif; ?>
|
||||
|
||||
@@ -290,4 +272,4 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
@@ -228,10 +228,10 @@ if($btn == "자동개최설정") {
|
||||
$phase = 0;
|
||||
startBetting($admin['tnmt_type'], 720);
|
||||
} elseif($btn == "베팅마감") {
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$dt = date("Y-m-d H:i:s", time() + 60);
|
||||
$gameStor->tournament=7;
|
||||
$gameStor->phase=0;
|
||||
$gameStor->tnmt_time = $clock->nowTick() + $clock->ticksFromSeconds(60);
|
||||
$gameStor->tnmt_time = $dt;
|
||||
} elseif($btn == "16강") {
|
||||
finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16);
|
||||
} elseif($btn == "8강") {
|
||||
@@ -248,4 +248,4 @@ if($btn == "자동개최설정") {
|
||||
$gameStor->tnmt_msg = $msg;
|
||||
}
|
||||
|
||||
header('location:b_tournament.php');
|
||||
header('location:b_tournament.php');
|
||||
@@ -0,0 +1,242 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace sammo;
|
||||
|
||||
use Ds\Map;
|
||||
use sammo\Enums\RankColumn;
|
||||
|
||||
if (PHP_SAPI !== 'cli') {
|
||||
http_response_code(404);
|
||||
exit;
|
||||
}
|
||||
|
||||
chdir(dirname(__DIR__));
|
||||
require_once 'lib.php';
|
||||
require_once 'func.php';
|
||||
|
||||
final class ComparisonTracingRNG implements RNG
|
||||
{
|
||||
private int $sequence = 0;
|
||||
|
||||
/** @var array<int, array<string, mixed>> */
|
||||
public array $calls = [];
|
||||
|
||||
public function __construct(private readonly RNG $inner)
|
||||
{
|
||||
}
|
||||
|
||||
public static function getMaxInt(): int
|
||||
{
|
||||
return LiteHashDRBG::getMaxInt();
|
||||
}
|
||||
|
||||
public function nextBytes(int $bytes): string
|
||||
{
|
||||
$value = $this->inner->nextBytes($bytes);
|
||||
$this->record('nextBytes', ['bytes' => $bytes], bin2hex($value));
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function nextBits(int $bits): string
|
||||
{
|
||||
$value = $this->inner->nextBits($bits);
|
||||
$this->record('nextBits', ['bits' => $bits], bin2hex($value));
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function nextInt(?int $max = null): int
|
||||
{
|
||||
$value = $this->inner->nextInt($max);
|
||||
$this->record('nextInt', ['maxInclusive' => $max], $value);
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function nextFloat1(): float
|
||||
{
|
||||
$value = $this->inner->nextFloat1();
|
||||
$this->record('nextFloat1', [], $value);
|
||||
return $value;
|
||||
}
|
||||
|
||||
private function record(string $operation, array $arguments, mixed $result): void
|
||||
{
|
||||
$this->calls[] = [
|
||||
'seq' => $this->sequence++,
|
||||
'operation' => $operation,
|
||||
'arguments' => $arguments,
|
||||
'result' => $result,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
function comparisonExtractRankVar(array $raw): Map
|
||||
{
|
||||
$rankVars = new Map();
|
||||
foreach ($raw as $rawKey => $rawValue) {
|
||||
$key = RankColumn::tryFrom($rawKey);
|
||||
if ($key !== null) {
|
||||
$rankVars[$key] = $rawValue;
|
||||
}
|
||||
}
|
||||
return $rankVars;
|
||||
}
|
||||
|
||||
function comparisonBuildGeneral(
|
||||
array $raw,
|
||||
array $city,
|
||||
array $nation,
|
||||
int $year,
|
||||
int $month,
|
||||
bool $defender = false,
|
||||
): General {
|
||||
$aux = [];
|
||||
if (array_key_exists('inheritBuff', $raw)) {
|
||||
$aux['inheritBuff'] = $raw['inheritBuff'];
|
||||
}
|
||||
$raw['aux'] = Json::encode($aux);
|
||||
$raw['owner'] = 0;
|
||||
return new General(
|
||||
$raw,
|
||||
comparisonExtractRankVar($raw),
|
||||
null,
|
||||
$city,
|
||||
$nation,
|
||||
$year,
|
||||
$month,
|
||||
$defender,
|
||||
);
|
||||
}
|
||||
|
||||
function comparisonRunBattle(array $fixture): array
|
||||
{
|
||||
$seed = (string)($fixture['seed'] ?? 'battle-differential');
|
||||
$year = (int)$fixture['year'];
|
||||
$month = (int)$fixture['month'];
|
||||
$startYear = (int)($fixture['startYear'] ?? 180);
|
||||
$rawAttacker = $fixture['attackerGeneral'];
|
||||
$rawAttackerCity = $fixture['attackerCity'];
|
||||
$rawAttackerNation = $fixture['attackerNation'];
|
||||
$rawDefenderCity = $fixture['defenderCity'];
|
||||
$rawDefenderNation = $fixture['defenderNation'];
|
||||
// 비교 fixture에 명시된 경우에만 ref runtime의 scenario action chain을
|
||||
// 활성화합니다. 일반 비교 fixture의 기존 동작은 그대로 유지합니다.
|
||||
$scenarioEffect = $fixture['scenarioEffect'] ?? null;
|
||||
if ($scenarioEffect === '' || $scenarioEffect === 'None') {
|
||||
$scenarioEffect = null;
|
||||
}
|
||||
if (
|
||||
$scenarioEffect !== null
|
||||
&& (!is_string($scenarioEffect) || getScenarioEffectClass($scenarioEffect) === null)
|
||||
) {
|
||||
throw new \InvalidArgumentException('scenarioEffect is invalid');
|
||||
}
|
||||
GameConst::$scenarioEffect = $scenarioEffect;
|
||||
|
||||
$tracingRng = new ComparisonTracingRNG(new LiteHashDRBG($seed));
|
||||
$warRng = new RandUtil($tracingRng);
|
||||
$attacker = new WarUnitGeneral(
|
||||
$warRng,
|
||||
comparisonBuildGeneral($rawAttacker, $rawAttackerCity, $rawAttackerNation, $year, $month),
|
||||
$rawAttackerNation,
|
||||
true,
|
||||
);
|
||||
$city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);
|
||||
|
||||
$defenderList = [];
|
||||
foreach ($fixture['defenderGenerals'] as $rawDefender) {
|
||||
$defenderList[] = new WarUnitGeneral(
|
||||
$warRng,
|
||||
comparisonBuildGeneral($rawDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, true),
|
||||
$rawDefenderNation,
|
||||
false,
|
||||
);
|
||||
}
|
||||
if (count($defenderList) && extractBattleOrder($city, $attacker) > 0) {
|
||||
$defenderList[] = $city;
|
||||
}
|
||||
usort(
|
||||
$defenderList,
|
||||
fn(WarUnit $lhs, WarUnit $rhs): int =>
|
||||
-(extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker)),
|
||||
);
|
||||
|
||||
$iterDefender = new \ArrayIterator($defenderList);
|
||||
$iterDefender->rewind();
|
||||
$finishedDefenders = [];
|
||||
$getNextDefender = function (?WarUnit $previous, bool $requestNext) use (
|
||||
$iterDefender,
|
||||
$attacker,
|
||||
&$finishedDefenders,
|
||||
): ?WarUnit {
|
||||
if ($previous !== null) {
|
||||
$finishedDefenders[] = buildWarTraceUnitSnapshot($previous);
|
||||
}
|
||||
if (!$requestNext || !$iterDefender->valid()) {
|
||||
return null;
|
||||
}
|
||||
$next = $iterDefender->current();
|
||||
if (extractBattleOrder($next, $attacker) <= 0) {
|
||||
return null;
|
||||
}
|
||||
$iterDefender->next();
|
||||
return $next;
|
||||
};
|
||||
|
||||
$events = [];
|
||||
$conquered = processWar_NG(
|
||||
$seed,
|
||||
$attacker,
|
||||
$getNextDefender,
|
||||
$city,
|
||||
static function (array $event) use (&$events): void {
|
||||
$events[] = $event;
|
||||
},
|
||||
);
|
||||
|
||||
$attackerLogs = $attacker->getLogger()->rollback();
|
||||
$defenderLogs = [];
|
||||
foreach ($defenderList as $defenderUnit) {
|
||||
if (!($defenderUnit instanceof WarUnitGeneral)) {
|
||||
continue;
|
||||
}
|
||||
$snapshot = buildWarTraceUnitSnapshot($defenderUnit);
|
||||
$defenderLogs[(string)$snapshot['id']] = $defenderUnit->getLogger()->rollback();
|
||||
}
|
||||
$cityLogs = $city->getLogger()->rollback();
|
||||
|
||||
return [
|
||||
'engine' => 'ref',
|
||||
'seed' => $seed,
|
||||
'conquered' => $conquered,
|
||||
'attacker' => buildWarTraceUnitSnapshot($attacker),
|
||||
'city' => buildWarTraceUnitSnapshot($city),
|
||||
'finishedDefenders' => $finishedDefenders,
|
||||
'events' => $events,
|
||||
'rng' => $tracingRng->calls,
|
||||
'logs' => [
|
||||
'attacker' => $attackerLogs,
|
||||
'defenders' => $defenderLogs,
|
||||
'city' => $cityLogs,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
$fixturePath = $argv[1] ?? null;
|
||||
if ($fixturePath === null || ($fixturePath !== '-' && !is_file($fixturePath))) {
|
||||
fwrite(STDERR, "usage: php compare/battle_trace.php <fixture.json|->\n");
|
||||
exit(2);
|
||||
}
|
||||
|
||||
try {
|
||||
$fixtureJson = $fixturePath === '-' ? stream_get_contents(STDIN) : file_get_contents($fixturePath);
|
||||
$fixture = json_decode((string)$fixtureJson, true, flags: JSON_THROW_ON_ERROR);
|
||||
echo json_encode(
|
||||
comparisonRunBattle($fixture),
|
||||
JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
|
||||
), PHP_EOL;
|
||||
} catch (\Throwable $throwable) {
|
||||
fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
|
||||
exit(1);
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"action": "AddGlobalBetray",
|
||||
"args": [2, 1],
|
||||
"setup": {
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2, 3],
|
||||
"general": [
|
||||
{ "id": 1, "values": { "name": "배신0", "betray": 0 } },
|
||||
{ "id": 2, "values": { "name": "배신1", "betray": 1 } },
|
||||
{ "id": 3, "values": { "name": "배신2", "betray": 2 } }
|
||||
]
|
||||
},
|
||||
"environment": {
|
||||
"year": 194,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2, 3]
|
||||
},
|
||||
"compactOutput": true
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
{
|
||||
"action": "AssignGeneralSpeciality",
|
||||
"setup": {
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2, 3],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "내정대상",
|
||||
"nation": 1,
|
||||
"age": 30,
|
||||
"leadership": 40,
|
||||
"strength": 45,
|
||||
"intel": 80,
|
||||
"special": "None",
|
||||
"specage": 30,
|
||||
"special2": "che_신산",
|
||||
"specage2": 99,
|
||||
"aux": {
|
||||
"prev_types_special": ["che_경작"]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "전투대상",
|
||||
"nation": 1,
|
||||
"age": 30,
|
||||
"leadership": 80,
|
||||
"strength": 75,
|
||||
"intel": 40,
|
||||
"special": "che_인덕",
|
||||
"specage": 99,
|
||||
"special2": "None",
|
||||
"specage2": 30,
|
||||
"dex1": 200,
|
||||
"dex2": 10,
|
||||
"dex3": 10,
|
||||
"dex4": 10,
|
||||
"dex5": 10,
|
||||
"aux": {
|
||||
"prev_types_special2": ["che_돌격"]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"name": "계승대상",
|
||||
"nation": 2,
|
||||
"age": 30,
|
||||
"leadership": 50,
|
||||
"strength": 50,
|
||||
"intel": 50,
|
||||
"special": "che_경작",
|
||||
"specage": 99,
|
||||
"special2": "None",
|
||||
"specage2": 30,
|
||||
"aux": {
|
||||
"inheritSpecificSpecialWar": "che_의술",
|
||||
"marker": 3
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2, 3]
|
||||
},
|
||||
"compactOutput": true
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
"action": "AutoDeleteInvader",
|
||||
"compactOutput": true,
|
||||
"args": [1],
|
||||
"setup": {
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1],
|
||||
"resetDiplomacy": true,
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "ⓞ남만족",
|
||||
"capital": 69,
|
||||
"gennum": 1,
|
||||
"tech": 100,
|
||||
"level": 2,
|
||||
"type": "che_병가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "ⓞ남만대왕",
|
||||
"nation": 1,
|
||||
"city": 69,
|
||||
"officer_level": 12,
|
||||
"npc": 9
|
||||
}
|
||||
}
|
||||
],
|
||||
"event": [
|
||||
{
|
||||
"id": 990001,
|
||||
"action": [["AutoDeleteInvader", 1]]
|
||||
}
|
||||
]
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"currentEventID": 990001
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"action": "BlockScoutAction",
|
||||
"args": [true],
|
||||
"setup": {
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2],
|
||||
"nation": [
|
||||
{ "id": 1, "values": { "name": "위", "level": 2, "scout": 0 } },
|
||||
{ "id": 2, "values": { "name": "촉", "level": 2, "scout": 0 } }
|
||||
],
|
||||
"gameEnvironment": {
|
||||
"block_change_scout": false
|
||||
}
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {
|
||||
"nationIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,226 @@
|
||||
{
|
||||
"action": "MonthlyBoundary",
|
||||
"compactOutput": true,
|
||||
"environment": {
|
||||
"year": 190,
|
||||
"month": 12,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"starttime": "2026-07-25 00:00:00",
|
||||
"turntime": "2026-07-25 02:00:00"
|
||||
},
|
||||
"setup": {
|
||||
"syncEnvironment": true,
|
||||
"world": {
|
||||
"hiddenSeed": "monthly-boundary-core-catalog"
|
||||
},
|
||||
"gameEnvironment": {
|
||||
"isunited": 1,
|
||||
"refreshLimit": 3,
|
||||
"block_change_scout": false
|
||||
},
|
||||
"resetCities": true,
|
||||
"deleteOtherCities": true,
|
||||
"keepCityIds": [1, 2],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "경계도시",
|
||||
"level": 1,
|
||||
"nation": 1,
|
||||
"pop": 10000,
|
||||
"pop_max": 20000,
|
||||
"agri": 1000,
|
||||
"agri_max": 2000,
|
||||
"comm": 1000,
|
||||
"comm_max": 2000,
|
||||
"secu": 1000,
|
||||
"secu_max": 2000,
|
||||
"trust": 50,
|
||||
"trade": 100,
|
||||
"def": 1000,
|
||||
"def_max": 2000,
|
||||
"wall": 1000,
|
||||
"wall_max": 2000,
|
||||
"officer_set": 1,
|
||||
"state": 31,
|
||||
"term": 1,
|
||||
"supply": 1,
|
||||
"front": 2,
|
||||
"conflict": {},
|
||||
"dead": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "중립도시",
|
||||
"level": 8,
|
||||
"nation": 0,
|
||||
"pop": 12000,
|
||||
"pop_max": 22000,
|
||||
"agri": 1200,
|
||||
"agri_max": 2200,
|
||||
"comm": 1200,
|
||||
"comm_max": 2200,
|
||||
"secu": 1200,
|
||||
"secu_max": 2200,
|
||||
"trust": 55,
|
||||
"trade": 100,
|
||||
"def": 1200,
|
||||
"def_max": 2200,
|
||||
"wall": 1200,
|
||||
"wall_max": 2200,
|
||||
"officer_set": 1,
|
||||
"state": 0,
|
||||
"term": 0,
|
||||
"supply": 0,
|
||||
"front": 0,
|
||||
"conflict": {},
|
||||
"dead": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "경계군주",
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"officer_level": 12,
|
||||
"npc": 0,
|
||||
"age": 30,
|
||||
"belong": 3,
|
||||
"makelimit": 2,
|
||||
"gold": 1000,
|
||||
"rice": 1000,
|
||||
"crew": 100,
|
||||
"train": 80,
|
||||
"atmos": 70,
|
||||
"leadership": 50,
|
||||
"strength": 50,
|
||||
"intel": 50,
|
||||
"experience": 0,
|
||||
"dedication": 0,
|
||||
"dex1": 0,
|
||||
"dex2": 0,
|
||||
"dex3": 0,
|
||||
"dex4": 0,
|
||||
"dex5": 0,
|
||||
"personal": "None",
|
||||
"special": "None",
|
||||
"specage": 0,
|
||||
"special2": "None",
|
||||
"specage2": 0,
|
||||
"betray": 0,
|
||||
"bornyear": 160,
|
||||
"deadyear": 250
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "경계재야",
|
||||
"nation": 0,
|
||||
"city": 2,
|
||||
"officer_level": 0,
|
||||
"npc": 0,
|
||||
"age": 25,
|
||||
"belong": 4,
|
||||
"makelimit": 0,
|
||||
"gold": 500,
|
||||
"rice": 500,
|
||||
"crew": 50,
|
||||
"train": 60,
|
||||
"atmos": 50,
|
||||
"leadership": 40,
|
||||
"strength": 40,
|
||||
"intel": 40,
|
||||
"experience": 0,
|
||||
"dedication": 0,
|
||||
"dex1": 0,
|
||||
"dex2": 0,
|
||||
"dex3": 0,
|
||||
"dex4": 0,
|
||||
"dex5": 0,
|
||||
"personal": "None",
|
||||
"special": "None",
|
||||
"specage": 0,
|
||||
"special2": "None",
|
||||
"specage2": 0,
|
||||
"betray": 0,
|
||||
"bornyear": 165,
|
||||
"deadyear": 250
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "경계국",
|
||||
"color": "#123456",
|
||||
"capital": 1,
|
||||
"gennum": 1,
|
||||
"gold": 10000,
|
||||
"rice": 20000,
|
||||
"tech": 100,
|
||||
"power": 10,
|
||||
"level": 2,
|
||||
"type": "che_유가",
|
||||
"bill": 100,
|
||||
"rate": 20,
|
||||
"rate_tmp": 10,
|
||||
"scout": 1,
|
||||
"chief_set": 1,
|
||||
"strategic_cmd_limit": 2,
|
||||
"surlimit": 1,
|
||||
"spy": "{}"
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetDiplomacy": true,
|
||||
"resetEvents": true,
|
||||
"event": [
|
||||
{
|
||||
"id": 991001,
|
||||
"target": "PRE_MONTH",
|
||||
"priority": 1000,
|
||||
"condition": true,
|
||||
"action": [
|
||||
["NoticeToHistoryLog", "aggregate-pre", 6]
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 991002,
|
||||
"target": "MONTH",
|
||||
"priority": 1000,
|
||||
"condition": true,
|
||||
"action": [
|
||||
["ProcessIncome", "gold"],
|
||||
["NewYear"],
|
||||
["ResetOfficerLock"],
|
||||
["RandomizeCityTradeRate"],
|
||||
["ChangeCity", "all", {"pop": "+10", "trust": 60}],
|
||||
["NoticeToHistoryLog", "aggregate-month", 6],
|
||||
["DeleteEvent"]
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2],
|
||||
"nationIds": [1],
|
||||
"cityIds": [1, 2],
|
||||
"eventIds": [991001, 991002],
|
||||
"accessGeneralIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
"action": "NewYear",
|
||||
"environment": {
|
||||
"year": 191,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"age": 30,
|
||||
"belong": 3
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 0,
|
||||
"age": 30,
|
||||
"belong": 4
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"action": "NoticeToHistoryLog",
|
||||
"args": ["<S>새해 알림</>", 6],
|
||||
"environment": {
|
||||
"year": 191,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {},
|
||||
"observe": {}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
{
|
||||
"action": "ProcessIncome",
|
||||
"args": ["gold"],
|
||||
"environment": {
|
||||
"year": 190,
|
||||
"month": 7,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"officer_level": 5,
|
||||
"npc": 0,
|
||||
"gold": 1000,
|
||||
"rice": 1000,
|
||||
"dedication": 100
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑국",
|
||||
"capital": 1,
|
||||
"gold": 10000,
|
||||
"rice": 20000,
|
||||
"level": 1,
|
||||
"rate_tmp": 20
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑성",
|
||||
"nation": 1,
|
||||
"level": 4,
|
||||
"supply": 1,
|
||||
"pop": 10000,
|
||||
"pop_max": 20000,
|
||||
"agri": 1000,
|
||||
"agri_max": 2000,
|
||||
"comm": 1000,
|
||||
"comm_max": 2000,
|
||||
"secu": 1000,
|
||||
"secu_max": 2000,
|
||||
"trust": 80,
|
||||
"def": 500,
|
||||
"def_max": 1000,
|
||||
"wall": 500,
|
||||
"wall_max": 1000
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1],
|
||||
"nationIds": [1],
|
||||
"cityIds": [1],
|
||||
"nationEnvironmentKeys": ["prev_income_gold", "prev_income_rice"]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"action": "ResetOfficerLock",
|
||||
"environment": {
|
||||
"year": 191,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetNations": true,
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"officer_set": 1
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"chief_set": 1
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"cityIds": [1],
|
||||
"nationIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"action": "CreateAdminNPC",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 12,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"action": "CreateManyNPC",
|
||||
"args": [2, 0],
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 5,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"turntime": "0193-05-01 00:00:00"
|
||||
},
|
||||
"setup": {
|
||||
"resetGenerals": true
|
||||
},
|
||||
"observe": {}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
"action": "FinishNationBetting",
|
||||
"args": [1],
|
||||
"setup": {
|
||||
"clearBetting": true,
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2],
|
||||
"nation": [
|
||||
{ "id": 1, "values": { "name": "위", "gennum": 1, "power": 100, "level": 2 } },
|
||||
{ "id": 2, "values": { "name": "촉", "gennum": 1, "power": 300, "level": 0 } }
|
||||
],
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"general": [
|
||||
{ "id": 1, "values": { "name": "장수1", "nation": 1, "owner": 1, "npc": 0 } },
|
||||
{ "id": 2, "values": { "name": "장수2", "nation": 2, "owner": 2, "npc": 0 } }
|
||||
],
|
||||
"bettingInfo": [
|
||||
{
|
||||
"id": 1,
|
||||
"type": "bettingNation",
|
||||
"name": "천통국 예상",
|
||||
"finished": false,
|
||||
"selectCnt": 1,
|
||||
"isExclusive": null,
|
||||
"reqInheritancePoint": true,
|
||||
"openYearMonth": 2400,
|
||||
"closeYearMonth": 2424,
|
||||
"candidates": [
|
||||
{
|
||||
"title": "위",
|
||||
"info": "국력: 100<br>장수 수: 1<br>도시 수: 1",
|
||||
"isHtml": true,
|
||||
"aux": { "nation": 1 }
|
||||
},
|
||||
{
|
||||
"title": "촉",
|
||||
"info": "국력: 300<br>장수 수: 1<br>도시 수: 1",
|
||||
"isHtml": true,
|
||||
"aux": { "nation": 2 }
|
||||
}
|
||||
],
|
||||
"winner": null
|
||||
}
|
||||
],
|
||||
"bet": [
|
||||
{ "betting_id": 1, "general_id": 0, "user_id": null, "betting_type": "[-1]", "amount": 100 },
|
||||
{ "betting_id": 1, "general_id": 1, "user_id": 1, "betting_type": "[0]", "amount": 100 },
|
||||
{ "betting_id": 1, "general_id": 2, "user_id": 2, "betting_type": "[1]", "amount": 100 }
|
||||
],
|
||||
"inheritancePrevious": {
|
||||
"1": 900,
|
||||
"2": 900
|
||||
},
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 202,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2],
|
||||
"nationIds": [1, 2],
|
||||
"ownerIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
"action": "InvaderEnding",
|
||||
"compactOutput": true,
|
||||
"setup": {
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1],
|
||||
"setAllCitiesNation": 1,
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "기준국",
|
||||
"capital": 1,
|
||||
"gennum": 1,
|
||||
"tech": 100,
|
||||
"level": 2,
|
||||
"type": "che_유가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"gameEnvironment": {
|
||||
"isunited": 1,
|
||||
"refreshLimit": 3
|
||||
},
|
||||
"event": [
|
||||
{
|
||||
"id": 990002,
|
||||
"action": [["InvaderEnding"]]
|
||||
}
|
||||
]
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"currentEventID": 990002
|
||||
},
|
||||
"observe": {}
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
{
|
||||
"action": "InvaderLifecycle",
|
||||
"args": [10, 150, 100, 20],
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1],
|
||||
"resetDiplomacy": true,
|
||||
"resetEvents": true,
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "기준도시",
|
||||
"level": 3,
|
||||
"nation": 1,
|
||||
"pop": 1000,
|
||||
"pop_max": 10000,
|
||||
"agri": 2000,
|
||||
"agri_max": 20000,
|
||||
"comm": 3000,
|
||||
"comm_max": 30000,
|
||||
"secu": 4000,
|
||||
"secu_max": 40000,
|
||||
"def": 5000,
|
||||
"def_max": 50000,
|
||||
"wall": 6000,
|
||||
"wall_max": 60000
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 48,
|
||||
"values": {
|
||||
"name": "남만",
|
||||
"level": 4,
|
||||
"nation": 0,
|
||||
"pop": 1000,
|
||||
"pop_max": 10000,
|
||||
"agri": 2000,
|
||||
"agri_max": 20000,
|
||||
"comm": 3000,
|
||||
"comm_max": 30000,
|
||||
"secu": 4000,
|
||||
"secu_max": 40000,
|
||||
"def": 5000,
|
||||
"def_max": 50000,
|
||||
"wall": 6000,
|
||||
"wall_max": 60000
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "기준국",
|
||||
"capital": 1,
|
||||
"gennum": 1,
|
||||
"tech": 100,
|
||||
"level": 2,
|
||||
"type": "che_유가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "군주",
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"officer_level": 12,
|
||||
"npc": 0,
|
||||
"leadership": 50,
|
||||
"strength": 50,
|
||||
"intel": 50,
|
||||
"experience": 1000,
|
||||
"dedication": 1000,
|
||||
"dex1": 10,
|
||||
"dex2": 20,
|
||||
"dex3": 30,
|
||||
"dex4": 40,
|
||||
"dex5": 50,
|
||||
"turntime": "0200-01-01 00:05:00"
|
||||
}
|
||||
}
|
||||
],
|
||||
"gameEnvironment": {
|
||||
"isunited": 0,
|
||||
"refreshLimit": 3
|
||||
},
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"turntime": "0200-01-01 00:00:00",
|
||||
"show_img_level": 3,
|
||||
"fiction": [0]
|
||||
},
|
||||
"observe": {}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"action": "LostUniqueItem",
|
||||
"args": [0.2],
|
||||
"environment": {
|
||||
"year": 210,
|
||||
"month": 1,
|
||||
"startyear": 180
|
||||
},
|
||||
"setup": {
|
||||
"syncEnvironment": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑",
|
||||
"npc": 0,
|
||||
"horse": "che_명마_12_옥란백용구",
|
||||
"weapon": "che_무기_15_의천검",
|
||||
"book": "che_서적_01_효경전",
|
||||
"item": "che_저지_삼황내문"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을",
|
||||
"npc": 1,
|
||||
"horse": "che_명마_12_사륜거",
|
||||
"weapon": "che_무기_01_단도",
|
||||
"book": "None",
|
||||
"item": "che_부적_태현청생부"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
{
|
||||
"action": "MergeInheritPointRank",
|
||||
"environment": {
|
||||
"year": 210,
|
||||
"month": 1,
|
||||
"startyear": 180
|
||||
},
|
||||
"setup": {
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1],
|
||||
"clearInheritanceOwnerIds": [100],
|
||||
"gameEnvironment": {
|
||||
"isunited": 0
|
||||
},
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑",
|
||||
"nation": 1,
|
||||
"owner": 100,
|
||||
"npc": 0,
|
||||
"belong": 3,
|
||||
"dex1": 1000,
|
||||
"dex2": 0,
|
||||
"dex3": 0,
|
||||
"dex4": 0,
|
||||
"dex5": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"inheritancePoints": [
|
||||
{"ownerId": 100, "key": "previous", "value": 999},
|
||||
{"ownerId": 100, "key": "lived_month", "value": 2},
|
||||
{"ownerId": 100, "key": "max_domestic_critical", "value": 4},
|
||||
{"ownerId": 100, "key": "active_action", "value": 15},
|
||||
{"ownerId": 100, "key": "unifier", "value": 6},
|
||||
{"ownerId": 100, "key": "tournament", "value": 7}
|
||||
],
|
||||
"rankData": [
|
||||
{"generalId": 1, "type": "warnum", "value": 2},
|
||||
{"generalId": 1, "type": "firenum", "value": 1},
|
||||
{"generalId": 1, "type": "betwin", "value": 2},
|
||||
{"generalId": 1, "type": "betgold", "value": 4000},
|
||||
{"generalId": 1, "type": "betwingold", "value": 2000},
|
||||
{"generalId": 1, "type": "inherit_earned_dyn", "value": 999},
|
||||
{"generalId": 1, "type": "inherit_earned_act", "value": 11},
|
||||
{"generalId": 1, "type": "inherit_earned", "value": 999},
|
||||
{"generalId": 1, "type": "inherit_spent_dyn", "value": 9},
|
||||
{"generalId": 1, "type": "inherit_spent", "value": 999}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1],
|
||||
"ownerIds": [100],
|
||||
"inheritanceKeys": [
|
||||
"previous",
|
||||
"lived_month",
|
||||
"max_domestic_critical",
|
||||
"active_action",
|
||||
"unifier",
|
||||
"tournament"
|
||||
],
|
||||
"rankGeneralIds": [1],
|
||||
"rankTypes": [
|
||||
"inherit_earned",
|
||||
"inherit_earned_act",
|
||||
"inherit_earned_dyn",
|
||||
"inherit_spent",
|
||||
"inherit_spent_dyn"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
{
|
||||
"action": "NationBettingLifecycle",
|
||||
"args": [1, 100],
|
||||
"bettorGeneralIds": [1, 2],
|
||||
"bettorOwnerIds": [1, 2],
|
||||
"setup": {
|
||||
"clearBetting": true,
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "위",
|
||||
"color": "#111111",
|
||||
"capital": 1,
|
||||
"gennum": 1,
|
||||
"gold": 1000,
|
||||
"rice": 2000,
|
||||
"tech": 100,
|
||||
"power": 100,
|
||||
"level": 2,
|
||||
"type": "che_유가"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "촉",
|
||||
"color": "#222222",
|
||||
"capital": 2,
|
||||
"gennum": 1,
|
||||
"gold": 3000,
|
||||
"rice": 4000,
|
||||
"tech": 200,
|
||||
"power": 300,
|
||||
"level": 2,
|
||||
"type": "che_병가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetCities": true,
|
||||
"deleteOtherCities": true,
|
||||
"keepCityIds": [1, 2],
|
||||
"city": [
|
||||
{ "id": 1, "values": { "name": "허창", "nation": 1, "level": 3 } },
|
||||
{ "id": 2, "values": { "name": "성도", "nation": 2, "level": 3 } }
|
||||
],
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"general": [
|
||||
{ "id": 1, "values": { "name": "장수1", "nation": 1, "city": 1, "owner": 1, "npc": 0 } },
|
||||
{ "id": 2, "values": { "name": "장수2", "nation": 2, "city": 2, "owner": 2, "npc": 0 } }
|
||||
],
|
||||
"inheritancePrevious": {
|
||||
"1": 1000,
|
||||
"2": 1000
|
||||
},
|
||||
"rankData": [
|
||||
{ "generalId": 1, "type": "inherit_spent_dyn", "value": 0 },
|
||||
{ "generalId": 1, "type": "inherit_earned_act", "value": 0 },
|
||||
{ "generalId": 2, "type": "inherit_spent_dyn", "value": 0 },
|
||||
{ "generalId": 2, "type": "inherit_earned_act", "value": 0 }
|
||||
],
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
{
|
||||
"action": "NpcNationLifecycle",
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"resetNations": true,
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "점유도시",
|
||||
"level": 5,
|
||||
"nation": 1,
|
||||
"pop": 10001,
|
||||
"pop_max": 50001,
|
||||
"agri": 1001,
|
||||
"agri_max": 5001,
|
||||
"comm": 2001,
|
||||
"comm_max": 6001,
|
||||
"secu": 3001,
|
||||
"secu_max": 7001,
|
||||
"def": 4001,
|
||||
"def_max": 8001,
|
||||
"wall": 5001,
|
||||
"wall_max": 9001
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 48,
|
||||
"values": {
|
||||
"name": "건국도시",
|
||||
"level": 5,
|
||||
"nation": 0,
|
||||
"pop": 10048,
|
||||
"pop_max": 50048,
|
||||
"agri": 1048,
|
||||
"agri_max": 5048,
|
||||
"comm": 2048,
|
||||
"comm_max": 6048,
|
||||
"secu": 3048,
|
||||
"secu_max": 7048,
|
||||
"def": 4048,
|
||||
"def_max": 8048,
|
||||
"wall": 5048,
|
||||
"wall_max": 9048
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "기준국",
|
||||
"capital": 1,
|
||||
"gennum": 0,
|
||||
"tech": 120,
|
||||
"level": 2,
|
||||
"type": "che_유가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"gameEnvironment": {
|
||||
"lastNPCTroopLeaderID": 40
|
||||
},
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"turntime": "0200-01-01 00:00:00",
|
||||
"show_img_level": 3,
|
||||
"fiction": [0]
|
||||
},
|
||||
"observe": {}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
"action": "OpenNationBetting",
|
||||
"args": [1, 500],
|
||||
"setup": {
|
||||
"clearBetting": true,
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "위",
|
||||
"color": "#111111",
|
||||
"capital": 1,
|
||||
"gennum": 1,
|
||||
"gold": 1000,
|
||||
"rice": 2000,
|
||||
"tech": 100,
|
||||
"power": 100,
|
||||
"level": 2,
|
||||
"type": "che_유가"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "촉",
|
||||
"color": "#222222",
|
||||
"capital": 2,
|
||||
"gennum": 1,
|
||||
"gold": 3000,
|
||||
"rice": 4000,
|
||||
"tech": 200,
|
||||
"power": 300,
|
||||
"level": 2,
|
||||
"type": "che_병가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetCities": true,
|
||||
"city": [
|
||||
{ "id": 1, "values": { "nation": 1, "level": 3 } },
|
||||
{ "id": 2, "values": { "nation": 2, "level": 3 } }
|
||||
],
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"general": [
|
||||
{ "id": 1, "values": { "name": "장수1", "nation": 1, "city": 1, "owner": 1, "npc": 0 } },
|
||||
{ "id": 2, "values": { "name": "장수2", "nation": 2, "city": 2, "owner": 2, "npc": 0 } }
|
||||
],
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2],
|
||||
"cityIds": [1, 2],
|
||||
"nationIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
{
|
||||
"action": "PostUpdateMonthly",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 2,
|
||||
"startyear": 193,
|
||||
"seedYear": 193,
|
||||
"seedMonth": 1
|
||||
},
|
||||
"setup": {
|
||||
"world": {
|
||||
"hiddenSeed": "monthly-post-diplomacy-fixture"
|
||||
},
|
||||
"syncEnvironment": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2, 3, 4],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2, 3, 4],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑장",
|
||||
"nation": 1,
|
||||
"npc": 2,
|
||||
"crew": 0,
|
||||
"gold": 0,
|
||||
"rice": 0,
|
||||
"leadership": 10,
|
||||
"strength": 10,
|
||||
"intel": 10,
|
||||
"experience": 0,
|
||||
"dedication": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을장",
|
||||
"nation": 2,
|
||||
"npc": 2,
|
||||
"crew": 0,
|
||||
"gold": 0,
|
||||
"rice": 0,
|
||||
"leadership": 10,
|
||||
"strength": 10,
|
||||
"intel": 10,
|
||||
"experience": 0,
|
||||
"dedication": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"name": "병장",
|
||||
"nation": 3,
|
||||
"npc": 2,
|
||||
"crew": 0,
|
||||
"gold": 0,
|
||||
"rice": 0,
|
||||
"leadership": 10,
|
||||
"strength": 10,
|
||||
"intel": 10,
|
||||
"experience": 0,
|
||||
"dedication": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"values": {
|
||||
"name": "정장",
|
||||
"nation": 4,
|
||||
"npc": 2,
|
||||
"crew": 0,
|
||||
"gold": 0,
|
||||
"rice": 0,
|
||||
"leadership": 10,
|
||||
"strength": 10,
|
||||
"intel": 10,
|
||||
"experience": 0,
|
||||
"dedication": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑국",
|
||||
"gennum": 2,
|
||||
"level": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을국",
|
||||
"gennum": 1,
|
||||
"level": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"name": "병국",
|
||||
"gennum": 1,
|
||||
"level": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"values": {
|
||||
"name": "정국",
|
||||
"gennum": 1,
|
||||
"level": 1
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetDiplomacy": true,
|
||||
"diplomacy": [
|
||||
{
|
||||
"fromNationId": 1,
|
||||
"toNationId": 2,
|
||||
"state": 1,
|
||||
"term": 1,
|
||||
"dead": 777
|
||||
},
|
||||
{
|
||||
"fromNationId": 2,
|
||||
"toNationId": 1,
|
||||
"state": 1,
|
||||
"term": 1,
|
||||
"dead": 888
|
||||
},
|
||||
{
|
||||
"fromNationId": 1,
|
||||
"toNationId": 3,
|
||||
"state": 0,
|
||||
"term": 5,
|
||||
"dead": 250
|
||||
},
|
||||
{
|
||||
"fromNationId": 3,
|
||||
"toNationId": 1,
|
||||
"state": 0,
|
||||
"term": 5,
|
||||
"dead": 50
|
||||
},
|
||||
{
|
||||
"fromNationId": 3,
|
||||
"toNationId": 4,
|
||||
"state": 0,
|
||||
"term": 1,
|
||||
"dead": 0
|
||||
},
|
||||
{
|
||||
"fromNationId": 4,
|
||||
"toNationId": 3,
|
||||
"state": 0,
|
||||
"term": 1,
|
||||
"dead": 0
|
||||
},
|
||||
{
|
||||
"fromNationId": 2,
|
||||
"toNationId": 4,
|
||||
"state": 7,
|
||||
"term": 1,
|
||||
"dead": 999
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2, 3, 4],
|
||||
"nationIds": [1, 2, 3, 4]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
{
|
||||
"action": "PostUpdateMonthly",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 2,
|
||||
"startyear": 193,
|
||||
"seedYear": 193,
|
||||
"seedMonth": 1
|
||||
},
|
||||
"setup": {
|
||||
"world": {
|
||||
"hiddenSeed": "monthly-post-nation-stats-fixture"
|
||||
},
|
||||
"syncEnvironment": true,
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2],
|
||||
"resetDiplomacy": true,
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"npc": 0,
|
||||
"gold": 1000,
|
||||
"rice": 2000,
|
||||
"crew": 100,
|
||||
"leadership": 50,
|
||||
"strength": 40,
|
||||
"intel": 30,
|
||||
"experience": 100,
|
||||
"dedication": 200,
|
||||
"dex1": 1000,
|
||||
"dex2": 0,
|
||||
"dex3": 0,
|
||||
"dex4": 0,
|
||||
"dex5": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 2,
|
||||
"npc": 2,
|
||||
"gold": 3000,
|
||||
"rice": 4000,
|
||||
"crew": 200,
|
||||
"leadership": 60,
|
||||
"strength": 50,
|
||||
"intel": 40,
|
||||
"experience": 300,
|
||||
"dedication": 400,
|
||||
"dex1": 2000,
|
||||
"dex2": 1000,
|
||||
"dex3": 0,
|
||||
"dex4": 0,
|
||||
"dex5": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"rankData": [
|
||||
{"generalId": 1, "type": "killcrew_person", "value": 100},
|
||||
{"generalId": 1, "type": "deathcrew_person", "value": 0},
|
||||
{"generalId": 2, "type": "killcrew_person", "value": 0},
|
||||
{"generalId": 2, "type": "deathcrew_person", "value": 100}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑국",
|
||||
"gold": 10000,
|
||||
"rice": 20000,
|
||||
"tech": 100,
|
||||
"level": 2,
|
||||
"gennum": 9,
|
||||
"power": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을국",
|
||||
"gold": 2000,
|
||||
"rice": 3000,
|
||||
"tech": 50,
|
||||
"level": 1,
|
||||
"gennum": 8,
|
||||
"power": 8
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑성",
|
||||
"nation": 1,
|
||||
"level": 4,
|
||||
"supply": 1,
|
||||
"pop": 1000,
|
||||
"pop_max": 2000,
|
||||
"agri": 100,
|
||||
"agri_max": 200,
|
||||
"comm": 100,
|
||||
"comm_max": 200,
|
||||
"secu": 100,
|
||||
"secu_max": 200,
|
||||
"def": 100,
|
||||
"def_max": 200,
|
||||
"wall": 100,
|
||||
"wall_max": 200
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을성",
|
||||
"nation": 2,
|
||||
"level": 4,
|
||||
"supply": 1,
|
||||
"pop": 2000,
|
||||
"pop_max": 4000,
|
||||
"agri": 200,
|
||||
"agri_max": 400,
|
||||
"comm": 200,
|
||||
"comm_max": 400,
|
||||
"secu": 200,
|
||||
"secu_max": 400,
|
||||
"def": 200,
|
||||
"def_max": 400,
|
||||
"wall": 200,
|
||||
"wall_max": 400
|
||||
}
|
||||
}
|
||||
],
|
||||
"nationEnvironment": [
|
||||
{
|
||||
"nationId": 1,
|
||||
"key": "max_power",
|
||||
"value": {
|
||||
"maxPower": 999,
|
||||
"maxCrew": 50,
|
||||
"maxCities": ["옛도시", "옛도시2"]
|
||||
}
|
||||
},
|
||||
{"nationId": 1, "key": "available_war_setting_cnt", "value": 1}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2],
|
||||
"nationIds": [1, 2],
|
||||
"cityIds": [1, 2],
|
||||
"rankGeneralIds": [1, 2],
|
||||
"rankTypes": ["killcrew_person", "deathcrew_person"],
|
||||
"nationEnvironmentKeys": ["max_power", "available_war_setting_cnt"]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
{
|
||||
"action": "PostUpdateMonthly",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 2,
|
||||
"startyear": 193,
|
||||
"seedYear": 193,
|
||||
"seedMonth": 1
|
||||
},
|
||||
"setup": {
|
||||
"world": {
|
||||
"hiddenSeed": "monthly-post-tail-2"
|
||||
},
|
||||
"syncEnvironment": true,
|
||||
"clearNeutralAuctions": true,
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2],
|
||||
"resetDiplomacy": true,
|
||||
"gameEnvironment": {
|
||||
"tournament": 0,
|
||||
"tnmt_trig": true,
|
||||
"tnmt_pattern": [0, 1, 2, 3],
|
||||
"prev_winner": null
|
||||
},
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑장",
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"officer_level": 12,
|
||||
"npc": 0,
|
||||
"gold": 5000,
|
||||
"rice": 7000,
|
||||
"crew": 100,
|
||||
"leadership": 50,
|
||||
"strength": 40,
|
||||
"intel": 30,
|
||||
"experience": 100,
|
||||
"dedication": 200
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을장",
|
||||
"nation": 2,
|
||||
"city": 2,
|
||||
"officer_level": 12,
|
||||
"npc": 0,
|
||||
"gold": 6000,
|
||||
"rice": 8000,
|
||||
"crew": 200,
|
||||
"leadership": 60,
|
||||
"strength": 50,
|
||||
"intel": 40,
|
||||
"experience": 300,
|
||||
"dedication": 400
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑국",
|
||||
"capital": 1,
|
||||
"gold": 10000,
|
||||
"rice": 20000,
|
||||
"tech": 100,
|
||||
"level": 2,
|
||||
"gennum": 1,
|
||||
"power": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을국",
|
||||
"capital": 2,
|
||||
"gold": 2000,
|
||||
"rice": 3000,
|
||||
"tech": 50,
|
||||
"level": 1,
|
||||
"gennum": 1,
|
||||
"power": 8
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑성",
|
||||
"nation": 1,
|
||||
"level": 4,
|
||||
"supply": 1,
|
||||
"front": 3,
|
||||
"pop": 1000,
|
||||
"pop_max": 2000
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "을성",
|
||||
"nation": 2,
|
||||
"level": 4,
|
||||
"supply": 1,
|
||||
"front": 3,
|
||||
"pop": 2000,
|
||||
"pop_max": 4000
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2],
|
||||
"nationIds": [1, 2],
|
||||
"cityIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
{
|
||||
"action": "PostUpdateMonthly",
|
||||
"environment": {
|
||||
"year": 195,
|
||||
"month": 2,
|
||||
"startyear": 193,
|
||||
"seedYear": 195,
|
||||
"seedMonth": 1
|
||||
},
|
||||
"setup": {
|
||||
"world": {
|
||||
"hiddenSeed": "monthly-post-wander-fixture"
|
||||
},
|
||||
"syncEnvironment": true,
|
||||
"resetCities": true,
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "방랑성",
|
||||
"nation": 4,
|
||||
"level": 4,
|
||||
"front": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "존속성",
|
||||
"nation": 1,
|
||||
"level": 4,
|
||||
"front": 1
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2, 3],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "방랑주",
|
||||
"nation": 4,
|
||||
"city": 1,
|
||||
"officer_level": 12,
|
||||
"npc": 2,
|
||||
"gold": 2000,
|
||||
"rice": 3000,
|
||||
"crew": 100,
|
||||
"makelimit": 0,
|
||||
"belong": 7,
|
||||
"leadership": 50,
|
||||
"strength": 40,
|
||||
"intel": 30,
|
||||
"experience": 100,
|
||||
"dedication": 200
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "방랑객",
|
||||
"nation": 4,
|
||||
"city": 1,
|
||||
"officer_level": 1,
|
||||
"npc": 0,
|
||||
"gold": 1500,
|
||||
"rice": 4000,
|
||||
"crew": 200,
|
||||
"makelimit": 0,
|
||||
"belong": 5,
|
||||
"leadership": 60,
|
||||
"strength": 50,
|
||||
"intel": 40,
|
||||
"experience": 300,
|
||||
"dedication": 400
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"name": "존속장",
|
||||
"nation": 1,
|
||||
"city": 2,
|
||||
"officer_level": 12,
|
||||
"npc": 2,
|
||||
"gold": 500,
|
||||
"rice": 500,
|
||||
"crew": 50,
|
||||
"leadership": 50,
|
||||
"strength": 50,
|
||||
"intel": 50,
|
||||
"experience": 0,
|
||||
"dedication": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 4],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "존속국",
|
||||
"gennum": 1,
|
||||
"level": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"values": {
|
||||
"name": "방랑국",
|
||||
"gennum": 2,
|
||||
"level": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"resetDiplomacy": true,
|
||||
"diplomacy": [
|
||||
{
|
||||
"fromNationId": 1,
|
||||
"toNationId": 4,
|
||||
"state": 2,
|
||||
"term": 0,
|
||||
"dead": 0
|
||||
},
|
||||
{
|
||||
"fromNationId": 4,
|
||||
"toNationId": 1,
|
||||
"state": 2,
|
||||
"term": 0,
|
||||
"dead": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2, 3],
|
||||
"nationIds": [1, 4],
|
||||
"cityIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
"action": "PreUpdateMonthly",
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 12,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"syncEnvironment": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1, 2],
|
||||
"general": [
|
||||
{"id": 1, "values": {"makelimit": 2}},
|
||||
{"id": 2, "values": {"makelimit": 0}}
|
||||
],
|
||||
"generalAccessLog": [
|
||||
{"generalId": 1, "refreshScoreTotal": 101},
|
||||
{"generalId": 2, "refreshScoreTotal": 1}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"rate": 35,
|
||||
"rate_tmp": 10,
|
||||
"strategic_cmd_limit": 2,
|
||||
"surlimit": 1,
|
||||
"spy": "{\"1\":1,\"2\":2}"
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{"id": 1, "values": {"state": 31, "term": 1, "conflict": {"1": 10}}},
|
||||
{"id": 2, "values": {"state": 32, "term": 2, "conflict": {"1": 20}}},
|
||||
{"id": 3, "values": {"state": 33, "term": 0, "conflict": {"1": 30}}},
|
||||
{"id": 4, "values": {"state": 34, "term": 3, "conflict": {"1": 40}}},
|
||||
{"id": 5, "values": {"state": 41, "term": 1, "conflict": {"1": 50}}},
|
||||
{"id": 6, "values": {"state": 42, "term": 2, "conflict": {"1": 60}}},
|
||||
{"id": 7, "values": {"state": 43, "term": 3, "conflict": {"1": 70}}}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2],
|
||||
"nationIds": [1],
|
||||
"cityIds": [1, 2, 3, 4, 5, 6, 7],
|
||||
"accessGeneralIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
"action": "ProcessIncome",
|
||||
"args": ["gold"],
|
||||
"environment": {
|
||||
"year": 190,
|
||||
"month": 7,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"officer_level": 5,
|
||||
"npc": 0,
|
||||
"gold": 1000,
|
||||
"rice": 1000,
|
||||
"dedication": 100
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑국",
|
||||
"capital": 1,
|
||||
"gold": 10000,
|
||||
"rice": 20000,
|
||||
"level": 1,
|
||||
"rate": 35,
|
||||
"rate_tmp": 10
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "갑성",
|
||||
"nation": 1,
|
||||
"level": 4,
|
||||
"supply": 1,
|
||||
"pop": 10000,
|
||||
"pop_max": 20000,
|
||||
"agri": 1000,
|
||||
"agri_max": 2000,
|
||||
"comm": 1000,
|
||||
"comm_max": 2000,
|
||||
"secu": 1000,
|
||||
"secu_max": 2000,
|
||||
"trust": 80,
|
||||
"def": 500,
|
||||
"def_max": 1000,
|
||||
"wall": 500,
|
||||
"wall_max": 1000
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1],
|
||||
"nationIds": [1],
|
||||
"cityIds": [1],
|
||||
"nationEnvironmentKeys": ["prev_income_gold", "prev_income_rice"]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
{
|
||||
"action": "ProcessSemiAnnual",
|
||||
"resource": "gold",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "반기검증국",
|
||||
"gold": 100001,
|
||||
"rice": 7777,
|
||||
"rate_tmp": 20,
|
||||
"type": "che_도가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"supply": 1,
|
||||
"pop": 10000,
|
||||
"pop_max": 50000,
|
||||
"agri": 1001,
|
||||
"agri_max": 5000,
|
||||
"comm": 1001,
|
||||
"comm_max": 5000,
|
||||
"secu": 1001,
|
||||
"secu_max": 2000,
|
||||
"trust": 55,
|
||||
"def": 1001,
|
||||
"def_max": 5000,
|
||||
"wall": 1001,
|
||||
"wall_max": 5000,
|
||||
"dead": 123
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"supply": 0,
|
||||
"pop": 10000,
|
||||
"pop_max": 50000,
|
||||
"agri": 1001,
|
||||
"agri_max": 5000,
|
||||
"comm": 1001,
|
||||
"comm_max": 5000,
|
||||
"secu": 1001,
|
||||
"secu_max": 2000,
|
||||
"trust": 55,
|
||||
"def": 1001,
|
||||
"def_max": 5000,
|
||||
"wall": 1001,
|
||||
"wall_max": 5000,
|
||||
"dead": 123
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"nation": 0,
|
||||
"supply": 1,
|
||||
"pop": 10000,
|
||||
"pop_max": 50000,
|
||||
"agri": 1001,
|
||||
"agri_max": 5000,
|
||||
"comm": 1001,
|
||||
"comm_max": 5000,
|
||||
"secu": 1001,
|
||||
"secu_max": 2000,
|
||||
"trust": 55,
|
||||
"def": 1001,
|
||||
"def_max": 5000,
|
||||
"wall": 1001,
|
||||
"wall_max": 5000,
|
||||
"dead": 123
|
||||
}
|
||||
}
|
||||
],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"gold": 10001,
|
||||
"rice": 8888
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1],
|
||||
"cityIds": [1, 2, 3],
|
||||
"nationIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
"action": "ProcessSemiAnnual",
|
||||
"resource": "gold",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "반기검증국",
|
||||
"gold": 100001,
|
||||
"rice": 7777,
|
||||
"rate": 50,
|
||||
"rate_tmp": 20,
|
||||
"type": "che_중립"
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"supply": 1,
|
||||
"pop": 10000,
|
||||
"pop_max": 50000,
|
||||
"agri": 1001,
|
||||
"agri_max": 5000,
|
||||
"comm": 1001,
|
||||
"comm_max": 5000,
|
||||
"secu": 1001,
|
||||
"secu_max": 2000,
|
||||
"trust": 55,
|
||||
"def": 1001,
|
||||
"def_max": 5000,
|
||||
"wall": 1001,
|
||||
"wall_max": 5000,
|
||||
"dead": 123
|
||||
}
|
||||
}
|
||||
],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"gold": 10001,
|
||||
"rice": 8888
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1],
|
||||
"cityIds": [1],
|
||||
"nationIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
{
|
||||
"action": "ProcessWarIncome",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "전쟁수입국",
|
||||
"gold": 1000,
|
||||
"level": 1,
|
||||
"type": "che_중립"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"name": "비활성국",
|
||||
"gold": 2000,
|
||||
"level": 0,
|
||||
"type": "che_중립"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"name": "법가국",
|
||||
"gold": 3000,
|
||||
"level": 1,
|
||||
"type": "che_법가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"supply": 1,
|
||||
"pop": 1000,
|
||||
"pop_max": 2000,
|
||||
"dead": 101
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"supply": 0,
|
||||
"pop": 1000,
|
||||
"pop_max": 2000,
|
||||
"dead": 999
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"nation": 2,
|
||||
"supply": 1,
|
||||
"pop": 1000,
|
||||
"pop_max": 2000,
|
||||
"dead": 1000
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"values": {
|
||||
"nation": 3,
|
||||
"supply": 1,
|
||||
"pop": 1000,
|
||||
"pop_max": 2000,
|
||||
"dead": 105
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"values": {
|
||||
"nation": 0,
|
||||
"supply": 1,
|
||||
"pop": 999,
|
||||
"pop_max": 1000,
|
||||
"dead": 10
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"cityIds": [1, 2, 3, 4, 5],
|
||||
"nationIds": [1, 2, 3]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
{
|
||||
"action": "RaiseInvader",
|
||||
"compactOutput": true,
|
||||
"args": [10, 150, 100, 20],
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"deleteOtherGenerals": true,
|
||||
"keepGeneralIds": [1],
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"level": 3,
|
||||
"nation": 1,
|
||||
"pop": 1000,
|
||||
"pop_max": 10000,
|
||||
"agri": 2000,
|
||||
"agri_max": 20000,
|
||||
"comm": 3000,
|
||||
"comm_max": 30000,
|
||||
"secu": 4000,
|
||||
"secu_max": 40000,
|
||||
"def": 5000,
|
||||
"def_max": 50000,
|
||||
"wall": 6000,
|
||||
"wall_max": 60000
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 48,
|
||||
"values": {
|
||||
"level": 4,
|
||||
"nation": 0,
|
||||
"pop": 1000,
|
||||
"pop_max": 10000,
|
||||
"agri": 2000,
|
||||
"agri_max": 20000,
|
||||
"comm": 3000,
|
||||
"comm_max": 30000,
|
||||
"secu": 4000,
|
||||
"secu_max": 40000,
|
||||
"def": 5000,
|
||||
"def_max": 50000,
|
||||
"wall": 6000,
|
||||
"wall_max": 60000
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "기준국",
|
||||
"capital": 1,
|
||||
"gennum": 1,
|
||||
"tech": 100,
|
||||
"level": 2,
|
||||
"type": "che_유가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "군주",
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"officer_level": 12,
|
||||
"npc": 0,
|
||||
"leadership": 50,
|
||||
"strength": 50,
|
||||
"intel": 50,
|
||||
"experience": 1000,
|
||||
"dedication": 1000,
|
||||
"dex1": 10,
|
||||
"dex2": 20,
|
||||
"dex3": 30,
|
||||
"dex4": 40,
|
||||
"dex5": 50,
|
||||
"turntime": "0200-01-01 00:05:00"
|
||||
}
|
||||
}
|
||||
],
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"turntime": "0200-01-01 00:00:00",
|
||||
"show_img_level": 3,
|
||||
"fiction": [0]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1],
|
||||
"cityIds": [1, 48],
|
||||
"nationIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
{
|
||||
"action": "RaiseNPCNation",
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"resetNations": true,
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "점유도시",
|
||||
"level": 5,
|
||||
"nation": 1,
|
||||
"pop": 10001,
|
||||
"pop_max": 50001,
|
||||
"agri": 1001,
|
||||
"agri_max": 5001,
|
||||
"comm": 2001,
|
||||
"comm_max": 6001,
|
||||
"secu": 3001,
|
||||
"secu_max": 7001,
|
||||
"def": 4001,
|
||||
"def_max": 8001,
|
||||
"wall": 5001,
|
||||
"wall_max": 9001
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 48,
|
||||
"values": {
|
||||
"name": "건국도시",
|
||||
"level": 5,
|
||||
"nation": 0,
|
||||
"pop": 10048,
|
||||
"pop_max": 50048,
|
||||
"agri": 1048,
|
||||
"agri_max": 5048,
|
||||
"comm": 2048,
|
||||
"comm_max": 6048,
|
||||
"secu": 3048,
|
||||
"secu_max": 7048,
|
||||
"def": 4048,
|
||||
"def_max": 8048,
|
||||
"wall": 5048,
|
||||
"wall_max": 9048
|
||||
}
|
||||
}
|
||||
],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "기준국",
|
||||
"capital": 1,
|
||||
"gennum": 1,
|
||||
"tech": 120,
|
||||
"level": 2,
|
||||
"type": "che_유가"
|
||||
}
|
||||
}
|
||||
],
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"turntime": "0200-01-01 00:00:00",
|
||||
"show_img_level": 3,
|
||||
"fiction": [0]
|
||||
},
|
||||
"observe": {
|
||||
"cityIds": [1, 48],
|
||||
"nationIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"action": "RegNeutralNPC",
|
||||
"args": [
|
||||
0,
|
||||
"등록재야",
|
||||
null,
|
||||
0,
|
||||
33,
|
||||
45,
|
||||
55,
|
||||
65,
|
||||
180,
|
||||
245,
|
||||
null,
|
||||
"무쌍",
|
||||
""
|
||||
],
|
||||
"setup": {
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"turntime": "0200-01-01 00:00:00",
|
||||
"show_img_level": 3,
|
||||
"fiction": [0]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [],
|
||||
"cityIds": [33],
|
||||
"nationIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"action": "RegNPC",
|
||||
"args": [
|
||||
0,
|
||||
"등록장수",
|
||||
null,
|
||||
0,
|
||||
33,
|
||||
60,
|
||||
50,
|
||||
40,
|
||||
7,
|
||||
186,
|
||||
240,
|
||||
null,
|
||||
"인덕",
|
||||
"등록 대사"
|
||||
],
|
||||
"setup": {
|
||||
"syncEnvironment": true
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190,
|
||||
"turnterm": 10,
|
||||
"turntime": "0200-01-01 00:00:00",
|
||||
"show_img_level": 3,
|
||||
"fiction": [0]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [],
|
||||
"cityIds": [33],
|
||||
"nationIds": [1]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"action": "UnblockScoutAction",
|
||||
"args": [false],
|
||||
"setup": {
|
||||
"resetNations": true,
|
||||
"deleteOtherNations": true,
|
||||
"keepNationIds": [1, 2],
|
||||
"nation": [
|
||||
{ "id": 1, "values": { "name": "위", "level": 2, "scout": 1 } },
|
||||
{ "id": 2, "values": { "name": "촉", "level": 2, "scout": 1 } }
|
||||
],
|
||||
"gameEnvironment": {
|
||||
"block_change_scout": true
|
||||
}
|
||||
},
|
||||
"environment": {
|
||||
"year": 200,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"observe": {
|
||||
"nationIds": [1, 2]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
{
|
||||
"action": "UpdateCitySupply",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 1,
|
||||
"startyear": 190
|
||||
},
|
||||
"setup": {
|
||||
"nation": [
|
||||
{
|
||||
"id": 99,
|
||||
"values": {
|
||||
"name": "보급검증국",
|
||||
"color": "#777777",
|
||||
"capital": 1,
|
||||
"level": 1,
|
||||
"type": "che_중립"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 98,
|
||||
"values": {
|
||||
"name": "불일치수도국",
|
||||
"color": "#888888",
|
||||
"capital": 2,
|
||||
"level": 1,
|
||||
"type": "che_중립"
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 99,
|
||||
"supply": 0,
|
||||
"front": 2,
|
||||
"pop": 1001,
|
||||
"agri": 501,
|
||||
"comm": 499,
|
||||
"secu": 99,
|
||||
"trust": 50,
|
||||
"def": 101,
|
||||
"wall": 50,
|
||||
"officer_set": 7,
|
||||
"term": 2,
|
||||
"conflict": {"98": 3}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"values": {
|
||||
"nation": 99,
|
||||
"supply": 0,
|
||||
"front": 2,
|
||||
"pop": 1001,
|
||||
"agri": 501,
|
||||
"comm": 499,
|
||||
"secu": 99,
|
||||
"trust": 50,
|
||||
"def": 101,
|
||||
"wall": 50,
|
||||
"officer_set": 7,
|
||||
"term": 2,
|
||||
"conflict": {"98": 3}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 99,
|
||||
"supply": 1,
|
||||
"front": 2,
|
||||
"pop": 1001,
|
||||
"agri": 501,
|
||||
"comm": 499,
|
||||
"secu": 99,
|
||||
"trust": 33,
|
||||
"def": 101,
|
||||
"wall": 50,
|
||||
"officer_set": 7,
|
||||
"term": 2,
|
||||
"conflict": {"98": 3}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"nation": 0,
|
||||
"supply": 0,
|
||||
"front": 0,
|
||||
"trust": 50
|
||||
}
|
||||
}
|
||||
],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 99,
|
||||
"city": 2,
|
||||
"officer_level": 4,
|
||||
"officer_city": 2,
|
||||
"crew": 101,
|
||||
"train": 51,
|
||||
"atmos": 99
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 99,
|
||||
"city": 1,
|
||||
"officer_level": 4,
|
||||
"officer_city": 2,
|
||||
"crew": 101,
|
||||
"train": 51,
|
||||
"atmos": 99
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"values": {
|
||||
"nation": 98,
|
||||
"city": 2,
|
||||
"officer_level": 3,
|
||||
"officer_city": 1,
|
||||
"crew": 101,
|
||||
"train": 51,
|
||||
"atmos": 99
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1, 2, 3],
|
||||
"cityIds": [1, 2, 3, 9],
|
||||
"nationIds": [98, 99]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
{
|
||||
"action": "UpdateNationLevel",
|
||||
"environment": {
|
||||
"year": 193,
|
||||
"month": 2,
|
||||
"startyear": 190,
|
||||
"killturn": 1000,
|
||||
"turnterm": 10
|
||||
},
|
||||
"setup": {
|
||||
"resetCities": true,
|
||||
"resetGenerals": true,
|
||||
"resetUniqueOccupancy": true,
|
||||
"syncEnvironment": true,
|
||||
"clearNationTurnIds": [1],
|
||||
"clearInheritanceOwnerIds": [990061],
|
||||
"nation": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "작위검증국",
|
||||
"color": "#777777",
|
||||
"capital": 1,
|
||||
"gold": 10000,
|
||||
"rice": 20000,
|
||||
"level": 0,
|
||||
"type": "che_중립",
|
||||
"aux": {}
|
||||
}
|
||||
}
|
||||
],
|
||||
"city": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"level": 4
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 1,
|
||||
"level": 4
|
||||
}
|
||||
}
|
||||
],
|
||||
"general": [
|
||||
{
|
||||
"id": 1,
|
||||
"values": {
|
||||
"name": "조조",
|
||||
"nation": 1,
|
||||
"city": 1,
|
||||
"officer_level": 12,
|
||||
"owner": 990061,
|
||||
"npc": 0,
|
||||
"killturn": 1000,
|
||||
"belong": 10,
|
||||
"horse": "None",
|
||||
"weapon": "None",
|
||||
"book": "None",
|
||||
"item": "None",
|
||||
"aux": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"values": {
|
||||
"nation": 0,
|
||||
"city": 2,
|
||||
"officer_level": 1,
|
||||
"npc": 0,
|
||||
"killturn": 0
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"observe": {
|
||||
"generalIds": [1],
|
||||
"cityIds": [1, 2],
|
||||
"nationIds": [1],
|
||||
"ownerIds": [990061]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace sammo;
|
||||
|
||||
if (PHP_SAPI !== 'cli') {
|
||||
http_response_code(404);
|
||||
exit;
|
||||
}
|
||||
|
||||
chdir(dirname(__DIR__));
|
||||
require_once 'lib.php';
|
||||
require_once 'func.php';
|
||||
|
||||
$input = stream_get_contents(STDIN);
|
||||
$keys = Json::decode($input);
|
||||
if (!is_array($keys)) {
|
||||
fwrite(STDERR, "Expected a JSON array of item keys.\n");
|
||||
exit(2);
|
||||
}
|
||||
|
||||
$result = [];
|
||||
foreach ($keys as $key) {
|
||||
if (!is_string($key)) {
|
||||
continue;
|
||||
}
|
||||
$item = buildItemClass($key);
|
||||
$result[$key] = [
|
||||
'rawName' => $item->getRawName(),
|
||||
'name' => $item->getName(),
|
||||
'info' => $item->getInfo(),
|
||||
'cost' => $item->getCost(),
|
||||
'buyable' => $item->isBuyable(),
|
||||
'consumable' => $item->isConsumable(),
|
||||
'reqSecu' => $item->getReqSecu(),
|
||||
];
|
||||
}
|
||||
|
||||
echo Json::encode($result);
|
||||
@@ -0,0 +1,1579 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace sammo;
|
||||
|
||||
if (PHP_SAPI !== 'cli' || getenv('TURN_DIFFERENTIAL_ENABLED') !== '1') {
|
||||
http_response_code(404);
|
||||
exit;
|
||||
}
|
||||
|
||||
chdir(dirname(__DIR__));
|
||||
$_SERVER['REMOTE_ADDR'] ??= '127.0.0.1';
|
||||
error_reporting(E_ALL & ~E_DEPRECATED);
|
||||
require_once 'lib.php';
|
||||
require_once 'func.php';
|
||||
require_once __DIR__ . '/turn_state_snapshot.php';
|
||||
|
||||
/** @param array<string, mixed> $values */
|
||||
function comparisonMonthlyPatch(string $table, int $id, array $values): void
|
||||
{
|
||||
$definitions = [
|
||||
'city' => [
|
||||
'idColumn' => 'city',
|
||||
'allowed' => [
|
||||
'name', 'level', 'nation', 'supply', 'front', 'pop', 'pop_max',
|
||||
'agri', 'agri_max', 'comm', 'comm_max', 'secu', 'secu_max',
|
||||
'trust', 'trade', 'def', 'def_max', 'wall', 'wall_max',
|
||||
'officer_set', 'state', 'region', 'term', 'conflict', 'dead',
|
||||
],
|
||||
],
|
||||
'nation' => [
|
||||
'idColumn' => 'nation',
|
||||
'allowed' => [
|
||||
'name', 'color', 'capital', 'gennum', 'gold', 'rice', 'tech',
|
||||
'power', 'level', 'type', 'bill', 'rate_tmp', 'scout', 'chief_set', 'aux',
|
||||
'rate', 'strategic_cmd_limit', 'surlimit', 'spy',
|
||||
],
|
||||
],
|
||||
'general' => [
|
||||
'idColumn' => 'no',
|
||||
'allowed' => [
|
||||
'name', 'nation', 'city', 'officer_level', 'officer_city',
|
||||
'crew', 'train', 'atmos', 'owner', 'npc', 'killturn', 'belong',
|
||||
'gold', 'rice', 'horse', 'weapon', 'book', 'item', 'aux',
|
||||
'leadership', 'strength', 'intel', 'experience', 'dedication',
|
||||
'injury',
|
||||
'dex1', 'dex2', 'dex3', 'dex4', 'dex5', 'personal', 'special',
|
||||
'specage', 'special2', 'specage2', 'betray', 'age',
|
||||
'bornyear', 'deadyear', 'turntime', 'makelimit',
|
||||
],
|
||||
],
|
||||
];
|
||||
$definition = $definitions[$table] ?? null;
|
||||
if ($definition === null) {
|
||||
throw new \InvalidArgumentException("unsupported setup table: {$table}");
|
||||
}
|
||||
$patch = [];
|
||||
foreach ($values as $key => $value) {
|
||||
if (!is_string($key) || !in_array($key, $definition['allowed'], true)) {
|
||||
throw new \InvalidArgumentException("unsupported {$table} setup field");
|
||||
}
|
||||
if (in_array($key, ['conflict', 'aux'], true) && is_array($value)) {
|
||||
$value = json_encode($value, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
|
||||
}
|
||||
$patch[$key] = $value;
|
||||
}
|
||||
if ($table === 'nation') {
|
||||
$patch += [
|
||||
'nation' => $id,
|
||||
'name' => "fixture-nation-{$id}",
|
||||
'color' => '#777777',
|
||||
'capital' => 0,
|
||||
'gold' => 0,
|
||||
'rice' => 0,
|
||||
'level' => 1,
|
||||
'type' => 'che_중립',
|
||||
'aux' => '{}',
|
||||
];
|
||||
DB::db()->insertUpdate('nation', $patch, $patch);
|
||||
} elseif ($patch !== []) {
|
||||
DB::db()->update($table, $patch, "`{$definition['idColumn']}` = %i", $id);
|
||||
}
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $observe */
|
||||
function comparisonMonthlyDetails(array $observe, int $worldHistoryAfterId): array
|
||||
{
|
||||
$db = DB::db();
|
||||
$generals = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'no',
|
||||
'nationId' => 'nation',
|
||||
'cityId' => 'city',
|
||||
'officerLevel' => 'officer_level',
|
||||
'officerCityId' => 'officer_city',
|
||||
'crew' => 'crew',
|
||||
'train' => 'train',
|
||||
'atmos' => 'atmos',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'injury' => 'injury',
|
||||
'leadership' => 'leadership',
|
||||
'strength' => 'strength',
|
||||
'intelligence' => 'intel',
|
||||
'age' => 'age',
|
||||
'specialDomestic' => 'special',
|
||||
'specAge' => 'specage',
|
||||
'specialWar' => 'special2',
|
||||
'specAge2' => 'specage2',
|
||||
'betray' => 'betray',
|
||||
'makeLimit' => 'makelimit',
|
||||
'horse' => 'horse',
|
||||
'weapon' => 'weapon',
|
||||
'book' => 'book',
|
||||
'item' => 'item',
|
||||
'dex1' => 'dex1',
|
||||
'dex2' => 'dex2',
|
||||
'dex3' => 'dex3',
|
||||
'dex4' => 'dex4',
|
||||
'dex5' => 'dex5',
|
||||
'aux' => 'aux',
|
||||
],
|
||||
['aux'],
|
||||
),
|
||||
comparisonRowsById('general', 'no', comparisonIntegerList($observe['generalIds'] ?? [], 'generalIds')),
|
||||
);
|
||||
$cities = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'city',
|
||||
'nationId' => 'nation',
|
||||
'state' => 'state',
|
||||
'supplyState' => 'supply',
|
||||
'frontState' => 'front',
|
||||
'officerSet' => 'officer_set',
|
||||
'term' => 'term',
|
||||
'dead' => 'dead',
|
||||
'population' => 'pop',
|
||||
'populationMax' => 'pop_max',
|
||||
'agriculture' => 'agri',
|
||||
'agricultureMax' => 'agri_max',
|
||||
'commerce' => 'comm',
|
||||
'commerceMax' => 'comm_max',
|
||||
'security' => 'secu',
|
||||
'securityMax' => 'secu_max',
|
||||
'trust' => 'trust',
|
||||
'trade' => 'trade',
|
||||
'defence' => 'def',
|
||||
'defenceMax' => 'def_max',
|
||||
'wall' => 'wall',
|
||||
'wallMax' => 'wall_max',
|
||||
'conflict' => 'conflict',
|
||||
],
|
||||
['conflict'],
|
||||
),
|
||||
comparisonRowsById('city', 'city', comparisonIntegerList($observe['cityIds'] ?? [], 'cityIds')),
|
||||
);
|
||||
$nations = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'nation',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'rate' => 'rate_tmp',
|
||||
'baseRate' => 'rate',
|
||||
'power' => 'power',
|
||||
'generalCount' => 'gennum',
|
||||
'tech' => 'tech',
|
||||
'typeCode' => 'type',
|
||||
'scout' => 'scout',
|
||||
'strategicCommandLimit' => 'strategic_cmd_limit',
|
||||
'surrenderLimit' => 'surlimit',
|
||||
'spy' => 'spy',
|
||||
'chiefSet' => 'chief_set',
|
||||
],
|
||||
['spy'],
|
||||
),
|
||||
comparisonRowsById('nation', 'nation', comparisonIntegerList($observe['nationIds'] ?? [], 'nationIds')),
|
||||
);
|
||||
$worldHistory = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'id',
|
||||
'nationId' => 'nation_id',
|
||||
'year' => 'year',
|
||||
'month' => 'month',
|
||||
'text' => 'text',
|
||||
],
|
||||
),
|
||||
$db->query(
|
||||
'SELECT id, nation_id, year, month, text FROM world_history WHERE id > %i ORDER BY id',
|
||||
$worldHistoryAfterId,
|
||||
),
|
||||
);
|
||||
$inheritanceKeys = $observe['inheritanceKeys'] ?? ['unifier'];
|
||||
if (!is_array($inheritanceKeys) || array_filter($inheritanceKeys, static fn($key): bool => !is_string($key))) {
|
||||
throw new \InvalidArgumentException('inheritanceKeys must be an array of strings');
|
||||
}
|
||||
$inheritancePoints = [];
|
||||
foreach (comparisonIntegerList($observe['ownerIds'] ?? [], 'ownerIds') as $ownerId) {
|
||||
$entry = ['ownerId' => $ownerId];
|
||||
foreach ($inheritanceKeys as $key) {
|
||||
$value = $db->queryFirstField(
|
||||
'SELECT value FROM storage WHERE namespace = %s AND `key` = %s',
|
||||
"inheritance_{$ownerId}",
|
||||
$key,
|
||||
);
|
||||
$entry[$key] = $value === null ? 0 : (comparisonJsonValue($value)[0] ?? 0);
|
||||
}
|
||||
$inheritancePoints[] = $entry;
|
||||
}
|
||||
$rankGeneralIds = comparisonIntegerList($observe['rankGeneralIds'] ?? [], 'rankGeneralIds');
|
||||
$rankTypes = $observe['rankTypes'] ?? [];
|
||||
if (!is_array($rankTypes) || array_filter($rankTypes, static fn($type): bool => !is_string($type))) {
|
||||
throw new \InvalidArgumentException('rankTypes must be an array of strings');
|
||||
}
|
||||
$rankData = (!$rankGeneralIds || !$rankTypes)
|
||||
? []
|
||||
: iterator_to_array($db->query(
|
||||
'SELECT general_id AS generalId, nation_id AS nationId, `type`, `value` FROM rank_data WHERE general_id IN %li AND `type` IN %ls ORDER BY general_id, `type`',
|
||||
$rankGeneralIds,
|
||||
$rankTypes,
|
||||
));
|
||||
$generalAccessLogs = [];
|
||||
$accessGeneralIds = comparisonIntegerList($observe['accessGeneralIds'] ?? [], 'accessGeneralIds');
|
||||
if ($accessGeneralIds) {
|
||||
$generalAccessLogs = iterator_to_array($db->query(
|
||||
'SELECT general_id AS generalId, refresh_score_total AS refreshScoreTotal FROM general_access_log WHERE general_id IN %li ORDER BY general_id',
|
||||
$accessGeneralIds,
|
||||
));
|
||||
}
|
||||
$nationEnvironment = [];
|
||||
$nationEnvironmentKeys = $observe['nationEnvironmentKeys'] ?? [];
|
||||
if (
|
||||
!is_array($nationEnvironmentKeys)
|
||||
|| array_filter($nationEnvironmentKeys, static fn($key): bool => !is_string($key))
|
||||
) {
|
||||
throw new \InvalidArgumentException('nationEnvironmentKeys must be an array of strings');
|
||||
}
|
||||
foreach (comparisonIntegerList($observe['nationIds'] ?? [], 'nationIds') as $nationId) {
|
||||
$entry = ['nationId' => $nationId];
|
||||
$storage = KVStorage::getStorage($db, $nationId, 'nation_env');
|
||||
foreach ($nationEnvironmentKeys as $key) {
|
||||
$entry[$key] = $storage->getValue($key);
|
||||
}
|
||||
$nationEnvironment[] = $entry;
|
||||
}
|
||||
return [
|
||||
'generals' => $generals,
|
||||
'cities' => $cities,
|
||||
'nations' => $nations,
|
||||
'worldHistory' => $worldHistory,
|
||||
'inheritancePoints' => $inheritancePoints,
|
||||
'rankData' => $rankData,
|
||||
'generalAccessLogs' => $generalAccessLogs,
|
||||
'nationEnvironment' => $nationEnvironment,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Exercise the dynamically-created invader events against one evolving database.
|
||||
*
|
||||
* @param array<string, mixed> $request
|
||||
* @param array<string, mixed> $environment
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
function comparisonInvaderLifecycleTrace(
|
||||
array $request,
|
||||
array $environment,
|
||||
int $generalIdBeforeAction,
|
||||
int $nationIdBeforeAction,
|
||||
int $eventIdBeforeAction,
|
||||
int $worldHistoryIdBeforeAction,
|
||||
): array {
|
||||
$db = DB::db();
|
||||
$args = $request['args'] ?? [];
|
||||
if (!is_array($args) || count($args) > 4) {
|
||||
throw new \InvalidArgumentException('InvaderLifecycle args must have at most four entries');
|
||||
}
|
||||
$year = $environment['year'];
|
||||
$month = $environment['month'];
|
||||
$startYear = $environment['startyear'];
|
||||
$raiseEnvironment = [
|
||||
'year' => $year,
|
||||
'month' => $month,
|
||||
'startyear' => $startYear,
|
||||
'turnterm' => $environment['turnterm'],
|
||||
'turntime' => $environment['turntime'],
|
||||
'show_img_level' => $environment['show_img_level'] ?? 3,
|
||||
'stored_icons' => $environment['stored_icons'] ?? [],
|
||||
'icon_path' => $environment['icon_path'] ?? '.',
|
||||
'fiction' => $environment['fiction'] ?? [0],
|
||||
];
|
||||
|
||||
(new \sammo\Event\Action\RaiseInvader(...$args))->run($raiseEnvironment);
|
||||
|
||||
$invaderNationIds = array_map(
|
||||
'intval',
|
||||
$db->queryFirstColumn('SELECT nation FROM nation WHERE nation > %i ORDER BY nation', $nationIdBeforeAction),
|
||||
);
|
||||
$existingNationId = (int)$db->queryFirstField(
|
||||
'SELECT nation FROM nation WHERE nation <= %i ORDER BY nation LIMIT 1',
|
||||
$nationIdBeforeAction,
|
||||
);
|
||||
$rulerIds = array_map(
|
||||
'intval',
|
||||
$db->queryFirstColumn(
|
||||
'SELECT no FROM general WHERE nation IN %li AND officer_level = 12 ORDER BY nation',
|
||||
$invaderNationIds,
|
||||
),
|
||||
);
|
||||
if ($invaderNationIds === [] || $existingNationId <= 0 || count($rulerIds) !== count($invaderNationIds)) {
|
||||
throw new \RuntimeException('InvaderLifecycle failed to create the expected entities');
|
||||
}
|
||||
|
||||
$autoDeleteEvents = [];
|
||||
$endingEventId = 0;
|
||||
foreach ($db->query('SELECT id, action FROM event WHERE id > %i ORDER BY id', $eventIdBeforeAction) as $row) {
|
||||
$action = comparisonJsonValue($row['action']);
|
||||
$actionName = $action[0][0] ?? null;
|
||||
if ($actionName === 'AutoDeleteInvader') {
|
||||
$autoDeleteEvents[] = [
|
||||
'eventId' => (int)$row['id'],
|
||||
'nationId' => (int)($action[0][1] ?? 0),
|
||||
];
|
||||
} elseif ($actionName === 'InvaderEnding') {
|
||||
$endingEventId = (int)$row['id'];
|
||||
}
|
||||
}
|
||||
if (count($autoDeleteEvents) !== count($invaderNationIds) || $endingEventId <= 0) {
|
||||
throw new \RuntimeException('InvaderLifecycle failed to create follow-up events');
|
||||
}
|
||||
|
||||
$diplomacyRows = iterator_to_array($db->query(
|
||||
'SELECT me, you, state, term FROM diplomacy WHERE (me IN %li AND you = %i) OR (me = %i AND you IN %li) ORDER BY me, you',
|
||||
$invaderNationIds,
|
||||
$existingNationId,
|
||||
$existingNationId,
|
||||
$invaderNationIds,
|
||||
));
|
||||
$diplomacyStates = array_values(array_unique(array_map(
|
||||
static fn(array $row): string => "{$row['state']}:{$row['term']}",
|
||||
$diplomacyRows,
|
||||
)));
|
||||
sort($diplomacyStates);
|
||||
$generalCounts = array_map(
|
||||
static fn(int $nationId): int => (int)DB::db()->queryFirstField(
|
||||
'SELECT count(*) FROM general WHERE nation = %i',
|
||||
$nationId,
|
||||
),
|
||||
$invaderNationIds,
|
||||
);
|
||||
$diplomacyCounts = array_map(
|
||||
static fn(int $nationId): int => (int)DB::db()->queryFirstField(
|
||||
'SELECT count(*) FROM diplomacy WHERE (me = %i AND you = %i) OR (me = %i AND you = %i)',
|
||||
$nationId,
|
||||
$existingNationId,
|
||||
$existingNationId,
|
||||
$nationId,
|
||||
),
|
||||
$invaderNationIds,
|
||||
);
|
||||
$gameStorage = KVStorage::getStorage($db, 'game_env');
|
||||
$afterRaise = [
|
||||
'createdNationCount' => count($invaderNationIds),
|
||||
'createdGeneralCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM general WHERE no > %i',
|
||||
$generalIdBeforeAction,
|
||||
),
|
||||
'followUpEventCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM event WHERE id > %i',
|
||||
$eventIdBeforeAction,
|
||||
),
|
||||
'generalCountsPerNation' => array_values(array_unique($generalCounts)),
|
||||
'diplomacyCountsPerNation' => array_values(array_unique($diplomacyCounts)),
|
||||
'diplomacyStates' => $diplomacyStates,
|
||||
'isunited' => (int)$gameStorage->isunited,
|
||||
'blockChangeScout' => (bool)$gameStorage->block_change_scout,
|
||||
];
|
||||
|
||||
$warResults = [];
|
||||
foreach ($autoDeleteEvents as $autoDeleteEvent) {
|
||||
$warResult = (new \sammo\Event\Action\AutoDeleteInvader($autoDeleteEvent['nationId']))->run([
|
||||
'year' => $year,
|
||||
'month' => $month + 1,
|
||||
'startyear' => $startYear,
|
||||
'currentEventID' => $autoDeleteEvent['eventId'],
|
||||
]);
|
||||
$warResults[] = $warResult[1] ?? null;
|
||||
}
|
||||
$atWar = [
|
||||
'results' => array_values(array_unique($warResults)),
|
||||
'autoDeleteEventCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM event WHERE id IN %li',
|
||||
array_column($autoDeleteEvents, 'eventId'),
|
||||
),
|
||||
];
|
||||
|
||||
$db->update(
|
||||
'diplomacy',
|
||||
['state' => 2, 'term' => 0],
|
||||
'me IN %li OR you IN %li',
|
||||
$invaderNationIds,
|
||||
$invaderNationIds,
|
||||
);
|
||||
$peaceResults = [];
|
||||
foreach ($autoDeleteEvents as $autoDeleteEvent) {
|
||||
$peaceResult = (new \sammo\Event\Action\AutoDeleteInvader($autoDeleteEvent['nationId']))->run([
|
||||
'year' => $year,
|
||||
'month' => $month + 2,
|
||||
'startyear' => $startYear,
|
||||
'currentEventID' => $autoDeleteEvent['eventId'],
|
||||
]);
|
||||
$peaceResults[] = $peaceResult[1] ?? null;
|
||||
}
|
||||
$atPeace = [
|
||||
'results' => array_values(array_unique($peaceResults)),
|
||||
'autoDeleteEventCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM event WHERE id IN %li',
|
||||
array_column($autoDeleteEvents, 'eventId'),
|
||||
),
|
||||
'rulerWanderTurnCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM general_turn WHERE general_id IN %li AND action = %s',
|
||||
$rulerIds,
|
||||
'che_방랑',
|
||||
),
|
||||
'endingEventPresent' => (bool)$db->queryFirstField(
|
||||
'SELECT count(*) FROM event WHERE id = %i',
|
||||
$endingEventId,
|
||||
),
|
||||
];
|
||||
|
||||
$invaderGeneralIds = array_map('intval', $db->queryFirstColumn(
|
||||
'SELECT no FROM general WHERE nation IN %li',
|
||||
$invaderNationIds,
|
||||
));
|
||||
if ($invaderGeneralIds !== []) {
|
||||
$db->delete('general_turn', 'general_id IN %li', $invaderGeneralIds);
|
||||
$db->delete('rank_data', 'general_id IN %li', $invaderGeneralIds);
|
||||
$db->delete('troop', 'nation IN %li', $invaderNationIds);
|
||||
$db->delete('general', 'no IN %li', $invaderGeneralIds);
|
||||
}
|
||||
$db->delete('nation_turn', 'nation_id IN %li', $invaderNationIds);
|
||||
$db->delete('diplomacy', 'me IN %li OR you IN %li', $invaderNationIds, $invaderNationIds);
|
||||
$db->delete('nation', 'nation IN %li', $invaderNationIds);
|
||||
$db->update('city', ['nation' => $existingNationId], true);
|
||||
|
||||
$endingResult = (new \sammo\Event\Action\InvaderEnding())->run([
|
||||
'year' => $year,
|
||||
'month' => $month + 3,
|
||||
'startyear' => $startYear,
|
||||
'currentEventID' => $endingEventId,
|
||||
]);
|
||||
$gameStorage->resetCache();
|
||||
$afterUserWin = [
|
||||
'result' => $endingResult[1] ?? null,
|
||||
'endingEventPresent' => (bool)$db->queryFirstField(
|
||||
'SELECT count(*) FROM event WHERE id = %i',
|
||||
$endingEventId,
|
||||
),
|
||||
'isunited' => (int)$gameStorage->isunited,
|
||||
'refreshLimit' => (int)$gameStorage->refreshLimit,
|
||||
'logs' => array_values($db->queryFirstColumn(
|
||||
'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 AND year = %i AND month = %i ORDER BY id',
|
||||
$worldHistoryIdBeforeAction,
|
||||
$year,
|
||||
$month + 3,
|
||||
)),
|
||||
];
|
||||
|
||||
return [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'action' => 'InvaderLifecycle',
|
||||
'phases' => [
|
||||
'afterRaise' => $afterRaise,
|
||||
'atWar' => $atWar,
|
||||
'atPeace' => $atPeace,
|
||||
'afterUserWin' => $afterUserWin,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Exercise NPC nation creation and the same-month troop leader follow-up.
|
||||
*
|
||||
* @param array<string, mixed> $environment
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
function comparisonNpcNationLifecycleTrace(
|
||||
array $environment,
|
||||
int $generalIdBeforeAction,
|
||||
int $nationIdBeforeAction,
|
||||
int $worldHistoryIdBeforeAction,
|
||||
): array {
|
||||
$db = DB::db();
|
||||
$actionEnvironment = [
|
||||
'year' => $environment['year'],
|
||||
'month' => $environment['month'],
|
||||
'startyear' => $environment['startyear'],
|
||||
'turnterm' => $environment['turnterm'],
|
||||
'turntime' => $environment['turntime'],
|
||||
'show_img_level' => $environment['show_img_level'] ?? 3,
|
||||
'stored_icons' => $environment['stored_icons'] ?? [],
|
||||
'icon_path' => $environment['icon_path'] ?? '.',
|
||||
'fiction' => $environment['fiction'] ?? [0],
|
||||
];
|
||||
$gameStorage = KVStorage::getStorage($db, 'game_env');
|
||||
$leaderCounterBefore = (int)($gameStorage->lastNPCTroopLeaderID ?? 0);
|
||||
|
||||
(new \sammo\Event\Action\RaiseNPCNation())->run($actionEnvironment);
|
||||
$createdNationIds = array_map(
|
||||
'intval',
|
||||
$db->queryFirstColumn('SELECT nation FROM nation WHERE nation > %i ORDER BY nation', $nationIdBeforeAction),
|
||||
);
|
||||
if ($createdNationIds === []) {
|
||||
throw new \RuntimeException('NpcNationLifecycle failed to create a nation');
|
||||
}
|
||||
$createdNationGeneralCounts = array_map(
|
||||
static fn(int $nationId): int => (int)DB::db()->queryFirstField(
|
||||
'SELECT count(*) FROM general WHERE nation = %i',
|
||||
$nationId,
|
||||
),
|
||||
$createdNationIds,
|
||||
);
|
||||
$afterRaise = [
|
||||
'createdNationCount' => count($createdNationIds),
|
||||
'createdGeneralCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM general WHERE no > %i',
|
||||
$generalIdBeforeAction,
|
||||
),
|
||||
'generalCountsPerCreatedNation' => array_values(array_unique($createdNationGeneralCounts)),
|
||||
'historyLogs' => array_values($db->queryFirstColumn(
|
||||
'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 ORDER BY id',
|
||||
$worldHistoryIdBeforeAction,
|
||||
)),
|
||||
];
|
||||
|
||||
(new \sammo\Event\Action\ProvideNPCTroopLeader())->run($actionEnvironment);
|
||||
$leaderIds = array_map(
|
||||
'intval',
|
||||
$db->queryFirstColumn('SELECT no FROM general WHERE no > %i AND npc = 5 ORDER BY no', $generalIdBeforeAction),
|
||||
);
|
||||
if ($leaderIds === []) {
|
||||
throw new \RuntimeException('NpcNationLifecycle failed to create troop leaders');
|
||||
}
|
||||
$leaderNationCounts = array_map(
|
||||
static fn(int $nationId): int => (int)DB::db()->queryFirstField(
|
||||
'SELECT count(*) FROM general WHERE nation = %i AND npc = 5',
|
||||
$nationId,
|
||||
),
|
||||
array_map(
|
||||
'intval',
|
||||
$db->queryFirstColumn('SELECT nation FROM nation WHERE level > 0 ORDER BY nation'),
|
||||
),
|
||||
);
|
||||
$gatherTurnCounts = array_map(
|
||||
static fn(int $generalId): int => (int)DB::db()->queryFirstField(
|
||||
'SELECT count(*) FROM general_turn WHERE general_id = %i AND action = %s',
|
||||
$generalId,
|
||||
'che_집합',
|
||||
),
|
||||
$leaderIds,
|
||||
);
|
||||
$gameStorage->resetCache();
|
||||
$afterProvide = [
|
||||
'createdLeaderCount' => count($leaderIds),
|
||||
'leaderCountsPerActiveNation' => array_values(array_unique($leaderNationCounts)),
|
||||
'troopCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM troop WHERE troop_leader IN %li',
|
||||
$leaderIds,
|
||||
),
|
||||
'gatherTurnCounts' => array_values(array_unique($gatherTurnCounts)),
|
||||
'leaderCounterDelta' => (int)$gameStorage->lastNPCTroopLeaderID - $leaderCounterBefore,
|
||||
];
|
||||
|
||||
return [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'action' => 'NpcNationLifecycle',
|
||||
'phases' => [
|
||||
'afterRaise' => $afterRaise,
|
||||
'afterProvide' => $afterProvide,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Exercise nation betting from monthly open through real user bets and settlement.
|
||||
*
|
||||
* @param array<string, mixed> $request
|
||||
* @param array<string, mixed> $environment
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
function comparisonNationBettingLifecycleTrace(
|
||||
array $request,
|
||||
array $environment,
|
||||
int $eventIdBeforeAction,
|
||||
int $worldHistoryIdBeforeAction,
|
||||
): array {
|
||||
$db = DB::db();
|
||||
$args = $request['args'] ?? [];
|
||||
if (!is_array($args) || count($args) > 2) {
|
||||
throw new \InvalidArgumentException('NationBettingLifecycle args must have at most two entries');
|
||||
}
|
||||
$bettorGeneralIds = comparisonIntegerList(
|
||||
$request['bettorGeneralIds'] ?? [],
|
||||
'bettorGeneralIds',
|
||||
);
|
||||
$bettorOwnerIds = comparisonIntegerList(
|
||||
$request['bettorOwnerIds'] ?? [],
|
||||
'bettorOwnerIds',
|
||||
);
|
||||
if (count($bettorGeneralIds) !== 2 || count($bettorOwnerIds) !== 2) {
|
||||
throw new \InvalidArgumentException(
|
||||
'NationBettingLifecycle requires exactly two bettorGeneralIds and bettorOwnerIds',
|
||||
);
|
||||
}
|
||||
|
||||
$year = $environment['year'];
|
||||
$month = $environment['month'];
|
||||
$startYear = $environment['startyear'];
|
||||
(new \sammo\Event\Action\OpenNationBetting(...$args))->run([
|
||||
'year' => $year,
|
||||
'month' => $month,
|
||||
'startyear' => $startYear,
|
||||
]);
|
||||
|
||||
$gameStorage = KVStorage::getStorage($db, 'game_env');
|
||||
$gameStorage->resetCache();
|
||||
$bettingId = (int)$gameStorage->last_betting_id;
|
||||
$betting = new Betting($bettingId);
|
||||
$bettingInfo = $betting->getInfo();
|
||||
$candidateNationIds = array_map(
|
||||
static fn(\sammo\DTO\SelectItem $candidate): int => (int)($candidate->aux['nation'] ?? 0),
|
||||
$bettingInfo->candidates,
|
||||
);
|
||||
if (count($candidateNationIds) !== 2) {
|
||||
throw new \RuntimeException('NationBettingLifecycle requires exactly two candidates');
|
||||
}
|
||||
|
||||
$finishEventCount = (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM event WHERE id > %i AND action LIKE %s',
|
||||
$eventIdBeforeAction,
|
||||
"%FinishNationBetting%{$bettingId}%",
|
||||
);
|
||||
$afterOpen = [
|
||||
'bettingId' => $bettingId,
|
||||
'candidateNationIds' => $candidateNationIds,
|
||||
'systemBonus' => (int)($db->queryFirstField(
|
||||
'SELECT amount FROM ng_betting WHERE betting_id = %i AND general_id = 0',
|
||||
$bettingId,
|
||||
) ?? 0),
|
||||
'finishEventCount' => $finishEventCount,
|
||||
'historyLogs' => array_values($db->queryFirstColumn(
|
||||
'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 ORDER BY id',
|
||||
$worldHistoryIdBeforeAction,
|
||||
)),
|
||||
];
|
||||
|
||||
$betting->bet($bettorGeneralIds[0], $bettorOwnerIds[0], [1], 100);
|
||||
$betting->bet($bettorGeneralIds[1], $bettorOwnerIds[1], [0], 100);
|
||||
$afterBets = [
|
||||
'bets' => array_map(
|
||||
static fn(array $row): array => [
|
||||
'generalId' => (int)$row['general_id'],
|
||||
'ownerId' => $row['user_id'] === null ? null : (int)$row['user_id'],
|
||||
'selectionKey' => $row['betting_type'],
|
||||
'amount' => (int)$row['amount'],
|
||||
],
|
||||
iterator_to_array($db->query(
|
||||
'SELECT general_id, user_id, betting_type, amount FROM ng_betting WHERE betting_id = %i ORDER BY general_id',
|
||||
$bettingId,
|
||||
)),
|
||||
),
|
||||
'inheritancePrevious' => array_map(
|
||||
static function (int $ownerId): int {
|
||||
$value = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->getValue('previous');
|
||||
return is_array($value) ? (int)($value[0] ?? 0) : 0;
|
||||
},
|
||||
$bettorOwnerIds,
|
||||
),
|
||||
'spentRank' => array_map(
|
||||
static fn(int $generalId): int => (int)(DB::db()->queryFirstField(
|
||||
'SELECT value FROM rank_data WHERE general_id = %i AND type = %s',
|
||||
$generalId,
|
||||
\sammo\Enums\RankColumn::inherit_point_spent_dynamic->value,
|
||||
) ?? 0),
|
||||
$bettorGeneralIds,
|
||||
),
|
||||
];
|
||||
|
||||
$db->update('nation', ['level' => 0], 'nation = %i', $candidateNationIds[1]);
|
||||
$finishResult = (new \sammo\Event\Action\FinishNationBetting($bettingId))->run([
|
||||
'year' => $year,
|
||||
'month' => $month + 1,
|
||||
'startyear' => $startYear,
|
||||
]);
|
||||
$settledInfo = (new Betting($bettingId))->getInfo();
|
||||
$afterFinish = [
|
||||
'result' => $finishResult[1] ?? null,
|
||||
'finished' => $settledInfo->finished,
|
||||
'winner' => $settledInfo->winner,
|
||||
'inheritancePrevious' => array_map(
|
||||
static function (int $ownerId): int {
|
||||
$value = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->getValue('previous');
|
||||
return is_array($value) ? (int)($value[0] ?? 0) : 0;
|
||||
},
|
||||
$bettorOwnerIds,
|
||||
),
|
||||
'earnedRank' => array_map(
|
||||
static fn(int $generalId): int => (int)(DB::db()->queryFirstField(
|
||||
'SELECT value FROM rank_data WHERE general_id = %i AND type = %s',
|
||||
$generalId,
|
||||
\sammo\Enums\RankColumn::inherit_point_earned_by_action->value,
|
||||
) ?? 0),
|
||||
$bettorGeneralIds,
|
||||
),
|
||||
'historyLogs' => array_values($db->queryFirstColumn(
|
||||
'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 ORDER BY id',
|
||||
$worldHistoryIdBeforeAction,
|
||||
)),
|
||||
];
|
||||
|
||||
return [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'action' => 'NationBettingLifecycle',
|
||||
'phases' => [
|
||||
'afterOpen' => $afterOpen,
|
||||
'afterBets' => $afterBets,
|
||||
'afterFinish' => $afterFinish,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
function comparisonMonthlyEventTraceMain(): void
|
||||
{
|
||||
try {
|
||||
$input = stream_get_contents(STDIN);
|
||||
$request = json_decode($input === '' ? '{}' : $input, true, flags: JSON_THROW_ON_ERROR);
|
||||
if (!is_array($request)) {
|
||||
throw new \InvalidArgumentException('request must be an object');
|
||||
}
|
||||
$actionName = $request['action'] ?? null;
|
||||
$supportedActions = [
|
||||
'UpdateCitySupply',
|
||||
'UpdateNationLevel',
|
||||
'RaiseDisaster',
|
||||
'ProcessSemiAnnual',
|
||||
'ProcessWarIncome',
|
||||
'CreateAdminNPC',
|
||||
'CreateManyNPC',
|
||||
'RegNPC',
|
||||
'RegNeutralNPC',
|
||||
'RaiseNPCNation',
|
||||
'NpcNationLifecycle',
|
||||
'RaiseInvader',
|
||||
'InvaderLifecycle',
|
||||
'AutoDeleteInvader',
|
||||
'InvaderEnding',
|
||||
'ChangeCity',
|
||||
'ProvideNPCTroopLeader',
|
||||
'NationBettingLifecycle',
|
||||
'OpenNationBetting',
|
||||
'FinishNationBetting',
|
||||
'BlockScoutAction',
|
||||
'UnblockScoutAction',
|
||||
'AssignGeneralSpeciality',
|
||||
'AddGlobalBetray',
|
||||
'LostUniqueItem',
|
||||
'MergeInheritPointRank',
|
||||
'ProcessIncome',
|
||||
'NoticeToHistoryLog',
|
||||
'NewYear',
|
||||
'ResetOfficerLock',
|
||||
'PreUpdateMonthly',
|
||||
'PostUpdateMonthly',
|
||||
'MonthlyBoundary',
|
||||
];
|
||||
if (!in_array($actionName, $supportedActions, true)) {
|
||||
throw new \InvalidArgumentException('unsupported monthly action');
|
||||
}
|
||||
$setup = $request['setup'] ?? [];
|
||||
if (!is_array($setup)) {
|
||||
throw new \InvalidArgumentException('setup must be an object');
|
||||
}
|
||||
foreach (['city', 'nation', 'general'] as $table) {
|
||||
$rows = $setup[$table] ?? [];
|
||||
if (!is_array($rows)) {
|
||||
throw new \InvalidArgumentException("setup.{$table} must be an array");
|
||||
}
|
||||
foreach ($rows as $row) {
|
||||
if (!is_array($row) || !is_int($row['id'] ?? null) || !is_array($row['values'] ?? null)) {
|
||||
throw new \InvalidArgumentException("invalid setup.{$table} row");
|
||||
}
|
||||
comparisonMonthlyPatch($table, $row['id'], $row['values']);
|
||||
}
|
||||
}
|
||||
if (($setup['resetCities'] ?? false) === true) {
|
||||
DB::db()->query('UPDATE city SET nation = 0, level = 1');
|
||||
foreach ($setup['city'] ?? [] as $row) {
|
||||
comparisonMonthlyPatch('city', $row['id'], $row['values']);
|
||||
}
|
||||
}
|
||||
if (($setup['deleteOtherCities'] ?? false) === true) {
|
||||
$keepCityIds = comparisonIntegerList($setup['keepCityIds'] ?? [], 'keepCityIds');
|
||||
if ($keepCityIds === []) {
|
||||
throw new \InvalidArgumentException('deleteOtherCities requires keepCityIds');
|
||||
}
|
||||
DB::db()->query('DELETE FROM city WHERE city NOT IN %li', $keepCityIds);
|
||||
}
|
||||
if (($setup['resetGenerals'] ?? false) === true) {
|
||||
DB::db()->query(
|
||||
'UPDATE general SET nation = 0, officer_level = 1, npc = 2, killturn = 0, horse = %s, weapon = %s, book = %s, item = %s',
|
||||
'None',
|
||||
'None',
|
||||
'None',
|
||||
'None',
|
||||
);
|
||||
foreach ($setup['general'] ?? [] as $row) {
|
||||
comparisonMonthlyPatch('general', $row['id'], $row['values']);
|
||||
}
|
||||
}
|
||||
if (($setup['deleteOtherGenerals'] ?? false) === true) {
|
||||
$keepGeneralIds = comparisonIntegerList($setup['keepGeneralIds'] ?? [], 'keepGeneralIds');
|
||||
if (!$keepGeneralIds) {
|
||||
throw new \InvalidArgumentException('deleteOtherGenerals requires keepGeneralIds');
|
||||
}
|
||||
DB::db()->query('DELETE FROM general_turn WHERE general_id NOT IN %li', $keepGeneralIds);
|
||||
DB::db()->query('DELETE FROM rank_data WHERE general_id NOT IN %li', $keepGeneralIds);
|
||||
DB::db()->query('DELETE FROM general WHERE no NOT IN %li', $keepGeneralIds);
|
||||
}
|
||||
if (($setup['resetNations'] ?? false) === true) {
|
||||
DB::db()->query('UPDATE nation SET level = 0, gennum = 0, tech = 0');
|
||||
foreach ($setup['nation'] ?? [] as $row) {
|
||||
comparisonMonthlyPatch('nation', $row['id'], $row['values']);
|
||||
}
|
||||
}
|
||||
if (($setup['deleteOtherNations'] ?? false) === true) {
|
||||
$keepNationIds = comparisonIntegerList($setup['keepNationIds'] ?? [], 'keepNationIds');
|
||||
if (!$keepNationIds) {
|
||||
throw new \InvalidArgumentException('deleteOtherNations requires keepNationIds');
|
||||
}
|
||||
DB::db()->query(
|
||||
'DELETE FROM diplomacy WHERE me NOT IN %li OR you NOT IN %li',
|
||||
$keepNationIds,
|
||||
$keepNationIds,
|
||||
);
|
||||
DB::db()->query('DELETE FROM nation_turn WHERE nation_id NOT IN %li', $keepNationIds);
|
||||
DB::db()->query('DELETE FROM nation WHERE nation NOT IN %li', $keepNationIds);
|
||||
}
|
||||
if (($setup['resetUniqueOccupancy'] ?? false) === true) {
|
||||
DB::db()->delete('ng_auction', '`type` = %s AND finished = 0', 'uniqueItem');
|
||||
DB::db()->query('DELETE FROM storage WHERE namespace LIKE %s', 'ut\\_%');
|
||||
}
|
||||
if (($setup['clearNeutralAuctions'] ?? false) === true) {
|
||||
DB::db()->delete(
|
||||
'ng_auction',
|
||||
'`type` IN %ls AND host_general_id = 0',
|
||||
['buyRice', 'sellRice'],
|
||||
);
|
||||
}
|
||||
foreach (comparisonIntegerList($setup['clearNationTurnIds'] ?? [], 'clearNationTurnIds') as $nationId) {
|
||||
DB::db()->delete('nation_turn', 'nation_id = %i', $nationId);
|
||||
}
|
||||
foreach (comparisonIntegerList($setup['clearInheritanceOwnerIds'] ?? [], 'clearInheritanceOwnerIds') as $ownerId) {
|
||||
DB::db()->delete('storage', 'namespace = %s', "inheritance_{$ownerId}");
|
||||
}
|
||||
if (($setup['clearBetting'] ?? false) === true) {
|
||||
DB::db()->query('DELETE FROM ng_betting');
|
||||
DB::db()->query('DELETE FROM storage WHERE namespace = %s', 'betting');
|
||||
$gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
|
||||
$gameStorage->setValue('last_betting_id', 0);
|
||||
}
|
||||
foreach ($setup['bettingInfo'] ?? [] as $rawBettingInfo) {
|
||||
if (!is_array($rawBettingInfo) || !is_int($rawBettingInfo['id'] ?? null)) {
|
||||
throw new \InvalidArgumentException('invalid setup.bettingInfo row');
|
||||
}
|
||||
KVStorage::getStorage(DB::db(), 'betting')->setValue(
|
||||
"id_{$rawBettingInfo['id']}",
|
||||
$rawBettingInfo,
|
||||
);
|
||||
}
|
||||
foreach ($setup['bet'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['betting_id'] ?? null)
|
||||
|| !is_int($row['general_id'] ?? null)
|
||||
|| !is_string($row['betting_type'] ?? null)
|
||||
|| !is_int($row['amount'] ?? null)
|
||||
) {
|
||||
throw new \InvalidArgumentException('invalid setup.bet row');
|
||||
}
|
||||
DB::db()->insert('ng_betting', [
|
||||
'betting_id' => $row['betting_id'],
|
||||
'general_id' => $row['general_id'],
|
||||
'user_id' => $row['user_id'] ?? null,
|
||||
'betting_type' => $row['betting_type'],
|
||||
'amount' => $row['amount'],
|
||||
]);
|
||||
}
|
||||
foreach ($setup['inheritancePrevious'] ?? [] as $ownerId => $value) {
|
||||
if (!is_numeric($ownerId) || !is_int($value)) {
|
||||
throw new \InvalidArgumentException('invalid setup.inheritancePrevious entry');
|
||||
}
|
||||
KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->setValue('previous', [$value, null]);
|
||||
}
|
||||
foreach ($setup['inheritancePoints'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['ownerId'] ?? null)
|
||||
|| !is_string($row['key'] ?? null)
|
||||
|| !is_numeric($row['value'] ?? null)
|
||||
) {
|
||||
throw new \InvalidArgumentException('invalid setup.inheritancePoints row');
|
||||
}
|
||||
KVStorage::getStorage(DB::db(), "inheritance_{$row['ownerId']}")->setValue(
|
||||
$row['key'],
|
||||
[$row['value'], null],
|
||||
);
|
||||
}
|
||||
foreach ($setup['rankData'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['generalId'] ?? null)
|
||||
|| !is_string($row['type'] ?? null)
|
||||
|| !is_int($row['value'] ?? null)
|
||||
) {
|
||||
throw new \InvalidArgumentException('invalid setup.rankData row');
|
||||
}
|
||||
$nationId = (int)(DB::db()->queryFirstField(
|
||||
'SELECT nation FROM general WHERE no = %i',
|
||||
$row['generalId'],
|
||||
) ?? 0);
|
||||
DB::db()->insertUpdate('rank_data', [
|
||||
'general_id' => $row['generalId'],
|
||||
'nation_id' => $nationId,
|
||||
'type' => $row['type'],
|
||||
'value' => $row['value'],
|
||||
], [
|
||||
'nation_id' => $nationId,
|
||||
'value' => $row['value'],
|
||||
]);
|
||||
}
|
||||
foreach ($setup['generalAccessLog'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['generalId'] ?? null)
|
||||
|| !is_int($row['refreshScoreTotal'] ?? null)
|
||||
) {
|
||||
throw new \InvalidArgumentException('invalid setup.generalAccessLog row');
|
||||
}
|
||||
DB::db()->insertUpdate('general_access_log', [
|
||||
'general_id' => $row['generalId'],
|
||||
'refresh_score_total' => $row['refreshScoreTotal'],
|
||||
], [
|
||||
'refresh_score_total' => $row['refreshScoreTotal'],
|
||||
]);
|
||||
}
|
||||
foreach ($setup['nationEnvironment'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['nationId'] ?? null)
|
||||
|| !is_string($row['key'] ?? null)
|
||||
|| !array_key_exists('value', $row)
|
||||
) {
|
||||
throw new \InvalidArgumentException('invalid setup.nationEnvironment row');
|
||||
}
|
||||
KVStorage::getStorage(DB::db(), $row['nationId'], 'nation_env')->setValue(
|
||||
$row['key'],
|
||||
$row['value'],
|
||||
);
|
||||
}
|
||||
if (($setup['resetDiplomacy'] ?? false) === true) {
|
||||
DB::db()->query('DELETE FROM diplomacy');
|
||||
}
|
||||
foreach ($setup['diplomacy'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['fromNationId'] ?? null)
|
||||
|| !is_int($row['toNationId'] ?? null)
|
||||
|| !is_int($row['state'] ?? null)
|
||||
|| !is_int($row['term'] ?? null)
|
||||
) {
|
||||
throw new \InvalidArgumentException('invalid setup.diplomacy row');
|
||||
}
|
||||
$diplomacyPatch = [
|
||||
'me' => $row['fromNationId'],
|
||||
'you' => $row['toNationId'],
|
||||
'state' => $row['state'],
|
||||
'term' => $row['term'],
|
||||
'dead' => $row['dead'] ?? 0,
|
||||
];
|
||||
DB::db()->insertUpdate('diplomacy', $diplomacyPatch, $diplomacyPatch);
|
||||
}
|
||||
if (($setup['resetEvents'] ?? false) === true) {
|
||||
DB::db()->query('DELETE FROM event');
|
||||
}
|
||||
foreach ($setup['event'] ?? [] as $row) {
|
||||
if (!is_array($row) || !is_int($row['id'] ?? null) || !is_array($row['action'] ?? null)) {
|
||||
throw new \InvalidArgumentException('invalid setup.event row');
|
||||
}
|
||||
$eventPatch = [
|
||||
'id' => $row['id'],
|
||||
'target' => $row['target'] ?? 'month',
|
||||
'priority' => $row['priority'] ?? 1000,
|
||||
'condition' => Json::encode($row['condition'] ?? true),
|
||||
'action' => Json::encode($row['action']),
|
||||
];
|
||||
DB::db()->insertUpdate('event', $eventPatch, $eventPatch);
|
||||
}
|
||||
$gameEnvironmentPatch = $setup['gameEnvironment'] ?? [];
|
||||
if (!is_array($gameEnvironmentPatch)) {
|
||||
throw new \InvalidArgumentException('setup.gameEnvironment must be an object');
|
||||
}
|
||||
$gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
|
||||
$worldPatch = $setup['world'] ?? [];
|
||||
if (!is_array($worldPatch)) {
|
||||
throw new \InvalidArgumentException('setup.world must be an object');
|
||||
}
|
||||
if (array_key_exists('hiddenSeed', $worldPatch)) {
|
||||
if (!is_string($worldPatch['hiddenSeed']) || $worldPatch['hiddenSeed'] === '') {
|
||||
throw new \InvalidArgumentException('setup.world.hiddenSeed must be a non-empty string');
|
||||
}
|
||||
UniqueConst::$hiddenSeed = $worldPatch['hiddenSeed'];
|
||||
}
|
||||
foreach ([
|
||||
'isunited',
|
||||
'refreshLimit',
|
||||
'block_change_scout',
|
||||
'lastNPCTroopLeaderID',
|
||||
'tournament',
|
||||
'tnmt_trig',
|
||||
'tnmt_pattern',
|
||||
'prev_winner',
|
||||
] as $key) {
|
||||
if (array_key_exists($key, $gameEnvironmentPatch)) {
|
||||
$gameStorage->setValue($key, $gameEnvironmentPatch[$key]);
|
||||
}
|
||||
}
|
||||
if (($setup['setAllCitiesNation'] ?? null) !== null) {
|
||||
if (!is_int($setup['setAllCitiesNation'])) {
|
||||
throw new \InvalidArgumentException('setup.setAllCitiesNation must be an integer');
|
||||
}
|
||||
DB::db()->update('city', ['nation' => $setup['setAllCitiesNation']], true);
|
||||
}
|
||||
|
||||
$db = DB::db();
|
||||
$generalIdBeforeAction =
|
||||
(int)($db->queryFirstField('SELECT COALESCE(MAX(no), 0) FROM general') ?? 0);
|
||||
$nationIdBeforeAction =
|
||||
(int)($db->queryFirstField('SELECT COALESCE(MAX(nation), 0) FROM nation') ?? 0);
|
||||
$eventIdBeforeAction =
|
||||
(int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM event') ?? 0);
|
||||
$auctionIdBeforeAction =
|
||||
(int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM ng_auction') ?? 0);
|
||||
$snapshotRequest = ['observe' => $request['observe'] ?? []];
|
||||
$snapshotRequest['observe']['logAfterId'] =
|
||||
(int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM general_record') ?? 0);
|
||||
$worldHistoryAfterId =
|
||||
(int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM world_history') ?? 0);
|
||||
$before = comparisonTurnStateSnapshot($snapshotRequest);
|
||||
$beforeDetails = comparisonMonthlyDetails($snapshotRequest['observe'], $worldHistoryAfterId);
|
||||
|
||||
$environment = $request['environment'] ?? [];
|
||||
if (!is_array($environment)) {
|
||||
throw new \InvalidArgumentException('environment must be an object');
|
||||
}
|
||||
$year = $environment['year'] ?? null;
|
||||
$month = $environment['month'] ?? null;
|
||||
$startYear = $environment['startyear'] ?? null;
|
||||
if (!is_int($year) || !is_int($month) || !is_int($startYear)) {
|
||||
throw new \InvalidArgumentException('environment year, month, and startyear must be integers');
|
||||
}
|
||||
if (($setup['syncEnvironment'] ?? false) === true) {
|
||||
$gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
|
||||
$environmentValues = [
|
||||
'year' => $year,
|
||||
'month' => $month,
|
||||
'startyear' => $startYear,
|
||||
'killturn' => $environment['killturn'] ?? $gameStorage->killturn,
|
||||
'turnterm' => $environment['turnterm'] ?? $gameStorage->turnterm,
|
||||
];
|
||||
if (isset($environment['starttime'])) {
|
||||
if (!is_string($environment['starttime']) || $environment['starttime'] === '') {
|
||||
throw new \InvalidArgumentException('environment.starttime must be a non-empty string');
|
||||
}
|
||||
$environmentValues['starttime'] = $environment['starttime'];
|
||||
}
|
||||
foreach ($environmentValues as $key => $value) {
|
||||
$gameStorage->setValue($key, $value);
|
||||
}
|
||||
if ($actionName === 'MonthlyBoundary') {
|
||||
$before = comparisonTurnStateSnapshot($snapshotRequest);
|
||||
$beforeDetails = comparisonMonthlyDetails($snapshotRequest['observe'], $worldHistoryAfterId);
|
||||
}
|
||||
}
|
||||
|
||||
if ($actionName === 'InvaderLifecycle') {
|
||||
foreach (['turnterm', 'turntime'] as $requiredEnvironmentKey) {
|
||||
if (!array_key_exists($requiredEnvironmentKey, $environment)) {
|
||||
throw new \InvalidArgumentException(
|
||||
"InvaderLifecycle requires environment.{$requiredEnvironmentKey}",
|
||||
);
|
||||
}
|
||||
}
|
||||
echo json_encode(
|
||||
comparisonInvaderLifecycleTrace(
|
||||
$request,
|
||||
$environment,
|
||||
$generalIdBeforeAction,
|
||||
$nationIdBeforeAction,
|
||||
$eventIdBeforeAction,
|
||||
$worldHistoryAfterId,
|
||||
),
|
||||
JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
|
||||
), PHP_EOL;
|
||||
return;
|
||||
}
|
||||
if ($actionName === 'NpcNationLifecycle') {
|
||||
foreach (['turnterm', 'turntime'] as $requiredEnvironmentKey) {
|
||||
if (!array_key_exists($requiredEnvironmentKey, $environment)) {
|
||||
throw new \InvalidArgumentException(
|
||||
"NpcNationLifecycle requires environment.{$requiredEnvironmentKey}",
|
||||
);
|
||||
}
|
||||
}
|
||||
echo json_encode(
|
||||
comparisonNpcNationLifecycleTrace(
|
||||
$environment,
|
||||
$generalIdBeforeAction,
|
||||
$nationIdBeforeAction,
|
||||
$worldHistoryAfterId,
|
||||
),
|
||||
JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
|
||||
), PHP_EOL;
|
||||
return;
|
||||
}
|
||||
if ($actionName === 'NationBettingLifecycle') {
|
||||
echo json_encode(
|
||||
comparisonNationBettingLifecycleTrace(
|
||||
$request,
|
||||
$environment,
|
||||
$eventIdBeforeAction,
|
||||
$worldHistoryAfterId,
|
||||
),
|
||||
JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
|
||||
), PHP_EOL;
|
||||
return;
|
||||
}
|
||||
|
||||
$actionClass = "\\sammo\\Event\\Action\\{$actionName}";
|
||||
if (in_array($actionName, ['PreUpdateMonthly', 'PostUpdateMonthly', 'MonthlyBoundary'], true)) {
|
||||
$action = null;
|
||||
} elseif ($actionName === 'ProcessSemiAnnual') {
|
||||
$resource = $request['resource'] ?? null;
|
||||
if (!is_string($resource)) {
|
||||
throw new \InvalidArgumentException('ProcessSemiAnnual requires resource');
|
||||
}
|
||||
$action = new $actionClass($resource);
|
||||
} elseif (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC', 'RaiseInvader', 'AutoDeleteInvader', 'ChangeCity', 'OpenNationBetting', 'FinishNationBetting', 'BlockScoutAction', 'UnblockScoutAction', 'AddGlobalBetray', 'LostUniqueItem', 'ProcessIncome', 'NoticeToHistoryLog'], true)) {
|
||||
$args = $request['args'] ?? [];
|
||||
if (!is_array($args)) {
|
||||
throw new \InvalidArgumentException("{$actionName} args must be an array");
|
||||
}
|
||||
if ($actionName === 'CreateManyNPC' && count($args) > 2) {
|
||||
throw new \InvalidArgumentException('CreateManyNPC args must have at most two entries');
|
||||
}
|
||||
if ($actionName === 'RaiseInvader' && count($args) > 4) {
|
||||
throw new \InvalidArgumentException('RaiseInvader args must have at most four entries');
|
||||
}
|
||||
if ($actionName === 'ChangeCity' && count($args) !== 2) {
|
||||
throw new \InvalidArgumentException('ChangeCity args must have exactly two entries');
|
||||
}
|
||||
if ($actionName === 'OpenNationBetting' && count($args) > 2) {
|
||||
throw new \InvalidArgumentException('OpenNationBetting args must have at most two entries');
|
||||
}
|
||||
if ($actionName === 'FinishNationBetting' && count($args) !== 1) {
|
||||
throw new \InvalidArgumentException('FinishNationBetting args must have exactly one entry');
|
||||
}
|
||||
if (in_array($actionName, ['BlockScoutAction', 'UnblockScoutAction'], true) && count($args) > 1) {
|
||||
throw new \InvalidArgumentException("{$actionName} args must have at most one entry");
|
||||
}
|
||||
if ($actionName === 'AddGlobalBetray' && count($args) > 2) {
|
||||
throw new \InvalidArgumentException('AddGlobalBetray args must have at most two entries');
|
||||
}
|
||||
if ($actionName === 'LostUniqueItem' && count($args) > 1) {
|
||||
throw new \InvalidArgumentException('LostUniqueItem args must have at most one entry');
|
||||
}
|
||||
if ($actionName === 'ProcessIncome' && count($args) !== 1) {
|
||||
throw new \InvalidArgumentException('ProcessIncome args must have exactly one entry');
|
||||
}
|
||||
if ($actionName === 'NoticeToHistoryLog' && (count($args) < 1 || count($args) > 2)) {
|
||||
throw new \InvalidArgumentException('NoticeToHistoryLog args must have one or two entries');
|
||||
}
|
||||
$action = new $actionClass(...$args);
|
||||
} else {
|
||||
$action = new $actionClass();
|
||||
}
|
||||
$actionEnvironment = [
|
||||
'year' => $year,
|
||||
'month' => $month,
|
||||
'startyear' => $startYear,
|
||||
];
|
||||
if (isset($environment['currentEventID'])) {
|
||||
if (!is_int($environment['currentEventID'])) {
|
||||
throw new \InvalidArgumentException('currentEventID must be an integer');
|
||||
}
|
||||
$actionEnvironment['currentEventID'] = $environment['currentEventID'];
|
||||
}
|
||||
if ($actionName === 'UpdateNationLevel') {
|
||||
$killturn = $environment['killturn'] ?? null;
|
||||
$turnterm = $environment['turnterm'] ?? null;
|
||||
if (!is_int($killturn) || !is_int($turnterm) || $turnterm <= 0) {
|
||||
throw new \InvalidArgumentException('UpdateNationLevel requires integer killturn and positive turnterm');
|
||||
}
|
||||
$actionEnvironment['killturn'] = $killturn;
|
||||
$actionEnvironment['turnterm'] = $turnterm;
|
||||
}
|
||||
if (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC', 'RaiseNPCNation', 'RaiseInvader', 'ProvideNPCTroopLeader'], true)) {
|
||||
$turnterm = $environment['turnterm'] ?? null;
|
||||
$turntime = $environment['turntime'] ?? null;
|
||||
$showImgLevel = $environment['show_img_level'] ?? 3;
|
||||
$fiction = $environment['fiction'] ?? [0];
|
||||
if (
|
||||
!is_int($turnterm)
|
||||
|| $turnterm <= 0
|
||||
|| !is_string($turntime)
|
||||
|| !is_int($showImgLevel)
|
||||
|| !is_array($fiction)
|
||||
) {
|
||||
throw new \InvalidArgumentException(
|
||||
"{$actionName} requires positive turnterm, string turntime, integer show_img_level, and array fiction",
|
||||
);
|
||||
}
|
||||
$actionEnvironment += [
|
||||
'turnterm' => $turnterm,
|
||||
'turntime' => $turntime,
|
||||
'show_img_level' => $showImgLevel,
|
||||
'stored_icons' => $environment['stored_icons'] ?? [],
|
||||
'icon_path' => $environment['icon_path'] ?? '.',
|
||||
'fiction' => $fiction,
|
||||
];
|
||||
}
|
||||
if ($actionName === 'PreUpdateMonthly') {
|
||||
if (!preUpdateMonthly()) {
|
||||
throw new \RuntimeException('preUpdateMonthly failed');
|
||||
}
|
||||
} elseif ($actionName === 'PostUpdateMonthly') {
|
||||
$seedYear = $environment['seedYear'] ?? null;
|
||||
$seedMonth = $environment['seedMonth'] ?? null;
|
||||
if (!is_int($seedYear) || !is_int($seedMonth)) {
|
||||
throw new \InvalidArgumentException('PostUpdateMonthly requires seedYear and seedMonth');
|
||||
}
|
||||
postUpdateMonthly(new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
|
||||
UniqueConst::$hiddenSeed,
|
||||
'monthly',
|
||||
$seedYear,
|
||||
$seedMonth,
|
||||
))));
|
||||
} elseif ($actionName === 'MonthlyBoundary') {
|
||||
$turntime = $environment['turntime'] ?? null;
|
||||
if (!is_string($turntime) || $turntime === '') {
|
||||
throw new \InvalidArgumentException('MonthlyBoundary requires turntime');
|
||||
}
|
||||
$gameStorage = KVStorage::getStorage($db, 'game_env');
|
||||
$seedYear = (int)$gameStorage->year;
|
||||
$seedMonth = (int)$gameStorage->month;
|
||||
TurnExecutionHelper::runEventHandler($db, $gameStorage, Enums\EventTarget::PreMonth);
|
||||
if (!preUpdateMonthly()) {
|
||||
throw new \RuntimeException('preUpdateMonthly failed');
|
||||
}
|
||||
turnDate($turntime);
|
||||
$gameStorage->resetCache();
|
||||
if ((int)$gameStorage->month === 1) {
|
||||
checkStatistic();
|
||||
}
|
||||
TurnExecutionHelper::runEventHandler($db, $gameStorage, Enums\EventTarget::Month);
|
||||
postUpdateMonthly(new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
|
||||
UniqueConst::$hiddenSeed,
|
||||
'monthly',
|
||||
$seedYear,
|
||||
$seedMonth,
|
||||
))));
|
||||
} else {
|
||||
$action->run($actionEnvironment);
|
||||
}
|
||||
unset($action);
|
||||
gc_collect_cycles();
|
||||
|
||||
$after = comparisonTurnStateSnapshot($snapshotRequest);
|
||||
$afterDetails = comparisonMonthlyDetails($snapshotRequest['observe'], $worldHistoryAfterId);
|
||||
$createdGenerals = [];
|
||||
if (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC', 'RaiseNPCNation', 'RaiseInvader', 'ProvideNPCTroopLeader'], true)) {
|
||||
foreach ($db->query('SELECT * FROM general WHERE no > %i ORDER BY no', $generalIdBeforeAction) as $row) {
|
||||
$generalId = (int)$row['no'];
|
||||
$turnRows = $db->query(
|
||||
'SELECT turn_idx, action, arg FROM general_turn WHERE general_id = %i ORDER BY turn_idx',
|
||||
$generalId,
|
||||
);
|
||||
$createdGenerals[] = comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'no',
|
||||
'name' => 'name',
|
||||
'nationId' => 'nation',
|
||||
'cityId' => 'city',
|
||||
'leadership' => 'leadership',
|
||||
'strength' => 'strength',
|
||||
'intelligence' => 'intel',
|
||||
'experience' => 'experience',
|
||||
'dedication' => 'dedication',
|
||||
'officerLevel' => 'officer_level',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'crew' => 'crew',
|
||||
'crewTypeId' => 'crewtype',
|
||||
'train' => 'train',
|
||||
'atmos' => 'atmos',
|
||||
'turnTime' => 'turntime',
|
||||
'killturn' => 'killturn',
|
||||
'age' => 'age',
|
||||
'npcState' => 'npc',
|
||||
'npcOriginalState' => 'npc_org',
|
||||
'affinity' => 'affinity',
|
||||
'personality' => 'personal',
|
||||
'specialDomestic' => 'special',
|
||||
'specialWar' => 'special2',
|
||||
'specAge' => 'specage',
|
||||
'specAge2' => 'specage2',
|
||||
'bornYear' => 'bornyear',
|
||||
'deadYear' => 'deadyear',
|
||||
'picture' => 'picture',
|
||||
'dex1' => 'dex1',
|
||||
'dex2' => 'dex2',
|
||||
'dex3' => 'dex3',
|
||||
'dex4' => 'dex4',
|
||||
'dex5' => 'dex5',
|
||||
],
|
||||
) + [
|
||||
'turnCount' => count($turnRows),
|
||||
'turnActions' => array_values(array_unique(array_column($turnRows, 'action'))),
|
||||
'rankCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM rank_data WHERE general_id = %i',
|
||||
$generalId,
|
||||
),
|
||||
'nonZeroRankCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM rank_data WHERE general_id = %i AND value != 0',
|
||||
$generalId,
|
||||
),
|
||||
'troop' => $db->queryFirstRow(
|
||||
'SELECT troop_leader AS id, nation AS nationId, name FROM troop WHERE troop_leader = %i',
|
||||
$generalId,
|
||||
) ?: null,
|
||||
];
|
||||
}
|
||||
}
|
||||
$createdNations = [];
|
||||
if (in_array($actionName, ['RaiseNPCNation', 'RaiseInvader'], true)) {
|
||||
foreach ($db->query('SELECT * FROM nation WHERE nation > %i ORDER BY nation', $nationIdBeforeAction) as $row) {
|
||||
$nationId = (int)$row['nation'];
|
||||
$createdNations[] = comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'nation',
|
||||
'name' => 'name',
|
||||
'color' => 'color',
|
||||
'capitalCityId' => 'capital',
|
||||
'generalCount' => 'gennum',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'tech' => 'tech',
|
||||
'level' => 'level',
|
||||
'typeCode' => 'type',
|
||||
'bill' => 'bill',
|
||||
'rate' => 'rate',
|
||||
'scout' => 'scout',
|
||||
'war' => 'war',
|
||||
'strategicCommandLimit' => 'strategic_cmd_limit',
|
||||
'surrenderLimit' => 'surlimit',
|
||||
'aux' => 'aux',
|
||||
],
|
||||
['aux'],
|
||||
) + [
|
||||
'nationTurnCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM nation_turn WHERE nation_id = %i',
|
||||
$nationId,
|
||||
),
|
||||
'diplomacyCount' => (int)$db->queryFirstField(
|
||||
'SELECT count(*) FROM diplomacy WHERE me = %i OR you = %i',
|
||||
$nationId,
|
||||
$nationId,
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
$response = [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'action' => $actionName,
|
||||
'before' => $before,
|
||||
'beforeDetails' => $beforeDetails,
|
||||
'after' => $after,
|
||||
'afterDetails' => $afterDetails,
|
||||
];
|
||||
if (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC'], true)) {
|
||||
$response['createdGenerals'] = $createdGenerals;
|
||||
}
|
||||
if (in_array($actionName, ['RaiseNPCNation', 'RaiseInvader'], true)) {
|
||||
$response['createdGenerals'] = $createdGenerals;
|
||||
$response['createdNations'] = $createdNations;
|
||||
}
|
||||
if ($actionName === 'ProvideNPCTroopLeader') {
|
||||
$response['createdGenerals'] = $createdGenerals;
|
||||
$response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
|
||||
'lastNPCTroopLeaderID',
|
||||
]);
|
||||
}
|
||||
if ($actionName === 'PreUpdateMonthly') {
|
||||
$response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
|
||||
'develcost',
|
||||
]);
|
||||
}
|
||||
if ($actionName === 'PostUpdateMonthly') {
|
||||
$response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
|
||||
'tournament',
|
||||
'tnmt_trig',
|
||||
'tnmt_pattern',
|
||||
'tnmt_type',
|
||||
'tnmt_auto',
|
||||
'phase',
|
||||
]);
|
||||
$response['createdNeutralAuctions'] = array_map(
|
||||
static fn(array $row): array => [
|
||||
'id' => (int)$row['id'],
|
||||
'type' => $row['type'],
|
||||
'target' => $row['target'],
|
||||
'detail' => Json::decode($row['detail']),
|
||||
],
|
||||
iterator_to_array(
|
||||
$db->query(
|
||||
'SELECT id, `type`, target, detail FROM ng_auction WHERE id > %i AND host_general_id = 0 ORDER BY id',
|
||||
$auctionIdBeforeAction,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
if (in_array($actionName, ['OpenNationBetting', 'FinishNationBetting'], true)) {
|
||||
$bettingStorage = KVStorage::getStorage(DB::db(), 'betting');
|
||||
$response['betting'] = $bettingStorage->getAll();
|
||||
$response['bets'] = iterator_to_array(
|
||||
$db->query(
|
||||
'SELECT betting_id AS bettingId, general_id AS generalId, user_id AS userId, betting_type AS selectionKey, amount FROM ng_betting ORDER BY id',
|
||||
),
|
||||
);
|
||||
$response['createdEvents'] = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'id',
|
||||
'targetCode' => 'target',
|
||||
'priority' => 'priority',
|
||||
'condition' => 'condition',
|
||||
'action' => 'action',
|
||||
],
|
||||
['condition', 'action'],
|
||||
),
|
||||
iterator_to_array(
|
||||
$db->query(
|
||||
'SELECT id, target, priority, `condition`, action FROM event WHERE id > %i ORDER BY id',
|
||||
$eventIdBeforeAction,
|
||||
),
|
||||
),
|
||||
);
|
||||
$response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
|
||||
'last_betting_id',
|
||||
]);
|
||||
$response['inheritancePrevious'] = [];
|
||||
foreach (comparisonIntegerList($request['observe']['ownerIds'] ?? [], 'ownerIds') as $ownerId) {
|
||||
$value = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->getValue('previous');
|
||||
$response['inheritancePrevious'][(string)$ownerId] = is_array($value) ? ($value[0] ?? 0) : 0;
|
||||
}
|
||||
}
|
||||
if (in_array($actionName, ['BlockScoutAction', 'UnblockScoutAction'], true)) {
|
||||
$response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
|
||||
'block_change_scout',
|
||||
]);
|
||||
}
|
||||
if ($actionName === 'RaiseInvader') {
|
||||
$response['createdEvents'] = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'id',
|
||||
'targetCode' => 'target',
|
||||
'priority' => 'priority',
|
||||
'condition' => 'condition',
|
||||
'action' => 'action',
|
||||
],
|
||||
['condition', 'action'],
|
||||
),
|
||||
iterator_to_array(
|
||||
$db->query(
|
||||
'SELECT id, target, priority, `condition`, action FROM event WHERE id > %i ORDER BY id',
|
||||
$eventIdBeforeAction,
|
||||
),
|
||||
),
|
||||
);
|
||||
$response['createdDiplomacy'] = iterator_to_array(
|
||||
$db->query(
|
||||
'SELECT me AS fromNationId, you AS toNationId, state, term FROM diplomacy WHERE me > %i OR you > %i ORDER BY me, you',
|
||||
$nationIdBeforeAction,
|
||||
$nationIdBeforeAction,
|
||||
),
|
||||
);
|
||||
$gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
|
||||
$response['gameEnvironment'] = $gameStorage->getValues([
|
||||
'isunited',
|
||||
'turnterm',
|
||||
'block_change_scout',
|
||||
'refreshLimit',
|
||||
]);
|
||||
}
|
||||
if (in_array($actionName, ['AutoDeleteInvader', 'InvaderEnding'], true)) {
|
||||
$gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
|
||||
$response['gameEnvironment'] = $gameStorage->getValues([
|
||||
'isunited',
|
||||
'turnterm',
|
||||
'block_change_scout',
|
||||
'refreshLimit',
|
||||
]);
|
||||
}
|
||||
if (($request['compactOutput'] ?? false) === true) {
|
||||
$observedGeneralTurns = [];
|
||||
foreach (comparisonIntegerList($request['observe']['generalIds'] ?? [], 'generalIds') as $generalId) {
|
||||
$observedGeneralTurns[(string)$generalId] = iterator_to_array(
|
||||
$db->query(
|
||||
'SELECT turn_idx AS turnIndex, action, arg FROM general_turn WHERE general_id = %i ORDER BY turn_idx',
|
||||
$generalId,
|
||||
),
|
||||
);
|
||||
}
|
||||
$response = [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'action' => $actionName,
|
||||
'afterDetails' => $afterDetails,
|
||||
'createdGeneralCount' => count($createdGenerals),
|
||||
'firstCreatedGenerals' => array_slice($createdGenerals, 0, 3),
|
||||
'createdNations' => $response['createdNations'] ?? [],
|
||||
'createdEvents' => $response['createdEvents'] ?? [],
|
||||
'createdDiplomacy' => $response['createdDiplomacy'] ?? [],
|
||||
'gameEnvironment' => $response['gameEnvironment'] ?? [],
|
||||
'logs' => $after['logs'],
|
||||
'observedGeneralTurns' => $observedGeneralTurns,
|
||||
'remainingEventIds' => array_map(
|
||||
'intval',
|
||||
$db->queryFirstColumn('SELECT id FROM event ORDER BY id'),
|
||||
),
|
||||
];
|
||||
}
|
||||
echo json_encode(
|
||||
$response,
|
||||
JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
|
||||
), PHP_EOL;
|
||||
} catch (\Throwable $throwable) {
|
||||
fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
comparisonMonthlyEventTraceMain();
|
||||
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace sammo;
|
||||
|
||||
if (PHP_SAPI !== 'cli') {
|
||||
http_response_code(404);
|
||||
exit;
|
||||
}
|
||||
|
||||
chdir(dirname(__DIR__));
|
||||
require_once 'lib.php';
|
||||
require_once 'func.php';
|
||||
|
||||
$groups = [
|
||||
'nation' => ['ActionNationType', 'ActionNationType'],
|
||||
'domestic' => ['ActionSpecialDomestic', 'ActionSpecialDomestic'],
|
||||
'war' => ['ActionSpecialWar', 'ActionSpecialWar'],
|
||||
'personality' => ['ActionPersonality', 'ActionPersonality'],
|
||||
];
|
||||
|
||||
$result = [];
|
||||
foreach ($groups as $kind => [$directory, $namespace]) {
|
||||
foreach (glob(__DIR__ . "/../sammo/{$directory}/*.php") ?: [] as $path) {
|
||||
$key = basename($path, '.php');
|
||||
if ($key === 'None' || str_starts_with($key, 'che_event_') || $key === 'che_거상') {
|
||||
continue;
|
||||
}
|
||||
$className = "\\sammo\\{$namespace}\\{$key}";
|
||||
$trait = new $className();
|
||||
$result[$kind][$key] = [
|
||||
'name' => $trait->getName(),
|
||||
'info' => $trait->getInfo(),
|
||||
];
|
||||
}
|
||||
ksort($result[$kind]);
|
||||
}
|
||||
|
||||
echo Json::encode($result);
|
||||
@@ -0,0 +1,804 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace sammo;
|
||||
|
||||
use sammo\Enums\RankColumn;
|
||||
|
||||
if (PHP_SAPI !== 'cli') {
|
||||
http_response_code(404);
|
||||
exit;
|
||||
}
|
||||
|
||||
chdir(dirname(__DIR__));
|
||||
$_SERVER['REMOTE_ADDR'] ??= '127.0.0.1';
|
||||
error_reporting(E_ALL & ~E_DEPRECATED);
|
||||
require_once 'lib.php';
|
||||
require_once 'func.php';
|
||||
require_once __DIR__ . '/turn_state_snapshot.php';
|
||||
|
||||
final class TurnComparisonTracingRNG implements RNG
|
||||
{
|
||||
private int $sequence = 0;
|
||||
|
||||
/** @var list<array<string, mixed>> */
|
||||
public array $calls = [];
|
||||
|
||||
public function __construct(private readonly RNG $inner)
|
||||
{
|
||||
}
|
||||
|
||||
public static function getMaxInt(): int
|
||||
{
|
||||
return LiteHashDRBG::getMaxInt();
|
||||
}
|
||||
|
||||
public function nextBytes(int $bytes): string
|
||||
{
|
||||
$value = $this->inner->nextBytes($bytes);
|
||||
$this->record('nextBytes', ['bytes' => $bytes], bin2hex($value));
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function nextBits(int $bits): string
|
||||
{
|
||||
$value = $this->inner->nextBits($bits);
|
||||
$this->record('nextBits', ['bits' => $bits], bin2hex($value));
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function nextInt(?int $max = null): int
|
||||
{
|
||||
$value = $this->inner->nextInt($max);
|
||||
$this->record('nextInt', ['maxInclusive' => $max], $value);
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function nextFloat1(): float
|
||||
{
|
||||
$value = $this->inner->nextFloat1();
|
||||
$this->record('nextFloat1', [], $value);
|
||||
return $value;
|
||||
}
|
||||
|
||||
private function record(string $operation, array $arguments, mixed $result): void
|
||||
{
|
||||
$this->calls[] = [
|
||||
'seq' => $this->sequence++,
|
||||
'operation' => $operation,
|
||||
'arguments' => $arguments === [] ? (object)[] : $arguments,
|
||||
'result' => $result,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
/** @return array<string, mixed> */
|
||||
function comparisonMappedPatch(array $row, array $mapping): array
|
||||
{
|
||||
$patch = [];
|
||||
foreach ($mapping as $canonical => $legacy) {
|
||||
if (array_key_exists($canonical, $row)) {
|
||||
$patch[$legacy] = $row[$canonical];
|
||||
}
|
||||
}
|
||||
return $patch;
|
||||
}
|
||||
|
||||
function comparisonApplyTurnFixtureSetup(mixed $setup): void
|
||||
{
|
||||
if ($setup === null) {
|
||||
return;
|
||||
}
|
||||
if (!is_array($setup)) {
|
||||
throw new \InvalidArgumentException('setup must be an object');
|
||||
}
|
||||
$db = DB::db();
|
||||
$world = $setup['world'] ?? null;
|
||||
if ($world !== null) {
|
||||
if (!is_array($world)) {
|
||||
throw new \InvalidArgumentException('setup.world must be an object');
|
||||
}
|
||||
$game = KVStorage::getStorage($db, 'game_env');
|
||||
foreach (['year', 'month', 'startyear', 'init_year', 'init_month'] as $key) {
|
||||
$fixtureKey = match ($key) {
|
||||
'startyear' => 'startYear',
|
||||
'init_year' => 'initYear',
|
||||
'init_month' => 'initMonth',
|
||||
default => $key,
|
||||
};
|
||||
if (!array_key_exists($fixtureKey, $world)) {
|
||||
continue;
|
||||
}
|
||||
$value = $world[$fixtureKey];
|
||||
if (
|
||||
!is_int($value)
|
||||
|| $value < 1
|
||||
|| (in_array($key, ['month', 'init_month'], true) && $value > 12)
|
||||
) {
|
||||
throw new \InvalidArgumentException("setup.world.{$fixtureKey} is invalid");
|
||||
}
|
||||
$game->setValue($key, $value);
|
||||
}
|
||||
$game->resetCache();
|
||||
if (array_key_exists('hiddenSeed', $world)) {
|
||||
$hiddenSeed = $world['hiddenSeed'];
|
||||
if (!is_string($hiddenSeed) || $hiddenSeed === '' || strlen($hiddenSeed) > 256) {
|
||||
throw new \InvalidArgumentException('setup.world.hiddenSeed is invalid');
|
||||
}
|
||||
UniqueConst::$hiddenSeed = $hiddenSeed;
|
||||
}
|
||||
// 비교 fixture는 전역 상태에 의존하지 않도록 effect 기본값을 null로 고정하고,
|
||||
// 명시된 경우에만 해당 effect를 활성화합니다.
|
||||
GameConst::$scenarioEffect = null;
|
||||
if (array_key_exists('scenarioEffect', $world)) {
|
||||
$scenarioEffect = $world['scenarioEffect'];
|
||||
if ($scenarioEffect === '' || $scenarioEffect === 'None') {
|
||||
$scenarioEffect = null;
|
||||
}
|
||||
if ($scenarioEffect !== null) {
|
||||
if (!is_string($scenarioEffect) || getScenarioEffectClass($scenarioEffect) === null) {
|
||||
throw new \InvalidArgumentException('setup.world.scenarioEffect is invalid');
|
||||
}
|
||||
}
|
||||
GameConst::$scenarioEffect = $scenarioEffect;
|
||||
}
|
||||
if (array_key_exists('staticEventHandlers', $world)) {
|
||||
$handlersByEvent = $world['staticEventHandlers'];
|
||||
if (!is_array($handlersByEvent)) {
|
||||
throw new \InvalidArgumentException('setup.world.staticEventHandlers must be an object');
|
||||
}
|
||||
foreach ($handlersByEvent as $eventType => $handlers) {
|
||||
if (!is_string($eventType) || $eventType === '' || !is_array($handlers)) {
|
||||
throw new \InvalidArgumentException('setup.world.staticEventHandlers is invalid');
|
||||
}
|
||||
foreach ($handlers as $handler) {
|
||||
if (!is_string($handler) || $handler === '') {
|
||||
throw new \InvalidArgumentException('setup.world.staticEventHandlers is invalid');
|
||||
}
|
||||
}
|
||||
}
|
||||
GameConst::$staticEventHandlers = $handlersByEvent;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (['nations', 'cities', 'generals', 'troops', 'diplomacy'] as $collection) {
|
||||
if (isset($setup[$collection]) && !is_array($setup[$collection])) {
|
||||
throw new \InvalidArgumentException("setup.{$collection} must be an array");
|
||||
}
|
||||
}
|
||||
$generalCooldowns = comparisonGeneralCooldownSelectors(
|
||||
$setup['generalCooldowns'] ?? [],
|
||||
'setup.generalCooldowns',
|
||||
);
|
||||
if ($generalCooldowns !== []) {
|
||||
$nextExecuteStorage = KVStorage::getStorage($db, 'next_execute');
|
||||
foreach ($setup['generalCooldowns'] as $entry) {
|
||||
$nextAvailableTurn = $entry['nextAvailableTurn'] ?? null;
|
||||
if (!is_int($nextAvailableTurn) || $nextAvailableTurn < 0) {
|
||||
throw new \InvalidArgumentException(
|
||||
'setup.generalCooldowns entries require a non-negative nextAvailableTurn',
|
||||
);
|
||||
}
|
||||
$key = "next_execute_{$entry['generalId']}_{$entry['actionName']}";
|
||||
$nextExecuteStorage->setValue($key, $nextAvailableTurn);
|
||||
}
|
||||
$nextExecuteStorage->resetCache();
|
||||
}
|
||||
if (isset($setup['randomFoundingCandidateCityIds'])) {
|
||||
$candidateCityIds = comparisonIntegerList(
|
||||
$setup['randomFoundingCandidateCityIds'],
|
||||
'randomFoundingCandidateCityIds',
|
||||
);
|
||||
$db->update('city', ['level' => 4], '1 = 1');
|
||||
if ($candidateCityIds !== []) {
|
||||
$db->update('city', ['level' => 5], 'city IN %li', $candidateCityIds);
|
||||
}
|
||||
}
|
||||
|
||||
if (($setup['isolateWorld'] ?? false) === true) {
|
||||
$generalIds = array_values(array_map(
|
||||
static fn(array $row): int => (int)$row['id'],
|
||||
$setup['generals'] ?? [],
|
||||
));
|
||||
$nationIds = array_values(array_map(
|
||||
static fn(array $row): int => (int)$row['id'],
|
||||
$setup['nations'] ?? [],
|
||||
));
|
||||
if ($generalIds === [] || $nationIds === []) {
|
||||
throw new \InvalidArgumentException('isolateWorld requires generals and nations');
|
||||
}
|
||||
$generalTemplate = $db->queryFirstRow(
|
||||
'SELECT * FROM general WHERE no IN %li ORDER BY no LIMIT 1',
|
||||
$generalIds,
|
||||
);
|
||||
if ($generalTemplate === null) {
|
||||
throw new \InvalidArgumentException('isolateWorld requires at least one existing fixture general');
|
||||
}
|
||||
$generalTemplateId = (int)$generalTemplate['no'];
|
||||
$rankDataTemplate = $db->query(
|
||||
'SELECT `type`, `value` FROM rank_data WHERE general_id = %i',
|
||||
$generalTemplateId,
|
||||
);
|
||||
$db->delete('general_turn', 'general_id NOT IN %li', $generalIds);
|
||||
$db->delete('rank_data', 'general_id NOT IN %li', $generalIds);
|
||||
$db->delete('nation_turn', 'nation_id NOT IN %li', $nationIds);
|
||||
$db->delete('troop', '1 = 1');
|
||||
$db->delete('diplomacy', '1 = 1');
|
||||
$db->delete('general', 'no NOT IN %li', $generalIds);
|
||||
foreach ($generalIds as $generalId) {
|
||||
if ($db->queryFirstField('SELECT no FROM general WHERE no = %i', $generalId) !== null) {
|
||||
continue;
|
||||
}
|
||||
$newGeneral = $generalTemplate;
|
||||
$newGeneral['no'] = $generalId;
|
||||
$newGeneral['owner'] = 0;
|
||||
$newGeneral['name'] = "fixture-general-{$generalId}";
|
||||
$db->insert('general', $newGeneral);
|
||||
}
|
||||
foreach ($generalIds as $generalId) {
|
||||
foreach ($rankDataTemplate as $rankRow) {
|
||||
$rankData = [
|
||||
'general_id' => $generalId,
|
||||
'type' => $rankRow['type'],
|
||||
'value' => $rankRow['value'],
|
||||
];
|
||||
$db->insertUpdate('rank_data', $rankData, $rankData);
|
||||
}
|
||||
}
|
||||
$db->delete('nation', 'nation NOT IN %li', $nationIds);
|
||||
$db->update('city', [
|
||||
'nation' => 0,
|
||||
'supply' => 0,
|
||||
'front' => 0,
|
||||
'state' => 0,
|
||||
'term' => 0,
|
||||
'conflict' => '{}',
|
||||
'officer_set' => 0,
|
||||
], '1 = 1');
|
||||
}
|
||||
|
||||
foreach ($setup['nations'] ?? [] as $row) {
|
||||
if (!is_array($row) || !is_int($row['id'] ?? null) || $row['id'] < 1) {
|
||||
throw new \InvalidArgumentException('setup.nations requires positive integer ids');
|
||||
}
|
||||
$data = comparisonMappedPatch($row, [
|
||||
'id' => 'nation',
|
||||
'name' => 'name',
|
||||
'color' => 'color',
|
||||
'capitalCityId' => 'capital',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'tech' => 'tech',
|
||||
'level' => 'level',
|
||||
'typeCode' => 'type',
|
||||
'war' => 'war',
|
||||
'diplomacyLimit' => 'surlimit',
|
||||
'generalCount' => 'gennum',
|
||||
'power' => 'power',
|
||||
'capitalRevision' => 'capset',
|
||||
'strategicCommandLimit' => 'strategic_cmd_limit',
|
||||
]);
|
||||
if (isset($row['meta'])) {
|
||||
$data['aux'] = Json::encode($row['meta']);
|
||||
}
|
||||
$data += [
|
||||
'name' => "fixture-nation-{$row['id']}",
|
||||
'color' => '#777777',
|
||||
'capital' => 0,
|
||||
'gold' => 0,
|
||||
'rice' => 0,
|
||||
'level' => 1,
|
||||
'type' => 'che_중립',
|
||||
'aux' => '{}',
|
||||
];
|
||||
$db->insertUpdate('nation', $data, $data);
|
||||
$nationStor = KVStorage::getStorage($db, $row['id'], 'nation_env');
|
||||
if (($setup['isolateWorld'] ?? false) === true) {
|
||||
$nationStor->deleteValue('recv_assist');
|
||||
$nationStor->deleteValue('resp_assist');
|
||||
}
|
||||
if (array_key_exists('nationEnv', $row)) {
|
||||
if (!is_array($row['nationEnv'])) {
|
||||
throw new \InvalidArgumentException('setup.nations.nationEnv must be an object');
|
||||
}
|
||||
foreach ($row['nationEnv'] as $key => $value) {
|
||||
if (!is_string($key) || $key === '') {
|
||||
throw new \InvalidArgumentException('setup.nations.nationEnv keys must be non-empty strings');
|
||||
}
|
||||
$nationStor->setValue($key, $value);
|
||||
}
|
||||
$nationStor->resetCache();
|
||||
}
|
||||
if (array_key_exists('turnLastByOfficerLevel', $row)) {
|
||||
$turnLastByOfficerLevel = $row['turnLastByOfficerLevel'];
|
||||
if (!is_array($turnLastByOfficerLevel)) {
|
||||
throw new \InvalidArgumentException('setup.nations.turnLastByOfficerLevel must be an object');
|
||||
}
|
||||
foreach ($turnLastByOfficerLevel as $officerLevel => $lastTurn) {
|
||||
$officerLevel = filter_var($officerLevel, FILTER_VALIDATE_INT);
|
||||
if (
|
||||
$officerLevel === false
|
||||
|| $officerLevel < 5
|
||||
|| $officerLevel > 12
|
||||
|| !is_array($lastTurn)
|
||||
) {
|
||||
throw new \InvalidArgumentException(
|
||||
'setup.nations.turnLastByOfficerLevel requires officer levels 5 through 12'
|
||||
);
|
||||
}
|
||||
$nationStor->setValue("turn_last_{$officerLevel}", $lastTurn);
|
||||
}
|
||||
$nationStor->resetCache();
|
||||
}
|
||||
}
|
||||
if (($setup['isolateWorld'] ?? false) === true && ($setup['nations'] ?? []) !== []) {
|
||||
$maxNationId = max(array_map(
|
||||
static fn(array $row): int => (int)$row['id'],
|
||||
$setup['nations'],
|
||||
));
|
||||
$db->query('ALTER TABLE nation AUTO_INCREMENT = %i', $maxNationId + 1);
|
||||
}
|
||||
|
||||
foreach ($setup['cities'] ?? [] as $row) {
|
||||
if (!is_array($row) || !is_int($row['id'] ?? null) || $row['id'] < 1) {
|
||||
throw new \InvalidArgumentException('setup.cities requires positive integer ids');
|
||||
}
|
||||
$patch = comparisonMappedPatch($row, [
|
||||
'nationId' => 'nation',
|
||||
'level' => 'level',
|
||||
'population' => 'pop',
|
||||
'populationMax' => 'pop_max',
|
||||
'agriculture' => 'agri',
|
||||
'agricultureMax' => 'agri_max',
|
||||
'commerce' => 'comm',
|
||||
'commerceMax' => 'comm_max',
|
||||
'security' => 'secu',
|
||||
'securityMax' => 'secu_max',
|
||||
'supplyState' => 'supply',
|
||||
'frontState' => 'front',
|
||||
'defence' => 'def',
|
||||
'defenceMax' => 'def_max',
|
||||
'wall' => 'wall',
|
||||
'wallMax' => 'wall_max',
|
||||
'state' => 'state',
|
||||
'term' => 'term',
|
||||
'trust' => 'trust',
|
||||
'trade' => 'trade',
|
||||
'officerSet' => 'officer_set',
|
||||
]);
|
||||
if (array_key_exists('conflictEntries', $row)) {
|
||||
if (!is_array($row['conflictEntries'])) {
|
||||
throw new \InvalidArgumentException('setup.cities.conflictEntries must be an array');
|
||||
}
|
||||
$orderedConflict = [];
|
||||
foreach ($row['conflictEntries'] as $entry) {
|
||||
if (
|
||||
!is_array($entry)
|
||||
|| count($entry) !== 2
|
||||
|| !is_int($entry[0] ?? null)
|
||||
|| $entry[0] < 1
|
||||
|| !is_numeric($entry[1] ?? null)
|
||||
) {
|
||||
throw new \InvalidArgumentException(
|
||||
'setup.cities.conflictEntries requires [positive nation id, numeric value] pairs'
|
||||
);
|
||||
}
|
||||
$orderedConflict[$entry[0]] = $entry[1];
|
||||
}
|
||||
$patch['conflict'] = Json::encode($orderedConflict);
|
||||
} elseif (array_key_exists('conflict', $row)) {
|
||||
if (!is_array($row['conflict'])) {
|
||||
throw new \InvalidArgumentException('setup.cities.conflict must be an object');
|
||||
}
|
||||
$patch['conflict'] = Json::encode($row['conflict']);
|
||||
}
|
||||
if ($patch !== []) {
|
||||
$db->update('city', $patch, 'city = %i', $row['id']);
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($setup['generals'] ?? [] as $row) {
|
||||
if (!is_array($row) || !is_int($row['id'] ?? null) || $row['id'] < 1) {
|
||||
throw new \InvalidArgumentException('setup.generals requires positive integer ids');
|
||||
}
|
||||
$patch = comparisonMappedPatch($row, [
|
||||
'name' => 'name',
|
||||
'nationId' => 'nation',
|
||||
'cityId' => 'city',
|
||||
'troopId' => 'troop',
|
||||
'leadership' => 'leadership',
|
||||
'strength' => 'strength',
|
||||
'intelligence' => 'intel',
|
||||
'leadershipExp' => 'leadership_exp',
|
||||
'strengthExp' => 'strength_exp',
|
||||
'intelExp' => 'intel_exp',
|
||||
'experience' => 'experience',
|
||||
'dedication' => 'dedication',
|
||||
'expLevel' => 'explevel',
|
||||
'officerLevel' => 'officer_level',
|
||||
'officerCityId' => 'officer_city',
|
||||
'belong' => 'belong',
|
||||
'permission' => 'permission',
|
||||
'betray' => 'betray',
|
||||
'makeLimit' => 'makelimit',
|
||||
'injury' => 'injury',
|
||||
'age' => 'age',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'crew' => 'crew',
|
||||
'crewTypeId' => 'crewtype',
|
||||
'train' => 'train',
|
||||
'atmos' => 'atmos',
|
||||
'dex1' => 'dex1',
|
||||
'dex2' => 'dex2',
|
||||
'dex3' => 'dex3',
|
||||
'dex4' => 'dex4',
|
||||
'dex5' => 'dex5',
|
||||
'specAge' => 'specage',
|
||||
'specAge2' => 'specage2',
|
||||
'killTurn' => 'killturn',
|
||||
'npcState' => 'npc',
|
||||
'blockState' => 'block',
|
||||
'specialDomestic' => 'special',
|
||||
'specialWar' => 'special2',
|
||||
'personality' => 'personal',
|
||||
'itemHorse' => 'horse',
|
||||
'itemWeapon' => 'weapon',
|
||||
'itemBook' => 'book',
|
||||
'itemExtra' => 'item',
|
||||
]);
|
||||
if (isset($row['meta'])) {
|
||||
$patch['aux'] = Json::encode($row['meta']);
|
||||
}
|
||||
if (array_key_exists('penalty', $row)) {
|
||||
if (!is_array($row['penalty'])) {
|
||||
throw new \InvalidArgumentException('setup.generals.penalty must be an object');
|
||||
}
|
||||
$patch['penalty'] = Json::encode($row['penalty']);
|
||||
}
|
||||
if (isset($row['lastTurn']) && is_array($row['lastTurn'])) {
|
||||
$patch['last_turn'] = Json::encode($row['lastTurn']);
|
||||
}
|
||||
if ($patch !== []) {
|
||||
$db->update('general', $patch, 'no = %i', $row['id']);
|
||||
}
|
||||
if (array_key_exists('nationId', $row)) {
|
||||
$db->update('rank_data', [
|
||||
'nation_id' => $row['nationId'],
|
||||
], 'general_id = %i', $row['id']);
|
||||
}
|
||||
}
|
||||
foreach ($setup['rankData'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['generalId'] ?? null)
|
||||
|| !is_string($row['type'] ?? null)
|
||||
|| RankColumn::tryFrom($row['type']) === null
|
||||
|| !is_int($row['value'] ?? null)
|
||||
) {
|
||||
throw new \InvalidArgumentException('invalid setup.rankData row');
|
||||
}
|
||||
$nationId = (int)($db->queryFirstField(
|
||||
'SELECT nation FROM general WHERE no = %i',
|
||||
$row['generalId'],
|
||||
) ?? 0);
|
||||
$db->insertUpdate('rank_data', [
|
||||
'general_id' => $row['generalId'],
|
||||
'nation_id' => $nationId,
|
||||
'type' => $row['type'],
|
||||
'value' => $row['value'],
|
||||
], [
|
||||
'nation_id' => $nationId,
|
||||
'value' => $row['value'],
|
||||
]);
|
||||
}
|
||||
if (($setup['isolateWorld'] ?? false) === true && ($setup['generals'] ?? []) !== []) {
|
||||
$maxGeneralId = max(array_map(
|
||||
static fn(array $row): int => (int)$row['id'],
|
||||
$setup['generals'],
|
||||
));
|
||||
$db->query('ALTER TABLE general AUTO_INCREMENT = %i', $maxGeneralId + 1);
|
||||
}
|
||||
|
||||
foreach ($setup['troops'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row)
|
||||
|| !is_int($row['id'] ?? null)
|
||||
|| !is_int($row['nationId'] ?? null)
|
||||
|| !is_string($row['name'] ?? null)
|
||||
|| $row['id'] < 1
|
||||
|| $row['nationId'] < 1
|
||||
|| $row['name'] === ''
|
||||
) {
|
||||
throw new \InvalidArgumentException('setup.troops requires positive id/nationId and non-empty name');
|
||||
}
|
||||
$data = [
|
||||
'troop_leader' => $row['id'],
|
||||
'nation' => $row['nationId'],
|
||||
'name' => $row['name'],
|
||||
];
|
||||
$db->insertUpdate('troop', $data, $data);
|
||||
}
|
||||
|
||||
foreach ($setup['diplomacy'] ?? [] as $row) {
|
||||
if (
|
||||
!is_array($row) ||
|
||||
!is_int($row['fromNationId'] ?? null) ||
|
||||
!is_int($row['toNationId'] ?? null) ||
|
||||
$row['fromNationId'] < 1 ||
|
||||
$row['toNationId'] < 1
|
||||
) {
|
||||
throw new \InvalidArgumentException('setup.diplomacy requires positive integer nation ids');
|
||||
}
|
||||
$data = comparisonMappedPatch($row, [
|
||||
'fromNationId' => 'me',
|
||||
'toNationId' => 'you',
|
||||
'state' => 'state',
|
||||
'term' => 'term',
|
||||
'dead' => 'dead',
|
||||
]);
|
||||
$data += ['state' => 3, 'term' => 0, 'dead' => 0];
|
||||
$db->insertUpdate('diplomacy', $data, $data);
|
||||
}
|
||||
}
|
||||
|
||||
function comparisonRunTurnCommand(array $request): array
|
||||
{
|
||||
if (getenv('TURN_DIFFERENTIAL_ENABLED') !== '1') {
|
||||
throw new \RuntimeException('TURN_DIFFERENTIAL_ENABLED=1 is required');
|
||||
}
|
||||
$kind = $request['kind'] ?? null;
|
||||
if (!in_array($kind, ['general', 'nation', 'instantNation', 'troopJoinStaticEvent'], true)) {
|
||||
throw new \InvalidArgumentException(
|
||||
'kind must be general, nation, instantNation, or troopJoinStaticEvent',
|
||||
);
|
||||
}
|
||||
$actorGeneralId = $request['actorGeneralId'] ?? null;
|
||||
$action = $request['action'] ?? null;
|
||||
$args = $request['args'] ?? null;
|
||||
$includeLifecycle = $request['includeLifecycle'] ?? false;
|
||||
if (!is_int($actorGeneralId) || $actorGeneralId < 1) {
|
||||
throw new \InvalidArgumentException('actorGeneralId must be a positive integer');
|
||||
}
|
||||
if (!is_string($action) || $action === '') {
|
||||
throw new \InvalidArgumentException('action must be a non-empty string');
|
||||
}
|
||||
if (!is_bool($includeLifecycle)) {
|
||||
throw new \InvalidArgumentException('includeLifecycle must be a boolean');
|
||||
}
|
||||
if ($includeLifecycle && $kind !== 'general') {
|
||||
throw new \InvalidArgumentException('includeLifecycle currently supports general commands only');
|
||||
}
|
||||
|
||||
comparisonApplyTurnFixtureSetup($request['setup'] ?? null);
|
||||
if ($includeLifecycle) {
|
||||
DB::db()->insertUpdate('general_turn', [
|
||||
'general_id' => $actorGeneralId,
|
||||
'turn_idx' => 0,
|
||||
'action' => $action,
|
||||
'arg' => Json::encode($args),
|
||||
'brief' => $action,
|
||||
], [
|
||||
'action' => $action,
|
||||
'arg' => Json::encode($args),
|
||||
'brief' => $action,
|
||||
]);
|
||||
}
|
||||
$snapshotRequest = ['observe' => $request['observe'] ?? []];
|
||||
$before = comparisonTurnStateSnapshot($snapshotRequest);
|
||||
$db = DB::db();
|
||||
$gameStorage = KVStorage::getStorage($db, 'game_env');
|
||||
$gameStorage->resetCache();
|
||||
$environment = $gameStorage->getAll();
|
||||
if ($kind === 'troopJoinStaticEvent') {
|
||||
if ($action !== \sammo\API\Troop\JoinTroop::class) {
|
||||
throw new \InvalidArgumentException('troopJoinStaticEvent requires the JoinTroop API action');
|
||||
}
|
||||
$troopId = is_array($args) ? ($args['troopID'] ?? null) : null;
|
||||
if (!is_int($troopId) || $troopId < 1) {
|
||||
throw new \InvalidArgumentException('troopJoinStaticEvent requires a positive integer troopID');
|
||||
}
|
||||
$general = GeneralLite::createObjFromDB(
|
||||
$actorGeneralId,
|
||||
['troop'],
|
||||
Enums\GeneralLiteQueryMode::Lite,
|
||||
);
|
||||
if ($general === null) {
|
||||
throw new \RuntimeException('장수 정보를 불러올 수 없습니다.');
|
||||
}
|
||||
if ($general->getVar('troop') != 0) {
|
||||
throw new \RuntimeException('이미 부대에 소속되어 있습니다.');
|
||||
}
|
||||
$nationId = $general->getNationID();
|
||||
if ($nationId == 0) {
|
||||
throw new \RuntimeException('국가에 소속되어 있지 않습니다.');
|
||||
}
|
||||
$troopExists = $db->queryFirstField(
|
||||
'SELECT `troop_leader` FROM `troop` WHERE `troop_leader` = %i AND `nation` = %i',
|
||||
$troopId,
|
||||
$nationId,
|
||||
);
|
||||
if (!$troopExists) {
|
||||
throw new \RuntimeException('부대가 올바르지 않습니다.');
|
||||
}
|
||||
|
||||
GameConst::$staticEventHandlers = [
|
||||
\sammo\API\Troop\JoinTroop::class => ['event_부대탑승즉시이동'],
|
||||
];
|
||||
$general->setVar('troop', $troopId);
|
||||
StaticEventHandler::handleEvent($general, null, \sammo\API\Troop\JoinTroop::class, [], $args);
|
||||
$general->applyDB($db);
|
||||
$after = comparisonTurnStateSnapshot($snapshotRequest);
|
||||
|
||||
return [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'execution' => [
|
||||
'kind' => $kind,
|
||||
'actorGeneralId' => $actorGeneralId,
|
||||
'action' => $action,
|
||||
'args' => $args,
|
||||
'seedDomain' => 'none',
|
||||
'outcome' => ['completed' => true],
|
||||
],
|
||||
'before' => $before,
|
||||
'after' => $after,
|
||||
'rng' => [],
|
||||
];
|
||||
}
|
||||
$general = General::createObjFromDB($actorGeneralId);
|
||||
if ($kind === 'instantNation') {
|
||||
$command = buildNationCommandClass($action, $general, $environment, new LastTurn(), $args);
|
||||
if (!$command->hasFullConditionMet()) {
|
||||
throw new \RuntimeException($command->getFailString());
|
||||
}
|
||||
$completed = $command->run(NoRNG::rngInstance());
|
||||
$command->setNextAvailable();
|
||||
$general->getLogger()->flush();
|
||||
$after = comparisonTurnStateSnapshot($snapshotRequest);
|
||||
|
||||
return [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'execution' => [
|
||||
'kind' => $kind,
|
||||
'actorGeneralId' => $actorGeneralId,
|
||||
'action' => $action,
|
||||
'args' => $args,
|
||||
'seedDomain' => 'none',
|
||||
'outcome' => [
|
||||
'lastTurn' => (object)[],
|
||||
'commandName' => $command->getName(),
|
||||
'completed' => $completed,
|
||||
],
|
||||
],
|
||||
'before' => $before,
|
||||
'after' => $after,
|
||||
'rng' => [],
|
||||
];
|
||||
}
|
||||
$turn = new TurnExecutionHelper($general);
|
||||
$general->increaseInheritancePoint(Enums\InheritanceKey::lived_month, 1);
|
||||
$preprocessRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
|
||||
UniqueConst::$hiddenSeed,
|
||||
'preprocess',
|
||||
(int)$environment['year'],
|
||||
(int)$environment['month'],
|
||||
$actorGeneralId,
|
||||
)));
|
||||
$turn->preprocessCommand($preprocessRng, $environment);
|
||||
$seedDomain = $kind === 'general' ? 'generalCommand' : 'nationCommand';
|
||||
$seed = Util::simpleSerialize(
|
||||
UniqueConst::$hiddenSeed,
|
||||
$seedDomain,
|
||||
(int)$environment['year'],
|
||||
(int)$environment['month'],
|
||||
$actorGeneralId,
|
||||
$action,
|
||||
);
|
||||
$tracingRng = new TurnComparisonTracingRNG(new LiteHashDRBG($seed));
|
||||
$rng = new RandUtil($tracingRng);
|
||||
if ($kind === 'general' && $action === 'che_견문') {
|
||||
\sammo\TextDecoration\SightseeingMessage::setComparisonRng($rng);
|
||||
}
|
||||
|
||||
if ($kind === 'general') {
|
||||
$previousLastTurn = $general->getLastTurn();
|
||||
$previousLastTurnRaw = $previousLastTurn->toRaw();
|
||||
$command = buildGeneralCommandClass($action, $general, $environment, $args);
|
||||
$commandFullConditionMet = $command->hasFullConditionMet();
|
||||
$resultTurn = $turn->processCommand($rng, $command, false);
|
||||
} else {
|
||||
$nationStor = KVStorage::getStorage($db, $general->getNationID(), 'nation_env');
|
||||
$lastNationTurnKey = "turn_last_{$general->getVar('officer_level')}";
|
||||
$previousLastTurn = LastTurn::fromRaw($nationStor->getValue($lastNationTurnKey));
|
||||
$previousLastTurnRaw = $previousLastTurn->toRaw();
|
||||
$command = buildNationCommandClass($action, $general, $environment, $previousLastTurn, $args);
|
||||
$commandFullConditionMet = $command->hasFullConditionMet();
|
||||
$resultTurn = $turn->processNationCommand($rng, $command);
|
||||
$nationStor->setValue($lastNationTurnKey, $resultTurn->toRaw());
|
||||
}
|
||||
|
||||
if ($includeLifecycle) {
|
||||
pullGeneralCommand($general->getID());
|
||||
$general->increaseVarWithLimit(
|
||||
'myset',
|
||||
GameConst::$incDefSettingChange,
|
||||
null,
|
||||
GameConst::$maxDefSettingChange,
|
||||
);
|
||||
$turn->updateTurnTime();
|
||||
}
|
||||
$general->getLogger()->flush();
|
||||
$turn->applyDB();
|
||||
unset($turn);
|
||||
$after = comparisonTurnStateSnapshot($snapshotRequest);
|
||||
$resultTurnRaw = $resultTurn->toRaw();
|
||||
$resultTerm = (int)($resultTurnRaw['term'] ?? 0);
|
||||
$preReqTurn = $command->getPreReqTurn();
|
||||
$acceptScoutCompleted = (
|
||||
$action === 'che_등용수락'
|
||||
&& is_array($args)
|
||||
&& is_int($args['destNationID'] ?? null)
|
||||
&& $general->getNationID() === $args['destNationID']
|
||||
);
|
||||
$foundNationCompleted = (
|
||||
in_array($action, ['che_건국', 'cr_건국', 'che_무작위건국'], true)
|
||||
&& is_array($args)
|
||||
&& is_string($args['nationName'] ?? null)
|
||||
&& DB::db()->queryFirstField(
|
||||
'SELECT name FROM nation WHERE nation = %i',
|
||||
$general->getNationID(),
|
||||
) === $args['nationName']
|
||||
);
|
||||
$completedByState = (
|
||||
$action === 'che_접경귀환'
|
||||
&& $tracingRng->calls !== []
|
||||
) || $acceptScoutCompleted || $foundNationCompleted || (($resultTurnRaw['command'] ?? null) === $command->getName()
|
||||
&& (
|
||||
($preReqTurn === 0 && $resultTerm === 0)
|
||||
|| (
|
||||
$preReqTurn > 0
|
||||
&& ($previousLastTurnRaw['command'] ?? null) === $command->getName()
|
||||
&& ($previousLastTurnRaw['arg'] ?? null) === $command->getArg()
|
||||
&& (int)($previousLastTurnRaw['term'] ?? 0) === $preReqTurn
|
||||
)
|
||||
));
|
||||
$completed = $commandFullConditionMet && $completedByState;
|
||||
|
||||
return [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'execution' => [
|
||||
'kind' => $kind,
|
||||
'actorGeneralId' => $actorGeneralId,
|
||||
'action' => $action,
|
||||
'args' => $args,
|
||||
'seedDomain' => $seedDomain,
|
||||
'outcome' => [
|
||||
'lastTurn' => $resultTurnRaw,
|
||||
'commandName' => $command->getName(),
|
||||
'completed' => $completed,
|
||||
],
|
||||
],
|
||||
'before' => $before,
|
||||
'after' => $after,
|
||||
'rng' => $tracingRng->calls,
|
||||
];
|
||||
}
|
||||
|
||||
try {
|
||||
$input = stream_get_contents(STDIN);
|
||||
$request = json_decode($input === '' ? '{}' : $input, true, flags: JSON_THROW_ON_ERROR);
|
||||
if (!is_array($request)) {
|
||||
throw new \InvalidArgumentException('request must be an object');
|
||||
}
|
||||
echo json_encode(
|
||||
comparisonRunTurnCommand($request),
|
||||
JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
|
||||
), PHP_EOL;
|
||||
} catch (\Throwable $throwable) {
|
||||
fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
|
||||
exit(1);
|
||||
}
|
||||
@@ -0,0 +1,643 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace sammo;
|
||||
|
||||
use sammo\Enums\RankColumn;
|
||||
|
||||
if (PHP_SAPI !== 'cli') {
|
||||
http_response_code(404);
|
||||
exit;
|
||||
}
|
||||
|
||||
chdir(dirname(__DIR__));
|
||||
require_once 'lib.php';
|
||||
require_once 'func.php';
|
||||
|
||||
/** @return list<int> */
|
||||
function comparisonIntegerList(mixed $value, string $label): array
|
||||
{
|
||||
if ($value === null) {
|
||||
return [];
|
||||
}
|
||||
if (!is_array($value)) {
|
||||
throw new \InvalidArgumentException("{$label} must be an array");
|
||||
}
|
||||
$result = [];
|
||||
foreach ($value as $entry) {
|
||||
if (!is_int($entry) || $entry < 0) {
|
||||
throw new \InvalidArgumentException("{$label} entries must be non-negative integers");
|
||||
}
|
||||
$result[$entry] = $entry;
|
||||
}
|
||||
ksort($result, SORT_NUMERIC);
|
||||
return array_values($result);
|
||||
}
|
||||
|
||||
function comparisonJsonValue(mixed $value): mixed
|
||||
{
|
||||
if (!is_string($value) || $value === '') {
|
||||
return $value;
|
||||
}
|
||||
try {
|
||||
return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
|
||||
} catch (\JsonException) {
|
||||
return $value;
|
||||
}
|
||||
}
|
||||
|
||||
function comparisonOptionalCode(mixed $value): ?string
|
||||
{
|
||||
if (!is_string($value) || $value === '' || $value === 'None') {
|
||||
return null;
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
/** @return list<array{generalId: int, actionName: string}> */
|
||||
function comparisonGeneralCooldownSelectors(mixed $value, string $label): array
|
||||
{
|
||||
if ($value === null) {
|
||||
return [];
|
||||
}
|
||||
if (!is_array($value)) {
|
||||
throw new \InvalidArgumentException("{$label} must be an array");
|
||||
}
|
||||
$result = [];
|
||||
foreach ($value as $entry) {
|
||||
if (!is_array($entry)) {
|
||||
throw new \InvalidArgumentException("{$label} entries must be objects");
|
||||
}
|
||||
$generalId = $entry['generalId'] ?? null;
|
||||
$actionName = $entry['actionName'] ?? null;
|
||||
if (!is_int($generalId) || $generalId < 1 || !is_string($actionName) || $actionName === '') {
|
||||
throw new \InvalidArgumentException(
|
||||
"{$label} entries require a positive generalId and non-empty actionName",
|
||||
);
|
||||
}
|
||||
$result["{$generalId}:{$actionName}"] = [
|
||||
'generalId' => $generalId,
|
||||
'actionName' => $actionName,
|
||||
];
|
||||
}
|
||||
ksort($result, SORT_STRING);
|
||||
return array_values($result);
|
||||
}
|
||||
|
||||
/** @return list<array{nationId: int, actionName: string}> */
|
||||
function comparisonNationCooldownSelectors(mixed $value, string $label): array
|
||||
{
|
||||
if ($value === null) {
|
||||
return [];
|
||||
}
|
||||
if (!is_array($value)) {
|
||||
throw new \InvalidArgumentException("{$label} must be an array");
|
||||
}
|
||||
$result = [];
|
||||
foreach ($value as $entry) {
|
||||
if (!is_array($entry)) {
|
||||
throw new \InvalidArgumentException("{$label} entries must be objects");
|
||||
}
|
||||
$nationId = $entry['nationId'] ?? null;
|
||||
$actionName = $entry['actionName'] ?? null;
|
||||
if (!is_int($nationId) || $nationId < 1 || !is_string($actionName) || $actionName === '') {
|
||||
throw new \InvalidArgumentException(
|
||||
"{$label} entries require a positive nationId and non-empty actionName",
|
||||
);
|
||||
}
|
||||
$result["{$nationId}:{$actionName}"] = [
|
||||
'nationId' => $nationId,
|
||||
'actionName' => $actionName,
|
||||
];
|
||||
}
|
||||
ksort($result, SORT_STRING);
|
||||
return array_values($result);
|
||||
}
|
||||
|
||||
/** @return list<array{fromNationId: int, toNationId: int}> */
|
||||
function comparisonDiplomacyPairSelectors(mixed $value, string $label): array
|
||||
{
|
||||
if ($value === null) {
|
||||
return [];
|
||||
}
|
||||
if (!is_array($value)) {
|
||||
throw new \InvalidArgumentException("{$label} must be an array");
|
||||
}
|
||||
$result = [];
|
||||
foreach ($value as $entry) {
|
||||
if (!is_array($entry)) {
|
||||
throw new \InvalidArgumentException("{$label} entries must be objects");
|
||||
}
|
||||
$fromNationId = $entry['fromNationId'] ?? null;
|
||||
$toNationId = $entry['toNationId'] ?? null;
|
||||
if (!is_int($fromNationId) || $fromNationId < 1 || !is_int($toNationId) || $toNationId < 1) {
|
||||
throw new \InvalidArgumentException(
|
||||
"{$label} entries require positive fromNationId and toNationId",
|
||||
);
|
||||
}
|
||||
$result["{$fromNationId}:{$toNationId}"] = [
|
||||
'fromNationId' => $fromNationId,
|
||||
'toNationId' => $toNationId,
|
||||
];
|
||||
}
|
||||
ksort($result, SORT_STRING);
|
||||
return array_values($result);
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $row */
|
||||
function comparisonPickRow(array $row, array $mapping, array $jsonKeys = []): array
|
||||
{
|
||||
$result = [];
|
||||
foreach ($mapping as $canonical => $legacy) {
|
||||
if (!array_key_exists($legacy, $row)) {
|
||||
continue;
|
||||
}
|
||||
$value = $row[$legacy];
|
||||
if (in_array($legacy, $jsonKeys, true)) {
|
||||
$value = comparisonJsonValue($value);
|
||||
}
|
||||
$result[$canonical] = $value;
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
/** @param list<int> $ids */
|
||||
function comparisonRowsById(string $table, string $idColumn, array $ids): array
|
||||
{
|
||||
$db = DB::db();
|
||||
$rows = [];
|
||||
foreach ($ids as $id) {
|
||||
$row = $db->queryFirstRow(
|
||||
"SELECT * FROM `{$table}` WHERE `{$idColumn}` = %i",
|
||||
$id,
|
||||
);
|
||||
if ($row !== null) {
|
||||
$rows[] = $row;
|
||||
}
|
||||
}
|
||||
return $rows;
|
||||
}
|
||||
|
||||
function comparisonTurnStateSnapshot(array $request): array
|
||||
{
|
||||
$observe = $request['observe'] ?? [];
|
||||
if (!is_array($observe)) {
|
||||
throw new \InvalidArgumentException('observe must be an object');
|
||||
}
|
||||
$generalIds = comparisonIntegerList($observe['generalIds'] ?? [], 'generalIds');
|
||||
$cityIds = comparisonIntegerList($observe['cityIds'] ?? [], 'cityIds');
|
||||
$nationIds = comparisonIntegerList($observe['nationIds'] ?? [], 'nationIds');
|
||||
$logAfterId = $observe['logAfterId'] ?? 0;
|
||||
$messageAfterId = $observe['messageAfterId'] ?? 0;
|
||||
$includeNationHistoryLogs = $observe['includeNationHistoryLogs'] ?? false;
|
||||
$includeGlobalHistoryLogs = $observe['includeGlobalHistoryLogs'] ?? false;
|
||||
$generalCooldownSelectors = comparisonGeneralCooldownSelectors(
|
||||
$observe['generalCooldowns'] ?? [],
|
||||
'generalCooldowns',
|
||||
);
|
||||
$nationCooldownSelectors = comparisonNationCooldownSelectors(
|
||||
$observe['nationCooldowns'] ?? [],
|
||||
'nationCooldowns',
|
||||
);
|
||||
$diplomacyPairSelectors = comparisonDiplomacyPairSelectors(
|
||||
$observe['diplomacyPairs'] ?? [],
|
||||
'diplomacyPairs',
|
||||
);
|
||||
if (
|
||||
!is_int($logAfterId)
|
||||
|| $logAfterId < 0
|
||||
|| !is_int($messageAfterId)
|
||||
|| $messageAfterId < 0
|
||||
) {
|
||||
throw new \InvalidArgumentException('logAfterId and messageAfterId must be non-negative integers');
|
||||
}
|
||||
if (!is_bool($includeNationHistoryLogs)) {
|
||||
throw new \InvalidArgumentException('includeNationHistoryLogs must be a boolean');
|
||||
}
|
||||
if (!is_bool($includeGlobalHistoryLogs)) {
|
||||
throw new \InvalidArgumentException('includeGlobalHistoryLogs must be a boolean');
|
||||
}
|
||||
|
||||
$db = DB::db();
|
||||
$game = KVStorage::getStorage($db, 'game_env');
|
||||
$game->resetCache();
|
||||
$worldValues = $game->getValues([
|
||||
'year',
|
||||
'month',
|
||||
'turnterm',
|
||||
'turntime',
|
||||
'isunited',
|
||||
'scenario',
|
||||
'init_year',
|
||||
'init_month',
|
||||
'develcost',
|
||||
'killturn',
|
||||
]);
|
||||
$nextExecuteStorage = KVStorage::getStorage($db, 'next_execute');
|
||||
$nextExecuteStorage->resetCache();
|
||||
$generalCooldowns = array_map(
|
||||
static function (array $selector) use ($nextExecuteStorage): array {
|
||||
$key = "next_execute_{$selector['generalId']}_{$selector['actionName']}";
|
||||
$value = $nextExecuteStorage->getValue($key);
|
||||
return [
|
||||
...$selector,
|
||||
'nextAvailableTurn' => is_int($value) ? $value : null,
|
||||
];
|
||||
},
|
||||
$generalCooldownSelectors,
|
||||
);
|
||||
$nationCooldowns = array_map(
|
||||
static function (array $selector) use ($db): array {
|
||||
$nationStorage = KVStorage::getStorage($db, $selector['nationId'], 'nation_env');
|
||||
$nationStorage->resetCache();
|
||||
$value = $nationStorage->getValue("next_execute_{$selector['actionName']}");
|
||||
return [
|
||||
...$selector,
|
||||
'nextAvailableTurn' => is_int($value) ? $value : null,
|
||||
];
|
||||
},
|
||||
$nationCooldownSelectors,
|
||||
);
|
||||
|
||||
$generals = array_map(
|
||||
static function (array $row): array {
|
||||
$result = comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'no',
|
||||
'name' => 'name',
|
||||
'nationId' => 'nation',
|
||||
'cityId' => 'city',
|
||||
'troopId' => 'troop',
|
||||
'leadership' => 'leadership',
|
||||
'strength' => 'strength',
|
||||
'intelligence' => 'intel',
|
||||
'experience' => 'experience',
|
||||
'dedication' => 'dedication',
|
||||
'expLevel' => 'explevel',
|
||||
'officerLevel' => 'officer_level',
|
||||
'officerCityId' => 'officer_city',
|
||||
'belong' => 'belong',
|
||||
'permission' => 'permission',
|
||||
'betray' => 'betray',
|
||||
'makeLimit' => 'makelimit',
|
||||
'injury' => 'injury',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'crew' => 'crew',
|
||||
'crewTypeId' => 'crewtype',
|
||||
'train' => 'train',
|
||||
'atmos' => 'atmos',
|
||||
'age' => 'age',
|
||||
'npcState' => 'npc',
|
||||
'turnTime' => 'turntime',
|
||||
'recentWarTime' => 'recent_war',
|
||||
'lastTurn' => 'last_turn',
|
||||
'meta' => 'aux',
|
||||
'penalty' => 'penalty',
|
||||
'leadershipExp' => 'leadership_exp',
|
||||
'strengthExp' => 'strength_exp',
|
||||
'intelExp' => 'intel_exp',
|
||||
'dex1' => 'dex1',
|
||||
'dex2' => 'dex2',
|
||||
'dex3' => 'dex3',
|
||||
'dex4' => 'dex4',
|
||||
'dex5' => 'dex5',
|
||||
'specAge' => 'specage',
|
||||
'specAge2' => 'specage2',
|
||||
'killTurn' => 'killturn',
|
||||
'mySet' => 'myset',
|
||||
'specialDomestic' => 'special',
|
||||
'specialWar' => 'special2',
|
||||
'personality' => 'personal',
|
||||
'itemHorse' => 'horse',
|
||||
'itemWeapon' => 'weapon',
|
||||
'itemBook' => 'book',
|
||||
'itemExtra' => 'item',
|
||||
],
|
||||
['last_turn', 'aux', 'penalty'],
|
||||
);
|
||||
foreach ([
|
||||
'specialDomestic',
|
||||
'specialWar',
|
||||
'personality',
|
||||
'itemHorse',
|
||||
'itemWeapon',
|
||||
'itemBook',
|
||||
'itemExtra',
|
||||
] as $key) {
|
||||
$result[$key] = comparisonOptionalCode($result[$key] ?? null);
|
||||
}
|
||||
$result['maxBelong'] = (int)($result['meta']['max_belong'] ?? 0);
|
||||
$ownerId = (int)($row['owner'] ?? 0);
|
||||
$activeActionPoints = 0;
|
||||
if ($ownerId > 0) {
|
||||
$inheritanceStorage = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}");
|
||||
$inheritanceStorage->resetCache();
|
||||
$stored = $inheritanceStorage->getValue('active_action');
|
||||
if (is_array($stored) && (is_int($stored[0] ?? null) || is_float($stored[0] ?? null))) {
|
||||
$activeActionPoints = $stored[0];
|
||||
}
|
||||
}
|
||||
$result['hasOwner'] = $ownerId > 0;
|
||||
$result['inheritActiveActionPoints'] = $activeActionPoints;
|
||||
return $result;
|
||||
},
|
||||
comparisonRowsById('general', 'no', $generalIds),
|
||||
);
|
||||
$rankTypes = array_map(
|
||||
static fn(RankColumn $column): string => $column->value,
|
||||
RankColumn::cases(),
|
||||
);
|
||||
$rankData = $generalIds === []
|
||||
? []
|
||||
: iterator_to_array($db->query(
|
||||
'SELECT general_id AS generalId, nation_id AS nationId, `type`, `value`'
|
||||
. ' FROM rank_data WHERE general_id IN %li AND `type` IN %ls'
|
||||
. ' ORDER BY general_id, `type`',
|
||||
$generalIds,
|
||||
$rankTypes,
|
||||
));
|
||||
|
||||
$cities = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'city',
|
||||
'name' => 'name',
|
||||
'nationId' => 'nation',
|
||||
'level' => 'level',
|
||||
'population' => 'pop',
|
||||
'populationMax' => 'pop_max',
|
||||
'agriculture' => 'agri',
|
||||
'agricultureMax' => 'agri_max',
|
||||
'commerce' => 'comm',
|
||||
'commerceMax' => 'comm_max',
|
||||
'security' => 'secu',
|
||||
'securityMax' => 'secu_max',
|
||||
'supplyState' => 'supply',
|
||||
'frontState' => 'front',
|
||||
'defence' => 'def',
|
||||
'defenceMax' => 'def_max',
|
||||
'wall' => 'wall',
|
||||
'wallMax' => 'wall_max',
|
||||
'state' => 'state',
|
||||
'term' => 'term',
|
||||
'trust' => 'trust',
|
||||
'trade' => 'trade',
|
||||
'conflict' => 'conflict',
|
||||
'officerSet' => 'officer_set',
|
||||
],
|
||||
['conflict'],
|
||||
),
|
||||
comparisonRowsById('city', 'city', $cityIds),
|
||||
);
|
||||
|
||||
$nations = array_map(
|
||||
static function (array $row) use ($db): array {
|
||||
$projected = comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'nation',
|
||||
'name' => 'name',
|
||||
'color' => 'color',
|
||||
'capitalCityId' => 'capital',
|
||||
'gold' => 'gold',
|
||||
'rice' => 'rice',
|
||||
'tech' => 'tech',
|
||||
'level' => 'level',
|
||||
'typeCode' => 'type',
|
||||
'generalCount' => 'gennum',
|
||||
'power' => 'power',
|
||||
'war' => 'war',
|
||||
'diplomacyLimit' => 'surlimit',
|
||||
'capitalRevision' => 'capset',
|
||||
'strategicCommandLimit' => 'strategic_cmd_limit',
|
||||
'meta' => 'aux',
|
||||
],
|
||||
['aux'],
|
||||
);
|
||||
$nationStor = KVStorage::getStorage($db, (int)$row['nation'], 'nation_env');
|
||||
$receivedAssist = $nationStor->getValue('recv_assist');
|
||||
if (is_array($receivedAssist) && $receivedAssist !== []) {
|
||||
$projected['meta']['recv_assist'] = $receivedAssist;
|
||||
}
|
||||
$respondedAssist = $nationStor->getValue('resp_assist');
|
||||
if (is_array($respondedAssist) && $respondedAssist !== []) {
|
||||
$projected['meta']['resp_assist'] = $respondedAssist;
|
||||
}
|
||||
return $projected;
|
||||
},
|
||||
comparisonRowsById('nation', 'nation', $nationIds),
|
||||
);
|
||||
|
||||
$diplomacyPairs = [];
|
||||
foreach ($nationIds as $fromNationId) {
|
||||
foreach ($nationIds as $toNationId) {
|
||||
if ($fromNationId === $toNationId) {
|
||||
continue;
|
||||
}
|
||||
$diplomacyPairs["{$fromNationId}:{$toNationId}"] = [
|
||||
'fromNationId' => $fromNationId,
|
||||
'toNationId' => $toNationId,
|
||||
];
|
||||
}
|
||||
}
|
||||
foreach ($diplomacyPairSelectors as $pair) {
|
||||
$diplomacyPairs["{$pair['fromNationId']}:{$pair['toNationId']}"] = $pair;
|
||||
}
|
||||
ksort($diplomacyPairs, SORT_STRING);
|
||||
|
||||
$diplomacy = [];
|
||||
foreach ($diplomacyPairs as $pair) {
|
||||
$row = $db->queryFirstRow(
|
||||
'SELECT me, you, state, term, dead FROM diplomacy WHERE me = %i AND you = %i',
|
||||
$pair['fromNationId'],
|
||||
$pair['toNationId'],
|
||||
);
|
||||
if ($row !== null) {
|
||||
$diplomacy[] = comparisonPickRow($row, [
|
||||
'fromNationId' => 'me',
|
||||
'toNationId' => 'you',
|
||||
'state' => 'state',
|
||||
'term' => 'term',
|
||||
'dead' => 'dead',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
$generalTurns = [];
|
||||
foreach ($generalIds as $generalId) {
|
||||
foreach ($db->query(
|
||||
'SELECT general_id, turn_idx, action, arg FROM general_turn WHERE general_id = %i ORDER BY turn_idx',
|
||||
$generalId,
|
||||
) as $row) {
|
||||
$generalTurns[] = comparisonPickRow(
|
||||
$row,
|
||||
['generalId' => 'general_id', 'turnIndex' => 'turn_idx', 'action' => 'action', 'args' => 'arg'],
|
||||
['arg'],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$nationTurns = [];
|
||||
foreach ($nationIds as $nationId) {
|
||||
foreach ($db->query(
|
||||
'SELECT nation_id, officer_level, turn_idx, action, arg FROM nation_turn WHERE nation_id = %i ORDER BY officer_level, turn_idx',
|
||||
$nationId,
|
||||
) as $row) {
|
||||
$nationTurns[] = comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'nationId' => 'nation_id',
|
||||
'officerLevel' => 'officer_level',
|
||||
'turnIndex' => 'turn_idx',
|
||||
'action' => 'action',
|
||||
'args' => 'arg',
|
||||
],
|
||||
['arg'],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$logs = [];
|
||||
if ($generalIds !== []) {
|
||||
foreach ($db->query(
|
||||
'SELECT id, general_id, log_type, year, month, text FROM general_record WHERE id > %i ORDER BY id',
|
||||
$logAfterId,
|
||||
) as $row) {
|
||||
if ((int)$row['general_id'] !== 0 && !in_array((int)$row['general_id'], $generalIds, true)) {
|
||||
continue;
|
||||
}
|
||||
$generalId = (int)$row['general_id'];
|
||||
$category = (string)$row['log_type'];
|
||||
if ($category === 'battle') {
|
||||
$category = 'battle_detail';
|
||||
} elseif ($generalId === 0) {
|
||||
$category = 'summary';
|
||||
}
|
||||
$logs[] = comparisonPickRow($row, [
|
||||
'id' => 'id',
|
||||
'generalId' => 'general_id',
|
||||
'year' => 'year',
|
||||
'month' => 'month',
|
||||
'text' => 'text',
|
||||
]) + [
|
||||
'scope' => $generalId === 0 ? 'system' : 'general',
|
||||
'category' => $category,
|
||||
'nationId' => null,
|
||||
];
|
||||
}
|
||||
}
|
||||
if ($includeNationHistoryLogs && $nationIds !== []) {
|
||||
foreach ($db->query(
|
||||
'SELECT id, nation_id, year, month, text FROM world_history WHERE nation_id IN %li ORDER BY id',
|
||||
$nationIds,
|
||||
) as $row) {
|
||||
$logs[] = comparisonPickRow($row, [
|
||||
'id' => 'id',
|
||||
'nationId' => 'nation_id',
|
||||
'year' => 'year',
|
||||
'month' => 'month',
|
||||
'text' => 'text',
|
||||
]) + [
|
||||
'scope' => 'nation',
|
||||
'category' => 'history',
|
||||
'generalId' => null,
|
||||
];
|
||||
}
|
||||
}
|
||||
if ($includeGlobalHistoryLogs) {
|
||||
foreach ($db->query(
|
||||
'SELECT id, nation_id, year, month, text FROM world_history WHERE nation_id = 0 ORDER BY id',
|
||||
) as $row) {
|
||||
$logs[] = comparisonPickRow($row, [
|
||||
'id' => 'id',
|
||||
'nationId' => 'nation_id',
|
||||
'year' => 'year',
|
||||
'month' => 'month',
|
||||
'text' => 'text',
|
||||
]) + [
|
||||
'scope' => 'system',
|
||||
'category' => 'history',
|
||||
'generalId' => null,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
$messages = array_map(
|
||||
static fn(array $row): array => comparisonPickRow(
|
||||
$row,
|
||||
[
|
||||
'id' => 'id',
|
||||
'mailbox' => 'mailbox',
|
||||
'type' => 'type',
|
||||
'sourceId' => 'src',
|
||||
'destinationId' => 'dest',
|
||||
'createdAt' => 'time',
|
||||
'payload' => 'message',
|
||||
],
|
||||
['message'],
|
||||
),
|
||||
$db->query(
|
||||
'SELECT id, mailbox, type, src, dest, time, message FROM message WHERE id > %i ORDER BY id',
|
||||
$messageAfterId,
|
||||
),
|
||||
);
|
||||
|
||||
return [
|
||||
'schemaVersion' => 1,
|
||||
'engine' => 'ref',
|
||||
'world' => [
|
||||
'year' => (int)$worldValues['year'],
|
||||
'month' => (int)$worldValues['month'],
|
||||
'tickMinutes' => (int)$worldValues['turnterm'],
|
||||
'turnTime' => (string)$worldValues['turntime'],
|
||||
'isUnited' => (int)$worldValues['isunited'],
|
||||
'scenarioId' => (int)$worldValues['scenario'],
|
||||
'initYear' => (int)$worldValues['init_year'],
|
||||
'initMonth' => (int)$worldValues['init_month'],
|
||||
'develCost' => (int)$worldValues['develcost'],
|
||||
'killTurn' => (int)$worldValues['killturn'],
|
||||
'generalCooldowns' => $generalCooldowns,
|
||||
'nationCooldowns' => $nationCooldowns,
|
||||
],
|
||||
'generals' => $generals,
|
||||
'rankData' => $rankData,
|
||||
'cities' => $cities,
|
||||
'nations' => $nations,
|
||||
'diplomacy' => $diplomacy,
|
||||
'generalTurns' => $generalTurns,
|
||||
'nationTurns' => $nationTurns,
|
||||
'logs' => $logs,
|
||||
'messages' => $messages,
|
||||
'watermarks' => [
|
||||
'logId' => (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM general_record') ?? 0),
|
||||
'historyLogId' => (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM world_history') ?? 0),
|
||||
'messageId' => (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM message') ?? 0),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
function comparisonTurnStateSnapshotMain(): void
|
||||
{
|
||||
try {
|
||||
$input = stream_get_contents(STDIN);
|
||||
$request = json_decode($input === '' ? '{}' : $input, true, flags: JSON_THROW_ON_ERROR);
|
||||
if (!is_array($request)) {
|
||||
throw new \InvalidArgumentException('request must be an object');
|
||||
}
|
||||
echo json_encode(
|
||||
comparisonTurnStateSnapshot($request),
|
||||
JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
|
||||
), PHP_EOL;
|
||||
} catch (\Throwable $throwable) {
|
||||
fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
if (realpath((string)($_SERVER['SCRIPT_FILENAME'] ?? '')) === __FILE__) {
|
||||
comparisonTurnStateSnapshotMain();
|
||||
}
|
||||
+110
-102
@@ -630,11 +630,7 @@ function generalInfo(General $generalObj)
|
||||
$injury = "건강";
|
||||
}
|
||||
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
$remaining = max(0, intdiv(
|
||||
$generalObj->getTurnTick() - $clock->nowTick(),
|
||||
$clock->ticksFromMinutes(1),
|
||||
));
|
||||
$remaining = (new \DateTimeImmutable($generalObj->getTurnTime()))->diff(new \DateTimeImmutable())->i;
|
||||
|
||||
if ($nation['color'] == "") {
|
||||
$nation['color'] = "#000000";
|
||||
@@ -925,37 +921,45 @@ function banner()
|
||||
);
|
||||
}
|
||||
|
||||
function addTurn(int $tick, int $turnterm, int $turn = 1, bool $withFraction = true): int
|
||||
{
|
||||
return $tick + GameClock::TICKS_PER_TURN * $turn;
|
||||
}
|
||||
|
||||
function subTurn(int $tick, int $turnterm, int $turn = 1, bool $withFraction = true): int
|
||||
{
|
||||
return $tick - GameClock::TICKS_PER_TURN * $turn;
|
||||
}
|
||||
|
||||
function cutTurn(int $tick, int $turnterm, bool $withFraction = true): int
|
||||
{
|
||||
$remainder = $tick % GameClock::TICKS_PER_TURN;
|
||||
if ($remainder < 0) {
|
||||
$remainder += GameClock::TICKS_PER_TURN;
|
||||
}
|
||||
return $tick - $remainder;
|
||||
}
|
||||
|
||||
/** 시나리오 초기화 입력인 벽시계를 기존 01:00 기준 월 경계로 정렬합니다. */
|
||||
function cutTurnDateTime(string $date, int $turnterm, bool $withFraction = true): string
|
||||
{
|
||||
$dateObj = new \DateTime($date);
|
||||
$baseDate = new \DateTime($dateObj->format('Y-m-d'));
|
||||
$baseDate->sub(new \DateInterval('P1D'));
|
||||
$baseDate->add(new \DateInterval('PT1H'));
|
||||
$diffMin = intdiv($dateObj->getTimestamp() - $baseDate->getTimestamp(), 60);
|
||||
$diffMin -= $diffMin % $turnterm;
|
||||
$baseDate->add(new \DateInterval("PT{$diffMin}M"));
|
||||
return $baseDate->format($withFraction ? 'Y-m-d H:i:s.u' : 'Y-m-d H:i:s');
|
||||
}
|
||||
function addTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
|
||||
{
|
||||
$date = new \DateTime($date);
|
||||
$target = $turnterm * $turn;
|
||||
$date->add(new \DateInterval("PT{$target}M"));
|
||||
if ($withFraction) {
|
||||
return $date->format('Y-m-d H:i:s.u');
|
||||
}
|
||||
return $date->format('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
function subTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
|
||||
{
|
||||
$date = new \DateTime($date);
|
||||
$target = $turnterm * $turn;
|
||||
$date->sub(new \DateInterval("PT{$target}M"));
|
||||
if ($withFraction) {
|
||||
return $date->format('Y-m-d H:i:s.u');
|
||||
}
|
||||
return $date->format('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
function cutTurn($date, int $turnterm, bool $withFraction = true)
|
||||
{
|
||||
$date = new \DateTime($date);
|
||||
|
||||
$baseDate = new \DateTime($date->format('Y-m-d'));
|
||||
$baseDate->sub(new \DateInterval("P1D"));
|
||||
$baseDate->add(new \DateInterval("PT1H"));
|
||||
|
||||
$diffMin = intdiv($date->getTimeStamp() - $baseDate->getTimeStamp(), 60);
|
||||
$diffMin -= $diffMin % $turnterm;
|
||||
|
||||
$baseDate->add(new \DateInterval("PT{$diffMin}M"));
|
||||
if ($withFraction) {
|
||||
return $baseDate->format('Y-m-d H:i:s.u');
|
||||
}
|
||||
return $baseDate->format('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
function cutDay($date, int $turnterm, bool $withFraction = true)
|
||||
{
|
||||
@@ -997,9 +1001,11 @@ function increaseRefresh($type = "", $cnt = 1)
|
||||
$generalID = $session->generalID;
|
||||
$userGrade = $session->userGrade;
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$date = GameClock::fromStorage($gameStor)->nowTick();
|
||||
$dateObj = new \DateTimeImmutable();
|
||||
$date = TimeUtil::format($dateObj, false);
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$isunited = $gameStor->isunited;
|
||||
$opentime = $gameStor->opentime;
|
||||
|
||||
@@ -1139,19 +1145,18 @@ function unlock(): bool
|
||||
return $db->affectedRows() > 0;
|
||||
}
|
||||
|
||||
function timeover(): bool
|
||||
function timeover(): bool
|
||||
{
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
list($turnterm, $turntime) = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$diff = $clock->nowTick() - Util::toInt($turntime);
|
||||
list($turnterm, $turntime) = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
|
||||
$diff = (new \DateTime())->getTimestamp() - (new \DateTime($turntime))->getTimestamp();
|
||||
|
||||
$t = min($turnterm, 5);
|
||||
|
||||
$term = $clock->ticksFromSeconds($t);
|
||||
if ($diff >= $term || $diff < 0) {
|
||||
$term = $diff;
|
||||
if ($term >= $t || $term < 0) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
@@ -1164,8 +1169,9 @@ function checkDelay()
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
//서버정보
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$timeMinDiff = intdiv($clock->nowTick() - Util::toInt($gameStor->turntime), $clock->ticksFromMinutes(1));
|
||||
$now = new \DateTimeImmutable();
|
||||
$turntime = new \DateTimeImmutable($gameStor->turntime);
|
||||
$timeMinDiff = intdiv($now->getTimestamp() - $turntime->getTimestamp(), 60);
|
||||
|
||||
// 1턴이상 갱신 없었으면 서버 지연
|
||||
$term = $gameStor->turnterm;
|
||||
@@ -1179,17 +1185,20 @@ function checkDelay()
|
||||
//지연 해야할 밀린 턴 횟수
|
||||
$iter = intdiv($timeMinDiff, $term);
|
||||
if ($iter > $threshold) {
|
||||
$minute = $iter * $term;
|
||||
$delayTick = $clock->ticksFromMinutes($minute);
|
||||
$gameStor->turntime = Util::toInt($gameStor->turntime) + $delayTick;
|
||||
$gameStor->starttime = Util::toInt($gameStor->starttime) + $delayTick;
|
||||
|
||||
$db->update('general', [
|
||||
'turntime' => $db->sqleval('turntime + %i', $delayTick)
|
||||
], true);
|
||||
$db->update('ng_auction', [
|
||||
'close_tick' => $db->sqleval('close_tick + %i', $delayTick)
|
||||
], 'finished = 0');
|
||||
$minute = $iter * $term;
|
||||
$newTurntime = $turntime->add(new \DateInterval("PT{$minute}M"));
|
||||
$newNextTurntime = $turntime->add(new \DateInterval("PT{$term}M"));
|
||||
$gameStor->turntime = $newTurntime->format('Y-m-d H:i:s');
|
||||
$gameStor->starttime = (new \DateTimeImmutable($gameStor->starttime))
|
||||
->add(new \DateInterval("PT{$minute}M"))
|
||||
->format('Y-m-d H:i:s');
|
||||
|
||||
$db->update('general', [
|
||||
'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
|
||||
], 'turntime<=DATE_ADD(turntime, INTERVAL %i MINUTE)', $term);
|
||||
$db->update('ng_auction', [
|
||||
'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
|
||||
], 'finished = 0');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1238,15 +1247,17 @@ function updateOnline()
|
||||
$gameStor->online_nation = join(', ', $onlineNation);
|
||||
}
|
||||
|
||||
function turnDate($curtime)
|
||||
function turnDate($curtime)
|
||||
{
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$admin = $gameStor->getValues(['startyear', 'starttime', 'turnterm', 'year', 'month']);
|
||||
|
||||
$turn = $admin['starttime'];
|
||||
$curturn = cutTurn(Util::toInt($curtime), $admin['turnterm']);
|
||||
$num = intdiv($curturn - Util::toInt($turn), GameClock::TICKS_PER_TURN);
|
||||
$curturn = cutTurn($curtime, $admin['turnterm']);
|
||||
$term = $admin['turnterm'];
|
||||
|
||||
$num = intdiv((strtotime($curturn) - strtotime($turn)), $term * 60);
|
||||
|
||||
$date = $admin['startyear'] * 12;
|
||||
$date += $num;
|
||||
@@ -1694,21 +1705,12 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
|
||||
return giveRandomUniqueItem($rng, $general, $acquireType);
|
||||
}
|
||||
|
||||
function getAdmin()
|
||||
{
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$admin = $gameStor->getAll();
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
foreach (['turntime', 'starttime', 'opentime', 'tnmt_time'] as $key) {
|
||||
if (($admin[$key] ?? null) !== null) {
|
||||
$admin["{$key}_display"] = $clock->formatTick(Util::toInt($admin[$key]), true);
|
||||
}
|
||||
}
|
||||
$admin['clock_now_tick'] = $clock->nowTick();
|
||||
$admin['clock_now_display'] = $clock->formatTick($admin['clock_now_tick'], true);
|
||||
return $admin;
|
||||
}
|
||||
function getAdmin()
|
||||
{
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
return $gameStor->getAll();
|
||||
}
|
||||
|
||||
/** @return General[] */
|
||||
function deleteNation(General $lord, bool $applyDB): array
|
||||
@@ -2197,29 +2199,35 @@ function SabotageInjury(RandUtil $rng, array $cityGeneralList, string $reason):
|
||||
return $injuryCount;
|
||||
}
|
||||
|
||||
function getRandTurn(RandUtil $rng, int $term, ?int $baseTick = null): int
|
||||
{
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$baseTick ??= $clock->nowTick();
|
||||
|
||||
$randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
|
||||
$randMicrosecond = $rng->nextRangeInt(0, 999999); // 레거시 RNG 소비 6자리 유지
|
||||
|
||||
return $baseTick
|
||||
+ $clock->ticksFromSeconds($randSecond)
|
||||
+ intdiv($randMicrosecond * $clock->ticksPerSecond(), 1_000_000);
|
||||
}
|
||||
|
||||
function getRandTurn2(RandUtil $rng, int $term, ?int $baseTick = null): int
|
||||
{
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$baseTick ??= $clock->nowTick();
|
||||
$randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
|
||||
$randMicrosecond = $rng->nextRangeInt(0, 999999); // 레거시 RNG 소비 6자리 유지
|
||||
|
||||
return $baseTick
|
||||
- $clock->ticksFromSeconds($randSecond)
|
||||
- intdiv($randMicrosecond * $clock->ticksPerSecond(), 1_000_000);
|
||||
}
|
||||
function getRandTurn(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime = null)
|
||||
{
|
||||
if ($baseDateTime === null) {
|
||||
$baseDateTime = new \DateTimeImmutable();
|
||||
} else if ($baseDateTime instanceof \DateTime) {
|
||||
$baseDateTime = \DateTimeImmutable::createFromMutable($baseDateTime);
|
||||
} else if ($baseDateTime instanceof \DateTimeImmutable) {
|
||||
//do Nothing
|
||||
} else {
|
||||
throw new MustNotBeReachedException();
|
||||
}
|
||||
|
||||
$randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
|
||||
$randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
|
||||
|
||||
return TimeUtil::format($baseDateTime->add(TimeUtil::secondsToDateInterval($randSecond + $randFraction)), true);
|
||||
}
|
||||
|
||||
function getRandTurn2(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime = null)
|
||||
{
|
||||
if ($baseDateTime === null) {
|
||||
$baseDateTime = new \DateTimeImmutable();
|
||||
} else if ($baseDateTime instanceof \DateTime) {
|
||||
$baseDateTime = \DateTimeImmutable::createFromMutable($baseDateTime);
|
||||
} else {
|
||||
throw new MustNotBeReachedException();
|
||||
}
|
||||
$randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
|
||||
$randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
|
||||
|
||||
return $baseDateTime->sub(TimeUtil::secondsToDateInterval($randSecond + $randFraction))->format('Y-m-d H:i:s.u');
|
||||
}
|
||||
|
||||
@@ -62,12 +62,11 @@ function processAuction()
|
||||
{
|
||||
$db = DB::db();
|
||||
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$nowTick = GameClock::fromStorage($gameStor)->nowTick();
|
||||
$now = TimeUtil::now();
|
||||
|
||||
$auctionList = $db->queryAllLists(
|
||||
'SELECT id, `type` FROM ng_auction WHERE `close_tick` <= %i AND finished = 0',
|
||||
$nowTick
|
||||
'SELECT id, `type` FROM ng_auction WHERE `close_date` <= %s AND finished = 0',
|
||||
$now
|
||||
);
|
||||
|
||||
if (!$auctionList) {
|
||||
|
||||
+37
-65
@@ -42,21 +42,15 @@ function pushGeneralCommand(int $generalID, int $turnCnt=1){
|
||||
|
||||
$db = DB::db();
|
||||
|
||||
$db->query(
|
||||
'UPDATE general_turn AS dst
|
||||
LEFT JOIN general_turn AS src
|
||||
ON src.general_id = dst.general_id
|
||||
AND src.turn_idx = dst.turn_idx - %i
|
||||
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||
WHERE dst.general_id = %i',
|
||||
$turnCnt,
|
||||
'휴식',
|
||||
'{}',
|
||||
'휴식',
|
||||
$generalID
|
||||
);
|
||||
$db->update('general_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
|
||||
], 'general_id=%i ORDER BY turn_idx DESC', $generalID);
|
||||
$db->update('general_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxTurn),
|
||||
'action'=>'휴식',
|
||||
'arg'=>'{}',
|
||||
'brief'=>'휴식'
|
||||
], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
|
||||
}
|
||||
|
||||
function pullGeneralCommand(int $generalID, int $turnCnt=1){
|
||||
@@ -73,21 +67,15 @@ function pullGeneralCommand(int $generalID, int $turnCnt=1){
|
||||
|
||||
$db = DB::db();
|
||||
|
||||
$db->query(
|
||||
'UPDATE general_turn AS dst
|
||||
LEFT JOIN general_turn AS src
|
||||
ON src.general_id = dst.general_id
|
||||
AND src.turn_idx = dst.turn_idx + %i
|
||||
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||
WHERE dst.general_id = %i',
|
||||
$turnCnt,
|
||||
'휴식',
|
||||
'{}',
|
||||
'휴식',
|
||||
$generalID
|
||||
);
|
||||
$db->update('general_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx + %i', GameConst::$maxTurn),
|
||||
'action'=>'휴식',
|
||||
'arg'=>'{}',
|
||||
'brief'=>'휴식'
|
||||
], 'general_id=%i AND turn_idx < %i', $generalID, $turnCnt);
|
||||
$db->update('general_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
|
||||
], 'general_id=%i ORDER BY turn_idx ASC', $generalID);
|
||||
}
|
||||
|
||||
function repeatGeneralCommand(int $generalId, int $turnCnt){
|
||||
@@ -138,23 +126,15 @@ function pushNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
|
||||
|
||||
$db = DB::db();
|
||||
|
||||
$db->query(
|
||||
'UPDATE nation_turn AS dst
|
||||
LEFT JOIN nation_turn AS src
|
||||
ON src.nation_id = dst.nation_id
|
||||
AND src.officer_level = dst.officer_level
|
||||
AND src.turn_idx = dst.turn_idx - %i
|
||||
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||
WHERE dst.nation_id = %i AND dst.officer_level = %i',
|
||||
$turnCnt,
|
||||
'휴식',
|
||||
'{}',
|
||||
'휴식',
|
||||
$nationID,
|
||||
$officerLevel
|
||||
);
|
||||
$db->update('nation_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
|
||||
], 'nation_id=%i AND officer_level=%i ORDER BY turn_idx DESC', $nationID, $officerLevel);
|
||||
$db->update('nation_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxChiefTurn),
|
||||
'action'=>'휴식',
|
||||
'arg'=>'{}',
|
||||
'brief'=>'휴식'
|
||||
], 'nation_id=%i AND officer_level=%i AND turn_idx >= %i ORDER BY turn_idx ASC', $nationID, $officerLevel, GameConst::$maxChiefTurn);
|
||||
}
|
||||
|
||||
function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
|
||||
@@ -177,23 +157,15 @@ function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
|
||||
|
||||
$db = DB::db();
|
||||
|
||||
$db->query(
|
||||
'UPDATE nation_turn AS dst
|
||||
LEFT JOIN nation_turn AS src
|
||||
ON src.nation_id = dst.nation_id
|
||||
AND src.officer_level = dst.officer_level
|
||||
AND src.turn_idx = dst.turn_idx + %i
|
||||
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||
WHERE dst.nation_id = %i AND dst.officer_level = %i',
|
||||
$turnCnt,
|
||||
'휴식',
|
||||
'{}',
|
||||
'휴식',
|
||||
$nationID,
|
||||
$officerLevel
|
||||
);
|
||||
$db->update('nation_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx + %i', GameConst::$maxChiefTurn),
|
||||
'action'=>'휴식',
|
||||
'arg'=>'{}',
|
||||
'brief'=>'휴식',
|
||||
], 'nation_id=%i AND officer_level=%i AND turn_idx < %i', $nationID, $officerLevel, $turnCnt);
|
||||
$db->update('nation_turn', [
|
||||
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
|
||||
], 'nation_id=%i AND officer_level=%i ORDER BY turn_idx ASC', $nationID, $officerLevel);
|
||||
}
|
||||
|
||||
function repeatNationCommand(int $nationID, int $officerLevel, int $turnCnt){
|
||||
@@ -522,4 +494,4 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
|
||||
'arg_test'=>true,
|
||||
'reason'=>'success'
|
||||
];
|
||||
}
|
||||
}
|
||||
+6
-14
@@ -651,24 +651,16 @@ function checkStatistic()
|
||||
}
|
||||
|
||||
|
||||
function convForOldGeneral(array $general, int $year, int $month)
|
||||
{
|
||||
$general['history'] = getGeneralHistoryLogAll($general['no']);
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
$turnTimeDisplay = $clock->formatTick(Util::toInt($general['turntime']), true);
|
||||
$general['turntime_tick'] = Util::toInt($general['turntime']);
|
||||
$general['turntime'] = $turnTimeDisplay;
|
||||
if ($general['recent_war'] !== null) {
|
||||
$general['recent_war_tick'] = Util::toInt($general['recent_war']);
|
||||
$general['recent_war'] = $clock->formatTick(Util::toInt($general['recent_war']), true);
|
||||
}
|
||||
return [
|
||||
function convForOldGeneral(array $general, int $year, int $month)
|
||||
{
|
||||
$general['history'] = getGeneralHistoryLogAll($general['no']);
|
||||
return [
|
||||
'server_id' => UniqueConst::$serverID,
|
||||
'general_no' => $general['no'],
|
||||
'owner' => $general['owner'],
|
||||
'name' => $general['name'],
|
||||
'last_yearmonth' => $year * 100 + $month,
|
||||
'turntime' => $turnTimeDisplay,
|
||||
'turntime' => $general['turntime'],
|
||||
'data' => Json::encode($general)
|
||||
];
|
||||
}
|
||||
@@ -742,7 +734,7 @@ function checkEmperior()
|
||||
|
||||
/** @var int[] */
|
||||
$auctionList = $db->queryFirstColumn(
|
||||
'SELECT `id` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0 ORDER BY `close_tick` ASC',
|
||||
'SELECT `id` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0 ORDER BY `close_date` ASC',
|
||||
AuctionType::UniqueItem->value
|
||||
);
|
||||
foreach($auctionList as $auctionID){
|
||||
|
||||
@@ -4,10 +4,6 @@ namespace sammo;
|
||||
|
||||
function printLimitMsg($turntime)
|
||||
{
|
||||
if (is_int($turntime) || (is_string($turntime) && ctype_digit(ltrim($turntime, '-')))) {
|
||||
$gameStor = KVStorage::getStorage(DB::db(), 'game_env');
|
||||
$turntime = GameClock::fromStorage($gameStor)->formatTick(Util::toInt($turntime), true);
|
||||
}
|
||||
//FIXME: template로 이동.
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
|
||||
@@ -61,12 +61,8 @@ function chiefTurnTable()
|
||||
";
|
||||
}
|
||||
|
||||
function templateLimitMsg(string $turntime): string
|
||||
{
|
||||
if (ctype_digit(ltrim($turntime, '-'))) {
|
||||
$gameStor = KVStorage::getStorage(DB::db(), 'game_env');
|
||||
$turntime = GameClock::fromStorage($gameStor)->formatTick(Util::toInt($turntime), true);
|
||||
}
|
||||
function templateLimitMsg(string $turntime): string
|
||||
{
|
||||
return "이미 너무 많은 접속을 하셨습니다. 다음 턴에 다시 시도해주세요. (턴시간: {$turntime})";
|
||||
}
|
||||
|
||||
|
||||
+8
-11
@@ -17,10 +17,10 @@ function processTournament()
|
||||
{
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
|
||||
$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time', 'turnterm', 'last_tournament_betting_id']);
|
||||
$offset = intdiv($clock->nowTick() - Util::toInt($admin['tnmt_time']), $clock->ticksPerSecond());
|
||||
$now = new \DateTime();
|
||||
$offset = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
|
||||
|
||||
//수동일땐 무시
|
||||
if (!$admin['tnmt_auto']) {
|
||||
@@ -122,10 +122,10 @@ function processTournament()
|
||||
if ($tnmt == 6) {
|
||||
$betTerm = Util::valueFit($unit * 60, null, 3600);
|
||||
//처리 초 더한 날짜
|
||||
$dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i + $betTerm);
|
||||
$gameStor->tournament = $tnmt;
|
||||
$gameStor->phase = $phase;
|
||||
$gameStor->tnmt_time = Util::toInt($admin['tnmt_time'])
|
||||
+ $clock->ticksFromSeconds($unit * $i + $betTerm);
|
||||
$gameStor->tnmt_time = $dt;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -133,7 +133,7 @@ function processTournament()
|
||||
$second = $unit * $iter;
|
||||
$gameStor->tournament = $tnmt;
|
||||
$gameStor->phase = $phase;
|
||||
$gameStor->tnmt_time = Util::toInt($admin['tnmt_time']) + $clock->ticksFromSeconds($second);
|
||||
$gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
function getTournamentTermText(int $turnTerm)
|
||||
@@ -160,8 +160,7 @@ function getTournamentTime()
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
list($tnmt, $tnmt_time) = $gameStor->getValuesAsArray(['tournament', 'tnmt_time']);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$dt = substr($clock->formatTick(Util::toInt($tnmt_time)), 11, 5);
|
||||
$dt = substr($tnmt_time, 11, 5);
|
||||
switch ($tnmt) {
|
||||
case 1:
|
||||
$tnmt = "개막시간 {$dt}";
|
||||
@@ -285,11 +284,9 @@ function startTournament($type)
|
||||
$admin = $gameStor->getValues(['year', 'month', 'turnterm']);
|
||||
$turnTerm = $admin['turnterm'];
|
||||
$unit = calcTournamentTerm($turnTerm);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
|
||||
$gameStor->tnmt_auto = true;
|
||||
// 기존 startTournament은 unit을 분으로 더하므로 그 계약을 유지합니다.
|
||||
$gameStor->tnmt_time = $clock->nowTick() + $clock->ticksFromMinutes($unit);
|
||||
$gameStor->tnmt_time = (new \DateTimeImmutable())->add(new \DateInterval("PT{$unit}M"))->format('Y-m-d H:i:s');
|
||||
$gameStor->tournament = 1;
|
||||
$gameStor->tnmt_type = $type;
|
||||
$gameStor->last_tournament_betting_id = 0;
|
||||
@@ -1174,7 +1171,7 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type)
|
||||
}
|
||||
$damage1 *= $factor1;
|
||||
$damage2 *= $factor2;
|
||||
|
||||
|
||||
//1합 승부
|
||||
if ($phase == 1) {
|
||||
|
||||
|
||||
@@ -16,10 +16,12 @@ $session = Session::requireLogin([])->setReadOnly();
|
||||
$userID = Session::getUserID();
|
||||
|
||||
|
||||
$oNow = new \DateTimeImmutable();
|
||||
|
||||
$now = $oNow->format('Y-m-d H:i:s');
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$now = $clock->nowTick();
|
||||
|
||||
$oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
|
||||
if($oldGeneral !== null){
|
||||
@@ -42,14 +44,15 @@ if($npcmode!=1){
|
||||
]);
|
||||
}
|
||||
|
||||
$token = $db->queryFirstRow('SELECT * FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%i', $userID, $now);
|
||||
$token = $db->queryFirstRow('SELECT * FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
|
||||
$pickResult = [];
|
||||
|
||||
|
||||
if($token && $refresh){
|
||||
$pickMoreFrom = Util::toInt($token['pick_more_from']);
|
||||
$pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
|
||||
$nowT = $oNow->getTimestamp();
|
||||
|
||||
if($now >= $pickMoreFrom){
|
||||
if($nowT >= $pickMoreFrom){
|
||||
$oldPickResult = Json::decode($token['pick_result']);
|
||||
|
||||
foreach($keepResult as $keepId){
|
||||
@@ -72,14 +75,15 @@ if($token && $refresh){
|
||||
}
|
||||
|
||||
if($token && !$refresh){
|
||||
$pickMoreFrom = Util::toInt($token['pick_more_from']);
|
||||
$pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
|
||||
$nowT = $oNow->getTimestamp();
|
||||
|
||||
Json::die([
|
||||
'result'=>true,
|
||||
'pick'=>Json::decode($token['pick_result']),
|
||||
'pickMoreFrom'=>$clock->formatTick($pickMoreFrom),
|
||||
'pickMoreSeconds'=>intdiv($pickMoreFrom - $now, $clock->ticksPerSecond()),
|
||||
'validUntil'=>$clock->formatTick(Util::toInt($token['valid_until']))
|
||||
'pickMoreFrom'=>$token['pick_more_from'],
|
||||
'pickMoreSeconds'=>$pickMoreFrom-$nowT,
|
||||
'validUntil'=>$token['valid_until']
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -96,7 +100,7 @@ foreach($db->query('SELECT `no`, `name`, leadership, strength, intel, nation, im
|
||||
$weight[$general['no']] = pow($allStat, 1.5);
|
||||
}
|
||||
|
||||
foreach($db->queryFirstColumn('SELECT pick_result FROM select_npc_token WHERE `owner`!=%i AND valid_until >=%i', $userID, $now) as $reserved){
|
||||
foreach($db->queryFirstColumn('SELECT pick_result FROM select_npc_token WHERE `owner`!=%i AND valid_until >=%s', $userID, $now) as $reserved){
|
||||
$reserved = Json::decode($reserved);
|
||||
foreach(array_keys($reserved) as $reservedNPC){
|
||||
if(key_exists($reservedNPC, $weight)){
|
||||
@@ -127,8 +131,8 @@ $newNonce = random_int(0, 0xfffffff);
|
||||
$validSecond = max(VALID_SECOND, $turnterm*40);
|
||||
$pickMoreSecond = max(PICK_MORE_SECOND, Util::round(pow($turnterm, 0.672)*8));
|
||||
|
||||
$validUntil = $now + $clock->ticksFromSeconds($validSecond);
|
||||
$pickMoreFrom = $now + $clock->ticksFromSeconds($pickMoreSecond);
|
||||
$validUntil = $oNow->add(new \DateInterval(sprintf('PT%dS', $validSecond)));
|
||||
$pickMoreFrom = $oNow->add(new \DateInterval(sprintf('PT%dS', $pickMoreSecond)));
|
||||
|
||||
$db->delete('select_npc_token', 'valid_until < %s', $now);
|
||||
|
||||
@@ -136,8 +140,8 @@ $inserted = 0;
|
||||
|
||||
if($token){
|
||||
$db->update('select_npc_token', [
|
||||
'valid_until'=>$validUntil,
|
||||
'pick_more_from'=>$pickMoreFrom,
|
||||
'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
|
||||
'pick_more_from'=>$pickMoreFrom->format('Y-m-d H:i:s'),
|
||||
'pick_result'=>Json::encode($pickResult),
|
||||
'nonce'=>$newNonce
|
||||
], 'owner = %i AND nonce = %i', $userID, $token['nonce']);
|
||||
@@ -148,8 +152,8 @@ if($token){
|
||||
else{
|
||||
$db->insertIgnore('select_npc_token', [
|
||||
'owner'=>$userID,
|
||||
'valid_until'=>$validUntil,
|
||||
'pick_more_from'=>$now,
|
||||
'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
|
||||
'pick_more_from'=>'2000-01-01 01:00:00',
|
||||
'pick_result'=>Json::encode($pickResult),
|
||||
'nonce'=>$newNonce
|
||||
]);
|
||||
@@ -169,7 +173,7 @@ if($inserted === 0){
|
||||
Json::die([
|
||||
'result'=>true,
|
||||
'pick'=>$pickResult,
|
||||
'pickMoreFrom'=>$clock->formatTick(($inserted===-1)?$pickMoreFrom:$now),
|
||||
'pickMoreFrom'=>($inserted===-1)?$pickMoreFrom->format('Y-m-d H:i:s'):'2000-01-01 01:00:00',
|
||||
'pickMoreSeconds'=>($inserted===-1)?$pickMoreSecond:0,
|
||||
'validUntil'=>$clock->formatTick($validUntil)
|
||||
]);
|
||||
'validUntil'=>$validUntil->format('Y-m-d H:i:s')
|
||||
]);
|
||||
@@ -43,10 +43,12 @@ function putInfoText(&$info, ?array $currentTargetEnv){
|
||||
$session = Session::requireLogin([])->setReadOnly();
|
||||
$userID = Session::getUserID();
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$now = $clock->nowTick();
|
||||
$oNow = new \DateTimeImmutable();
|
||||
|
||||
$now = $oNow->format('Y-m-d H:i:s');
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
$eventEnv = $gameStor->getValues(['npcmode', 'startyear', 'year', 'month']);
|
||||
$npcmode = $eventEnv['npcmode'];
|
||||
@@ -86,7 +88,7 @@ if($tokens){
|
||||
Json::die([
|
||||
'result'=>true,
|
||||
'pick'=>$pick,
|
||||
'validUntil'=>$clock->formatTick(Util::toInt($valid_until))
|
||||
'validUntil'=>$valid_until
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -106,5 +108,5 @@ sortTokens($pick);//좀 무식하지만..
|
||||
Json::die([
|
||||
'result'=>true,
|
||||
'pick'=>$pick,
|
||||
'validUntil'=>$valid_until === null ? null : $clock->formatTick(Util::toInt($valid_until))
|
||||
'validUntil'=>$valid_until
|
||||
]);
|
||||
|
||||
+2
-2
@@ -211,7 +211,7 @@ try{
|
||||
$show_img_level,
|
||||
!!$tournament_trig,
|
||||
$join_mode,
|
||||
TimeUtil::format(GameClock::readWallTime(), false),
|
||||
TimeUtil::now(),
|
||||
$autorun_user
|
||||
));
|
||||
}
|
||||
@@ -220,4 +220,4 @@ catch(\Exception $e){
|
||||
'result'=>false,
|
||||
'reason'=>$e->getMessage()
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -24,8 +24,8 @@ $db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$rootDB = RootDB::db();
|
||||
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$now = $clock->nowTick();
|
||||
$oNow = new \DateTimeImmutable();
|
||||
$now = $oNow->format('Y-m-d H:i:s');
|
||||
|
||||
$member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
|
||||
if(!$member){
|
||||
@@ -139,4 +139,4 @@ $rootDB->insert('member_log', [
|
||||
Json::die([
|
||||
'result'=>true,
|
||||
'reason'=>'success'
|
||||
]);
|
||||
]);
|
||||
@@ -37,8 +37,8 @@ $db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
$rootDB = RootDB::db();
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$now = $clock->nowTick();
|
||||
$oNow = new \DateTimeImmutable();
|
||||
$now = $oNow->format('Y-m-d H:i:s');
|
||||
|
||||
$hasGeneralID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
|
||||
if($hasGeneralID){
|
||||
@@ -176,11 +176,7 @@ $builder->setOwner($userID);
|
||||
$builder->setOwnerName($userNick);
|
||||
$builder->setKillturn(5);
|
||||
$builder->setNPCType(0);
|
||||
$builder->setAuxVar('next_change', $now + GameClock::TICKS_PER_TURN * 12);
|
||||
$builder->setAuxVar(
|
||||
'prestart_delete_after',
|
||||
addTurn($now, $env['turnterm'], GameConst::$minTurnDieOnPrestart)
|
||||
);
|
||||
$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
|
||||
$builder->fillRemainSpecAsZero($env);
|
||||
if ($isCentennialAllStar) {
|
||||
$candidateCities = $db->queryFirstColumn(
|
||||
|
||||
@@ -19,7 +19,6 @@ if(!class_exists('\\sammo\\DB')){
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
|
||||
if(file_exists(__DIR__.'/.htaccess')){
|
||||
$reserved = $db->queryFirstRow(
|
||||
@@ -76,8 +75,8 @@ $admin['maxUserCnt'] = $admin['maxgeneral'];
|
||||
$admin['npcMode'] = $admin['npcmode'];
|
||||
$admin['turnTerm'] = $admin['turnterm'];
|
||||
$admin['isUnited'] = $admin['isunited'];
|
||||
$admin['starttime'] = substr($clock->formatTick(Util::toInt($admin['opentime'])), 5, 11);
|
||||
$admin['turntime'] = substr($clock->formatTick(Util::toInt($admin['turntime'])), 5, 11);
|
||||
$admin['starttime'] = substr($admin['opentime'], 5, 11);
|
||||
$admin['turntime'] = substr($admin['turntime'], 5, 11);
|
||||
unset($admin['npcmode']);
|
||||
unset($admin['maxgeneral']);
|
||||
unset($admin['turnterm']);
|
||||
@@ -132,4 +131,4 @@ if($general){
|
||||
Json::die([
|
||||
'game'=>$admin,
|
||||
'me'=>$me?:null
|
||||
]);
|
||||
]);
|
||||
@@ -77,8 +77,7 @@ $month = $query['month'];
|
||||
$repeatCnt = $query['repeatCnt'];
|
||||
|
||||
$rawAttacker = $query['attackerGeneral'];
|
||||
$battleClock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
$rawAttacker['turntime'] = $battleClock->formatTick($battleClock->nowTick());
|
||||
$rawAttacker['turntime'] = TimeUtil::now();
|
||||
$rawAttackerCity = $query['attackerCity'];
|
||||
$rawAttackerNation = $query['attackerNation'];
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ $db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
$rootDB = RootDB::db();
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$now = $clock->nowTick();
|
||||
$oNow = new \DateTimeImmutable();
|
||||
$now = $oNow->format('Y-m-d H:i:s');
|
||||
|
||||
$generalID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
|
||||
if(!$generalID){
|
||||
@@ -181,7 +181,7 @@ if ($isCentennialAllStar) {
|
||||
if(key_exists('generalName', $info)){
|
||||
$generalObj->updateVar('name', $info['generalName']);
|
||||
}
|
||||
$generalObj->setAuxVar('next_change', $now + GameClock::TICKS_PER_TURN * 12);
|
||||
$generalObj->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $turnterm));
|
||||
|
||||
$userNick = $ownerInfo['name'];
|
||||
$generalObj->setVar('owner_name', $userNick);
|
||||
|
||||
+2
-4
@@ -11,11 +11,9 @@ $db = DB::db();
|
||||
$updated = false;
|
||||
$locked = false;
|
||||
$lastExecuted = TurnExecutionHelper::executeAllCommand($updated, $locked);
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
Json::die([
|
||||
'result' => true,
|
||||
'updated' => $updated,
|
||||
'locked' => $locked,
|
||||
'lastExecutedTick' => $lastExecuted,
|
||||
'lastExecuted' => $clock->formatTick($lastExecuted, true),
|
||||
]);
|
||||
'lastExecuted' => $lastExecuted,
|
||||
]);
|
||||
@@ -230,6 +230,7 @@ function processWar_NG(
|
||||
WarUnitGeneral $attacker,
|
||||
callable $getNextDefender,
|
||||
WarUnitCity $city,
|
||||
?callable $trace = null,
|
||||
): bool {
|
||||
$templates = new \League\Plates\Engine(__DIR__ . '/templates');
|
||||
|
||||
@@ -245,6 +246,26 @@ function processWar_NG(
|
||||
/** @var WarUnit */
|
||||
$defender = ($getNextDefender)(null, true);
|
||||
$conquerCity = false;
|
||||
$traceSeq = 0;
|
||||
$emitTrace = function (string $event, ?WarUnit $currentDefender, array $details = []) use (
|
||||
$trace,
|
||||
&$traceSeq,
|
||||
$attacker,
|
||||
$city
|
||||
): void {
|
||||
if ($trace === null) {
|
||||
return;
|
||||
}
|
||||
$trace([
|
||||
'seq' => $traceSeq++,
|
||||
'event' => $event,
|
||||
'attacker' => buildWarTraceUnitSnapshot($attacker),
|
||||
'defender' => $currentDefender === null ? null : buildWarTraceUnitSnapshot($currentDefender),
|
||||
'city' => buildWarTraceUnitSnapshot($city),
|
||||
'details' => $details,
|
||||
]);
|
||||
};
|
||||
$emitTrace('battle_start', $defender, ['seed' => $warSeed]);
|
||||
|
||||
$josaRo = JosaUtil::pick($city->getName(), '로');
|
||||
$josaYi = JosaUtil::pick($attacker->getName(), '이');
|
||||
@@ -277,6 +298,7 @@ function processWar_NG(
|
||||
$logger->pushGlobalHistoryLog("<M><b>【패퇴】</b></><D><b>{$defender->getNationVar('name')}</b></>{$josaYi} 병량 부족으로 <G><b>{$defender->getName()}</b></>{$josaUl} 뺏기고 말았습니다.");
|
||||
|
||||
$conquerCity = true;
|
||||
$emitTrace('supply_retreat', $defender);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -332,18 +354,34 @@ function processWar_NG(
|
||||
$initCaller->merge($defender->getGeneral()->getBattleInitSkillTriggerList($defender));
|
||||
|
||||
$initCaller->fire($attacker->rng, [], [$attacker, $defender]);
|
||||
$emitTrace('opponent_initialized', $defender);
|
||||
}
|
||||
|
||||
$attacker->beginPhase();
|
||||
$defender->beginPhase();
|
||||
if ($trace !== null) {
|
||||
$emitTrace('phase_power', $defender, [
|
||||
'attackerAttack' => $attacker->getComputedAttack(),
|
||||
'attackerDefence' => $attacker->getComputedDefence(),
|
||||
'attackerTrain' => $attacker->getComputedTrain(),
|
||||
'attackerAtmos' => $attacker->getComputedAtmos(),
|
||||
'defenderAttack' => $defender->getComputedAttack(),
|
||||
'defenderDefence' => $defender->getComputedDefence(),
|
||||
'defenderTrain' => $defender->getComputedTrain(),
|
||||
'defenderAtmos' => $defender->getComputedAtmos(),
|
||||
]);
|
||||
}
|
||||
|
||||
$battleCaller = $attacker->getGeneral()->getBattlePhaseSkillTriggerList($attacker);
|
||||
$battleCaller->merge($defender->getGeneral()->getBattlePhaseSkillTriggerList($defender));
|
||||
|
||||
$battleCaller->fire($attacker->rng, [], [$attacker, $defender]);
|
||||
$emitTrace('phase_triggered', $defender);
|
||||
|
||||
$deadDefender = $attacker->calcDamage();
|
||||
$deadAttacker = $defender->calcDamage();
|
||||
$rawDeadAttacker = $deadAttacker;
|
||||
$rawDeadDefender = $deadDefender;
|
||||
|
||||
$attackerHP = $attacker->getHP();
|
||||
$defenderHP = $defender->getHP();
|
||||
@@ -371,6 +409,14 @@ function processWar_NG(
|
||||
|
||||
$attacker->increaseKilled($deadDefender);
|
||||
$defender->increaseKilled($deadAttacker);
|
||||
$emitTrace('phase_damage', $defender, [
|
||||
'rawDeadAttacker' => $rawDeadAttacker,
|
||||
'rawDeadDefender' => $rawDeadDefender,
|
||||
'deadAttacker' => $deadAttacker,
|
||||
'deadDefender' => $deadDefender,
|
||||
'attackerHpBefore' => $attackerHP,
|
||||
'defenderHpBefore' => $defenderHP,
|
||||
]);
|
||||
|
||||
if($defender->getPhase() < 0){
|
||||
$phaseNickname = '先';
|
||||
@@ -394,8 +440,10 @@ function processWar_NG(
|
||||
|
||||
$attacker->addPhase();
|
||||
$defender->addPhase();
|
||||
$emitTrace('phase_end', $defender);
|
||||
|
||||
if (!$attacker->continueWar($noRice)) {
|
||||
$emitTrace('attacker_stopped', $defender, ['noRice' => (bool)$noRice]);
|
||||
$logWritten = true;
|
||||
|
||||
$attacker->logBattleResult();
|
||||
@@ -420,6 +468,7 @@ function processWar_NG(
|
||||
}
|
||||
|
||||
if (!$defender->continueWar($noRice)) {
|
||||
$emitTrace('defender_stopped', $defender, ['noRice' => (bool)$noRice]);
|
||||
$logWritten = true;
|
||||
|
||||
$attacker->logBattleResult();
|
||||
@@ -462,6 +511,7 @@ function processWar_NG(
|
||||
|
||||
$defender->finishBattle();
|
||||
$defender = ($getNextDefender)($defender, true);
|
||||
$emitTrace('opponent_switched', $defender);
|
||||
|
||||
if ($defender !== null && !($defender instanceof WarUnitGeneral)) {
|
||||
throw new \RuntimeException('다음 수비자를 받아오는데 실패');
|
||||
@@ -497,10 +547,60 @@ function processWar_NG(
|
||||
}
|
||||
|
||||
($getNextDefender)($defender, false);
|
||||
$emitTrace('battle_end', $defender, ['conquered' => $conquerCity]);
|
||||
|
||||
return $conquerCity;
|
||||
}
|
||||
|
||||
function buildWarTraceUnitSnapshot(WarUnit $unit): array
|
||||
{
|
||||
$snapshot = [
|
||||
'kind' => $unit instanceof WarUnitGeneral ? 'general' : 'city',
|
||||
'id' => $unit instanceof WarUnitGeneral
|
||||
? $unit->getGeneral()->getID()
|
||||
: $unit->getVar('city'),
|
||||
'name' => $unit->getName(),
|
||||
'isAttacker' => $unit->isAttacker(),
|
||||
'crewTypeId' => $unit->getCrewType()->id,
|
||||
'phase' => $unit->getPhase(),
|
||||
'realPhase' => $unit->getRealPhase(),
|
||||
'maxPhase' => $unit->getMaxPhase(),
|
||||
'hp' => $unit->getHP(),
|
||||
'rawWarPower' => $unit->getRawWarPower(),
|
||||
'warPower' => $unit->getWarPower(),
|
||||
'warPowerMultiplier' => $unit->getWarPowerMultiply(),
|
||||
'killed' => $unit->getKilled(),
|
||||
'dead' => $unit->getDead(),
|
||||
'activatedSkills' => $unit->getActivatedSkillLog(),
|
||||
];
|
||||
|
||||
if ($unit instanceof WarUnitGeneral) {
|
||||
$general = $unit->getGeneral();
|
||||
$snapshot['general'] = [
|
||||
'crew' => $general->getVar('crew'),
|
||||
'rice' => $general->getVar('rice'),
|
||||
'train' => $general->getVar('train'),
|
||||
'atmos' => $general->getVar('atmos'),
|
||||
'injury' => $general->getVar('injury'),
|
||||
'experience' => $general->getVar('experience'),
|
||||
'dedication' => $general->getVar('dedication'),
|
||||
'dex1' => $general->getVar('dex1'),
|
||||
'dex2' => $general->getVar('dex2'),
|
||||
'dex3' => $general->getVar('dex3'),
|
||||
'dex4' => $general->getVar('dex4'),
|
||||
'dex5' => $general->getVar('dex5'),
|
||||
];
|
||||
} else {
|
||||
$snapshot['cityState'] = [
|
||||
'defence' => $unit->getVar('def'),
|
||||
'wall' => $unit->getVar('wall'),
|
||||
'population' => $unit->getVar('pop'),
|
||||
];
|
||||
}
|
||||
|
||||
return $snapshot;
|
||||
}
|
||||
|
||||
function DeleteConflict($nation)
|
||||
{
|
||||
$db = DB::db();
|
||||
|
||||
@@ -21,7 +21,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
|
||||
])
|
||||
->rule('int', 'amount')
|
||||
->rule('int', 'auctionID')
|
||||
->rule('boolean', 'extendCloseTick');
|
||||
->rule('boolean', 'extendCloseDate');
|
||||
|
||||
if (!$v->validate()) {
|
||||
return $v->errorStr();
|
||||
@@ -38,7 +38,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
|
||||
{
|
||||
$auctionID = $this->args['auctionID'];
|
||||
$amount = $this->args['amount'];
|
||||
$tryExtendCloseDate = $this->args['extendCloseTick'] ?? false;
|
||||
$tryExtendCloseDate = $this->args['extendCloseDate'] ?? false;
|
||||
|
||||
$generalID = $session->generalID;
|
||||
$general = General::createObjFromDB($generalID);
|
||||
|
||||
@@ -15,8 +15,6 @@ use sammo\General;
|
||||
use sammo\Json;
|
||||
use sammo\TimeUtil;
|
||||
use sammo\Util;
|
||||
use sammo\GameClock;
|
||||
use sammo\KVStorage;
|
||||
|
||||
use function sammo\getAuctionLogRecent;
|
||||
|
||||
@@ -35,13 +33,12 @@ class GetActiveResourceAuctionList extends \sammo\BaseAPI
|
||||
public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
|
||||
{
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
|
||||
$buyRiceList = [];
|
||||
$sellRiceList = [];
|
||||
/** @var AuctionInfo[] */
|
||||
$auctions = array_map(fn ($raw) => AuctionInfo::fromArray($raw), $db->query(
|
||||
'SELECT * FROM `ng_auction` WHERE `type` IN %ls AND `finished` = 0 ORDER BY `close_tick` ASC',
|
||||
'SELECT * FROM `ng_auction` WHERE `type` IN %ls AND `finished` = 0 ORDER BY `close_date` ASC',
|
||||
[
|
||||
AuctionType::BuyRice->value,
|
||||
AuctionType::SellRice->value,
|
||||
@@ -90,8 +87,8 @@ class GetActiveResourceAuctionList extends \sammo\BaseAPI
|
||||
'type' => $auction->type->value,
|
||||
'hostGeneralID' => $auction->hostGeneralID,
|
||||
'hostName' => $auction->detail->hostName,
|
||||
'openDate' => $clock->formatTick($auction->openTick),
|
||||
'closeDate' => $clock->formatTick($auction->closeTick),
|
||||
'openDate' => TimeUtil::format($auction->openDate, false),
|
||||
'closeDate' => TimeUtil::format($auction->closeDate, false),
|
||||
'amount' => $auction->detail->amount,
|
||||
'startBidAmount' => $auction->detail->startBidAmount,
|
||||
'finishBidAmount' => $auction->detail->finishBidAmount,
|
||||
|
||||
@@ -14,8 +14,6 @@ use sammo\Enums\GeneralQueryMode;
|
||||
use sammo\Enums\InheritanceKey;
|
||||
use sammo\InheritancePointManager;
|
||||
use sammo\TimeUtil;
|
||||
use sammo\GameClock;
|
||||
use sammo\KVStorage;
|
||||
use sammo\Validator;
|
||||
use sammo\General;
|
||||
|
||||
@@ -44,7 +42,6 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
|
||||
public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
|
||||
{
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
|
||||
$generalID = $session->generalID;
|
||||
$auctionID = $this->args['auctionID'];
|
||||
@@ -95,11 +92,9 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
|
||||
'target' => $auction->target,
|
||||
'isCallerHost' => $auction->hostGeneralID === $generalID,
|
||||
'hostName' => $auction->detail->hostName,
|
||||
'closeDate' => $clock->formatTick($auction->closeTick),
|
||||
'closeDate' => TimeUtil::format($auction->closeDate, false),
|
||||
'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
|
||||
'availableLatestBidCloseDate' => $auction->detail->availableLatestBidCloseTick === null
|
||||
? null
|
||||
: $clock->formatTick($auction->detail->availableLatestBidCloseTick),
|
||||
'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
|
||||
],
|
||||
'bidList' => $responseBid,
|
||||
'obfuscatedName' => $obfuscatedName,
|
||||
|
||||
@@ -12,8 +12,6 @@ use sammo\Enums\APIRecoveryType;
|
||||
use sammo\Enums\AuctionType;
|
||||
use sammo\TimeUtil;
|
||||
use sammo\Util;
|
||||
use sammo\GameClock;
|
||||
use sammo\KVStorage;
|
||||
|
||||
class GetUniqueItemAuctionList extends \sammo\BaseAPI
|
||||
{
|
||||
@@ -30,13 +28,12 @@ class GetUniqueItemAuctionList extends \sammo\BaseAPI
|
||||
public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
|
||||
{
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
|
||||
$generalID = $session->generalID;
|
||||
|
||||
/** @var AuctionInfo[] */
|
||||
$auctions = array_map(fn($raw)=>AuctionInfo::fromArray($raw), $db->query(
|
||||
'SELECT * FROM `ng_auction` WHERE `type` = %s ORDER BY `close_tick` ASC',
|
||||
'SELECT * FROM `ng_auction` WHERE `type` = %s ORDER BY `close_date` ASC',
|
||||
AuctionType::UniqueItem->value
|
||||
) ?? []);
|
||||
|
||||
@@ -88,11 +85,9 @@ class GetUniqueItemAuctionList extends \sammo\BaseAPI
|
||||
'target' => $auction->target,
|
||||
'isCallerHost' => $auction->hostGeneralID === $generalID,
|
||||
'hostName' => $auction->detail->hostName,
|
||||
'closeDate' => $clock->formatTick($auction->closeTick),
|
||||
'closeDate' => TimeUtil::format($auction->closeDate, false),
|
||||
'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
|
||||
'availableLatestBidCloseDate' => $auction->detail->availableLatestBidCloseTick === null
|
||||
? null
|
||||
: $clock->formatTick($auction->detail->availableLatestBidCloseTick),
|
||||
'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
|
||||
'highestBid' => [
|
||||
'generalName' => $highestBid->aux->generalName,
|
||||
'amount' => $highestBid->amount,
|
||||
|
||||
@@ -7,11 +7,9 @@ use DateTimeInterface;
|
||||
use sammo\DB;
|
||||
use sammo\Enums\APIRecoveryType;
|
||||
use sammo\GameConst;
|
||||
use sammo\GameClock;
|
||||
use sammo\Json;
|
||||
use sammo\KVStorage;
|
||||
use sammo\TimeUtil;
|
||||
use sammo\Util;
|
||||
|
||||
use function sammo\cutTurn;
|
||||
|
||||
@@ -84,12 +82,11 @@ class GetReservedCommand extends \sammo\BaseAPI
|
||||
|
||||
return [
|
||||
'result' => true,
|
||||
'turnTimeTick' => Util::toInt($turnTime),
|
||||
'turnTime' => GameClock::fromStorage($gameStor)->formatTick(Util::toInt($turnTime)),
|
||||
'turnTime' => $turnTime,
|
||||
'turnTerm' => $turnTerm,
|
||||
'year' => $year,
|
||||
'month' => $month,
|
||||
'date' => GameClock::fromStorage($gameStor)->formatTick(GameClock::fromStorage($gameStor)->nowTick(), true),
|
||||
'date' => TimeUtil::now(true),
|
||||
'turn' => $commandList,
|
||||
'autorun_limit' => $generalAux['autorun_limit'] ?? null,
|
||||
];
|
||||
|
||||
@@ -11,8 +11,7 @@ use sammo\Session;
|
||||
use sammo\General;
|
||||
use sammo\JosaUtil;
|
||||
use sammo\KVStorage;
|
||||
use sammo\GameClock;
|
||||
use sammo\Util;
|
||||
use sammo\TimeUtil;
|
||||
|
||||
use function sammo\addTurn;
|
||||
use function sammo\increaseRefresh;
|
||||
@@ -38,14 +37,8 @@ class DieOnPrestart extends \sammo\BaseAPI
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$nowTick = $clock->nowTick();
|
||||
|
||||
$general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i AND npc = 0', $userID);
|
||||
if (!$general) {
|
||||
return '장수가 없습니다';
|
||||
}
|
||||
|
||||
$lastRefresh = $db->queryFirstField(
|
||||
'SELECT %b FROM general_access_log WHERE %b = %i',
|
||||
GeneralAccessLogColumn::lastRefresh->value,
|
||||
@@ -53,9 +46,8 @@ class DieOnPrestart extends \sammo\BaseAPI
|
||||
$general['no']
|
||||
);
|
||||
|
||||
$generalObj = General::createObjFromDB($general['no']);
|
||||
if ($generalObj instanceof DummyGeneral) {
|
||||
trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
|
||||
if (!$general) {
|
||||
return '장수가 없습니다';
|
||||
}
|
||||
|
||||
increaseRefresh("장수 삭제", 1);
|
||||
@@ -69,21 +61,16 @@ class DieOnPrestart extends \sammo\BaseAPI
|
||||
return '이미 국가에 소속되어있습니다.';
|
||||
}
|
||||
|
||||
$targetTime = $generalObj->getAuxVar('prestart_delete_after');
|
||||
if (!is_int($targetTime)) {
|
||||
$targetTime = addTurn(
|
||||
$lastRefresh === null ? $nowTick : Util::toInt($lastRefresh),
|
||||
$gameStor->turnterm,
|
||||
GameConst::$minTurnDieOnPrestart
|
||||
);
|
||||
$generalObj->setAuxVar('prestart_delete_after', $targetTime);
|
||||
$generalObj->applyDB($db);
|
||||
//서버 가오픈시 할 수 있는 행동
|
||||
$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
|
||||
if ($targetTime > TimeUtil::now()) {
|
||||
$targetTimeShort = substr($targetTime, 0, 19);
|
||||
return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
|
||||
}
|
||||
|
||||
//서버 가오픈시 할 수 있는 행동
|
||||
if ($targetTime > $nowTick) {
|
||||
$targetTimeShort = $clock->formatTick($targetTime);
|
||||
return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
|
||||
$generalObj = General::createObjFromDB($general['no']);
|
||||
if ($generalObj instanceof DummyGeneral) {
|
||||
trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
|
||||
}
|
||||
|
||||
$generalName = $generalObj->getName();
|
||||
|
||||
@@ -14,7 +14,6 @@ use sammo\Enums\GeneralColumn;
|
||||
use sammo\Enums\GeneralQueryMode;
|
||||
use sammo\Enums\RankColumn;
|
||||
use sammo\GameConst;
|
||||
use sammo\GameClock;
|
||||
use sammo\General;
|
||||
use sammo\KVStorage;
|
||||
use sammo\LastTurn;
|
||||
@@ -106,7 +105,6 @@ class GetFrontInfo extends \sammo\BaseAPI
|
||||
$db = DB::db();
|
||||
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$gameStor->cacheValues(['isunited', 'opentime', 'refresh']);
|
||||
|
||||
$lastHistoryID = $this->args['lastWorldHistoryID'];
|
||||
@@ -160,7 +158,6 @@ class GetFrontInfo extends \sammo\BaseAPI
|
||||
private function generateGlobalInfo(MeekroDB $db): array
|
||||
{
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
|
||||
[
|
||||
$scenarioText, $extendedGeneral, $isFiction, $npcMode,
|
||||
@@ -213,8 +210,7 @@ class GetFrontInfo extends \sammo\BaseAPI
|
||||
'month' => $month,
|
||||
'autorunUser' => $autorunUser,
|
||||
'turnterm' => $turnterm,
|
||||
'lastExecutedTick' => $lastExecuted,
|
||||
'lastExecuted' => $clock->formatTick(Util::toInt($lastExecuted), true),
|
||||
'lastExecuted' => $lastExecuted,
|
||||
'lastVoteID' => $lastVoteID,
|
||||
'develCost' => $develCost,
|
||||
'noticeMsg' => $noticeMsg,
|
||||
@@ -228,8 +224,7 @@ class GetFrontInfo extends \sammo\BaseAPI
|
||||
'isLocked' => $isLocked,
|
||||
'tournamentType' => $tournamentType,
|
||||
'tournamentState' => $tournamentState,
|
||||
'tournamentTimeTick' => $tournamentTime,
|
||||
'tournamentTime' => $tournamentTime === null ? null : $clock->formatTick(Util::toInt($tournamentTime)),
|
||||
'tournamentTime' => $tournamentTime,
|
||||
'genCount' => $globalGenCount,
|
||||
'generalCntLimit' => $generalCntLimit,
|
||||
'serverCnt' => $serverCnt,
|
||||
@@ -366,7 +361,6 @@ class GetFrontInfo extends \sammo\BaseAPI
|
||||
|
||||
public function generateGeneralInfo(MeekroDB $db, General $general, array $rawNation): array
|
||||
{
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
|
||||
$permission = checkSecretPermission($general->getRaw());
|
||||
|
||||
@@ -431,12 +425,8 @@ class GetFrontInfo extends \sammo\BaseAPI
|
||||
'crew' => $general->getVar(GeneralColumn::crew), // number;
|
||||
'train' => $general->getVar(GeneralColumn::train), // number;
|
||||
'atmos' => $general->getVar(GeneralColumn::atmos), // number;
|
||||
'turntimeTick' => $general->getTurnTick(), // number;
|
||||
'turntime' => $general->getTurnTime(), // string;
|
||||
'recent_war_tick' => $general->getVar(GeneralColumn::recent_war), // number|null;
|
||||
'recent_war' => $general->getVar(GeneralColumn::recent_war) === null
|
||||
? null
|
||||
: $clock->formatTick(Util::toInt($general->getVar(GeneralColumn::recent_war)), true), // string|null;
|
||||
'turntime' => $general->getVar(GeneralColumn::turntime), // string;
|
||||
'recent_war' => $general->getVar(GeneralColumn::recent_war), // string;
|
||||
'horse' => $general->getVar(GeneralColumn::horse), // GameObjClassKey;
|
||||
'weapon' => $general->getVar(GeneralColumn::weapon), // GameObjClassKey;
|
||||
'book' => $general->getVar(GeneralColumn::book), // GameObjClassKey;
|
||||
@@ -554,7 +544,7 @@ class GetFrontInfo extends \sammo\BaseAPI
|
||||
'result' => false,
|
||||
'reason' => '접속 제한중입니다.',
|
||||
'recovery' => APIRecoveryType::GameQuota,
|
||||
'recovery_arg' => $general->getTurnTime(),
|
||||
'recovery_arg' => $general->getVar('turntime'),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ use sammo\Enums\APIRecoveryType;
|
||||
use sammo\Enums\GeneralAccessLogColumn;
|
||||
use sammo\Enums\RankColumn;
|
||||
use sammo\GameConst;
|
||||
use sammo\GameClock;
|
||||
use sammo\GameUnitConst;
|
||||
use sammo\General;
|
||||
use sammo\InheritancePointManager;
|
||||
@@ -166,7 +165,6 @@ class Join extends \sammo\BaseAPI
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$gameStor->cacheValues(['year', 'month', 'maxgeneral', 'scenario', 'show_img_level', 'block_general_create', 'turnterm', 'turntime', 'genius', 'npcmode']);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
########## 동일 정보 존재여부 확인. ##########
|
||||
|
||||
$block_general_create = $gameStor->getValue('block_general_create');
|
||||
@@ -224,7 +222,7 @@ class Join extends \sammo\BaseAPI
|
||||
|
||||
$userLogger = new UserLogger($userID, $admin['year'], $admin['month'], false);
|
||||
|
||||
$now = $clock->nowTick();
|
||||
$now = TimeUtil::now(false);
|
||||
$rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
|
||||
UniqueConst::$hiddenSeed,
|
||||
'MakeGeneral',
|
||||
@@ -362,14 +360,17 @@ class Join extends \sammo\BaseAPI
|
||||
|
||||
$userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");
|
||||
|
||||
$inheritTurnMicrosecond = $rng->nextRangeInt(0, 999999);
|
||||
$turntime = cutTurn(Util::toInt($admin['turntime']), $admin['turnterm'])
|
||||
+ $clock->ticksFromSeconds($inheritTurntime)
|
||||
+ intdiv($inheritTurnMicrosecond * $clock->ticksPerSecond(), 1_000_000);
|
||||
$inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
|
||||
|
||||
$turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
|
||||
$turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
|
||||
$turntime = TimeUtil::format($turntime, true);
|
||||
} else {
|
||||
$turntime = getRandTurn($rng, $admin['turnterm'], Util::toInt($admin['turntime']));
|
||||
$turntime = getRandTurn($rng, $admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
|
||||
}
|
||||
|
||||
|
||||
$now = TimeUtil::now(true);
|
||||
if ($now >= $turntime) {
|
||||
$turntime = addTurn($turntime, $admin['turnterm']);
|
||||
}
|
||||
@@ -434,13 +435,6 @@ class Join extends \sammo\BaseAPI
|
||||
'specage2' => $specage2,
|
||||
'special2' => $special2,
|
||||
'penalty' => Json::encode($penalty),
|
||||
'aux' => Json::encode([
|
||||
'prestart_delete_after' => addTurn(
|
||||
$now,
|
||||
$admin['turnterm'],
|
||||
GameConst::$minTurnDieOnPrestart
|
||||
),
|
||||
]),
|
||||
]);
|
||||
$generalID = $db->insertId();
|
||||
$db->insert('general_access_log', [
|
||||
|
||||
@@ -8,8 +8,6 @@ use DateTimeInterface;
|
||||
use sammo\Enums\APIRecoveryType;
|
||||
use sammo\TurnExecutionHelper;
|
||||
use sammo\UniqueConst;
|
||||
use sammo\GameClock;
|
||||
use sammo\KVStorage;
|
||||
|
||||
class ExecuteEngine extends \sammo\BaseAPI
|
||||
{
|
||||
@@ -37,13 +35,11 @@ class ExecuteEngine extends \sammo\BaseAPI
|
||||
$updated = false;
|
||||
$locked = false;
|
||||
$lastExecuted = TurnExecutionHelper::executeAllCommand($updated, $locked);
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
return [
|
||||
'result' => true,
|
||||
'updated' => $updated,
|
||||
'locked' => $locked,
|
||||
'lastExecutedTick' => $lastExecuted,
|
||||
'lastExecuted' => $clock->formatTick($lastExecuted, true),
|
||||
'lastExecuted' => $lastExecuted,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace sammo\API\Global;
|
||||
|
||||
use sammo\DB;
|
||||
use sammo\GameClock;
|
||||
use sammo\Enums\APIRecoveryType;
|
||||
use sammo\Json;
|
||||
use sammo\KVStorage;
|
||||
@@ -146,8 +145,7 @@ class GeneralList extends \sammo\BaseAPI
|
||||
|
||||
|
||||
if (static::$withToken) {
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$now = GameClock::fromStorage($gameStor)->nowTick();
|
||||
$now = (new \DateTimeImmutable())->format('Y-m-d H:i:s');
|
||||
$tokens = [];
|
||||
foreach ($db->query('SELECT * FROM select_npc_token WHERE `valid_until`>=%s', $now) as $token) {
|
||||
$validUntil = $token['valid_until'];
|
||||
|
||||
@@ -64,11 +64,13 @@ class ResetTurnTime extends \sammo\BaseAPI
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
|
||||
$currTurnTime = new DateTimeImmutable($general->getTurnTime());
|
||||
|
||||
$rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
|
||||
UniqueConst::$hiddenSeed,
|
||||
'ResetTurnTime',
|
||||
$userID,
|
||||
$general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTick()
|
||||
$general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
|
||||
)));
|
||||
|
||||
$afterTurn = $rng->nextFloat1() * $turnTerm * 60;
|
||||
|
||||
@@ -8,7 +8,6 @@ use sammo\Enums\APIRecoveryType;
|
||||
use sammo\Enums\GeneralLiteQueryMode;
|
||||
use sammo\Enums\GeneralQueryMode;
|
||||
use sammo\General;
|
||||
use sammo\GameClock;
|
||||
use sammo\GeneralLite;
|
||||
use sammo\Session;
|
||||
use sammo\Util;
|
||||
@@ -265,11 +264,8 @@ class GeneralList extends \sammo\BaseAPI
|
||||
'honorText' => fn ($rawGeneral) => getHonor($rawGeneral['experience']),
|
||||
'dedLevelText' => fn ($rawGeneral) => getDedLevelText($rawGeneral['dedlevel']),
|
||||
//'0000-00-00 11:23';
|
||||
'turntime' => fn ($rawGeneral) => GameClock::fromStorage($gameStor)
|
||||
->formatTick(Util::toInt($rawGeneral['turntime'])),
|
||||
'recent_war' => fn ($rawGeneral) => $rawGeneral['recent_war'] === null
|
||||
? null
|
||||
: GameClock::fromStorage($gameStor)->formatTick(Util::toInt($rawGeneral['recent_war'])),
|
||||
'turntime' => fn ($rawGeneral) => substr($rawGeneral['turntime'], 0, 19),
|
||||
'recent_war' => fn ($rawGeneral) => substr($rawGeneral['recent_war'], 0, 19),
|
||||
'bill' => fn ($rawGeneral) => getBillByLevel($rawGeneral['dedlevel']),
|
||||
'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
|
||||
'autorun_limit' => fn ($rawGeneral) => ($rawGeneral['aux'] ?? [])['autorun_limit'] ?? 0,
|
||||
|
||||
@@ -8,7 +8,6 @@ use sammo\DB;
|
||||
use sammo\Enums\APIRecoveryType;
|
||||
use sammo\Enums\GeneralQueryMode;
|
||||
use sammo\GameConst;
|
||||
use sammo\GameClock;
|
||||
use sammo\General;
|
||||
use sammo\Json;
|
||||
use sammo\KVStorage;
|
||||
@@ -52,8 +51,7 @@ class GetReservedCommand extends \sammo\BaseAPI
|
||||
$nationID = $me['nation'];
|
||||
$limitState = checkLimit($me['refresh_score']);
|
||||
if ($limitState >= 2) {
|
||||
$limitTime = GameClock::fromStorage($gameStor)->formatTick(Util::toInt($me['turntime']), true);
|
||||
return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$limitTime})";
|
||||
return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$me['turntime']})";
|
||||
}
|
||||
|
||||
$permission = checkSecretPermission($me);
|
||||
|
||||
@@ -30,9 +30,8 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
|
||||
}
|
||||
|
||||
static public function pickGeneralFromPool(\MeekroDB $db, RandUtil $rng, int $owner, int $pickCnt, ?string $prefix=null):array{
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$now = $clock->nowTick();
|
||||
$oNow = new \DateTimeImmutable();
|
||||
$now = $oNow->format('Y-m-d H:i:s');
|
||||
|
||||
$db->update('select_pool', [
|
||||
'reserved_until'=>null,
|
||||
@@ -49,8 +48,9 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
|
||||
throw new \RuntimeException('pool 부족');
|
||||
}
|
||||
|
||||
$result = [];
|
||||
$validUntil = $now + GameClock::TICKS_PER_TURN * 2;
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$result = [];
|
||||
$validUntil = TimeUtil::nowAddMinutes(2 * $gameStor->turnterm);
|
||||
while(count($result) < $pickCnt){
|
||||
$cand = $rng->choiceUsingWeightPair($pool);
|
||||
$poolID = $cand['id'];
|
||||
|
||||
@@ -34,7 +34,7 @@ abstract class AbsGeneralPool{
|
||||
* specialWar
|
||||
*/
|
||||
|
||||
public function __construct(\MeekroDB $db, RandUtil $rng, array $info, int $validUntil)
|
||||
public function __construct(\MeekroDB $db, RandUtil $rng, array $info, string $validUntil)
|
||||
{
|
||||
$this->db = $db;
|
||||
$this->info = $info;
|
||||
@@ -92,7 +92,7 @@ abstract class AbsGeneralPool{
|
||||
return $this->builder;
|
||||
}
|
||||
|
||||
public function getValidUntil():int{
|
||||
public function getValidUntil():string{
|
||||
return $this->validUntil;
|
||||
}
|
||||
|
||||
@@ -109,4 +109,4 @@ abstract class AbsGeneralPool{
|
||||
|
||||
abstract public static function getPoolName():string;
|
||||
abstract public static function initPool(\MeekroDB $db);
|
||||
}
|
||||
}
|
||||
+54
-55
@@ -146,35 +146,40 @@ abstract class Auction
|
||||
return $this->info;
|
||||
}
|
||||
|
||||
public function shrinkCloseTick(?int $tick): ?string
|
||||
public function shrinkCloseDate(?DateTimeInterface $date): ?string
|
||||
{
|
||||
if ($date === null) {
|
||||
$date = new DateTimeImmutable();
|
||||
}
|
||||
|
||||
$this->info->closeDate = $date;
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$this->info->closeTick = $tick ?? $clock->nowTick();
|
||||
$db->update('ng_auction', $this->info->toArray('id'), 'id = %i', $this->info->id);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public function extendLatestBidCloseTick(?int $tick): ?string
|
||||
public function extendLatestBidCloseDate(?DateTimeInterface $date): ?string
|
||||
{
|
||||
if ($tick === null) {
|
||||
if ($date === null) {
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
$tick = $this->info->closeTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
|
||||
);
|
||||
$date = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
|
||||
));
|
||||
}
|
||||
if ($this->info->detail->availableLatestBidCloseTick !== null && $tick < $this->info->detail->availableLatestBidCloseTick) {
|
||||
else{
|
||||
$date = DateTimeImmutable::createFromInterface($date);
|
||||
}
|
||||
if ($this->info->detail->availableLatestBidCloseDate !== null && $date < $this->info->detail->availableLatestBidCloseDate) {
|
||||
return '기간보다 짧습니다.';
|
||||
}
|
||||
$this->info->detail->availableLatestBidCloseTick = $tick;
|
||||
$this->info->detail->availableLatestBidCloseDate = $date;
|
||||
return null;
|
||||
}
|
||||
|
||||
public function extendCloseTick(int $tick, bool $force = false): ?string
|
||||
public function extendCloseDate(DateTimeInterface $date, bool $force = false): ?string
|
||||
{
|
||||
if (!$force) {
|
||||
if ($this->info->detail->remainCloseDateExtensionCnt === null) {
|
||||
@@ -188,11 +193,12 @@ abstract class Auction
|
||||
}
|
||||
}
|
||||
|
||||
if ($tick < $this->info->closeTick) {
|
||||
if ($date < $this->info->closeDate) {
|
||||
return '종료 기간보다 짧습니다.';
|
||||
}
|
||||
|
||||
$this->info->closeTick = $tick;
|
||||
$closeDate = DateTimeImmutable::createFromInterface($date);
|
||||
$this->info->closeDate = $closeDate;
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -239,13 +245,12 @@ abstract class Auction
|
||||
|
||||
//TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
|
||||
//TODO: 바로가기를 제공하는 편이 좋을 것 같다.
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$msg = new Message(
|
||||
MessageType::private,
|
||||
$src,
|
||||
$dest,
|
||||
$reason,
|
||||
DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
|
||||
new DateTime(),
|
||||
new DateTime('9999-12-31'),
|
||||
[]
|
||||
);
|
||||
@@ -270,12 +275,7 @@ abstract class Auction
|
||||
$db->update('ng_auction', $this->info->toArray('id'), 'id = %i', $this->info->id);
|
||||
}
|
||||
|
||||
private function bidInheritPoint(
|
||||
int $amount,
|
||||
int $nowTick,
|
||||
\DateTimeImmutable $nowDate,
|
||||
bool $tryExtendCloseDate,
|
||||
): ?string
|
||||
private function bidInheritPoint(int $amount, \DateTimeImmutable $now, bool $tryExtendCloseDate): ?string
|
||||
{
|
||||
$db = DB::db();
|
||||
|
||||
@@ -311,7 +311,7 @@ abstract class Auction
|
||||
$general->getVar('owner'),
|
||||
$general->getID(),
|
||||
$amount,
|
||||
$nowDate,
|
||||
$now,
|
||||
new AuctionBidItemData(
|
||||
$general->getVar('owner_name'),
|
||||
$obfuscatedName,
|
||||
@@ -324,16 +324,15 @@ abstract class Auction
|
||||
}
|
||||
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
|
||||
if ($this->info->detail->availableLatestBidCloseTick !== null) {
|
||||
$extendedCloseTick = $nowTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
|
||||
);
|
||||
if ($this->info->detail->availableLatestBidCloseDate !== null) {
|
||||
$extendedCloseDate = $now->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
|
||||
));
|
||||
|
||||
if ($extendedCloseTick > $this->info->closeTick && $this->info->closeTick < $this->info->detail->availableLatestBidCloseTick) {
|
||||
$this->extendCloseTick(min($extendedCloseTick, $this->info->detail->availableLatestBidCloseTick), true);
|
||||
if ($extendedCloseDate > $this->info->closeDate && $this->info->closeDate < $this->info->detail->availableLatestBidCloseDate) {
|
||||
$this->extendCloseDate(min($extendedCloseDate, $this->info->detail->availableLatestBidCloseDate), true);
|
||||
$this->applyDB();
|
||||
}
|
||||
}
|
||||
@@ -357,16 +356,12 @@ abstract class Auction
|
||||
return '경매가 이미 끝났습니다.';
|
||||
}
|
||||
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$nowTick = $clock->nowTick();
|
||||
$nowDate = $clock->tickToDateTime($nowTick);
|
||||
$now = new \DateTimeImmutable();
|
||||
|
||||
if ($auctionInfo->closeTick < $nowTick) {
|
||||
if ($auctionInfo->closeDate < $now) {
|
||||
return '경매가 이미 끝났습니다.';
|
||||
}
|
||||
if ($auctionInfo->openTick > $nowTick) {
|
||||
if ($auctionInfo->openDate > $now) {
|
||||
return '경매가 아직 시작되지 않았습니다.';
|
||||
}
|
||||
|
||||
@@ -382,11 +377,13 @@ abstract class Auction
|
||||
|
||||
|
||||
if ($auctionInfo->reqResource === ResourceType::inheritancePoint) {
|
||||
return $this->bidInheritPoint($amount, $nowTick, $nowDate, $tryExtendCloseDate);
|
||||
return $this->bidInheritPoint($amount, $now, $tryExtendCloseDate);
|
||||
}
|
||||
|
||||
//reqResource는 말 그대로 '구매자가 내야하는 자원'이다.
|
||||
|
||||
$db = DB::db();
|
||||
|
||||
$highestBid = $this->getHighestBid();
|
||||
if (!$auctionInfo->detail->isReverse) {
|
||||
if ($highestBid !== null && $amount <= $highestBid->amount) {
|
||||
@@ -424,7 +421,7 @@ abstract class Auction
|
||||
$general->getVar('owner'),
|
||||
$general->getID(),
|
||||
$amount,
|
||||
$nowDate,
|
||||
$now,
|
||||
new AuctionBidItemData(
|
||||
$general->getVar('owner_name'),
|
||||
$general->getName(),
|
||||
@@ -439,13 +436,14 @@ abstract class Auction
|
||||
|
||||
$general->increaseVar($resType->value, -$morePoint);
|
||||
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
$extendedCloseTick = $nowTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
|
||||
);
|
||||
$extendedCloseDate = $now->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
|
||||
));
|
||||
|
||||
if ($extendedCloseTick > $this->info->closeTick) {
|
||||
$this->extendCloseTick($extendedCloseTick, true);
|
||||
if ($extendedCloseDate > $this->info->closeDate) {
|
||||
$this->extendCloseDate($extendedCloseDate, true);
|
||||
$this->applyDB();
|
||||
}
|
||||
|
||||
@@ -458,10 +456,10 @@ abstract class Auction
|
||||
|
||||
public function tryFinish(): ?bool
|
||||
{
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
if ($clock->nowTick() < $this->info->closeTick) return null;
|
||||
$now = new DateTimeImmutable();
|
||||
if ($now < $this->info->closeDate) {
|
||||
return null;
|
||||
}
|
||||
|
||||
//경매를 닫아야한다.
|
||||
$highestBid = $this->getHighestBid();
|
||||
@@ -471,15 +469,17 @@ abstract class Auction
|
||||
}
|
||||
|
||||
if ($highestBid->aux->tryExtendCloseDate) {
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
|
||||
//연장 요청이 있었다.
|
||||
$extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_BY_EXTENSION_QUERY)
|
||||
);
|
||||
$extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_BY_EXTENSION_QUERY) * 60
|
||||
));
|
||||
|
||||
if ($this->extendCloseTick($extendedCloseTick) === null) {
|
||||
$this->extendLatestBidCloseTick(null);
|
||||
if ($this->extendCloseDate($extendedCloseDate) === null) {
|
||||
$this->extendLatestBidCloseDate(null);
|
||||
$this->applyDB();
|
||||
return false;
|
||||
}
|
||||
@@ -509,13 +509,12 @@ abstract class Auction
|
||||
|
||||
//TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
|
||||
//TODO: 바로가기를 제공하는 편이 좋을 것 같다.
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$msg = new Message(
|
||||
MessageType::private,
|
||||
$src,
|
||||
$dest,
|
||||
$failReason,
|
||||
DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
|
||||
new \DateTime(),
|
||||
new \DateTime('9999-12-31'),
|
||||
[]
|
||||
);
|
||||
|
||||
@@ -56,11 +56,10 @@ abstract class AuctionBasicResource extends Auction
|
||||
}
|
||||
|
||||
|
||||
$now = new \DateTimeImmutable();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$nowTick = $clock->nowTick();
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
$closeTick = $nowTick + GameClock::TICKS_PER_TURN * $closeTurnCnt;
|
||||
$closeDate = $now->add(TimeUtil::secondsToDateInterval($closeTurnCnt * $turnTerm * 60));
|
||||
|
||||
$openResult = static::openAuction(new AuctionInfo(
|
||||
null,
|
||||
@@ -69,8 +68,8 @@ abstract class AuctionBasicResource extends Auction
|
||||
"$amount",
|
||||
$general->getId(),
|
||||
$bidderRes,
|
||||
$nowTick,
|
||||
$closeTick,
|
||||
$now,
|
||||
$closeDate,
|
||||
new AuctionInfoDetail(
|
||||
"{$hostResName} {$amount} 경매",
|
||||
$general->getName(),
|
||||
@@ -146,13 +145,12 @@ abstract class AuctionBasicResource extends Auction
|
||||
|
||||
//TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
|
||||
//TODO: 바로가기를 제공하는 편이 좋을 것 같다.
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
$msg = new Message(
|
||||
MessageType::private,
|
||||
$src,
|
||||
$dest,
|
||||
"{$this->auctionID}번 {$hostResName} 경매에 입찰이 없어 취소되었습니다.",
|
||||
\DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
|
||||
new \DateTime(),
|
||||
new \DateTime('9999-12-31'),
|
||||
[]
|
||||
);
|
||||
@@ -248,8 +246,8 @@ abstract class AuctionBasicResource extends Auction
|
||||
$db = DB::db();
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$this->shrinkCloseTick($clock->nowTick() + GameClock::TICKS_PER_TURN);
|
||||
$date = (new DateTimeImmutable())->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
|
||||
$this->shrinkCloseDate($date);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -72,15 +72,16 @@ class AuctionUniqueItem extends Auction
|
||||
|
||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||
|
||||
$now = new DateTimeImmutable();
|
||||
|
||||
[$turnTerm, $year, $month] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month']);
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
$nowTick = $clock->nowTick();
|
||||
$closeTick = $nowTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_AUCTION_CLOSE_MINUTES, $turnTerm * static::COEFF_AUCTION_CLOSE_MINUTES)
|
||||
);
|
||||
$availableLatestBidCloseTick = $closeTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID)
|
||||
);
|
||||
|
||||
$closeDate = $now->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_AUCTION_CLOSE_MINUTES, $turnTerm * static::COEFF_AUCTION_CLOSE_MINUTES) * 60
|
||||
));
|
||||
$availableLatestBidCloseDate = $closeDate->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID) * 60
|
||||
));
|
||||
|
||||
$info = new AuctionInfo(
|
||||
null,
|
||||
@@ -89,8 +90,8 @@ class AuctionUniqueItem extends Auction
|
||||
$itemKey,
|
||||
$general->getID(),
|
||||
ResourceType::inheritancePoint,
|
||||
$nowTick,
|
||||
$closeTick,
|
||||
$now,
|
||||
$closeDate,
|
||||
new AuctionInfoDetail(
|
||||
"{$item->getName()} 경매",
|
||||
static::genObfuscatedName($general->getID()),
|
||||
@@ -99,7 +100,7 @@ class AuctionUniqueItem extends Auction
|
||||
$startAmount,
|
||||
null,
|
||||
1,
|
||||
$availableLatestBidCloseTick,
|
||||
$availableLatestBidCloseDate,
|
||||
)
|
||||
);
|
||||
|
||||
@@ -266,22 +267,21 @@ class AuctionUniqueItem extends Auction
|
||||
|
||||
if ($availableEquipUniqueCnt <= 0) {
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
//제한에 걸렸다면 자동 연장
|
||||
$extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT)
|
||||
);
|
||||
$extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT) * 60
|
||||
));
|
||||
|
||||
if($bidder->getID() != $this->info->hostGeneralID){
|
||||
$this->setHostAsNeutral();
|
||||
}
|
||||
$this->extendCloseTick($extendedCloseTick, true);
|
||||
$this->extendLatestBidCloseTick(null);
|
||||
$this->extendCloseDate($extendedCloseDate, true);
|
||||
$this->extendLatestBidCloseDate(null);
|
||||
$this->applyDB();
|
||||
return '유니크 아이템 소유 제한 상태입니다. 종료 시간이 연장됩니다.';
|
||||
}
|
||||
|
||||
$isExtendCloseTickRequired = false;
|
||||
$isExtendCloseDateRequired = false;
|
||||
foreach (GameConst::$allItems as $itemType => $itemList) {
|
||||
//아직은 그런 경우는 없지만 동일 유니크를 여러 부위에 장착할 수 있을지도 모름
|
||||
if (!key_exists($itemKey, $itemList)) {
|
||||
@@ -291,13 +291,13 @@ class AuctionUniqueItem extends Auction
|
||||
$ownItem = $general->getItem($itemType);
|
||||
if ($ownItem->getRawClassName() == $itemKey) {
|
||||
//FIXME: 이 경우에는 환불이 되던가 해야함.
|
||||
$isExtendCloseTickRequired = true;
|
||||
$isExtendCloseDateRequired = true;
|
||||
$reasons[] = '이미 그 유니크를 가지고 있습니다.';
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!$ownItem->isBuyable()) {
|
||||
$isExtendCloseTickRequired = true;
|
||||
$isExtendCloseDateRequired = true;
|
||||
$reasons[] = '이미 다른 유니크를 가지고 있습니다.';
|
||||
continue;
|
||||
}
|
||||
@@ -313,19 +313,18 @@ class AuctionUniqueItem extends Auction
|
||||
}
|
||||
|
||||
if (!$availableItemTypes) {
|
||||
if ($isExtendCloseTickRequired) {
|
||||
if ($isExtendCloseDateRequired) {
|
||||
$turnTerm = $gameStor->getValue('turnterm');
|
||||
$clock = GameClock::fromStorage($gameStor);
|
||||
//동일 부위 제한에 걸렸다면 자동 연장
|
||||
$extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
|
||||
max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID)
|
||||
);
|
||||
$extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
|
||||
max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID) * 60
|
||||
));
|
||||
|
||||
if($bidder->getID() != $this->info->hostGeneralID){
|
||||
$this->setHostAsNeutral();
|
||||
}
|
||||
$this->extendCloseTick($extendedCloseTick, true);
|
||||
$this->extendLatestBidCloseTick(null);
|
||||
$this->extendCloseDate($extendedCloseDate, true);
|
||||
$this->extendLatestBidCloseDate(null);
|
||||
$this->applyDB();
|
||||
}
|
||||
return join(' ', $reasons);
|
||||
|
||||
@@ -451,7 +451,6 @@ final class CentennialAllStarGrowthService
|
||||
if (!in_array($general->getNPCType(), [3, 4], true)) {
|
||||
return null;
|
||||
}
|
||||
self::initializeGeneratedNPC($general, $targetInfo);
|
||||
$result = self::applyTarget(
|
||||
$general,
|
||||
$targetInfo,
|
||||
@@ -463,67 +462,6 @@ final class CentennialAllStarGrowthService
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps the ordinary M/G-general stat total while aligning its strong,
|
||||
* middle, and weak stats with the selected all-star target. The target's
|
||||
* creation-date growth floor is applied immediately afterwards.
|
||||
*/
|
||||
public static function initializeGeneratedNPC(
|
||||
General $general,
|
||||
array $targetInfo
|
||||
): void {
|
||||
$generatedStats = [];
|
||||
foreach (self::STAT_KEYS as $key) {
|
||||
$generatedStats[$key] = (int) $general->getVar($key);
|
||||
}
|
||||
$initialStats = self::calculateGeneratedNPCInitialStats(
|
||||
$targetInfo,
|
||||
$generatedStats
|
||||
);
|
||||
foreach (self::STAT_KEYS as $key) {
|
||||
$general->updateVar($key, $initialStats[$key]);
|
||||
}
|
||||
foreach (self::DEX_KEYS as $key) {
|
||||
$general->updateVar($key, 0);
|
||||
}
|
||||
$general->setAuxVar(self::AUX_KEY, self::initialAux($targetInfo));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $targetInfo
|
||||
* @param array{leadership:int,strength:int,intel:int} $generatedStats
|
||||
* @return array{leadership:int,strength:int,intel:int}
|
||||
*/
|
||||
public static function calculateGeneratedNPCInitialStats(
|
||||
array $targetInfo,
|
||||
array $generatedStats
|
||||
): array {
|
||||
$targetOrder = self::STAT_KEYS;
|
||||
$keyOrder = array_flip(self::STAT_KEYS);
|
||||
usort(
|
||||
$targetOrder,
|
||||
static function (string $lhs, string $rhs) use ($targetInfo, $keyOrder): int {
|
||||
$targetCompare = (int) ($targetInfo[$rhs] ?? 0)
|
||||
<=> (int) ($targetInfo[$lhs] ?? 0);
|
||||
return $targetCompare !== 0
|
||||
? $targetCompare
|
||||
: $keyOrder[$lhs] <=> $keyOrder[$rhs];
|
||||
}
|
||||
);
|
||||
|
||||
$generatedValues = array_map(
|
||||
static fn (string $key): int => (int) ($generatedStats[$key] ?? 0),
|
||||
self::STAT_KEYS
|
||||
);
|
||||
rsort($generatedValues, SORT_NUMERIC);
|
||||
|
||||
$result = array_fill_keys(self::STAT_KEYS, 0);
|
||||
foreach ($targetOrder as $idx => $key) {
|
||||
$result[$key] = $generatedValues[$idx];
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Moves the event-backed part of a dex conversion with the converted
|
||||
* value and consumes any guaranteed floor crossed by the source value.
|
||||
|
||||
@@ -159,7 +159,7 @@ class che_발령 extends Command\NationCommand
|
||||
$destGeneral->getLogger()->pushGeneralActionLog("<Y>{$generalName}</>에 의해 <G><b>{$destCityName}</b></>{$josaRo} 발령됐습니다. <1>$date</>");
|
||||
|
||||
$yearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']);
|
||||
if (cutTurn($general->getTurnTick(), $this->env['turnterm']) != cutTurn($destGeneral->getTurnTick(), $this->env['turnterm'])) {
|
||||
if (cutTurn($general->getTurnTime(), $this->env['turnterm']) != cutTurn($destGeneral->getTurnTime(), $this->env['turnterm'])) {
|
||||
$yearMonth += 1;
|
||||
}
|
||||
$destGeneral->setAuxVar('last발령', $yearMonth);
|
||||
|
||||
@@ -137,7 +137,7 @@ class che_천도 extends Command\NationCommand
|
||||
$nationID = $general->getNationID();
|
||||
$nationStor = \sammo\KVStorage::getStorage(DB::db(), $nationID, 'nation_env');
|
||||
|
||||
$nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTick()];
|
||||
$nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];
|
||||
|
||||
if ($lastTurn->getCommand() != $commandName || $lastTurn->getArg() !== $this->arg) {
|
||||
$this->setResultTurn(new LastTurn(
|
||||
|
||||
@@ -2,9 +2,11 @@
|
||||
|
||||
namespace sammo\DTO;
|
||||
|
||||
use LDTO\Attr\Convert;
|
||||
use LDTO\Attr\JsonString;
|
||||
use LDTO\Attr\NullIsUndefined;
|
||||
use LDTO\Attr\RawName;
|
||||
use LDTO\Converter\DateTimeConverter;
|
||||
use sammo\Enums\AuctionType;
|
||||
use sammo\Enums\ResourceType;
|
||||
|
||||
@@ -21,10 +23,12 @@ class AuctionInfo extends \LDTO\DTO
|
||||
#[RawName('req_resource')]
|
||||
public ResourceType $reqResource,
|
||||
|
||||
#[RawName('open_tick')]
|
||||
public int $openTick,
|
||||
#[RawName('close_tick')]
|
||||
public int $closeTick,
|
||||
#[RawName('open_date')]
|
||||
#[Convert(DateTimeConverter::class)]
|
||||
public \DateTimeImmutable $openDate,
|
||||
#[RawName('close_date')]
|
||||
#[Convert(DateTimeConverter::class)]
|
||||
public \DateTimeImmutable $closeDate,
|
||||
|
||||
#[JsonString]
|
||||
public AuctionInfoDetail $detail,
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
|
||||
namespace sammo\DTO;
|
||||
|
||||
use LDTO\Attr\Convert;
|
||||
use LDTO\Attr\NullIsUndefined;
|
||||
use LDTO\Converter\DateTimeConverter;
|
||||
|
||||
class AuctionInfoDetail extends \LDTO\DTO
|
||||
{
|
||||
@@ -19,7 +21,8 @@ class AuctionInfoDetail extends \LDTO\DTO
|
||||
#[NullIsUndefined]
|
||||
public ?int $remainCloseDateExtensionCnt,
|
||||
#[NullIsUndefined]
|
||||
public ?int $availableLatestBidCloseTick,
|
||||
#[Convert(DateTimeConverter::class)]
|
||||
public ?\DateTimeImmutable $availableLatestBidCloseDate,
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
|
||||
namespace sammo\DTO;
|
||||
|
||||
use LDTO\Attr\Convert;
|
||||
use LDTO\Attr\NullIsUndefined;
|
||||
use LDTO\Attr\RawName;
|
||||
use LDTO\Converter\DateTimeConverter;
|
||||
|
||||
class GeneralAccessLog extends \LDTO\DTO
|
||||
{
|
||||
@@ -18,7 +20,8 @@ class GeneralAccessLog extends \LDTO\DTO
|
||||
public ?int $userID,
|
||||
|
||||
#[RawName('last_refresh')]
|
||||
public ?int $lastRefresh,
|
||||
#[Convert(DateTimeConverter::class)]
|
||||
public \DateTimeImmutable $lastRefresh,
|
||||
|
||||
public int $refresh,
|
||||
|
||||
@@ -32,4 +35,4 @@ class GeneralAccessLog extends \LDTO\DTO
|
||||
public int $refreshScoreTotal,
|
||||
) {
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -49,7 +49,7 @@ class DiplomaticMessage extends Message{
|
||||
$this->validDiplomacy = false;
|
||||
}
|
||||
|
||||
if($this->validUntil < $this->date){
|
||||
if($this->validUntil < (new \DateTime())){
|
||||
$this->validDiplomacy = false;
|
||||
}
|
||||
}
|
||||
@@ -281,4 +281,4 @@ class DiplomaticMessage extends Message{
|
||||
return self::DECLINED;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
+26
-70
@@ -281,13 +281,16 @@ class General extends GeneralBase implements iAction
|
||||
$this->calcCache[$cacheKey] = $result;
|
||||
return $result;
|
||||
}
|
||||
$tickDiff = Util::toInt($this->getVar('turntime')) - Util::toInt($this->getVar('recent_war'));
|
||||
if ($tickDiff <= 0) {
|
||||
$this->calcCache[$cacheKey] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
$result = intdiv($tickDiff, GameClock::TICKS_PER_TURN);
|
||||
$recwar = new \DateTimeImmutable($this->getVar('recent_war'));
|
||||
$turnNow = new \DateTimeImmutable($this->getVar('turntime'));
|
||||
$secDiff = TimeUtil::DateIntervalToSeconds($recwar->diff($turnNow));
|
||||
|
||||
if ($secDiff <= 0) {
|
||||
$this->calcCache[$cacheKey] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
$result = intdiv(Util::toInt($secDiff), 60 * $turnTerm);
|
||||
$this->calcCache[$cacheKey] = $result;
|
||||
return $result;
|
||||
}
|
||||
@@ -1042,64 +1045,18 @@ class General extends GeneralBase implements iAction
|
||||
|
||||
/** @var Map<GeneralAccessLog,int>|null */
|
||||
$rawAccessLog = null;
|
||||
$rankColumnValues = array_map(fn (\BackedEnum $e) => $e->value, $rankColumn);
|
||||
|
||||
if (!$accessLogColumn) {
|
||||
if ($rankColumn) {
|
||||
$rawGeneral = $db->queryFirstRow(
|
||||
'SELECT %l, (
|
||||
SELECT GROUP_CONCAT(
|
||||
CONCAT(`type`, CHAR(61), `value`)
|
||||
ORDER BY `type`
|
||||
)
|
||||
FROM rank_data
|
||||
WHERE rank_data.general_id = general.no
|
||||
AND `type` IN %ls
|
||||
) AS `_rank_values`
|
||||
FROM general WHERE no = %i',
|
||||
Util::formatListOfBackticks($column),
|
||||
$rankColumnValues,
|
||||
$generalID
|
||||
);
|
||||
} else {
|
||||
$rawGeneral = $db->queryFirstRow(
|
||||
'SELECT %l FROM general WHERE no = %i',
|
||||
Util::formatListOfBackticks($column),
|
||||
$generalID
|
||||
);
|
||||
}
|
||||
$rawGeneral = $db->queryFirstRow('SELECT %l FROM general WHERE no = %i', Util::formatListOfBackticks($column), $generalID);
|
||||
} else {
|
||||
if ($rankColumn) {
|
||||
$rawGeneral = $db->queryFirstRow(
|
||||
'SELECT %l, %l, (
|
||||
SELECT GROUP_CONCAT(
|
||||
CONCAT(`type`, CHAR(61), `value`)
|
||||
ORDER BY `type`
|
||||
)
|
||||
FROM rank_data
|
||||
WHERE rank_data.general_id = general.no
|
||||
AND `type` IN %ls
|
||||
) AS `_rank_values`
|
||||
FROM `general` LEFT JOIN general_access_log
|
||||
ON general.no = general_access_log.general_id
|
||||
WHERE no = %i',
|
||||
Util::formatListOfBackticks($column),
|
||||
Util::formatListOfBackticks($accessLogColumn),
|
||||
$rankColumnValues,
|
||||
$generalID
|
||||
);
|
||||
} else {
|
||||
$rawGeneral = $db->queryFirstRow(
|
||||
'SELECT %l, %l FROM `general` LEFT JOIN general_access_log
|
||||
ON general.no = general_access_log.general_id WHERE no = %i',
|
||||
Util::formatListOfBackticks($column),
|
||||
Util::formatListOfBackticks($accessLogColumn),
|
||||
$generalID
|
||||
);
|
||||
}
|
||||
}
|
||||
$rawGeneral = $db->queryFirstRow(
|
||||
'SELECT %l, %l FROM `general` LEFT JOIN general_access_log
|
||||
ON general.no = general_access_log.general_id WHERE no = %i',
|
||||
Util::formatListOfBackticks($column),
|
||||
Util::formatListOfBackticks($accessLogColumn),
|
||||
$generalID
|
||||
);
|
||||
|
||||
if ($accessLogColumn) {
|
||||
$rawAccessLog = new Map();
|
||||
foreach ($accessLogColumn as $accessLogKey) {
|
||||
if (!key_exists($accessLogKey->value, $rawGeneral)) {
|
||||
@@ -1119,16 +1076,15 @@ class General extends GeneralBase implements iAction
|
||||
|
||||
$rawRankValues = new Map();
|
||||
if ($rankColumn) {
|
||||
$rawRankPairs = $rawGeneral['_rank_values'];
|
||||
foreach ($rawRankPairs === null || $rawRankPairs === ''
|
||||
? []
|
||||
: explode(',', $rawRankPairs) as $rawRankPair
|
||||
) {
|
||||
[$rawRankType, $rankValue] = explode('=', $rawRankPair, 2);
|
||||
$rankType = RankColumn::from($rawRankType);
|
||||
$rawRankValues->put($rankType, (int) $rankValue);
|
||||
$rawValue = $db->queryAllLists(
|
||||
'SELECT `type`, `value` FROM rank_data WHERE general_id = %i AND `type` IN %ls',
|
||||
$generalID,
|
||||
array_map(fn (\BackedEnum $e) => $e->value, $rankColumn)
|
||||
);
|
||||
foreach ($rawValue as [$rawRankType, $rankValue]) {
|
||||
$rankType = RankColumn::tryFrom($rawRankType);
|
||||
$rawRankValues->put($rankType, $rankValue);
|
||||
}
|
||||
unset($rawGeneral['_rank_values']);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+15
-12
@@ -302,7 +302,7 @@ class GeneralAI
|
||||
$this->calcWarRoute();
|
||||
$troopCandidate = [];
|
||||
|
||||
$chiefTurn = cutTurn($this->general->getTurnTick(), $this->env['turnterm']);
|
||||
$chiefTurn = cutTurn($this->general->getTurnTime(), $this->env['turnterm']);
|
||||
$yearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']);
|
||||
|
||||
foreach ($this->troopLeaders as $troopLeader) {
|
||||
@@ -319,7 +319,7 @@ class GeneralAI
|
||||
|
||||
$last발령 = $troopLeader->getAuxVar('last발령');
|
||||
if ($last발령) {
|
||||
$leaderTurn = cutTurn($troopLeader->getTurnTick(), $this->env['turnterm']);
|
||||
$leaderTurn = cutTurn($troopLeader->getTurnTime(), $this->env['turnterm']);
|
||||
$compYearMonth = $yearMonth;
|
||||
if ($chiefTurn < $leaderTurn) {
|
||||
$compYearMonth += 1;
|
||||
@@ -405,7 +405,7 @@ class GeneralAI
|
||||
return null;
|
||||
}
|
||||
|
||||
$chiefTurn = cutTurn($this->general->getTurnTick(), $this->env['turnterm']);
|
||||
$chiefTurn = cutTurn($this->general->getTurnTime(), $this->env['turnterm']);
|
||||
$yearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']);
|
||||
|
||||
$troopCandidate = [];
|
||||
@@ -428,7 +428,7 @@ class GeneralAI
|
||||
|
||||
$last발령 = $troopLeader->getAuxVar('last발령');
|
||||
if ($last발령) {
|
||||
$leaderTurn = cutTurn($troopLeader->getTurnTick(), $this->env['turnterm']);
|
||||
$leaderTurn = cutTurn($troopLeader->getTurnTime(), $this->env['turnterm']);
|
||||
$compYearMonth = $yearMonth;
|
||||
if ($chiefTurn < $leaderTurn) {
|
||||
$compYearMonth += 1;
|
||||
@@ -586,8 +586,8 @@ class GeneralAI
|
||||
continue;
|
||||
}
|
||||
|
||||
$generalTurnTime = $userGeneral->getTurnTick();
|
||||
$troopTurnTime = $troopLeader->getTurnTick();
|
||||
$generalTurnTime = $userGeneral->getTurnTime();
|
||||
$troopTurnTime = $troopLeader->getTurnTime();
|
||||
|
||||
if ($generalTurnTime < $troopTurnTime) { //NOTE: 어차피 수뇌 턴이 제일 빠르다
|
||||
$generalCadidates[$generalID] = $userGeneral;
|
||||
@@ -782,7 +782,7 @@ class GeneralAI
|
||||
|
||||
if (
|
||||
key_exists($troopLeader->getCityID(), $this->supplyCities) &&
|
||||
$this->troopLeaders[$troopID]->getTurnTick() < $lostGeneral->getTurnTick()
|
||||
$this->troopLeaders[$troopID]->getTurnTime() < $lostGeneral->getTurnTime()
|
||||
) {
|
||||
//이미 탈출 가능한 부대를 탔다
|
||||
continue;
|
||||
@@ -1986,7 +1986,7 @@ class GeneralAI
|
||||
if ($lastTurn->getCommand() === '천도' && $lastTurn->getArg()['destCityID'] != $this->nation['capital']) {
|
||||
$cmd = buildNationCommandClass('che_천도', $this->general, $this->env, $lastTurn, $lastTurn->getArg());
|
||||
if ($cmd->hasFullConditionMet()) {
|
||||
$nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTick()];
|
||||
$nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];
|
||||
$this->reqUpdateInstance = true;
|
||||
return $cmd;
|
||||
}
|
||||
@@ -1995,9 +1995,12 @@ class GeneralAI
|
||||
$lastTrial = $nationStor->last천도Trial;
|
||||
if ($lastTrial) {
|
||||
[$lastTrialLevel, $lastTrialTurnTime] = $lastTrial;
|
||||
$timeDiffTick = abs($general->getTurnTick() - Util::toInt($lastTrialTurnTime));
|
||||
if ($timeDiffTick < intdiv(GameClock::TICKS_PER_TURN, 2)
|
||||
&& $lastTrialLevel !== $general->getVar('officer_level')) { //0.5Turn
|
||||
$timeDiffSeconds = TimeUtil::DateIntervalToSeconds(
|
||||
date_create_immutable($lastTrialTurnTime)->diff(
|
||||
date_create_immutable($general->getTurnTime())
|
||||
)
|
||||
);
|
||||
if ($timeDiffSeconds < $turnTerm * 30 && $lastTrialLevel !== $general->getVar('officer_level')) { //0.5Turn
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -2106,7 +2109,7 @@ class GeneralAI
|
||||
}
|
||||
|
||||
|
||||
$nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTick()];
|
||||
$nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];
|
||||
$this->reqUpdateInstance = true;
|
||||
return $cmd;
|
||||
}
|
||||
|
||||
+10
-33
@@ -54,24 +54,14 @@ abstract class GeneralBase
|
||||
);
|
||||
}
|
||||
|
||||
function getTurnTime(int $short = self::TURNTIME_FULL_MS): ?string
|
||||
{
|
||||
if(!key_exists('turntime', $this->raw)){
|
||||
return null;
|
||||
}
|
||||
|
||||
$rawTurnTime = $this->getVar('turntime');
|
||||
// 비교용 Dummy와 과거 fixture는 문자열을 잠시 허용하되 제품 DB는 tick만 사용합니다.
|
||||
if (is_string($rawTurnTime) && !ctype_digit(ltrim($rawTurnTime, '-'))) {
|
||||
$formattedTurnTime = $rawTurnTime;
|
||||
} else {
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$formattedTurnTime = $clock->formatTick(Util::toInt($rawTurnTime), true);
|
||||
}
|
||||
|
||||
return [
|
||||
self::TURNTIME_FULL_MS => function ($turntime) {
|
||||
function getTurnTime(int $short = self::TURNTIME_FULL_MS): ?string
|
||||
{
|
||||
if(!key_exists('turntime', $this->raw)){
|
||||
return null;
|
||||
}
|
||||
|
||||
return [
|
||||
self::TURNTIME_FULL_MS => function ($turntime) {
|
||||
return $turntime;
|
||||
},
|
||||
self::TURNTIME_FULL => function ($turntime) {
|
||||
@@ -83,21 +73,8 @@ abstract class GeneralBase
|
||||
self::TURNTIME_HM => function ($turntime) {
|
||||
return substr($turntime, 11, 5);
|
||||
},
|
||||
][$short]($formattedTurnTime);
|
||||
}
|
||||
|
||||
function getTurnTick(): ?int
|
||||
{
|
||||
if (!key_exists('turntime', $this->raw)) {
|
||||
return null;
|
||||
}
|
||||
$rawTurnTime = $this->getVar('turntime');
|
||||
if (is_string($rawTurnTime) && !ctype_digit(ltrim($rawTurnTime, '-'))) {
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
return $clock->dateTimeToTick(new \DateTimeImmutable($rawTurnTime));
|
||||
}
|
||||
return Util::toInt($rawTurnTime);
|
||||
}
|
||||
][$short]($this->getVar('turntime'));
|
||||
}
|
||||
|
||||
function getNPCType(): int
|
||||
{
|
||||
|
||||
@@ -59,7 +59,7 @@ class RandomNameGeneral extends AbsGeneralPool{
|
||||
'generalName'=>$generalName,
|
||||
'imgsvr'=>0,
|
||||
'picture'=>null
|
||||
], PHP_INT_MAX);
|
||||
], '9999-12-31 12:00:00');
|
||||
}
|
||||
|
||||
static public function pickGeneralFromPool(MeekroDB $db, RandUtil $rng, int $owner, int $pickCnt, ?string $prefix = null): array
|
||||
@@ -68,25 +68,26 @@ class RandomNameGeneral extends AbsGeneralPool{
|
||||
$result = [];
|
||||
$dbInsert = [];
|
||||
|
||||
$oNow = new \DateTimeImmutable();
|
||||
|
||||
|
||||
for($i=0;$i<$pickCnt;$i++){
|
||||
$result[] = static::pickGeneral1FromPool($db, $rng, $owner, $prefix);
|
||||
}
|
||||
|
||||
if($owner){
|
||||
$gameStor = \sammo\KVStorage::getStorage($db, 'game_env');
|
||||
$clock = \sammo\GameClock::fromStorage($gameStor);
|
||||
$now = $clock->nowTick();
|
||||
$now = $oNow->format('Y-m-d H:i:s');
|
||||
$db->delete('select_pool', [
|
||||
'reserved_until'=>null,
|
||||
'owner'=>null,
|
||||
],'(reserved_until < %s OR reserved_until IS NULL) AND general_id IS null', $now);
|
||||
$validUntil = $now + $clock->ticksFromSeconds(30);
|
||||
$validUntil = $oNow->add(new \DateInterval(sprintf('PT%dS', 30)));
|
||||
foreach($result as $pickedGeneral){
|
||||
$dbInsert[] = [
|
||||
'owner'=>$owner,
|
||||
'uniqueName'=>$pickedGeneral->getUniqueName(),
|
||||
'info'=>$pickedGeneral->getInfo(),
|
||||
'reserved_until'=>$validUntil
|
||||
'reserved_until'=>$validUntil->format(('Y-m-d H:i:s'))
|
||||
];
|
||||
}
|
||||
$db->insert('select_pool', $dbInsert);
|
||||
@@ -98,4 +99,4 @@ class RandomNameGeneral extends AbsGeneralPool{
|
||||
public static function initPool(\MeekroDB $db){
|
||||
//do Nothing
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ class SPoolUnderU100 extends AbsFromUserPool
|
||||
private const STAT_BONUS_MAX_TOTAL = 190;
|
||||
private const STAT_BONUS_MAX_MULTIPLIER = 1.5;
|
||||
|
||||
public function __construct(\MeekroDB $db, RandUtil $rng, array $info, int $validUntil)
|
||||
public function __construct(\MeekroDB $db, RandUtil $rng, array $info, string $validUntil)
|
||||
{
|
||||
$targetInfo = $info;
|
||||
$initialInfo = $info;
|
||||
|
||||
+15
-32
@@ -104,7 +104,6 @@ class Message
|
||||
|
||||
public static function buildFromArray(array $row) : Message
|
||||
{
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
$dbMessage = Json::decode($row['message']);
|
||||
|
||||
$msgType = MessageType::from($row['type']);
|
||||
@@ -117,8 +116,8 @@ class Message
|
||||
$src,
|
||||
$dest,
|
||||
$dbMessage['text'],
|
||||
\DateTime::createFromImmutable($clock->tickToDateTime(Util::toInt($row['time']))),
|
||||
\DateTime::createFromImmutable($clock->tickToDateTime(Util::toInt($row['valid_until']))),
|
||||
new \DateTime($row['time']),
|
||||
new \DateTime($row['valid_until']),
|
||||
$option
|
||||
];
|
||||
|
||||
@@ -152,12 +151,9 @@ class Message
|
||||
public static function getMessageByID(int $messageID) : ?Message
|
||||
{
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$row = $db->queryFirstRow(
|
||||
'SELECT * FROM `message` WHERE `id` = %i AND valid_until > %i',
|
||||
$messageID,
|
||||
$clock->nowTick(),
|
||||
);
|
||||
$now = new \DateTime();
|
||||
$row = $db->queryFirstRow('SELECT * FROM `message` WHERE `id` = %i AND valid_until', $messageID);
|
||||
//FIXME: $now가 들어가야 하는데 안 들어가있는데?
|
||||
if (!$row) {
|
||||
return null;
|
||||
}
|
||||
@@ -175,12 +171,12 @@ class Message
|
||||
{
|
||||
$db = DB::db();
|
||||
|
||||
$date = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'))->nowTick();
|
||||
$date = (new \DateTime())->format('Y-m-d H:i:s');
|
||||
|
||||
$where = new \WhereClause('and');
|
||||
$where->add('mailbox = %i', $mailbox);
|
||||
$where->add('type = %s', $msgType->value);
|
||||
$where->add('valid_until > %i', $date);
|
||||
$where->add('valid_until > %s', $date);
|
||||
if ($fromSeq > 0) {
|
||||
$where->add('id >= %i', $fromSeq);
|
||||
}
|
||||
@@ -207,12 +203,12 @@ class Message
|
||||
{
|
||||
$db = DB::db();
|
||||
|
||||
$date = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'))->nowTick();
|
||||
$date = (new \DateTime())->format('Y-m-d H:i:s');
|
||||
|
||||
$where = new \WhereClause('and');
|
||||
$where->add('mailbox = %i', $mailbox);
|
||||
$where->add('type = %s', $msgType->value);
|
||||
$where->add('valid_until > %i', $date);
|
||||
$where->add('valid_until > %s', $date);
|
||||
$where->add('id < %i', $toSeq);
|
||||
|
||||
if ($limit > 0) {
|
||||
@@ -240,8 +236,7 @@ class Message
|
||||
return '시스템 외교 메시지는 삭제할 수 없습니다.';
|
||||
}
|
||||
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
|
||||
$prev5min = \DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick()));
|
||||
$prev5min = new \DateTime();
|
||||
$prev5min->sub(new \DateInterval('PT5M'));
|
||||
|
||||
if($msgObj->date < $prev5min){
|
||||
@@ -270,15 +265,14 @@ class Message
|
||||
|
||||
}
|
||||
|
||||
$now = \DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick()));
|
||||
$in1min = clone $now;
|
||||
$in1min = new \DateTime();
|
||||
$in1min->add(new \DateInterval('PT1M'));
|
||||
$newMsg = new Message(
|
||||
$msgObj->msgType,
|
||||
$msgObj->src,
|
||||
$msgObj->dest,
|
||||
"req_del_msg",
|
||||
$now,
|
||||
new \DateTime(),
|
||||
$in1min,
|
||||
$msgOption
|
||||
);
|
||||
@@ -306,23 +300,13 @@ class Message
|
||||
|
||||
|
||||
$db = DB::db();
|
||||
$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
|
||||
$timeTick = $clock->nowTick();
|
||||
if (Util::toInt($this->validUntil->format('Y')) >= 9000) {
|
||||
$validUntilTick = GameClock::MAX_SAFE_TICK;
|
||||
} else {
|
||||
$validitySeconds = $this->validUntil->getTimestamp() - $this->date->getTimestamp();
|
||||
$validUntilTick = $timeTick + $clock->ticksFromSeconds($validitySeconds);
|
||||
}
|
||||
$this->date = \DateTime::createFromImmutable($clock->tickToDateTime($timeTick));
|
||||
$this->validUntil = \DateTime::createFromImmutable($clock->tickToDateTime($validUntilTick));
|
||||
$db->insert('message', [
|
||||
'mailbox' => $mailbox,
|
||||
'type' => $this->msgType->value,
|
||||
'src' => $src_id,
|
||||
'dest' => $dest_id,
|
||||
'time' => $timeTick,
|
||||
'valid_until' => $validUntilTick,
|
||||
'time' => $this->date->format('Y-m-d H:i:s'),
|
||||
'valid_until' => $this->validUntil->format('Y-m-d H:i:s'),
|
||||
'message' => Json::encode([
|
||||
'src'=>($this->src)?($this->src->toArray()):[],
|
||||
'dest'=>($this->dest)?($this->dest->toArray()):[],
|
||||
@@ -505,8 +489,7 @@ class Message
|
||||
'text' => $this->msg,
|
||||
'option' => $this->msgOption
|
||||
]),
|
||||
'valid_until'=>GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'))
|
||||
->dateTimeToTick($this->validUntil),
|
||||
'valid_until'=>$this->validUntil->format('Y-m-d H:i:s'),
|
||||
], 'id=%i', $this->id);
|
||||
|
||||
}
|
||||
|
||||
+16
-34
@@ -245,35 +245,21 @@ class ResetHelper{
|
||||
true
|
||||
);
|
||||
|
||||
$requestedTime = new \DateTimeImmutable($turntime);
|
||||
if($sync == 0) {
|
||||
// 현재 시간을 1월로 맞춤
|
||||
$baseTime = new \DateTimeImmutable(cutTurnDateTime($turntime, $turnterm));
|
||||
$month = 1;
|
||||
$year = $startyear;
|
||||
} else {
|
||||
// 현재 시간과 동기화
|
||||
[$baseTimeString, $yearPulled, $month] = cutDay($turntime, $turnterm);
|
||||
$baseTime = new \DateTimeImmutable($baseTimeString);
|
||||
if($sync == 0) {
|
||||
// 현재 시간을 1월로 맞춤
|
||||
$starttime = cutTurn($turntime, $turnterm);
|
||||
$month = 1;
|
||||
$year = $startyear;
|
||||
} else {
|
||||
// 현재 시간과 동기화
|
||||
[$starttime, $yearPulled, $month] = cutDay($turntime, $turnterm);
|
||||
if($yearPulled){
|
||||
$year = $startyear-1;
|
||||
}
|
||||
else{
|
||||
$year = $startyear;
|
||||
}
|
||||
}
|
||||
|
||||
$wallNow = GameClock::readWallTime();
|
||||
$initialClock = new GameClock(
|
||||
$baseTime,
|
||||
$turnterm,
|
||||
0,
|
||||
GameClock::MODE_REALTIME,
|
||||
$wallNow,
|
||||
fn (): \DateTimeImmutable => $wallNow,
|
||||
);
|
||||
$requestedTick = $initialClock->dateTimeToTick($requestedTime);
|
||||
$currentTick = $initialClock->dateTimeToTick($wallNow);
|
||||
}
|
||||
|
||||
$killturn = 4800 / $turnterm;
|
||||
if($npcmode == 1) { $killturn = intdiv($killturn, 3); }
|
||||
@@ -297,14 +283,10 @@ class ResetHelper{
|
||||
'maxnation'=>GameConst::$defaultMaxNation,
|
||||
'refreshLimit'=>30000,
|
||||
'develcost'=>$develcost,
|
||||
'turntime'=>$requestedTick,
|
||||
'starttime'=>0,
|
||||
'opentime'=>$requestedTick,
|
||||
'turnterm'=>$turnterm,
|
||||
'clock_base_time'=>TimeUtil::format($baseTime, true),
|
||||
'clock_tick'=>$currentTick,
|
||||
'clock_mode'=>GameClock::MODE_REALTIME,
|
||||
'clock_wall_anchor'=>TimeUtil::format($wallNow, true),
|
||||
'turntime'=>$turntime,
|
||||
'starttime'=>$starttime,
|
||||
'opentime'=>$turntime,
|
||||
'turnterm'=>$turnterm,
|
||||
'killturn'=>$killturn,
|
||||
'genius'=>GameConst::$defaultMaxGenius,
|
||||
'show_img_level'=>$show_img_level,
|
||||
@@ -326,7 +308,7 @@ class ResetHelper{
|
||||
'name'=>$admin['name'],
|
||||
'picture'=>$admin['picture'],
|
||||
'imgsvr'=>$admin['imgsvr'],
|
||||
'turntime'=>$requestedTick,
|
||||
'turntime'=>$turntime,
|
||||
'killturn'=>9999,
|
||||
'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE
|
||||
]);
|
||||
@@ -362,7 +344,7 @@ class ResetHelper{
|
||||
|
||||
$db->insert('ng_games', [
|
||||
'server_id'=>$serverID,
|
||||
'date'=>TimeUtil::format($requestedTime, false),
|
||||
'date'=>$turntime,
|
||||
'winner_nation'=>null,
|
||||
'map'=>$scenarioObj->getMapTheme(),
|
||||
'season'=>$seasonIdx,
|
||||
@@ -386,4 +368,4 @@ class ResetHelper{
|
||||
'result'=>true
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user