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

Merge pull request #38 from armando1980/patch-10

Browse Source 
fix catapults and attack in time of peace by Armando
This commit is contained in:
Shadow
2014-01-06 21:36:41 -08:00
parent 888a1351c8 20963a7e7e
commit 51658276bd
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+10 -7
View File
@@ -1925,7 +1925,8 @@ class Automation {
$tblevel = $bdo['f'.$rand]; $tblevel = $bdo['f'.$rand];
$tbgid = $bdo['f'.$rand.'t']; $tbgid = $bdo['f'.$rand.'t'];
$tbid = $rand; $tbid = $rand;
if ($battlepart[4]>$battlepart[3]) $needed_cata = round((($battlepart[5] * (pow($tblevel,2) + $tblevel + 1)) / (8 * (round(200 * pow(1.0205,$bid25[$residence]['attri']))/200) / (1 * $bid34[$stonemason]['attri']/100))) + 0.5);
if ($battlepart[4]>$needed_cata)
{ {
$info_cat = "".$catp_pic.", ".$this->procResType($tbgid,$can_destroy,$isoasis)." destroyed."; $info_cat = "".$catp_pic.", ".$this->procResType($tbgid,$can_destroy,$isoasis)." destroyed.";
$database->setVillageLevel($data['to'],"f".$tbid."",'0'); $database->setVillageLevel($data['to'],"f".$tbid."",'0');
@@ -1964,7 +1965,7 @@ class Automation {
} }
else else
{ {
$demolish=$battlepart[4]/$battlepart[3]; $demolish=$battlepart[4]/$needed_cata;
$totallvl = round(sqrt(pow(($tblevel+0.5),2)-($battlepart[4]*8))); $totallvl = round(sqrt(pow(($tblevel+0.5),2)-($battlepart[4]*8)));
if ($tblevel==$totallvl) if ($tblevel==$totallvl)
$info_cata=" was not damaged."; $info_cata=" was not damaged.";
@@ -2052,7 +2053,8 @@ class Automation {
$tblevel = $bdo['f'.$rand]; $tblevel = $bdo['f'.$rand];
$tbgid = $bdo['f'.$rand.'t']; $tbgid = $bdo['f'.$rand.'t'];
$tbid = $rand; $tbid = $rand;
if ($battlepart[4]>$battlepart[3]) $needed_cata = round((($battlepart[5] * (pow($tblevel,2) + $tblevel + 1)) / (8 * (round(200 * pow(1.0205,$bid25[$residence]['attri']))/200) / (1 * $bid34[$stonemason]['attri']/100))) + 0.5);
if ($battlepart[4]>$needed_cata)
{ {
$info_cat = "".$catp_pic.", ".$this->procResType($tbgid,$can_destroy,$isoasis)." destroyed."; $info_cat = "".$catp_pic.", ".$this->procResType($tbgid,$can_destroy,$isoasis)." destroyed.";
$database->setVillageLevel($data['to'],"f".$tbid."",'0'); $database->setVillageLevel($data['to'],"f".$tbid."",'0');
@@ -2095,7 +2097,7 @@ class Automation {
} }
else else
{ {
$demolish=$battlepart[4]/$battlepart[3]; $demolish=$battlepart[4]/$needed_cata;
$totallvl = round(sqrt(pow(($tblevel+0.5),2)-(($battlepart[4]/2)*8))); $totallvl = round(sqrt(pow(($tblevel+0.5),2)-(($battlepart[4]/2)*8)));
if ($tblevel==$totallvl) if ($tblevel==$totallvl)
$info_cata=" was not damaged."; $info_cata=" was not damaged.";
@@ -2180,7 +2182,8 @@ class Automation {
$tblevel = $bdo['f'.$rand]; $tblevel = $bdo['f'.$rand];
$tbgid = $bdo['f'.$rand.'t']; $tbgid = $bdo['f'.$rand.'t'];
$tbid = $rand; $tbid = $rand;
if ($battlepart[4]>$battlepart[3]) $needed_cata = round((($battlepart[5] * (pow($tblevel,2) + $tblevel + 1)) / (8 * (round(200 * pow(1.0205,$bid25[$residence]['attri']))/200) / (1 * $bid34[$stonemason]['attri']/100))) + 0.5);
if ($battlepart[4]>$needed_cata)
{ {
$info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\"> $info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\">
<img class=\"unit u".$catp_pic."\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> ".$this->procResType($tbgid,$can_destroy,$isoasis)." destroyed.</td></tr></tbody>"; <img class=\"unit u".$catp_pic."\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> ".$this->procResType($tbgid,$can_destroy,$isoasis)." destroyed.</td></tr></tbody>";
@@ -2223,7 +2226,7 @@ class Automation {
} }
else else
{ {
$demolish=$battlepart[4]/$battlepart[3]; $demolish=$battlepart[4]/$needed_cata;
$totallvl = round(sqrt(pow(($tblevel+0.5),2)-(($battlepart[4]/2)*8))); $totallvl = round(sqrt(pow(($tblevel+0.5),2)-(($battlepart[4]/2)*8)));
if ($tblevel==$totallvl) if ($tblevel==$totallvl)
$info_cata=" was not damaged."; $info_cata=" was not damaged.";
@@ -2852,7 +2855,7 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
} }
} }
$endtime += $AttackArrivalTime; $endtime += $AttackArrivalTime;
$endtime += microtime(true); //$endtime += microtime(true);
$database->setMovementProc($data['moveid']); $database->setMovementProc($data['moveid']);
$database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],$AttackArrivalTime,$endtime); $database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],$AttackArrivalTime,$endtime);
$peace = PEACE; $peace = PEACE;