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

통합, 항복 제거

Browse Source
This commit is contained in:
Hide_D
2020-05-07 23:48:08 +09:00
parent 7199a770c0
commit e7f8900286
14 changed files with 22 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_선양.php
-4
View File
@@ -77,10 +77,6 @@ class che_선양 extends Command\GeneralCommand
ConstraintHelper::BeLord(),
ConstraintHelper::ExistsDestGeneral(),
ConstraintHelper::FriendlyDestGeneral(),
ConstraintHelper::DisallowDiplomacyStatus(
$this->generalObj->getNationID(),
[4 => '현재 통합 진행중입니다.']
)
];
}
hwe/sammo/Command/General/che_하야.php
+9 -25
View File
@@ -72,33 +72,17 @@ class che_하야 extends Command\GeneralCommand{
$nationID = $this->nation['nation'];
$nationName = $this->nation['name'];
$josaUl = JosaUtil::pick($nationName, '을');
$dipState = Util::arrayGroupBy($db->query('SELECT no, state FROM diplomacy WHERE me = %i', $nationID), 'state');
$logger = $general->getLogger();
if(key_exists('3', $dipState) || key_exists('4', $dipState)){
$logger->pushGeneralActionLog("통합에 반대하며 <D><b>{$nationName}</b></>에서 떠났습니다. <1>$date</>");
$logger->pushGeneralHistoryLog("통합에 반대하며 <D><b>{$nationName}</b></>{$josaUl} 떠남");
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} 통합에 반대하며 <D><b>{$nationName}</b></>{$josaUl} <R>떠났</>습니다.");
}
else if(key_exists('5', $dipState) || key_exists('6', $dipState)){
$logger->pushGeneralActionLog("합병에 반대하며 <D><b>{$nationName}</b></>에서 떠났습니다. <1>$date</>");
$logger->pushGeneralHistoryLog("합병에 반대하며 <D><b>{$nationName}</b></>{$josaUl} 떠남");
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} 합병에 반대하며 <D><b>{$nationName}</b></>{$josaUl} <R>떠났</>습니다.");
}
else{
$logger->pushGeneralActionLog("<D><b>{$nationName}</b></>에서 하야했습니다. <1>$date</>");
$logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>에서 하야");
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>에서 <R>하야</>했습니다.");
$general->setVar('experience', $general->getVar('experience') * (1 - 0.1 * $general->getVar('betray')));
$general->addExperience(0, false);
$general->setVar('dedication', $general->getVar('dedication') * (1 - 0.1 * $general->getVar('betray')));
$general->addDedication(0, false);
$general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
}
$logger->pushGeneralActionLog("<D><b>{$nationName}</b></>에서 하야했습니다. <1>$date</>");
$logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>에서 하야");
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>에서 <R>하야</>했습니다.");
$general->setVar('experience', $general->getVar('experience') * (1 - 0.1 * $general->getVar('betray')));
$general->addExperience(0, false);
$general->setVar('dedication', $general->getVar('dedication') * (1 - 0.1 * $general->getVar('betray')));
$general->addDedication(0, false);
$general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
$newGold = Util::valueFit($general->getVar('gold'), null, GameConst::$defaultGold);
$newRice = Util::valueFit($general->getVar('rice'), null, GameConst::$defaultRice);