fix: 성벽 전투 반영
This commit is contained in:
+1
-1
@@ -482,8 +482,8 @@ function processWar_NG(
|
|||||||
|
|
||||||
if($city->getDead() || $defender instanceof WarUnitCity){
|
if($city->getDead() || $defender instanceof WarUnitCity){
|
||||||
if($city !== $defender){
|
if($city !== $defender){
|
||||||
$city->finishBattle();
|
|
||||||
$city->setSiege();
|
$city->setSiege();
|
||||||
|
$city->finishBattle();
|
||||||
}
|
}
|
||||||
|
|
||||||
$newConflict = $city->addConflict();
|
$newConflict = $city->addConflict();
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ class WarUnitCity extends WarUnit{
|
|||||||
$this->currPhase = 0;
|
$this->currPhase = 0;
|
||||||
$this->prePhase = 0;
|
$this->prePhase = 0;
|
||||||
$this->bonusPhase = 0;
|
$this->bonusPhase = 0;
|
||||||
|
$this->isFinished = false;
|
||||||
/** @var DummyGeneral $general */
|
/** @var DummyGeneral $general */
|
||||||
$general = $this->general;
|
$general = $this->general;
|
||||||
$general->setCrewType(null);
|
$general->setCrewType(null);
|
||||||
@@ -131,15 +132,15 @@ class WarUnitCity extends WarUnit{
|
|||||||
}
|
}
|
||||||
|
|
||||||
function finishBattle(){
|
function finishBattle(){
|
||||||
if($this->isFinished || !$this->onSiege){
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$this->clearActivatedSkill();
|
$this->clearActivatedSkill();
|
||||||
$this->isFinished = true;
|
$this->isFinished = true;
|
||||||
|
|
||||||
$this->updateVar('def', Util::round($this->getHP() / 10));
|
$this->updateVar('def', Util::round($this->getHP() / 10));
|
||||||
$this->updateVar('wall', Util::round($this->getVar('wall')));
|
$this->updateVar('wall', Util::round($this->getVar('wall')));
|
||||||
|
|
||||||
|
if($this->isFinished || !$this->onSiege){
|
||||||
|
return;
|
||||||
|
}
|
||||||
//NOTE: 전투로 인한 사망자는 여기서 처리하지 않음
|
//NOTE: 전투로 인한 사망자는 여기서 처리하지 않음
|
||||||
|
|
||||||
$decWealth = $this->getKilled() / 20;
|
$decWealth = $this->getKilled() / 20;
|
||||||
|
|||||||
Reference in New Issue
Block a user