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

정장, 선정 커맨드 문제로 명성,계급 반영 위치 이동

Browse Source
This commit is contained in:
Hide_D
2018-09-15 03:49:08 +09:00
parent ed2a2a8975
commit 03f9c56928
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/che_기술연구.php
+4 -2
View File
@@ -79,6 +79,10 @@ class che_기술연구 extends che_상업투자{
$score *= CriticalScoreEx($pick);
$score = Util::round($score);
$exp = $score * 0.7;
$ded = $score * 1.0;
$scoreText = number_format($score, 0);
$josaUl = JosaUtil::pick(static::$actionName, '을');
@@ -92,8 +96,6 @@ class che_기술연구 extends che_상업투자{
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
$exp = $score * 0.7;
$ded = $score * 1.0;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
hwe/sammo/Command/che_상업투자.php
+4 -3
View File
@@ -106,6 +106,10 @@ class che_상업투자 extends BaseCommand{
$score *= CriticalScoreEx($pick);
$score = Util::round($score);
$exp = $score * 0.7;
$ded = $score * 1.0;
$scoreText = number_format($score, 0);
$josaUl = JosaUtil::pick(static::$actionName, '을');
@@ -119,9 +123,6 @@ class che_상업투자 extends BaseCommand{
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
$exp = $score * 0.7;
$ded = $score * 1.0;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
hwe/sammo/Command/che_정착장려.php
+11 -12
View File
@@ -48,13 +48,7 @@ class che_상업투자 extends BaseCommand{
protected function calcBaseScore():float{
$general = $this->generalObj;
if(static::$statKey == 'intel'){
$score = getGeneralIntel($general->getRaw(), true, true, true, false);
}
else if(static::$statKey == 'power'){
$score = getGeneralPower($general->getRaw(), true, true, true, false);
}
else if(static::$statKey == 'leader'){
if(static::$statKey == 'leader'){
$score = getGeneralLeadership($general->getRaw(), true, true, true, false);
}
else{
@@ -99,21 +93,26 @@ class che_상업투자 extends BaseCommand{
$score *= CriticalScoreEx($pick);
$score = Util::round($score);
$exp = $score * 0.7;
$ded = $score * 1.0;
$score *= 10;
$scoreText = number_format($score, 0);
$josaUl = JosaUtil::pick(static::$actionName, '을');
if($pick == 'fail'){
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <span class='ev_failed'>실패</span>하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <span class='ev_failed'>실패</span>하여 주민이 <C>$scoreText</>명 증가했습니다. <1>$date</>");
}
else if($pick == 'success'){
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <S>성공</>하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} <S>성공</>하여 주민이 <C>$scoreText</>명 증가했습니다. <1>$date</>");
}
else{
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 주민이 <C>$scoreText</>명 증가했습니다. <1>$date</>");
}
$exp = $score * 0.7;
$ded = $score * 1.0;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
hwe/sammo/Command/che_주민선정.php
+6 -4
View File
@@ -55,7 +55,6 @@ class che_주민선정 extends BaseCommand{
throw new \sammo\MustNotBeReachedException();
}
$score /= 10;
$score *= getDomesticExpLevelBonus($general['explevel']);
$score *= Util::randRange(0.8, 1.2);
$score = $general->onCalcDomestic(static::$actionKey, 'score', $score);
@@ -94,6 +93,12 @@ class che_주민선정 extends BaseCommand{
$date = substr($general->getVar('turntime'),11,5);
$score *= CriticalScoreEx($pick);
$exp = $score * 0.7;
$ded = $score * 1.0;
$score /= 10;
$scoreText = number_format($score, 1);
$josaUl = JosaUtil::pick(static::$actionName, '을');
@@ -107,9 +112,6 @@ class che_주민선정 extends BaseCommand{
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
$exp = $score * 0.7;
$ded = $score * 1.0;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);