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

turntime 관련 조정중

Browse Source
This commit is contained in:
Hide_D
2019-10-05 10:52:31 +09:00
parent 01d3e6c03d
commit 969306822f
53 changed files with 156 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_NPC능동.php
+1 -1
View File
@@ -81,7 +81,7 @@ class che_NPC능동 extends Command\GeneralCommand{
$logger = $general->getLogger();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
if($this->arg['optionText'] == '순간이동'){
$destCityID = $this->arg['destCityID'];
hwe/sammo/Command/General/che_강행.php
+1 -1
View File
@@ -93,7 +93,7 @@ class che_강행 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$destCityName = $this->destCity['name'];
$destCityID = $this->destCity['city'];
hwe/sammo/Command/General/che_거병.php
+2 -2
View File
@@ -14,7 +14,7 @@ use \sammo\{
use \sammo\Constraint\Constraint;
use \sammo\Constraint\ConstraintHelper;
use sammo\CityConst;
use function sammo\getNationTypeClass;
use function sammo\buildNationTypeClass;
use function sammo\refreshNationStaticInfo;
use function sammo\GetNationColors;
use function sammo\getAllNationStaticInfo;
@@ -68,7 +68,7 @@ class che_거병 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이');
hwe/sammo/Command/General/che_건국.php
+3 -3
View File
@@ -19,7 +19,7 @@ use function \sammo\{
use \sammo\Constraint\Constraint;
use \sammo\Constraint\ConstraintHelper;
use sammo\CityConst;
use function sammo\getNationTypeClass;
use function sammo\buildNationTypeClass;
use function sammo\refreshNationStaticInfo;
use function sammo\GetNationColors;
use function sammo\newColor;
@@ -54,7 +54,7 @@ class che_건국 extends Command\GeneralCommand{
}
try{
$nationTypeClass = getNationTypeClass($nationType);
$nationTypeClass = buildNationTypeClass($nationType);
}
catch(InvalidArgumentException $e){
return false;
@@ -115,7 +115,7 @@ class che_건국 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이');
hwe/sammo/Command/General/che_견문.php
+1 -1
View File
@@ -57,7 +57,7 @@ class che_견문 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$sightseeing = new SightseeingMessage();
hwe/sammo/Command/General/che_군량매매.php
+1 -1
View File
@@ -98,7 +98,7 @@ class che_군량매매 extends Command\GeneralCommand{
$general = $this->generalObj;
$tradeRate = $this->city['trade'];
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$buyRice = $this->arg['buyRice'];
hwe/sammo/Command/General/che_귀환.php
+1 -1
View File
@@ -67,7 +67,7 @@ class che_귀환 extends Command\GeneralCommand{
$general = $this->generalObj;
$generalID = $general->getID();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalLevel = $general->getVar('level');
$target = null;
hwe/sammo/Command/General/che_기술연구.php
+1 -1
View File
@@ -84,7 +84,7 @@ class che_기술연구 extends che_상업투자{
$logger = $general->getLogger();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$score *= CriticalScoreEx($pick);
$score = Util::round($score);
hwe/sammo/Command/General/che_단련.php
+1 -1
View File
@@ -69,7 +69,7 @@ class che_단련 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
[$pick, $multiplier] = Util::choiceRandomUsingWeightPair([
[['success', 3], 0.34],
hwe/sammo/Command/General/che_등용.php
+2 -2
View File
@@ -112,7 +112,7 @@ class che_등용 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$logger = $general->getLogger();
@@ -120,7 +120,7 @@ class che_등용 extends Command\GeneralCommand{
$destGeneralID = $this->destGeneralObj->getID();
$msg = ScoutMessage::buildScoutMessage($general->getID(), $destGeneralID, $reason, new \DateTime($general->getVar('turntime')));
$msg = ScoutMessage::buildScoutMessage($general->getID(), $destGeneralID, $reason, new \DateTime($general->getTurnTime()));
if($msg){
$logger->pushGeneralActionLog("<Y>{$destGeneralName}</>에게 등용 권유 서신을 보냈습니다. <1>$date</>");
$msg->send(true);
hwe/sammo/Command/General/che_랜덤임관.php
+1 -1
View File
@@ -95,7 +95,7 @@ class che_랜덤임관 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이');
hwe/sammo/Command/General/che_모반시도.php
+1 -1
View File
@@ -65,7 +65,7 @@ class che_모반시도 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$nationID = $general->getNationID();
hwe/sammo/Command/General/che_물자조달.php
+1 -1
View File
@@ -66,7 +66,7 @@ class che_물자조달 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
[$resName, $resKey] = Util::choiceRandom([
['금', 'gold'],
hwe/sammo/Command/General/che_방랑.php
+1 -1
View File
@@ -77,7 +77,7 @@ class che_방랑 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이');
$josaUn = JosaUtil::pick($generalName, '은');
hwe/sammo/Command/General/che_사기진작.php
+1 -1
View File
@@ -69,7 +69,7 @@ class che_사기진작 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$score = Util::round($general->getLeadership() * 100 / $general->getVar('crew') * GameConst::$atmosDelta);
$scoreText = number_format($score, 0);
hwe/sammo/Command/General/che_상업투자.php
+1 -1
View File
@@ -150,7 +150,7 @@ class che_상업투자 extends Command\GeneralCommand{
$logger = $general->getLogger();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$score *= CriticalScoreEx($pick);
$score = Util::round($score);
hwe/sammo/Command/General/che_선동.php
+1 -1
View File
@@ -17,7 +17,7 @@ class che_선동 extends che_화계{
protected function affectDestCity(int $injuryCount){
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$logger = $general->getLogger();
hwe/sammo/Command/General/che_선양.php
+1 -1
View File
@@ -90,7 +90,7 @@ class che_선양 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$destGeneral = $this->destGeneralObj;
hwe/sammo/Command/General/che_소집해제.php
+1 -1
View File
@@ -59,7 +59,7 @@ class che_소집해제 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$crew = $general->getVar('crew');
hwe/sammo/Command/General/che_요양.php
+1 -1
View File
@@ -59,7 +59,7 @@ class che_요양 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$crew = $general->getVar('crew');
hwe/sammo/Command/General/che_이동.php
+1 -1
View File
@@ -92,7 +92,7 @@ class che_이동 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$destCityName = $this->destCity['name'];
$destCityID = $this->destCity['city'];
hwe/sammo/Command/General/che_인재탐색.php
+1 -1
View File
@@ -76,7 +76,7 @@ class che_인재탐색 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$nationID = $general->getNationID();
hwe/sammo/Command/General/che_임관.php
+1 -1
View File
@@ -122,7 +122,7 @@ class che_임관 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이');
hwe/sammo/Command/General/che_장비매매.php
+1 -1
View File
@@ -119,7 +119,7 @@ class che_장비매매 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$itemType = $this->arg['itemType'];
$itemCode = $this->arg['itemCode'];
hwe/sammo/Command/General/che_전투태세.php
+1 -1
View File
@@ -72,7 +72,7 @@ class che_전투태세 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$lastTurn = $general->getLastTurn();
$turnResult = new LastTurn(static::getName(), $this->arg);
hwe/sammo/Command/General/che_정착장려.php
+1 -1
View File
@@ -115,7 +115,7 @@ class che_정착장려 extends Command\GeneralCommand{
$logger = $general->getLogger();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$score *= CriticalScoreEx($pick);
$score = Util::round($score);
hwe/sammo/Command/General/che_주민선정.php
+1 -1
View File
@@ -116,7 +116,7 @@ class che_주민선정 extends Command\GeneralCommand{
$logger = $general->getLogger();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$score *= CriticalScoreEx($pick);
hwe/sammo/Command/General/che_증여.php
+1 -1
View File
@@ -113,7 +113,7 @@ class che_증여 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$isGold = $this->arg['isGold'];
$amount = $this->arg['amount'];
hwe/sammo/Command/General/che_집합.php
+1 -1
View File
@@ -68,7 +68,7 @@ class che_집합 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$cityID = $this->city['city'];
$cityName = $this->city['name'];
hwe/sammo/Command/General/che_징병.php
+1 -1
View File
@@ -138,7 +138,7 @@ class che_징병 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$reqCrew = $this->reqCrew;
$reqCrewText = number_format($reqCrew);
hwe/sammo/Command/General/che_첩보.php
+1 -1
View File
@@ -93,7 +93,7 @@ class che_첩보 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$destCity = $this->destCity;
hwe/sammo/Command/General/che_출병.php
+1 -1
View File
@@ -99,7 +99,7 @@ class che_출병 extends Command\GeneralCommand{
$general = $this->generalObj;
$attackerNationID = $general->getNationID();
$defenderNationID = $this->destCity['nation'];
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$defenderCityName = $this->destCity['name'];
$defenderCityID = $this->destCity['city'];
hwe/sammo/Command/General/che_탈취.php
+1 -1
View File
@@ -18,7 +18,7 @@ class che_탈취 extends che_화계{
protected function affectDestCity(int $injuryCount){
$general = $this->generalObj;
$nationID = $general->getNationID();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$logger = $general->getLogger();
hwe/sammo/Command/General/che_파괴.php
+1 -1
View File
@@ -17,7 +17,7 @@ class che_파괴 extends che_화계{
protected function affectDestCity(int $injuryCount){
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$logger = $general->getLogger();
hwe/sammo/Command/General/che_하야.php
+1 -1
View File
@@ -66,7 +66,7 @@ class che_하야 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이');
hwe/sammo/Command/General/che_해산.php
+2 -2
View File
@@ -14,7 +14,7 @@ use \sammo\{
use \sammo\Constraint\Constraint;
use \sammo\Constraint\ConstraintHelper;
use sammo\CityConst;
use function sammo\getNationTypeClass;
use function sammo\buildNationTypeClass;
use function sammo\refreshNationStaticInfo;
use function sammo\GetNationColors;
use function sammo\getAllNationStaticInfo;
@@ -67,7 +67,7 @@ class che_해산 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$generalName = $general->getName();
$josaYi = JosaUtil::pick($generalName, '이');
hwe/sammo/Command/General/che_헌납.php
+1 -1
View File
@@ -93,7 +93,7 @@ class che_헌납 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$isGold = $this->arg['isGold'];
$amount = $this->arg['amount'];
hwe/sammo/Command/General/che_화계.php
+2 -2
View File
@@ -153,7 +153,7 @@ class che_화계 extends Command\GeneralCommand{
protected function affectDestCity(int $injuryCount){
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$logger = $general->getLogger();
@@ -198,7 +198,7 @@ class che_화계 extends Command\GeneralCommand{
$env = $this->env;
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$destCity = $this->destCity;
hwe/sammo/Command/General/che_훈련.php
+1 -1
View File
@@ -65,7 +65,7 @@ class che_훈련 extends Command\GeneralCommand{
$db = DB::db();
$general = $this->generalObj;
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$score = Util::round($general->getLeadership() * 100 / $general->getVar('crew') * GameConst::$trainDelta);
$scoreText = number_format($score, 0);
hwe/sammo/Command/General/휴식.php
+1 -1
View File
@@ -33,7 +33,7 @@ class 휴식 extends Command\GeneralCommand{
public function run():bool{
$general = $this->generalObj;
$logger = $general->getLogger();
$date = substr($general->getVar('turntime'),11,5);
$date = $general->getTurnTime($general::TURNTIME_HM);
$logger->pushGeneralActionLog("아무것도 실행하지 않았습니다. <1>$date</>");
$general->setResultTurn(new LastTurn());