xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 16:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some movement problems

Browse Source
This commit is contained in:
unknown
2012-06-16 22:04:22 +03:00
parent 46faa7dab0
commit 97d4dc1f16
3 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+1 -1
View File
@@ -2374,7 +2374,7 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
}else{
$fastertroops = 1;
}
$endtime = round($this->procDistanceTime($from,$to,min($speeds),1)/$fastertroops) + $AttackArrivalTime;
$endtime = round($this->procDistanceTime($from,$to,min($speeds),1)/$fastertroops) + time();
//$endtime = $this->procDistanceTime($from,$to,min($speeds),1) + time();
if($type == 1) {
$database->addNotice($from['owner'],$to['wref'],$ownally,18,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
Templates/a2b/startRaid.tpl
+20 -33
View File
@@ -13,35 +13,22 @@
$t1 = $row['t1'];$t2 = $row['t2'];$t3 = $row['t3'];$t4 = $row['t4'];$t5 = $row['t5'];
$t6 = $row['t6'];$t7 = $row['t7'];$t8 = $row['t8'];$t9 = $row['t9'];$t10 = $row['t10'];
$t11 = 0;
if($tribe == 1){ $u = "u"; } elseif($tribe == 2){ $u = "u1"; } elseif($tribe == 3){ $u = "u2"; }elseif($tribe == 4){ $u = "u3"; }else {$u = "u4"; }
if($tribe == 1){ $u1 = "u1"; } elseif($tribe == 2){ $u1 = "u2"; } elseif($tribe == 3){ $u1 = "u3"; }elseif($tribe == 4){ $u1 = "u4"; }else {$u1 = "u5"; }
if($tribe == 1){ $u2 = ""; } elseif($tribe == 2){ $u2 = "1"; } elseif($tribe == 3){ $u2 = "2"; }elseif($tribe == 4){ $u2 = "3"; }else {$u2 = "4"; }
if($sql1[$u.'1']>=$t1 && $sql1[$u.'2']>=$t2 && $sql1[$u.'3']>=$t3 && $sql1[$u.'4']>=$t4 && $sql1[$u.'5']>=$t5 && $sql1[$u.'6']>=$t6 && $sql1[$u.'7']>=$t7 && $sql1[$u.'8']>=$t8 && $sql1[$u.'9']>=$t9 && $sql1[$u1.'0']>=$t10 && $sql1['hero']>=$t11){
if($tribe == 1){ $uname = "u"; } elseif($tribe == 2){ $uname = "u1"; } elseif($tribe == 3){ $uname = "u2"; }elseif($tribe == 4){ $uname = "u3"; }else {$uname = "u4"; }
if($tribe == 1){ $uname1 = "u1"; } elseif($tribe == 2){ $uname1 = "u2"; } elseif($tribe == 3){ $uname1 = "u3"; }elseif($tribe == 4){ $uname1 = "u4"; }else {$uname1 = "u5"; }
if($tribe == 1){ $uname2 = ""; } elseif($tribe == 2){ $uname2 = "1"; } elseif($tribe == 3){ $uname2 = "2"; }elseif($tribe == 4){ $uname2 = "3"; }else {$uname2 = "4"; }
if($sql1[$uname.'1']>=$t1 && $sql1[$uname.'2']>=$t2 && $sql1[$uname.'3']>=$t3 && $sql1[$uname.'4']>=$t4 && $sql1[$uname.'5']>=$t5 && $sql1[$uname.'6']>=$t6 && $sql1[$uname.'7']>=$t7 && $sql1[$uname.'8']>=$t8 && $sql1[$uname.'9']>=$t9 && $sql1[$uname1.'0']>=$t10 && $sql1['hero']>=$t11){
if($_POST['slot'.$sid]=='on'){
$ckey = $generator->generateRandStr(6);
$id = $database->addA2b($ckey,time(),$wref,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11,4);
$data = $database->getA2b($ckey, time());
if($database->checkVilExist($data['to_vid'])){
$query1 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = ' . $data['to_vid']);
}else{
$query1 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'odata` WHERE `wref` = ' . $data['to_vid']);
}
$data1 = mysql_fetch_assoc($query1);
$query2 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'users` WHERE `id` = '.$data1['owner']);
$data2 = mysql_fetch_assoc($query2);
$query11 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$getFLData['wref']);
$data11 = mysql_fetch_assoc($query11);
$query21 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'users` WHERE `id` = '.$data11['owner']);
$data21 = mysql_fetch_assoc($query21);
$eigen = $database->getCoor($getFLData['wref']);
$from = array('x'=>$eigen['x'], 'y'=>$eigen['y']);
$ander = $database->getCoor($data['to_vid']);
$to = array('x'=>$ander['x'], 'y'=>$ander['y']);
$start = ($data21['tribe']-1)*10+1;
$end = ($data21['tribe']*10);
$start = ($tribe-1)*10+1;
$end = ($tribe*10);
$speeds = array();
$scout = 1;
@@ -57,9 +44,9 @@
}
}
$artefact = count($database->getOwnUniqueArtefactInfo2($session->uid,2,3,0));
$artefact1 = count($database->getOwnUniqueArtefactInfo2($village->wid,2,1,1));
$artefact2 = count($database->getOwnUniqueArtefactInfo2($session->uid,2,2,0));
$artefact = count($database->getOwnUniqueArtefactInfo2($getFLData['owner'],2,3,0));
$artefact1 = count($database->getOwnUniqueArtefactInfo2($getFLData['wref'],2,1,1));
$artefact2 = count($database->getOwnUniqueArtefactInfo2($getFLData['owner'],2,2,0));
if($artefact > 0){
$fastertroops = 3;
}else if($artefact1 > 0){
@@ -69,23 +56,23 @@
}else{
$fastertroops = 1;
}
$time = round($generator->procDistanceTime($from,$to,min($speeds),0)/$fastertroops);
$time = round($generator->procDistanceTime($from,$to,min($speeds),1)/$fastertroops);
$ctar1 = 0;
$ctar2 = 0;
$abdata = $database->getABTech($getFLData['wref']);
$reference = $database->addAttack(($getFLData['wref']),$data['u1'],$data['u2'],$data['u3'],$data['u4'],$data['u5'],$data['u6'],$data['u7'],$data['u8'],$data['u9'],$data['u10'],$data['u11'],$data['type'],$ctar1,$ctar2,0,$abdata['b1'],$abdata['b2'],$abdata['b3'],$abdata['b4'],$abdata['b5'],$abdata['b6'],$abdata['b7'],$abdata['b8']);
$totalunits = $data['u1']+$data['u2']+$data['u3']+$data['u4']+$data['u5']+$data['u6']+$data['u7']+$data['u8']+$data['u9']+$data['u10']+$data['u11'];
$database->modifyUnit($getFLData['wref'], array($u2.'1'), array($data['u1']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'2'), array($data['u2']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'3'), array($data['u3']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'4'), array($data['u4']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'5'), array($data['u5']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'6'), array($data['u6']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'7'), array($data['u7']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'8'), array($data['u8']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'9'), array($data['u9']), array(0));
$database->modifyUnit($getFLData['wref'], array($u2.'10'), array($data['u10']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'1'), array($data['u1']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'2'), array($data['u2']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'3'), array($data['u3']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'4'), array($data['u4']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'5'), array($data['u5']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'6'), array($data['u6']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'7'), array($data['u7']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'8'), array($data['u8']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'9'), array($data['u9']), array(0));
$database->modifyUnit($getFLData['wref'], array($uname2.'10'), array($data['u10']), array(0));
$database->modifyUnit($getFLData['wref'], array('hero'), array($data['u11']), array(0));
$database->addMovement(3,$getFLData['wref'],$data['to_vid'],$reference,time(),($time+time()));
build.php
+2 -2
View File
@@ -228,10 +228,10 @@ $resultc=$database->query($qc) or die(mysql_error());
$newid=$lastid['id']+1;
$q2 = "INSERT INTO " . TB_PREFIX . "send values ($newid,0,0,0,0,0)";
$database->query($q2);
$database->addMovement(4,$oldmovement[0]['to'],$oldmovement[0]['from'],$oldmovement[0]['ref'],$oldmovement[0]['starttime'],$end);
$database->addMovement(4,$oldmovement[0]['to'],$oldmovement[0]['from'],$oldmovement[0]['ref'],$now,$end);
$database->addMovement(6,$oldmovement[0]['to'],$oldmovement[0]['from'],$newid,$oldmovement[0]['strattime'],$end);
$database->addMovement(6,$oldmovement[0]['to'],$oldmovement[0]['from'],$newid,$now,$end);
}
}
header("Location: ".$_SERVER['PHP_SELF']."?id=".$_GET['id']);