Merge branch devel into NPC possession comparison
This commit is contained in:
+22
-8
@@ -22,8 +22,6 @@ $db = DB::db();
|
|||||||
$gameStor = KVStorage::getStorage($db, 'game_env');
|
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||||
$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
|
$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
|
||||||
|
|
||||||
increaseRefresh("내정보", 1);
|
|
||||||
|
|
||||||
$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
|
$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
|
||||||
|
|
||||||
$myset = $me->getVar('myset');
|
$myset = $me->getVar('myset');
|
||||||
@@ -41,10 +39,26 @@ $lastRefresh = $db->queryFirstField(
|
|||||||
$generalID
|
$generalID
|
||||||
);
|
);
|
||||||
|
|
||||||
$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
|
$nextChange = $me->getAuxVar('next_change');
|
||||||
if ($gameStor->turntime <= $gameStor->opentime) {
|
if (!is_string($nextChange) || $nextChange === '') {
|
||||||
//서버 가오픈시 할 수 있는 행동
|
$nextChange = null;
|
||||||
if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
|
}
|
||||||
|
|
||||||
|
increaseRefresh("내정보", 1);
|
||||||
|
if ($gameStor->turntime <= $gameStor->opentime) {
|
||||||
|
$targetTime = $me->getAuxVar('prestart_delete_after');
|
||||||
|
if (!is_string($targetTime) || $targetTime === '') {
|
||||||
|
$targetTime = addTurn(
|
||||||
|
$lastRefresh ?: TimeUtil::now(),
|
||||||
|
$gameStor->turnterm,
|
||||||
|
GameConst::$minTurnDieOnPrestart
|
||||||
|
);
|
||||||
|
$me->setAuxVar('prestart_delete_after', $targetTime);
|
||||||
|
$me->applyDB($db);
|
||||||
|
}
|
||||||
|
|
||||||
|
//서버 가오픈시 할 수 있는 행동
|
||||||
|
if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
|
||||||
$showDieOnPrestartBtn = true;
|
$showDieOnPrestartBtn = true;
|
||||||
if ($targetTime <= TimeUtil::now()) {
|
if ($targetTime <= TimeUtil::now()) {
|
||||||
$availableDieOnPrestart = true;
|
$availableDieOnPrestart = true;
|
||||||
@@ -174,7 +188,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
|
|||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
|
<?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
|
||||||
다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
|
다른 장수 선택 (<?= $nextChange ? substr($nextChange, 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>
|
<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; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
@@ -272,4 +286,4 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
|
|||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
+65
-37
@@ -42,15 +42,21 @@ function pushGeneralCommand(int $generalID, int $turnCnt=1){
|
|||||||
|
|
||||||
$db = DB::db();
|
$db = DB::db();
|
||||||
|
|
||||||
$db->update('general_turn', [
|
$db->query(
|
||||||
'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
|
'UPDATE general_turn AS dst
|
||||||
], 'general_id=%i ORDER BY turn_idx DESC', $generalID);
|
LEFT JOIN general_turn AS src
|
||||||
$db->update('general_turn', [
|
ON src.general_id = dst.general_id
|
||||||
'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxTurn),
|
AND src.turn_idx = dst.turn_idx - %i
|
||||||
'action'=>'휴식',
|
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||||
'arg'=>'{}',
|
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||||
'brief'=>'휴식'
|
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||||
], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
|
WHERE dst.general_id = %i',
|
||||||
|
$turnCnt,
|
||||||
|
'휴식',
|
||||||
|
'{}',
|
||||||
|
'휴식',
|
||||||
|
$generalID
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function pullGeneralCommand(int $generalID, int $turnCnt=1){
|
function pullGeneralCommand(int $generalID, int $turnCnt=1){
|
||||||
@@ -67,15 +73,21 @@ function pullGeneralCommand(int $generalID, int $turnCnt=1){
|
|||||||
|
|
||||||
$db = DB::db();
|
$db = DB::db();
|
||||||
|
|
||||||
$db->update('general_turn', [
|
$db->query(
|
||||||
'turn_idx'=>$db->sqleval('turn_idx + %i', GameConst::$maxTurn),
|
'UPDATE general_turn AS dst
|
||||||
'action'=>'휴식',
|
LEFT JOIN general_turn AS src
|
||||||
'arg'=>'{}',
|
ON src.general_id = dst.general_id
|
||||||
'brief'=>'휴식'
|
AND src.turn_idx = dst.turn_idx + %i
|
||||||
], 'general_id=%i AND turn_idx < %i', $generalID, $turnCnt);
|
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||||
$db->update('general_turn', [
|
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||||
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
|
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||||
], 'general_id=%i ORDER BY turn_idx ASC', $generalID);
|
WHERE dst.general_id = %i',
|
||||||
|
$turnCnt,
|
||||||
|
'휴식',
|
||||||
|
'{}',
|
||||||
|
'휴식',
|
||||||
|
$generalID
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function repeatGeneralCommand(int $generalId, int $turnCnt){
|
function repeatGeneralCommand(int $generalId, int $turnCnt){
|
||||||
@@ -126,15 +138,23 @@ function pushNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
|
|||||||
|
|
||||||
$db = DB::db();
|
$db = DB::db();
|
||||||
|
|
||||||
$db->update('nation_turn', [
|
$db->query(
|
||||||
'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
|
'UPDATE nation_turn AS dst
|
||||||
], 'nation_id=%i AND officer_level=%i ORDER BY turn_idx DESC', $nationID, $officerLevel);
|
LEFT JOIN nation_turn AS src
|
||||||
$db->update('nation_turn', [
|
ON src.nation_id = dst.nation_id
|
||||||
'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxChiefTurn),
|
AND src.officer_level = dst.officer_level
|
||||||
'action'=>'휴식',
|
AND src.turn_idx = dst.turn_idx - %i
|
||||||
'arg'=>'{}',
|
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||||
'brief'=>'휴식'
|
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||||
], 'nation_id=%i AND officer_level=%i AND turn_idx >= %i ORDER BY turn_idx ASC', $nationID, $officerLevel, GameConst::$maxChiefTurn);
|
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||||
|
WHERE dst.nation_id = %i AND dst.officer_level = %i',
|
||||||
|
$turnCnt,
|
||||||
|
'휴식',
|
||||||
|
'{}',
|
||||||
|
'휴식',
|
||||||
|
$nationID,
|
||||||
|
$officerLevel
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
|
function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
|
||||||
@@ -157,15 +177,23 @@ function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
|
|||||||
|
|
||||||
$db = DB::db();
|
$db = DB::db();
|
||||||
|
|
||||||
$db->update('nation_turn', [
|
$db->query(
|
||||||
'turn_idx'=>$db->sqleval('turn_idx + %i', GameConst::$maxChiefTurn),
|
'UPDATE nation_turn AS dst
|
||||||
'action'=>'휴식',
|
LEFT JOIN nation_turn AS src
|
||||||
'arg'=>'{}',
|
ON src.nation_id = dst.nation_id
|
||||||
'brief'=>'휴식',
|
AND src.officer_level = dst.officer_level
|
||||||
], 'nation_id=%i AND officer_level=%i AND turn_idx < %i', $nationID, $officerLevel, $turnCnt);
|
AND src.turn_idx = dst.turn_idx + %i
|
||||||
$db->update('nation_turn', [
|
SET dst.action = IF(src.id IS NULL, %s, src.action),
|
||||||
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
|
dst.arg = IF(src.id IS NULL, %s, src.arg),
|
||||||
], 'nation_id=%i AND officer_level=%i ORDER BY turn_idx ASC', $nationID, $officerLevel);
|
dst.brief = IF(src.id IS NULL, %s, src.brief)
|
||||||
|
WHERE dst.nation_id = %i AND dst.officer_level = %i',
|
||||||
|
$turnCnt,
|
||||||
|
'휴식',
|
||||||
|
'{}',
|
||||||
|
'휴식',
|
||||||
|
$nationID,
|
||||||
|
$officerLevel
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function repeatNationCommand(int $nationID, int $officerLevel, int $turnCnt){
|
function repeatNationCommand(int $nationID, int $officerLevel, int $turnCnt){
|
||||||
@@ -494,4 +522,4 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
|
|||||||
'arg_test'=>true,
|
'arg_test'=>true,
|
||||||
'reason'=>'success'
|
'reason'=>'success'
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,6 +177,10 @@ $builder->setOwnerName($userNick);
|
|||||||
$builder->setKillturn(5);
|
$builder->setKillturn(5);
|
||||||
$builder->setNPCType(0);
|
$builder->setNPCType(0);
|
||||||
$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
|
$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
|
||||||
|
$builder->setAuxVar(
|
||||||
|
'prestart_delete_after',
|
||||||
|
addTurn($now, $env['turnterm'], GameConst::$minTurnDieOnPrestart)
|
||||||
|
);
|
||||||
$builder->fillRemainSpecAsZero($env);
|
$builder->fillRemainSpecAsZero($env);
|
||||||
if ($isCentennialAllStar) {
|
if ($isCentennialAllStar) {
|
||||||
$candidateCities = $db->queryFirstColumn(
|
$candidateCities = $db->queryFirstColumn(
|
||||||
|
|||||||
@@ -39,6 +39,10 @@ class DieOnPrestart extends \sammo\BaseAPI
|
|||||||
$gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
|
$gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
|
||||||
|
|
||||||
$general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i AND npc = 0', $userID);
|
$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(
|
$lastRefresh = $db->queryFirstField(
|
||||||
'SELECT %b FROM general_access_log WHERE %b = %i',
|
'SELECT %b FROM general_access_log WHERE %b = %i',
|
||||||
GeneralAccessLogColumn::lastRefresh->value,
|
GeneralAccessLogColumn::lastRefresh->value,
|
||||||
@@ -46,8 +50,9 @@ class DieOnPrestart extends \sammo\BaseAPI
|
|||||||
$general['no']
|
$general['no']
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!$general) {
|
$generalObj = General::createObjFromDB($general['no']);
|
||||||
return '장수가 없습니다';
|
if ($generalObj instanceof DummyGeneral) {
|
||||||
|
trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
|
||||||
}
|
}
|
||||||
|
|
||||||
increaseRefresh("장수 삭제", 1);
|
increaseRefresh("장수 삭제", 1);
|
||||||
@@ -61,18 +66,23 @@ class DieOnPrestart extends \sammo\BaseAPI
|
|||||||
return '이미 국가에 소속되어있습니다.';
|
return '이미 국가에 소속되어있습니다.';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$targetTime = $generalObj->getAuxVar('prestart_delete_after');
|
||||||
|
if (!is_string($targetTime) || $targetTime === '') {
|
||||||
|
$targetTime = addTurn(
|
||||||
|
$lastRefresh ?: TimeUtil::now(),
|
||||||
|
$gameStor->turnterm,
|
||||||
|
GameConst::$minTurnDieOnPrestart
|
||||||
|
);
|
||||||
|
$generalObj->setAuxVar('prestart_delete_after', $targetTime);
|
||||||
|
$generalObj->applyDB($db);
|
||||||
|
}
|
||||||
|
|
||||||
//서버 가오픈시 할 수 있는 행동
|
//서버 가오픈시 할 수 있는 행동
|
||||||
$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
|
|
||||||
if ($targetTime > TimeUtil::now()) {
|
if ($targetTime > TimeUtil::now()) {
|
||||||
$targetTimeShort = substr($targetTime, 0, 19);
|
$targetTimeShort = substr($targetTime, 0, 19);
|
||||||
return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
|
return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
|
||||||
}
|
}
|
||||||
|
|
||||||
$generalObj = General::createObjFromDB($general['no']);
|
|
||||||
if ($generalObj instanceof DummyGeneral) {
|
|
||||||
trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
|
|
||||||
}
|
|
||||||
|
|
||||||
$generalName = $generalObj->getName();
|
$generalName = $generalObj->getName();
|
||||||
$josaYi = JosaUtil::pick($generalName, '이');
|
$josaYi = JosaUtil::pick($generalName, '이');
|
||||||
$generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 홀연히 모습을 <R>감추었습니다</>");
|
$generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 홀연히 모습을 <R>감추었습니다</>");
|
||||||
|
|||||||
@@ -435,6 +435,13 @@ class Join extends \sammo\BaseAPI
|
|||||||
'specage2' => $specage2,
|
'specage2' => $specage2,
|
||||||
'special2' => $special2,
|
'special2' => $special2,
|
||||||
'penalty' => Json::encode($penalty),
|
'penalty' => Json::encode($penalty),
|
||||||
|
'aux' => Json::encode([
|
||||||
|
'prestart_delete_after' => addTurn(
|
||||||
|
$now,
|
||||||
|
$admin['turnterm'],
|
||||||
|
GameConst::$minTurnDieOnPrestart
|
||||||
|
),
|
||||||
|
]),
|
||||||
]);
|
]);
|
||||||
$generalID = $db->insertId();
|
$generalID = $db->insertId();
|
||||||
$db->insert('general_access_log', [
|
$db->insert('general_access_log', [
|
||||||
|
|||||||
@@ -451,6 +451,7 @@ final class CentennialAllStarGrowthService
|
|||||||
if (!in_array($general->getNPCType(), [3, 4], true)) {
|
if (!in_array($general->getNPCType(), [3, 4], true)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
self::initializeGeneratedNPC($general, $targetInfo);
|
||||||
$result = self::applyTarget(
|
$result = self::applyTarget(
|
||||||
$general,
|
$general,
|
||||||
$targetInfo,
|
$targetInfo,
|
||||||
@@ -462,6 +463,36 @@ final class CentennialAllStarGrowthService
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Discards the builder's generic random stat/dex values before applying
|
||||||
|
* the selected all-star target. A newly generated NPC has no organic
|
||||||
|
* growth yet, so those temporary values must not mask the creation-date
|
||||||
|
* event baseline.
|
||||||
|
*/
|
||||||
|
public static function initializeGeneratedNPC(
|
||||||
|
General $general,
|
||||||
|
array $targetInfo
|
||||||
|
): void {
|
||||||
|
foreach (self::STAT_KEYS as $key) {
|
||||||
|
$target = min(
|
||||||
|
GameConst::$maxLevel,
|
||||||
|
max(0, (int) ($targetInfo[$key] ?? 0))
|
||||||
|
);
|
||||||
|
$general->updateVar(
|
||||||
|
$key,
|
||||||
|
CentennialAllStarGrowth::statFloor(
|
||||||
|
$target,
|
||||||
|
GameConst::$defaultStatMin,
|
||||||
|
0
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
foreach (self::DEX_KEYS as $key) {
|
||||||
|
$general->updateVar($key, 0);
|
||||||
|
}
|
||||||
|
$general->setAuxVar(self::AUX_KEY, self::initialAux($targetInfo));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Moves the event-backed part of a dex conversion with the converted
|
* Moves the event-backed part of a dex conversion with the converted
|
||||||
* value and consumes any guaranteed floor crossed by the source value.
|
* value and consumes any guaranteed floor crossed by the source value.
|
||||||
|
|||||||
+63
-16
@@ -1045,18 +1045,64 @@ class General extends GeneralBase implements iAction
|
|||||||
|
|
||||||
/** @var Map<GeneralAccessLog,int>|null */
|
/** @var Map<GeneralAccessLog,int>|null */
|
||||||
$rawAccessLog = null;
|
$rawAccessLog = null;
|
||||||
|
$rankColumnValues = array_map(fn (\BackedEnum $e) => $e->value, $rankColumn);
|
||||||
|
|
||||||
if (!$accessLogColumn) {
|
if (!$accessLogColumn) {
|
||||||
$rawGeneral = $db->queryFirstRow('SELECT %l FROM general WHERE no = %i', Util::formatListOfBackticks($column), $generalID);
|
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
|
||||||
|
);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$rawGeneral = $db->queryFirstRow(
|
if ($rankColumn) {
|
||||||
'SELECT %l, %l FROM `general` LEFT JOIN general_access_log
|
$rawGeneral = $db->queryFirstRow(
|
||||||
ON general.no = general_access_log.general_id WHERE no = %i',
|
'SELECT %l, %l, (
|
||||||
Util::formatListOfBackticks($column),
|
SELECT GROUP_CONCAT(
|
||||||
Util::formatListOfBackticks($accessLogColumn),
|
CONCAT(`type`, CHAR(61), `value`)
|
||||||
$generalID
|
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
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($accessLogColumn) {
|
||||||
$rawAccessLog = new Map();
|
$rawAccessLog = new Map();
|
||||||
foreach ($accessLogColumn as $accessLogKey) {
|
foreach ($accessLogColumn as $accessLogKey) {
|
||||||
if (!key_exists($accessLogKey->value, $rawGeneral)) {
|
if (!key_exists($accessLogKey->value, $rawGeneral)) {
|
||||||
@@ -1076,15 +1122,16 @@ class General extends GeneralBase implements iAction
|
|||||||
|
|
||||||
$rawRankValues = new Map();
|
$rawRankValues = new Map();
|
||||||
if ($rankColumn) {
|
if ($rankColumn) {
|
||||||
$rawValue = $db->queryAllLists(
|
$rawRankPairs = $rawGeneral['_rank_values'];
|
||||||
'SELECT `type`, `value` FROM rank_data WHERE general_id = %i AND `type` IN %ls',
|
foreach ($rawRankPairs === null || $rawRankPairs === ''
|
||||||
$generalID,
|
? []
|
||||||
array_map(fn (\BackedEnum $e) => $e->value, $rankColumn)
|
: explode(',', $rawRankPairs) as $rawRankPair
|
||||||
);
|
) {
|
||||||
foreach ($rawValue as [$rawRankType, $rankValue]) {
|
[$rawRankType, $rankValue] = explode('=', $rawRankPair, 2);
|
||||||
$rankType = RankColumn::tryFrom($rawRankType);
|
$rankType = RankColumn::from($rawRankType);
|
||||||
$rawRankValues->put($rankType, $rankValue);
|
$rawRankValues->put($rankType, (int) $rankValue);
|
||||||
}
|
}
|
||||||
|
unset($rawGeneral['_rank_values']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -83,6 +83,51 @@ final class CentennialAllStarGrowthTest extends TestCase
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGeneratedNpcUsesExactCreationDateTargetInsteadOfRandomBase(): void
|
||||||
|
{
|
||||||
|
$vars = [
|
||||||
|
'leadership' => 72,
|
||||||
|
'strength' => 61,
|
||||||
|
'intel' => 32,
|
||||||
|
'dex1' => 120000,
|
||||||
|
'dex2' => 240000,
|
||||||
|
'dex3' => 360000,
|
||||||
|
'dex4' => 480000,
|
||||||
|
'dex5' => 600000,
|
||||||
|
'special' => 'None',
|
||||||
|
];
|
||||||
|
$target = [
|
||||||
|
'uniqueName' => 'A1000001',
|
||||||
|
'leadership' => 100,
|
||||||
|
'strength' => 80,
|
||||||
|
'intel' => 10,
|
||||||
|
'dex' => [900000, 800000, 700000, 600000, 500000],
|
||||||
|
];
|
||||||
|
$aux = CentennialAllStarGrowthService::initialAux($target);
|
||||||
|
$general = $this->createStateGeneralMock($vars, $aux);
|
||||||
|
|
||||||
|
CentennialAllStarGrowthService::initializeGeneratedNPC($general, $target);
|
||||||
|
CentennialAllStarGrowthService::applyTarget(
|
||||||
|
$general,
|
||||||
|
$target,
|
||||||
|
['startyear' => 180, 'year' => 195, 'month' => 1],
|
||||||
|
CentennialAllStarGrowthService::NPC_PROGRESS_MULTIPLIER,
|
||||||
|
GameConst::$centennialNpcDexTargetRatio
|
||||||
|
);
|
||||||
|
|
||||||
|
self::assertSame(91, $vars['leadership']);
|
||||||
|
self::assertSame(73, $vars['strength']);
|
||||||
|
self::assertSame(10, $vars['intel']);
|
||||||
|
self::assertSame(
|
||||||
|
[360000, 320000, 280000, 240000, 200000],
|
||||||
|
$this->dexValues($vars)
|
||||||
|
);
|
||||||
|
self::assertSame(76, $aux['granted']['leadership']);
|
||||||
|
self::assertSame(58, $aux['granted']['strength']);
|
||||||
|
self::assertSame(0, $aux['granted']['intel']);
|
||||||
|
self::assertSame(360000, $aux['granted']['dex1']);
|
||||||
|
}
|
||||||
|
|
||||||
public function testProgressMultiplierMustStayWithinUnitInterval(): void
|
public function testProgressMultiplierMustStayWithinUnitInterval(): void
|
||||||
{
|
{
|
||||||
$this->expectException(InvalidArgumentException::class);
|
$this->expectException(InvalidArgumentException::class);
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import fs from 'node:fs';
|
||||||
|
import {createHash} from 'node:crypto';
|
||||||
|
import {chromium} from 'playwright';
|
||||||
|
|
||||||
|
const baseURL = process.env.REF_BROWSER_URL;
|
||||||
|
const screenshotPath = process.env.REF_SCREENSHOT_PATH;
|
||||||
|
const resultPath = process.env.REF_RESULT_PATH;
|
||||||
|
const username = process.env.REF_USER_ID ?? 's100user01';
|
||||||
|
const password = fs.readFileSync('/run/secrets/test_user_password', 'utf8').trim();
|
||||||
|
|
||||||
|
if (!baseURL || !screenshotPath || !resultPath) {
|
||||||
|
throw new Error('REF_BROWSER_URL, REF_SCREENSHOT_PATH, and REF_RESULT_PATH are required');
|
||||||
|
}
|
||||||
|
|
||||||
|
const browser = await chromium.launch({headless: true});
|
||||||
|
const context = await browser.newContext({
|
||||||
|
viewport: {width: 1280, height: 960},
|
||||||
|
deviceScaleFactor: 1,
|
||||||
|
});
|
||||||
|
const page = await context.newPage();
|
||||||
|
|
||||||
|
await page.goto(baseURL, {waitUntil: 'domcontentloaded', timeout: 60_000});
|
||||||
|
const salt = await page.locator('#global_salt').inputValue();
|
||||||
|
const passwordHash = createHash('sha512')
|
||||||
|
.update(salt + password + salt)
|
||||||
|
.digest('hex');
|
||||||
|
const loginResponse = await page.request.post(
|
||||||
|
new URL('api.php?path=Login/LoginByID', baseURL).href,
|
||||||
|
{data: {username, password: passwordHash}},
|
||||||
|
);
|
||||||
|
const loginResult = await loginResponse.json();
|
||||||
|
if (!loginResponse.ok() || loginResult.result !== true) {
|
||||||
|
throw new Error(`login failed: ${String(loginResult.reason ?? loginResponse.status())}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const myPageURL = new URL('hwe/b_myPage.php', baseURL).href;
|
||||||
|
const readCooldownText = async () => {
|
||||||
|
await page.goto(myPageURL, {waitUntil: 'networkidle', timeout: 60_000});
|
||||||
|
const bodyText = await page.locator('body').innerText();
|
||||||
|
const lines = bodyText.split('\n').map(line => line.trim());
|
||||||
|
const reselect = lines.find(line => line.startsWith('다른 장수 선택 ('));
|
||||||
|
const deletion = lines.find(line => line.startsWith('가오픈 기간 내 장수 삭제 ('));
|
||||||
|
if (!reselect || !deletion) {
|
||||||
|
throw new Error(`cooldown text missing: ${bodyText.slice(0, 4000)}`);
|
||||||
|
}
|
||||||
|
return {reselect, deletion};
|
||||||
|
};
|
||||||
|
|
||||||
|
const first = await readCooldownText();
|
||||||
|
await page.waitForTimeout(1100);
|
||||||
|
const second = await readCooldownText();
|
||||||
|
await page.waitForTimeout(1100);
|
||||||
|
const third = await readCooldownText();
|
||||||
|
|
||||||
|
if (JSON.stringify(first) !== JSON.stringify(second)
|
||||||
|
|| JSON.stringify(second) !== JSON.stringify(third)
|
||||||
|
) {
|
||||||
|
throw new Error(`cooldown moved after refresh: ${JSON.stringify({first, second, third})}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
await page.screenshot({path: screenshotPath, fullPage: true});
|
||||||
|
fs.writeFileSync(
|
||||||
|
resultPath,
|
||||||
|
`${JSON.stringify({
|
||||||
|
username,
|
||||||
|
url: page.url(),
|
||||||
|
viewport: {width: 1280, height: 960, deviceScaleFactor: 1},
|
||||||
|
first,
|
||||||
|
second,
|
||||||
|
third,
|
||||||
|
}, null, 2)}\n`,
|
||||||
|
{mode: 0o600},
|
||||||
|
);
|
||||||
|
|
||||||
|
await browser.close();
|
||||||
|
console.log(`S100 my-page cooldown refresh guard verified: ${screenshotPath}`);
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use sammo\CentennialAllStarGrowthService;
|
||||||
|
use sammo\DB;
|
||||||
|
use sammo\Event\Action\AdvanceCentennialAllStar;
|
||||||
|
use sammo\GameConst;
|
||||||
|
use sammo\General;
|
||||||
|
use sammo\Json;
|
||||||
|
use sammo\KVStorage;
|
||||||
|
use sammo\RootDB;
|
||||||
|
|
||||||
|
const APP_ROOT = '/var/www/html';
|
||||||
|
const TEST_ENV = ['startyear' => 180, 'year' => 195, 'month' => 1];
|
||||||
|
const STAT_KEYS = ['leadership', 'strength', 'intel'];
|
||||||
|
const DEX_KEYS = ['dex1', 'dex2', 'dex3', 'dex4', 'dex5'];
|
||||||
|
|
||||||
|
$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
|
||||||
|
$_SERVER['REQUEST_URI'] = '/s100-reselection-final-growth-check';
|
||||||
|
|
||||||
|
require APP_ROOT . '/hwe/lib.php';
|
||||||
|
require APP_ROOT . '/hwe/func.php';
|
||||||
|
|
||||||
|
$mode = $argv[1] ?? '';
|
||||||
|
$username = $argv[2] ?? 's100user01';
|
||||||
|
$snapshotPath = $argv[3] ?? '/tmp/s100-reselection-final-growth.json';
|
||||||
|
if (!in_array($mode, ['prepare', 'verify'], true)) {
|
||||||
|
throw new InvalidArgumentException('Mode must be prepare or verify');
|
||||||
|
}
|
||||||
|
if (preg_match('/^s100user[0-9]{2}$/', $username) !== 1) {
|
||||||
|
throw new InvalidArgumentException('Username must match s100userNN');
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = DB::db();
|
||||||
|
$owner = RootDB::db()->queryFirstField(
|
||||||
|
'SELECT no FROM member WHERE id=%s',
|
||||||
|
$username
|
||||||
|
);
|
||||||
|
if ($owner === null) {
|
||||||
|
throw new RuntimeException("No member for {$username}");
|
||||||
|
}
|
||||||
|
$generalID = $db->queryFirstField('SELECT no FROM general WHERE owner=%i', $owner);
|
||||||
|
if ($generalID === null) {
|
||||||
|
throw new RuntimeException("No general for owner {$owner}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($mode === 'prepare') {
|
||||||
|
$gameStor = KVStorage::getStorage($db, 'game_env');
|
||||||
|
$gameStor->setValue('year', TEST_ENV['year']);
|
||||||
|
$gameStor->setValue('month', TEST_ENV['month']);
|
||||||
|
|
||||||
|
$eventResult = (new AdvanceCentennialAllStar())->run(TEST_ENV);
|
||||||
|
$general = General::createObjFromDB((int) $generalID);
|
||||||
|
$beforeGrowth = readGeneralState($general);
|
||||||
|
|
||||||
|
$statGrowthKey = null;
|
||||||
|
foreach (STAT_KEYS as $key) {
|
||||||
|
if ((int) $general->getVar($key) < GameConst::$maxLevel) {
|
||||||
|
$statGrowthKey = $key;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($statGrowthKey === null) {
|
||||||
|
throw new RuntimeException('No stat can receive an organic level-up');
|
||||||
|
}
|
||||||
|
$general->increaseVar(
|
||||||
|
"{$statGrowthKey}_exp",
|
||||||
|
GameConst::$upgradeLimit
|
||||||
|
);
|
||||||
|
if (!$general->checkStatChange()) {
|
||||||
|
throw new RuntimeException('Organic stat level-up did not occur');
|
||||||
|
}
|
||||||
|
|
||||||
|
$general->addDex($general->getCrewTypeObj(), 12345, false);
|
||||||
|
$general->setAuxVar('next_change', '2000-01-01 00:00:00');
|
||||||
|
$general->applyDB($db);
|
||||||
|
|
||||||
|
$afterGrowth = readGeneralState($general);
|
||||||
|
$snapshot = [
|
||||||
|
'username' => $username,
|
||||||
|
'generalID' => (int) $generalID,
|
||||||
|
'eventResult' => $eventResult,
|
||||||
|
'statGrowthKey' => $statGrowthKey,
|
||||||
|
'beforeGrowth' => $beforeGrowth,
|
||||||
|
'afterGrowth' => $afterGrowth,
|
||||||
|
];
|
||||||
|
if (file_put_contents(
|
||||||
|
$snapshotPath,
|
||||||
|
Json::encode($snapshot, Json::PRETTY) . PHP_EOL
|
||||||
|
) === false) {
|
||||||
|
throw new RuntimeException("Could not write {$snapshotPath}");
|
||||||
|
}
|
||||||
|
chmod($snapshotPath, 0600);
|
||||||
|
printf(
|
||||||
|
"Prepared final-growth reselection: user=%s target=%s stat=%s dexDelta=%d\n",
|
||||||
|
$username,
|
||||||
|
$afterGrowth['targetId'],
|
||||||
|
$statGrowthKey,
|
||||||
|
array_sum($afterGrowth['dex']) - array_sum($beforeGrowth['dex'])
|
||||||
|
);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
$snapshot = Json::decode((string) file_get_contents($snapshotPath));
|
||||||
|
$general = General::createObjFromDB((int) $generalID);
|
||||||
|
$actual = readGeneralState($general);
|
||||||
|
$targetInfoRaw = $db->queryFirstField(
|
||||||
|
'SELECT info FROM select_pool WHERE general_id=%i',
|
||||||
|
$generalID
|
||||||
|
);
|
||||||
|
if ($targetInfoRaw === null) {
|
||||||
|
throw new RuntimeException('Reselected target is not assigned to the general');
|
||||||
|
}
|
||||||
|
$targetInfo = Json::decode($targetInfoRaw);
|
||||||
|
$oldTargetId = $snapshot['afterGrowth']['targetId'];
|
||||||
|
$newTargetId = (string) ($targetInfo['uniqueName'] ?? '');
|
||||||
|
if ($newTargetId === '' || $newTargetId === $oldTargetId) {
|
||||||
|
throw new RuntimeException('Chromium reselection did not change the target');
|
||||||
|
}
|
||||||
|
if ($actual['targetId'] !== $newTargetId) {
|
||||||
|
throw new RuntimeException('General aux target does not match the assigned pool target');
|
||||||
|
}
|
||||||
|
|
||||||
|
$expectedStats = CentennialAllStarGrowthService::calculateUserCurrentTargetStats(
|
||||||
|
$targetInfo,
|
||||||
|
TEST_ENV
|
||||||
|
);
|
||||||
|
$expectedDex = [];
|
||||||
|
foreach (STAT_KEYS as $key) {
|
||||||
|
$organic = max(
|
||||||
|
0,
|
||||||
|
(int) $snapshot['afterGrowth']['stats'][$key]
|
||||||
|
- (int) $snapshot['afterGrowth']['granted'][$key]
|
||||||
|
);
|
||||||
|
$expectedStats[$key] = max($organic, $expectedStats[$key]);
|
||||||
|
assertSameValue($expectedStats[$key], $actual['stats'][$key], $key);
|
||||||
|
assertSameValue(
|
||||||
|
$actual['stats'][$key] - $organic,
|
||||||
|
$actual['granted'][$key],
|
||||||
|
"{$key} event grant"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
foreach (DEX_KEYS as $idx => $key) {
|
||||||
|
$organic = max(
|
||||||
|
0,
|
||||||
|
(int) $snapshot['afterGrowth']['dex'][$key]
|
||||||
|
- (int) $snapshot['afterGrowth']['granted'][$key]
|
||||||
|
);
|
||||||
|
$targetFloor = CentennialAllStarGrowthService::calculateDexTargetFloor(
|
||||||
|
(int) ($targetInfo['dex'][$idx] ?? 0),
|
||||||
|
TEST_ENV
|
||||||
|
);
|
||||||
|
$expectedDex[$key] = max($organic, $targetFloor);
|
||||||
|
assertSameValue($expectedDex[$key], $actual['dex'][$key], $key);
|
||||||
|
assertSameValue($targetFloor, $actual['dexFloor'][$key], "{$key} floor");
|
||||||
|
assertSameValue(
|
||||||
|
$actual['dex'][$key] - $organic,
|
||||||
|
$actual['granted'][$key],
|
||||||
|
"{$key} event grant"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
printf(
|
||||||
|
"Verified final-growth reselection: user=%s old=%s new=%s stats=%s dex=%s\n",
|
||||||
|
$username,
|
||||||
|
$oldTargetId,
|
||||||
|
$newTargetId,
|
||||||
|
Json::encode($actual['stats']),
|
||||||
|
Json::encode($actual['dex'])
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array{
|
||||||
|
* targetId:string,
|
||||||
|
* stats:array<string,int>,
|
||||||
|
* dex:array<string,int>,
|
||||||
|
* granted:array<string,int>,
|
||||||
|
* dexFloor:array<string,int>
|
||||||
|
* }
|
||||||
|
*/
|
||||||
|
function readGeneralState(General $general): array
|
||||||
|
{
|
||||||
|
$aux = $general->getAuxVar(CentennialAllStarGrowthService::AUX_KEY);
|
||||||
|
if (!is_array($aux)) {
|
||||||
|
throw new RuntimeException('Centennial growth ledger is missing');
|
||||||
|
}
|
||||||
|
$stats = [];
|
||||||
|
foreach (STAT_KEYS as $key) {
|
||||||
|
$stats[$key] = (int) $general->getVar($key);
|
||||||
|
}
|
||||||
|
$dex = [];
|
||||||
|
foreach (DEX_KEYS as $key) {
|
||||||
|
$dex[$key] = (int) $general->getVar($key);
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
'targetId' => (string) ($aux['targetId'] ?? ''),
|
||||||
|
'stats' => $stats,
|
||||||
|
'dex' => $dex,
|
||||||
|
'granted' => $aux['granted'] ?? [],
|
||||||
|
'dexFloor' => $aux['dexFloor'] ?? [],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertSameValue(int $expected, int $actual, string $label): void
|
||||||
|
{
|
||||||
|
if ($actual !== $expected) {
|
||||||
|
throw new RuntimeException(
|
||||||
|
"{$label}: expected {$expected}, got {$actual}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user