diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index ec631b1c..01497dbe 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -1228,6 +1228,35 @@ class Automation { $database->getABTech($vilIDs); } + private function buildScoutReport($data, $spy_pic, $isoasis, $targettribe, $crannySpy, $totwood, $totclay, $totiron, $totcrop) { + global $database; + $info_spy = ""; + if ($data['spy'] == 1){ + $info_spy = "".$spy_pic.",
\"Lumber\"".round($totwood)." | + \"Clay\"".round($totclay)." | + \"Iron\"".round($totiron)." | + \"Crop\"".round($totcrop)."
+
\"carry\"Total Resources: ".round($totwood+$totclay+$totiron+$totcrop)."
+ "; + }else if($data['spy'] == 2){ + if ($isoasis == 0){ + $walllevel = $database->getFieldLevelInVillage($data['to'], '31, 32, 33'); + $residencelevel = $database->getFieldLevelInVillage($data['to'], 25); + $palacelevel = $database->getFieldLevelInVillage($data['to'], 26); + $residenceimg = "\"Residence\""; + $palaceimg = "\"Palace\""; + $crannyimg = "\"Cranny\""; + $wallimg = "\"Wall\""; + $info_spy = "".$spy_pic.","; + if($residencelevel > 0) $info_spy .= $residenceimg." Residence level:".$residencelevel."
"; + elseif($palacelevel > 0) $info_spy .= $palaceimg." Palace level: ".$palacelevel."
"; + + if($walllevel > 0) $info_spy .= $wallimg." Wall level: ".$walllevel."
"; + $info_spy .= $crannyimg." Total crannies capacity: ".$crannySpy.""; + } + else $info_spy = "".$spy_pic.", There are no informations to show"; + } + return $info_spy; /** * Distribute the battle bounty across the resources actually available in * the target (after cranny protection) and return how much of each is taken. @@ -2318,31 +2347,7 @@ class Automation { if ($DefenderID == 0) $natar = 0; if(!empty($scout)) { - if ($data['spy'] == 1){ - $info_spy = "".$spy_pic.",
\"Lumber\"".round($totwood)." | - \"Clay\"".round($totclay)." | - \"Iron\"".round($totiron)." | - \"Crop\"".round($totcrop)."
-
\"carry\"Total Resources: ".round($totwood+$totclay+$totiron+$totcrop)."
- "; - }else if($data['spy'] == 2){ - if ($isoasis == 0){ - $walllevel = $database->getFieldLevelInVillage($data['to'], '31, 32, 33'); - $residencelevel = $database->getFieldLevelInVillage($data['to'], 25); - $palacelevel = $database->getFieldLevelInVillage($data['to'], 26); - $residenceimg = "\"Residence\""; - $palaceimg = "\"Palace\""; - $crannyimg = "\"Cranny\""; - $wallimg = "\"Wall\""; - $info_spy = "".$spy_pic.","; - if($residencelevel > 0) $info_spy .= $residenceimg." Residence level:".$residencelevel."
"; - elseif($palacelevel > 0) $info_spy .= $palaceimg." Palace level: ".$palacelevel."
"; - - if($walllevel > 0) $info_spy .= $wallimg." Wall level: ".$walllevel."
"; - $info_spy .= $crannyimg." Total crannies capacity: ".$crannySpy.""; - } - else $info_spy = "".$spy_pic.", There are no informations to show"; - } + $info_spy = $this->buildScoutReport($data, $spy_pic, $isoasis, $targettribe, $crannySpy, $totwood, $totclay, $totiron, $totcrop); $data2 = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.',0,0,0,0,0,'.$to['owner'].','.$to['wref'].','.addslashes($to['name']).',,,,'.$targettribe.','.$unitssend_def[0].','.$unitsdead_def[0].','.$rom.','.$unitssend_def[1].','.$unitsdead_def[1].','.$ger.','.$unitssend_def[2].','.$unitsdead_def[2].','.$gal.','.$unitssend_def[3].','.$unitsdead_def[3].','.$nat.','.$unitssend_def[4].','.$unitsdead_def[4].','.$natar.','.$unitssend_def[5].','.$unitsdead_def[5].','.$DefenderHeroesTot.','.$DefenderHeroesDead.','.$info_ram.','.$info_cat.','.$info_chief.','.$info_spy.','.$data['t11'].','.$dead11.','.$herosend_def.','.$deadhero.',,'.$unitstraped_att; }else{