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

setResultTurn 버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-05-31 17:21:51 +09:00
parent c5fbe93890
commit 65f5e8e964
59 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/BaseCommand.php
+1 -1
View File
@@ -455,7 +455,7 @@ abstract class BaseCommand{
}
public function setResultTurn(LastTurn $lastTurn){
$this->generalObj->setResultTurn($lastTurn);
$this->generalObj->_setResultTurn($lastTurn);
}
public function getResultTurn():LastTurn{
hwe/sammo/Command/General/che_NPC능동.php
+1 -1
View File
@@ -95,7 +95,7 @@ class che_NPC능동 extends Command\GeneralCommand{
$logger->pushGeneralActionLog("NPC 전용 명령을 이용해 {$cityName}{$josaRo} 이동했습니다.");
$general->setVar('city', $destCityID);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
}
$general->applyDB($db);
hwe/sammo/Command/General/che_강행.php
+1 -1
View File
@@ -165,7 +165,7 @@ class che_강행 extends Command\GeneralCommand
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->addExperience($exp);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_거병.php
+1 -1
View File
@@ -172,7 +172,7 @@ class che_거병 extends Command\GeneralCommand{
$general->setVar('officer_city', 0);
$general->setVar('nation', $nationID);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_건국.php
+1 -1
View File
@@ -193,7 +193,7 @@ class che_건국 extends Command\GeneralCommand
refreshNationStaticInfo();
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general, '건국');
$general->applyDB($db);
hwe/sammo/Command/General/che_견문.php
+1 -1
View File
@@ -114,7 +114,7 @@ class che_견문 extends Command\GeneralCommand{
$logger->pushGeneralActionLog("{$text} <1>$date</>");
$general->addExperience($exp);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_군량매매.php
+1 -1
View File
@@ -179,7 +179,7 @@ class che_군량매매 extends Command\GeneralCommand{
$general->addDedication($ded);
$general->increaseVar($incStat, 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_귀환.php
+1 -1
View File
@@ -99,7 +99,7 @@ class che_귀환 extends Command\GeneralCommand{
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_기술연구.php
+1 -1
View File
@@ -125,7 +125,7 @@ class che_기술연구 extends che_상업투자{
$general->addDedication($ded);
$general->increaseVar(static::$statKey.'_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_단련.php
+1 -1
View File
@@ -126,7 +126,7 @@ class che_단련 extends Command\GeneralCommand{
$general->increaseVarWithLimit('rice', -$reqRice, 0);
$general->addExperience($exp);
$general->increaseVar($incStat, 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_등용.php
+1 -1
View File
@@ -168,7 +168,7 @@ class che_등용 extends Command\GeneralCommand{
$general->increaseVar('leadership_exp', 1);
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_랜덤임관.php
+1 -1
View File
@@ -289,7 +289,7 @@ class che_랜덤임관 extends Command\GeneralCommand{
}
$general->addExperience($exp);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general, '랜덤 임관');
$general->applyDB($db);
hwe/sammo/Command/General/che_모반시도.php
+1 -1
View File
@@ -100,7 +100,7 @@ class che_모반시도 extends Command\GeneralCommand{
$logger->pushGeneralHistoryLog("모반으로 <D><b>{$nationName}</b></>의 군주자리를 찬탈");
$lordLogger->pushGeneralHistoryLog("<D><b>{$generalName}</b></>의 모반으로 인해 <D><b>{$nationName}</b></>의 군주자리를 박탈당함");
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
$lordGeneral->applyDB($db);
hwe/sammo/Command/General/che_물자조달.php
+1 -1
View File
@@ -122,7 +122,7 @@ class che_물자조달 extends Command\GeneralCommand{
$resKey=>$db->sqleval('%b + %i', $resKey, $score)
], 'nation=%i',$general->getNationID());
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_방랑.php
+1 -1
View File
@@ -127,7 +127,7 @@ class che_방랑 extends Command\GeneralCommand{
refreshNationStaticInfo();
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
return true;
hwe/sammo/Command/General/che_사기진작.php
+1 -1
View File
@@ -104,7 +104,7 @@ class che_사기진작 extends Command\GeneralCommand{
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_상업투자.php
+1 -1
View File
@@ -196,7 +196,7 @@ class che_상업투자 extends Command\GeneralCommand{
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar(static::$statKey.'_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_선양.php
+1 -1
View File
@@ -139,7 +139,7 @@ class che_선양 extends Command\GeneralCommand
$logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>의 군주자리를 <Y>{$destGeneralName}</>에게 선양");
$destLogger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>의 군주자리를 물려 받음");
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
$destGeneral->applyDB($db);
hwe/sammo/Command/General/che_소집해제.php
+1 -1
View File
@@ -83,7 +83,7 @@ class che_소집해제 extends Command\GeneralCommand{
$general->setVar('crew', 0);
$general->addExperience($exp);
$general->addDedication($ded);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_숙련전환.php
+1 -1
View File
@@ -188,7 +188,7 @@ class che_숙련전환 extends Command\GeneralCommand
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->increaseVarWithLimit('rice', -$reqRice, 0);
$general->increaseVar('leadership_exp', 2);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_요양.php
+1 -1
View File
@@ -74,7 +74,7 @@ class che_요양 extends Command\GeneralCommand{
$general->setVar('injury', 0);
$general->addExperience($exp);
$general->addDedication($ded);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_이동.php
+1 -1
View File
@@ -173,7 +173,7 @@ class che_이동 extends Command\GeneralCommand
$general->increaseVarWithLimit('atmos', -5, 20);
$general->addExperience($exp);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_인재탐색.php
+2 -2
View File
@@ -164,7 +164,7 @@ class che_인재탐색 extends Command\GeneralCommand
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar($incStat, 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
@@ -291,7 +291,7 @@ class che_인재탐색 extends Command\GeneralCommand
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar($incStat, 3);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_임관.php
+1 -1
View File
@@ -175,7 +175,7 @@ class che_임관 extends Command\GeneralCommand{
}
$general->addExperience($exp);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_장비매매.php
+1 -1
View File
@@ -178,7 +178,7 @@ class che_장비매매 extends Command\GeneralCommand{
$exp = 10;
$general->addExperience($exp);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_장수대상임관.php
+1 -1
View File
@@ -180,7 +180,7 @@ class che_장수대상임관 extends Command\GeneralCommand{
}
$general->addExperience($exp);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_전투태세.php
+2 -2
View File
@@ -99,7 +99,7 @@ class che_전투태세 extends Command\GeneralCommand{
if($term < 3){
$logger->pushGeneralActionLog("병사들을 열심히 훈련중... ({$term}/3) <1>$date</>");
$general->setResultTurn($turnResult);
$this->setResultTurn($turnResult);
$general->applyDB($db);
return true;
@@ -121,7 +121,7 @@ class che_전투태세 extends Command\GeneralCommand{
$general->addDex($general->getCrewTypeObj(), $crew / 100 * 3, false);
$general->increaseVar('leadership_exp', 3);
$general->setResultTurn($turnResult);
$this->setResultTurn($turnResult);
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_전투특기초기화.php
+1 -1
View File
@@ -119,7 +119,7 @@ class che_전투특기초기화 extends Command\GeneralCommand{
$logger->pushGeneralActionLog("새로운 {$specialName}를 가질 준비가 되었습니다. <1>$date</>");
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_정착장려.php
+1 -1
View File
@@ -179,7 +179,7 @@ class che_정착장려 extends Command\GeneralCommand{
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar(static::$statKey.'_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_주민선정.php
+1 -1
View File
@@ -179,7 +179,7 @@ class che_주민선정 extends Command\GeneralCommand{
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar(static::$statKey.'_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_증여.php
+1 -1
View File
@@ -175,7 +175,7 @@ class che_증여 extends Command\GeneralCommand
$general->addDedication($ded);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
$destGeneral->applyDB($db);
hwe/sammo/Command/General/che_집합.php
+1 -1
View File
@@ -104,7 +104,7 @@ class che_집합 extends Command\GeneralCommand{
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/che_징병.php
+1 -1
View File
@@ -227,7 +227,7 @@ class che_징병 extends Command\GeneralCommand
$general->increaseVarWithLimit('gold', -$reqGold, 0);
$general->increaseVarWithLimit('rice', -$reqRice, 0);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->setAuxVar('armType', $reqCrewType->armType);
tryUniqueItemLottery($general);
hwe/sammo/Command/General/che_첩보.php
+1 -1
View File
@@ -221,7 +221,7 @@ class che_첩보 extends Command\GeneralCommand
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_출병.php
+1 -1
View File
@@ -232,7 +232,7 @@ class che_출병 extends Command\GeneralCommand
$general->addDex($general->getCrewTypeObj(), $general->getVar('crew') / 100);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
processWar($general, $this->nation, $this->destCity);
hwe/sammo/Command/General/che_하야.php
+1 -1
View File
@@ -107,7 +107,7 @@ class che_하야 extends Command\GeneralCommand{
$general->setVar('belong', 0);
$general->setVar('makelimit', 12);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_해산.php
+1 -1
View File
@@ -92,7 +92,7 @@ class che_해산 extends Command\GeneralCommand{
$logger->pushGeneralActionLog("세력을 해산했습니다. <1>$date</>");
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} 세력을 해산했습니다.");
$logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaUl} 해산");
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$nationGenerals = deleteNation($general, false);
foreach($nationGenerals as $oldGeneral){
hwe/sammo/Command/General/che_헌납.php
+1 -1
View File
@@ -151,7 +151,7 @@ class che_헌납 extends Command\GeneralCommand
$general->addDedication($ded);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_화계.php
+2 -2
View File
@@ -297,7 +297,7 @@ class che_화계 extends Command\GeneralCommand
$general->addDedication($ded);
$general->increaseVar($statType . '_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
return false;
@@ -330,7 +330,7 @@ class che_화계 extends Command\GeneralCommand
$general->addDedication($ded);
$general->increaseVar($statType . '_exp', 1);
$general->increaseRankVar('firenum', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
$general->applyDB($db);
hwe/sammo/Command/General/che_훈련.php
+1 -1
View File
@@ -108,7 +108,7 @@ class che_훈련 extends Command\GeneralCommand{
$general->addExperience($exp);
$general->addDedication($ded);
$general->increaseVar('leadership_exp', 1);
$general->setResultTurn(new LastTurn(static::getName(), $this->arg));
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange();
tryUniqueItemLottery($general);
$general->applyDB($db);
hwe/sammo/Command/General/휴식.php
+1 -1
View File
@@ -38,7 +38,7 @@ class 휴식 extends Command\GeneralCommand{
$date = $general->getTurnTime($general::TURNTIME_HM);
$logger->pushGeneralActionLog("아무것도 실행하지 않았습니다. <1>$date</>");
$general->setResultTurn(new LastTurn());
$this->setResultTurn(new LastTurn());
$general->applyDB(DB::db());
return true;
hwe/sammo/Command/Nation/che_감축.php
+1 -1
View File
@@ -207,7 +207,7 @@ class che_감축 extends Command\NationCommand{
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>{$josaUl} <M>감축</>하였습니다.");
$logger->pushGlobalHistoryLog("<M><b>【감축】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaUl} <M>감축</>하였습니다.");
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_국기변경.php
+1 -1
View File
@@ -155,7 +155,7 @@ class che_국기변경 extends Command\NationCommand
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <span style='color:{$color};'><b>국기</b></span>를 변경하였습니다");
$logger->pushGlobalHistoryLog("<S><b>【국기변경】</b></><D><b>{$nationName}</b></>{$josaYiNation} <span style='color:{$color};'><b>국기</b></span>를 변경하였습니다.");
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
}
hwe/sammo/Command/Nation/che_국호변경.php
+1 -1
View File
@@ -162,7 +162,7 @@ class che_국호변경 extends Command\NationCommand
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다.");
$logger->pushGlobalHistoryLog("<S><b>【국호변경】</b></><D><b>{$nationName}</b></>{$josaYiNation} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다.");
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
}
hwe/sammo/Command/Nation/che_급습.php
+1 -1
View File
@@ -198,7 +198,7 @@ class che_급습 extends Command\NationCommand
$db->update('diplomacy', [
'term' => $db->sqleval('`term` - %i', 3),
], '(me = %i AND you = %i) OR (you = %i AND me = %i)', $nationID, $destNationID, $nationID, $destNationID);
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_물자원조.php
+1 -1
View File
@@ -230,7 +230,7 @@ class che_물자원조 extends Command\NationCommand{
$general->addExperience(5);
$general->addDedication(5);
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_백성동원.php
+1 -1
View File
@@ -164,7 +164,7 @@ class che_백성동원 extends Command\NationCommand{
'strategic_cmd_limit' => $this->getPostReqTurn()
], 'nation=%i', $nationID);
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_수몰.php
+1 -1
View File
@@ -182,7 +182,7 @@ class che_수몰 extends Command\NationCommand{
'strategic_cmd_limit' => $this->getPostReqTurn()
], 'nation=%i', $nationID);
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_의병모집.php
+1 -1
View File
@@ -235,7 +235,7 @@ class che_의병모집 extends Command\NationCommand
'strategic_cmd_limit' => $this->getPostReqTurn()
], 'nation=%i', $nationID);
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_이호경식.php
+1
View File
@@ -197,6 +197,7 @@ class che_이호경식 extends Command\NationCommand
'state' => 1,
], '(me = %i AND you = %i) OR (you = %i AND me = %i)', $nationID, $destNationID, $nationID, $destNationID);
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_증축.php
+1 -1
View File
@@ -198,7 +198,7 @@ class che_증축 extends Command\NationCommand{
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>{$josaUl} <M>증축</>하였습니다.");
$logger->pushGlobalHistoryLog("<C><b>【증축】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaUl} <M>증축</>하였습니다.");
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_천도.php
+1 -1
View File
@@ -235,7 +235,7 @@ class che_천도 extends Command\NationCommand
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>{$josaRo} <M>천도</>를 명령하였습니다.");
$logger->pushGlobalHistoryLog("<S><b>【천도】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaRo} <M>천도</>하였습니다.");
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
}
hwe/sammo/Command/Nation/che_초토화.php
+1 -1
View File
@@ -190,7 +190,7 @@ class che_초토화 extends Command\NationCommand{
$logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>{$josaUl} <M>초토화</>하였습니다.");
$logger->pushGlobalHistoryLog("<S><b>【초토화】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>{$josaUl} <M>초토화</>하였습니다.");
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
}
hwe/sammo/Command/Nation/che_필사즉생.php
+1 -1
View File
@@ -126,7 +126,7 @@ class che_필사즉생 extends Command\NationCommand{
'strategic_cmd_limit' => $this->getPostReqTurn()
], 'nation=%i', $nationID);
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/che_허보.php
+1 -1
View File
@@ -207,7 +207,7 @@ class che_허보 extends Command\NationCommand
'strategic_cmd_limit' => $this->getPostReqTurn()
], 'nation=%i', $nationID);
$general->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
$general->applyDB($db);
return true;
hwe/sammo/Command/Nation/휴식.php
+1
View File
@@ -32,6 +32,7 @@ class 휴식 extends Command\NationCommand{
}
public function run():bool{
$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
return true;
}
}
hwe/sammo/Command/NationCommand.php
+1 -1
View File
@@ -9,7 +9,7 @@ abstract class NationCommand extends BaseCommand{
public function __construct(General $generalObj, array $env, LastTurn $lastTurn, $arg = null){
$this->lastTurn = $lastTurn;
$this->resultTurn = new LastTurn();
$this->resultTurn = $lastTurn->duplicate();
parent::__construct($generalObj, $env, $arg);
}
hwe/sammo/Constraint/OccupiedCity.php
+1 -1
View File
@@ -28,7 +28,7 @@ class OccupiedCity extends Constraint{
$this->tested = true;
//재야여도 허용하는 경우
if($this->arg[0] && $this->general['nation'] == 0){
if($this->arg && $this->general['nation'] == 0){
return true;
}
hwe/sammo/General.php
+1 -1
View File
@@ -185,7 +185,7 @@ class General implements iAction{
return $this->lastTurn;
}
function setResultTurn(LastTurn $resultTurn){
function _setResultTurn(LastTurn $resultTurn){
$this->resultTurn = $resultTurn;
}