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

fix: 수비자 도시 버그

Browse Source 
fix: RaiseInvader 버그 수정 중
This commit is contained in:
Hide_D
2021-03-28 04:12:10 +09:00
parent f8f4b73a09
commit f450d5d9de
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/process_war.php
+2 -1
View File
@@ -43,7 +43,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
$iterDefender = new \ArrayIterator($defenderList); $iterDefender = new \ArrayIterator($defenderList);
$iterDefender->rewind(); $iterDefender->rewind();
$getNextDefender = function(?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderNation, $db) { $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
if($prevDefender !== null){ if($prevDefender !== null){
$prevDefender->applyDB($db); $prevDefender->applyDB($db);
} }
@@ -57,6 +57,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
} }
$nextDefender = $iterDefender->current(); $nextDefender = $iterDefender->current();
$nextDefender->setRawCity($rawDefenderCity);
if(extractBattleOrder($nextDefender) <= 0){ if(extractBattleOrder($nextDefender) <= 0){
return null; return null;
} }
hwe/sammo/Event/Action/RaiseInvader.php
+2 -2
View File
@@ -115,7 +115,7 @@ class RaiseInvader extends \sammo\Event\Action
$dex = $this->dex; $dex = $this->dex;
if ($dex < 0) { if ($dex < 0) {
$dex = $db->queryFirstField("SELECT avg(dex1 + dex2 + dex3 + dex4 + dex5)/5 from nation where `level`>0"); $dex = $db->queryFirstField("SELECT avg((dex1 + dex2 + dex3 + dex4 + dex5)/5) from general where npc < 5");
$dex *= -1 * $this->dex; $dex *= -1 * $this->dex;
} }
$dex = Util::toInt($dex); $dex = Util::toInt($dex);
@@ -150,7 +150,7 @@ class RaiseInvader extends \sammo\Event\Action
$invaderName = $cityObj->name; $invaderName = $cityObj->name;
$nationName = "ⓞ{$invaderName}족"; $nationName = "ⓞ{$invaderName}족";
$cityID = $cityObj->id; $cityID = $cityObj->id;
$nationObj = new Nation($invaderNationID, $nationName, '#800080', 9999999, 9999999, "중원의 부패를 물리쳐라! 이민족 침범!", $tech, "che_병가", 1, [$cityID]); $nationObj = new Nation($invaderNationID, $nationName, '#800080', 9999999, 9999999, "중원의 부패를 물리쳐라! 이민족 침범!", $tech, "che_병가", 2, [$cityID]);
$nationObj->addGeneral((new GeneralBuilder("{$invaderName}대왕", false, null, $lastNationID)) $nationObj->addGeneral((new GeneralBuilder("{$invaderName}대왕", false, null, $lastNationID))
->setEgo('che_패권') ->setEgo('che_패권')
->setSpecial('che_인덕', 'che_척사') ->setSpecial('che_인덕', 'che_척사')