devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

feat: extractBattleOrder 함수가 공격자를 받아서 처리할 수 있도록 변경

Browse Source
This commit is contained in:
Hide_D
2023-05-10 01:28:00 +09:00
parent ffdacc2cfb
commit 483641bcd5
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/j_simulate_battle.php
+11 -7
View File
@@ -293,9 +293,12 @@ if(!$v->validate()){
]);
}
$attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month);
if($action == 'reorder'){
usort($defenderList, function(General $lhs, General $rhs){
return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
usort($defenderList, function(General $lhs, General $rhs) use ($attackerGeneral){
return -(extractBattleOrder($lhs, $attackerGeneral) <=> extractBattleOrder($rhs, $attackerGeneral));
});
$order = [];
@@ -310,8 +313,8 @@ if($action == 'reorder'){
]);
}
usort($defenderList, function(General $lhs, General $rhs){
return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
usort($defenderList, function(General $lhs, General $rhs) use ($attackerGeneral){
return -(extractBattleOrder($lhs, $attackerGeneral) <=> extractBattleOrder($rhs, $attackerGeneral));
});
$rawDefenderList = array_map(function(General $general){
@@ -347,9 +350,10 @@ function simulateBattle(
$warRng = new RandUtil(new LiteHashDRBG($warSeed));
$attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month);
$attacker = new WarUnitGeneral(
$warRng,
new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month),
$attackerGeneral,
$rawAttackerNation,
true
);
@@ -364,7 +368,7 @@ function simulateBattle(
$defenderRice = 0;
$getNextDefender = function(?WarUnit $prevDefender, bool $reqNext)
use ($warRng, $iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice) {
use ($warRng, $iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice, $attackerGeneral) {
if($prevDefender !== null){
$prevDefender->getLogger()->rollback();
$battleResult[] = $prevDefender;
@@ -382,7 +386,7 @@ function simulateBattle(
}
$defenderObj = new General($iterDefender->current(), extractRankVar($iterDefender->current()), $rawDefenderCity, $rawDefenderNation, $year, $month);
if(extractBattleOrder($defenderObj) <= 0){
if(extractBattleOrder($defenderObj, $attackerGeneral) <= 0){
return null;
}