diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 5ed31e90..e4a47343 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -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])); diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index b5b77469..36153004 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -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); } diff --git a/GameEngine/Units.php b/GameEngine/Units.php index 7f8bf64b..5765aa59 100644 --- a/GameEngine/Units.php +++ b/GameEngine/Units.php @@ -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) { diff --git a/Templates/Build/16_walking.tpl b/Templates/Build/16_walking.tpl index 9e796ef9..34056b1b 100644 --- a/Templates/Build/16_walking.tpl +++ b/Templates/Build/16_walking.tpl @@ -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='
'; - -}else{$canceltroops="";} ?> @@ -77,8 +71,10 @@ $canceltroops='
"; - ?> - + if (($units[$y]['starttime']+90)>time()){ + ?> +
">
+
@@ -141,8 +137,10 @@ $timer += 1; echo "on ".$datetime[0]." "; } echo "at ".$datetime[1].""; - ?> - + if (($units[$y]['starttime']+90)>time()){ + ?> +
">
+ diff --git a/build.php b/build.php index 63225a68..bef40b51 100644 --- a/build.php +++ b/build.php @@ -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']);