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

update automation.php (need to test somthing later) + now you need 2 presses to send resources in marketplace

Browse Source
This commit is contained in:
unknown
2012-04-29 22:40:21 +03:00
parent 549f232663
commit b77a09bcdc
3 changed files with 122 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+4 -4
View File
@@ -385,7 +385,7 @@ private function loyaltyRegeneration() {
$needDelete = $database->getNeedDelete();
if(count($needDelete) > 0) {
foreach($needDelete as $need) {
$needVillage = $database->getVillagesID($need['uid']); //wref
$needVillage = $database->getVillagesID($need['uid']);
foreach($needVillage as $village) {
$q = "DELETE FROM ".TB_PREFIX."abdata where wref = ".$village;
$database->query($q);
@@ -409,7 +409,7 @@ private function loyaltyRegeneration() {
$database->query($q);
$q = "DELETE FROM ".TB_PREFIX."units where vref =".$village;
$database->query($q);
$q = "DELETE FROM ".TB_PREFIX."vdata where owner = ".$village;
$q = "DELETE FROM ".TB_PREFIX."vdata where vref = ".$village;
$database->query($q);
$q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = ".$village;
$database->query($q);
@@ -1331,8 +1331,8 @@ ${dead.$i}=$data['t'.$i];
{
if ($catp!='0')
{
$villpop=$this->recountPop($data['to']);
if($villpop<=0)
$pop=$this->recountPop($data['to']);
if($pop<=0)
{
$info_cat = ",".$catp_pic.", Village already destroyed.";
}
GameEngine/Database/db_MYSQL.php
+8 -9
View File
@@ -114,7 +114,7 @@
return $this->mysql_fetch_all($result);
}
function getVilWref($x, $y) {
function getVilWref($x, $y) {
$q = "SELECT * FROM " . TB_PREFIX . "wdata where x = $x AND y = $y";
$result = mysql_query($q, $this->connection);
$dbarray = mysql_fetch_array($result);
@@ -299,8 +299,8 @@ function getVilWref($x, $y) {
}
}
function generateBase($sector) {
switch($sector) {
function generateBase($sector) {
switch($sector) {
case 1:
$q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and x < 0 and y > 0 and occupied = 0";
break;
@@ -313,13 +313,13 @@ function getVilWref($x, $y) {
case 4:
$q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and x > 0 and y < 0 and occupied = 0";
break;
}
}
$result = mysql_query($q, $this->connection);
$num_rows = mysql_num_rows($result);
$result = $this->mysql_fetch_all($result);
$base = rand(0, ($num_rows-1));
return $result[$base]['id'];
}
}
function setFieldTaken($id) {
$q = "UPDATE " . TB_PREFIX . "wdata set occupied = 1 where id = $id";
@@ -883,21 +883,20 @@ function getVilWref($x, $y) {
return mysql_query($q, $this->connection);
}
function getVillageType2($wref) {
function getVillageType2($wref) {
$q = "SELECT * FROM " . TB_PREFIX . "wdata where id = $wref";
//$q = "SELECT * FROM " . TB_PREFIX . "units where id = $wref";
$result = mysql_query($q, $this->connection);
$dbarray = mysql_fetch_array($result);
return $dbarray['oasistype'];
}
function getFLData($id) {
function getFLData($id) {
$q = "SELECT * FROM " . TB_PREFIX . "farmlist where id = $id";
$result = mysql_query($q, $this->connection);
return mysql_fetch_array($result);
}
function checkVilExist($wref) {
function checkVilExist($wref) {
$q = "SELECT * FROM " . TB_PREFIX . "vdata where wref = '$wref'";
$result = mysql_query($q, $this->connection);
if(mysql_num_rows($result)) {
Templates/Build/17.tpl
+110 -6
View File
@@ -12,8 +12,98 @@
var haendler = <?php echo $market->merchantAvail(); ?>;
var carry = <?php echo $market->maxcarry; ?>;
//-->
</script><form method="POST" name="snd" action="build.php">
</script>
<?php
$allres = "".$_POST['r1']."+".$_POST['r2']."+".$_POST['r3']."+".$_POST['r4']."";
if($_POST['x']!="" && $_POST['y']!=""){
$getwref = $database->getVilWref($_POST['x'],$_POST['y']);
$checkexist = $database->checkVilExist($getwref);
}
else if($_POST['dname']!=""){
$getwref = $database->getVillageByName($_POST['dname']);
$checkexist = $database->checkVilExist($getwref);
}
if(isset($_POST['ft'])=='check' && $allres!=0 && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist){
?>
<form method="POST" name="snd" action="build.php">
<input type="hidden" name="ft" value="mk1">
<input type="hidden" name="id" value="<?php echo $id; ?>">
<input type="hidden" name="x" value="<?php echo $_POST['x']; ?>">
<input type="hidden" name="y" value="<?php echo $_POST['y']; ?>">
<table id="send_select" class="send_res" cellpadding="1" cellspacing="1">
<tr>
<td class="ico"><img class="r1" src="img/x.gif" alt="Fa" title="Fa" /></td>
<td class="nam"> Wood</td>
<td class="val"><input class="text disabled" type="text" name="r1" id="r1" value="<?php echo $_POST['r1']; ?>" readonly="readonly"></td>
<td class="max"> / <span class="none"><B><?php echo $market->maxcarry; ?></B></span> </td>
</tr>
<tr>
<td class="ico"><img class="r2" src="img/x.gif" alt="Agyag" title="Agyag" /></td>
<td class="nam"> Clay</td>
<td class="val"><input class="text disabled" type="text" name="r2" id="r2" value="<?php echo $_POST['r2']; ?>" readonly="readonly"></td>
<td class="max"> / <span class="none"><b><?php echo$market->maxcarry; ?></b></span> </td>
</tr>
<tr>
<td class="ico"><img class="r3" src="img/x.gif" alt="Vas?rc" title="Vas?rc" /></td>
<td class="nam"> Iron</td>
<td class="val"><input class="text disabled" type="text" name="r3" id="r3" value="<?php echo $_POST['r3']; ?>" readonly="readonly">
</td>
<td class="max"> / <span class="none"><b><?php echo $market->maxcarry; ?></b></span> </td>
</tr>
<tr>
<td class="ico"><img class="r4" src="img/x.gif" alt="B?za" title="B?za" /></td>
<td class="nam"> Wheat</td>
<td class="val"> <input class="text disabled" type="text" name="r4" id="r4" value="<?php echo $_POST['r4']; ?>" readonly="readonly">
</td>
<td class="max"> / <span class="none"><B><?php echo $market->maxcarry; ?></B></span></td>
</tr></table>
<table id="target_validate" class="res_target" cellpadding="1" cellspacing="1">
<tbody><tr>
<th>Coordinates:</th>
<?php
if($_POST['x']!="" && $_POST['y']!=""){
$getwref = $database->getVilWref($_POST['x'],$_POST['y']);
$getvilname = $database->getVillageField($getwref, "name");
$getvilowner = $database->getVillageField($getwref, "owner");
$getvilcoor['y'] = $_POST['y'];
$getvilcoor['x'] = $_POST['x'];
}
else if($_POST['dname']!=""){
$getwref = $database->getVillageByName($_POST['dname']);
$getvilcoor = $database->getCoor($getwref);
$getvilname = $database->getVillageField($getwref, "name");
$getvilowner = $database->getVillageField($getwref, "owner");
}
?>
<td><?php echo $getvilname; ?>(<?php echo $getvilcoor['y']; ?>|<?php echo $getvilcoor['x']; ?>)<span class="clear"></span></td>
</tr>
<tr>
<th>Player:</th>
<td><a href="spieler.php?uid=<?php echo $getvilowner; ?>"><?php echo $database->getUserField($getvilowner,username,0); ?></a></td>
</tr>
<tr>
<th>duration:</th>
<td>-</td>
</tr>
<tr>
<th>Merchants:</th>
<td><?php
$resource = array($_POST['r1'],$_POST['r2'],$_POST['r3'],$_POST['r4']);
echo ceil((array_sum($resource)-0.1)/$market->maxcarry); ?></td>
</tr>
<tr>
<td colspan="2">
</td>
</tr>
</tbody></table>
<div class="clear"></div>
<p>
<div class="clear"></div><p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" tabindex="8" alt="OK" <?php if(!$market->merchantAvail()) { echo "DISABLED"; }?>/></p></form>
<?php }else{ ?>
<form method="POST" name="snd" action="build.php">
<input type="hidden" name="ft" value="check">
<input type="hidden" name="id" value="<?php echo $id; ?>">
<table id="send_select" class="send_res" cellpadding="1" cellspacing="1"><tr>
<td class="ico">
@@ -97,11 +187,25 @@ $coor['y'] = "";
</td>
</tr>
</table>
<div class="clear"></div><p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" tabindex="8" alt="OK" <?php if(!$market->merchantAvail()) { echo "DISABLED"; }?>/></form></p><script language="JavaScript" type="text/javascript">
//<!--
document.snd.r1.focus();
//-->
</script>
<div class="clear"></div><p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" tabindex="8" alt="OK" <?php if(!$market->merchantAvail()) { echo "DISABLED"; }?>/></p></form>
<?php
$error = '';
if(isset($_POST['ft'])=='check'){
if(!$checkexist){
$error = '<span class="error"><b>No Coordinates selected</b></span>';
}elseif($_POST['r1']==0){
$error = '<span class="error"><b>Resources not selected.</b></span>';
}elseif(!$_POST['x'] && !$_POST['y'] && !$_POST['dname']){
$error = '<span class="error"><b>Enter the coordinates.</b></span>';
}elseif($_POST['x']==0 && $_POST['y']==0 && !$_POST['dname']){
$error = '<span class="error"><b>Enter the coordinates.</b></span>';
}
echo $error;
}
?>
<p>
<?php } ?>
<p>Each merchant can carry <b><?php echo $market->maxcarry; ?></b> units of resource</p>
<?php
$timer = 1;