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

버그 수정, 구조 변경

Browse Source
This commit is contained in:
Hide_D
2019-04-28 03:49:03 +09:00
parent fe2a076558
commit ef40f299ef
52 changed files with 140 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_강행.php
+1 -1
View File
@@ -104,7 +104,7 @@ class che_강행 extends Command\GeneralCommand{
$exp = 100;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$exp = $general->onCalcStat($general, 'experience', $exp);
$general->setVar('city', $destCityID);
if($general->getVar('level') == 12 && $this->nation['level'] == 0){
hwe/sammo/Command/General/che_거병.php
+2 -2
View File
@@ -157,8 +157,8 @@ class che_거병 extends Command\GeneralCommand{
$exp = 100;
$ded = 100;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
hwe/sammo/Command/General/che_건국.php
+2 -2
View File
@@ -143,8 +143,8 @@ class che_건국 extends Command\GeneralCommand{
$exp = 1000;
$ded = 1000;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
hwe/sammo/Command/General/che_견문.php
+1 -1
View File
@@ -107,7 +107,7 @@ class che_견문 extends Command\GeneralCommand{
$logger->pushGeneralActionLog("{$text} <1>$date</>");
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$exp = $general->onCalcStat($general, 'experience', $exp);
$general->increaseVar('experience', $exp);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
hwe/sammo/Command/General/che_군량매매.php
+2 -2
View File
@@ -157,8 +157,8 @@ class che_군량매매 extends Command\GeneralCommand{
$exp = 30;
$ded = 50;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$incStat = Util::choiceRandomUsingWeight([
'leader2'=>$general->getLeadership(false, false, false, false),
hwe/sammo/Command/General/che_귀환.php
+2 -2
View File
@@ -84,8 +84,8 @@ class che_귀환 extends Command\GeneralCommand{
$exp = 70;
$ded = 100;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->setVar('city', $cityID);
hwe/sammo/Command/General/che_기술연구.php
+2 -2
View File
@@ -106,8 +106,8 @@ class che_기술연구 extends che_상업투자{
}
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
if(TechLimit($this->env['startyear'], $this->env['year'], $this->nation['tech'])){
$score /= 4;
hwe/sammo/Command/General/che_단련.php
+1 -1
View File
@@ -96,7 +96,7 @@ class che_단련 extends Command\GeneralCommand{
}
$exp = $general->getVar('crew') / 400;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$exp = $general->onCalcStat($general, 'experience', $exp);
$general->addDex($general->getCrewTypeObj(), $score, false);
hwe/sammo/Command/General/che_등용.php
+2 -2
View File
@@ -130,8 +130,8 @@ class che_등용 extends Command\GeneralCommand{
$exp = 100;
$ded = 200;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
[$reqGold, $reqRice] = $this->getCost();
hwe/sammo/Command/General/che_랜덤임관.php
+1 -1
View File
@@ -236,7 +236,7 @@ class che_랜덤임관 extends Command\GeneralCommand{
$exp = 100;
}
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$exp = $general->onCalcStat($general, 'experience', $exp);
$general->setVar('nation', $destNationID);
$general->setVar('level', 1);
$general->setVar('belong', 1);
hwe/sammo/Command/General/che_물자조달.php
+2 -2
View File
@@ -103,8 +103,8 @@ class che_물자조달 extends Command\GeneralCommand{
$exp = $score * 0.7 / 3;
$ded = $score * 1.0 / 3;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$incStat = Util::choiceRandomUsingWeight([
'leader2'=>$general->getLeadership(false, false, false, false),
hwe/sammo/Command/General/che_사기진작.php
+2 -2
View File
@@ -83,8 +83,8 @@ class che_사기진작 extends Command\GeneralCommand{
$exp = 100;
$ded = 70;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVarWithLimit('atmos', $score, 0, GameConst::$maxAtmosByCommand);
$general->setVar('train', $sideEffect);
hwe/sammo/Command/General/che_상업투자.php
+2 -2
View File
@@ -171,8 +171,8 @@ class che_상업투자 extends Command\GeneralCommand{
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
if(in_array($this->city['front'], [1, 3]) && $this->nation['capital'] != $this->city['city']){
$score *= static::$debuffFront;
hwe/sammo/Command/General/che_소집해제.php
+2 -2
View File
@@ -70,8 +70,8 @@ class che_소집해제 extends Command\GeneralCommand{
$exp = 70;
$ded = 100;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$db->update('city', [
'pop'=>$db->sqleval('pop + %i', $crew)
hwe/sammo/Command/General/che_요양.php
+2 -2
View File
@@ -71,8 +71,8 @@ class che_요양 extends Command\GeneralCommand{
$exp = 10;
$ded = 7;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->setVar('injury', 0);
$general->increaseVar('experience', $exp);
hwe/sammo/Command/General/che_이동.php
+1 -1
View File
@@ -104,7 +104,7 @@ class che_이동 extends Command\GeneralCommand{
$exp = 50;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$exp = $general->onCalcStat($general, 'experience', $exp);
$general->setVar('city', $destCityID);
if($general->getVar('level') == 12 && $this->nation['level'] == 0){
hwe/sammo/Command/General/che_인재탐색.php
+4 -4
View File
@@ -107,8 +107,8 @@ class che_인재탐색 extends Command\GeneralCommand{
$exp = 100;
$ded = 70;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->increaseVarWithLimit('rice', -$reqRice, 0);
@@ -254,8 +254,8 @@ class che_인재탐색 extends Command\GeneralCommand{
$exp = 200;
$ded = 300;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->increaseVarWithLimit('rice', -$reqRice, 0);
hwe/sammo/Command/General/che_임관.php
+1 -1
View File
@@ -143,7 +143,7 @@ class che_임관 extends Command\GeneralCommand{
$exp = 100;
}
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$exp = $general->onCalcStat($general, 'experience', $exp);
$general->setVar('nation', $destNationID);
$general->setVar('level', 1);
$general->setVar('belong', 1);
hwe/sammo/Command/General/che_장비매매.php
+1 -1
View File
@@ -168,7 +168,7 @@ class che_장비매매 extends Command\GeneralCommand{
}
$exp = 10;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$exp = $general->onCalcStat($general, 'experience', $exp);
$general->increaseVar('experience', $exp);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
hwe/sammo/Command/General/che_전투태세.php
+2 -2
View File
@@ -113,8 +113,8 @@ class che_전투태세 extends Command\GeneralCommand{
$exp = 100 * 3;
$ded = 70 * 3;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
hwe/sammo/Command/General/che_정착장려.php
+2 -2
View File
@@ -140,8 +140,8 @@ class che_정착장려 extends Command\GeneralCommand{
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
//NOTE: 내정량 상승시 초과 가능?
$cityUpdated = [
hwe/sammo/Command/General/che_주민선정.php
+2 -2
View File
@@ -138,8 +138,8 @@ class che_주민선정 extends Command\GeneralCommand{
$logger->pushGeneralActionLog(static::$actionName."{$josaUl} 하여 <C>$scoreText</> 상승했습니다. <1>$date</>");
}
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
//NOTE: 내정량 상승시 초과 가능?
$cityUpdated = [
hwe/sammo/Command/General/che_증여.php
+2 -2
View File
@@ -135,8 +135,8 @@ class che_증여 extends Command\GeneralCommand{
$exp = 70;
$ded = 100;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
hwe/sammo/Command/General/che_집합.php
+2 -2
View File
@@ -97,8 +97,8 @@ class che_집합 extends Command\GeneralCommand{
$exp = 70;
$ded = 100;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
hwe/sammo/Command/General/che_징병.php
+2 -2
View File
@@ -179,8 +179,8 @@ class che_징병 extends Command\GeneralCommand{
$exp = Util::round($reqCrew / 100);
$ded = Util::round($reqCrew / 100);
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->addDex($general->getCrewTypeObj(), $reqCrew / 100, false);
hwe/sammo/Command/General/che_첩보.php
+2 -2
View File
@@ -166,8 +166,8 @@ class che_첩보 extends Command\GeneralCommand{
$exp = Util::randRangeInt(1, 100);
$ded = Util::randRangeInt(1, 70);
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
[$reqGold, $reqRice] = $this->getCost();
$general->increaseVarWithLimit('gold', -$reqGold, 0);
hwe/sammo/Command/General/che_출병.php
+1 -1
View File
@@ -48,7 +48,7 @@ class che_출병 extends Command\GeneralCommand{
$this->setCity();
$this->setNation(['war', 'gennum', 'tech', 'gold', 'rice']);
$this->setDestCity($this->arg['destCityID'], ['city', 'name', 'nation']);
$this->setDestCity($this->arg['destCityID'], null);
[$reqGold, $reqRice] = $this->getCost();
$relYear = $this->env['year'] - $this->env['startyear'];
hwe/sammo/Command/General/che_헌납.php
+2 -2
View File
@@ -116,8 +116,8 @@ class che_헌납 extends Command\GeneralCommand{
$exp = 70;
$ded = 100;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVar('experience', $exp);
$general->increaseVar('dedication', $ded);
hwe/sammo/Command/General/che_화계.php
+4 -4
View File
@@ -237,8 +237,8 @@ class che_화계 extends Command\GeneralCommand{
$exp = Util::randRangeInt(1, 100);
$ded = Util::randRangeInt(1, 70);
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
[$reqGold, $reqRice] = $this->getCost();
$general->increaseVarWithLimit('gold', -$reqGold, 0);
@@ -273,8 +273,8 @@ class che_화계 extends Command\GeneralCommand{
$exp = Util::randRangeInt(201, 300);
$ded = Util::randRangeInt(141, 210);
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
[$reqGold, $reqRice] = $this->getCost();
$general->increaseVarWithLimit('gold', -$reqGold, 0);
hwe/sammo/Command/General/che_훈련.php
+2 -2
View File
@@ -79,8 +79,8 @@ class che_훈련 extends Command\GeneralCommand{
$exp = 100;
$ded = 70;
$exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
$ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
$exp = $general->onCalcStat($general, 'experience', $exp);
$ded = $general->onCalcStat($general, 'dedication', $ded);
$general->increaseVarWithLimit('train', $score, 0, GameConst::$maxTrainByCommand);
$general->setVar('atmos', $sideEffect);