diff --git a/hwe/j_simulate_battle.php b/hwe/j_simulate_battle.php index dab0ab32..d0d9be30 100644 --- a/hwe/j_simulate_battle.php +++ b/hwe/j_simulate_battle.php @@ -443,14 +443,12 @@ function simulateBattle( $defender = $iterDefender->current(); if (extractBattleOrder($defender, $attacker) <= 0) { - logError('noDefence', TVarDumper::dump($defender, 2), '', []); return null; } $defenderRice += $defender->getVar('rice'); $iterDefender->next(); - logError('nextDefender', TVarDumper::dump($defender, 2), '', []); return $defender; }; diff --git a/hwe/sammo/WarUnitCity.php b/hwe/sammo/WarUnitCity.php index 0cdf6905..d3f1d513 100644 --- a/hwe/sammo/WarUnitCity.php +++ b/hwe/sammo/WarUnitCity.php @@ -80,6 +80,9 @@ class WarUnitCity extends WarUnit{ function setSiege(){ $this->onSiege = true; + $this->currPhase = 0; + $this->prePhase = 0; + $this->bonusPhase = 0; } function isSiege(): bool{