xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-17 08:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs

Browse Source 
In the simulator:
Fixed some error that could have shown during scountings.

All types of attack:
Changed "int" into "float" to gain precision in the attack formula.
Fixed spies formula, it's more precise now.
Fixed the Blacksmith/Armoury calculation formula for spies.
This commit is contained in:
Pietro
2018-04-06 18:06:08 +02:00
committed by GitHub
parent 00d5021d1c
commit 5f9186bd71
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Battle.php
+26 -23
View File
@@ -123,34 +123,37 @@ class Battle {
//set the arrays with attacking and defending units //set the arrays with attacking and defending units
$attacker = array('u1'=>0,'u2'=>0,'u3'=>0,'u4'=>0,'u5'=>0,'u6'=>0,'u7'=>0,'u8'=>0,'u9'=>0,'u10'=>0,'u11'=>0,'u12'=>0,'u13'=>0,'u14'=>0,'u15'=>0,'u16'=>0,'u17'=>0,'u18'=>0,'u19'=>0,'u20'=>0,'u21'=>0,'u22'=>0,'u23'=>0,'u24'=>0,'u25'=>0,'u26'=>0,'u27'=>0,'u28'=>0,'u29'=>0,'u30'=>0,'u31'=>0,'u32'=>0,'u33'=>0,'u34'=>0,'u35'=>0,'u36'=>0,'u37'=>0,'u38'=>0,'u39'=>0,'u40'=>0,'u41'=>0,'u42'=>0,'u43'=>0,'u44'=>0,'u45'=>0,'u46'=>0,'u47'=>0,'u48'=>0,'u49'=>0,'u50'=>0); $attacker = array('u1'=>0,'u2'=>0,'u3'=>0,'u4'=>0,'u5'=>0,'u6'=>0,'u7'=>0,'u8'=>0,'u9'=>0,'u10'=>0,'u11'=>0,'u12'=>0,'u13'=>0,'u14'=>0,'u15'=>0,'u16'=>0,'u17'=>0,'u18'=>0,'u19'=>0,'u20'=>0,'u21'=>0,'u22'=>0,'u23'=>0,'u24'=>0,'u25'=>0,'u26'=>0,'u27'=>0,'u28'=>0,'u29'=>0,'u30'=>0,'u31'=>0,'u32'=>0,'u33'=>0,'u34'=>0,'u35'=>0,'u36'=>0,'u37'=>0,'u38'=>0,'u39'=>0,'u40'=>0,'u41'=>0,'u42'=>0,'u43'=>0,'u44'=>0,'u45'=>0,'u46'=>0,'u47'=>0,'u48'=>0,'u49'=>0,'u50'=>0);
$start = ($post['a1_v']-1)*10+1; $start = ($post['a1_v']-1)*10+1;
$index = 1;
$offhero=intval($post['h_off_bonus']); $offhero=intval($post['h_off_bonus']);
$hero_strenght=intval($post['h_off']); $hero_strenght=intval($post['h_off']);
$deffhero=intval($post['h_def_bonus']); $deffhero=intval($post['h_def_bonus']);
for($i=$start;$i<=($start+9);$i++) { for($i=$start, $index = 1;$i<=($start+9);$i++, $index++) {
$attacker['u'.$i] = $post['a1_'.$index]; if(isset($post['a1_'.$index]) && !empty($post['a1_'.$index])) {
if($index <=8) { $attacker['u'.$i] = $post['a1_'.$index];
${'att_ab'.$index} = $post['f1_'.$index]; }else{
} $attacker['u'.$i] = 0;
$index += 1; }
if($index <=8) {
${'att_ab'.$index} = $post['f1_'.$index];
}
} }
$defender = array(); $defender = array();
$defscout=0; $defscout=0;
//fix by ronix //fix by ronix
for($i=1;$i<=50;$i++) { for($i=1;$i<=50;$i++) {
if(isset($post['a2_'.$i]) && $post['a2_'.$i] != "") { if(isset($post['a2_'.$i]) && !empty($post['a2_'.$i])) {
$defender['u'.$i] = $post['a2_'.$i]; $defender['u'.$i] = $post['a2_'.$i];
$def_ab[$i]=$post['f2_'.$i]; $def_ab[$i]=$post['f2_'.$i];
if($i == 4 || $i == 14 || $i == 23 || $i == 44){ if($i == 4 || $i == 14 || $i == 23 || $i == 44){
$defscout+=$defender['u'.$i]; $defscout+=$defender['u'.$i];
} }
} }
else { else {
$defender['u'.$i] = 0; $defender['u'.$i] = 0;
$def_ab[$i]=0; $def_ab[$i]=0;
} }
} }
$deftribe = $post['tribe']; $deftribe = $post['tribe'];
$wall = 0; $wall = 0;
@@ -375,7 +378,7 @@ class Battle {
$j = $i-$start+1; $j = $i-$start+1;
if($Attacker['u'.$i]>0 && ($i == 4 || $i == 14 || $i == 23 || $i == 44)){ if($Attacker['u'.$i]>0 && ($i == 4 || $i == 14 || $i == 23 || $i == 44)){
if(${'att_ab'.$abcount} > 0) { if(${'att_ab'.$abcount} > 0) {
$ap += (35 + (35 + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.00697, ${'att_ab'.$abcount}) - 1)) * $Attacker['u'.$i];// ^ ($Attacker['u'.$i]/100); $ap += (35 + (35 + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.007, ${'att_ab'.$abcount}) - 1)) * $Attacker['u'.$i];// ^ ($Attacker['u'.$i]/100);
}else{ }else{
$ap += $Attacker['u'.$i]*35; $ap += $Attacker['u'.$i]*35;
} }
@@ -403,9 +406,9 @@ class Battle {
$j = $i-$start+1; $j = $i-$start+1;
if($abcount <= 8 && ${'att_ab'.$abcount} > 0) { if($abcount <= 8 && ${'att_ab'.$abcount} > 0) {
if(in_array($i,$calvary)) { if(in_array($i,$calvary)) {
$cap += (int) (${'u'.$i}['atk'] + (${'u'.$i}['atk'] + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.007, ${'att_ab'.$abcount}) - 1)) * (int) $Attacker['u'.$i]; $cap += (float) (${'u'.$i}['atk'] + (${'u'.$i}['atk'] + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.007, ${'att_ab'.$abcount}) - 1)) * (int) $Attacker['u'.$i];
}else{ }else{
$ap += (int) (${'u'.$i}['atk'] + (${'u'.$i}['atk'] + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.007, ${'att_ab'.$abcount}) - 1)) * (int) $Attacker['u'.$i]; $ap += (float) (${'u'.$i}['atk'] + (${'u'.$i}['atk'] + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.007, ${'att_ab'.$abcount}) - 1)) * (int) $Attacker['u'.$i];
} }
}else{ }else{
if(in_array($i,$calvary)) { if(in_array($i,$calvary)) {
@@ -520,7 +523,7 @@ class Battle {
$moralbonus = 1.0; $moralbonus = 1.0;
} }
if($involve >= 1000) { if($involve >= 1000 && $type != 1) {
$Mfactor = round(2*(1.8592-pow($involve,0.015)),4); $Mfactor = round(2*(1.8592-pow($involve,0.015)),4);
}else{ }else{
$Mfactor = 1.5; $Mfactor = 1.5;
@@ -772,7 +775,7 @@ class Battle {
global ${'u'.$y}; global ${'u'.$y};
if($defenders['u'.$y]>0 && $def_ab[$y] > 0) { if($defenders['u'.$y]>0 && $def_ab[$y] > 0) {
$dp += (20 + (20 + 300 * ${'u'.$y}['pop'] / 7) * (pow(1.00696, $def_ab[$y]) - 1)) * $defenders['u'.$y] * $defender_artefact; $dp += (20 + (20 + 300 * ${'u'.$y}['pop'] / 7) * (pow(1.007, $def_ab[$y]) - 1)) * $defenders['u'.$y] * $defender_artefact;
$def_foolartefact = $database->getFoolArtefactInfo(3,$AttackerWref,$AttackerID); $def_foolartefact = $database->getFoolArtefactInfo(3,$AttackerWref,$AttackerID);
if(count($def_foolartefact) > 0){ if(count($def_foolartefact) > 0){