![\"Trap\"](\"".GP_LOCATE."img/u/98.gif\" "\\"Trap\\"")
";
$p_username = $database->getUserField($from['owner'], "username", 0);
if($mytroops > 0 && $anothertroops > 0){
- $info_trap = "".$trapper_pic." ".$p_username." released ".$mytroops." from his troops and ".$anothertroops." friendly troops.";
+ $info_trap = "".$trapper_pic." ".$p_username." freed ".$mytroops." from his troops".$ownDeadsText." and ".$anothertroops." friendly troops".$anotherDeadsText.".";
}elseif($mytroops > 0){
- $info_trap = "".$trapper_pic." ".$p_username." released ".$mytroops." from his troops.";
+ $info_trap = "".$trapper_pic." ".$p_username." freed ".$mytroops." from his troops".$ownDeadsText.".";
}elseif($anothertroops > 0){
- $info_trap = "".$trapper_pic." ".$p_username." released ".$anothertroops." friendly troops.";
+ $info_trap = "".$trapper_pic." ".$p_username." freed ".$anothertroops." friendly troops".$anotherDeadsText.".";
}
}
}
@@ -2681,15 +2689,11 @@ class Automation {
$database->addNotice($from['owner'],$to['wref'],$ownally,3,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime);
}
}
- if($type == 3 or $type == 4){
- $database->addGeneralAttack($totalattackdead);
- }
+ if($type == 3 || $type == 4) $database->addGeneralAttack($totalattackdead);
if (!isset($village_destroyed)) $village_destroyed = 0;
- if ($village_destroyed == 1 && $can_destroy==1) {
- $this->DelVillage($data['to']);
- }
+ if ($village_destroyed == 1 && $can_destroy == 1) $this->DelVillage($data['to']);
}else{
//units attack string for battleraport
$unitssend_att1 = ''.$data['t1'].','.$data['t2'].','.$data['t3'].','.$data['t4'].','.$data['t5'].','.$data['t6'].','.$data['t7'].','.$data['t8'].','.$data['t9'].','.$data['t10'].'';
@@ -2709,22 +2713,8 @@ class Automation {
$database->addNotice($to['owner'], $to['wref'], $targetally, 23,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'', $data2, $time);
}
- //check if not natar tribe
- $getvillage = $database->getVillage($to['wref']);
- if ($getvillage['owner']!=3) {
- $crop = $database->getCropProdstarv($to['wref'], false);
- $unitarrays = $this->getAllUnits($to['wref'], false);
- $village_upkeep = $getvillage['pop'] + $this->getUpkeep($unitarrays, 0);
- $starv = $getvillage['starv'];
-
- if ($crop < $village_upkeep){
- // add starv data
- $database->setVillageField($to['wref'], 'starv', $village_upkeep);
- if($starv==0)
- $database->setVillageField($to['wref'], 'starvupdate', time());
- }
- unset($crop,$unitarrays,$getvillage,$village_upkeep);
- }
+ //Update starvation data
+ $this->addStarvationData($to['wref']);
//Returning units back to village is not necessary because it will be taken care when processing movement
// Fix by AL-Kateb
@@ -2986,13 +2976,12 @@ class Automation {
$owntribe = $database->getUserField($AttackerID,"tribe",0);
//check to see if we're sending a hero between own villages and there's a Mansion at target village
- $HeroTransfer=0;
- $troopsPresent=0;
+ $HeroTransfer = $troopsPresent = 0;
if($data['t11'] != 0) {
if($AttackerID == $DefenderID) {
// only add hero if we're sending him alone
if (
- ($this->getTypeLevel(37,$data['to']) > 0) &&
+ ($this->getTypeLevel(37, $data['to']) > 0) &&
($data['t1'] == 0) &&
($data['t2'] == 0) &&
($data['t3'] == 0) &&
@@ -3005,21 +2994,23 @@ class Automation {
($data['t10'] == 0)
) {
//don't reinforce, addunit instead
- $database->modifyUnit($data['to'],array("hero"),array(1),array(1));
+ $database->modifyUnit($data['to'], ["hero"], [1], [1]);
$heroid = $database->getHeroField($DefenderID, 'heroid');
- $database->modifyHero("wref",$data['to'],$heroid,0);
+ $database->modifyHero("wref", $data['to'], $heroid, 0);
$HeroTransfer = 1;
}
}
}
- for($i=1;$i<=10;$i++) {
- if($data['t'.$i]>0) {
- $troopsPresent = 1; break;
+
+ for($i = 1;$i <= 10; $i++) {
+ if($data['t'.$i] > 0) {
+ $troopsPresent = 1;
+ break;
}
}
if($data['t11'] != 0 || $troopsPresent) {
- $temphero=$data['t11'];
+ $temphero = $data['t11'];
if ($HeroTransfer) $data['t11'] = 0;
//check if there is defence from town in to town
$check = $database->getEnforce($data['to'], $data['from']);
@@ -3059,26 +3050,15 @@ class Automation {
$movementProcIDs[] = $data['moveid'];
}
- $crop = $database->getCropProdstarv($data['to']);
- $unitarrays = $this->getAllUnits($data['to']);
- $village = $database->getVillage($data['to']);
- $upkeep = $village['pop'] + $this->getUpkeep($unitarrays, 0);
- $starv = $database->getVillageField($data['to'],"starv");
- if ($crop < $upkeep){
- // add starv data
- $database->setVillageField($data['to'], 'starv', $upkeep);
- if($starv==0){
- $database->setVillageField($data['to'], 'starvupdate', $time);
- }
- }
+ //Update starvation data
+ $this->addStarvationData($data['to']);
//check empty reinforcement in rally point
- $e_units='';
- for ($i=1; $i <= 50; $i++) {
- $e_units.='u'.$i.'=0 AND ';
- }
- $e_units.='hero=0';
- $q="DELETE FROM ".TB_PREFIX."enforcement WHERE ".$e_units." AND (vref=".(int) $data['to']." OR `from`=".(int) $data['to'].")";
+ $e_units = '';
+ for ($i = 1; $i <= 50; $i++) $e_units.= 'u'.$i.'= 0 AND ';
+
+ $e_units.= 'hero = 0';
+ $q = "DELETE FROM ".TB_PREFIX."enforcement WHERE ".$e_units." AND (vref=".(int) $data['to']." OR `from`=".(int) $data['to'].")";
$database->query($q);
}
@@ -3146,18 +3126,9 @@ class Automation {
);
$movementProcIDs[] = $data['moveid'];
- $crop = $database->getCropProdstarv($data['to']);
- $unitarrays = $this->getAllUnits($data['to']);
- $village = $database->getVillage($data['to']);
- $upkeep = $village['pop'] + $this->getUpkeep($unitarrays, 0);
- $starv = $database->getVillageField($data['to'],"starv");
- if ($crop < $upkeep){
- // add starv data
- $database->setVillageField($data['to'], 'starv', $upkeep);
- if($starv==0){
- $database->setVillageField($data['to'], 'starvupdate', $time);
- }
- }
+
+ //Update starvation data
+ $this->addStarvationData($data['to']);
// make sure we don't process duplicate movements until the big bad bug which inserts them into DB is fixed
$wavesData[$data['from'].$data['to'].$data['starttime'].$data['endtime']] = true;
@@ -3189,18 +3160,9 @@ class Automation {
$database->modifyResource($data['to'],$data['wood'],$data['clay'],$data['iron'],$data['crop'],1);
//$database->updateVillage($data['to']);
$movementProcIDs[] = $data['moveid'];
- $crop = $database->getCropProdstarv($data['to']);
- $unitarrays = $this->getAllUnits($data['to']);
- $village = $database->getVillage($data['to']);
- $upkeep = $village['pop'] + $this->getUpkeep($unitarrays, 0);
- $starv = $database->getVillageField($data['to'],"starv");
- if ($crop < $upkeep){
- // add starv data
- $database->setVillageField($data['to'], 'starv', $upkeep);
- if($starv==0){
- $database->setVillageField($data['to'], 'starvupdate', $time);
- }
- }
+
+ //Update starvation data
+ $this->addStarvationData($data['to']);
}
$database->setMovementProc(implode(', ', $movementProcIDs));
@@ -3352,7 +3314,7 @@ class Automation {
//Activate activable artifacts
foreach($inactiveArtifacts as $artifact){
- if($ownArtifacts['totals'] < 3) {
+ if($ownArtifacts['totals'] < 3){
if($artifact['size'] == 1){ //Village effect
$database->activateArtifact($artifact['id']);
$ownArtifacts['totals']++;
@@ -3379,7 +3341,7 @@ class Automation {
$ownArtifacts['small']--;
$ownArtifacts['totals']++;
- if($size == 2) $ownArtifacts['great']++;
+ if($artifact['size'] == 2) $ownArtifacts['great']++;
else $ownArtifacts['unique']++;
}
}
@@ -3413,18 +3375,12 @@ class Automation {
$sort_type = substr($data['tech'],0,1);
switch($sort_type) {
case "t":
- if (!isset($tdata[$data['vref']])) {
- $tdata[$data['vref']] = [];
- }
-
+ if (!isset($tdata[$data['vref']])) $tdata[$data['vref']] = [];
$tdata[$data['vref']][] = $data['tech'].' = 1';
break;
case "a":
case "b":
- if (!isset($abdata[$data['vref']])) {
- $abdata[$data['vref']] = [];
- }
-
+ if (!isset($abdata[$data['vref']])) $abdata[$data['vref']] = [];
$abdata[$data['vref']][] = $data['tech']." = ".$data['tech']." + 1";
break;
}
@@ -3489,38 +3445,38 @@ class Automation {
switch($oasis['type']) {
case 1:
case 2:
- $wood += 1;
+ $wood++;
break;
case 3:
- $wood += 1;
- $crop += 1;
+ $wood++;
+ $crop++;
break;
case 4:
case 5:
- $clay += 1;
+ $clay++;
break;
case 6:
- $clay += 1;
- $crop += 1;
+ $clay++;
+ $crop++;
break;
case 7:
case 8:
- $iron += 1;
+ $iron++;
break;
case 9:
- $iron += 1;
- $crop += 1;
+ $iron++;
+ $crop++;
break;
case 10:
case 11:
- $crop += 1;
+ $crop++;
break;
case 12:
$crop += 2;
break;
}
}
- return array($wood,$clay,$iron,$crop);
+ return [$wood, $clay, $iron, $crop];
}
function getAllUnits($base, $use_cache = true) {
@@ -3711,7 +3667,23 @@ class Automation {
$database->modifyOasisResource($bountywid, $nwood, $nclay, $niron, $ncrop, 1);
$database->updateOasis($bountywid);
}
+
+ private function bountyGetOWoodProd() {
+ return round(SPEED * 40);
+ }
+
+ private function bountyGetOClayProd() {
+ return round(SPEED * 40);
+ }
+
+ private function bountyGetOIronProd() {
+ return round(SPEED * 40);
+ }
+ private function bountyGetOCropProd() {
+ return round(SPEED * 40);
+ }
+
private function bountyGetWoodProd() {
global $bid1,$bid5,$session;
$wood = $sawmill = 0;
@@ -3735,22 +3707,6 @@ class Automation {
return round($wood);
}
- private function bountyGetOWoodProd() {
- return round(SPEED * 40);
- }
-
- private function bountyGetOClayProd() {
- return round(SPEED * 40);
- }
-
- private function bountyGetOIronProd() {
- return round(SPEED * 40);
- }
-
- private function bountyGetOCropProd() {
- return round(SPEED * 40);
- }
-
private function bountyGetClayProd() {
global $bid2,$bid6,$session;
$clay = $brick = 0;
@@ -3891,22 +3847,10 @@ class Automation {
if($train['amt'] - $trained <= 0) $database->trainUnit($train['id'], 0, 0, 0, 0, 1);
}
- if ($valuesUpdated) {
- call_user_func(get_class($database).'::clearUnitsCache');
- }
+ if ($valuesUpdated) call_user_func(get_class($database).'::clearUnitsCache');
- $crop = $database->getCropProdstarv($train['vref']);
- $unitarrays = $this->getAllUnits($train['vref']);
- $village = $database->getVillage($train['vref'], 0);
- $upkeep = $village['pop'] + $this->getUpkeep($unitarrays, 0);
- $starv = $database->getVillageField($train['vref'],"starv");
- if ($crop < $upkeep){
- // add starv data
- $database->setVillageField($train['vref'], 'starv', $upkeep);
- if($starv==0){
- $database->setVillageField($train['vref'], 'starvupdate', $time);
- }
- }
+ //Update starvation data
+ $this->addStarvationData($train['vref']);
}
}
if(file_exists("GameEngine/Prevention/training.txt")) {
@@ -3914,56 +3858,35 @@ class Automation {
}
}
- private function getsort_typeLevel($tid,$resarray) {
- global $village;
+ private function getsort_typeLevel($tid, $resarray) {
+ $keyholder = [];
- $keyholder = array();
-
- foreach(array_keys($resarray,$tid) as $key) {
- if(strpos($key,'t')) {
+ foreach(array_keys($resarray, $tid) as $key) {
+ if(strpos($key, 't')) {
$key = preg_replace("/[^0-9]/", '', $key);
array_push($keyholder, $key);
}
}
$element = count($keyholder);
-
if($element >= 2) {
-
if($tid <= 4) {
- $temparray = array();
+ $temparray = [];
- for($i=0;$i<=$element-1;$i++) {
- array_push($temparray,$resarray['f'.$keyholder[$i]]);
+ for($i = 0; $i <= $element - 1; $i++) {
+ array_push($temparray, $resarray['f'.$keyholder[$i]]);
}
foreach ($temparray as $key => $val) {
- if ($val == max($temparray))
- $target = $key;
+ if ($val == max($temparray)) $target = $key;
}
}
- else {
- /*for($i=0;$i<=$element-1;$i++) {
- //if($resarray['f'.$keyholder[$i]] != $this->getsort_typeMaxLevel($tid)) {
- // $target = $i;
- //}
- }
- */
- }
- }
- else if($element == 1) {
- $target = 0;
- }
- else {
- return 0;
}
+ else if($element == 1) $target = 0;
+ else return 0;
- if($keyholder[$target] != "") {
- return $resarray['f'.$keyholder[$target]];
- }
- else {
- return 0;
- }
+ if(!empty($keyholder[$target])) return $resarray['f'.$keyholder[$target]];
+ else return 0;
}
private function celebrationComplete() {
@@ -3983,7 +3906,7 @@ class Automation {
$user = $vil['owner'];
$cp = ($type == 1) ? 500 : 2000;
$database->clearCel($id);
- $database->setCelCp($user,$cp);
+ $database->setCelCp($user, $cp);
}
if(file_exists("GameEngine/Prevention/celebration.txt")) {
@@ -4032,7 +3955,7 @@ class Automation {
if ($level == 1) $clear = ",f".$vil['buildnumber']."t=0";
else $clear = "";
- if ($village->natar == 1 && $type == 40) $clear=""; //fix by ronix
+ if ($village->natar == 1 && $type == 40) $clear = ""; //fix by ronix
$q = "UPDATE ".TB_PREFIX."fdata SET f".$vil['buildnumber']."=".(($level - 1 >= 0) ? $level - 1 : 0).$clear." WHERE vref=".(int) $vil['vref'];
$database->query($q);
@@ -4077,35 +4000,26 @@ class Automation {
$lastUpdateTime = $timeNow;
$newHealth = -1;
- if((time()-$hdata['lastupdate'])>=1){
- if($hdata['health']<100 and $hdata['health']>0){
- if(SPEED <= 10){
- $speed = SPEED;
- }else if(SPEED <= 100){
- $speed = ceil(SPEED/10);
- }else{
- $speed = ceil(SPEED/100);
- }
+ if((time()-$hdata['lastupdate']) >= 1){
+ if($hdata['health'] < 100 and $hdata['health'] > 0){
+ if(SPEED <= 10) $speed = SPEED;
+ else if(SPEED <= 100) $speed = ceil(SPEED / 10);
+ else $speed = ceil(SPEED / 100);
- $reg = $hdata['health']+$hdata['regeneration']*5*$speed/86400*(time()-$hdata['lastupdate']);
+ $reg = $hdata['health'] + $hdata['regeneration'] * 5 * $speed / 86400 * (time() - $hdata['lastupdate']);
- if($reg <= 100){
- $newHealth = $reg;
- }else{
- $newHealth = 100;
- }
+ if($reg <= 100) $newHealth = $reg;
+ else $newHealth = 100;
}
}
$herolevel = $hdata['level'];
- $newLevel = -1;
+ $newLevel = - 1;
$scorePoints = false;
- for ($i = $herolevel+1; $i < 100; $i++){
+ for ($i = $herolevel + 1; $i < 100; $i++){
if($hdata['experience'] >= $hero_levels[$i]){
$newLevel = $i;
- if ($i < 99) {
- $scorePoints = true;
- }
+ if ($i < 99) $scorePoints = true;
}
}
@@ -4174,9 +4088,7 @@ class Automation {
$lastUpdateIDs[] = $hdata['heroid'];
}
- if (count($columns)) {
- $database->modifyHero( $columns, $columnValues, $hdata['heroid'], $modes );
- }
+ if (count($columns)) $database->modifyHero($columns, $columnValues, $hdata['heroid'], $modes);
}
if (count($lastUpdateIDs)) {
@@ -4194,7 +4106,7 @@ class Automation {
private function updateStore() {
global $database, $bid10, $bid38, $bid11, $bid39;
- $result = mysqli_query($database->dblink,'SELECT * FROM `' . TB_PREFIX . 'fdata`');
+ $result = mysqli_query($database->dblink, 'SELECT * FROM `' . TB_PREFIX . 'fdata`');
mysqli_begin_transaction($database->dblink);
while ($row = mysqli_fetch_assoc($result))
@@ -4202,23 +4114,25 @@ class Automation {
$ress = $crop = 0;
for ($i = 19; $i < 40; ++$i)
{
+ //Warehouse
if ($row['f' . $i . 't'] == 10)
{
$ress += ((isset($bid10[$row['f' . $i]]) && isset($bid10[$row['f' . $i]]['attri'])) ? $bid10[$row['f' . $i]]['attri'] * STORAGE_MULTIPLIER : 0);
}
+ //Great warehouse
if ($row['f' . $i . 't'] == 38)
{
$ress += ((isset($bid38[$row['f' . $i]]) && isset($bid38[$row['f' . $i]]['attri'])) ? $bid38[$row['f' . $i]]['attri'] * STORAGE_MULTIPLIER : 0);
}
-
-
-
+
+ //Granary
if ($row['f' . $i . 't'] == 11)
{
$crop += ((isset($bid11[$row['f' . $i]]) && isset($bid11[$row['f' . $i]]['attri'])) ? $bid11[$row['f' . $i]]['attri'] * STORAGE_MULTIPLIER : 0);
}
-
+
+ //Great granary
if ($row['f' . $i . 't'] == 39)
{
$crop += ((isset($bid39[$row['f' . $i]]) && isset($bid39[$row['f' . $i]]['attri'])) ? $bid39[$row['f' . $i]]['attri'] * STORAGE_MULTIPLIER : 0);
@@ -4227,18 +4141,11 @@ class Automation {
// no need for update, since we didn't find any warehouses or granaries
// and maximums would have been set to correct values inside prune* functions already
- if ($ress == 0 && $crop == 0) {
- continue;
- }
+ if ($ress == 0 && $crop == 0) continue;
// maxstore nor maxcrop can go below the minimum threshold
- if ($ress < STORAGE_BASE) {
- $ress = STORAGE_BASE;
- }
-
- if ($crop < STORAGE_BASE) {
- $crop = STORAGE_BASE;
- }
+ if ($ress < STORAGE_BASE) $ress = STORAGE_BASE;
+ if ($crop < STORAGE_BASE) $crop = STORAGE_BASE;
mysqli_query($database->dblink,'UPDATE `' . TB_PREFIX . 'vdata` SET `maxstore` = ' . (int) $ress . ', `maxcrop` = ' . (int) $crop . ' WHERE `wref` = ' . (int) $row['vref']);
}
@@ -4309,12 +4216,12 @@ class Automation {
$array = $database->query_return($q);
foreach($array as $master) {
- $owner = $database->getVillageField($master['wid'],'owner');
- $tribe = $database->getUserField($owner,'tribe',0);
- $villwood = $database->getVillageField($master['wid'],'wood');
- $villclay = $database->getVillageField($master['wid'],'clay');
- $villiron = $database->getVillageField($master['wid'],'iron');
- $villcrop = $database->getVillageField($master['wid'],'crop');
+ $owner = $database->getVillageField($master['wid'], 'owner');
+ $tribe = $database->getUserField($owner, 'tribe', 0);
+ $villwood = $database->getVillageField($master['wid'], 'wood');
+ $villclay = $database->getVillageField($master['wid'], 'clay');
+ $villiron = $database->getVillageField($master['wid'], 'iron');
+ $villcrop = $database->getVillageField($master['wid'], 'crop');
$type = $master['type'];
$level = $master['level'];
$buildarray = $GLOBALS["bid".$type];
@@ -4322,10 +4229,9 @@ class Automation {
$buildclay = $buildarray[$level]['clay'];
$buildiron = $buildarray[$level]['iron'];
$buildcrop = $buildarray[$level]['crop'];
- $ww = count($database->getBuildingByType($master['wid'],40));
+ $ww = count($database->getBuildingByType($master['wid'], 40));
if($tribe == 1){
-
if($master['field'] < 19){
$dorf1Buildings = $database->getDorf1Building($master['wid']);
$bdata = count($dorf1Buildings);
@@ -4344,17 +4250,11 @@ class Automation {
$bdata1 = $dorf1Buildings;
}
- if($database->getUserField($owner,'plus',0) > time() or $ww > 0){
-
- if($bbdata < 2){
- $inbuild = 2;
- }else{
- $inbuild = 1;
- }
-
- }else{
- $inbuild = 1;
+ if($database->getUserField($owner, 'plus', 0) > time() || $ww > 0){
+ if($bbdata < 2) $inbuild = 2;
+ else $inbuild = 1;
}
+ else $inbuild = 1;
$usergold = $database->getUserField($owner,'gold',0);
@@ -4363,30 +4263,52 @@ class Automation {
if(!empty($bdata1)){
foreach($bdata1 as $master1) {
- $time += ($master1['timestamp']-time());
+ $time += ($master1['timestamp'] - time());
}
}
- if($bdata == 0){
- $database->updateBuildingWithMaster($master['id'],$time,0);
- }else{
- $database->updateBuildingWithMaster($master['id'],$time,1);
- }
+ if($bdata == 0) $database->updateBuildingWithMaster($master['id'], $time, 0);
+ else $database->updateBuildingWithMaster($master['id'], $time, 1);
- $gold = $usergold-1;
- $database->updateUserField($owner,'gold',$gold,1);
- $database->modifyResource($master['wid'],$buildwood,$buildclay,$buildiron,$buildcrop,0);
+ $database->updateUserField($owner, 'gold', --$usergold, 1);
+ $database->modifyResource($master['wid'], $buildwood, $buildclay, $buildiron, $buildcrop, 0);
}
}
}
- /************************************************
- Function for starvation - by brainiacX and Shadow
- Rework by ronix
- Refactored by iopietro
- References:
- ************************************************/
-
+ /**
+ * Adds the starvation data in villages with a negative value of crop
+ *
+ * @param int $wref The village ID where the crop is negative
+ */
+
+ private function addStarvationData($wref){
+ global $database;
+
+ $getVillage = $database->getVillage($wref);
+
+ //Exlude Support, Nature, Natars, TaskMaster and Multihunter
+ if ($getVillage['owner'] > 5){
+ $crop = $database->getCropProdstarv($wref, false);
+ $unitArrays = $this->getAllUnits($wref, false);
+ $villageUpkeep = $getVillage['pop'] + $this->getUpkeep($unitArrays, 0);
+ $starv = $getVillage['starv'];
+
+ if ($crop < $villageUpkeep){
+
+ //Add starvation data
+ $database->setVillageField($wref, 'starv', $villageUpkeep);
+ $database->setVillageFields($wref, ['starv', 'starvupdate'], [$villageUpkeep, time()]);
+ }
+ }
+ }
+
+ /**
+ * Function for starvation - by brainiacX and Shadow
+ * Rework by ronix
+ * Refactored by iopietro
+ */
+
//TODO: This function needs to be splitted in many subfunctions (for TravianZ refactor)
private function starvation() {
global $database, $autoprefix;
@@ -4404,23 +4326,9 @@ class Automation {
//update starvation in every village
$starvarray = $database->getProfileVillages(0, 7);
- foreach($starvarray as $starv)
- {
- $crop = $database->getCropProdstarv($starv['wref']);
- $unitArrays = $this->getAllUnits($starv['wref']);
- $villageUpkeep = $starv['pop'] + $this->getUpkeep($unitArrays, 0);
-
- if ($crop < $villageUpkeep)
- {
- // add starv data
- $database->setVillageFields($starv['wref'], ['starv', 'starvupdate'], [$villageUpkeep, time()]);
- }
-
- unset($crop, $unitArrays, $villageUpkeep);
- }
+ foreach($starvarray as $starv) $this->addStarvationData($starv['wref']);
// load villages with minus prod
-
$starvarray = [];
$starvarray = $database->getStarvation();
@@ -4560,8 +4468,13 @@ class Automation {
if($totalKilledUnits < $totalUnits)
{
$database->modifyPrisoners($starvingTroops['id'], array_keys($killedUnits), array_values($killedUnits), 0);
+ $database->modifyUnit($starvingTroops['wref'], ["99o"], [$totalKilledUnits], [0]);
+ }
+ else
+ {
+ $database->deletePrisoners($starvingTroops['id']);
+ $database->modifyUnit($starvingTroops['wref'], ["99o"], [$totalUnits], [0]);
}
- else $database->deletePrisoners($starvingTroops['id']);
break;
case 2:
@@ -4595,29 +4508,23 @@ class Automation {
}
}
- /************************************************
- Function for starvation - by brainiacX and Shadow
- Rework by ronix
- Refactored by iopietro
- References:
- ************************************************/
-
private function procNewClimbers() {
if(file_exists("GameEngine/Prevention/climbers.txt")) {
unlink("GameEngine/Prevention/climbers.txt");
}
global $database, $ranking;
+
$ranking->procRankArray();
$climbers = $ranking->getRank();
if(count($climbers) > 0){
$q = "SELECT week FROM ".TB_PREFIX."medal order by week DESC LIMIT 0, 1";
$result = mysqli_query($database->dblink,$q);
if(mysqli_num_rows($result)) {
- $row=mysqli_fetch_assoc($result);
- $week=($row['week']+1);
- } else {
- $week='1';
+ $row = mysqli_fetch_assoc($result);
+ $week = $row['week'] + 1;
}
+ else $week = 1;
+
$q = "SELECT id FROM ".TB_PREFIX."users where oldrank = 0 and id > 5";
$array = $database->query_return($q);
foreach($array as $user){
@@ -4662,6 +4569,7 @@ class Automation {
private function procClimbers($uid) {
global $database, $ranking;
+
$ranking->procRankArray();
$climbers = $ranking->getRank();
if(count($ranking->getRank()) > 0){
@@ -4669,10 +4577,10 @@ class Automation {
$result = mysqli_query($database->dblink,$q);
if(mysqli_num_rows($result)) {
$row = mysqli_fetch_assoc($result);
- $week = ($row['week'] + 1);
- } else {
- $week = 1;
+ $week = $row['week'] + 1;
}
+ else $week = 1;
+
$myrank = $ranking->getUserRank($uid);
if(isset($climbers[$myrank]['oldrank']) && $climbers[$myrank]['oldrank'] > $myrank){
for($i = $myrank + 1; $i <= $climbers[$myrank]['oldrank']; $i++) {
@@ -4779,23 +4687,20 @@ class Automation {
private function regenerateOasisTroops() {
global $database;
- $time = time();
- $time2 = NATURE_REGTIME;
- $timeFinal = $time - $time2;
+
+ $timeFinal = time() - NATURE_REGTIME;
$q = "SELECT wref FROM " . TB_PREFIX . "odata where conqured = 0 and lastupdated2 < $timeFinal";
$array = $database->query_return($q);
if (count($array)) {
$ids = [];
- foreach($array as $oasis) {
- $ids[] = $oasis['wref'];
- }
-
+ foreach($array as $oasis) $ids[] = $oasis['wref'];
$database->regenerateOasisUnits($ids, true);
}
}
public static function updateMax($leader) {
global $bid18, $database;
+
$q = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "alidata where leader = ". (int) $leader), MYSQLI_ASSOC);
if ($q['Total'] > 0) {
$villages = $database->getVillagesID2($leader);
@@ -4826,7 +4731,7 @@ class Automation {
}
private function checkReviveHero(){
- global $database,$session;
+ global $database, $session;
$herodata = $database->getHero($session->uid, 1);
if ($herodata[0]['dead'] == 1){
mysqli_query($database->dblink,"UPDATE " . TB_PREFIX . "units SET hero = 0 WHERE vref = ".(int) $session->villages[0]."");
@@ -4841,13 +4746,13 @@ class Automation {
}
}
- /************************************************
- Function for automate medals - by yi12345 and Shadow
- References:
- ************************************************/
-
+ /**
+ * Function for automate medals - by yi12345 and Shadow
+ *
+ */
+
function medals(){
- global $ranking,$database;
+ global $ranking, $database;
//we may give away ribbons
$giveMedal = false;
@@ -5370,11 +5275,6 @@ class Automation {
}
}
- /************************************************
- Function for automate medals - by yi12345 and Shadow
- References:
- ************************************************/
-
private function artefactOfTheFool() {
global $database;
$time = time();
diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index d2c3ffa5..a5e66b52 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -855,7 +855,7 @@ class MYSQLi_DB implements IDbConnection {
return $ret;
}
- // no n eed to cache this method
+ // no need to cache this method
function getSitee($uid) {
list($uid) = $this->escape_input((int) $uid);
@@ -6111,13 +6111,13 @@ References: User ID/Message ID, Mode
else{$unit = 'u' . $unit;}
++$i;
- //Fixed part of negativ troops (double troops) - by InCube
+ //Fixed part of negative troops (double troops) - by InCube
$array_amt[$i] = (int) $array_amt[$i] < 0 ? 0 : $array_amt[$i];
- //Fixed part of negativ troops (double troops) - by InCube
+ //Fixed part of negative troops (double troops) - by InCube
$units .= $unit.' = '.$unit.' '.(($array_mode[$i] == 1)? '+':'-').' '.($array_amt[$i] ? $array_amt[$i] : 0).(($number > $i+1) ? ', ' : '');
}
$q = "UPDATE ".TB_PREFIX."units set $units WHERE vref = $vref";
- return mysqli_query($this->dblink,$q);
+ return mysqli_query($this->dblink, $q);
}
function getEnforce($vid, $from, $use_cache = true) {
diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php
index 92a04c6a..e98a06c0 100755
--- a/GameEngine/Lang/en.php
+++ b/GameEngine/Lang/en.php
@@ -1003,19 +1003,20 @@ define("REQUIRED_LEVEL","Required level");
define("TIME_CONQUER","Time of conquer");
define("TIME_ACTIVATION","Time of activation");
define("FORMER_OWNER","Former owner(s)");
-define("BUILDING_STRONGER","building stronger with");
-define("BUILDING_WEAKER","building weaker with");
-define("TROOPS_FASTER","makes troops faster with");
-define("TROOPS_SLOWEST","makes troops slowest with");
-define("SPIES_INCREASE","spies increase ability with");
-define("SPIES_DECRESE","spies decrese ability with");
-define("CONSUME_LESS","all troops consume less with");
-define("CONSUME_HIGH","all troops consume high with");
-define("TROOPS_MAKE_FASTER","troops make faster with");
-define("TROOPS_MAKE_SLOWEST","troops make slowest with");
-define("YOU_CONSTRUCT","you can construct ");
-define("CRANNY_INCREASED","cranny capacity is increased by");
-define("CRANNY_DECRESE","cranny capacity is decrese by");
+define("BUILDING_STRONGER","Building stronger with");
+define("BUILDING_WEAKER","Building weaker with");
+define("TROOPS_FASTER","Makes troops faster with");
+define("TROOPS_SLOWEST","Makes troops slowest with");
+define("SPIES_INCREASE","Spies increase ability with");
+define("SPIES_DECRESE","Spies decrese ability with");
+define("CONSUME_LESS","All troops consume less with");
+define("CONSUME_HIGH","All troops consume high with");
+define("TROOPS_MAKE_FASTER","Troops make faster with");
+define("TROOPS_MAKE_SLOWEST","Troops make slowest with");
+define("YOU_CONSTRUCT","You can construct ");
+define("CRANNY_INCREASED","Cranny capacity is increased by");
+define("CRANNY_DECRESE","Cranny capacity is decrese by");
+define("WW_BUILDING_PLAN","You can build the Wonder of the World");
define("NO_PREVIOUS_OWNERS","There are no previous owners.");
define("TREASURY_DESC","The riches of your empire are kept in the treasury. The treasury has room for one treasure. After you have captured an artefact it takes 24 hours on a normal server or 12 hours on a thrice speed server to be effective.");
diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index 3695ecd3..3ba34a36 100755
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -507,7 +507,7 @@ class Technology {
return $database->getArtifactsValueInfluence($session->uid, $vid, 4, $upkeep);
}
- private function trainUnit($unit,$amt,$great=false) {
+ private function trainUnit($unit, $amt, $great = false) {
global $session, $database, ${'u'.$unit}, $building, $village, $bid19, $bid20, $bid21, $bid25, $bid26, $bid29, $bid30, $bid36, $bid41, $bid42;
if($this->getTech($unit) || $unit % 10 <= 1 || $unit == 99) {
@@ -557,36 +557,32 @@ class Technology {
$each = round(($bid19[$building->getTypeLevel(36)]['attri'] / 100) * ${'u'.$unit}['time'] / SPEED);
}
- if($unit%10 == 0 || $unit%10 == 9 && $unit != 99) {
- $slots = $database->getAvailableExpansionTraining();
- if($unit%10 == 0 && $slots['settlers'] <= $amt) { $amt = $slots['settlers']; }
- if($unit%10 == 9 && $slots['chiefs'] <= $amt) { $amt = $slots['chiefs']; }
+ if($unit % 10 == 0 || $unit % 10 == 9 && $unit != 99) {
+ $slots = $database->getAvailableExpansionTraining();
+ if($unit % 10 == 0 && $slots['settlers'] <= $amt) $amt = $slots['settlers'];
+ if($unit % 10 == 9 && $slots['chiefs'] <= $amt) $amt = $slots['chiefs'];
} else {
- if($unit != 99){
- if($this->maxUnit($unit,$great) < $amt) {
- $amt = 0;
- }
- }else{
- $trainlist = $this->getTrainingList(8);
- foreach($trainlist as $train) {
- $train_amt += $train['amt'];
+ if($unit != 99){
+ if($this->maxUnit($unit, $great) < $amt) $amt = 0;
+ }else{
+ $trainlist = $this->getTrainingList(8);
+
+ foreach($trainlist as $train) $train_amt += $train['amt'];
+
+ $max = 0;
+ for($i = 19; $i < 41; $i++){
+ if($village->resarray['f'.$i.'t'] == 36){
+ $max += $bid36[$village->resarray['f'.$i]]['attri']*TRAPPER_CAPACITY;
+ }
+ }
+ $max1 = $max - ($village->unitarray['u99'] + $train_amt);
+ if($max1 < $amt) $amt = 0;
+ }
}
- $max = 0;
- for($i=19;$i<41;$i++){
- if($village->resarray['f'.$i.'t'] == 36){
- $max += $bid36[$village->resarray['f'.$i]]['attri']*TRAPPER_CAPACITY;
- }
- }
- $max1 = $max - ($village->unitarray['u99'] + $train_amt);
- if($max1 < $amt) {
- $amt = 0;
- }
- }
- }
- $wood = ${'u'.$unit}['wood'] * $amt * ($great?3:1);
- $clay = ${'u'.$unit}['clay'] * $amt * ($great?3:1);
- $iron = ${'u'.$unit}['iron'] * $amt * ($great?3:1);
- $crop = ${'u'.$unit}['crop'] * $amt * ($great?3:1);
+ $wood = ${'u'.$unit}['wood'] * $amt * ($great ? 3 : 1);
+ $clay = ${'u'.$unit}['clay'] * $amt * ($great ? 3 : 1);
+ $iron = ${'u'.$unit}['iron'] * $amt * ($great ? 3 : 1);
+ $crop = ${'u'.$unit}['crop'] * $amt * ($great ? 3 : 1);
if($database->modifyResource($village->wid, $wood , $clay, $iron, $crop, 0) && $amt > 0) {
$database->trainUnit($village->wid, $unit + ($great ? 60 : 0), $amt, ${'u'.$unit}['pop'], $each, 0);
diff --git a/GameEngine/Units.php b/GameEngine/Units.php
index 1904e97f..8b4130b9 100755
--- a/GameEngine/Units.php
+++ b/GameEngine/Units.php
@@ -1,7 +1,4 @@
sendTroops($post);
- }else{
- $post = $this->loadUnits($post);
- return $post;
- }
- break;
-
+ if (isset($post['a'])&& $post['a']==533374){
+ $this->sendTroops($post);
+ }else{
+ $post = $this->loadUnits($post);
+ return $post;
+ }
+ break;
+
case "2":
- if (isset($post['a'])&& $post['a']==533374 && $post['disabled'] == ""){
- $this->sendTroops($post);
- }else{
- $post = $this->loadUnits($post);
- return $post;
- }
- break;
-
+ if (isset($post['a'])&& $post['a']==533374 && $post['disabled'] == ""){
+ $this->sendTroops($post);
+ }else{
+ $post = $this->loadUnits($post);
+ return $post;
+ }
+ break;
+
case "8":
- $this->sendTroopsBack($post);
- break;
-
+ $this->sendTroopsBack($post);
+ break;
+
case "3":
- if (isset($post['a'])&& $post['a']==533374 && $post['disabled'] == ""){
- $this->sendTroops($post);
- }else{
- $post = $this->loadUnits($post);
- return $post;
- }
- break;
-
+ if (isset($post['a']) && $post['a'] == 533374 && empty($post['disabled'])) $this->sendTroops($post);
+ else{
+ $post = $this->loadUnits($post);
+ return $post;
+ }
+ break;
+
case "4":
- if (isset($post['a'])&& $post['a']==533374){
- $this->sendTroops($post);
- }else{
- $post = $this->loadUnits($post);
- return $post;
- }
-
+ if (isset($post['a']) && $post['a'] == 533374) $this->sendTroops($post);
+ else{
+ $post = $this->loadUnits($post);
+ return $post;
+ }
+
case "5":
- if (isset($post['a']) && $post['a']== "new"){
- $this->Settlers($post);
- }else{
- $post = $this->loadUnits($post);
- return $post;
- }
- break;
+ if (isset($post['a']) && $post['a'] == "new") $this->Settlers($post);
+ else
+ {
+ $post = $this->loadUnits($post);
+ return $post;
+ }
}
}
}
+
private function loadUnits($post) {
global $database,$village,$session,$generator,$logging,$form;
// Search by town name
// Coordinates and look confirm name people
- if(isset($post['x']) && isset($post['y']) && $post['x'] != "" && $post['y'] != "") {
- $vid = $database->getVilWref($post['x'],$post['y']);
- unset($post['dname']);
- unset($_POST['dname']);
- }else if(isset($post['dname']) && $post['dname']!=""){
+ if(isset($post['x']) && isset($post['y']) && !empty($post['x']) && !empty($post['y'])) {
+ $vid = $database->getVilWref($post['x'], $post['y']);
+ unset($post['dname'], $_POST['dname']);
+ }else if(isset($post['dname']) && !empty($post['dname'])){
$vid = $database->getVillageByName(stripslashes($post['dname']));
}
if (!empty($vid)) {
if($database->isVillageOases($vid)){
$too = $database->getOasisField($vid,"conqured");
- if($too == 0){
- $disabledr ="disabled=disabled"; $disabled ="disabled=disabled";
- }else{
- $disabledr ="";
- if($session->sit == 0){
- $disabled ="";
- }else{
- $disabled ="disabled=disabled";
- }
+ if($too == 0) $disabled = $disabledr ="disabled=disabled";
+ else
+ {
+ $disabledr = "";
+ if($session->sit == 0) $disabled = "";
+ else $disabled ="disabled=disabled";
}
}else{
$too = $database->getVillage($vid);
if($too['owner'] == 3){
- $disabledr ="disabled=disabled"; $disabled ="";
+ $disabledr = "disabled=disabled";
+ $disabled = "";
}else{
- $disabledr ="";
- if($session->sit == 0){
- $disabled ="";
- }else{
- $disabled ="disabled=disabled";
- }
+ $disabledr = "";
+ if($session->sit == 0) $disabled = "";
+ else $disabled ="disabled=disabled";
}
}
}else{
- $disabledr ="";
- if($session->sit == 0){
- $disabled ="";
- }else{
- $disabled ="disabled=disabled";
- }
+ $disabledr = "";
+ if($session->sit == 0) $disabled = "";
+ else $disabled ="disabled=disabled";
}
if(!empty($disabledr) && $post['c'] == 2){
$form->addError("error","You can't reinforce this village/oasis");
@@ -134,8 +117,8 @@ class Units {
if($post['c'] < 2 || $post['c'] > 4) $form->addError("error", "Invalid attack type.");
- if(empty($post['t1']) && empty($post['t2']) && empty($post['t3']) && empty($post['t4']) && empty($post['t5']) &&
- empty($post['t6']) && empty($post['t7']) && empty($post['t8']) && empty($post['t9']) && empty($post['t10']) && empty($post['t11'])){
+ if(empty($post['t1']) && empty($post['t2']) && empty($post['t3']) && empty($post['t4']) && empty($post['t5']) &&
+ empty($post['t6']) && empty($post['t7']) && empty($post['t8']) && empty($post['t9']) && empty($post['t10']) && empty($post['t11'])){
$form->addError("error","You need to mark min. one troop");
}
@@ -143,31 +126,29 @@ class Units {
$form->addError("error","Insert name or coordinates");
}
- if(isset($post['dname']) && $post['dname'] != "") {
+ if(isset($post['dname']) && !empty($post['dname'])) {
$id = $database->getVillageByName(stripslashes($post['dname']));
- if (!isset($id)){
- $form->addError("error","Village do not exist");
- }else{
- $coor = $database->getCoor($id);
- }
+
+ if (!isset($id)) $form->addError("error","Village do not exist");
+ else $coor = $database->getCoor($id);
}
// People search by coordinates
// We confirm and seek coordinate coordinates Village
- if(isset($post['x']) && isset($post['y']) && $post['x'] != "" && $post['y'] != "") {
- $coor = array('x'=>$post['x'], 'y'=>$post['y']);
- $id = $generator->getBaseID($coor['x'],$coor['y']);
- if (!$database->getVillageState($id)){
- $form->addError("error","Coordinates do not exist");
- }
+ if(isset($post['x']) && isset($post['y']) && !empty($post['x']) && !empty($post['y'])) {
+ $coor = ['x' => $post['x'], 'y' => $post['y']];
+ $id = $generator->getBaseID($coor['x'], $coor['y']);
+
+ if (!$database->getVillageState($id)) $form->addError("error","Coordinates do not exist");
}
+
if (!empty($coor)) {
- if ($session->tribe == 1){$Gtribe = "";}elseif ($session->tribe == 2){$Gtribe = "1";}elseif ($session->tribe == 3){$Gtribe = "2";}elseif ($session->tribe == 4){$Gtribe = "3";}elseif ($session->tribe == 5){$Gtribe = "4";}
- for($i=1; $i<12; $i++){
+ $Gtribe = $session->tribe == 1 ? "" : $session->tribe - 1;
+ for($i = 1; $i < 12; $i++){
if(isset($post['t'.$i])){
- if ($i<10) $troophave=$village->unitarray['u'.$Gtribe.$i];
- if ($i==10)$troophave=$village->unitarray['u'.floor(intval($Gtribe)+1)*$i];
- if ($i==11)$troophave=$village->unitarray['hero'];
+ if ($i < 10) $troophave = $village->unitarray['u'.$Gtribe.$i];
+ if ($i == 10) $troophave = $village->unitarray['u'.floor(intval($Gtribe) + 1) * $i];
+ if ($i == 11) $troophave = $village->unitarray['hero'];
if (intval($post['t'.$i]) > $troophave){
$form->addError("error","You can't send more units than you have");
@@ -184,63 +165,61 @@ class Units {
}
}
}
- if (isset($id) && $database->isVillageOases($id) == 0) {
- if($database->hasBeginnerProtection($id)==1) {
- $form->addError("error","Player is under beginners protection. You can't attack him");
- }
-
- //check if banned/admin:
- $villageOwner = $database->getVillageField($id,'owner');
- $userAccess = $database->getUserField($villageOwner,'access',0);
- $userID = $database->getUserField($villageOwner,'id',0);
- if($userAccess == '0' or ($userAccess == MULTIHUNTER && $userID == 5) or (!ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN)){
- $form->addError("error","Player is Banned. You can't attack him");
- //break;
- }
- //check if vacation mode:
- if($database->getvacmodexy($id)){
- $form->addError("error","User is on vacation mode");
- //break;
- }
-
- //check if attacking same village that units are in
- if($id == $village->wid){
- $form->addError("error","You cant attack same village you are sending from.");
- //break;
- }
- // We process the array with the errors given in the form
- if($form->returnErrors() > 0) {
- $_SESSION['errorarray'] = $form->getErrors();
- $_SESSION['valuearray'] = $_POST;
- header("Location: a2b.php");
- exit;
- }else{
+
+ if(isset($id) && $database->isVillageOases($id) == 0) {
+ if($database->hasBeginnerProtection($id) == 1) {
+ $form->addError("error","Player is under beginners protection. You can't attack him");
+ }
+
+ //check if banned/admin:
+ $villageOwner = $database->getVillageField($id,'owner');
+ $userAccess = $database->getUserField($villageOwner,'access',0);
+ $userID = $database->getUserField($villageOwner,'id',0);
+ if($userAccess == 0 or ($userAccess == MULTIHUNTER && $userID == 5) or (!ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN)){
+ $form->addError("error","Player is Banned. You can't attack him");
+ //break;
+ }
+ //check if vacation mode:
+ if($database->getvacmodexy($id)){
+ $form->addError("error","User is on vacation mode");
+ //break;
+ }
+
+ //check if attacking same village that units are in
+ if($id == $village->wid){
+ $form->addError("error","You cant attack same village you are sending from.");
+ //break;
+ }
+ // We process the array with the errors given in the form
+ if($form->returnErrors() > 0) {
+ $_SESSION['errorarray'] = $form->getErrors();
+ $_SESSION['valuearray'] = $_POST;
+ header("Location: a2b.php");
+ exit;
+ }else{
// We must return an array with $ post, which contains all the data more
// another variable that will define the flag is raised and is being sent and the type of shipping
$villageName = $database->getVillageField($id,'name');
$speed= 300;
$timetaken = $generator->procDistanceTime($coor, $village->coor, INCREASE_SPEED, 1);
array_push($post, "$id", "$villageName", "$villageOwner","$timetaken");
- return $post;
-
+ return $post;
}
- }else{
-
- if($form->returnErrors() > 0) {
- $_SESSION['errorarray'] = $form->getErrors();
- $_SESSION['valuearray'] = $_POST;
- header("Location: a2b.php");
- exit;
- } else if (isset($id)) {
+ }else{
+ if($form->returnErrors() > 0) {
+ $_SESSION['errorarray'] = $form->getErrors();
+ $_SESSION['valuearray'] = $_POST;
+ header("Location: a2b.php");
+ exit;
+ } else if (isset($id)) {
$villageName = $database->getOasisField($id,"name");
$speed= 300;
$timetaken = $generator->procDistanceTime($coor, $village->coor, INCREASE_SPEED, 1);
array_push($post, "$id", "$villageName", "2","$timetaken");
return $post;
-
+
}
- }
-
+ }
}
public function returnTroops($wref, $mode = 0) {
@@ -683,6 +662,60 @@ class Units {
}
}
+ /**
+ * Function to kill/release prisoners
+ *
+ * @param int the ID of the prisoners you want to release
+ */
+
+ public function deletePrisoners($id){
+ global $village, $database, $session, $building, $bid19, $u99;
+
+ $prisoner = $database->getPrisonersByID($id);
+ $troops = 0;
+ if($prisoner['wref'] == $village->wid){
+ $p_owner = $database->getVillageField($prisoner['from'], "owner");
+ $p_tribe = $database->getUserField($p_owner, "tribe", 0);
+
+ $troopsTime = $this->getWalkingTroopsTime($prisoner['from'], $prisoner['wref'], $p_owner, $p_tribe, $prisoner, 1, 't');
+ $p_time = $database->getArtifactsValueInfluence($p_owner, $prisoner['from'], 2, $troopsTime);
+
+ $p_reference = $database->addAttack($prisoner['from'], $prisoner['t1'],$prisoner['t2'], $prisoner['t3'], $prisoner['t4'], $prisoner['t5'], $prisoner['t6'], $prisoner['t7'], $prisoner['t8'], $prisoner['t9'], $prisoner['t10'], $prisoner['t11'], 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ $database->addMovement(4, $prisoner['wref'], $prisoner['from'], $p_reference, time(), ($p_time + time()));
+
+ for($i = 1; $i <= 11; $i++) $troops += $prisoner['t'.$i];
+
+ //Reset traps
+ $database->modifyUnit($village->wid, ["99", "99o"], [$troops, $troops], [0, 0]);
+ $repairDuration = $database->getArtifactsValueInfluence($session->uid, $village->wid, 5, round(($bid19[max($building->getTypeLevel(36, $village->wid), 1)]['attri'] / 100) * $u99['time'] / SPEED));
+ $database->trainUnit($village->wid, 99, $troops, $u99['pop'], $repairDuration, 0);
+
+ $database->deletePrisoners($prisoner['id']);
+ }else if($prisoner['from'] == $village->wid){
+ $prisonersToOwner = $database->getVillageField($prisoner['wref'], "owner");
+
+ for($i = 1; $i <= 11; $i++) $troops += $prisoner['t'.$i];
+
+ if($prisoner['t11'] > 0){
+ $p_owner = $database->getVillageField($prisoner['from'], "owner");
+ mysqli_query($database->dblink, "UPDATE ".TB_PREFIX."hero SET `dead` = '1', `health` = '0' WHERE `uid` = '".$p_owner."' AND dead = 0");
+ }
+
+ //Reset traps
+ $database->modifyUnit($prisoner['wref'], ["99", "99o"], [$troops, $troops], [0, 0]);
+
+ if(($troops = round($troops / 3)) > 0){
+ $repairDuration = $database->getArtifactsValueInfluence($prisonersToOwner, $prisoner['wref'], 5, round(($bid19[max($building->getTypeLevel(36, $prisoner['wref']), 1)]['attri'] / 100) * $u99['time'] / SPEED));
+ $database->trainUnit($prisoner['wref'], 99, $troops, $u99['pop'], $repairDuration, 0);
+ }
+
+ $database->deletePrisoners($prisoner['id']);
+ }
+
+ header("Location: build.php?id=39");
+ exit;
+ }
+
/**
* Get how much time troops spend to walk from a village to another
*
diff --git a/Templates/Build/27_show.tpl b/Templates/Build/27_show.tpl
index 00281162..3fca5cab 100644
--- a/Templates/Build/27_show.tpl
+++ b/Templates/Build/27_show.tpl
@@ -52,7 +52,7 @@ switch($kind){
$betterorbadder = $artefactBadEffect ? SPIES_INCREASE : SPIES_DECRESE;
break;
}
-$bonus = isset($betterorbadder) ? $betterorbadder." (".str_replace(["(", ")"], "" , $effecty).")" : "Not yet active";
+$bonus = isset($betterorbadder) ? $betterorbadder." (".str_replace(["(", ")"], "" , $effecty).")" : (($kind == 11 && $artefact['active']) ? "".WW_BUILDING_PLAN."" : "Not yet active");
?>
diff --git a/Templates/Build/36.tpl b/Templates/Build/36.tpl
index 19628e4e..48348d4d 100644
--- a/Templates/Build/36.tpl
+++ b/Templates/Build/36.tpl
@@ -13,8 +13,7 @@ include("next.tpl");
20|0|getTimeFormat(round(($bid19[$village->resarray['f'.$id]]['attri'] / 100) * ${'u99'}['time'] / SPEED)); ?>
+ alt="Duration" title="" />
+ getTimeFormat($database->getArtifactsValueInfluence($session->uid, $village->wid, 5, round(($bid19[$village->resarray['f'.$id]]['attri'] / 100) * ${'u99'}['time'] / SPEED))); ?>
+
getTrainingList(8);
- foreach($trainlist as $train) {
- $train_amt += $train['amt'];
+ foreach($trainlist as $train) $train_amt += $train['amt'];
+
+ $max = $technology->maxUnit(99, false);
+ $max1 = 0;
+ for($i = 19; $i < 41; $i++){
+ if($village->resarray['f'.$i.'t'] == 36){
+ $max1 += $bid36[$village->resarray['f'.$i]]['attri'] * TRAPPER_CAPACITY;
+ }
+ }
+
+ if (!isset($train_amt)) $train_amt = 0;
+
+ if($max > $max1 - ($village->unitarray['u99'] + $train_amt)){
+ $max = $max1 - ($village->unitarray['u99'] + $train_amt);
}
- $max = $technology->maxUnit(99,false);
- $max1 = 0;
- for($i=19;$i<41;$i++){
- if($village->resarray['f'.$i.'t'] == 36){
- $max1 += $bid36[$village->resarray['f'.$i]]['attri']*TRAPPER_CAPACITY;
- }
- }
-
- if (!isset($train_amt)) {
- $train_amt = 0;
- }
-
- if($max > $max1 - ($village->unitarray['u99'] + $train_amt)){
- $max = $max1 - ($village->unitarray['u99'] + $train_amt);
- }
- if($max < 0){
- $max = 0;
- }
+ if($max < 0) $max = 0;
?>
\n"; } - if(count($trainlist) > 0) { + if(!empty($trainlist)) { echo "
";
echo "![\"".U99."\"](\"img/x.gif\" "\\"\".U99.\"\\"") ";
echo $train['amt']." ".U99." | "; - if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); - echo "".$generator->getTimeFormat($train['timestamp']-time()).""; - } else { - echo $generator->getTimeFormat($train['eachtime']*$train['amt']); - } + if ($TrainCount == 1) { + $NextFinished = $generator->getTimeFormat(($train['timestamp'] - time()) - ($train['amt'] - 1) * $train['eachtime']); + echo "".$generator->getTimeFormat($train['timestamp'] - time()).""; + } + else echo $generator->getTimeFormat($train['eachtime'] * $train['amt']); + echo " | "; $time = $generator->procMTime($train['timestamp']); - if($time[0] != "today") { - echo "on ".$time[0]." at "; - } + if($time[0] != "today") echo "on ".$time[0]." at "; echo $time[1]; } ?> |