diff --git a/hwe/sammo/ActionItem/che_불굴_상편.php b/hwe/sammo/ActionItem/che_불굴_상편.php index 3be6e233..854553b8 100644 --- a/hwe/sammo/ActionItem/che_불굴_상편.php +++ b/hwe/sammo/ActionItem/che_불굴_상편.php @@ -25,7 +25,7 @@ class che_불굴_상편 extends \sammo\BaseItem $crewRatio = Util::valueFit($crew / ($leadership * 100), 0, 1); return new WarUnitTriggerCaller( - new 전투력보정(1 + 0.5 * (1 - $crewRatio)) + new 전투력보정($unit, 1 + 0.5 * (1 - $crewRatio)) ); } } diff --git a/hwe/sammo/ActionItem/che_상성보정_과실주.php b/hwe/sammo/ActionItem/che_상성보정_과실주.php index da416aad..9ac09829 100644 --- a/hwe/sammo/ActionItem/che_상성보정_과실주.php +++ b/hwe/sammo/ActionItem/che_상성보정_과실주.php @@ -17,15 +17,12 @@ class che_상성보정_과실주 extends \sammo\BaseItem{ public function getBattlePhaseSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller { $oppose = $unit->getOppose(); - if($oppose === null){ - return null; - } $attackCoef = $unit->getCrewType()->getAttackCoef($oppose->getCrewType()); if($attackCoef <= 1){ return null; } return new WarUnitTriggerCaller( - new 전투력보정(1.1, 0.9) + new 전투력보정($unit, 1.1, 0.9) ); } } diff --git a/hwe/sammo/WarUnitTrigger/전투력보정.php b/hwe/sammo/WarUnitTrigger/전투력보정.php index b40a85fe..a06931de 100644 --- a/hwe/sammo/WarUnitTrigger/전투력보정.php +++ b/hwe/sammo/WarUnitTrigger/전투력보정.php @@ -10,7 +10,8 @@ use sammo\ObjectTrigger; class 전투력보정 extends BaseWarUnitTrigger{ protected $priority = ObjectTrigger::PRIORITY_BEGIN; - public function __construct(protected int|float $attackerWarPowerMultiplier, protected int|float $defenderWarPowerMultiplier = 1){ + public function __construct(WarUnit $unit, protected int|float $attackerWarPowerMultiplier, protected int|float $defenderWarPowerMultiplier = 1){ + $this->object = $unit; } protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{