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

fix attacks canel system 100%

Browse Source
This commit is contained in:
unknown
2012-04-07 19:44:42 +03:00
parent 709ce39555
commit e0331f8f9a
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+3 -3
View File
@@ -545,7 +545,7 @@ private function loyaltyRegeneration() {
$fromcoor = $database->getCoor($data['to']);
$targettribe = $database->getUserField($database->getVillageField($data['from'],"owner"),"tribe",0);
$endtime = $this->procDistanceTime($tocoor,$fromcoor,$targettribe,0) + $data['endtime'];
$database->addMovement(2,$data['to'],$data['from'],$data['merchant'],$endtime);
$database->addMovement(2,$data['to'],$data['from'],$data['merchant'],time(),$endtime);
$database->setMovementProc($data['moveid']);
}
$q = "UPDATE ".TB_PREFIX."movement set proc = 1 where endtime < $time and sort_type = 2";
@@ -1877,14 +1877,14 @@ if($data['t11'] > 0){
}
$database->setMovementProc($data['moveid']);
$database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],$endtime);
$database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],time(),$endtime);
// send the bounty on type 6.
if($type !== 1)
{
$reference = $database->sendResource($steal[0],$steal[1],$steal[2],$steal[3],0,0);
$database->modifyResource($to['wref'],$steal[0],$steal[1],$steal[2],$steal[3],0);
$database->addMovement(6,$to['wref'],$from['wref'],$reference,$endtime);
$database->addMovement(6,$to['wref'],$from['wref'],$reference,time(),$endtime);
//$database->updateVillage($to['wref']);
$totalstolengain=$steal[0]+$steal[1]+$steal[2]+$steal[3];
$totalstolentaken=($totalstolentaken-($steal[0]+$steal[1]+$steal[2]+$steal[3]));
GameEngine/Database/db_MYSQL.php
+2 -2
View File
@@ -1743,8 +1743,8 @@
}
}
function addMovement($type, $from, $to, $ref, $endtime) {
$q = "INSERT INTO " . TB_PREFIX . "movement values (0,$type,$from,$to,$ref,$endtime,0)";
function addMovement($type, $from, $to, $ref, $time, $endtime) {
$q = "INSERT INTO " . TB_PREFIX . "movement values (0,$type,$from,$to,$ref,$time,$endtime,0)";
return mysql_query($q, $this->connection);
}
GameEngine/Units.php
+3 -3
View File
@@ -284,7 +284,7 @@ class Units {
if (isset($post['spy'])){$post['spy'] = $post['spy'];}else{ $post['spy'] = 0;}
$abdata = $database->getABTech($village->wid);
$reference = $database->addAttack(($village->wid),$data['u1'],$data['u2'],$data['u3'],$data['u4'],$data['u5'],$data['u6'],$data['u7'],$data['u8'],$data['u9'],$data['u10'],$data['u11'],$data['type'],$post['ctar1'],$post['ctar2'],$post['spy'],$abdata['b1'],$abdata['b2'],$abdata['b3'],$abdata['b4'],$abdata['b5'],$abdata['b6'],$abdata['b7'],$abdata['b8']);
$database->addMovement(3,$village->wid,$data['to_vid'],$reference,($time+time()));
$database->addMovement(3,$village->wid,$data['to_vid'],$reference,time(),($time+time()));
if($form->returnErrors() > 0) {
$_SESSION['errorarray'] = $form->getErrors();
@@ -363,7 +363,7 @@ class Units {
}
$time = $generator->procDistanceTime($fromCor,$toCor,min($speeds),1);
$reference = $database->addAttack($enforce['from'],$post['t1'],$post['t2'],$post['t3'],$post['t4'],$post['t5'],$post['t6'],$post['t7'],$post['t8'],$post['t9'],$post['t10'],0,2,0,0,0,0);
$database->addMovement(4,$village->wid,$enforce['from'],$reference,($time+time()));
$database->addMovement(4,$village->wid,$enforce['from'],$reference,time(),($time+time()));
$technology->checkReinf($post['ckey']);
header("Location: build.php?id=39");
@@ -392,7 +392,7 @@ class Units {
$database->modifyResource($village->wid,750,750,750,750,0);
$database->modifyUnit($village->wid,array($unit),array(3),array(0));
$database->addMovement(5,$village->wid,$post['s'],0,$post['timestamp']);
$database->addMovement(5,$village->wid,$post['s'],0,time(),$post['timestamp']);
header("Location: build.php?id=39");
if($form->returnErrors() > 0) {
Templates/Build/16_walking.tpl
+8 -10
View File
@@ -22,12 +22,6 @@ if ($isoasis ==0){
$to = $database->getMInfo($units[$y]['to']);
} else {
$to = $database->getOMInfo($units[$y]['to']);}
if (($units[$y]['starttime']+60)>time()){
$canceltroops='<div class="abort"><a href="build.php?id='.$_GET['id'].'&mode=troops&cancel=1&moveid='.$units[$y]['moveid'].'"><img src="img/x.gif" class="del" /></a>';
}else{$canceltroops="";}
?>
<table class="troop_details" cellpadding="1" cellspacing="1">
<thead>
@@ -77,8 +71,10 @@ $canceltroops='<div class="abort"><a href="build.php?id='.$_GET['id'].'&mode=tro
echo "on ".$datetime[0]." ";
}
echo "at ".$datetime[1]."</div>";
?>
<!--<div class="abort"><a href="build.php?id=39&a=4&t=5360004"><img src="img/x.gif" class="del" title="Annuleren" alt="Annuleren" /></a>-->
if (($units[$y]['starttime']+90)>time()){
?>
<div class="abort"><a href="build.php?id=<?php echo $_GET['id']."&mode=troops&cancel=1&moveid=".$units[$y]['moveid']; ?>"><img src="img/x.gif" class="del" /></a></div>
<?php } ?>
</div>
</td>
</tr>
@@ -141,8 +137,10 @@ $timer += 1;
echo "on ".$datetime[0]." ";
}
echo "at ".$datetime[1]."</div>";
?>
<!--<div class="abort"><a href="build.php?id=39&a=4&t=5360004"><img src="img/x.gif" class="del" title="Annuleren" alt="Annuleren" /></a>-->
if (($units[$y]['starttime']+90)>time()){
?>
<div class="abort"><a href="build.php?id=<?php echo $_GET['id']."&mode=troops&cancel=1&moveid=".$units[$y]['moveid']; ?>"><img src="img/x.gif" class="del" /></a></div>
<?php } ?>
</div>
</td>
</tr>
build.php
+3 -3
View File
@@ -51,7 +51,7 @@ if ($_GET['mode']=='troops'&&$_GET['cancel']==1){
$oldmovement=$database->getMovementById($_GET['moveid']);
$now=time();
if (($now-$oldmovement[0]['starttime'])<60){
if (($now-$oldmovement[0]['starttime'])<90){
$qc="SELECT * FROM " . TB_PREFIX . "movement where proc = 0 and moveid = ".$_GET['moveid'];
$resultc=$database->query($qc) or die(mysql_error());
@@ -67,10 +67,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'],$end);
$database->addMovement(4,$oldmovement[0]['to'],$oldmovement[0]['from'],$oldmovement[0]['ref'],$oldmovement[0]['starttime'],$end);
$database->addMovement(6,$oldmovement[0]['to'],$oldmovement[0]['from'],$newid,$end);
$database->addMovement(6,$oldmovement[0]['to'],$oldmovement[0]['from'],$newid,$oldmovement[0]['strattime'],$end);
}
}
header("Location: ".$_SERVER['PHP_SELF']."?id=".$_GET['id']);