Revert "전투 종료 시 뜨는 로그 순서 변경"

This reverts commit 568e1b2923.
This commit is contained in:
2018-08-26 23:23:06 +09:00
parent 7a514e2492
commit dbf044b418
+4 -29
View File
@@ -63,12 +63,7 @@ function processWar(array $rawAttacker, array $rawDefenderCity){
return null; return null;
} }
$rawGeneral = $iterDefender->current(); $retVal = new WarUnitGeneral($iterDefender->current(), $rawDefenderCity, $rawDefenderNation, false, $year, $month);
if(extractBattleOrder($rawGeneral) <= 0){
return null;
}
$retVal = new WarUnitGeneral($rawGeneral, $rawDefenderCity, $rawDefenderNation, false, $year, $month);
$iterDefender->next(); $iterDefender->next();
return $retVal; return $retVal;
}; };
@@ -159,26 +154,6 @@ function processWar(array $rawAttacker, array $rawDefenderCity){
} }
function extractBattleOrder($general){ function extractBattleOrder($general){
if($general['crew'] == 0){
return 0;
}
if($general['rice'] <= $general['crew'] / 100){
return 0;
}
if($general['mode'] == 0){
return 0;
}
if($general['mode'] == 1 && ($general['train'] < 60 || $general['atmos'] < 60)){
return 0;
}
if($general['mode'] == 2 && ($general['train'] < 80 || $general['atmos'] < 80)){
return 0;
}
return ( return (
$general['leader'] + $general['leader'] +
$general['power'] + $general['power'] +
@@ -421,11 +396,11 @@ function processWar_NG(
if($currPhase == $attacker->getMaxPhase()){ if($currPhase == $attacker->getMaxPhase()){
//마지막 페이즈의 전투 마무리 //마지막 페이즈의 전투 마무리
$attacker->logBattleResult();
$defender->logBattleResult();
$attacker->tryWound(); $attacker->tryWound();
$defender->tryWound(); $defender->tryWound();
$attacker->logBattleResult();
$defender->logBattleResult();
} }
if($defender instanceof WarUnitCity){ if($defender instanceof WarUnitCity){