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

fix regenerate oasis troops (tested and it works)

Browse Source
This commit is contained in:
yi12345
2013-08-12 22:12:54 +03:00
parent 1e8d1e3dc2
commit 2075515208
3 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+2 -2
View File
@@ -4340,11 +4340,11 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
global $database;
$time = time();
$time2 = NATURE_REGTIME;
$q = "SELECT * FROM " . TB_PREFIX . "odata where conqured = 0 and $time - lastupdated2 > $time2";
$q = "SELECT * FROM " . TB_PREFIX . "odata where conqured = 0 and lastupdated2 + $time2 < $time";
$array = $database->query_return($q);
foreach($array as $oasis) {
$database->populateOasisUnits($oasis['wref'],$oasis['high']);
$database->updateOasis2($oasis['wref']);
$database->updateOasis2($oasis['wref'], $time2);
}
}
GameEngine/Database/db_MYSQL.php
+17 -13
View File
@@ -525,17 +525,21 @@ class MYSQL_DB {
}
function populateOasisUnits($wid, $high) {
$basearray = $this->getMInfo($wid);
$basearray = $this->getOasisInfo($wid);
if($basearray2['high'] == 0){
if($high == 0){
$max = rand(15,30);
}elseif($basearray2['high'] == 1){
$max = rand(70,90);
}elseif($basearray2['high'] == 2){
$max = rand(100,140);
}elseif($high == 1){
$max = rand(50,70);
}elseif($high == 2){
$max = rand(90,120);
}
$max2 = 0;
$rand = rand(0,3);
if($rand == 1){
$max2 = 3;
}
//each Troop is a Set for oasis type like mountains have rats spiders and snakes fields tigers elphants clay wolves so on stonger one more not so less
switch($basearray['oasistype']) {
switch($basearray['type']) {
case 1:
case 2:
//+25% lumber per hour
@@ -544,7 +548,7 @@ class MYSQL_DB {
break;
case 3:
//+25% lumber and +25% crop per hour
$q = "UPDATE " . TB_PREFIX . "units SET u35 = u35 + '".rand(0,5)."', u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u35 = u35 + '".rand(0,5)."', u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max." OR u40 <= ".$max.")";
$result = mysql_query($q, $this->connection);
break;
case 4:
@@ -555,7 +559,7 @@ class MYSQL_DB {
break;
case 6:
//+25% clay and +25% crop per hour
$q = "UPDATE " . TB_PREFIX . "units SET u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max." OR u40 <= ".$max.")";
$result = mysql_query($q, $this->connection);
break;
case 7:
@@ -566,7 +570,7 @@ class MYSQL_DB {
break;
case 9:
//+25% iron and +25% crop
$q = "UPDATE " . TB_PREFIX . "units SET u31 = u31 + '".rand(0,5)."', u32 = u32 + '".rand(0,5)."', u34 = u34 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u31 <= ".$max." OR u32 <= ".$max." OR u34 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u31 = u31 + '".rand(0,5)."', u32 = u32 + '".rand(0,5)."', u34 = u34 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u31 <= ".$max." OR u32 <= ".$max." OR u34 <= ".$max." OR u40 <= ".$max.")";
$result = mysql_query($q, $this->connection);
break;
case 10:
@@ -577,7 +581,7 @@ class MYSQL_DB {
break;
case 12:
//+50% crop per hour
$q = "UPDATE " . TB_PREFIX . "units SET u33 = u33 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u39 = u39 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u33 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u33 = u33 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u39 = u39 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u33 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max." OR u39 <= ".$max." OR u40 <= ".$max.")";
$result = mysql_query($q, $this->connection);
break;
}
@@ -1488,9 +1492,9 @@ class MYSQL_DB {
return mysql_query($q, $this->connection);
}
function updateOasis2($vid) {
function updateOasis2($vid, $time) {
$time = time();
$q = "UPDATE " . TB_PREFIX . "odata set lastupdated2 = $time where wref = $vid";
$q = "UPDATE " . TB_PREFIX . "odata set lastupdated2 = lastupdated2 + $time where wref = $vid";
return mysql_query($q, $this->connection);
}
GameEngine/Database/db_MYSQLi.php
+17 -13
View File
@@ -528,17 +528,21 @@ class MYSQLi_DB {
}
function populateOasisUnits($wid, $high) {
$basearray = $this->getMInfo($wid);
$basearray = $this->getOasisInfo($wid);
if($basearray2['high'] == 0){
if($high == 0){
$max = rand(15,30);
}elseif($basearray2['high'] == 1){
$max = rand(70,90);
}elseif($basearray2['high'] == 2){
$max = rand(100,140);
}elseif($high == 1){
$max = rand(50,70);
}elseif($high == 2){
$max = rand(90,120);
}
$max2 = 0;
$rand = rand(0,3);
if($rand == 1){
$max2 = 3;
}
//each Troop is a Set for oasis type like mountains have rats spiders and snakes fields tigers elphants clay wolves so on stonger one more not so less
switch($basearray['oasistype']) {
switch($basearray['type']) {
case 1:
case 2:
//+25% lumber per hour
@@ -547,7 +551,7 @@ class MYSQLi_DB {
break;
case 3:
//+25% lumber and +25% crop per hour
$q = "UPDATE " . TB_PREFIX . "units SET u35 = u35 + '".rand(0,5)."', u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u35 = u35 + '".rand(0,5)."', u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max." OR u40 <= ".$max.")";
$result = mysqli_query($this->connection, $q);
break;
case 4:
@@ -558,7 +562,7 @@ class MYSQLi_DB {
break;
case 6:
//+25% clay and +25% crop per hour
$q = "UPDATE " . TB_PREFIX . "units SET u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u36 = u36 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u36 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max." OR u40 <= ".$max.")";
$result = mysqli_query($this->connection, $q);
break;
case 7:
@@ -569,7 +573,7 @@ class MYSQLi_DB {
break;
case 9:
//+25% iron and +25% crop
$q = "UPDATE " . TB_PREFIX . "units SET u31 = u31 + '".rand(0,5)."', u32 = u32 + '".rand(0,5)."', u34 = u34 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u31 <= ".$max." OR u32 <= ".$max." OR u34 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u31 = u31 + '".rand(0,5)."', u32 = u32 + '".rand(0,5)."', u34 = u34 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u31 <= ".$max." OR u32 <= ".$max." OR u34 <= ".$max." OR u40 <= ".$max.")";
$result = mysqli_query($this->connection, $q);
break;
case 10:
@@ -580,7 +584,7 @@ class MYSQLi_DB {
break;
case 12:
//+50% crop per hour
$q = "UPDATE " . TB_PREFIX . "units SET u33 = u33 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u39 = u39 + '".rand(0,5)."' WHERE vref = '" . $wid . "' AND (u33 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max.")";
$q = "UPDATE " . TB_PREFIX . "units SET u33 = u33 + '".rand(0,5)."', u37 = u37 + '".rand(0,5)."', u38 = u38 + '".rand(0,5)."', u39 = u39 + '".rand(0,5)."', u40 = u40 + '".rand(0,$max2)."' WHERE vref = '" . $wid . "' AND (u33 <= ".$max." OR u37 <= ".$max." OR u38 <= ".$max." OR u39 <= ".$max." OR u40 <= ".$max.")";
$result = mysqli_query($this->connection, $q);
break;
}
@@ -1491,9 +1495,9 @@ class MYSQLi_DB {
return mysqli_query($this->connection, $q);
}
function updateOasis2($vid) {
function updateOasis2($vid, $time) {
$time = time();
$q = "UPDATE " . TB_PREFIX . "odata set lastupdated2 = $time where wref = $vid";
$q = "UPDATE " . TB_PREFIX . "odata set lastupdated2 = lastupdated2 + $time where wref = $vid";
return mysqli_query($this->connection, $q);
}