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

내정 커맨드 버그 수정, 정착장려, 주민선정 추가, RemainCityTrust 추가, succ -> success

Browse Source
This commit is contained in:
Hide_D
2018-09-15 03:42:09 +09:00
parent 7b71a1cf20
commit 732528ce85
17 changed files with 393 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/che_기술연구.php
+12 -11
View File
@@ -75,11 +75,11 @@ class che_기술연구 extends BaseCommand{
$score = Util::valueFit($this->calcBaseScore(), 1);
['succ'=>$successRatio, 'fail'=>$failRatio] = CriticalRatioDomestic($general->getRaw(), static::$statKey);
['success'=>$successRatio, 'fail'=>$failRatio] = CriticalRatioDomestic($general->getRaw(), static::$statKey);
if($trust < 80){
$successRatio *= $trust / 80;
}
$successRatio = $general->onCalcDomestic(static::$cityKey, 'succ', $successRatio);
$successRatio = $general->onCalcDomestic(static::$cityKey, 'success', $successRatio);
$failRatio = $general->onCalcDomestic(static::$cityKey, 'fail', $failRatio);
$successRatio = Util::valueFit($successRatio, 0, 1);
@@ -88,7 +88,7 @@ class che_기술연구 extends BaseCommand{
$pick = Util::choiceRandomUsingWeight([
'fail'=>$failRatio,
'succ'=>$successRatio,
'success'=>$successRatio,
'normal'=>$normalRatio
]);
@@ -96,18 +96,19 @@ class che_기술연구 extends BaseCommand{
$date = substr($general->getVar('turntime'),11,5);
$score *= CriticalScoreEx($pick);
$score = Util::round($score);
$scoreText = number_format($score, 0);
$josaUl = JosaUtil::pick(static::$actionName, '을');
if($pick == 'fail'){
$score = CriticalScore($score, 1);
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <span class='ev_failed'>실패</span>하여 <C>$score</> 상승했습니다. <1>$date</>");
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <span class='ev_failed'>실패</span>하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
else if($pick == 'succ'){
$score = CriticalScore($score, 1);
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <S>성공</>하여 <C>$score</> 상승했습니다. <1>$date</>");
else if($pick == 'success'){
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <S>성공</>하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
else{
$score = Util::round($score);
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$score</> 상승했습니다. <1>$date</>");
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
$exp = $score * 0.7;
@@ -121,7 +122,7 @@ class che_기술연구 extends BaseCommand{
}
$genCount = Util::valueFit(
$db->queryFirstField('SELECT count(*) FROM general WHERE nation=%i', $general->getVar('nation')),
$db->queryFirstField('SELECT gennum FROM nation WHERE nation=%i', $general->getVar('nation')),
GameConst::$initialNationGenLimit
);