This commit is contained in:
unknown
2012-09-22 23:12:00 +03:00
parent b503ddf56a
commit 9a44851cec
5 changed files with 9 additions and 10 deletions
+5 -6
View File
@@ -145,7 +145,7 @@ class Automation {
public function Automation() { public function Automation() {
$this->procClimbers();
$this->ClearUser(); $this->ClearUser();
$this->ClearInactive(); $this->ClearInactive();
$this->oasisResoucesProduce(); $this->oasisResoucesProduce();
@@ -1587,8 +1587,7 @@ class Automation {
$heroxp = $totaldead_def; $heroxp = $totaldead_def;
$database->modifyHeroXp("experience",$heroxp,$from['owner']); $database->modifyHeroXp("experience",$heroxp,$from['owner']);
} }
$Defender1 = $database->getUnit($to['wref']); if($Defender['hero'] > 0){
if($Defender1['hero'] > 0){
$defheroxp = $totaldead_att; $defheroxp = $totaldead_att;
$database->modifyHeroXp("experience",$defheroxp,$toF['owner']); $database->modifyHeroXp("experience",$defheroxp,$toF['owner']);
} }
@@ -2657,8 +2656,8 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
} }
} }
$database->setMovementProc($data['moveid']);
if($chiefing_village != 1 && $village_destroyed != 1){ if($chiefing_village != 1 && $village_destroyed != 1){
$database->setMovementProc($data['moveid']);
$database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],time(),$endtime); $database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],time(),$endtime);
// send the bounty on type 6. // send the bounty on type 6.
if($type !== 1) if($type !== 1)
@@ -2720,6 +2719,7 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
foreach($getmovement as $movedata) { foreach($getmovement as $movedata) {
$time = time(); $time = time();
$time2 = $time - $movedata['starttime']; $time2 = $time - $movedata['starttime'];
$database->setMovementProc($data['moveid']);
$database->addMovement(4,$movedata['to'],$movedata['from'],$movedata['ref'],$time,$time+$time2); $database->addMovement(4,$movedata['to'],$movedata['from'],$movedata['ref'],$time,$time+$time2);
$database->setMovementProc($movedata['moveid']); $database->setMovementProc($movedata['moveid']);
} }
@@ -2869,7 +2869,6 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
,$totaldead_def ,$totaldead_def
,$unitsdead_att_check ,$unitsdead_att_check
,$totalattackdead ,$totalattackdead
,$Defender1
,$enforce1 ,$enforce1
,$defheroowner ,$defheroowner
,$enforceowner ,$enforceowner
@@ -3838,7 +3837,7 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
foreach($harray as $hdata){ foreach($harray as $hdata){
if((time()-$hdata['lastupdate'])>=1){ if((time()-$hdata['lastupdate'])>=1){
if($hdata['health']<100 and $hdata['health']>0){ if($hdata['health']<100 and $hdata['health']>0){
$reg = $hdata['health']+$hdata['regeneration']*5*ceil(SPEED/10)/86400*(time()-$hdata['lastupdate']); $reg = $hdata['health']+$hdata['regeneration']*5*SPEED/86400*(time()-$hdata['lastupdate']);
if($reg <= 100){ if($reg <= 100){
$database->modifyHero("health",$reg,$hdata['heroid']); $database->modifyHero("health",$reg,$hdata['heroid']);
}else{ }else{
+1 -1
View File
@@ -22,7 +22,7 @@ if (mysql_num_rows($MyGold)) {
if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) {
if($golds['b2'] == 0) { if($golds['b2'] == 0) {
mysql_query("UPDATE ".TB_PREFIX."users set b2 = ('".time()."')+".PLUS_PRODUCTION." where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b2 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} else { } else {
mysql_query("UPDATE ".TB_PREFIX."users set b2 = '".($golds['b2']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b2 = '".($golds['b2']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} }
+1 -1
View File
@@ -22,7 +22,7 @@ if (mysql_num_rows($MyGold)) {
if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) {
if($golds['b3'] == 0) { if($golds['b3'] == 0) {
mysql_query("UPDATE ".TB_PREFIX."users set b3 = ('".time()."')+".PLUS_PRODUCTION." where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b3 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} else { } else {
mysql_query("UPDATE ".TB_PREFIX."users set b3 = '".($golds['b3']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b3 = '".($golds['b3']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} }
+1 -1
View File
@@ -22,7 +22,7 @@ if (mysql_num_rows($MyGold)) {
if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) {
if($golds['b4'] == 0) { if($golds['b4'] == 0) {
mysql_query("UPDATE ".TB_PREFIX."users set b4 = ('".time()."')+".PLUS_PRODUCTION." where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b4 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} else { } else {
mysql_query("UPDATE ".TB_PREFIX."users set b4 = '".($golds['b4']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b4 = '".($golds['b4']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} }
+1 -1
View File
@@ -22,7 +22,7 @@ if (mysql_num_rows($MyGold)) {
if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) {
if($golds['b1'] == 0) { if($golds['b1'] == 0) {
mysql_query("UPDATE ".TB_PREFIX."users set b1 = ('".time()."')+".PLUS_PRODUCTION." where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b1 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} else { } else {
mysql_query("UPDATE ".TB_PREFIX."users set b1 = '".($golds['b1']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error()); mysql_query("UPDATE ".TB_PREFIX."users set b1 = '".($golds['b1']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysql_error());
} }