불가침 외교 커맨드 부활. 버그 수정

2020-03-12 15:58:14 +09:00
parent 0fe8b3f671
commit 23089d2288
13 changed files with 440 additions and 88 deletions
@@ -250,7 +250,7 @@ abstract class BaseCommand{
            'nation'=>$this->nation,
            'cmd_arg'=>$this->arg,

-            'destGeneral'=>$this->destGeneralObj->getRaw(),
+            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
            'destCity'=>$this->destCity,
            'destNation'=>$this->destNation,
        ];
@@ -272,10 +272,6 @@ abstract class BaseCommand{
            throw new \InvalidArgumentException('runnableConstraits가 제대로 설정되지 않았습니다');
        }

-        if(!$this->isReservable()){
-            return $this->testReservable();
-        }
-
        if($this->reasonNotRunnable){
            return $this->reasonNotRunnable;
        }
@@ -0,0 +1,286 @@
+<?php
+namespace sammo\Command\Nation;
+
+use \sammo\{
+    DB, Util, JosaUtil,
+    General, DummyGeneral,
+    ActionLogger,
+    GameConst,
+    LastTurn,
+    GameUnitConst,
+    Command,
+    MessageTarget,
+    DiplomaticMessage,
+    Message,
+};
+
+use function \sammo\{
+    getDomesticExpLevelBonus,
+    CriticalRatioDomestic, 
+    CriticalScoreEx,
+    getAllNationStaticInfo,
+    getNationStaticInfo,
+    GetImageURL
+};
+
+use \sammo\Constraint\Constraint;
+use \sammo\Constraint\ConstraintHelper;
+
+class che_불가침수락 extends Command\NationCommand{
+    static protected $actionName = '불가침';
+    static public $reqArg = true;
+
+    protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
+
+        if(!key_exists('destNationID', $this->arg)){
+            return false;
+        }
+        $destNationID = $this->arg['destNationID'];
+        if(!is_int($destNationID)){
+            return false;
+        }
+        if($destNationID < 1){
+            return false;
+        }
+
+        if(!key_exists('destGeneralID', $this->arg)){
+            return false;
+        }
+        $destGeneralID = $this->arg['destGeneralID'];
+        if(!is_int($destGeneralID)){
+            return false;
+        }
+        if($destGeneralID <= 0){
+            return false;
+        }
+        if($destGeneralID == $this->generalObj->getID()){
+            return false;
+        }
+
+        if(!key_exists('year', $this->arg) || !key_exists('month', $this->arg) ){
+            return false;
+        }
+        $year = $this->arg['year'];
+        $month = $this->arg['month'];
+        if(!is_int($year) || !is_int($month)){
+            return false;
+        }
+
+        if($month < 1 || 12 < $month){
+            return false;
+        }
+
+        if($year < $this->env['startyear']){
+            return false;
+        }
+
+        $this->arg = [
+            'destNationID'=>$destNationID,
+            'destGeneralID'=>$destGeneralID,
+            'year'=>$year,
+            'month'=>$month,
+        ];
+        return true;
+    }
+
+    protected function init(){
+        $general = $this->generalObj;
+
+        $env = $this->env;
+        $relYear = $env['year'] - $env['startyear'];
+
+        $this->setCity();
+        $this->setNation();
+
+        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['imgsvr', 'picture'], 1);
+        $this->setDestGeneral($destGeneral);
+        $this->setDestNation($this->arg['destNationID']);
+
+        //NOTE: 개월에서 기한으로 바뀜
+        $year = $this->arg['year'];
+        $month = $this->arg['month'];
+
+        $currentMonth = $env['year'] * 12 + $env['month'] - 1;
+        $reqMonth = $year *12 + $month - 1;
+
+        $nationID = $this->nation['nation'];
+
+        $this->reservableConstraints = [
+            ConstraintHelper::AlwaysFail('예약 불가능 커맨드')
+        ];
+
+        if ($reqMonth <= $currentMonth) {
+            $this->runnableConstraints = [
+                ConstraintHelper::AlwaysFail('이미 기한이 지났습니다.')
+            ];
+            return;
+        }        
+
+        $this->runnableConstraints=[
+            ConstraintHelper::BeChief(),
+            ConstraintHelper::NotBeNeutral(), 
+            ConstraintHelper::OccupiedCity(),
+            ConstraintHelper::SuppliedCity(),
+            ConstraintHelper::ExistsDestNation(),
+            ConstraintHelper::ExistsDestGeneral(),
+            ConstraintHelper::DisallowDiplomacyBetweenStatus([
+                0 => '아국과 이미 교전중입니다.',
+                1 => '아국과 이미 선포중입니다.',
+                3 => '아국과 외교 진행중입니다.',
+                4 => '아국과 외교 진행중입니다.',
+                5 => '아국과 외교 진행중입니다.',
+                6 => '아국과 외교 진행중입니다.',
+            ]),
+        ];
+
+    }
+
+    public function getCost():array{
+        return [0, 0];
+    }
+    
+    public function getPreReqTurn():int{
+        return 0;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getBrief():string{
+        $commandName = $this->getName();
+        $destNationName = getNationStaticInfo($this->arg['destNationID'])['name'];
+        $year = $this->arg['year'];
+        $month = $this->arg['month'];
+        return "{$year}년 {$month}월까지 ";
+    }
+
+    public function run():bool{
+        if(!$this->isRunnable()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+
+        $db = DB::db();
+        $env = $this->env;
+
+        $general = $this->generalObj;
+
+        $nation = $this->nation;
+        $nationID = $nation['nation'];
+        $nationName = $nation['name'];
+
+        $destNation = $this->destNation;
+        $destNationID = $destNation['nation'];
+        $destNationName = $destNation['name'];
+
+        $year = $this->arg['year'];
+        $month = $this->arg['month'];
+
+        $logger = $general->getLogger();
+        $destLogger = new ActionLogger(0, $destNationID, $env['year'], $env['month']);
+        
+        $currentMonth = $env['year'] * 12 + $env['month'] - 1;
+        $reqMonth = $year *12 + $month - 1;
+
+        $db->update('diplomacy',[
+            'state'=>7,
+            'term'=>$reqMonth - $currentMonth
+        ],
+        '(me=%i AND you=%i) OR (you=%i AND me=%i)',
+        $nationID, $destNationID,
+        $nationID, $destNationID);
+
+        $josaWa = JosaUtil::pick($destNationName, '와');
+        $logger->pushGeneralActionLog("<D><b>{$destNationName}</b></>{$josaWa} <C>$year</>년 불가침에 성공했습니다.", ActionLogger::PLAIN);
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>{$josaWa} {$year}년 {$month}월까지 불가침 성공");
+
+
+        $josaWa = JosaUtil::pick($nationName, '와');
+        $destLogger->pushGeneralActionLog("<D><b>{$nationName}</b></>{$josaWa} <C>$year</>년 불가침에 성공했습니다.", ActionLogger::PLAIN);
+        $destLogger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaWa} {$year}년 {$month}월까지 불가침 성공");
+
+        $general->applyDB($db);
+        $destLogger->flush();
+
+        return true;
+    }
+
+    public function getJSFiles(): array
+    {
+        return [
+            'js/defaultSelectNationByMap.js'
+        ];
+    }
+
+    public function getForm(): string
+    {
+        $generalObj = $this->generalObj;
+        $nationID = $generalObj->getNationID();
+        
+        $db = DB::db();
+
+        $currYear = $this->env['year'];
+
+        $diplomacyStatus = Util::convertArrayToDict(
+            $db->query('SELECT * FROM diplomacy WHERE me = %i', $nationID),
+            'you'
+        );
+
+        $nationList = [];
+        foreach(getAllNationStaticInfo() as $destNation){
+            if($destNation['nation'] == $nationID){
+                continue;
+            }
+
+            $testCommand = new static($generalObj, $this->env, $this->getLastTurn(), [
+                'destNationID'=>$destNation['nation'],
+                'year'=>$currYear+1,
+                'month'=>12
+            ]);
+            if(!$testCommand->isRunnable()){
+                $destNation['cssBgColor'] = 'background-color:red;';
+            }
+            else if($diplomacyStatus[$destNation['nation']]['state'] == 7){
+                $destNation['cssBgColor'] = 'background-color:blue;';
+            }
+            else{
+                $destNation['cssBgColor'] = '';
+            }
+
+            $nationList[] = $destNation;
+        }
+
+        ob_start(); 
+?>
+<?=\sammo\getMapHtml()?><br>
+타국에게 불가침을 제의합니다.<br>
+제의할 국가를 목록에서 선택하세요.<br>
+불가침 기한 다음 달부터 선포 가능합니다.<br>
+배경색은 현재 제의가 불가능한 국가는 <font color=red>붉은색</font>, 현재 불가침중인 국가는 <font color=blue>푸른색</font>으로 표시됩니다.<br>
+<br>
+<select class='formInput' name="destNationID" id="destNationID" size='1' style='color:white;background-color:black;'>
+<?php foreach($nationList as $nation): ?>
+    <option 
+        value='<?=$nation['nation']?>' 
+        style='color:<?=$nation['color']?>;<?=$nation['cssBgColor']?>'
+    >【<?=$nation['name']?> 】</option>
+<?php endforeach; ?>
+</select>에게
+<select class='formInput' name="year" id="year" size='1' style='color:white;background-color:black;'>
+<?php foreach(range($currYear+1, $currYear+20) as $formYear): ?>
+    <option value='<?=$formYear?>'><?=$formYear?></option>
+<?php endforeach; ?>
+</select>년
+<select class='formInput' name="month" id="month" size='1' style='color:white;background-color:black;'>
+<?php foreach(range(1, 12) as $formMonth): ?>
+    <option value='<?=$formMonth?>'><?=$formMonth?></option>
+<?php endforeach; ?>
+</select>월까지 
+<input type=button id="commonSubmit" value="<?=$this->getName()?>">
+<?php
+        return ob_get_clean();
+    }
+}
@@ -18,6 +18,8 @@ use function \sammo\{
    getDomesticExpLevelBonus,
    CriticalRatioDomestic, 
    CriticalScoreEx,
+    getAllNationStaticInfo,
+    getNationStaticInfo,
    GetImageURL
 };

@@ -87,7 +89,13 @@ class che_불가침제의 extends Command\NationCommand{
        $currentMonth = $env['year'] * 12 + $env['month'] - 1;
        $reqMonth = $year *12 + $month - 1;

+        $nationID = $this->nation['nation'];
+
        if ($reqMonth < $currentMonth + 12) {
+            $this->reservableConstraints = [
+                ConstraintHelper::AlwaysFail('기한은 1년 이상이어야 합니다.')
+            ];
+
            $this->runnableConstraints = [
                ConstraintHelper::AlwaysFail('기한은 1년 이상이어야 합니다.')
            ];
@@ -100,6 +108,14 @@ class che_불가침제의 extends Command\NationCommand{
            ConstraintHelper::OccupiedCity(),
            ConstraintHelper::SuppliedCity(),
            ConstraintHelper::ExistsDestNation(),
+            ConstraintHelper::DisallowDiplomacyBetweenStatus([
+                0 => '아국과 이미 교전중입니다.',
+                1 => '아국과 이미 선포중입니다.',
+                3 => '아국과 외교 진행중입니다.',
+                4 => '아국과 외교 진행중입니다.',
+                5 => '아국과 외교 진행중입니다.',
+                6 => '아국과 외교 진행중입니다.',
+            ]),
        ];

    }
@@ -116,6 +132,14 @@ class che_불가침제의 extends Command\NationCommand{
        return 0;
    }

+    public function getBrief():string{
+        $commandName = $this->getName();
+        $destNationName = getNationStaticInfo($this->arg['destNationID'])['name'];
+        $year = $this->arg['year'];
+        $month = $this->arg['month'];
+        return "【{$destNationName}】에게 {$year}년 {$month}월까지 {$commandName}";
+    }
+

    public function run():bool{
        if(!$this->isRunnable()){
@@ -171,7 +195,7 @@ class che_불가침제의 extends Command\NationCommand{
            Message::MSGTYPE_DIPLOMACY,
            $src,
            $dest,
-            "{$nationName}의 {$year}년 {$month}까지 불가침 제의 서신",
+            "{$nationName}와 {$year}년 {$month}월까지 불가침 제의 서신",
            $now,
            $validUntil,
            [
@@ -188,4 +212,80 @@ class che_불가침제의 extends Command\NationCommand{

        return true;
    }
+
+    public function getJSFiles(): array
+    {
+        return [
+            'js/defaultSelectNationByMap.js'
+        ];
+    }
+
+    public function getForm(): string
+    {
+        $generalObj = $this->generalObj;
+        $nationID = $generalObj->getNationID();
+        
+        $db = DB::db();
+
+        $currYear = $this->env['year'];
+
+        $diplomacyStatus = Util::convertArrayToDict(
+            $db->query('SELECT * FROM diplomacy WHERE me = %i', $nationID),
+            'you'
+        );
+
+        $nationList = [];
+        foreach(getAllNationStaticInfo() as $destNation){
+            if($destNation['nation'] == $nationID){
+                continue;
+            }
+
+            $testCommand = new static($generalObj, $this->env, $this->getLastTurn(), [
+                'destNationID'=>$destNation['nation'],
+                'year'=>$currYear+1,
+                'month'=>12
+            ]);
+            if(!$testCommand->isRunnable()){
+                $destNation['cssBgColor'] = 'background-color:red;';
+            }
+            else if($diplomacyStatus[$destNation['nation']]['state'] == 7){
+                $destNation['cssBgColor'] = 'background-color:blue;';
+            }
+            else{
+                $destNation['cssBgColor'] = '';
+            }
+
+            $nationList[] = $destNation;
+        }
+
+        ob_start(); 
+?>
+<?=\sammo\getMapHtml()?><br>
+타국에게 불가침을 제의합니다.<br>
+제의할 국가를 목록에서 선택하세요.<br>
+불가침 기한 다음 달부터 선포 가능합니다.<br>
+배경색은 현재 제의가 불가능한 국가는 <font color=red>붉은색</font>, 현재 불가침중인 국가는 <font color=blue>푸른색</font>으로 표시됩니다.<br>
+<br>
+<select class='formInput' name="destNationID" id="destNationID" size='1' style='color:white;background-color:black;'>
+<?php foreach($nationList as $nation): ?>
+    <option 
+        value='<?=$nation['nation']?>' 
+        style='color:<?=$nation['color']?>;<?=$nation['cssBgColor']?>'
+    >【<?=$nation['name']?> 】</option>
+<?php endforeach; ?>
+</select>에게
+<select class='formInput' name="year" id="year" size='1' style='color:white;background-color:black;'>
+<?php foreach(range($currYear+1, $currYear+20) as $formYear): ?>
+    <option value='<?=$formYear?>'><?=$formYear?></option>
+<?php endforeach; ?>
+</select>년
+<select class='formInput' name="month" id="month" size='1' style='color:white;background-color:black;'>
+<?php foreach(range(1, 12) as $formMonth): ?>
+    <option value='<?=$formMonth?>'><?=$formMonth?></option>
+<?php endforeach; ?>
+</select>월까지 
+<input type=button id="commonSubmit" value="<?=$this->getName()?>">
+<?php
+        return ob_get_clean();
+    }
 }