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

fix: 사망 시 유산 포인트 관련 환불/초기화가 없는 문제

Browse Source
This commit is contained in:
Hide_D
2021-09-18 03:36:08 +09:00
parent f3538fbcb7
commit a653cedb16
1 changed files with 451 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/General.php
+451 -343
View File
@@ -5,7 +5,8 @@ namespace sammo;
use sammo\Command\GeneralCommand; use sammo\Command\GeneralCommand;
use sammo\WarUnitTrigger as WarUnitTrigger; use sammo\WarUnitTrigger as WarUnitTrigger;
class General implements iAction{ class General implements iAction
{
use LazyVarUpdater; use LazyVarUpdater;
protected $raw = []; protected $raw = [];
@@ -42,28 +43,28 @@ class General implements iAction{
protected $resultTurn = null; protected $resultTurn = null;
const RANK_COLUMN = [ const RANK_COLUMN = [
'firenum'=>1, 'warnum'=>1, 'killnum'=>1, 'deathnum'=>1, 'killcrew'=>1, 'deathcrew'=>1, 'firenum' => 1, 'warnum' => 1, 'killnum' => 1, 'deathnum' => 1, 'killcrew' => 1, 'deathcrew' => 1,
'ttw'=>1, 'ttd'=>1, 'ttl'=>1, 'ttg'=>1, 'ttp'=>1, 'ttw' => 1, 'ttd' => 1, 'ttl' => 1, 'ttg' => 1, 'ttp' => 1,
'tlw'=>1, 'tld'=>1, 'tll'=>1, 'tlg'=>1, 'tlp'=>1, 'tlw' => 1, 'tld' => 1, 'tll' => 1, 'tlg' => 1, 'tlp' => 1,
'tsw'=>1, 'tsd'=>1, 'tsl'=>1, 'tsg'=>1, 'tsp'=>1, 'tsw' => 1, 'tsd' => 1, 'tsl' => 1, 'tsg' => 1, 'tsp' => 1,
'tiw'=>1, 'tid'=>1, 'til'=>1, 'tig'=>1, 'tip'=>1, 'tiw' => 1, 'tid' => 1, 'til' => 1, 'tig' => 1, 'tip' => 1,
'betwin'=>1, 'betgold'=>1, 'betwingold'=>1, 'betwin' => 1, 'betgold' => 1, 'betwingold' => 1,
'killcrew_person'=>1, 'deathcrew_person'=>1, 'killcrew_person' => 1, 'deathcrew_person' => 1,
'occupied'=>1, 'occupied' => 1,
]; ];
const INHERITANCE_KEY = [ const INHERITANCE_KEY = [
'previous'=>[true, 1, '기존 포인트'], 'previous' => [true, 1, '기존 포인트'],
'lived_month'=>[true, 1, '생존'], 'lived_month' => [true, 1, '생존'],
'max_belong'=>[false, 10, '최대 임관년 수'], 'max_belong' => [false, 10, '최대 임관년 수'],
'max_domestic_critical'=>[true, 1, '최대 연속 내정 성공'], 'max_domestic_critical' => [true, 1, '최대 연속 내정 성공'],
'snipe_combat'=>[true, 10, '병종 상성 우위 횟수'], 'snipe_combat' => [true, 10, '병종 상성 우위 횟수'],
'combat'=>[['rank', 'warnum'], 5, '전투 횟수'], 'combat' => [['rank', 'warnum'], 5, '전투 횟수'],
'sabotage'=>[['rank', 'firenum'], 20, '계략 성공 횟수'], 'sabotage' => [['rank', 'firenum'], 20, '계략 성공 횟수'],
'unifier'=>[true, 1, '천통 기여'], 'unifier' => [true, 1, '천통 기여'],
'dex'=>[false, 0.001, '숙련도'], 'dex' => [false, 0.001, '숙련도'],
'tournament'=>[true, 1, '토너먼트'], 'tournament' => [true, 1, '토너먼트'],
'betting'=>[false, 10, '베팅 당첨'], 'betting' => [false, 10, '베팅 당첨'],
]; ];
const TURNTIME_FULL_MS = -1; const TURNTIME_FULL_MS = -1;
@@ -75,19 +76,19 @@ class General implements iAction{
protected static $prohibitedDirectUpdateVars = [ protected static $prohibitedDirectUpdateVars = [
//Reason: iAction //Reason: iAction
'leadership'=>1, 'leadership' => 1,
'power'=>1, 'power' => 1,
'intel'=>1, 'intel' => 1,
'nation'=>2, 'nation' => 2,
'officer_level'=>1, 'officer_level' => 1,
//NOTE: officerLevelObj로 인해 국가의 '레벨'이 바뀌는 것도 조심해야 하나, 국가 레벨의 변경은 월 초/말에만 일어남. //NOTE: officerLevelObj로 인해 국가의 '레벨'이 바뀌는 것도 조심해야 하나, 국가 레벨의 변경은 월 초/말에만 일어남.
'special'=>1, 'special' => 1,
'special2'=>1, 'special2' => 1,
'personal'=>1, 'personal' => 1,
'horse'=>1, 'horse' => 1,
'weapon'=>1, 'weapon' => 1,
'book'=>1, 'book' => 1,
'item'=>1 'item' => 1
]; ];
@@ -98,10 +99,11 @@ class General implements iAction{
* @param int|null $month 게임 월 * @param int|null $month 게임 월
* @param bool $fullConstruct iAction, 및 ActionLogger 초기화 여부, false인 경우 no, name, city, nation, officer_level 정도로 초기화 가능 * @param bool $fullConstruct iAction, 및 ActionLogger 초기화 여부, false인 경우 no, name, city, nation, officer_level 정도로 초기화 가능
*/ */
public function __construct(array $raw, ?array $rawRank, ?array $city, ?array $nation, ?int $year, ?int $month, bool $fullConstruct=true){ public function __construct(array $raw, ?array $rawRank, ?array $city, ?array $nation, ?int $year, ?int $month, bool $fullConstruct = true)
{
//TODO: 밖에서 가져오도록 하면 버그 확률이 높아짐. 필요한 raw 값을 직접 구해야함. //TODO: 밖에서 가져오도록 하면 버그 확률이 높아짐. 필요한 raw 값을 직접 구해야함.
if($nation === null){ if ($nation === null) {
$nation = getNationStaticInfo($raw['nation']); $nation = getNationStaticInfo($raw['nation']);
} }
@@ -109,20 +111,20 @@ class General implements iAction{
$this->rawCity = $city; $this->rawCity = $city;
$this->resultTurn = new LastTurn(); $this->resultTurn = new LastTurn();
if(key_exists('last_turn', $this->raw)){ if (key_exists('last_turn', $this->raw)) {
$this->lastTurn = LastTurn::fromJson($this->raw['last_turn']); $this->lastTurn = LastTurn::fromJson($this->raw['last_turn']);
$this->resultTurn = $this->lastTurn->duplicate(); $this->resultTurn = $this->lastTurn->duplicate();
} }
if($year !== null && $month !== null){ if ($year !== null && $month !== null) {
$this->initLogger($year, $month); $this->initLogger($year, $month);
} }
if($rawRank){ if ($rawRank) {
$this->rankVarRead = $rawRank; $this->rankVarRead = $rawRank;
} }
if(!$fullConstruct){ if (!$fullConstruct) {
return; return;
} }
@@ -139,15 +141,16 @@ class General implements iAction{
$this->itemObjs['book'] = buildItemClass($raw['book']); $this->itemObjs['book'] = buildItemClass($raw['book']);
$this->itemObjs['item'] = buildItemClass($raw['item']); $this->itemObjs['item'] = buildItemClass($raw['item']);
if(key_exists('aux', $this->raw)){ if (key_exists('aux', $this->raw)) {
$rawInheritBuff = $this->getAuxVar('inheritBuff'); $rawInheritBuff = $this->getAuxVar('inheritBuff');
if($rawInheritBuff !== null){ if ($rawInheritBuff !== null) {
$this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff); $this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff);
} }
} }
} }
function initLogger(int $year, int $month){ function initLogger(int $year, int $month)
{
$this->logger = new ActionLogger( $this->logger = new ActionLogger(
$this->getVar('no'), $this->getVar('no'),
$this->getVar('nation'), $this->getVar('nation'),
@@ -157,17 +160,27 @@ class General implements iAction{
); );
} }
function getTurnTime(int $short=self::TURNTIME_FULL_MS){ function getTurnTime(int $short = self::TURNTIME_FULL_MS)
{
return [ return [
self::TURNTIME_FULL_MS=>function($turntime){return $turntime;}, self::TURNTIME_FULL_MS => function ($turntime) {
self::TURNTIME_FULL=>function($turntime){return substr($turntime, 0, 19);}, return $turntime;
self::TURNTIME_HMS=>function($turntime){return substr($turntime, 11, 8);}, },
self::TURNTIME_HM=>function($turntime){return substr($turntime, 11, 5);}, self::TURNTIME_FULL => function ($turntime) {
return substr($turntime, 0, 19);
},
self::TURNTIME_HMS => function ($turntime) {
return substr($turntime, 11, 8);
},
self::TURNTIME_HM => function ($turntime) {
return substr($turntime, 11, 5);
},
][$short]($this->getVar('turntime')); ][$short]($this->getVar('turntime'));
} }
function setItem(string $itemKey='item', ?string $itemCode){ function setItem(string $itemKey = 'item', ?string $itemCode)
if($itemCode === null){ {
if ($itemCode === null) {
$this->deleteItem($itemKey); $this->deleteItem($itemKey);
} }
@@ -175,50 +188,61 @@ class General implements iAction{
$this->itemObjs[$itemKey] = buildItemClass($itemCode); $this->itemObjs[$itemKey] = buildItemClass($itemCode);
} }
function deleteItem(string $itemKey='item'){ function deleteItem(string $itemKey = 'item')
{
$this->setVar($itemKey, 'None'); $this->setVar($itemKey, 'None');
$this->itemObjs[$itemKey] = new ActionItem\None(); $this->itemObjs[$itemKey] = new ActionItem\None();
} }
function getItem(string $itemKey='item'):BaseItem{ function getItem(string $itemKey = 'item'): BaseItem
{
return $this->itemObjs[$itemKey]; return $this->itemObjs[$itemKey];
} }
function getNPCType():int{ function getNPCType(): int
{
return $this->raw['npc']; return $this->raw['npc'];
} }
/** @return BaseItem[] */ /** @return BaseItem[] */
function getItems():array{ function getItems(): array
{
return $this->itemObjs; return $this->itemObjs;
} }
function getPersonality():iAction{ function getPersonality(): iAction
{
return $this->personalityObj; return $this->personalityObj;
} }
function getSpecialDomestic():iAction{ function getSpecialDomestic(): iAction
{
return $this->specialDomesticObj; return $this->specialDomesticObj;
} }
function getSpecialWar():iAction{ function getSpecialWar(): iAction
{
return $this->specialWarObj; return $this->specialWarObj;
} }
function getLastTurn():LastTurn{ function getLastTurn(): LastTurn
{
return $this->lastTurn; return $this->lastTurn;
} }
function _setResultTurn(LastTurn $resultTurn){ function _setResultTurn(LastTurn $resultTurn)
{
$this->resultTurn = $resultTurn; $this->resultTurn = $resultTurn;
} }
function getResultTurn():LastTurn{ function getResultTurn(): LastTurn
{
return $this->resultTurn; return $this->resultTurn;
} }
function clearActivatedSkill(){ function clearActivatedSkill()
foreach ($this->activatedSkill as $skillName=>$state) { {
foreach ($this->activatedSkill as $skillName => $state) {
if (!$state) { if (!$state) {
continue; continue;
} }
@@ -232,86 +256,103 @@ class General implements iAction{
$this->activatedSkill = []; $this->activatedSkill = [];
} }
function getActivatedSkillLog():array{ function getActivatedSkillLog(): array
{
return $this->logActivatedSkill; return $this->logActivatedSkill;
} }
function hasActivatedSkill(string $skillName):bool{ function hasActivatedSkill(string $skillName): bool
{
return $this->activatedSkill[$skillName] ?? false; return $this->activatedSkill[$skillName] ?? false;
} }
function activateSkill(... $skillNames){ function activateSkill(...$skillNames)
foreach($skillNames as $skillName){ {
foreach ($skillNames as $skillName) {
$this->activatedSkill[$skillName] = true; $this->activatedSkill[$skillName] = true;
} }
} }
function deactivateSkill(... $skillNames){ function deactivateSkill(...$skillNames)
foreach($skillNames as $skillName){ {
foreach ($skillNames as $skillName) {
$this->activatedSkill[$skillName] = false; $this->activatedSkill[$skillName] = false;
} }
} }
function getName():string{ function getName(): string
{
return $this->raw['name']; return $this->raw['name'];
} }
function getInfo():string{ function getInfo(): string
{
//iAction용 info로는 적절하지 않음 //iAction용 info로는 적절하지 않음
return ''; return '';
} }
function getID():int{ function getID(): int
{
return $this->raw['no']; return $this->raw['no'];
} }
function getRawCity():?array{ function getRawCity(): ?array
{
return $this->rawCity; return $this->rawCity;
} }
function setRawCity(?array $city){ function setRawCity(?array $city)
{
$this->rawCity = $city; $this->rawCity = $city;
} }
function getCityID():int{ function getCityID(): int
{
return $this->raw['city']; return $this->raw['city'];
} }
function getNationID():int{ function getNationID(): int
{
return $this->raw['nation']; return $this->raw['nation'];
} }
function getStaticNation():array{ function getStaticNation(): array
{
return getNationStaticInfo($this->raw['nation']); return getNationStaticInfo($this->raw['nation']);
} }
function getLogger():?ActionLogger{ function getLogger(): ?ActionLogger
{
return $this->logger; return $this->logger;
} }
public function getNationTypeObj():iAction{ public function getNationTypeObj(): iAction
{
return $this->nationType; return $this->nationType;
} }
public function getOfficerLevelObj():iAction{ public function getOfficerLevelObj(): iAction
{
return $this->officerLevelObj; return $this->officerLevelObj;
} }
function getCrewTypeObj():GameUnitDetail{ function getCrewTypeObj(): GameUnitDetail
{
$crewType = GameUnitConst::byID($this->getVar('crewtype')); $crewType = GameUnitConst::byID($this->getVar('crewtype'));
if($crewType === null){ if ($crewType === null) {
throw new \InvalidArgumentException('Invalid CrewType:'.$this->getVar('crewtype')); throw new \InvalidArgumentException('Invalid CrewType:' . $this->getVar('crewtype'));
} }
return $crewType; return $crewType;
} }
function calcRecentWarTurn(int $turnTerm):int{ function calcRecentWarTurn(int $turnTerm): int
{
$cacheKey = "recent_war_turn_{$turnTerm}"; $cacheKey = "recent_war_turn_{$turnTerm}";
if(key_exists($cacheKey, $this->calcCache)){ if (key_exists($cacheKey, $this->calcCache)) {
return $this->calcCache[$cacheKey]; return $this->calcCache[$cacheKey];
} }
if(!$this->getVar('recent_war')){ if (!$this->getVar('recent_war')) {
$result = 12*1000; $result = 12 * 1000;
$this->calcCache[$cacheKey] = $result; $this->calcCache[$cacheKey] = $result;
return $result; return $result;
} }
@@ -319,7 +360,7 @@ class General implements iAction{
$turnNow = new \DateTimeImmutable($this->getVar('turntime')); $turnNow = new \DateTimeImmutable($this->getVar('turntime'));
$secDiff = TimeUtil::DateIntervalToSeconds($recwar->diff($turnNow)); $secDiff = TimeUtil::DateIntervalToSeconds($recwar->diff($turnNow));
if($secDiff <= 0){ if ($secDiff <= 0) {
$this->calcCache[$cacheKey] = 0; $this->calcCache[$cacheKey] = 0;
return 0; return 0;
} }
@@ -329,13 +370,14 @@ class General implements iAction{
return $result; return $result;
} }
function getReservedTurn(int $turnIdx, array $env):GeneralCommand{ function getReservedTurn(int $turnIdx, array $env): GeneralCommand
{
$db = DB::db(); $db = DB::db();
$rawCmd = $db->queryFirstRow('SELECT * FROM general_turn WHERE general_id = %i AND turn_idx = %i', $this->getID(), $turnIdx); $rawCmd = $db->queryFirstRow('SELECT * FROM general_turn WHERE general_id = %i AND turn_idx = %i', $this->getID(), $turnIdx);
if(!$rawCmd){ if (!$rawCmd) {
return buildGeneralCommandClass(null, $this, $env); return buildGeneralCommandClass(null, $this, $env);
} }
return buildGeneralCommandClass($rawCmd['action'], $this, $env, Json::decode($rawCmd['arg']??null)); return buildGeneralCommandClass($rawCmd['action'], $this, $env, Json::decode($rawCmd['arg'] ?? null));
} }
/** /**
@@ -345,13 +387,14 @@ class General implements iAction{
* @param array $env * @param array $env
* @return GeneralCommand[] * @return GeneralCommand[]
*/ */
public function getReservedTurnList(int $turnIdxFrom, int $turnIdxTo, array $env){ public function getReservedTurnList(int $turnIdxFrom, int $turnIdxTo, array $env)
if($turnIdxFrom < 0 || $turnIdxFrom >= GameConst::$maxTurn){ {
throw new \OutOfRangeException('$turnIdxFrom 범위 초과'.$turnIdxFrom); if ($turnIdxFrom < 0 || $turnIdxFrom >= GameConst::$maxTurn) {
throw new \OutOfRangeException('$turnIdxFrom 범위 초과' . $turnIdxFrom);
} }
if($turnIdxTo <= $turnIdxFrom || GameConst::$maxTurn < $turnIdxTo){ if ($turnIdxTo <= $turnIdxFrom || GameConst::$maxTurn < $turnIdxTo) {
throw new \OutOfRangeException('$turnIdxTo 범위 초과'.$turnIdxTo); throw new \OutOfRangeException('$turnIdxTo 범위 초과' . $turnIdxTo);
} }
$db = DB::db(); $db = DB::db();
@@ -362,15 +405,15 @@ class General implements iAction{
$rawCmds = $db->queryFirstRow('SELECT * FROM general_turn WHERE general_id = %i AND %i <= turn_idx AND turn_idx < %i ORDER BY turn_idx ASC', $generalID, $turnIdxFrom, $turnIdxTo); $rawCmds = $db->queryFirstRow('SELECT * FROM general_turn WHERE general_id = %i AND %i <= turn_idx AND turn_idx < %i ORDER BY turn_idx ASC', $generalID, $turnIdxFrom, $turnIdxTo);
if(!$rawCmds){ if (!$rawCmds) {
foreach(Util::range($turnIdxFrom, $turnIdxTo) as $turnIdx){ foreach (Util::range($turnIdxFrom, $turnIdxTo) as $turnIdx) {
$result[$turnIdx] = buildGeneralCommandClass(null, $this, $env); $result[$turnIdx] = buildGeneralCommandClass(null, $this, $env);
} }
return $result; return $result;
} }
foreach($rawCmds as $turnIdx=>$rawCmd){ foreach ($rawCmds as $turnIdx => $rawCmd) {
$result[$turnIdx] = buildGeneralCommandClass($rawCmd['action'], $this, $env, Json::decode($rawCmd['arg']??null)); $result[$turnIdx] = buildGeneralCommandClass($rawCmd['action'], $this, $env, Json::decode($rawCmd['arg'] ?? null));
} }
return $result; return $result;
@@ -388,11 +431,12 @@ class General implements iAction{
* @return int|float 계산된 능력치 * @return int|float 계산된 능력치
*/ */
protected function getStatValue(string $statName, $withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true):float{ protected function getStatValue(string $statName, $withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true): float
{
$cKey = "{$statName}_{$withInjury}_{$withIActionObj}_{$withStatAdjust}"; $cKey = "{$statName}_{$withInjury}_{$withIActionObj}_{$withStatAdjust}";
if(key_exists($cKey, $this->calcCache)){ if (key_exists($cKey, $this->calcCache)) {
$statValue = $this->calcCache[$cKey]; $statValue = $this->calcCache[$cKey];
if($useFloor){ if ($useFloor) {
return Util::toInt($statValue); return Util::toInt($statValue);
} }
return $statValue; return $statValue;
@@ -400,35 +444,34 @@ class General implements iAction{
$statValue = $this->getVar($statName); $statValue = $this->getVar($statName);
if($withInjury){ if ($withInjury) {
$statValue *= (100 - $this->getVar('injury')) / 100; $statValue *= (100 - $this->getVar('injury')) / 100;
} }
if($withStatAdjust){ if ($withStatAdjust) {
if($statName === 'strength'){ if ($statName === 'strength') {
$statValue += Util::round($this->getStatValue('intel', $withInjury, $withIActionObj, false, false) / 4); $statValue += Util::round($this->getStatValue('intel', $withInjury, $withIActionObj, false, false) / 4);
} } else if ($statName === 'intel') {
else if($statName === 'intel'){
$statValue += Util::round($this->getStatValue('strength', $withInjury, $withIActionObj, false, false) / 4); $statValue += Util::round($this->getStatValue('strength', $withInjury, $withIActionObj, false, false) / 4);
} }
} }
if($withIActionObj){ if ($withIActionObj) {
foreach([ foreach ([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
$this->specialWarObj, $this->specialWarObj,
$this->personalityObj, $this->personalityObj,
$this->inheritBuffObj, $this->inheritBuffObj,
] as $actionObj){ ] as $actionObj) {
if($actionObj !== null){ if ($actionObj !== null) {
$statValue = $actionObj->onCalcStat($this, $statName, $statValue); $statValue = $actionObj->onCalcStat($this, $statName, $statValue);
} }
} }
foreach($this->itemObjs as $actionObj){ foreach ($this->itemObjs as $actionObj) {
if($actionObj !== null){ if ($actionObj !== null) {
$statValue = $actionObj->onCalcStat($this, $statName, $statValue); $statValue = $actionObj->onCalcStat($this, $statName, $statValue);
} }
} }
@@ -436,54 +479,58 @@ class General implements iAction{
$this->calcCache[$cKey] = $statValue; $this->calcCache[$cKey] = $statValue;
if($useFloor){ if ($useFloor) {
return Util::toInt($statValue); return Util::toInt($statValue);
} }
return $statValue; return $statValue;
} }
function getLeadership($withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true):float{ function getLeadership($withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true): float
{
return $this->getStatValue('leadership', $withInjury, $withIActionObj, $withStatAdjust, $useFloor); return $this->getStatValue('leadership', $withInjury, $withIActionObj, $withStatAdjust, $useFloor);
} }
function getStrength($withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true):float{ function getStrength($withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true): float
{
return $this->getStatValue('strength', $withInjury, $withIActionObj, $withStatAdjust, $useFloor); return $this->getStatValue('strength', $withInjury, $withIActionObj, $withStatAdjust, $useFloor);
} }
function getIntel($withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true):float{ function getIntel($withInjury = true, $withIActionObj = true, $withStatAdjust = true, $useFloor = true): float
{
return $this->getStatValue('intel', $withInjury, $withIActionObj, $withStatAdjust, $useFloor); return $this->getStatValue('intel', $withInjury, $withIActionObj, $withStatAdjust, $useFloor);
} }
function getDex(GameUnitDetail $crewType){ function getDex(GameUnitDetail $crewType)
{
$armType = $crewType->armType; $armType = $crewType->armType;
if($armType == GameUnitConst::T_CASTLE){ if ($armType == GameUnitConst::T_CASTLE) {
$armType = GameUnitConst::T_SIEGE; $armType = GameUnitConst::T_SIEGE;
} }
return $this->getVar("dex{$armType}"); return $this->getVar("dex{$armType}");
} }
function addDex(GameUnitDetail $crewType, float $exp, bool $affectTrainAtmos=false){ function addDex(GameUnitDetail $crewType, float $exp, bool $affectTrainAtmos = false)
{
$armType = $crewType->armType; $armType = $crewType->armType;
if($armType == GameUnitConst::T_CASTLE){ if ($armType == GameUnitConst::T_CASTLE) {
$armType = GameUnitConst::T_SIEGE; $armType = GameUnitConst::T_SIEGE;
} }
if($armType < 0){ if ($armType < 0) {
return; return;
} }
if($armType == GameUnitConst::T_WIZARD) { if ($armType == GameUnitConst::T_WIZARD) {
$exp *= 0.9; $exp *= 0.9;
} } else if ($armType == GameUnitConst::T_SIEGE) {
else if($armType == GameUnitConst::T_SIEGE) {
$exp *= 0.9; $exp *= 0.9;
} }
if($affectTrainAtmos){ if ($affectTrainAtmos) {
$exp *= ($this->getVar('train') + $this->getVar('atmos')) / 200; $exp *= ($this->getVar('train') + $this->getVar('atmos')) / 200;
} }
@@ -492,39 +539,39 @@ class General implements iAction{
$this->increaseVar($dexType, $exp); $this->increaseVar($dexType, $exp);
} }
function addExperience(float $experience, bool $affectTrigger=true){ function addExperience(float $experience, bool $affectTrigger = true)
if($affectTrigger){ {
if ($affectTrigger) {
$experience = $this->onCalcStat($this, 'experience', $experience); $experience = $this->onCalcStat($this, 'experience', $experience);
} }
$this->increaseVar('experience', $experience); $this->increaseVar('experience', $experience);
$nextExpLevel = getExpLevel($this->getVar('experience')); $nextExpLevel = getExpLevel($this->getVar('experience'));
$comp = $nextExpLevel <=> $this->getVar('explevel'); $comp = $nextExpLevel <=> $this->getVar('explevel');
if($comp === 0){ if ($comp === 0) {
return; return;
} }
$this->updateVar('explevel', $nextExpLevel); $this->updateVar('explevel', $nextExpLevel);
$josaRo = JosaUtil::pick($nextExpLevel, '로'); $josaRo = JosaUtil::pick($nextExpLevel, '로');
if($comp > 0){ if ($comp > 0) {
$this->getLogger()->pushGeneralActionLog("<C>Lv {$nextExpLevel}</>{$josaRo} <C>레벨업</>!", ActionLogger::PLAIN); $this->getLogger()->pushGeneralActionLog("<C>Lv {$nextExpLevel}</>{$josaRo} <C>레벨업</>!", ActionLogger::PLAIN);
} } else {
else{
$this->getLogger()->pushGeneralActionLog("<C>Lv {$nextExpLevel}</>{$josaRo} <R>레벨다운</>!", ActionLogger::PLAIN); $this->getLogger()->pushGeneralActionLog("<C>Lv {$nextExpLevel}</>{$josaRo} <R>레벨다운</>!", ActionLogger::PLAIN);
} }
} }
function addDedication(float $dedication, bool $affectTrigger=true){ function addDedication(float $dedication, bool $affectTrigger = true)
if($affectTrigger){ {
if ($affectTrigger) {
$dedication = $this->onCalcStat($this, 'dedication', $dedication); $dedication = $this->onCalcStat($this, 'dedication', $dedication);
} }
$this->increaseVar('dedication', $dedication); $this->increaseVar('dedication', $dedication);
$nextDedLevel = getDedLevel($this->getVar('dedication')); $nextDedLevel = getDedLevel($this->getVar('dedication'));
$comp = $nextDedLevel <=> $this->getVar('dedlevel'); $comp = $nextDedLevel <=> $this->getVar('dedlevel');
if($comp === 0){ if ($comp === 0) {
return; return;
} }
@@ -534,20 +581,19 @@ class General implements iAction{
$billText = number_format(getBillByLevel($nextDedLevel)); $billText = number_format(getBillByLevel($nextDedLevel));
$josaRoDed = JosaUtil::pick($dedLevelText, '로'); $josaRoDed = JosaUtil::pick($dedLevelText, '로');
$josaRoBill = JosaUtil::pick($billText, '로'); $josaRoBill = JosaUtil::pick($billText, '로');
if($comp > 0){ if ($comp > 0) {
$this->getLogger()->pushGeneralActionLog("<Y>{$dedLevelText}</>{$josaRoDed} <C>승급</>하여 봉록이 <C>{$billText}</>{$josaRoBill} <C>상승</>했습니다!", ActionLogger::PLAIN); $this->getLogger()->pushGeneralActionLog("<Y>{$dedLevelText}</>{$josaRoDed} <C>승급</>하여 봉록이 <C>{$billText}</>{$josaRoBill} <C>상승</>했습니다!", ActionLogger::PLAIN);
} } else {
else{
$this->getLogger()->pushGeneralActionLog("<Y>{$dedLevelText}</>{$josaRoDed} <R>강등</>되어 봉록이 <C>{$billText}</>{$josaRoBill} <R>하락</>했습니다!", ActionLogger::PLAIN); $this->getLogger()->pushGeneralActionLog("<Y>{$dedLevelText}</>{$josaRoDed} <R>강등</>되어 봉록이 <C>{$billText}</>{$josaRoBill} <R>하락</>했습니다!", ActionLogger::PLAIN);
} }
} }
function updateVar(string $key, $value){ function updateVar(string $key, $value)
if(($this->raw[$key]??null) === $value){ {
if (($this->raw[$key] ?? null) === $value) {
return; return;
} }
if(!key_exists($key, $this->updatedVar)){ if (!key_exists($key, $this->updatedVar)) {
$this->updatedVar[$key] = true; $this->updatedVar[$key] = true;
} }
$this->raw[$key] = $value; $this->raw[$key] = $value;
@@ -557,39 +603,81 @@ class General implements iAction{
/** /**
* @param \MeekroDB $db * @param \MeekroDB $db
*/ */
function kill($db, bool $sendDyingMessage=true, ?string $dyingMessage=null){ function kill($db, bool $sendDyingMessage = true, ?string $dyingMessage = null)
{
$generalID = $this->getID(); $generalID = $this->getID();
$logger = $this->getLogger(); $logger = $this->getLogger();
$generalName = $this->getName(); $generalName = $this->getName();
$this->mergeTotalInheritancePoint(); //유산포인트 관련 항목 환불
if ($this->getNPCType() < 2) {
$refundPoint = 0;
$userID = $this->getVar('owner');
$userLogger = new UserLogger($userID);
if ($this->getAuxVar('inheritRandomUnique')) {
$this->setAuxVar('inheritRandomUnique', null);
$userLogger->push(sprintf("사망으로 랜덤 유니크 구입 %d 포인트 반환", GameConst::$inheritItemRandomPoint), "inheritPoint");
$refundPoint += GameConst::$inheritItemRandomPoint;
}
$itemTrials = $this->getAuxVar('inheritUniqueTrial') ?? [];
foreach (array_keys($itemTrials) as $itemKey) {
$trialStor = KVStorage::getStorage($db, "ut_{$itemKey}");
$ownTrial = $trialStor->getValue("u{$userID}");
$itemObj = buildItemClass($itemKey);
$itemName = $itemObj->getName();
if (!$ownTrial) {
continue;
}
[,, $amount] = $ownTrial;
$trialStor->deleteValue("u{$userID}");
$userLogger->push("사망으로 {$itemName} 입찰에 사용한 {$amount} 포인트 반환", "inheritPoint");
$refundPoint += $amount;
}
if($this->getAuxVar('inheritSpecificSpecialWar')){
$this->setAuxVar('inheritSpecificSpecialWar', null);
$userLogger->push(sprintf("사망으로 전투 특기 지정 %d 포인트 반환", GameConst::$inheritSpecificSpecialPoint), "inheritPoint");
$refundPoint += GameConst::$inheritSpecificSpecialPoint;
}
if ($refundPoint > 0) {
$this->increaseInheritancePoint('previous', $refundPoint);
}
$this->mergeTotalInheritancePoint();
}
// 군주였으면 유지 이음 // 군주였으면 유지 이음
$officerLevel = $this->getVar('officer_level'); $officerLevel = $this->getVar('officer_level');
if($officerLevel == 12) { if ($officerLevel == 12) {
nextRuler($this); nextRuler($this);
$this->setVar('officer_level', 1); $this->setVar('officer_level', 1);
} }
// 부대 처리 // 부대 처리
$troopLeaderID = $this->getVar('troop'); $troopLeaderID = $this->getVar('troop');
if($troopLeaderID == $generalID){ if ($troopLeaderID == $generalID) {
//부대장일 경우 //부대장일 경우
// 모두 탈퇴 // 모두 탈퇴
$db->update('general', [ $db->update('general', [
'troop'=>0 'troop' => 0
], 'troop=%i', $troopLeaderID); ], 'troop=%i', $troopLeaderID);
// 부대 삭제 // 부대 삭제
$db->delete('troop', 'troop_leader=%i', $troopLeaderID); $db->delete('troop', 'troop_leader=%i', $troopLeaderID);
} }
if($sendDyingMessage){ if ($sendDyingMessage) {
if($dyingMessage){ if ($dyingMessage) {
$logger->pushGlobalActionLog($dyingMessage); $logger->pushGlobalActionLog($dyingMessage);
} } else {
else{
$dyingMessageObj = new TextDecoration\DyingMessage($this); $dyingMessageObj = new TextDecoration\DyingMessage($this);
$logger->pushGlobalActionLog($dyingMessageObj->getText()); $logger->pushGlobalActionLog($dyingMessageObj->getText());
} }
@@ -597,9 +685,9 @@ class General implements iAction{
} }
$db->update('select_pool', [ $db->update('select_pool', [
'general_id'=>null, 'general_id' => null,
'owner'=>null, 'owner' => null,
'reserved_until'=>null, 'reserved_until' => null,
], 'general_id=%i', $generalID); ], 'general_id=%i', $generalID);
$db->delete('general', 'no=%i', $generalID); $db->delete('general', 'no=%i', $generalID);
@@ -609,17 +697,18 @@ class General implements iAction{
$this->updatedVar = []; $this->updatedVar = [];
$db->update('nation', [ $db->update('nation', [
'gennum'=>$db->sqleval('gennum - 1') 'gennum' => $db->sqleval('gennum - 1')
], 'nation=%i', $this->getVar('nation')); ], 'nation=%i', $this->getVar('nation'));
} }
function rebirth(){ function rebirth()
{
$logger = $this->getLogger(); $logger = $this->getLogger();
$generalName = $this->getName(); $generalName = $this->getName();
$ownerID = $this->getVar('owner'); $ownerID = $this->getVar('owner');
if($ownerID){ if ($ownerID) {
$this->mergeTotalInheritancePoint(); $this->mergeTotalInheritancePoint();
resetInheritanceUser($ownerID, true); resetInheritanceUser($ownerID, true);
} }
@@ -639,7 +728,7 @@ class General implements iAction{
$this->multiplyVar('dex4', 0.5); $this->multiplyVar('dex4', 0.5);
$this->multiplyVar('dex5', 0.5); $this->multiplyVar('dex5', 0.5);
foreach(array_keys(static::RANK_COLUMN) as $rankKey){ foreach (array_keys(static::RANK_COLUMN) as $rankKey) {
$this->setRankVar($rankKey, 0); $this->setRankVar($rankKey, 0);
} }
@@ -649,23 +738,24 @@ class General implements iAction{
$logger->pushGeneralHistoryLog('나이가 들어 은퇴하고, 자손에게 관직을 물려줌'); $logger->pushGeneralHistoryLog('나이가 들어 은퇴하고, 자손에게 관직을 물려줌');
} }
function increaseRankVar(string $key, int $value){ function increaseRankVar(string $key, int $value)
if(!key_exists($key, static::RANK_COLUMN)){ {
throw new \InvalidArgumentException('올바르지 않은 인자 :'.$key); if (!key_exists($key, static::RANK_COLUMN)) {
throw new \InvalidArgumentException('올바르지 않은 인자 :' . $key);
} }
if(key_exists($key, $this->rankVarSet)){ if (key_exists($key, $this->rankVarSet)) {
$this->rankVarSet[$key] += $value; $this->rankVarSet[$key] += $value;
return; return;
} }
if(key_exists($key, $this->rankVarRead)){ if (key_exists($key, $this->rankVarRead)) {
$this->rankVarSet[$key] = $this->rankVarRead[$key] + $value; $this->rankVarSet[$key] = $this->rankVarRead[$key] + $value;
unset($this->rankVarRead[$key]); unset($this->rankVarRead[$key]);
return; return;
} }
if(key_exists($key, $this->rankVarIncrease)){ if (key_exists($key, $this->rankVarIncrease)) {
$this->rankVarIncrease[$key] += $value; $this->rankVarIncrease[$key] += $value;
return; return;
} }
@@ -673,31 +763,32 @@ class General implements iAction{
$this->rankVarIncrease[$key] = $value; $this->rankVarIncrease[$key] = $value;
} }
function setRankVar(string $key, int $value){ function setRankVar(string $key, int $value)
if(!key_exists($key, static::RANK_COLUMN)){ {
throw new \InvalidArgumentException('올바르지 않은 인자 :'.$key); if (!key_exists($key, static::RANK_COLUMN)) {
throw new \InvalidArgumentException('올바르지 않은 인자 :' . $key);
} }
if(key_exists($key, $this->rankVarRead)){ if (key_exists($key, $this->rankVarRead)) {
unset($this->rankVarRead[$key]); unset($this->rankVarRead[$key]);
} } else if (key_exists($key, $this->rankVarIncrease)) {
else if(key_exists($key, $this->rankVarIncrease)){
unset($this->rankVarIncrease[$key]); unset($this->rankVarIncrease[$key]);
} }
$this->rankVarSet[$key]=$value; $this->rankVarSet[$key] = $value;
} }
function getRankVar(string $key):int{ function getRankVar(string $key): int
if(!key_exists($key, static::RANK_COLUMN)){ {
throw new \InvalidArgumentException('올바르지 않은 인자 :'.$key); if (!key_exists($key, static::RANK_COLUMN)) {
throw new \InvalidArgumentException('올바르지 않은 인자 :' . $key);
} }
if(key_exists($key, $this->rankVarSet)){ if (key_exists($key, $this->rankVarSet)) {
return $this->rankVarSet[$key]; return $this->rankVarSet[$key];
} }
if(!key_exists($key, $this->rankVarRead)){ if (!key_exists($key, $this->rankVarRead)) {
throw new \RuntimeException('인자가 없음 : '.$key); throw new \RuntimeException('인자가 없음 : ' . $key);
} }
return $this->rankVarRead[$key]; return $this->rankVarRead[$key];
@@ -706,8 +797,9 @@ class General implements iAction{
/** /**
* @param \MeekroDB $db * @param \MeekroDB $db
*/ */
function applyDB($db):bool{ function applyDB($db): bool
if($this->lastTurn && $this->getLastTurn() != $this->getResultTurn()){ {
if ($this->lastTurn && $this->getLastTurn() != $this->getResultTurn()) {
$this->setVar('last_turn', $this->getResultTurn()->toJson()); $this->setVar('last_turn', $this->getResultTurn()->toJson());
} }
$updateVals = $this->getUpdatedValues(); $updateVals = $this->getUpdatedValues();
@@ -716,31 +808,31 @@ class General implements iAction{
$generalID = $this->getID(); $generalID = $this->getID();
$result = false; $result = false;
if($updateVals){ if ($updateVals) {
$db->update('general', $updateVals, 'no=%i', $generalID); $db->update('general', $updateVals, 'no=%i', $generalID);
$result = $result || $db->affectedRows() > 0; $result = $result || $db->affectedRows() > 0;
if(key_exists('nation', $updateVals)){ if (key_exists('nation', $updateVals)) {
$db->update('rank_data', [ $db->update('rank_data', [
'nation_id'=>$updateVals['nation'] 'nation_id' => $updateVals['nation']
], 'general_id = %i', $generalID); ], 'general_id = %i', $generalID);
$result = true; $result = true;
} }
$this->flushUpdateValues(); $this->flushUpdateValues();
} }
if($this->rankVarIncrease){ if ($this->rankVarIncrease) {
foreach($this->rankVarIncrease as $rankKey => $rankVal){ foreach ($this->rankVarIncrease as $rankKey => $rankVal) {
$db->update('rank_data', [ $db->update('rank_data', [
'value'=>$db->sqleval('value + %i', $rankVal) 'value' => $db->sqleval('value + %i', $rankVal)
], 'general_id = %i AND type = %s', $generalID, $rankKey); ], 'general_id = %i AND type = %s', $generalID, $rankKey);
} }
$result = true; $result = true;
} }
if($this->rankVarSet){ if ($this->rankVarSet) {
foreach($this->rankVarSet as $rankKey => $rankVal){ foreach ($this->rankVarSet as $rankKey => $rankVal) {
$db->update('rank_data', [ $db->update('rank_data', [
'value'=>$rankVal 'value' => $rankVal
], 'general_id = %i AND type = %s', $generalID, $rankKey); ], 'general_id = %i AND type = %s', $generalID, $rankKey);
$this->rankVarRead[$rankKey] = $rankVal; $this->rankVarRead[$rankKey] = $rankVal;
} }
@@ -754,7 +846,8 @@ class General implements iAction{
return $result; return $result;
} }
function checkStatChange():bool{ function checkStatChange(): bool
{
$logger = $this->getLogger(); $logger = $this->getLogger();
$limit = GameConst::$upgradeLimit; $limit = GameConst::$upgradeLimit;
@@ -766,16 +859,15 @@ class General implements iAction{
$result = false; $result = false;
foreach($table as [$statNickName, $statName]){ foreach ($table as [$statNickName, $statName]) {
$statExpName = $statName.'_exp'; $statExpName = $statName . '_exp';
if($this->getVar($statExpName) < 0){ if ($this->getVar($statExpName) < 0) {
$logger->pushGeneralActionLog("<R>{$statNickName}</>이 <C>1</> 떨어졌습니다!", ActionLogger::PLAIN); $logger->pushGeneralActionLog("<R>{$statNickName}</>이 <C>1</> 떨어졌습니다!", ActionLogger::PLAIN);
$this->increaseVar($statExpName, $limit); $this->increaseVar($statExpName, $limit);
$this->increaseVar($statName, -1); $this->increaseVar($statName, -1);
$result = true; $result = true;
} } else if ($this->getVar($statExpName) >= $limit) {
else if($this->getVar($statExpName) >= $limit){
$logger->pushGeneralActionLog("<S>{$statNickName}</>이 <C>1</> 올랐습니다!", ActionLogger::PLAIN); $logger->pushGeneralActionLog("<S>{$statNickName}</>이 <C>1</> 올랐습니다!", ActionLogger::PLAIN);
$this->increaseVar($statExpName, -$limit); $this->increaseVar($statExpName, -$limit);
$this->increaseVar($statName, 1); $this->increaseVar($statName, 1);
@@ -786,9 +878,10 @@ class General implements iAction{
return $result; return $result;
} }
public function getPreTurnExecuteTriggerList(General $general):?GeneralTriggerCaller{ public function getPreTurnExecuteTriggerList(General $general): ?GeneralTriggerCaller
{
$caller = new GeneralTriggerCaller(); $caller = new GeneralTriggerCaller();
foreach(array_merge([ foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -796,9 +889,9 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -807,8 +900,9 @@ class General implements iAction{
return $caller; return $caller;
} }
public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{ public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
foreach(array_merge([ {
foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -816,8 +910,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -826,9 +920,10 @@ class General implements iAction{
return $value; return $value;
} }
public function onCalcStat(General $general, string $statName, $value, $aux=null){ public function onCalcStat(General $general, string $statName, $value, $aux = null)
{
//xxx: $general? //xxx: $general?
foreach(array_merge([ foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -836,8 +931,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -846,9 +941,10 @@ class General implements iAction{
return $value; return $value;
} }
public function onCalcOpposeStat(General $general, string $statName, $value, $aux=null){ public function onCalcOpposeStat(General $general, string $statName, $value, $aux = null)
{
//xxx: $general? //xxx: $general?
foreach(array_merge([ foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -856,8 +952,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -866,8 +962,9 @@ class General implements iAction{
return $value; return $value;
} }
public function onCalcStrategic(string $turnType, string $varType, $value){ public function onCalcStrategic(string $turnType, string $varType, $value)
foreach(array_merge([ {
foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -875,8 +972,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -885,8 +982,9 @@ class General implements iAction{
return $value; return $value;
} }
public function onCalcNationalIncome(string $type, $amount){ public function onCalcNationalIncome(string $type, $amount)
foreach(array_merge([ {
foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -894,8 +992,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -904,11 +1002,12 @@ class General implements iAction{
return $amount; return $amount;
} }
public function getWarPowerMultiplier(WarUnit $unit):array{ public function getWarPowerMultiplier(WarUnit $unit): array
{
//xxx:$unit //xxx:$unit
$att = 1; $att = 1;
$def = 1; $def = 1;
foreach(array_merge([ foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -916,8 +1015,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -927,9 +1026,10 @@ class General implements iAction{
} }
return [$att, $def]; return [$att, $def];
} }
public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{ public function getBattleInitSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
{
$caller = new WarUnitTriggerCaller(); $caller = new WarUnitTriggerCaller();
foreach(array_merge([ foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -937,8 +1037,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -947,7 +1047,8 @@ class General implements iAction{
return $caller; return $caller;
} }
public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{ public function getBattlePhaseSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
{
$caller = new WarUnitTriggerCaller( $caller = new WarUnitTriggerCaller(
new WarUnitTrigger\che_필살시도($unit), new WarUnitTrigger\che_필살시도($unit),
new WarUnitTrigger\che_필살발동($unit), new WarUnitTrigger\che_필살발동($unit),
@@ -957,7 +1058,7 @@ class General implements iAction{
new WarUnitTrigger\che_계략발동($unit), new WarUnitTrigger\che_계략발동($unit),
new WarUnitTrigger\che_계략실패($unit) new WarUnitTrigger\che_계략실패($unit)
); );
foreach(array_merge([ foreach (array_merge([
$this->nationType, $this->nationType,
$this->officerLevelObj, $this->officerLevelObj,
$this->specialDomesticObj, $this->specialDomesticObj,
@@ -965,8 +1066,8 @@ class General implements iAction{
$this->personalityObj, $this->personalityObj,
$this->getCrewTypeObj(), $this->getCrewTypeObj(),
$this->inheritBuffObj, $this->inheritBuffObj,
], $this->itemObjs) as $iObj){ ], $this->itemObjs) as $iObj) {
if(!$iObj){ if (!$iObj) {
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
@@ -976,7 +1077,8 @@ class General implements iAction{
return $caller; return $caller;
} }
static public function mergeQueryColumn(?array $reqColumns=null, int $constructMode=2):array{ static public function mergeQueryColumn(?array $reqColumns = null, int $constructMode = 2): array
{
$minimumColumn = ['no', 'name', 'city', 'nation', 'officer_level', 'officer_city']; $minimumColumn = ['no', 'name', 'city', 'nation', 'officer_level', 'officer_city'];
$defaultEventColumn = [ $defaultEventColumn = [
'no', 'name', 'owner', 'city', 'nation', 'officer_level', 'officer_city', 'no', 'name', 'owner', 'city', 'nation', 'officer_level', 'officer_city',
@@ -994,22 +1096,21 @@ class General implements iAction{
'specage', 'specage2', 'con', 'connect', 'aux', 'lastrefresh', 'specage', 'specage2', 'con', 'connect', 'aux', 'lastrefresh',
]; ];
if($reqColumns === null){ if ($reqColumns === null) {
return [$fullColumn, array_keys(static::RANK_COLUMN)]; return [$fullColumn, array_keys(static::RANK_COLUMN)];
} }
$rankColumn = []; $rankColumn = [];
$subColumn = []; $subColumn = [];
foreach($reqColumns as $column){ foreach ($reqColumns as $column) {
if(key_exists($column, static::RANK_COLUMN)){ if (key_exists($column, static::RANK_COLUMN)) {
$rankColumn[] = $column; $rankColumn[] = $column;
} } else {
else{
$subColumn[] = $column; $subColumn[] = $column;
} }
} }
if($constructMode > 1){ if ($constructMode > 1) {
return [array_unique(array_merge($defaultEventColumn, $subColumn)), $rankColumn]; return [array_unique(array_merge($defaultEventColumn, $subColumn)), $rankColumn];
} }
@@ -1023,31 +1124,30 @@ class General implements iAction{
* @return \sammo\General[] * @return \sammo\General[]
* @throws MustNotBeReachedException * @throws MustNotBeReachedException
*/ */
static public function createGeneralObjListFromDB(?array $generalIDList, ?array $column=null, int $constructMode=2):array{ static public function createGeneralObjListFromDB(?array $generalIDList, ?array $column = null, int $constructMode = 2): array
if($generalIDList === []){ {
if ($generalIDList === []) {
return []; return [];
} }
$db = DB::db(); $db = DB::db();
if($constructMode > 0){ if ($constructMode > 0) {
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
[$year, $month] = $gameStor->getValuesAsArray(['year', 'month']); [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
} } else {
else{
$year = null; $year = null;
$month = null; $month = null;
} }
[$column, $rankColumn] = static::mergeQueryColumn($column, $constructMode); [$column, $rankColumn] = static::mergeQueryColumn($column, $constructMode);
if($generalIDList === null){ if ($generalIDList === null) {
$rawGenerals = Util::convertArrayToDict( $rawGenerals = Util::convertArrayToDict(
$db->query('SELECT %l FROM general WHERE 1', Util::formatListOfBackticks($column)), $db->query('SELECT %l FROM general WHERE 1', Util::formatListOfBackticks($column)),
'no' 'no'
); );
$generalIDList = array_keys($rawGenerals); $generalIDList = array_keys($rawGenerals);
} } else {
else{
$rawGenerals = Util::convertArrayToDict( $rawGenerals = Util::convertArrayToDict(
$db->query('SELECT %l FROM general WHERE no IN %li', Util::formatListOfBackticks($column), $generalIDList), $db->query('SELECT %l FROM general WHERE no IN %li', Util::formatListOfBackticks($column), $generalIDList),
'no' 'no'
@@ -1056,14 +1156,14 @@ class General implements iAction{
$rawRanks = []; $rawRanks = [];
if($rankColumn){ if ($rankColumn) {
$rawValue = $db->queryAllLists( $rawValue = $db->queryAllLists(
'SELECT `general_id`, `type`, `value` FROM rank_data WHERE general_id IN %li AND `type` IN %ls', 'SELECT `general_id`, `type`, `value` FROM rank_data WHERE general_id IN %li AND `type` IN %ls',
$generalIDList, $generalIDList,
$rankColumn $rankColumn
); );
foreach($rawValue as [$generalID, $rankType, $rankValue]){ foreach ($rawValue as [$generalID, $rankType, $rankValue]) {
if(!key_exists($generalID, $rawRanks)){ if (!key_exists($generalID, $rawRanks)) {
$rawRanks[$generalID] = []; $rawRanks[$generalID] = [];
} }
$rawRanks[$generalID][$rankType] = $rankValue; $rawRanks[$generalID][$rankType] = $rankValue;
@@ -1071,27 +1171,27 @@ class General implements iAction{
} }
$result = []; $result = [];
foreach($generalIDList as $generalID){ foreach ($generalIDList as $generalID) {
if(!key_exists($generalID, $rawGenerals)){ if (!key_exists($generalID, $rawGenerals)) {
$result[$generalID] = new DummyGeneral($constructMode > 0); $result[$generalID] = new DummyGeneral($constructMode > 0);
continue; continue;
} }
if(key_exists($generalID, $rawRanks) && count($rawRanks[$generalID]??[]) !== count($rankColumn)){ if (key_exists($generalID, $rawRanks) && count($rawRanks[$generalID] ?? []) !== count($rankColumn)) {
throw new \RuntimeException('column의 수가 일치하지 않음 : '.$generalID); throw new \RuntimeException('column의 수가 일치하지 않음 : ' . $generalID);
} }
$result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID]??null, null, null, $year, $month, $constructMode > 1); $result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID] ?? null, null, null, $year, $month, $constructMode > 1);
} }
return $result; return $result;
} }
static public function createGeneralObjFromDB(int $generalID, ?array $column=null, int $constructMode=2):self{ static public function createGeneralObjFromDB(int $generalID, ?array $column = null, int $constructMode = 2): self
{
$db = DB::db(); $db = DB::db();
if($constructMode > 0){ if ($constructMode > 0) {
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
[$year, $month] = $gameStor->getValuesAsArray(['year', 'month']); [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
} } else {
else{
$year = null; $year = null;
$month = null; $month = null;
} }
@@ -1099,14 +1199,14 @@ class General implements iAction{
[$column, $rankColumn] = static::mergeQueryColumn($column, $constructMode); [$column, $rankColumn] = static::mergeQueryColumn($column, $constructMode);
$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);
if(!$rawGeneral){ if (!$rawGeneral) {
return new DummyGeneral($constructMode > 0); return new DummyGeneral($constructMode > 0);
} }
$rawRankValues = []; $rawRankValues = [];
if($rankColumn){ if ($rankColumn) {
$rawValue = $db->queryAllLists('SELECT `type`, `value` FROM rank_data WHERE general_id = %i AND `type` IN %ls', $generalID, $rankColumn); $rawValue = $db->queryAllLists('SELECT `type`, `value` FROM rank_data WHERE general_id = %i AND `type` IN %ls', $generalID, $rankColumn);
foreach($rawValue as [$rankType, $rankValue]){ foreach ($rawValue as [$rankType, $rankValue]) {
$rawRankValues[$rankType] = $rankValue; $rawRankValues[$rankType] = $rankValue;
} }
} }
@@ -1123,21 +1223,22 @@ class General implements iAction{
* @param array $env * @param array $env
* @return GeneralCommand[] * @return GeneralCommand[]
*/ */
static public function getReservedTurnByGeneralList(array $generalList, int $turnIdx, array $env){ static public function getReservedTurnByGeneralList(array $generalList, int $turnIdx, array $env)
if(!$generalList){ {
if (!$generalList) {
return []; return [];
} }
$generalIDList = array_map(function(General $general){ $generalIDList = array_map(function (General $general) {
return $general->getID(); return $general->getID();
}, $generalList); }, $generalList);
$db = DB::db(); $db = DB::db();
$result = []; $result = [];
$rawCmds = Util::convertArrayToDict($db->query('SELECT * FROM general_turn WHERE general_id IN %li AND turn_idx = %i', $generalIDList, $turnIdx), 'general_id'); $rawCmds = Util::convertArrayToDict($db->query('SELECT * FROM general_turn WHERE general_id IN %li AND turn_idx = %i', $generalIDList, $turnIdx), 'general_id');
foreach($generalList as $general){ foreach ($generalList as $general) {
$generalID = $general->getID(); $generalID = $general->getID();
if(!key_exists($generalID, $rawCmds)){ if (!key_exists($generalID, $rawCmds)) {
$result[$generalID] = buildGeneralCommandClass(null, $general, $env); $result[$generalID] = buildGeneralCommandClass(null, $general, $env);
continue; continue;
} }
@@ -1154,21 +1255,22 @@ class General implements iAction{
* @param array $env * @param array $env
* @return GeneralCommand[][] * @return GeneralCommand[][]
*/ */
static public function getReservedTurnListByGeneralList(array $generalList, int $turnIdxFrom, int $turnIdxTo, array $env){ static public function getReservedTurnListByGeneralList(array $generalList, int $turnIdxFrom, int $turnIdxTo, array $env)
{
//XXX: static인데 return값이 General이 아니라고?? GeneralCommandHelper같은게 있어야하지 않을까? //XXX: static인데 return값이 General이 아니라고?? GeneralCommandHelper같은게 있어야하지 않을까?
if(!$generalList){ if (!$generalList) {
return []; return [];
} }
if($turnIdxFrom < 0 || $turnIdxFrom >= GameConst::$maxTurn){ if ($turnIdxFrom < 0 || $turnIdxFrom >= GameConst::$maxTurn) {
throw new \OutOfRangeException('$turnIdxFrom 범위 초과'.$turnIdxFrom); throw new \OutOfRangeException('$turnIdxFrom 범위 초과' . $turnIdxFrom);
} }
if($turnIdxTo <= $turnIdxFrom || GameConst::$maxTurn < $turnIdxTo){ if ($turnIdxTo <= $turnIdxFrom || GameConst::$maxTurn < $turnIdxTo) {
throw new \OutOfRangeException('$turnIdxTo 범위 초과'.$turnIdxTo); throw new \OutOfRangeException('$turnIdxTo 범위 초과' . $turnIdxTo);
} }
$generalIDList = array_map(function(General $general){ $generalIDList = array_map(function (General $general) {
return $general->getID(); return $general->getID();
}, $generalList); }, $generalList);
@@ -1176,26 +1278,26 @@ class General implements iAction{
$rawCmds = $db->queryFirstRow('SELECT * FROM general_turn WHERE general_id IN %i AND %i <= turn_idx AND turn_idx < %i ORDER BY general_id ASC, turn_idx ASC', $generalIDList, $turnIdxFrom, $turnIdxTo); $rawCmds = $db->queryFirstRow('SELECT * FROM general_turn WHERE general_id IN %i AND %i <= turn_idx AND turn_idx < %i ORDER BY general_id ASC, turn_idx ASC', $generalIDList, $turnIdxFrom, $turnIdxTo);
$orderedRawCmds = []; $orderedRawCmds = [];
foreach($rawCmds as $rawCmd){ foreach ($rawCmds as $rawCmd) {
$generalID = $rawCmd['general_id']; $generalID = $rawCmd['general_id'];
$turnIdx = $rawCmd['turn_idx']; $turnIdx = $rawCmd['turn_idx'];
if(!key_exists($generalID, $orderedRawCmds)){ if (!key_exists($generalID, $orderedRawCmds)) {
$orderedRawCmds[$generalID] = []; $orderedRawCmds[$generalID] = [];
} }
$orderedRawCmds[$generalID][$turnIdx] = $rawCmd; $orderedRawCmds[$generalID][$turnIdx] = $rawCmd;
} }
$result = []; $result = [];
foreach($generalList as $general){ foreach ($generalList as $general) {
$generalID = $general->getID(); $generalID = $general->getID();
$result[$generalID] = []; $result[$generalID] = [];
if(!key_exists($generalID, $orderedRawCmds)){ if (!key_exists($generalID, $orderedRawCmds)) {
foreach(Util::range($turnIdxFrom, $turnIdxTo) as $turnIdx){ foreach (Util::range($turnIdxFrom, $turnIdxTo) as $turnIdx) {
$result[$generalID][$turnIdx] = buildGeneralCommandClass(null, $general, $env); $result[$generalID][$turnIdx] = buildGeneralCommandClass(null, $general, $env);
} }
continue; continue;
} }
foreach($orderedRawCmds[$generalID] as $turnIdx=>$rawCmd){ foreach ($orderedRawCmds[$generalID] as $turnIdx => $rawCmd) {
$result[$generalID][$turnIdx] = buildGeneralCommandClass($rawCmd['action'], $general, $env, Json::decode($rawCmd['arg'])); $result[$generalID][$turnIdx] = buildGeneralCommandClass($rawCmd['action'], $general, $env, Json::decode($rawCmd['arg']));
} }
} }
@@ -1205,109 +1307,113 @@ class General implements iAction{
/** /**
* @return int|float * @return int|float
*/ */
public function getInheritancePoint(string $key, &$aux=null, bool $forceCalc=false){ public function getInheritancePoint(string $key, &$aux = null, bool $forceCalc = false)
$inheritType = static::INHERITANCE_KEY[$key]??null; {
if($inheritType === null){ $inheritType = static::INHERITANCE_KEY[$key] ?? null;
if ($inheritType === null) {
throw new \OutOfRangeException("{$key}는 유산 타입이 아님"); throw new \OutOfRangeException("{$key}는 유산 타입이 아님");
} }
$ownerID = $this->getVar('owner'); $ownerID = $this->getVar('owner');
if(!$ownerID){ if (!$ownerID) {
return 0; return 0;
} }
if($this->getVar('npc') != 0){ if ($this->getVar('npc') != 0) {
return 0; return 0;
} }
[$storeType, $multiplier, ] = $inheritType; [$storeType, $multiplier,] = $inheritType;
$gameStor = KVStorage::getStorage(DB::db(), 'game_env'); $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
if($storeType === true || ($gameStor->isunited != 0 && !$forceCalc)){ if ($storeType === true || ($gameStor->isunited != 0 && !$forceCalc)) {
$inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}"); $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}");
[$value, $aux] = $inheritStor->getValue($key); [$value, $aux] = $inheritStor->getValue($key);
return $value; return $value;
} }
if(is_array($storeType)){ if (is_array($storeType)) {
[$storSubType, $storSubKey] = $storeType; [$storSubType, $storSubKey] = $storeType;
if($storSubType === 'rank'){ if ($storSubType === 'rank') {
return $this->getRankVar($storSubKey) * $multiplier; return $this->getRankVar($storSubKey) * $multiplier;
} }
if($storSubType === 'raw'){ if ($storSubType === 'raw') {
return $this->getVar($storSubKey) * $multiplier; return $this->getVar($storSubKey) * $multiplier;
} }
if($storSubType === 'aux'){ if ($storSubType === 'aux') {
return ($this->getAuxVar($storSubKey)??0) * $multiplier; return ($this->getAuxVar($storSubKey) ?? 0) * $multiplier;
} }
throw new \InvalidArgumentException("{$storSubType}은 참조 할 수 없는 유산 세부키임"); throw new \InvalidArgumentException("{$storSubType}은 참조 할 수 없는 유산 세부키임");
} }
if($storeType !== false){ if ($storeType !== false) {
throw new \InvalidArgumentException("{$storeType}은 올바르지 않은 유산 키임"); throw new \InvalidArgumentException("{$storeType}은 올바르지 않은 유산 키임");
} }
$extractFn = function(){ return [0, null];}; $extractFn = function () {
switch($key){ return [0, null];
case 'dex': };
$extractFn = function() use ($multiplier){ switch ($key) {
$totalDex = 0; case 'dex':
foreach(array_keys(GameUnitConst::allType()) as $armType){ $extractFn = function () use ($multiplier) {
$totalDex += $this->getVar("dex{$armType}"); $totalDex = 0;
} foreach (array_keys(GameUnitConst::allType()) as $armType) {
return [$totalDex * $multiplier, null]; $totalDex += $this->getVar("dex{$armType}");
}; }
break; return [$totalDex * $multiplier, null];
case 'betting': };
$extractFn = function() use ($multiplier){ break;
$betWin = $this->getRankVar('betwin'); case 'betting':
$betWinRate = $this->getRankVar('betwingold')/max(1, $this->getRankVar('betgold')); $extractFn = function () use ($multiplier) {
$betWin = $this->getRankVar('betwin');
$betWinRate = $this->getRankVar('betwingold') / max(1, $this->getRankVar('betgold'));
return [$betWin * $multiplier * pow($betWinRate, 2), null]; return [$betWin * $multiplier * pow($betWinRate, 2), null];
}; };
break; break;
case 'max_belong': case 'max_belong':
$extractFn = function() use ($multiplier){ $extractFn = function () use ($multiplier) {
$maxBelong = max($this->getVar('belong'), $this->getAuxVar('max_belong')??0); $maxBelong = max($this->getVar('belong'), $this->getAuxVar('max_belong') ?? 0);
return [$maxBelong * $multiplier, null]; return [$maxBelong * $multiplier, null];
}; };
break; break;
default: default:
throw new \InvalidArgumentException("{$key}는 유산 추출기를 보유하고 있지 않음"); throw new \InvalidArgumentException("{$key}는 유산 추출기를 보유하고 있지 않음");
} }
[$value, $aux] = ($extractFn)(); [$value, $aux] = ($extractFn)();
return $value; return $value;
} }
public function setInheritancePoint(string $key, $value, $aux=null){ public function setInheritancePoint(string $key, $value, $aux = null)
if(!is_int($value) && !is_float($value)){ {
if (!is_int($value) && !is_float($value)) {
throw new \InvalidArgumentException("{$value}는 숫자가 아님"); throw new \InvalidArgumentException("{$value}는 숫자가 아님");
} }
$inheritType = static::INHERITANCE_KEY[$key]??null; $inheritType = static::INHERITANCE_KEY[$key] ?? null;
if($inheritType === null){ if ($inheritType === null) {
throw new \OutOfRangeException("{$key}는 유산 타입이 아님"); throw new \OutOfRangeException("{$key}는 유산 타입이 아님");
} }
[$storeType, $multiplier, ] = $inheritType; [$storeType, $multiplier,] = $inheritType;
if($storeType !== true){ if ($storeType !== true) {
throw new \InvalidArgumentException("{$key}는 직접 저장형 유산 포인트가 아님"); throw new \InvalidArgumentException("{$key}는 직접 저장형 유산 포인트가 아님");
} }
if($multiplier != 1 && $value != 0){ if ($multiplier != 1 && $value != 0) {
throw new \InvalidArgumentException("{$key}는 1:1 유산 포인트가 아님"); throw new \InvalidArgumentException("{$key}는 1:1 유산 포인트가 아님");
} }
$ownerID = $this->getVar('owner'); $ownerID = $this->getVar('owner');
if(!$ownerID){ if (!$ownerID) {
return; return;
} }
if($this->getVar('npc') != 0){ if ($this->getVar('npc') != 0) {
return; return;
} }
$gameStor = KVStorage::getStorage(DB::db(), 'game_env'); $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
if($gameStor->isunited != 0){ if ($gameStor->isunited != 0) {
return; return;
} }
@@ -1315,39 +1421,40 @@ class General implements iAction{
$inheritStor->setValue($key, [$value, $aux]); $inheritStor->setValue($key, [$value, $aux]);
} }
public function increaseInheritancePoint(string $key, $value, $aux=null){ public function increaseInheritancePoint(string $key, $value, $aux = null)
if(!is_int($value) && !is_float($value)){ {
if (!is_int($value) && !is_float($value)) {
throw new \InvalidArgumentException("{$value}는 숫자가 아님"); throw new \InvalidArgumentException("{$value}는 숫자가 아님");
} }
$inheritType = static::INHERITANCE_KEY[$key]??null; $inheritType = static::INHERITANCE_KEY[$key] ?? null;
if($inheritType === null){ if ($inheritType === null) {
throw new \OutOfRangeException("{$key}는 유산 타입이 아님"); throw new \OutOfRangeException("{$key}는 유산 타입이 아님");
} }
[$storeType, $multiplier, ] = $inheritType; [$storeType, $multiplier,] = $inheritType;
if($storeType !== true){ if ($storeType !== true) {
throw new \InvalidArgumentException("{$key}는 직접 저장형 유산 포인트가 아님"); throw new \InvalidArgumentException("{$key}는 직접 저장형 유산 포인트가 아님");
} }
$ownerID = $this->getVar('owner'); $ownerID = $this->getVar('owner');
if(!$ownerID){ if (!$ownerID) {
return; return;
} }
if($this->getVar('npc') != 0){ if ($this->getVar('npc') != 0) {
return; return;
} }
$gameStor = KVStorage::getStorage(DB::db(), 'game_env'); $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
if($gameStor->isunited != 0){ if ($gameStor->isunited != 0) {
return; return;
} }
$inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}"); $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}");
[$oldValue, $oldAux] = $inheritStor->getValue($key)??[0, null]; [$oldValue, $oldAux] = $inheritStor->getValue($key) ?? [0, null];
if($oldAux !== $aux){ if ($oldAux !== $aux) {
$oldValue = 0; $oldValue = 0;
} }
@@ -1355,22 +1462,23 @@ class General implements iAction{
$inheritStor->setValue($key, [$newValue, $aux]); $inheritStor->setValue($key, [$newValue, $aux]);
} }
public function mergeTotalInheritancePoint(){ public function mergeTotalInheritancePoint()
{
$ownerID = $this->getVar('owner'); $ownerID = $this->getVar('owner');
if(!$ownerID){ if (!$ownerID) {
return; return;
} }
if($this->getVar('npc') != 0){ if ($this->getVar('npc') != 0) {
return; return;
} }
$inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}"); $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}");
$inheritStor->cacheAll(); $inheritStor->cacheAll();
foreach(static::INHERITANCE_KEY as $key=>[$storType, ,]){ foreach (static::INHERITANCE_KEY as $key => [$storType,,]) {
$aux = null; $aux = null;
$point = $this->getInheritancePoint($key, $aux, true); $point = $this->getInheritancePoint($key, $aux, true);
if($storType === true){ if ($storType === true) {
continue; continue;
} }
$inheritStor->setValue($key, [$point, $aux]); $inheritStor->setValue($key, [$point, $aux]);
@@ -1383,4 +1491,4 @@ class General implements iAction{
$month = $gameStor->month; $month = $gameStor->month;
$oldInheritStor->setValue("{$serverID}_{$ownerID}_{$this->getID()}_{$year}_{$month}", $inheritStor->getAll(true)); $oldInheritStor->setValue("{$serverID}_{$ownerID}_{$this->getID()}_{$year}_{$month}", $inheritStor->getAll(true));
} }
} }