From ca3d9d399beef2f81373eed5ae10c0f673093235 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Apr 2012 02:50:48 +0300 Subject: [PATCH] fix 25% production bonus in plus and now scouts can send as reinforcement --- Templates/Plus/10.tpl | 11 +++-------- Templates/Plus/11.tpl | 11 +++-------- Templates/Plus/12.tpl | 11 +++-------- Templates/Plus/3.tpl | 20 -------------------- Templates/Plus/9.tpl | 11 +++-------- Templates/a2b/attack.tpl | 4 ++-- install/include/multihunter.php | 2 +- 7 files changed, 15 insertions(+), 55 deletions(-) diff --git a/Templates/Plus/10.tpl b/Templates/Plus/10.tpl index 63b48bfc..3e90e1e4 100644 --- a/Templates/Plus/10.tpl +++ b/Templates/Plus/10.tpl @@ -21,19 +21,14 @@ if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) { -if($golds['14'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b2 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} - - -if($golds['14'] == 0) { +if($golds['b2'] == 0) { mysql_query("UPDATE ".TB_PREFIX."users set b2 = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+".PLUS_PRODUCTION." where `username`='".$session->username."'") or die(mysql_error()); } else { -mysql_query("UPDATE ".TB_PREFIX."users set b2 = '".($golds['14']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); +mysql_query("UPDATE ".TB_PREFIX."users set b2 = '".($golds['b2']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); } -$done1 = "+25% Production: Clay"; +$done1 = "+25% Production: Clay"; mysql_query("UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `username`='".$session->username."'") or die(mysql_error()); mysql_query("INSERT INTO ".TB_PREFIX."gold_fin_log VALUES ('".(mysql_num_rows($goldlog)+1)."', '".$village->wid."', '+25% Production: Clay')") or die(mysql_error()); diff --git a/Templates/Plus/11.tpl b/Templates/Plus/11.tpl index 58811b6f..c0c95cad 100644 --- a/Templates/Plus/11.tpl +++ b/Templates/Plus/11.tpl @@ -21,19 +21,14 @@ if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) { -if($golds['15'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b3 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} - - -if($golds['15'] == 0) { +if($golds['b3'] == 0) { mysql_query("UPDATE ".TB_PREFIX."users set b3 = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+".PLUS_PRODUCTION." where `username`='".$session->username."'") or die(mysql_error()); } else { -mysql_query("UPDATE ".TB_PREFIX."users set b3 = '".($golds['15']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); +mysql_query("UPDATE ".TB_PREFIX."users set b3 = '".($golds['b3']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); } -$done1 = "+25% Production: Iron"; +$done1 = "+25% Production: Iron"; mysql_query("UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `username`='".$session->username."'") or die(mysql_error()); mysql_query("INSERT INTO ".TB_PREFIX."gold_fin_log VALUES ('".(mysql_num_rows($goldlog)+1)."', '".$village->wid."', '+25% Production: Iron')") or die(mysql_error()); diff --git a/Templates/Plus/12.tpl b/Templates/Plus/12.tpl index a0223b80..8903113f 100644 --- a/Templates/Plus/12.tpl +++ b/Templates/Plus/12.tpl @@ -21,19 +21,14 @@ if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) { -if($golds['16'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b4 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} - - -if($golds['16'] == 0) { +if($golds['b4'] == 0) { mysql_query("UPDATE ".TB_PREFIX."users set b4 = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+".PLUS_PRODUCTION." where `username`='".$session->username."'") or die(mysql_error()); } else { -mysql_query("UPDATE ".TB_PREFIX."users set b4 = '".($golds['16']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); +mysql_query("UPDATE ".TB_PREFIX."users set b4 = '".($golds['b4']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); } -$done1 = "+25% Production: Crop"; +$done1 = "+25% Production: Crop"; mysql_query("UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `username`='".$session->username."'") or die(mysql_error()); mysql_query("INSERT INTO ".TB_PREFIX."gold_fin_log VALUES ('".(mysql_num_rows($goldlog)+1)."', '".$village->wid."', '+25% Production: Crop')") or die(mysql_error()); diff --git a/Templates/Plus/3.tpl b/Templates/Plus/3.tpl index a330f4aa..fed9c886 100644 --- a/Templates/Plus/3.tpl +++ b/Templates/Plus/3.tpl @@ -3,26 +3,6 @@ $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `username`='".$session->username."'") or die(mysql_error()); $golds = mysql_fetch_array($MyGold); -if($golds['13'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b1 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} - -if($golds['14'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b2 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} -if($golds['15'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b3 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} - -if($golds['16'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b4 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} - - - - - - include("Templates/Plus/pmenu.tpl"); diff --git a/Templates/Plus/9.tpl b/Templates/Plus/9.tpl index af082be8..0f2df469 100644 --- a/Templates/Plus/9.tpl +++ b/Templates/Plus/9.tpl @@ -21,19 +21,14 @@ if (mysql_num_rows($MyGold)) { if (mysql_num_rows($MyGold)) { -if($golds['13'] <= time()) { -mysql_query("UPDATE ".TB_PREFIX."users set b1 = '0' where `username`='".$session->username."'") or die(mysql_error()); -} - - -if($golds['13'] == 0) { +if($golds['b1'] == 0) { mysql_query("UPDATE ".TB_PREFIX."users set b1 = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+".PLUS_PRODUCTION." where `username`='".$session->username."'") or die(mysql_error()); } else { -mysql_query("UPDATE ".TB_PREFIX."users set b1 = '".($golds['13']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); +mysql_query("UPDATE ".TB_PREFIX."users set b1 = '".($golds['b1']+PLUS_PRODUCTION)."' where `username`='".$session->username."'") or die(mysql_error()); } -$done1 = "+25% Production: Lumber"; +$done1 = "+25% Production: Lumber"; mysql_query("UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `username`='".$session->username."'") or die(mysql_error()); mysql_query("INSERT INTO ".TB_PREFIX."gold_fin_log VALUES ('".(mysql_num_rows($goldlog)+1)."', '".$village->wid."', '+25% Production: Lumber')") or die(mysql_error()); diff --git a/Templates/a2b/attack.tpl b/Templates/a2b/attack.tpl index b57aba94..b934a9f8 100644 --- a/Templates/a2b/attack.tpl +++ b/Templates/a2b/attack.tpl @@ -32,9 +32,9 @@ $ckey= $generator->generateRandStr(6); $totalunits =$process['t1']+$process['t2']+$process['t3']+$process['t5']+$process['t6']+$process['t7']+$process['t8']+$process['t9']+$process['t10']+$process['t11']; } if ($scout==1 && $totalunits==0) { - +if ($process['c'] != 2){ $process['c'] = 1; - +} } $id = $database->addA2b($ckey,time(),$process['0'],$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11,$process['c']); diff --git a/install/include/multihunter.php b/install/include/multihunter.php index ad0a914c..363f6c20 100644 --- a/install/include/multihunter.php +++ b/install/include/multihunter.php @@ -17,7 +17,7 @@ $status = $database->getVillageState($wid); if($status == 0) { $database->setFieldTaken($wid); - $database->addVillage($wid, $uid, 'Multihunter', '5'); + $database->addVillage($wid, $uid, 'Multihunter', '0'); $database->addResourceFields($wid, $database->getVillageType($wid)); $database->addUnits($wid); $database->addTech($wid);