diff --git a/hwe/sammo/DummyGeneral.php b/hwe/sammo/DummyGeneral.php index be35868c..6f1c0901 100644 --- a/hwe/sammo/DummyGeneral.php +++ b/hwe/sammo/DummyGeneral.php @@ -34,6 +34,14 @@ class DummyGeneral extends General{ return new WarUnitTriggerCaller(); } + public function onCalcStat(General $general, string $statName, $value, $aux=null){ + return $value; + } + + public function onCalcOpposeStat(General $general, string $statName, $value, $aux=null){ + return $value; + } + function applyDB($db):bool{ if($this->logger){ $this->initLogger(1, 1); diff --git a/hwe/sammo/WarUnitGeneral.php b/hwe/sammo/WarUnitGeneral.php index b0e8cc7e..800cce28 100644 --- a/hwe/sammo/WarUnitGeneral.php +++ b/hwe/sammo/WarUnitGeneral.php @@ -67,7 +67,7 @@ class WarUnitGeneral extends WarUnit { $phase = $this->getCrewType()->speed; $phase = $this->general->onCalcStat($this->general, 'initWarPhase', $phase, ['isAttacker' => $this->isAttacker]); - $phase = $this->oppose->general->onCalcOpposeStat($this->general, 'initWarPhase', $phase, ['isAttacker' => $this->isAttacker]); + //maxPhase는 상대가 결정되기 전에 계산되므로 oppose를 호출할 수 없음 return $phase + $this->bonusPhase; }