Merge pull request #1 from Shadowss/master

refresh 05.12.2017
This commit is contained in:
Vladyslav
2017-12-05 11:08:19 +02:00
committed by GitHub
132 changed files with 4505 additions and 2407 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ if(isset($id))
$varray = $database->getProfileVillages($id);
$varmedal = $database->getProfileMedal($id); ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<style type="text/css">
input.dynamic_img, img.dynamic_img
{
+12 -13
View File
@@ -1,4 +1,4 @@
<?php
<?php
$noticeClass = array("Scout Report","Won as attacker without losses","Won as attacker with losses","Lost as attacker with losses","Won as defender without losses","Won as defender with losses","Lost as defender with losses","Lost as defender without losses","Reinforcement arrived","","Wood Delivered","Clay Delivered","Iron Delivered","Crop Delivered","","Won as defender without losses","Won as defender with losses","Lost as defender with losses","Won scouting as attacker","Lost scouting as attacker","Won scouting as defender","Lost scouting as defender","Scout Report");
?>
<form method="post" action="berichte.php" name="msg">
@@ -20,32 +20,32 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
<input class="check" type="checkbox" id="s10" name="s10" onclick="Allmsg(this.form);" />
<?php } ?></th>
<th class="buttons"><input name="del" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" value="delete" alt="delete" />
<?php if($session->plus) {
<?php if($session->plus) {
if(isset($_GET['t']) && $_GET['t'] == 5) {
echo "<input name=\"start\" type=\"image\" value=\"back\" alt=\"back\" id=\"btn_back\" class=\"dynamic_img\" src=\"img/x.gif\" />";
}
else {
echo "<input name=\"archive\" type=\"image\" value=\"Archive\" alt=\"Archive\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" />";
echo "<input name=\"archive\" type=\"image\" value=\"Archive\" alt=\"Archive\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" />";
}
}?>
</th>
<th class=navi>
<?php
<?php
if(!isset($_GET['s']) && count($rep1) < 10) {
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($rep1) > 10) {
echo "&laquo;<a href=\"?p=report&s=10&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?p=report&".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=10&o=0\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($rep1) > $_GET['s']) {
if(count($rep1) > ($_GET['s']+10) && $_GET['s']-10 < count($rep1) && $_GET['s'] != 0) {
echo "<a href=\"?p=report&s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?p=report&s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "<a href=\"?p=report&".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?p=report&".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else if(count($rep1) > $_GET['s']+10) {
echo "&laquo;<a href=\"?p=report&s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?p=report&".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else {
echo "<a href=\"?p=report&s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
echo "<a href=\"?p=report&".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
}
}
?>
@@ -53,7 +53,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
</tr>
</tfoot>
<tbody>
<?php
<?php
if(isset($_GET['s'])) {
$s = $_GET['s'];
@@ -61,7 +61,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
else {
$s = 0;
}
$name = 1;
$count = 0;
for($i=(1+$s);$i<=(10+$s);$i++) {
@@ -88,10 +88,9 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
}
if(count($rep1) == 0) {
echo "<td colspan=\"3\" class=\"none\">There are no reports available.</td></tr>";
}
}
?>
</tbody>
</table>
+11 -4
View File
@@ -16,10 +16,17 @@ if($_GET['aid'])
$aliusers = $database->getAllMember($_GET['aid']);
if($alidata and $aliusers)
{
foreach($aliusers as $member)
{
$totalpop += $database->getVSumField($member['id'],"pop");
} ?>
$memberIDs = [];
foreach($aliusers as $member) {
$memberIDs[] = $member['id'];
}
$data = $database->getVSumField($memberIDs,"pop");
if (count($data)) {
foreach ($data as $row) {
$totalpop += $row['Total'];
}
} ?>
<br>
<table id="profile" cellpadding="1" cellspacing="1">
+7 -7
View File
@@ -63,12 +63,12 @@ function refresh(tz) {
<option value="en" <?php if (LANG=="en") echo "selected";?>>English</option>
<option value="nl" <?php if (LANG=="nl") echo "selected";?>>Dutch</option>
<option value="es" <?php if (LANG=="es") echo "selected";?>>Spain</option>
<option value="my" <?php if (LANG=="my") echo "selected";?>>Malay</option>
<option value="rs" <?php if (LANG=="rs") echo "selected";?>>Serbian</option>
<option value="ru" <?php if (LANG=="ru") echo "selected";?>>Russian</option>
<option value="zh_tw" <?php if (LANG=="zh_tw") echo "selected";?>>Taiwan</option>
<option value="zh_tw" <?php if (LANG=="zh_tw") echo "selected";?>>Taiwanese</option>
</select>
</td>
</tr>
</tr>
<tr>
<td>Server Speed</td>
<td><input class="fm" name="speed" value="<?php echo SPEED;?>" style="width: 20%;"></td>
@@ -76,7 +76,7 @@ function refresh(tz) {
<tr>
<td>Troop Speed</td>
<td><input class="fm" name="incspeed" value="<?php echo INCREASE_SPEED;?>" style="width: 20%;"></td>
</tr>
</tr>
<td>Evasion Speed</td>
<td><input class="fm" name="evasionspeed" value="<?php echo EVASION_SPEED;?>" style="width: 20%;"></td>
</tr>
@@ -129,7 +129,7 @@ function refresh(tz) {
<option value="432000" <?php if (PROTECTION=="432000") echo "selected";?>>120 hours (5 days)</option>
</select>
</td>
</tr>
</tr>
<tr>
<td>Register Open</td>
<td>
@@ -148,7 +148,7 @@ function refresh(tz) {
</select>
</td>
</tr>
<tr>
<tr>
<td>Quest</td>
<td>
<select name="quest">
@@ -214,7 +214,7 @@ function refresh(tz) {
</select>
</td>
</tr>
<tr>
<tr>
<td>Tourn Threshold</td>
<td><input class="fm" name="ts_threshold" value="<?php echo TS_THRESHOLD;?>" style="width: 20%;"></td>
</tr>
+17 -1
View File
@@ -17,7 +17,7 @@ $fdata = $database->getResourceLevel($village['wref']);
if(isset($id))
{
include("search2.tpl"); ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<form action="../GameEngine/Admin/Mods/editBuildings.php" method="POST">
<input type="hidden" name="admid" id="admid" value="<?php echo $_SESSION['id']; ?>">
<input type="hidden" name="id" value="<?php echo $_GET['did']; ?>" />
@@ -171,6 +171,22 @@ if(isset($id))
{
echo "<img src=\"../img/x.gif\" class=\"dx1 g16e\">";
}
$resourcearray = $database->getResourceLevel($village['wref']);
if($resourcearray['f99t'] == 40) {
if($resourcearray['f99'] >= 0 && $resourcearray['f99'] <= 19) {
echo '<img class="ww g40" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 20 && $resourcearray['f99'] <= 39) {
echo '<img class="ww g40_1" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 40 && $resourcearray['f99'] <= 59) {
echo '<img class="ww g40_2" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 60 && $resourcearray['f99'] <= 79) {
echo '<img class="ww g40_3" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 80 && $resourcearray['f99'] <= 99) {
echo '<img class="ww g40_4" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] == 100) {
echo '<img class="ww g40_5" src="img/x.gif" alt="Worldwonder">'; }
}
?>
<div id="levels" class="on">
<?php
+1 -1
View File
@@ -12,7 +12,7 @@
<style>
.del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);}
</style>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<table id="member" style="width:225px">
<thead>
<tr>
+1 -1
View File
@@ -13,7 +13,7 @@ $msg = $database->getMessage($_GET['nid'],3);
if($msg)
{ ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>travian.css?e21d2" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css">
+1 -1
View File
@@ -98,7 +98,7 @@
else
{
$tsdiffact = $datetime - $now;
$timetoecho = $timeformat->getTimeFormat($tsdiffact);
$timetoecho = \App\Utils\DateTime::getTimeFormat($tsdiffact);
echo '<img src="../gpack/travian_default/img/new/tick.png" title="Ends: '.date('d.m.Y H:i',$user['protect']+3600*2).'">';
echo "<font color=\"blue\"> $timetoecho</font>";
}
+5 -5
View File
@@ -18,7 +18,7 @@
else
{
$tsdiffact = $datetime - $now;
$timetoecho = $timeformat->getTimeFormat($tsdiffact);
$timetoecho = \App\Utils\DateTime::getTimeFormat($tsdiffact);
echo '<img src="../gpack/travian_default/img/new/tick.png" title="Ends: '.date('d.m.Y H:i',$user['plus']+3600*2).'">';
echo "<font color=\"blue\"> $timetoecho</font>";
}
@@ -55,7 +55,7 @@
else
{
$tsdiffact = $datetime - $now;
$timetoecho = $timeformat->getTimeFormat($tsdiffact);
$timetoecho = \App\Utils\DateTime::getTimeFormat($tsdiffact);
echo '<img src="../gpack/travian_default/img/new/tick.png" title="Ends: '.date('d.m.Y H:i',$user['b1']+3600*2).'">';
echo "<font color=\"blue\"> $timetoecho</font>";
}
@@ -92,7 +92,7 @@
else
{
$tsdiffact = $datetime - $now;
$timetoecho = $timeformat->getTimeFormat($tsdiffact);
$timetoecho = \App\Utils\DateTime::getTimeFormat($tsdiffact);
echo '<img src="../gpack/travian_default/img/new/tick.png" title="Ends: '.date('d.m.Y H:i',$user['b2']+3600*2).'">';
echo "<font color=\"blue\"> $timetoecho</font>";
}
@@ -130,7 +130,7 @@
else
{
$tsdiffact = $datetime - $now;
$timetoecho = $timeformat->getTimeFormat($tsdiffact);
$timetoecho = \App\Utils\DateTime::getTimeFormat($tsdiffact);
echo '<img src="../gpack/travian_default/img/new/tick.png" title="Ends: '.date('d.m.Y H:i',$user['b3']+3600*2).'">';
echo "<font color=\"blue\"> $timetoecho</font>";
}
@@ -168,7 +168,7 @@
else
{
$tsdiffact = $datetime - $now;
$timetoecho = $timeformat->getTimeFormat($tsdiffact);
$timetoecho = \App\Utils\DateTime::getTimeFormat($tsdiffact);
echo '<img src="../gpack/travian_default/img/new/tick.png" title="Ends: '.date('d.m.Y H:i',$user['b4']+3600*2).'">';
echo "<font color=\"blue\"> $timetoecho</font>";
}
+2 -2
View File
@@ -22,7 +22,7 @@ if($rep1)
//$att = $database->getUserArray($rep1['uid'],1);
?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>travian.css?e21d2" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css">
<h1>Under Construction</h1>
@@ -36,7 +36,7 @@ if($rep1)
if($rep)
{ ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>travian.css?e21d2" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css">
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!");
if($_SESSION['access'] < MULTIHUNTER) die("Access Denied: You are not Admin!");
?>
<table id="member">
<thead>
+1 -1
View File
@@ -108,7 +108,7 @@
else if($units['u49'] > 0){$u49 = '<font color="black">'.$units['u49'].'';}
if($units['u50'] == 0){$u50 = '<font color="gray">'.$units['u50'].'';}
else if($units['u50'] > 0){$u50 = '<font color="black">'.$units['u50'].'';}
if($_SESSION['access'] == ADMIN)
if($_SESSION['access'] >= MULTIHUNTER)
{
if($user['tribe'] == 1)
{
+72 -23
View File
@@ -10,7 +10,7 @@
## Copyright: TravianZ (c) 2010-2014. All rights reserved. ##
## Improved: aggenkeech ##
#################################################################################
if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!");
if($_SESSION['access'] < 8) die("Access Denied: You are not Admin!");
error_reporting(0);
$id = $_GET['did'];
if(isset($id))
@@ -20,7 +20,7 @@ if(isset($id))
$type = $database->getVillageType($village['wref']);
$fdata = $database->getResourceLevel($village['wref']);
$units = $database->getUnit($village['wref']);
$abtech = $database->getABTech($id); // Armory/blacksmith level
$abtech = $database->getABTech($id); // Armory/blacksmith level
if($type == 1){ $typ = array(3,3,3,9); }
elseif($type == 2){ $typ = array(3,4,5,6); }
elseif($type == 3){ $typ = array(4,4,4,6); }
@@ -39,28 +39,59 @@ if(isset($id))
$result = $database->query_return($q);
if(count($result) >0)
{
$newResult = [];
foreach($result as $row)
{
{
$type = $row['type'];
if($type==1) { $type = '<img src="../img/admin/r/1.gif"> + 25%'; $wood+=1;}
elseif($type==2) { $type = '<img src="../img/admin/r/1.gif"> + 25%'; $wood+=1;}
elseif($type==3) { $type = '<img src="../img/admin/r/1.gif"> + 25%<br /><img src="../img/admin/r/4.gif"> + 25%'; $wood+=1; $crop+=1;}
elseif($type==4) { $type = '<img src="../img/admin/r/2.gif"> + 25%'; $clay+=1;}
elseif($type==5) { $type = '<img src="../img/admin/r/2.gif"> + 25%'; $clay+=1;}
elseif($type==6) { $type = '<img src="../img/admin/r/2.gif"> + 25%<br /><img src="../img/admin/r/4.gif"> + 25%'; $clay+=1;$crop+=1;}
elseif($type==7) { $type = '<img src="../img/admin/r/3.gif"> + 25%'; $iron+=1;}
elseif($type==8) { $type = '<img src="../img/admin/r/3.gif"> + 25%'; $iron+=1;}
elseif($type==9) { $type = '<img src="../img/admin/r/3.gif"> + 25%<br /><img src="../img/admin/r/4.gif"> + 25%'; $iron+=1; $crop+=1;}
elseif($type==10){ $type = '<img src="../img/admin/r/4.gif"> + 25%'; $crop+=1;}
elseif($type==11){ $type = '<img src="../img/admin/r/4.gif"> + 25%'; $crop+=1;}
elseif($type==12){ $type = '<img src="../img/admin/r/4.gif"> + 50%'; $crop+=2;}
}
if ( $type == 1 ) {
$row['type'] = '<img src="../img/admin/r/1.gif"> + 25%';
$wood += 1;
} elseif ( $type == 2 ) {
$row['type'] = '<img src="../img/admin/r/1.gif"> + 25%';
$wood += 1;
} elseif ( $type == 3 ) {
$row['type'] = '<img src="../img/admin/r/1.gif"> + 25%<br /><img src="../img/admin/r/4.gif"> + 25%';
$wood += 1;
$crop += 1;
} elseif ( $type == 4 ) {
$row['type'] = '<img src="../img/admin/r/2.gif"> + 25%';
$clay += 1;
} elseif ( $type == 5 ) {
$row['type'] = '<img src="../img/admin/r/2.gif"> + 25%';
$clay += 1;
} elseif ( $type == 6 ) {
$row['type'] = '<img src="../img/admin/r/2.gif"> + 25%<br /><img src="../img/admin/r/4.gif"> + 25%';
$clay += 1;
$crop += 1;
} elseif ( $type == 7 ) {
$row['type'] = '<img src="../img/admin/r/3.gif"> + 25%';
$iron += 1;
} elseif ( $type == 8 ) {
$row['type'] = '<img src="../img/admin/r/3.gif"> + 25%';
$iron += 1;
} elseif ( $type == 9 ) {
$row['type'] = '<img src="../img/admin/r/3.gif"> + 25%<br /><img src="../img/admin/r/4.gif"> + 25%';
$iron += 1;
$crop += 1;
} elseif ( $type == 10 ) {
$row['type'] = '<img src="../img/admin/r/4.gif"> + 25%';
$crop += 1;
} elseif ( $type == 11 ) {
$row['type'] = '<img src="../img/admin/r/4.gif"> + 25%';
$crop += 1;
} elseif ( $type == 12 ) {
$row['type'] = '<img src="../img/admin/r/4.gif"> + 50%';
$crop += 2;
}
$newResult[] = $row;
}
}
$ocounter = array($wood,$clay,$iron,$crop);
$production=$admin->calculateProduction($id,$user['id'],$user['b1'],$user['b2'],$user['b3'],$user['b4'],$fdata, $ocounter, $village['pop']);
$refreshiconfrm = "../img/admin/refresh.png";
$refreshicon = "<img src=\"".$refreshiconfrm."\">";
class MyGenerator
{
public function getMapCheck($wref)
@@ -69,14 +100,14 @@ if(isset($id))
}
};
$generator = new MyGenerator;
if($village and $user)
{
include("search2.tpl"); ?>
<style>
.del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);}
</style>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<br />
<table id="profile" cellpadding="1" cellspacing="1" >
@@ -237,9 +268,9 @@ if(isset($id))
</thead>
<tbody>
<?php
if(count($result) >0)
if(count($newResult))
{
foreach($result as $row)
foreach($newResult as $row)
{
echo "
<tr>
@@ -247,9 +278,9 @@ if(isset($id))
<td class=\"hab\">".$row['name']."</td>
<td class=\"hab\"><a href=\"../karte.php?d=".$row['wref']."&c=".$generator->getMapCheck($row['wref'])."\" target=\"blank\">(".$row['x']."|".$row['y'].")</a></td>
<td class=\"hab\">".round($row['loyalty'])."%</td>
<td class=\"hab\">$type</td>
<td class=\"hab\">".$row['type']."</td>
</tr>";
}
}
}
elseif($result ==0)
{
@@ -278,6 +309,7 @@ if(isset($id))
$level = $fdata['f'.($f)];
echo "<img src=\"../img/x.gif\" class=\"reslevel rf".$f." level".$level."\">";
}
?>
</div>
<div id="map_details">
@@ -337,6 +369,23 @@ if(isset($id))
{
echo "<img src=\"../img/x.gif\" class=\"dx1 g16e\">";
}
$resourcearray = $database->getResourceLevel($village['wref']);
if($resourcearray['f99t'] == 40) {
if($resourcearray['f99'] >= 0 && $resourcearray['f99'] <= 19) {
echo '<img class="ww g40" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 20 && $resourcearray['f99'] <= 39) {
echo '<img class="ww g40_1" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 40 && $resourcearray['f99'] <= 59) {
echo '<img class="ww g40_2" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 60 && $resourcearray['f99'] <= 79) {
echo '<img class="ww g40_3" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] >= 80 && $resourcearray['f99'] <= 99) {
echo '<img class="ww g40_4" src="img/x.gif" alt="Worldwonder">'; }
if($resourcearray['f99'] == 100) {
echo '<img class="ww g40_5" src="img/x.gif" alt="Worldwonder">'; }
}
?>
<div id="levels" class="on">
<?php
+53 -76
View File
@@ -22,30 +22,7 @@ include_once("../GameEngine/config.php");
include_once("../GameEngine/Database.php");
include_once ("../GameEngine/Lang/" . LANG . ".php");
include_once("../GameEngine/Admin/database.php");
include_once("../GameEngine/Data/buidata.php");
class timeFormatGenerator
{
public function getTimeFormat($time)
{
$min = 0;
$hr = 0;
$days = 0;
while ($time >= 60): $time -= 60; $min += 1; endwhile;
while ($min >= 60): $min -= 60; $hr += 1; endwhile;
while ($hr >= 24): $hr -= 24; $days +=1; endwhile;
if ($min < 10)
{
$min = "0".$min;
}
if($time < 10)
{
$time = "0".$time;
}
return $days ." day ".$hr."h ".$min."m ".$time."s";
}
};
$timeformat = new timeFormatGenerator;
include_once("../GameEngine/Data/buidata.php");
include('Templates/ver.tpl');
include('Templates/update_latest.tpl');
@@ -58,131 +35,131 @@ if (!empty($_GET['p'])) {
case 'server_info':
$subpage = 'Server Info';
break;
case 'online':
$subpage = 'Online Users';
break;
case 'notregistered':
$subpage = 'Players Not Activated';
break;
case 'inactive':
$subpage = 'Players Inactivate';
break;
case 'report':
$subpage = 'Players Reported';
break;
case 'map':
$subpage = 'Map';
break;
case 'search':
$subpage = 'General Search';
break;
case 'message':
$subpage = 'Search IGMs/Reports';
break;
case 'ban':
$subpage = 'Ban/Unban Players';
break;
case 'maintenence':
$subpage = 'Server Maintenence';
break;
case 'cleanban':
$subpage = 'Clean Banlist Data';
break;
case 'gold':
$subpage = 'Give All Free Gold';
break;
case 'usergold':
$subpage = 'Give Free Gold To Specific User';
break;
case 'maintenenceResetGold':
$subpage = 'Reset Gold';
break;
case 'delmedal':
$subpage = 'Delete Player Medals';
break;
case 'delallymedal':
$subpage = 'Delete Ally Medals';
break;
case 'givePlus':
$subpage = 'Give All Plus';
break;
case 'maintenenceResetPlus':
$subpage = 'Reset Plus';
break;
case 'givePlusRes':
$subpage = 'Give All Res Bonus';
break;
case 'maintenenceResetPlusBonus':
$subpage = 'Reset Res Bonus';
break;
case 'addUsers':
$subpage = 'Create Users';
break;
case 'natarend':
$subpage = 'Add WW Villages';
break;
case 'natarbuildingplan':
$subpage = 'Add WW Building Plan Villages';
break;
case 'admin_log':
$subpage = 'Admin Log';
break;
case 'config':
$subpage = 'Server Settings';
break;
case 'editServerSet':
$subpage = 'Server Configuration';
break;
case 'editPlusSet':
$subpage = 'PLUS Settings';
break;
case 'editLogSet':
$subpage = 'Log Settings';
break;
case 'editNewsboxSet':
$subpage = 'NewsBox Settings';
break;
case 'editExtraSet':
$subpage = 'Extra Settings';
break;
case 'editAdminInfo':
$subpage = 'Edit Admin Information';
break;
case 'resetServer':
$subpage = 'Server Resetting';
break;
case 'player':
if (!empty($_GET['uid'])) {
$displayarray = $database->getUserArray($_GET['uid'],1);
@@ -192,7 +169,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Player Details (no player)';
}
break;
case 'editUser':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -201,7 +178,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Player (no player)';
}
break;
case 'deletion':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -210,7 +187,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Delete Player (no player)';
}
break;
case 'Newmessage':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -219,7 +196,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Compose Message';
}
break;
case 'editPlus':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -228,7 +205,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Plus &amp; Resources';
}
break;
case 'editSitter':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -237,7 +214,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Sitters ';
}
break;
case 'editOverall':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -246,7 +223,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Off &amp; Def';
}
break;
case 'editWeek':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -255,7 +232,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Weekly Off &amp; Def';
}
break;
case 'userlogin':
if (!empty($_GET['uid'])) {
$player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $_GET['uid']));
@@ -264,7 +241,7 @@ if (!empty($_GET['p'])) {
$subpage = 'User Logins (no player)';
}
break;
case 'userillegallog':
if (!empty($_GET['uid'])) {
$player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $_GET['uid']));
@@ -273,7 +250,7 @@ if (!empty($_GET['p'])) {
$subpage = 'User Illegals Log (no player)';
}
break;
case 'editHero':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -282,7 +259,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Hero';
}
break;
case 'editAdditional':
if (!empty($_GET['uid'])) {
$user = $database->getUserArray($_GET['uid'],1);
@@ -291,7 +268,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Additional Info';
}
break;
case 'village':
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
@@ -301,7 +278,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Village (no village)';
}
break;
case 'editResources':
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
@@ -311,7 +288,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Resources (no village)';
}
break;
case 'addTroops':
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
@@ -321,7 +298,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Troops (no village)';
}
break;
case 'addABTroops':
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
@@ -331,7 +308,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Upgrade Troops (no village)';
}
break;
case 'editVillage':
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
@@ -341,7 +318,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Edit Village (no village)';
}
break;
case 'villagelog':
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
@@ -351,7 +328,7 @@ if (!empty($_GET['p'])) {
$subpage = 'Build Log (no village)';
}
break;
case 'techlog':
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
@@ -449,8 +426,8 @@ if (!empty($_GET['p'])) {
function go_url(url) {
location=url;
return(false);
}
}
</script>
<div id="ltop1">
<div style="position:relative; width:231px; height:100px; float:left;">
+18 -8
View File
@@ -75,6 +75,9 @@ class Account {
else if(USRNM_SPECIAL && preg_match("/[:,\\. \\n\\r\\t\\s\\<\\>]+/", $_POST['name'])) {
$form->addError("name",USRNM_CHAR);
}
else if(strtolower($_POST['name']) == 'natars') {
$form->addError("name",USRNM_TAKEN);
}
else if(User::exists($database,$_POST['name'])) {
$form->addError("name",USRNM_TAKEN);
}
@@ -103,7 +106,7 @@ class Account {
$form->addError("email",EMAIL_TAKEN);
}
}
if(!isset($_POST['vid'])) {
if(!isset($_POST['vid']) || !in_array($_POST['vid'], [1, 2, 3])) {
$form->addError("tribe",TRIBE_EMPTY);
}
if(!isset($_POST['agb'])) {
@@ -154,14 +157,14 @@ class Account {
if(START_DATE < date('m/d/Y') or START_DATE == date('m/d/Y') && START_TIME <= date('H:i'))
{
global $database;
$q = "SELECT act, username, password, email, tribe, kid FROM ".TB_PREFIX."activate where act = '".$database->escape($_POST['id'])."'";
$q = "SELECT act, username, password, email, tribe, location FROM ".TB_PREFIX."activate where act = '".$database->escape($_POST['id'])."'";
$result = mysqli_query($GLOBALS['link'],$q);
$dbarray = mysqli_fetch_array($result);
if($dbarray['act'] == $_POST['id']) {
$uid = $database->register($dbarray['username'],$dbarray['password'],$dbarray['email'],$dbarray['tribe'],"");
if($uid) {
$database->unreg($dbarray['username']);
$this->generateBase($dbarray['kid'],$uid,$dbarray['username']);
$this->generateBase($dbarray['location'],$uid,$dbarray['username']);
header("Location: activate.php?e=2");
exit;
}
@@ -209,15 +212,22 @@ class Account {
$form->addError("pw",LOGIN_PASS_EMPTY);
}
else if(!$database->login($_POST['user'],$_POST['pw']) && !$database->sitterLogin($_POST['user'],$_POST['pw'])) {
$form->addError("pw",LOGIN_PW_ERROR);
// try activation data if the user was not found
if (!$userData) {
$activateData = $database->getActivateField( $_POST['user'], 'act', 1 );
if ( $activateData != "" ) {
$form->addError( "activate", $_POST['user'] );
} else {
$form->addError("pw",LOGIN_PW_ERROR);
}
} else {
$form->addError("pw",LOGIN_PW_ERROR);
}
}
$userData = $database->getUserArray($_POST['user'], 0);
if($userData["act"] != "") {
$form->addError("activate",$_POST['user']);
}
// Vacation mode by Shadow
if($userData["vac_mode"] == 1 && $userData["vac_time"] > time()) {
$form->addError("vacation","Vacation mode is still enabled");
+17 -8
View File
@@ -14,9 +14,18 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
include_once("../../Database.php");
$id = (int) $_POST['id'];
if (!file_exists('constant_format.tpl')) {
die(
'You seem to be running a new version of TravianZ which was installed using an old installer.<br />' .
'Please download <strong>constant_format.tpl</strong> file and copy it into the <strong>GameEngine/Admin/Mods</strong> ' .
'directory - otherwise saving configuration won\'t work.<br /><br />' .
'The constant_format.tpl file can be downloaded at ' .
'<strong>https://raw.githubusercontent.com/Shadowss/TravianZ/master/install/data/constant_format.tpl</strong>');
}
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
@@ -39,7 +48,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$NEWSBOX2=(NEWSBOX2==false)? "false":"true";
$NEWSBOX3=(NEWSBOX3==false)? "false":"true";
$LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true";
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
@@ -60,7 +69,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
$text = preg_replace("'%QUEST%'", $QUEST, $text);
$text = preg_replace("'%QTYPE%'", QTYPE, $text);
$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
@@ -84,7 +93,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text);
$text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text);
$text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text);
$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
$text = preg_replace("'%BOX1%'", $NEWSBOX1, $text);
$text = preg_replace("'%BOX2%'", $NEWSBOX2, $text);
$text = preg_replace("'%BOX3%'", $NEWSBOX3, $text);
@@ -94,10 +103,10 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
$text = preg_replace("'%SDB%'", SQL_DB, $text);
$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
$text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text);
$text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text);
$text = preg_replace("'%AEMAIL%'", $_POST['aemail'], $text);
$text = preg_replace("'%ANAME%'", $_POST['aname'], $text);
$text = preg_replace("'%ASUPPMSGS%'", ($_POST['admin_support_msgs'] == 'True' ? 'true' : 'false'), $text);
@@ -107,7 +116,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
$text = preg_replace("'%SERVER%'", SERVER, $text);
// PLUS settings need to be kept intact
$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
@@ -123,7 +132,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
fwrite($fh, $text);
fclose($fh);
+13 -4
View File
@@ -14,9 +14,18 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
include_once("../../Database.php");
$id = (int) $_POST['id'];
if (!file_exists('constant_format.tpl')) {
die(
'You seem to be running a new version of TravianZ which was installed using an old installer.<br />' .
'Please download <strong>constant_format.tpl</strong> file and copy it into the <strong>GameEngine/Admin/Mods</strong> ' .
'directory - otherwise saving configuration won\'t work.<br /><br />' .
'The constant_format.tpl file can be downloaded at ' .
'<strong>https://raw.githubusercontent.com/Shadowss/TravianZ/master/install/data/constant_format.tpl</strong>');
}
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
@@ -38,7 +47,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true";
$SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true');
$ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true');
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text);
$text = preg_replace("'%ERROR%'", ERROR_REPORT, $text);
@@ -104,7 +113,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
$text = preg_replace("'%SERVER%'", SERVER, $text);
// PLUS settings need to be kept intact
$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
@@ -120,7 +129,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
fwrite($fh, $text);
fclose($fh);
+18 -9
View File
@@ -14,9 +14,18 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
include_once("../../Database.php");
$id = (int) $_POST['id'];
if (!file_exists('constant_format.tpl')) {
die(
'You seem to be running a new version of TravianZ which was installed using an old installer.<br />' .
'Please download <strong>constant_format.tpl</strong> file and copy it into the <strong>GameEngine/Admin/Mods</strong> ' .
'directory - otherwise saving configuration won\'t work.<br /><br />' .
'The constant_format.tpl file can be downloaded at ' .
'<strong>https://raw.githubusercontent.com/Shadowss/TravianZ/master/install/data/constant_format.tpl</strong>');
}
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
@@ -26,7 +35,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$AUTH_EMAIL=(AUTH_EMAIL==false)? "false":"true";
$GREAT_WKS=(GREAT_WKS==false)? "false":"true";
$REG_OPEN=(REG_OPEN==false)? "false":"true";
$NEWSBOX1=(NEWSBOX1==false)? "false":"true";
$NEWSBOX2=(NEWSBOX2==false)? "false":"true";
$NEWSBOX3=(NEWSBOX3==false)? "false":"true";
@@ -34,7 +43,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true";
$SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true');
$ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true');
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
@@ -55,7 +64,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
$text = preg_replace("'%QUEST%'", $QUEST, $text);
$text = preg_replace("'%QTYPE%'", QTYPE, $text);
$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
@@ -80,7 +89,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%LOGADMIN%'", $_POST['log_admin'], $text);
$text = preg_replace("'%LOGWAR%'", $_POST['log_war'], $text);
$text = preg_replace("'%LOGMARKET%'", $_POST['log_market'], $text);
$text = preg_replace("'%LOGILLEGAL%'", $_POST['log_illegal'], $text);
$text = preg_replace("'%LOGILLEGAL%'", $_POST['log_illegal'], $text);
//end update
$text = preg_replace("'%BOX1%'", $NEWSBOX1, $text);
$text = preg_replace("'%BOX2%'", $NEWSBOX2, $text);
@@ -91,10 +100,10 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
$text = preg_replace("'%SDB%'", SQL_DB, $text);
$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
@@ -104,7 +113,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
$text = preg_replace("'%SERVER%'", SERVER, $text);
// PLUS settings need to be kept intact
$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
@@ -120,7 +129,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
fwrite($fh, $text);
fclose($fh);
+18 -9
View File
@@ -14,9 +14,18 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
include_once("../../Database.php");
$id = (int) $_POST['id'];
if (!file_exists('constant_format.tpl')) {
die(
'You seem to be running a new version of TravianZ which was installed using an old installer.<br />' .
'Please download <strong>constant_format.tpl</strong> file and copy it into the <strong>GameEngine/Admin/Mods</strong> ' .
'directory - otherwise saving configuration won\'t work.<br /><br />' .
'The constant_format.tpl file can be downloaded at ' .
'<strong>https://raw.githubusercontent.com/Shadowss/TravianZ/master/install/data/constant_format.tpl</strong>');
}
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
@@ -35,13 +44,13 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$LOG_WAR=(LOG_WAR==false)? "false":"true";
$LOG_MARKET=(LOG_MARKET==false)? "false":"true";
$LOG_ILLEGAL=(LOG_ILLEGAL==false)? "false":"true";
$LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true";
$INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true";
$SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true');
$ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true');
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
@@ -62,7 +71,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text);
$text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text);
$text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text);
$text = preg_replace("'%QUEST%'", $QUEST, $text);
$text = preg_replace("'%QTYPE%'", QTYPE, $text);
$text = preg_replace("'%BEGINNER%'", PROTECTION, $text);
@@ -86,7 +95,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text);
$text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text);
$text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text);
$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
//update
$text = preg_replace("'%BOX1%'", $_POST['box1'], $text);
$text = preg_replace("'%BOX2%'", $_POST['box2'], $text);
@@ -98,10 +107,10 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
$text = preg_replace("'%SDB%'", SQL_DB, $text);
$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
$text = preg_replace("'%ANAME%'", ADMIN_NAME, $text);
$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
@@ -111,7 +120,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
$text = preg_replace("'%SERVER%'", SERVER, $text);
// PLUS settings need to be kept intact
$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
@@ -127,7 +136,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
fwrite($fh, $text);
fclose($fh);
+10 -1
View File
@@ -15,11 +15,20 @@ include_once("../../Database.php");
include_once("../../config.php");
$id = (int) $_POST['id'];
if (!file_exists('constant_format.tpl')) {
die(
'You seem to be running a new version of TravianZ which was installed using an old installer.<br />' .
'Please download <strong>constant_format.tpl</strong> file and copy it into the <strong>GameEngine/Admin/Mods</strong> ' .
'directory - otherwise saving configuration won\'t work.<br /><br />' .
'The constant_format.tpl file can be downloaded at ' .
'<strong>https://raw.githubusercontent.com/Shadowss/TravianZ/master/install/data/constant_format.tpl</strong>');
}
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$text = file_get_contents("constant_format.tpl");
$SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true');
$ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true');
+17 -8
View File
@@ -14,9 +14,18 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
include_once("../../Database.php");
$id = (int) $_POST['id'];
if (!file_exists('constant_format.tpl')) {
die(
'You seem to be running a new version of TravianZ which was installed using an old installer.<br />' .
'Please download <strong>constant_format.tpl</strong> file and copy it into the <strong>GameEngine/Admin/Mods</strong> ' .
'directory - otherwise saving configuration won\'t work.<br /><br />' .
'The constant_format.tpl file can be downloaded at ' .
'<strong>https://raw.githubusercontent.com/Shadowss/TravianZ/master/install/data/constant_format.tpl</strong>');
}
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$T4=(T4_COMING==false)? "false":"true";
$LOG_BUILD=(LOG_BUILD==false)? "false":"true";
$LOG_TECH=(LOG_TECH==false)? "false":"true";
@@ -33,7 +42,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true";
$SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true');
$ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true');
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERRORREPORT%'", $_POST['error'], $text);
$text = preg_replace("'%ERROR%'", $_POST['error'], $text);
@@ -54,7 +63,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%TRAPPERCAP%'", $_POST['trappercap'], $text);
$text = preg_replace("'%VILLAGE_EXPAND%'", $_POST['village_expand'], $text);
$text = preg_replace("'%DEMOLISH%'", $_POST['demolish'], $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text);
$text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text);
$text = preg_replace("'%QUEST%'", $_POST['quest'], $text);
$text = preg_replace("'%QTYPE%'", $_POST['qtype'], $text);
$text = preg_replace("'%BEGINNER%'", $_POST['beginner'], $text);
@@ -76,7 +85,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text);
$text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text);
$text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text);
$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
$text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text);
$text = preg_replace("'%BOX1%'", $NEWSBOX1, $text);
$text = preg_replace("'%BOX2%'", $NEWSBOX2, $text);
$text = preg_replace("'%BOX3%'", $NEWSBOX3, $text);
@@ -86,10 +95,10 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
$text = preg_replace("'%SDB%'", SQL_DB, $text);
$text = preg_replace("'%PREFIX%'", TB_PREFIX, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%CONNECTT%'", DB_TYPE, $text);
$text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text);
$text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text);
$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
$text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text);
$text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text);
$text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text);
$text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text);
@@ -99,7 +108,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%DOMAIN%'", DOMAIN, $text);
$text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text);
$text = preg_replace("'%SERVER%'", SERVER, $text);
// PLUS settings need to be kept intact
$text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text);
$text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text);
@@ -115,7 +124,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text);
$text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text);
fwrite($fh, $text);
fclose($fh);
+1 -4
View File
@@ -27,7 +27,6 @@ include_once($autoprefix."GameEngine/Database.php");
$id = (int) $_POST['id'];
$amt = (int) $_POST['vill_amount'];
$addUnitsWrefs = [];
for($i=1;$i<=$amt;$i++) {
@@ -41,7 +40,7 @@ $addUnitsWrefs = [];
mysqli_query($GLOBALS["link"], $q);
$pop = $automation->recountPop($wid);
$cp = $automation->recountPop($wid);
$addUnitsWrefs[] = $wid;
$database->addUnits($wid);
$database->addTech($wid);
$database->addABTech($wid);
$speed = NATARS_UNITS;
@@ -51,8 +50,6 @@ $addUnitsWrefs = [];
$database->addArtefact($wid, 3, 11, 1, PLAN, $desc, '', 'type1.gif');
}
$database->addUnits($addUnitsWrefs);
$myFile = "../../../Templates/text.tpl";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: templates/text.tpl");
$text = file_get_contents("../../../Templates/text_format.tpl");
+1 -3
View File
@@ -27,7 +27,6 @@ include_once($autoprefix."GameEngine/Database.php");
$id = (int) $_POST['id'];
$amt = (int) $_POST['vill_amount'];
$addUnitsWrefs = [];
$addTechWrefs = [];
$addABTechWrefs = [];
@@ -44,17 +43,16 @@ for($i=1;$i<=$amt;$i++) {
mysqli_query($GLOBALS["link"], $q);
$pop = $automation->recountPop($wid);
$cp = $automation->recountPop($wid);
$addUnitsWrefs[] = $wid;
$addTechWrefs[] = $wid;
$addABTechWrefs[] = $wid;
$speed = NATARS_UNITS;
//new with random amount of troops
$database->addUnits($wid);
$q = "UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(50, 1200) * $speed) . ", u42 = " . (rand(100, 1400) * $speed) . ", u43 = " . (rand(200, 1600) * $speed) . ", u44 = " . (rand(10, 50) * $speed) . ", u45 = " . (rand(48, 1700) * $speed) . ", u46 = " . (rand(60, 1800) * $speed) . ", u47 = " . (rand(200, 1600) * $speed) . ", u48 = " . (rand(40, 200) * $speed) . " , u49 = " . (rand(4, 20) * $speed) . ", u50 = " . (rand(5, 25) * $speed) . " WHERE vref = '".$wid."'";
mysqli_query($GLOBALS["link"], $q);
}
$database->addUnits($addUnitsWrefs);
$database->addTech($addTechWrefs);
$database->addABTech($addABTechWrefs);
+16 -1
View File
@@ -181,7 +181,7 @@ class adm_DB {
$username = $database->getUserArray($uid,1);
$username = $username['username'];
$database->addVillage($wid,$uid,$username,'0');
$database->addResourceFields($wid,$database->getVillageType($wid));
$database->addResourceFields($wid,$database->getVillageType($wid, false));
$database->addUnits($wid);
$database->addTech($wid);
$database->addABTech($wid);
@@ -364,6 +364,21 @@ class adm_DB {
$q = "UPDATE ".TB_PREFIX."wdata SET occupied = 0 where id = $wref";
mysqli_query($this->connection, $q);
// clear expansion slots, if this village is an expansion of any other village
$q = "
UPDATE
".TB_PREFIX."vdata
SET
exp1 = IF(exp1 = $wref, 0, exp1),
exp2 = IF(exp2 = $wref, 0, exp2),
exp3 = IF(exp3 = $wref, 0, exp3)
WHERE
exp1 = $wref OR
exp2 = $wref OR
exp3 = $wref";
mysqli_query($this->connection, $q);
$getmovement = $database->getMovement(3,$wref,1);
foreach($getmovement as $movedata) {
$time = microtime(true);
+4 -4
View File
@@ -86,10 +86,10 @@ class funct {
if (!$killhero){
$killhero=$database->FindHeroInOasis($get['uid']);
}
if ($killhero) {
$database->KillMyHero($get['uid']);
$error="&kc=1";
}else $error="&e=1";
$database->KillMyHero($get['uid']);
$error="&kc=1";
header("Location: admin.php?p=player&uid=".$get['uid'].$error);
exit;
case "reviveHero":
+217 -135
View File
@@ -654,11 +654,10 @@ class Automation {
if ($level != 1) {
$max -= ${'bid'.$indi['type']}[$level-1]['attri'] * STORAGE_MULTIPLIER;
$max += ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
} else {
$max = ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
}
$max += ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
$fieldsToSet[$fieldDbName] = $max;
}
@@ -1085,14 +1084,9 @@ class Automation {
$database->setMaxCropForVillage($data['to'], $buildarray[$tblevel]['attri']);
}
// embassy level was changed
if ($tbgid==18){
$info_cat .= $database->checkEmbassiesAfterBattle($data['to'], false);
}
// oasis cannot be destroyed
$pop=$this->recountPop($data['to'], false);
if ($isoasis == 0) {
$pop=$this->recountPop($data['to'], false);
if($pop==0 && $can_destroy==1){
$village_destroyed = 1;
// this will ensure the right $info_cat text
@@ -1101,18 +1095,34 @@ class Automation {
}
if ($isSecondRow) {
$info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\">
<img class=\"unit u".$catp_pic."\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> ".$this->procResType($tbgid,$can_destroy,$isoasis)." destroyed.</td></tr></tbody>";
if ($tbid > 0 || ($tbid == 0 && strpos($info_cat, 'The village has') === false)) {
$info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\">
<img class=\"unit u" . $catp_pic . "\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> " . $this->procResType( $tbgid, $can_destroy, $isoasis ) . " destroyed.";
}
// embassy level was changed
if ($tbgid==18){
$info_cat .= $database->checkEmbassiesAfterBattle($data['to'], $bdo['f'.$catapultTarget], false);
}
$info_cat .= "</td></tr></tbody>";
} else {
$info_cat = "" . $catp_pic . ", " . $this->procResType( $tbgid, $can_destroy, $isoasis ) . " destroyed.";
// embassy level was changed
if ($tbgid==18){
$info_cat .= $database->checkEmbassiesAfterBattle($data['to'], $bdo['f'.$catapultTarget], false);
}
}
}
// building/field not damaged
elseif ($battlepart[4]==0)
{
if ($isSecondRow) {
$info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\">
<img class=\"unit u".$catp_pic."\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> ".$this->procResType($tbgid,$can_destroy,$isoasis)." was not damaged.</td></tr></tbody>";
if ($tbid > 0 || ($tbid == 0 && strpos($info_cat, 'The village has') === false)) {
$info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\">
<img class=\"unit u" . $catp_pic . "\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> " . $this->procResType( $tbgid, $can_destroy, $isoasis ) . " was not damaged.</td></tr></tbody>";
}
} else {
$info_cat = "" . $catp_pic . "," . $this->procResType( $tbgid, $can_destroy, $isoasis ) . " was not damaged.";
}
@@ -1162,11 +1172,6 @@ class Automation {
if ( $tbgid == 11 || $tbgid == 39 ) {
$database->setMaxCropForVillage( $data['to'], $buildarray[ $tblevel ]['attri'] );
}
// embassy level was changed
if ( $tbgid == 18 ) {
$info_cat .= $database->checkEmbassiesAfterBattle( $data['to'], false );
}
}
$fieldsToSet = ["f" . $tbid];
@@ -1192,9 +1197,21 @@ class Automation {
if ($isSecondRow) {
$info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\">
<img class=\"unit u".$catp_pic."\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> ".$this->procResType($tbgid,$can_destroy,$isoasis).$info_cata."</td></tr></tbody>";
<img class=\"unit u".$catp_pic."\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> ".$this->procResType($tbgid,$can_destroy,$isoasis).$info_cata;
// embassy level was changed
if ( $tbgid == 18 ) {
$info_cat .= $database->checkEmbassiesAfterBattle( $data['to'], $bdo['f'.$catapultTarget], false );
}
$info_cat .= "</td></tr></tbody>";
} else {
$info_cat = "" . $catp_pic . "," . $this->procResType( $tbgid, $can_destroy, $isoasis ) . $info_cata;
// embassy level was changed
if ( $tbgid == 18 ) {
$info_cat .= $database->checkEmbassiesAfterBattle( $data['to'], $bdo['f'.$catapultTarget], false );
}
}
}
}
@@ -1207,7 +1224,7 @@ class Automation {
}
$reload=false;
$ourFileHandle = fopen("GameEngine/Prevention/sendunits.txt", 'w');
$ourFileHandle = fopen($autoprefix."GameEngine/Prevention/sendunits.txt", 'w');
fclose($ourFileHandle);
$time = time();
$q = "
@@ -2204,7 +2221,7 @@ class Automation {
}
}
if ($herosend_att>0){
$hero_unit = $database->getHeroField($from['owner'], 'unit', false);
$hero_unit = $database->getHeroField($from['owner'], 'unit');
$speeds[] = $GLOBALS['u'.$hero_unit]['speed'];
}
@@ -2268,6 +2285,9 @@ class Automation {
else
{
// village stands, let's do the damage
/**
* FIRST CATAPULTS ROW
*/
$basearray = $data['to'];
$bdo = $database->getResourceLevel($basearray, false);
$catapultTarget = $data['ctar1'];
@@ -2278,15 +2298,12 @@ class Automation {
$catapults2TargetRandom = ($catapults2WillNotShoot || $catapultTarget2 == 99);
// we're manually targetting 1st and/or 2nd row of catapults
if (!$catapults1TargetRandom || !$catapults2TargetRandom)
if (!$catapults1TargetRandom)
{
$_catapultsTarget1Levels=array();
$__catapultsTarget1AltTargets=array();
$_catapultsTarget2Levels=array();
$__catapultsTarget2AltTargets=array();
// calculate targets for 1st and 2nd rows of catapults
// calculate targets for 1st rows of catapults
$j=0;
for ($i=1;$i<=41;$i++)
{
@@ -2299,13 +2316,6 @@ class Automation {
$_catapultsTarget1Levels[$j]=$bdo['f'.$i];
$__catapultsTarget1AltTargets[$j]=$i;
}
// 2nd row of catapults pre-selected target calculations, if needed
if (!$catapults2TargetRandom && !$catapults2WillNotShoot && $bdo['f'.$i.'t'] == $catapultTarget2 && $bdo['f'.$i] > 0 && $catapultTarget2 != 31 && $catapultTarget2 != 32 && $catapultTarget2 != 33)
{
$_catapultsTarget2Levels[$j]=$bdo['f'.$i];
$__catapultsTarget2AltTargets[$j]=$i;
}
}
// if we couldn't find a suitable target for 1st row of catapults,
@@ -2322,6 +2332,53 @@ class Automation {
$catapults1TargetRandom = true;
}
}
}
// 1st row of catapults set to target randomly
if ($catapults1TargetRandom)
{
$list=array();
for ($i=1;$i<=41;$i++)
{
if ($i==41) $i=99;
if ($bdo['f'.$i] > 0 && $catapultTarget != 31 && $catapultTarget != 32 && $catapultTarget != 33)
{
$list[]=$i;
}
}
$catapultTarget = $list[ rand(0, count($list) - 1) ];
}
/**
* resolve 1st row of catapults
*/
$village_destroyed = 0;
$this->resolveCatapultsDestruction($bdo, $battlepart, $info_cat, $data, $catapultTarget, !$catapults2WillNotShoot, false, $catp_pic, $can_destroy, $isoasis, $village_destroyed);
/**
* SECOND CATAPULTS ROW
*/
// we're manually targetting 2nd row of catapults
if (!$catapults2TargetRandom)
{
$_catapultsTarget2Levels=array();
$__catapultsTarget2AltTargets=array();
// calculate targets for 2nd rows of catapults
$j=0;
for ($i=1;$i<=41;$i++)
{
if ($i==41) $i=99;
// 2nd row of catapults pre-selected target calculations, if needed
if (!$catapults2TargetRandom && !$catapults2WillNotShoot && $bdo['f'.$i.'t'] == $catapultTarget2 && $bdo['f'.$i] > 0 && $catapultTarget2 != 31 && $catapultTarget2 != 32 && $catapultTarget2 != 33)
{
$j++;
$_catapultsTarget2Levels[$j]=$bdo['f'.$i];
$__catapultsTarget2AltTargets[$j]=$i;
}
}
// if we couldn't find a suitable target for 2nd row of catapults,
// select a random target instead
@@ -2339,46 +2396,21 @@ class Automation {
}
}
// 1st row of catapults set to target randomly
if ($catapults1TargetRandom)
{
$list=array();
$j = 1;
for ($i=1;$i<=41;$i++)
{
if ($i==41) $i=99;
if ($bdo['f'.$i] > 0 && $catapultTarget != 31 && $catapultTarget != 32 && $catapultTarget != 33)
{
$list[$j]=$i;
$j++;
}
}
$catapultTarget = $list[ rand(1, $j - 1) ];
}
// 2nd row of catapults set to target randomly
if ($catapults2TargetRandom && !$catapults2WillNotShoot)
{
$list=array();
$j=1;
for ($i=1;$i<=41;$i++)
{
if ($i==41) $i=99;
if ($bdo['f'.$i] > 0)
{
$j++;
$list[$j]=$i;
$list[]=$i;
}
}
$catapultTarget2 = $list[ rand(1, $j - 1) ];
$catapultTarget2 = $list[ rand(0, count($list) - 1) ];
}
/**
* resolve 1st row of catapults
*/
$village_destroyed = 0;
$this->resolveCatapultsDestruction($bdo, $battlepart, $info_cat, $data, $catapultTarget, !$catapults2WillNotShoot, false, $catp_pic, $can_destroy, $isoasis, $village_destroyed);
/**
* resolve 2nd row of catapults
*/
@@ -2656,7 +2688,7 @@ class Automation {
} else {
$xp=" gained ".$heroxp." XP from the battle";
}
$artifact = $database->getOwnArtefactInfo($data['to']);
$artifact = reset($database->getOwnArtefactInfo($data['to']));
if (!empty($artifact)) {
if ($type=='3') {
if ($database->canClaimArtifact($data['from'],$artifact['vref'],$artifact['size'],$artifact['type'])) {
@@ -2716,7 +2748,7 @@ class Automation {
else{
if(isset($village_destroyed) && $village_destroyed == 1 && $can_destroy==1){
//check if village pop=0 and no info destroy
if (strpos($info_cat,"The village has")==0) {
if (strpos($info_cat,"The village has") === false) {
$info_cat .= "<br><tbody class=\"goods\"><tr><th>Information</th><td colspan=\"11\">
<img class=\"unit u".$catp_pic."\" src=\"img/x.gif\" alt=\"Catapult\" title=\"Catapult\" /> The village has been destroyed.</td></tr></tbody>";
}
@@ -2803,7 +2835,7 @@ class Automation {
}
if ($prisoner['t11']>0){
$p_hero_unit = $database->getHeroField($p_owner, 'unit', false)['unit'];
$p_hero_unit = $database->getHeroField($p_owner, 'unit');
$p_speeds[] = $GLOBALS['u'.$p_hero_unit]['speed'];
}
@@ -3004,7 +3036,7 @@ class Automation {
}
if ($herosend_att>0){
$hero_unit = $database->getHeroField($from['owner'], 'unit', false)['unit'];
$hero_unit = $database->getHeroField($from['owner'], 'unit');
$speeds[] = $GLOBALS['u'.$hero_unit]['speed'];
}
@@ -3139,8 +3171,8 @@ class Automation {
}
}
if(file_exists("GameEngine/Prevention/sendunits.txt")) {
unlink("GameEngine/Prevention/sendunits.txt");
if(file_exists($autoprefix."GameEngine/Prevention/sendunits.txt")) {
unlink($autoprefix."GameEngine/Prevention/sendunits.txt");
}
if ($reload) header("Location: ".$_SERVER['PHP_SELF']);
}
@@ -3212,6 +3244,20 @@ class Automation {
$q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref";
$database->query($q);
// clear expansion slots, if this village is an expansion of any other village
$q = "
UPDATE
".TB_PREFIX."vdata
SET
exp1 = IF(exp1 = $wref, 0, exp1),
exp2 = IF(exp2 = $wref, 0, exp2),
exp3 = IF(exp3 = $wref, 0, exp3)
WHERE
exp1 = $wref OR
exp2 = $wref OR
exp3 = $wref";
$database->query($q);
$getprisoners = $database->getPrisoners($wref);
foreach($getprisoners as $pris) {
$troops = 0;
@@ -3325,10 +3371,7 @@ class Automation {
}
if (isset($post['t11'])){
if( $post['t11'] != '' && $post['t11'] > 0){
$qh = "SELECT unit FROM ".TB_PREFIX."hero WHERE uid = ".(int) $from['owner']." AND dead = 0";
$resulth = mysqli_query($GLOBALS['link'],$qh);
$hero_f=mysqli_fetch_array($resulth);
$hero_unit=$hero_f['unit'];
$hero_unit = getHeroField($from['owner'], 'unit');
$speeds[] = $GLOBALS['u'.$hero_unit]['speed'];
} else {
$post['t11']='0';
@@ -3438,7 +3481,7 @@ class Automation {
$DefenderID = $database->getVillageField($data['to'],"owner");
if (isset($AttackerID) && $session->uid==$AttackerID || $session->uid==$DefenderID) $reload=true;
$database->addEnforce($data);
$reinf = $database->getEnforce($data['to'],$data['from']);
$reinf = $database->getEnforce($data['from'],$data['to']);
$database->modifyEnforce($reinf['id'],31,1,1);
$data_fail = '0,0,4,1,0,0,0,0,0,0,0,0,0,0';
$database->addNotice($to['owner'],$to['wref'],(isset($targetally) ? $targetally : 0),8,'village of the elders reinforcement '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime);
@@ -3992,113 +4035,133 @@ class Automation {
}
public function getUpkeep($array,$type,$vid=0,$prisoners=0) {
global $database,$session,$village;
global $database, $session, $village;
if ( $vid == 0 ) {
$vid = $village->wid;
}
if($vid==0) { $vid=$village->wid; }
$buildarray = array();
if($vid!=0){ $buildarray = $database->getResourceLevel($vid); }
if ( $vid != 0 ) {
$buildarray = $database->getResourceLevel( $vid );
}
$upkeep = 0;
switch($type) {
switch ( $type ) {
case 0:
$start = 1;
$end = 50;
$end = 50;
break;
case 1:
$start = 1;
$end = 10;
$end = 10;
break;
case 2:
$start = 11;
$end = 20;
$end = 20;
break;
case 3:
$start = 21;
$end = 30;
$end = 30;
break;
case 4:
$start = 31;
$end = 40;
$end = 40;
break;
case 5:
$start = 41;
$end = 50;
$end = 50;
break;
}
for($i=$start;$i<=$end;$i++) {
$k = $i-$start+1;
$unit = "u".$i;
$unit2 = "t".$k;
for ( $i = $start; $i <= $end; $i ++ ) {
$k = $i - $start + 1;
$unit = "u" . $i;
$unit2 = "t" . $k;
global $$unit;
$dataarray = $$unit;
for($j=19;$j<=38;$j++) {
if($buildarray['f'.$j.'t'] == 41) {
for ( $j = 19; $j <= 38; $j ++ ) {
if ( $buildarray[ 'f' . $j . 't' ] == 41 ) {
$horsedrinking = $j;
}
}
if($prisoners == 0){
if(isset($horsedrinking)){
if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)) {
$upkeep += ($dataarray['pop']-1) * $array[$unit];
} else {
$upkeep += $dataarray['pop'] * $array[$unit];
}}else{
$upkeep += $dataarray['pop'] * $array[$unit];
}
}else{
if(isset($horsedrinking)){
if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)) {
$upkeep += ($dataarray['pop']-1) * $array[$unit2];
} else {
$upkeep += $dataarray['pop'] * $array[$unit2];
}}else{
$upkeep += $dataarray['pop'] * $array[$unit2];
}
if ( $prisoners == 0 ) {
if ( isset( $horsedrinking ) ) {
if ( ( $i == 4 && $buildarray[ 'f' . $horsedrinking ] >= 10 )
|| ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
|| ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 ) ) {
$upkeep += ( $dataarray['pop'] - 1 ) * $array[ $unit ];
} else {
$upkeep += $dataarray['pop'] * $array[ $unit ];
}
} else {
$upkeep += $dataarray['pop'] * $array[ $unit ];
}
} else {
if ( isset( $horsedrinking ) ) {
if ( ( $i == 4 && $buildarray[ 'f' . $horsedrinking ] >= 10 )
|| ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
|| ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 ) ) {
$upkeep += ( $dataarray['pop'] - 1 ) * $array[ $unit2 ];
} else {
$upkeep += $dataarray['pop'] * $array[ $unit2 ];
}
} else {
$upkeep += $dataarray['pop'] * $array[ $unit2 ];
}
}
}
// $unit = "hero";
// global $$unit;
// $dataarray = $$unit;
if($prisoners == 0){
if (!isset($array['hero'])) {
if ( $prisoners == 0 ) {
if ( ! isset( $array['hero'] ) ) {
$array['hero'] = 0;
}
$upkeep += $array['hero'] * 6;
}else{
if (!isset($array['t11'])) {
} else {
if ( ! isset( $array['t11'] ) ) {
$array['t11'] = 0;
}
$upkeep += $array['t11'] * 6;
}
$who=$database->getVillageField($vid,"owner");
$artefact = count($database->getOwnUniqueArtefactInfo2($who,4,3,0));
$artefact1 = count($database->getOwnUniqueArtefactInfo2($vid,4,1,1));
$artefact2 = count($database->getOwnUniqueArtefactInfo2($who,4,2,0));
if($artefact > 0){
$who = $database->getVillageField( $vid, "owner" );
$artefact = count( $database->getOwnUniqueArtefactInfo2( $who, 4, 3, 0 ) );
$artefact1 = count( $database->getOwnUniqueArtefactInfo2( $vid, 4, 1, 1 ) );
$artefact2 = count( $database->getOwnUniqueArtefactInfo2( $who, 4, 2, 0 ) );
if ( $artefact > 0 ) {
$upkeep /= 2;
$upkeep = round($upkeep);
}else if($artefact1 > 0){
$upkeep = round( $upkeep );
} else if ( $artefact1 > 0 ) {
$upkeep /= 2;
$upkeep = round($upkeep);
}else if($artefact2 > 0){
$upkeep = round( $upkeep );
} else if ( $artefact2 > 0 ) {
$upkeep /= 4;
$upkeep = round($upkeep);
$upkeep = round( $upkeep );
$upkeep *= 3;
}
$foolartefact = $database->getFoolArtefactInfo(4,$vid,$who);
if(count($foolartefact) > 0){
foreach($foolartefact as $arte){
if($arte['bad_effect'] == 1){
$foolartefact = $database->getFoolArtefactInfo( 4, $vid, $who );
if ( count( $foolartefact ) > 0 ) {
foreach ( $foolartefact as $arte ) {
if ( $arte['bad_effect'] == 1 ) {
$upkeep *= $arte['effect2'];
}else{
} else {
$upkeep /= $arte['effect2'];
$upkeep = round($upkeep);
$upkeep = round( $upkeep );
}
}
}
return $upkeep;
}
@@ -4501,6 +4564,11 @@ class Automation {
if ($vil['timetofinish'] <= time()) {
$type = $database->getFieldType($vil['vref'],$vil['buildnumber']);
$level = $database->getFieldLevel($vil['vref'],$vil['buildnumber']);
if ($level < 0) {
$level = 0;
}
$buildarray = $GLOBALS["bid".$type];
if ($type==10 || $type==38) {
@@ -4525,7 +4593,7 @@ class Automation {
if ($village->natar==1 && $type==40) $clear=""; //fix by ronix
$q = "UPDATE ".TB_PREFIX."fdata SET f".$vil['buildnumber']."=".($level-1).$clear." WHERE vref=".(int) $vil['vref'];
$q = "UPDATE ".TB_PREFIX."fdata SET f".$vil['buildnumber']."=".(($level-1 >= 0) ? $level-1 : 0).$clear." WHERE vref=".(int) $vil['vref'];
$database->query($q);
$pop = $this->getPop($type,$level-1);
@@ -4608,15 +4676,15 @@ class Automation {
$modes[] = null;
}
// add 5 points, if we're below level 100
// add as many points as needed, if we're below level 100
if ($scorePoints) {
$columns[] = 'points';
$columnValues[] = 5;
$columnValues[] = (5 * ($newLevel - $herolevel));
$modes[] = 1;
}
$villunits = $unitData[$hdata['wref']];
if($villunits['hero'] == 0 && $hdata['trainingtime'] < time() && $hdata['inrevive'] == 1){
if($hdata['trainingtime'] < time() && $hdata['inrevive'] == 1){
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET hero = 1 WHERE vref = ".(int) $hdata['wref']."");
$columns[] = 'dead';
@@ -4635,9 +4703,13 @@ class Automation {
$lastUpdateTime = (int) $hdata['trainingtime'];
}
if($villunits['hero'] == 0 && $hdata['trainingtime'] < time() && $hdata['intraining'] == 1){
if($hdata['trainingtime'] < time() && $hdata['intraining'] == 1){
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET hero = 1 WHERE vref = ".(int) $hdata['wref']);
$columns[] = 'dead';
$columnValues[] = 0;
$modes[] = null;
$columns[] = 'intraining';
$columnValues[] = 0;
$modes[] = null;
@@ -5249,9 +5321,19 @@ class Automation {
$ally = $database->getAlliance($aid);
$memberlist = $database->getAllMember($ally['id']);
$oldrank = 0;
$memberIDs = [];
foreach($memberlist as $member) {
$oldrank += $database->getVSumField($member['id'],"pop");
$memberIDs[] = $member['id'];
}
$data = $database->getVSumField($memberIDs,"pop");
if (count($data)) {
foreach ($data as $row) {
$oldrank += $row['Total'];
}
}
if($ally['oldrank'] != $oldrank){
if($ally['oldrank'] < $oldrank) {
$totalpoints = $oldrank - $ally['oldrank'];
+4 -4
View File
@@ -58,10 +58,10 @@ $pattern[50] = "/\[tid48\]/";
$pattern[51] = "/\[tid49\]/";
$pattern[52] = "/\[tid50\]/";
$pattern[53] = "/\[hero\]/";
$pattern[54] = "/\[l\]/";
$pattern[55] = "/\[cl\]/";
$pattern[56] = "/\[i\]/";
$pattern[57] = "/\[c\]/";
$pattern[54] = "/\[lumber\]/";
$pattern[55] = "/\[clay\]/";
$pattern[56] = "/\[iron\]/";
$pattern[57] = "/\[crop\]/";
$pattern[58] = "/\*aha\*/";
$pattern[59] = "/\*angry\*/";
$pattern[60] = "/\*cool\*/";
+2 -2
View File
@@ -508,12 +508,12 @@ class Battle {
// Formula for calculating the Moral
if($attpop > $defpop) {
if ($rap < $rdp) {
$moralbonus = min(1.5, pow($attpop / $defpop, (0.2*($rap/$rdp))));
$moralbonus = min(1.5, pow(($defpop > 0 ? $attpop / $defpop : 0), (0.2*($rap/$rdp))));
}else{
if($defpop==0){
$moralbonus = min(1.5, pow($attpop, 0.2));
}else{
$moralbonus = min(1.5, pow($attpop / $defpop, 0.2));
$moralbonus = min(1.5, pow(($defpop > 0 ? $attpop / $defpop : 0), 0.2));
}
}
}else{
+237 -62
View File
@@ -4,15 +4,15 @@
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ##
## Project: TravianZ ##
## Version: 22.06.2015 ##
## Version: 22.06.2015 ##
## Filename Building.php ##
## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ##
## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ##
## Fixed by: Shadow - STARVATION , HERO FIXED COMPL., TPLinux ##
## Fixed by: InCube - double troops ##
## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2015. All rights reserved. ##
## URLs: http://travian.shadowss.ro ##
## Source code: https://github.com/Shadowss/TravianZ ##
## Source code: https://github.com/Shadowss/TravianZ ##
## ##
#################################################################################
@@ -41,30 +41,178 @@ class Building {
}
}
}
public function residenceOfPalaceBuildInProgress() {
global $database, $village;
$residenceOrPalaceInProgress = $database->getBuildingByType2($village->wid, '25, 26');
$residenceBuildInProgress = false;
$palaceBuildInProgress = false;
if (count($residenceOrPalaceInProgress)) {
foreach ($residenceOrPalaceInProgress as $record) {
if ($record == 25) {
$residenceBuildInProgress = true;
} else {
$palaceBuildInProgress = true;
}
}
}
return [
'residence' => $residenceBuildInProgress,
'palace' => $palaceBuildInProgress
];
}
/*
* Checks whether to allow building Wonder of the World
* above current level. This includes checks for WW upgrade
* currently in progress as well as current WW level
* and the right number of building plans in the alliance.
*/
public function allowWwUpgrade() {
global $database, $village, $session;
static $cached = null;
if ($cached === null) {
$wwHighestLevelFound = $village->resarray['f99'];
$wwBuildingProgress = $database->getBuildingByType( $village->wid, 99 );
if ( count( $wwBuildingProgress ) ) {
if ( $wwBuildingProgress[0]['level'] > $wwHighestLevelFound ) {
$wwHighestLevelFound = $wwBuildingProgress[0]['level'];
}
}
// check if we should allow building the WW this high
if ( $wwHighestLevelFound >= 50 ) {
$needed_plan = 2;
} else {
$needed_plan = 1;
}
// count building plans
if ( $needed_plan ) {
$wwbuildingplan = 0;
$planFoundInOwnersVillage = false;
$villages = $database->getVillagesID( $session->uid );
foreach ( $villages as $village1 ) {
$plan = count( $database->getOwnArtefactInfoByType2( $village1, 11 ) );
if ( $plan > 0 ) {
$wwbuildingplan = 1;
$planFoundInOwnersVillage = true;
}
}
if ( $session->alliance != 0 ) {
$alli_users = $database->getUserByAlliance( $session->alliance );
foreach ( $alli_users as $users ) {
$villages = $database->getVillagesID( $users['id'] );
if ( $users['id'] != $session->uid ) {
foreach ( $villages as $village1 ) {
$plan = count( $database->getOwnArtefactInfoByType2( $village1, 11 ) );
if ( $plan > 0 ) {
$wwbuildingplan += 1;
}
}
}
}
}
if ($needed_plan == 1) {
$cached = ($wwbuildingplan >= $needed_plan && $planFoundInOwnersVillage);
} else {
$cached = $wwbuildingplan >= $needed_plan;
}
} else {
// no need for building plans, we can still upgrade WW
$cached = true;
}
}
return $cached;
}
public function canProcess($id,$tid) {
//add fix by ronix
global $session;
//add fix by ronix
global $session, $database, $village;
if($session->access==BANNED){
header("Location: banned.php");
exit;
} else {
if ($this->checkResource($id,$tid)!=4) {
if($tid >= 19) {
header("Location: dorf2.php");
$page = basename($_SERVER['SCRIPT_NAME']);
$levels = $database->getResourceLevel($village->wid);
$progresses = $this->residenceOfPalaceBuildInProgress();
if (
!(
// check if we're not trying to hack-build residence and palace together
(
!in_array($tid, [25, 26]) ||
(
($tid == 25 && $progresses['palace'] === false) ||
($tid == 26 && $progresses['residence'] === false)
)
) &&
// don't allow building WW to level 51 with a waiting loop
(
$tid != 99 ||
(
$tid == 99 &&
$this->allowWwUpgrade()
)
)
)
) {
if ( $tid > 18 ) {
header( "Location: dorf2.php" );
exit;
}
else {
header("Location: dorf1.php");
} else {
header( "Location: dorf1.php" );
exit;
}
exit;
}
}
}
}
}
if (
// check that our ID actually exists within the buildings list
isset($village->resarray['f'.$tid.'t']) &&
// let's see if we should allow building what we want where we want to
// (prevent building resource fields in the village
(
($page == 'dorf1.php' && $id >= 1 && $id <= 4) ||
($page == 'dorf2.php' && $id > 4)
) &&
// check that we're not trying to change a standing building type
(
$levels['f'.$tid.'t'] == $id ||
$levels['f'.$tid.'t'] == 0
)
) {
if ( !isset($_GET['master']) && $this->checkResource( $id, $tid ) != 4 ) {
if ( $tid >= 19 ) {
header( "Location: dorf2.php" );
exit;
} else {
header( "Location: dorf1.php" );
exit;
}
exit;
}
} else {
header('Location: '.$_SERVER['SCRIPT_NAME']);
exit;
}
}
}
public function procBuild($get) {
global $session, $village, $database;
if(isset($get['a']) && $get['c'] == $session->checker && !isset($get['id'])) {
if($get['a'] == 0) {
$this->removeBuilding($get['d']);
@@ -74,21 +222,25 @@ class Building {
$this->upgradeBuilding($get['a']);
}
}
if(isset($get['master']) && isset($get['id']) && isset($get['time']) && $session->gold >= 1 && $session->goldclub && $village->master == 0 && (isset($get['c']) && $get['c']== $session->checker)) {
$this->canProcess($get['master'],$get['id']);
$m=$get['master'];
$master = $_GET;
$session->changeChecker();
if($session->access==BANNED){
header("Location: banned.php");
exit;
}
$level = $database->getResourceLevel($village->wid);
$database->addBuilding($village->wid, $get['id'], $get['master'], 1, $get['time'], 1, $level['f'.$get['id']] + 1 + count($database->getBuildingByField($village->wid,$get['id'])));
if($get['id'] > 18) {
header("Location: dorf2.php");
}
$level = $database->getResourceLevel( $village->wid );
$database->addBuilding( $village->wid, $get['id'], $get['master'], 1, $get['time'], 1, $level[ 'f' . $get['id'] ] + 1 + count( $database->getBuildingByField( $village->wid, $get['id'] ) ) );
if ( $get['id'] > 18 ) {
header( "Location: dorf2.php" );
exit;
} else {
header("Location: dorf1.php");
header( "Location: dorf1.php" );
exit;
}
}
@@ -334,7 +486,7 @@ class Building {
}
private function upgradeBuilding($id) {
global $database,$village,$session,$logging;
global $database,$village,$session,$logging,${'bid'.$village->resarray['f'.$id.'t']};
if($this->allocated < $this->maxConcurrent) {
$uprequire = $this->resourceRequired($id,$village->resarray['f'.$id.'t']);
$time = time() + $uprequire['time'];
@@ -369,6 +521,12 @@ class Building {
}
}
$level = $database->getResourceLevel($village->wid);
// don't allow building above max levels
if ($level['f'.$id] + 1 > count(${'bid'.$village->resarray['f'.$id.'t']})) {
return;
}
if($session->access!=BANNED){
if($database->addBuilding($village->wid,$id,$village->resarray['f'.$id.'t'],$loop,$time+($loop==1?ceil(60/SPEED):0),0,$level['f'.$id] + 1 + count($database->getBuildingByField($village->wid,$id)))) {
$database->modifyResource($village->wid,$uprequire['wood'],$uprequire['clay'],$uprequire['iron'],$uprequire['crop'],0);
@@ -434,37 +592,52 @@ class Building {
global $database,$village,$session,$logging;
if($this->allocated < $this->maxConcurrent) {
if($tid == 16) {
$id = 39;
}
else if($tid == 31 || $tid == 32 || $tid == 33) {
$id = 40;
}
$uprequire = $this->resourceRequired($id,$tid);
$time = time() + $uprequire['time'];
$bindicate = $this->canBuild($id,$village->resarray['f'.$id.'t']);
$loop = ($bindicate == 9 ? 1 : 0);
if($loop == 1) {
foreach($this->buildArray as $build) {
if($build['field'] >= 19 || ($session->tribe <> 1 && !ALLOW_ALL_TRIBE)) {
$time = $build['timestamp'] + ceil(60/SPEED) + $uprequire['time'];
}
}
}
if($this->meetRequirement($tid)) {
if($session->access!=BANNED){
$level = $database->getResourceLevel($village->wid);
if($database->addBuilding($village->wid,$id,$tid,$loop,$time,0,$level['f'.$id] + 1 + count($database->getBuildingByField($village->wid,$id)))) {
$logging->addBuildLog($village->wid,$this->procResType($tid),($village->resarray['f'.$id]+1),1);
$database->modifyResource($village->wid,$uprequire['wood'],$uprequire['clay'],$uprequire['iron'],$uprequire['crop'],0);
header("Location: dorf2.php");
exit;
}
}else{
header("Location: banned.php");
exit;
}
}
// check if we're not trying to hack-build residence and palace together
if (
($progresses = $this->residenceOfPalaceBuildInProgress()) &&
(
!in_array($tid, [25, 26]) ||
(
($tid == 25 && $progresses['palace'] === false) ||
($tid == 26 && $progresses['residence'] === false)
)
)
) {
if ( $tid == 16 ) {
$id = 39;
} else if ( $tid == 31 || $tid == 32 || $tid == 33 ) {
$id = 40;
}
$uprequire = $this->resourceRequired( $id, $tid );
$time = time() + $uprequire['time'];
$bindicate = $this->canBuild( $id, $village->resarray[ 'f' . $id . 't' ] );
$loop = ( $bindicate == 9 ? 1 : 0 );
if ( $loop == 1 ) {
foreach ( $this->buildArray as $build ) {
if ( $build['field'] >= 19 || ( $session->tribe <> 1 && ! ALLOW_ALL_TRIBE ) ) {
$time = $build['timestamp'] + ceil( 60 / SPEED ) + $uprequire['time'];
}
}
}
if ( $this->meetRequirement( $tid ) ) {
if ( $session->access != BANNED ) {
$level = $database->getResourceLevel( $village->wid );
if ( $database->addBuilding( $village->wid, $id, $tid, $loop, $time, 0, $level[ 'f' . $id ] + 1 + count( $database->getBuildingByField( $village->wid, $id ) ) ) ) {
$logging->addBuildLog( $village->wid, $this->procResType( $tid ), ( $village->resarray[ 'f' . $id ] + 1 ), 1 );
$database->modifyResource( $village->wid, $uprequire['wood'], $uprequire['clay'], $uprequire['iron'], $uprequire['crop'], 0 );
header( "Location: dorf2.php" );
exit;
}
} else {
header( "Location: banned.php" );
exit;
}
}
} else {
header( "Location: dorf2.php" );
exit;
}
}
}
@@ -684,16 +857,18 @@ class Building {
}
break;
// great warehouse can only be built with artefact or only in Natar village
case 38:
if ( $this->getTypeLevel( 15 ) >= 10 && $village->natar == 1 ) {
if ( $this->getTypeLevel( 15 ) >= 10 && ($village->natar == 1 || count($database->getOwnUniqueArtefactInfo2($session->uid, 6, 1, 0)) || count($database->getOwnUniqueArtefactInfo2($session->uid, 6, 2, 0)) ) ) {
return true;
} else {
return false;
}
break;
// great grannary can only be built with artefact or only in Natar village
case 39:
if ( $this->getTypeLevel( 15 ) >= 10 && $village->natar == 1 ) {
if ( $this->getTypeLevel( 15 ) >= 10 && ($village->natar == 1 || count($database->getOwnUniqueArtefactInfo2($session->uid, 6, 1, 0)) || count($database->getOwnUniqueArtefactInfo2($session->uid, 6, 2, 0)) ) ) {
return true;
} else {
return false;
@@ -830,7 +1005,7 @@ class Building {
if ($session->uid == 1) {
return 0;
}
$keyholder = array();
if($vid == 0) {
@@ -838,7 +1013,7 @@ class Building {
} else {
$resourcearray = $database->getResourceLevel($vid);
}
foreach(array_keys($resourcearray,$tid) as $key) {
if(strpos($key,'t')) {
$key = preg_replace("/[^0-9]/", '', $key);
@@ -853,7 +1028,7 @@ class Building {
// resource field
if($tid <= 4) {
$temparray = array();
for($i=0;$i<=$element-1;$i++) {
// collect current field level
array_push($temparray,$resourcearray['f'.$keyholder[$i]]);
@@ -870,7 +1045,7 @@ class Building {
// village building
else {
$target = 0;
// find the highest level built for this building type
for($i=1;$i<=$element-1;$i++) {
if($resourcearray['f'.$keyholder[$i]] > $resourcearray['f'.$keyholder[$target]]) {
@@ -1024,7 +1199,7 @@ class Building {
$database->updateUserField($session->uid, "gold", $newgold, 1);
}
$stillbuildingarray = $database->getJobs($village->wid);
$stillbuildingarray = $database->getJobs($village->wid);
if (count($stillbuildingarray) == 1) {
if($stillbuildingarray[0]['loopcon'] == 1) {
//$q = "UPDATE ".TB_PREFIX."bdata SET loopcon=0,timestamp=".(time()+$stillbuildingarray[0]['timestamp']-$innertimestamp)." WHERE id=".$stillbuildingarray[0]['id'];
+601 -381
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -106,8 +106,8 @@ public function procMtime($time, $pref = 3) {
break;
}
*/
- $time += 3600*0; //Edit this yourself
+ $time += 0; //Edit this yourself
// $time += 3600*0; //Edit this yourself
$time += 0; //Edit this yourself
$today = date('d',time())-1;
if (date('Ymd',time()) == date('Ymd',$time)) {
File diff suppressed because it is too large Load Diff
+19 -6
View File
@@ -25,8 +25,9 @@ class Message {
if ($req_file == 'nachrichten.php') {
if ( isset( $_GET['t'] ) ) {
switch ( $_GET['t'] ) {
// send messages page
// send messages page or a single sent message
case 2:
case '2a':
$this->getMessages( 2 );
break;
@@ -402,7 +403,7 @@ class Message {
private function sendAMessage($topic,$text) {
global $session,$database;
// Vulnerability closed by Shadow
$q = "SELECT Count(*) as Total FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".(time() - 60);
@@ -412,7 +413,7 @@ class Message {
return; //flood
// Vulnerability closed by Shadow
$allmembersQ = mysqli_query($GLOBALS['link'],"SELECT id FROM ".TB_PREFIX."users WHERE alliance='".$session->alliance."'");
$userally = $database->getUserField($session->uid,"alliance",0);
$permission=mysqli_fetch_array(mysqli_query($GLOBALS['link'],"SELECT opt7 FROM ".TB_PREFIX."ali_permission WHERE uid='".$session->uid."'"));
@@ -581,9 +582,21 @@ class Message {
}
}
// check if we're not sending this as support
$support_from_admin_allowed = ( ( $session->access == MULTIHUNTER || $session->access == ADMIN ) && ADMIN_RECEIVE_SUPPORT_MESSAGES );
$database->sendMessage( $user, ( ( ! empty( $_POST['as_support'] ) && $support_from_admin_allowed ) ? 1 : $session->uid ), htmlspecialchars( addslashes( $topic ) ), htmlspecialchars( addslashes( $text ) ), 0, $alliance, $player, $coor, $report );
// check if we're not sending this as Support or Multihunter
$support_from_admin_allowed = ( $session->access == ADMIN && ADMIN_RECEIVE_SUPPORT_MESSAGES );
$send_as = $session->uid;
// send as Support?
if (( ! empty( $_POST['as_support'] ) && $support_from_admin_allowed )) {
$send_as = 1;
}
// send as Multihunter
if (( ! empty( $_POST['as_multihunter'] ) && $session->access == MULTIHUNTER )) {
$send_as = 5;
}
$database->sendMessage( $user, $send_as, htmlspecialchars( addslashes( $topic ) ), htmlspecialchars( addslashes( $text ) ), 0, $alliance, $player, $coor, $report );
}
}
+2 -2
View File
@@ -90,9 +90,9 @@ class Profile {
}
private function updateProfile($post) {
global $database;
global $database, $session;
$birthday = $post['jahr'].'-'.$post['monat'].'-'.$post['tag'];
$database->submitProfile($database->RemoveXSS($post['uid']),$database->RemoveXSS($post['mw']),$database->RemoveXSS($post['ort']),$database->RemoveXSS($birthday),$database->RemoveXSS($post['be2']),$database->RemoveXSS($post['be1']));
$database->submitProfile($session->uid,$database->RemoveXSS($post['mw']),$database->RemoveXSS($post['ort']),$database->RemoveXSS($birthday),$database->RemoveXSS($post['be2']),$database->RemoveXSS($post['be1']));
$varray = $database->getProfileVillages($post['uid']);
for($i=0;$i<=count($varray)-1;$i++) {
$k = trim($post['dname'.$i]);
+19 -9
View File
@@ -27,7 +27,7 @@
$myrank = 0;
if(count($ranking) > 0) {
for($i=0;$i<($users3);$i++) {
if( isset( $ranking[$i]['userid'] ) ) {
if( isset( $ranking[$i]['userid'] ) ) {
if($ranking[$i]['userid'] == $id && $ranking[$i] != "pad") {
$myrank = $i;
}
@@ -204,8 +204,8 @@
return $key;
break;
}
}
}
}
}
if(!next($this->rankarray)) {
if($field != "userid"){
return $name;
@@ -215,7 +215,7 @@
break;
}
}
}
}
@@ -268,7 +268,7 @@
WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
AND " . TB_PREFIX . "users.tribe <= 3
AND " . TB_PREFIX . "users.id > 5
ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
}
$result = (mysqli_query($GLOBALS['link'],$q));
@@ -474,16 +474,26 @@
}
public function procARankArray() {
global $multisort;
global $multisort, $database;
$array = $GLOBALS['db']->getARanking();
$holder = array();
foreach($array as $value) {
$memberlist = $GLOBALS['db']->getAllMember($value['id']);
$totalpop = 0;
foreach($memberlist as $member) {
$totalpop += $GLOBALS['db']->getVSumField($member['id'], "pop");
}
$memberIDs = [];
foreach($memberlist as $member) {
$memberIDs[] = $member['id'];
}
$data = $database->getVSumField($memberIDs,"pop");
if (count($data)) {
foreach ($data as $row) {
$totalpop += $row['Total'];
}
}
$value['players'] = count($memberlist);
$value['totalpop'] = $totalpop;
if(!isset($value['avg'])) {
+19 -9
View File
@@ -180,7 +180,7 @@ class Session {
if($user && ($admin || isset($_SESSION['sessid']))) {
// check if this is not a support user, for who only messages and statistics are available
if ($user == 1) {
if ($user == 'Support') {
$req_file = basename($_SERVER['PHP_SELF']);
if (!in_array($req_file, ['nachrichten.php', 'logout.php', 'statistiken.php', 'rules.php', 'karte.php', 'karte2.php', 'spieler.php'])) {
header('Location:nachrichten.php');
@@ -208,21 +208,29 @@ class Session {
global $database,$link;
$villageIDs = implode(', ', $this->villages);
$hero = mysqli_fetch_array(
mysqli_query($database->dblink, '
if (!count($this->villages)) {
$this->Logout();
header('login.php');
exit;
}
// check if hero unit for this player is present anywhere on the map
$q = '
SELECT
IFNULL((SELECT SUM(hero) from '.TB_PREFIX.'enforcement where `from` IN('.$villageIDs.')), 0) +
IFNULL((SELECT SUM(hero) from '.TB_PREFIX.'units where `vref` IN('.$villageIDs.')), 0) +
IFNULL((SELECT SUM(t11) from '.TB_PREFIX.'prisoners where `from` IN('.$villageIDs.')), 0) +
IFNULL((SELECT SUM(t11) FROM '.TB_PREFIX.'movement, '.TB_PREFIX.'attacks WHERE '.TB_PREFIX.'movement.`from` IN('.$villageIDs.') and '.TB_PREFIX.'movement.ref = '.TB_PREFIX.'attacks.id and '.TB_PREFIX.'movement.proc = 0 and '.TB_PREFIX.'movement.sort_type = 3), 0) +
IFNULL((SELECT SUM(t11) FROM '.TB_PREFIX.'movement, '.TB_PREFIX.'attacks where '.TB_PREFIX.'movement.`to` IN('.$villageIDs.') and '.TB_PREFIX.'movement.ref = '.TB_PREFIX.'attacks.id and '.TB_PREFIX.'movement.proc = 0 and '.TB_PREFIX.'movement.sort_type = 4), 0)
as herocount'),
MYSQLI_ASSOC
)['herocount'];
as herocount';
$heroUnitRegisters = mysqli_fetch_array( mysqli_query($database->dblink, $q, MYSQLI_ASSOC ))['herocount'];
$isHeroElsewhere = $database->getHeroDeadReviveOrInTraining($this->uid);
// check if the actual hero is alive or being trained/revived into a living state
$isHeroLivingOrRaising = $database->getHeroDeadReviveOrInTraining($this->uid);
if($isHeroElsewhere && !$hero) {
// if he doesn't register anywhere on the map but is marked as alive,
// we need to kill him
if(!$heroUnitRegisters && $isHeroLivingOrRaising) {
$database->KillMyHero($this->uid);
}
}
@@ -261,7 +269,9 @@ class Session {
if($this->userarray['b4'] > $this->time) {
$this->bonus4 = 1;
}
$this->CheckHeroReal();
if (!in_array($this->username, ['Support', 'Multihunter'])) {
$this->CheckHeroReal();
}
}
private function SurfControl(){
+115 -125
View File
@@ -443,141 +443,131 @@ class Technology {
}
public function getUpkeep($array,$type,$vid=0,$prisoners=0) {
global $database,$session,$village;
if($vid==0) { $vid=$village->wid; }
$buildarray = array();
$buildarray = $database->getResourceLevel($vid);
$upkeep = 0;
switch($type) {
case 0:
$start = 1;
$end = 50;
break;
case 1:
$start = 1;
$end = 10;
break;
case 2:
$start = 11;
$end = 20;
break;
case 3:
$start = 21;
$end = 30;
break;
case 4:
$start = 31;
$end = 40;
break;
case 5:
$start = 41;
$end = 50;
break;
}
global $database, $session, $village;
for($j=19;$j<=38;$j++) {
if($buildarray['f'.$j.'t'] == 41) {
$horsedrinking = $j;
break;
}
}
if ( $vid == 0 ) {
$vid = $village->wid;
}
for($i=$start;$i<=$end;$i++) {
$k = $i-$start+1;
$unit = "u".$i;
$unit2 = "t".$k;
global $$unit;
$dataarray = $$unit;
if($prisoners == 0){
if(isset($horsedrinking)){
if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)
) {
$upkeepDecrement = 0;
switch ($i) {
case 4: $upkeepDecrement = 2;
break;
$buildarray = array();
$buildarray = $database->getResourceLevel( $vid );
$upkeep = 0;
case 5: $upkeepDecrement = 3;
break;
switch ( $type ) {
case 0:
$start = 1;
$end = 50;
break;
case 1:
$start = 1;
$end = 10;
break;
case 2:
$start = 11;
$end = 20;
break;
case 3:
$start = 21;
$end = 30;
break;
case 4:
$start = 31;
$end = 40;
break;
case 5:
$start = 41;
$end = 50;
break;
}
case 6: $upkeepDecrement = 4;
break;
}
$upkeep += ($dataarray['pop'] - $upkeepDecrement) * $array[$unit];
} else {
$upkeep += $dataarray['pop'] * $array[$unit];
}
} else {
$upkeep += $dataarray['pop'] * $array[$unit];
}
} else {
if(isset($horsedrinking)){
if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)
) {
$upkeepDecrement = 0;
switch ($i) {
case 4: $upkeepDecrement = 2;
break;
for ( $j = 19; $j <= 38; $j ++ ) {
if ( $buildarray[ 'f' . $j . 't' ] == 41 ) {
$horsedrinking = $j;
break;
}
}
case 5: $upkeepDecrement = 3;
break;
for ( $i = $start; $i <= $end; $i ++ ) {
$k = $i - $start + 1;
$unit = "u" . $i;
$unit2 = "t" . $k;
global $$unit;
$dataarray = $$unit;
if ( $prisoners == 0 ) {
if ( isset( $horsedrinking ) ) {
if ( ( $i == 4 && $buildarray[ 'f' . $horsedrinking ] >= 10 )
|| ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
|| ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 )
) {
$upkeep += (( $dataarray['pop'] - 1 ) * $array[ $unit ]);
} else {
$upkeep += ($dataarray['pop'] * $array[ $unit ]);
}
} else {
$upkeep += ($dataarray['pop'] * $array[ $unit ]);
}
} else {
if ( isset( $horsedrinking ) ) {
if ( ( $i == 4 && $buildarray[ 'f' . $horsedrinking ] >= 10 )
|| ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
|| ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 )
) {
$upkeep += (( $dataarray['pop'] - 1 ) * $array[ $unit2 ]);
} else {
$upkeep += ($dataarray['pop'] * $array[ $unit2 ]);
}
} else {
$upkeep += ($dataarray['pop'] * $array[ $unit2 ]);
}
}
}
case 6: $upkeepDecrement = 4;
break;
}
$upkeep += ($dataarray['pop'] - $upkeepDecrement) * $array[$unit2];
} else {
$upkeep += $dataarray['pop'] * $array[$unit2];
}
} else {
$upkeep += $dataarray['pop'] * $array[$unit2];
}
}
}
// $unit = "hero";
// global $$unit;
// $dataarray = $$unit;
if($prisoners == 0){
if (!isset($array['hero'])) {
// $unit = "hero";
// global $$unit;
// $dataarray = $$unit;
if ( $prisoners == 0 ) {
if ( ! isset( $array['hero'] ) ) {
$array['hero'] = 0;
}
$upkeep += $array['hero'] * 6;
}else{
if (!isset($array['t11'])) {
$upkeep += $array['hero'] * 6;
} else {
if ( ! isset( $array['t11'] ) ) {
$array['t11'] = 0;
}
$upkeep += $array['t11'] * 6;
}
$artefact = count($database->getOwnUniqueArtefactInfo2($session->uid,4,3,0));
$artefact1 = count($database->getOwnUniqueArtefactInfo2($vid,4,1,1));
$artefact2 = count($database->getOwnUniqueArtefactInfo2($session->uid,4,2,0));
if($artefact > 0){
$upkeep /= 2;
$upkeep = round($upkeep);
}else if($artefact1 > 0){
$upkeep /= 2;
$upkeep = round($upkeep);
}else if($artefact2 > 0){
$upkeep /= 4;
$upkeep = round($upkeep);
$upkeep *= 3;
}
$foolartefact = $database->getFoolArtefactInfo(4,$vid,$session->uid);
if(count($foolartefact) > 0){
foreach($foolartefact as $arte){
if($arte['bad_effect'] == 1){
$upkeep *= $arte['effect2'];
}else{
$upkeep /= $arte['effect2'];
$upkeep = round($upkeep);
}
}
}
return $upkeep;
$upkeep += $array['t11'] * 6;
}
$artefact = count( $database->getOwnUniqueArtefactInfo2( $session->uid, 4, 3, 0 ) );
$artefact1 = count( $database->getOwnUniqueArtefactInfo2( $vid, 4, 1, 1 ) );
$artefact2 = count( $database->getOwnUniqueArtefactInfo2( $session->uid, 4, 2, 0 ) );
if ( $artefact > 0 ) {
$upkeep /= 2;
$upkeep = round( $upkeep );
} else if ( $artefact1 > 0 ) {
$upkeep /= 2;
$upkeep = round( $upkeep );
} else if ( $artefact2 > 0 ) {
$upkeep /= 4;
$upkeep = round( $upkeep );
$upkeep *= 3;
}
$foolartefact = $database->getFoolArtefactInfo( 4, $vid, $session->uid );
if ( count( $foolartefact ) > 0 ) {
var_dump($foolartefact);
foreach ( $foolartefact as $arte ) {
if ( $arte['bad_effect'] == 1 ) {
$upkeep *= $arte['effect2'];
} else {
$upkeep /= $arte['effect2'];
$upkeep = round( $upkeep );
}
}
}
return $upkeep;
}
private function trainUnit($unit,$amt,$great=false) {
+6 -1
View File
@@ -186,7 +186,8 @@ class Units {
//check if banned/admin:
$villageOwner = $database->getVillageField($id,'owner');
$userAccess = $database->getUserField($villageOwner,'access',0);
if($userAccess == '0' or $userAccess == '8' or (!ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == '9')){
$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;
}
@@ -552,6 +553,10 @@ class Units {
header( "Location: a2b.php" );
exit;
}
// prevent re-use of the same attack via re-POSTing the same data
$database->remA2b($data['id']);
header( "Location: build.php?id=39" );
exit;
+2 -1
View File
@@ -142,8 +142,9 @@ class Village {
$this->production['wood'] = $this->getWoodProd();
$this->production['clay'] = $this->getClayProd();
$this->production['iron'] = $this->getIronProd();
if ($uniqueA['size']==3 && $uniqueA['owner']==$session->uid){
$this->production['crop'] = $this->getCropProd()-$this->pop-(($upkeep)-round($upkeep*0.50));
$this->production['crop'] = $this->getCropProd()- $this->pop - (($upkeep)-round($upkeep*0.50));
}else if ($normalA['type']==4 && $normalA['size']==1 && $normalA['owner']==$session->uid){
$this->production['crop'] = $this->getCropProd()-$this->pop-(($upkeep)-round($upkeep*0.25));
+224
View File
@@ -0,0 +1,224 @@
[![Code Triagers Badge](https://www.codetriage.com/shadowss/travianz/badges/users.svg)](https://www.codetriage.com/shadowss/travianz) [![Join the chat at https://gitter.im/TravianZ-V8/Lobby](https://badges.gitter.im/TravianZ-V8/Lobby.svg)](https://gitter.im/TravianZ-V8/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
TravianZ Version v.8.3.3 BETA b3
Download and updates : https://github.com/Shadowss/TravianZ
Thank you to : Shadowss , advocaite , brainiacX , MisterX , yi12345 , ronix , Elio , martinambrus and many others that make that version posible.
First i want to say THANKS for all who worked on that version , will find a list on Version file.
TravianZ is based on TravianX v6.0.0 or TravianZ or TravianX with some grapich changes from ZravianX.
martinambrus changes:
1. PHP7 compatibility (mysql functions converted to mysqli)
2. a lot of database optimizations (not in code but in MySQL tables themselves, mostly adding indexes to speed things up)
3. fix for a nasty JavaScript bug which was killing the browser with any number of countdown(s) running on page (even one!)
4. large map not centered fix
5. WW Buildings have no aliance (PHP warning removed)
6. password in Admin area for deletion of user is now really a password field
7. Multihunter couldn't progress beyond Quest level 4
8. PLUS settings (including PayPal options) can be configured in Admin
9. installation timeouting fix
10. extra settings in admin save config correctly
11. security tightened to try and prevent MySQL injections from in-game
12. assigning link to alliance forum now works
13. alliance description now really editable
14. Admin SQL injection fixes
15. fix for map not showing natar villages
16. weak MD5 password in database converted into strong bcrypt ones
17. newsbox 1 best player can also show admin if they are enabled in config
18. Natar random attacks show attacker as ?? as intended now
19. System Message can contain quotes and no longer inserts BOM characters at the beginning
20. front-end + Admin page titles now correctly reflect where we really are (so browsing history can be navigated easily instead of showing Travian on every page)
21. Return to Server link in Admin works fine if homepage in config does not end with a slash
22. Great Workshop no longer shows as "Error" in Admin when editing Village
23. Great Workshop added to manual pages
24. new Combat Simulator link when showing details of oasis for quicker determination if we can win that fight
25. Support, Taskmaster & Multihunter no longer shown in statistics as last players with 0 villages
26. invalid `<br />` tags no longer added to description textboxes when editing User in Admin
27. editing additional user data in Admin now saves them when Enter is used instead of clicking on "Save" as well
28. fixed reports pagination always staying on "All" tab
29. fix for the "fixed" :) self-kicking from an alliance
30. fixed sending messages to player via Admin
31. Support user is now a part of the installation and can be logged into Admin and in-game (albeit in game, they have no village, so can not access fields or village views)
32. messages sent to Multihunter now have the correct recepient shown next to them (was empty)
33. new links in Admin to access in-game messages + Mass Message & System Message dialogs
34. mass messages sent out under Support rather than Multihunter (we should not be scaring people :D)
35. fixed displaying of current Quest in Admin
36. fixed OK message in Admin when resetting All Players' PLUS
37. new config option to show Support messages in Admin's mailbox
38. new feature: allowing messages to be sent as Support from in-game when user is Admin + it's allowed in config
39. not allowing installation if old data are still in database to prevent multiple worlds generation and game misbehavior
40. fixed quest 1 to reload the page and allow for immediate completion of the woodcutter
41. NPC links added to units in Hero Mansion
42. fixed random attacks attacker tribe (Natars) when building Wonder of the World
43. players who post in an Alliance forum are now notified of each subsequent post in that topic via messages
44. editing troops in Admin now saves them when Enter is used instead of clicking on "Save" as well
45. added option into Admin config to allow Administrative accounts to be raided and attacked (which also permits trading with them via Market)
46. vastly improved speed of world and oasis generation steps
47. Multihunter & Support password fields are now really password fields
48. login & logout pages redirect to install if game is not installed yet
49. Multihunter can no longer build beyond level 20
50. installation final screen shows info to remove install folder and CHMOD folders on Linux
51. fixed farms generation via Admin - these will be created all over map, not only where new players are currently being placed (players are positioned like this: middle section for first 20 days, then corners, then in between)
52. fixed logged-in check (no longer redirects to login.php from admin when not logged-in to the game itself)
53. horse drinking trough now decreases crop usage by real the amounts of how much crop Roman horse units really consume
54. fixed ability to build Great Warehouse and Great Granary in non-Natar villages
55. fixed ability to build buildings not belonging to player's tribe (trapper, brewery, horse drinking trough)
56. fixed admin help for editing village not showing IDs for all buildings
57. new feature: access log (only in config.php file to be used by advanced users to log game traffic and reveal URL hacks)
58. fixed ability to go back in quests and gain gold and resources all over again when using default quests set
59. fix for "finish immediatelly" PLUS button to decrease gold amount even when demolition alone has been insta-completed
60. fixed maximum of 3 heroes in the Hero's Mansion (+ update of the Admin interface to account for it)
61. new feature: Embassy mechanics overhaul - check out our [Wiki Page](https://github.com/Shadowss/TravianZ/wiki/New-Alliance-&-Embassy-Mechanics) or this [Google Presentation](https://docs.google.com/presentation/d/1KN1qVAlxVj7aAN6F9QkRai1oliajfxKPIaJ4MSodUac/edit?usp=sharing) to learn more about it
666. there's just a lot of stuff being worked on in this project and I'm too lazy to be writing all of it down... when the project is at lease stable, I think this will make sense... for now, it's just an "I did this" shoutout and people can see that in commits
Shadowss changes:
1. Modified Plus System with packages.</br>
2. Modified in Plus System and added Account Statement.</br>
3. Enabled Report Player in Profile. Send message to Multihunter. </br>
4. Enabled Graphic Pack in Profile (NOT CODED YET).</br>
5. Enabled in Profile : Auto Completation , Large Map , Report Filter and Time Preferences (NOT CODED YET).</br>
6. Integrate Support Section in game.</br>
7. Modified footer and menu and added version and bugs (I mean detailed version.php and bugs.php).</br>
8. Modified all admin page , now all pictures appers correctly.</br>
9. Added night / day pictures. (thanks to advocaite).</br>
10. Activate inactive player in Admin Panel.</br>
11. Added Server Maintenence in Admin Panel (Not working 100% , i mean mode ban all players).</br>
12. Activate Player Report in Admin Panel (NOT CODED YET).</br>
13. Many bug fixed in Admin Panel.</br>
14. Negative crop fixed , now units die (starvation). WORKS LIKE REAL TRAVIAN !!!</br>
15. Medal fixed.</br>
16. Added new quests (alliance , main building 5 , granary level 3 , warehouse level 5 , palace or residence , 3 settlers , new village , wall).</br>
17. Winner decoded end time fixed , 403 , 404 , 500 errors are now decoded.</br>
18. Populate and regenerate oasis automation function added and fixed.</br>
19. Fixed palace , now cannot be build more than one palace / accout.</br>
20. Now you need a warehouse and granary level 20 to build great granary and great warehouse.</br>
21. Cannot send attacks and send resource to banned players.</br>
22. Now banned palyer cannot recive resource from marketplace.</br>
23. Fix message replay , now can be viwed from who came message.</br>
24. Added in instalation Nature Regeneration Time.</br>
25. Fix oasis.tpl in instalation files.</br>
26. Fix ranking search from everyware.</br>
27. Fix "Finish all constructions for 2 gold." now you dont lose gold when you simply click.</br>
28. Fix bonus on artefacts , now show what bonus gives you.(thanks to brainiacX)</br>
29. Fix settler bug , now you cannot train settlers if you dont have resource. And also modifyResource function updated. (thanks to brainiacX)</br>
30. Fix brewerey now can be build only on capital.</br>
31. Fix treasurey and palace , now cannot be build on WW village.</br>
32. Fix greatbarraks.</br>
33. Fix eraseble hero , now you can delete your hero.</br>
34. Fix desapear hero when you send as reinforcement.</br>
35. Fix message problem with '</br>
36. Fix train hero for unit pretorian</br>
37. Fix merchant quantity</br>
38. Fix battle system for catapults</br>
39. Fix delete player in admin panel</br>
40. Added automated system for give medals and also added in instalation file</br>
41. Fix special characters when send troops</br>
45. Fix bug 10 from NarcisRO list : If you have plus account activated you cannot see the attck/deff/scout images when you attack a village (i mean img on villages : red swords etc..)</br>
43. Fix forum surveys - NOT DONE</br>
44. Fix wall image when spy someone for every tribe</br>
45. Fix the top romans/teutons/gauls icon must show you the first rank of each race,not the whole page</br>
46. Fix destroy village bug</br>
47. Fix conquer oasis.</br>
48. Fix movements.tpl (now show purple sword if your oasis is attacked or if you found new village)</br>
49. Fixed movements on rally point if your oasis is under attack</br>
50. Fixed vulnerability attack on message.</br>
51. Fixed scouting all player when create natars.</br>
52. Fixed catapult if have artefact for random target. Now can target WW even have that artefact like says.</br>
53. Fix special characters on message (script alert not work now).</br>
54. Fix mightiest bug of travian , double troops , now you won`t have any problems with double troops. Works for own units and for enforcement units.</br>
55. Fix catapult target on brewerey , now you can target brewerey.</br>
56. Added loss protection if you have beginner protection and want to attack a player you loss protection.</br>
57. Fix artefacts, will not win more artifacts from the same village.</br>
58. Fix UTF8 in database and sql.sql file.</br>
59. Fixed Username HACK on register.</br>
60. Fixed Village hack in profile . </br>
61. Fixed a Bug where Founder or a user in alliance can kick himself.</br>
62. Fixed new village must build a rally point. </br>
63. Fix sorting distance artefact village . </br>
64. Fix to conquer oasis: can conquer 1 attack if nature troop die. </br>
65. Fix report scout by Natars. Now report player can see.. </br>
66. Fix area and location like real travian. </br>
67. Fix field natar village set to type=3. </br>
68. Fix natar village area 400/400 or WORLD_MAX not the random area. </br>
69. Fix create_account : cannot create natar if already exist. </br>
70. Fix counter timer if timer < 0 = display 0:00:00 and not display like your time pc. </br>
71. Fix quest_core , now is like real travian. </br>
72. Fix update oasis unit. </br>
73. Fixed Registration hack. </br>
74. Fixed Village hack hidden village and <name> ! </br>
75. Fixed hidden Alliance name and fixed the bug of kicking your self if you are founder or anything else. </br>
76. Fix conquer artefact. </br>
77. Fix ranking and Quest 4. </br>
78. Fix finishAll building/demolition/tecknology. </br>
79. Fix conquer Occupied Oasis. </br>
80. Fix NPC trade on settler in village or palace. </br>
81. Fix bug when paste address to update building or resource , now not possible to upgrade. </br>
82. Fix spy : When defender has no spy's in his village, an incomming spy attack should be unnoticed, and the defender shouldn't get a report and also there shouldn't appear red swords in dorf.1 when there are no own spy's in village.</br>
83. Fix village to destroy and less query. </br>
84. Fix settler to raid (1 unit of settler can carry 3000 resource...wow!!)</br>
85. Fix dorf3 , now timer works corectly. </br>
86. Added timezone in instalation file , and can be edited after installation on config. </br>
87. The damage must be calculate for all troops as a defender. </br>
88. Battle system is fixed and it`s work like real travian. </br>
89. War Simulator system is fixed and it`s work like real travian. </br>
90. Fix calculation culturepoint according to the speed server.</br>
91. Fix to delete hero table when delete user from admin.</br>
92. Fix link to coor village from admin.</br>
93. Fix return troops if village destroy.</br>
94. Fix link list multivillage.</br>
95. Fix rally point to list troops own/other village/oasis.</br>
96. Fix recive report when other player send me reinforcement to my oasis</br>
97. Fix calculate defender hero</br>
98. Fix enforcement oasis</br>
99. Fix hero XP calculation by crop consumed and share point hero xp</br>
100. Fix chiefting village only normal attack can reduce loyalty</br>
101. Fix conquered oasis. Hero must use normal attack if oasis is conquered by other player</br>
102. Fix destroy village.</br>
103. Fix returntroop in oasis when destroy village</br>
104. Fix total point hero and statistics calculation by crop consumption</br>
105. Fix hero reinfocement sometimes mising in action</br>
106. Fix total of trapper bug is full trapp if 1 troop only you send.</br>
107. Fix invalid argument supplied if using masterbuilder</br>
108. Change entire database to InnoDB.
TienTN changes:
1. Change install/templates/config.tpl to deal with deprecated warning from new PHP version.
2. Fix install/data/sql.sql, to be executable in current MySQL version.
3. Fix db_MYSQL.php
with safe_mysql_fetch_all, and safe_mysqli_fetch_array wrappers, to avoid
Warning: mysql_fetch_all/array() expects parameter 1 to be resource, boolean given
4. Fix the db_MYSQLi.php in class object declaration(if anybody want to use db_MYSQLi.php again)
5. Fix the unx.js file for error:
VM5051:1 Uncaught SyntaxError: Unexpected token )
jd.onreadystatechange @ unx.js?0ac36:170
This error arises when moving to the border of the map.
6. Fix the map loop moving bug:
Symptom: For map not set to size 400x400, on the map page,
when moving on and on in one direction, cross the map border(loop) two times,
the moving function will be crashed(freeze, you can't move any more).
I found out that unx.js handle a static map size(400x400).
So I fixed this with a m_c.world_max variable from mapview.tpl and changed the unx.js accordingly.
7. Fix the constructor global variable missing in Session.php
TPLinux Changes:
1. Fix FinishAll with two gold issue/bug
2. Fix Reload crush issue after building construction finished
3. Fix in_array bug in show more buldings in WWV
4. Fix winner redirection
5. Fix winner WW image path
6. Convert '<?' To '<?php' in a2ab.php (Account transaction page)
7. Fixing ( Building shape not upgraded after Construct finish )
8. Change multihunter msg color to orange
9. Change fetch time to server speed if > 5
10. Fixing Quest not appears if press (play no tasks)
11. Fix the redirection from rally point when attack is finished
12. Remove Rally point advantage
13. Fix fullscreen map in rtl layout
14. Fix divesion by Zero bug in general statics
--
+52 -212
View File
@@ -1,224 +1,64 @@
[![Code Triagers Badge](https://www.codetriage.com/shadowss/travianz/badges/users.svg)](https://www.codetriage.com/shadowss/travianz) [![Join the chat at https://gitter.im/TravianZ-V8/Lobby](https://badges.gitter.im/TravianZ-V8/Lobby.svg)](https://gitter.im/TravianZ-V8/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Code Triagers Badge](https://www.codetriage.com/shadowss/travianz/badges/users.svg)](https://www.codetriage.com/shadowss/travianz)
[![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]()
[![GitHub Release](https://img.shields.io/github/release/Shadowss/TravianZ/all.svg)]()
[![Github All Downloads](https://img.shields.io/github/downloads/Shadowss/TravianZ/total.svg)]()
[![GitHub contributors](https://img.shields.io/github/contributors/Shadowss/TravianZ.svg)]()
[![license](https://img.shields.io/github/license/Shadowss/TravianZ.svg)]()
[![GitHub last commit](https://img.shields.io/github/last-commit/Shadowss/TravianZ.svg)]()
[![Proudly Coded in PHPStorm](https://img.shields.io/badge/coded%20in-PHPStorm-BD5CF3.svg)](https://www.jetbrains.com/buy/opensource/?product=phpstorm)
[![Donate to this project on LiberaPay](https://img.shields.io/badge/LiberaPay-donate-F6C915.svg)](https://liberapay.com/martinambrus/donate)
[![Join the chat at https://gitter.im/TravianZ-V8/Lobby](https://badges.gitter.im/TravianZ-V8/Lobby.svg)](https://gitter.im/TravianZ-V8/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Watch how this was made on YouTube](https://img.shields.io/badge/The%20making%20of...-YouTube-FF0000.svg)](https://www.youtube.com/watch?v=1XiHhpGUmQg&list=PLzV5avt1FFHorlIeoL9YX0pdb9bj-FO84)
TravianZ Version v.8.3.3 BETA b2
TravianZ Version **v.8.3.3 BETA b4**
======
**Note:** this game is still in a pre-release state, although at this point it is very playable, tested and found to be fairly stable
Download and updates : https://github.com/Shadowss/TravianZ
**Quick links:**
* [Download and Updates](https://github.com/Shadowss/TravianZ) &raquo;&raquo; https://github.com/Shadowss/TravianZ
* [Wiki](https://github.com/Shadowss/TravianZ/wiki)
* [Game Mechanics](http://travian.wikia.com/wiki/Travian_Wiki)
* [The Making Of](https://www.youtube.com/watch?v=1XiHhpGUmQg&list=PLzV5avt1FFHorlIeoL9YX0pdb9bj-FO84) - YouTube Videos about this project
* [Donate to TravianZ](https://liberapay.com/martinambrus/donate)
Thank you to : Shadowss , advocaite , brainiacX , MisterX , yi12345 , ronix , Elio , martinambrus and many others that make that version posible.
**Minimum requirements:**
* [PHP](http://php.net/) 5.6.32+
* [MySQL Community Server](https://dev.mysql.com/downloads/mysql/) 5.5+
* or alternatively, [MariaDB](https://downloads.mariadb.org/) 5.5+
* please see also the compatibility notes on [this Wiki page](https://github.com/Shadowss/TravianZ/wiki/Known-Bugs)
First i want to say THANKS for all who worked on that version , will find a list on Version file.
**Dedicated or shared hosting?**
TravianZ is based on TravianX v6.0.0 or TravianZ or TravianX with some grapich changes from ZravianX.
We *strongly* recommend using a ***dedicated hosting*** for this game. Big Travian servers used to host
thousands of players and the original servers still had about 300ms page display time. The legacy code
in this clone (which was created in 2013) is right now doing about **400 MySQL queries** (questions
to the database) per single page refresh - which is usually well beyond what most shared hostings can support
with a big enough player base.
**Support & Bug reports**
martinambrus changes:
1. PHP7 compatibility (mysql functions converted to mysqli)
2. a lot of database optimizations (not in code but in MySQL tables themselves, mostly adding indexes to speed things up)
3. fix for a nasty JavaScript bug which was killing the browser with any number of countdown(s) running on page (even one!)
4. large map not centered fix
5. WW Buildings have no aliance (PHP warning removed)
6. password in Admin area for deletion of user is now really a password field
7. Multihunter couldn't progress beyond Quest level 4
8. PLUS settings (including PayPal options) can be configured in Admin
9. installation timeouting fix
10. extra settings in admin save config correctly
11. security tightened to try and prevent MySQL injections from in-game
12. assigning link to alliance forum now works
13. alliance description now really editable
14. Admin SQL injection fixes
15. fix for map not showing natar villages
16. weak MD5 password in database converted into strong bcrypt ones
17. newsbox 1 best player can also show admin if they are enabled in config
18. Natar random attacks show attacker as ?? as intended now
19. System Message can contain quotes and no longer inserts BOM characters at the beginning
20. front-end + Admin page titles now correctly reflect where we really are (so browsing history can be navigated easily instead of showing Travian on every page)
21. Return to Server link in Admin works fine if homepage in config does not end with a slash
22. Great Workshop no longer shows as "Error" in Admin when editing Village
23. Great Workshop added to manual pages
24. new Combat Simulator link when showing details of oasis for quicker determination if we can win that fight
25. Support, Taskmaster & Multihunter no longer shown in statistics as last players with 0 villages
26. invalid `<br />` tags no longer added to description textboxes when editing User in Admin
27. editing additional user data in Admin now saves them when Enter is used instead of clicking on "Save" as well
28. fixed reports pagination always staying on "All" tab
29. fix for the "fixed" :) self-kicking from an alliance
30. fixed sending messages to player via Admin
31. Support user is now a part of the installation and can be logged into Admin and in-game (albeit in game, they have no village, so can not access fields or village views)
32. messages sent to Multihunter now have the correct recepient shown next to them (was empty)
33. new links in Admin to access in-game messages + Mass Message & System Message dialogs
34. mass messages sent out under Support rather than Multihunter (we should not be scaring people :D)
35. fixed displaying of current Quest in Admin
36. fixed OK message in Admin when resetting All Players' PLUS
37. new config option to show Support messages in Admin's mailbox
38. new feature: allowing messages to be sent as Support from in-game when user is Admin + it's allowed in config
39. not allowing installation if old data are still in database to prevent multiple worlds generation and game misbehavior
40. fixed quest 1 to reload the page and allow for immediate completion of the woodcutter
41. NPC links added to units in Hero Mansion
42. fixed random attacks attacker tribe (Natars) when building Wonder of the World
43. players who post in an Alliance forum are now notified of each subsequent post in that topic via messages
44. editing troops in Admin now saves them when Enter is used instead of clicking on "Save" as well
45. added option into Admin config to allow Administrative accounts to be raided and attacked (which also permits trading with them via Market)
46. vastly improved speed of world and oasis generation steps
47. Multihunter & Support password fields are now really password fields
48. login & logout pages redirect to install if game is not installed yet
49. Multihunter can no longer build beyond level 20
50. installation final screen shows info to remove install folder and CHMOD folders on Linux
51. fixed farms generation via Admin - these will be created all over map, not only where new players are currently being placed (players are positioned like this: middle section for first 20 days, then corners, then in between)
52. fixed logged-in check (no longer redirects to login.php from admin when not logged-in to the game itself)
53. horse drinking trough now decreases crop usage by real the amounts of how much crop Roman horse units really consume
54. fixed ability to build Great Warehouse and Great Granary in non-Natar villages
55. fixed ability to build buildings not belonging to player's tribe (trapper, brewery, horse drinking trough)
56. fixed admin help for editing village not showing IDs for all buildings
57. new feature: access log (only in config.php file to be used by advanced users to log game traffic and reveal URL hacks)
58. fixed ability to go back in quests and gain gold and resources all over again when using default quests set
59. fix for "finish immediatelly" PLUS button to decrease gold amount even when demolition alone has been insta-completed
60. fixed maximum of 3 heroes in the Hero's Mansion (+ update of the Admin interface to account for it)
61. new feature: Embassy mechanics overhaul - check out our [Wiki Page](https://github.com/Shadowss/TravianZ/wiki/New-Alliance-&-Embassy-Mechanics) or this [Google Presentation](https://docs.google.com/presentation/d/1KN1qVAlxVj7aAN6F9QkRai1oliajfxKPIaJ4MSodUac/edit?usp=sharing) to learn more about it
666. there's just a lot of stuff being worked on in this project and I'm too lazy to be writing all of it down... when the project is at lease stable, I think this will make sense... for now, it's just an "I did this" shoutout and people can see that in commits
We are usually available to chat at our [Gitter channel](https://gitter.im/TravianZ-V8/Lobby), if you like to ask
any questions or just talk to the developers about how great their day is today :) As for bug reports, please use
the [Issues tab](https://github.com/Shadowss/TravianZ/issues) and create new issue, whether it's an error in game
or you have a feature request to be included in the play.
**The team**
* [Shadowss](https://github.com/Shadowss) - project owner and an occasional developer / tester
* [martinambrus](https://github.com/martinambrus) - lead developer
* [Vladyslav](https://github.com/velhbxtyrj) - rigorous game tester
Shadowss changes:
1. Modified Plus System with packages.</br>
2. Modified in Plus System and added Account Statement.</br>
3. Enabled Report Player in Profile. Send message to Multihunter. </br>
4. Enabled Graphic Pack in Profile (NOT CODED YET).</br>
5. Enabled in Profile : Auto Completation , Large Map , Report Filter and Time Preferences (NOT CODED YET).</br>
6. Integrate Support Section in game.</br>
7. Modified footer and menu and added version and bugs (I mean detailed version.php and bugs.php).</br>
8. Modified all admin page , now all pictures appers correctly.</br>
9. Added night / day pictures. (thanks to advocaite).</br>
10. Activate inactive player in Admin Panel.</br>
11. Added Server Maintenence in Admin Panel (Not working 100% , i mean mode ban all players).</br>
12. Activate Player Report in Admin Panel (NOT CODED YET).</br>
13. Many bug fixed in Admin Panel.</br>
14. Negative crop fixed , now units die (starvation). WORKS LIKE REAL TRAVIAN !!!</br>
15. Medal fixed.</br>
16. Added new quests (alliance , main building 5 , granary level 3 , warehouse level 5 , palace or residence , 3 settlers , new village , wall).</br>
17. Winner decoded end time fixed , 403 , 404 , 500 errors are now decoded.</br>
18. Populate and regenerate oasis automation function added and fixed.</br>
19. Fixed palace , now cannot be build more than one palace / accout.</br>
20. Now you need a warehouse and granary level 20 to build great granary and great warehouse.</br>
21. Cannot send attacks and send resource to banned players.</br>
22. Now banned palyer cannot recive resource from marketplace.</br>
23. Fix message replay , now can be viwed from who came message.</br>
24. Added in instalation Nature Regeneration Time.</br>
25. Fix oasis.tpl in instalation files.</br>
26. Fix ranking search from everyware.</br>
27. Fix "Finish all constructions for 2 gold." now you dont lose gold when you simply click.</br>
28. Fix bonus on artefacts , now show what bonus gives you.(thanks to brainiacX)</br>
29. Fix settler bug , now you cannot train settlers if you dont have resource. And also modifyResource function updated. (thanks to brainiacX)</br>
30. Fix brewerey now can be build only on capital.</br>
31. Fix treasurey and palace , now cannot be build on WW village.</br>
32. Fix greatbarraks.</br>
33. Fix eraseble hero , now you can delete your hero.</br>
34. Fix desapear hero when you send as reinforcement.</br>
35. Fix message problem with '</br>
36. Fix train hero for unit pretorian</br>
37. Fix merchant quantity</br>
38. Fix battle system for catapults</br>
39. Fix delete player in admin panel</br>
40. Added automated system for give medals and also added in instalation file</br>
41. Fix special characters when send troops</br>
45. Fix bug 10 from NarcisRO list : If you have plus account activated you cannot see the attck/deff/scout images when you attack a village (i mean img on villages : red swords etc..)</br>
43. Fix forum surveys - NOT DONE</br>
44. Fix wall image when spy someone for every tribe</br>
45. Fix the top romans/teutons/gauls icon must show you the first rank of each race,not the whole page</br>
46. Fix destroy village bug</br>
47. Fix conquer oasis.</br>
48. Fix movements.tpl (now show purple sword if your oasis is attacked or if you found new village)</br>
49. Fixed movements on rally point if your oasis is under attack</br>
50. Fixed vulnerability attack on message.</br>
51. Fixed scouting all player when create natars.</br>
52. Fixed catapult if have artefact for random target. Now can target WW even have that artefact like says.</br>
53. Fix special characters on message (script alert not work now).</br>
54. Fix mightiest bug of travian , double troops , now you won`t have any problems with double troops. Works for own units and for enforcement units.</br>
55. Fix catapult target on brewerey , now you can target brewerey.</br>
56. Added loss protection if you have beginner protection and want to attack a player you loss protection.</br>
57. Fix artefacts, will not win more artifacts from the same village.</br>
58. Fix UTF8 in database and sql.sql file.</br>
59. Fixed Username HACK on register.</br>
60. Fixed Village hack in profile . </br>
61. Fixed a Bug where Founder or a user in alliance can kick himself.</br>
62. Fixed new village must build a rally point. </br>
63. Fix sorting distance artefact village . </br>
64. Fix to conquer oasis: can conquer 1 attack if nature troop die. </br>
65. Fix report scout by Natars. Now report player can see.. </br>
66. Fix area and location like real travian. </br>
67. Fix field natar village set to type=3. </br>
68. Fix natar village area 400/400 or WORLD_MAX not the random area. </br>
69. Fix create_account : cannot create natar if already exist. </br>
70. Fix counter timer if timer < 0 = display 0:00:00 and not display like your time pc. </br>
71. Fix quest_core , now is like real travian. </br>
72. Fix update oasis unit. </br>
73. Fixed Registration hack. </br>
74. Fixed Village hack hidden village and <name> ! </br>
75. Fixed hidden Alliance name and fixed the bug of kicking your self if you are founder or anything else. </br>
76. Fix conquer artefact. </br>
77. Fix ranking and Quest 4. </br>
78. Fix finishAll building/demolition/tecknology. </br>
79. Fix conquer Occupied Oasis. </br>
80. Fix NPC trade on settler in village or palace. </br>
81. Fix bug when paste address to update building or resource , now not possible to upgrade. </br>
82. Fix spy : When defender has no spy's in his village, an incomming spy attack should be unnoticed, and the defender shouldn't get a report and also there shouldn't appear red swords in dorf.1 when there are no own spy's in village.</br>
83. Fix village to destroy and less query. </br>
84. Fix settler to raid (1 unit of settler can carry 3000 resource...wow!!)</br>
85. Fix dorf3 , now timer works corectly. </br>
86. Added timezone in instalation file , and can be edited after installation on config. </br>
87. The damage must be calculate for all troops as a defender. </br>
88. Battle system is fixed and it`s work like real travian. </br>
89. War Simulator system is fixed and it`s work like real travian. </br>
90. Fix calculation culturepoint according to the speed server.</br>
91. Fix to delete hero table when delete user from admin.</br>
92. Fix link to coor village from admin.</br>
93. Fix return troops if village destroy.</br>
94. Fix link list multivillage.</br>
95. Fix rally point to list troops own/other village/oasis.</br>
96. Fix recive report when other player send me reinforcement to my oasis</br>
97. Fix calculate defender hero</br>
98. Fix enforcement oasis</br>
99. Fix hero XP calculation by crop consumed and share point hero xp</br>
100. Fix chiefting village only normal attack can reduce loyalty</br>
101. Fix conquered oasis. Hero must use normal attack if oasis is conquered by other player</br>
102. Fix destroy village.</br>
103. Fix returntroop in oasis when destroy village</br>
104. Fix total point hero and statistics calculation by crop consumption</br>
105. Fix hero reinfocement sometimes mising in action</br>
106. Fix total of trapper bug is full trapp if 1 troop only you send.</br>
107. Fix invalid argument supplied if using masterbuilder</br>
108. Change entire database to InnoDB.
**Thanks**
TienTN changes:
1. Change install/templates/config.tpl to deal with deprecated warning from new PHP version.
2. Fix install/data/sql.sql, to be executable in current MySQL version.
3. Fix db_MYSQL.php
with safe_mysql_fetch_all, and safe_mysqli_fetch_array wrappers, to avoid
Warning: mysql_fetch_all/array() expects parameter 1 to be resource, boolean given
4. Fix the db_MYSQLi.php in class object declaration(if anybody want to use db_MYSQLi.php again)
5. Fix the unx.js file for error:
VM5051:1 Uncaught SyntaxError: Unexpected token )
jd.onreadystatechange @ unx.js?0ac36:170
This error arises when moving to the border of the map.
6. Fix the map loop moving bug:
Symptom: For map not set to size 400x400, on the map page,
when moving on and on in one direction, cross the map border(loop) two times,
the moving function will be crashed(freeze, you can't move any more).
I found out that unx.js handle a static map size(400x400).
So I fixed this with a m_c.world_max variable from mapview.tpl and changed the unx.js accordingly.
7. Fix the constructor global variable missing in Session.php
Many thanks to all those who recently played around with the project and tested it both, locally and on their
own servers. This includes [ZZJHONS](https://github.com/ZZJHONS), [DracoMilesX](https://github.com/DracoMilesX),
[phaze1G](https://github.com/phaze1G) and many others who were too shy to let us know that they use and enjoy
runnign this game :)
Also, our thanks go to all both, the original and occasional developers, especially [yi12345](https://github.com/yi12345/),
[advocaite](https://github.com/advocaite/), [brainiacX](https://github.com/brainiacX/), [ronix](https://github.com/ronix/),
[MisterX](https://github.com/MisterX/), [Elio](https://github.com/Elio/) and many others who were part of this
project's history.
TPLinux Changes:
1. Fix FinishAll with two gold issue/bug
2. Fix Reload crush issue after building construction finished
3. Fix in_array bug in show more buldings in WWV
4. Fix winner redirection
5. Fix winner WW image path
6. Convert '<?' To '<?php' in a2ab.php (Account transaction page)
7. Fixing ( Building shape not upgraded after Construct finish )
8. Change multihunter msg color to orange
9. Change fetch time to server speed if > 5
10. Fixing Quest not appears if press (play no tasks)
11. Fix the redirection from rally point when attack is finished
12. Remove Rally point advantage
13. Fix fullscreen map in rtl layout
14. Fix divesion by Zero bug in general statics
--
Last but not least, our thanks go to [JetBrains](https://www.jetbrains.com/) for lending us a one-year full-featured
[open-source PHPStorm](https://www.jetbrains.com/buy/opensource/?product=phpstorm) (and other products) license!
Thanks guys, you're awesome :)
+2 -2
View File
@@ -473,7 +473,7 @@ if ($cropL<1){?>
//Check the village name is changed or is default name
$vName=$village->vname;
$vName=str_replace('&#039;', "'", $village->vname);
if ($vName==$session->userinfo['username']."'s village"){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q3; ?><\/h1><br \/><i>&rdquo;<?php echo Q3_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q3_ORDER; ?><\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"village_name\"><\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
@@ -944,7 +944,7 @@ if ($cropL<1){?>
//Check the village name is changed or is default name
$vName=$village->vname;
$vName=str_replace('&#039;', "'", $village->vname);
if ($vName==$session->userinfo['username']."'s village"){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/>Task 3: Your Village's Name<\/h1><br \/><i>&rdquo;Creative as you are you can grant your village the ultimate name.\r\n<br \/><br \/>\r\nClick on 'profile' in the left hand menu and then select 'change profile'...&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\">Order:<\/p>Change your village's name to something nice.<\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"village_name\"><\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":0}
<?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
+81 -81
View File
@@ -8,7 +8,7 @@
## Developed by: DesPlus and Marvin ##
## Fixed by: Shadow / Skype : cata7007 and Armando ##
## Revision by: noonn ##
## Official Quest by: ronix ##
## Official Quest by: ronix ##
## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2013. All rights reserved. ##
## URLs: http://travian.shadowss.ro ##
@@ -31,16 +31,16 @@ else if(!$message->unread && $message->nunread) { $messagelol = "i3"; }
else if($message->unread && $message->nunread) { $messagelol = "i1"; }
else { $messagelol = "i4"; }
//set $skipp_time. Use the SPEED. standard (1x) = 10 hours.
if(SPEED == '1'){
$skipp_time="43200";
} else if(SPEED == '2'){
$skipp_time="21600";
} else if(SPEED == '3'){
$skipp_time="11988";
//set $skipp_time. Use the SPEED. standard (1x) = 10 hours.
if(SPEED == '1'){
$skipp_time="43200";
} else if(SPEED == '2'){
$skipp_time="21600";
} else if(SPEED == '3'){
$skipp_time="11988";
} else if(SPEED <= '5'){
$skipp_time="7200";
} else if(SPEED > '5'){
$skipp_time="7200";
} else if(SPEED > '5'){
$skipp_time= 3600 / SPEED;
}
@@ -57,7 +57,7 @@ if (isset($qact)){
$database->updateUserField($_SESSION['username'],'quest','1',0);
$_SESSION['qst']= 1;
break;
//user does not follow the quest.
//user does not follow the quest.
//Get reward: Resources: Every 24 hours (1 speed) 24/speed=hours
//Gold: 25 gold
case 'skip':
@@ -66,10 +66,10 @@ if (isset($qact)){
break;
case '2':
$database->updateUserField($_SESSION['username'],'quest','2',0);
$_SESSION['qst']= 2;
$database->updateUserField($_SESSION['username'],'quest','2',0);
$_SESSION['qst']= 2;
//Give Reward
$database->FinishWoodcutter($session->villages[0]);
$database->FinishWoodcutter($session->villages[0]);
break;
case '3':
@@ -89,18 +89,18 @@ if (isset($qact)){
$database->updateUserField($_SESSION['username'],'quest','4',0);
$_SESSION['qst']= 4;
//Give Reward
$database->modifyResource($session->villages[0],30,60,30,20,1);
$database->modifyResource($session->villages[0],30,60,30,20,1);
break;
case 'rank':
$rSubmited=$qact2;
break;
case '5':
$database->updateUserField($_SESSION['username'],'quest','5',0);
$_SESSION['qst']= 5;
//Give Reward
$database->modifyResource($session->villages[0],40,30,20,30,1);
$database->modifyResource($session->villages[0],40,30,20,30,1);
break;
case '6':
@@ -111,9 +111,9 @@ if (isset($qact)){
$database->sendMessage($session->userinfo['id'],4,$Subject,$Message,0,0,0,0,0);
$RB=true;
//Give Reward
$database->modifyResource($session->villages[0],50,60,30,30,1);
$database->modifyResource($session->villages[0],50,60,30,30,1);
break;
case '7':
$database->updateUserField($_SESSION['username'],'quest','7',0);
$_SESSION['qst']= 7;
@@ -127,36 +127,36 @@ if (isset($qact)){
$x=$qact2;
$y=$qact3;
break;
case '8':
$database->updateUserField($_SESSION['username'],'quest','8',0);
$_SESSION['qst']= 8;
//Give Reward
$database->modifyResource($session->villages[0],60,30,40,90,1);
break;
case '9':
$crop = round($village->acrop);
if ($crop>=200){
$database->updateUserField($_SESSION['username'],'quest','9',0);
//Get 200 Crop
$database->modifyResource($session->villages[0],0,0,0,-200,1);
//Get 200 Crop
$database->modifyResource($session->villages[0],0,0,0,-200,1);
//Give Reward
$attack = $database->addAttack(0,1,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0);
$database->addMovement(3,0,$session->villages[0],$attack,time(),time()+43200/INCREASE_SPEED);
} else{
$NoCrop=Q8_NOCROP;
}
$_SESSION['qst']= 9;
$_SESSION['qst']= 9;
break;
case '10':
$database->updateUserField($_SESSION['username'],'quest','10',0);
$_SESSION['qst']= 10;
//Give Reward
$database->modifyResource($session->villages[0],100,80,40,40,1);
break;
case '11':
$database->updateUserField($_SESSION['username'],'quest','11',0);
$_SESSION['qst']= 11;
@@ -174,16 +174,16 @@ if (isset($qact)){
$database->updateUserField($_SESSION['username'],'quest','12',0);
$_SESSION['qst']= 12;
//Give Reward
$database->modifyResource($session->villages[0],75,140,40,40,1);
$database->modifyResource($session->villages[0],75,140,40,40,1);
break;
case '13':
$database->updateUserField($_SESSION['username'],'quest','13',0);
$_SESSION['qst']= 13;
//Give Reward
$database->modifyResource($session->villages[0],75,80,30,50,1);
break;
case '14':
$database->updateUserField($_SESSION['username'],'quest','14',0);
$_SESSION['qst']= 14;
@@ -197,7 +197,7 @@ if (isset($qact)){
//Give Reward
$database->modifyResource($session->villages[0],150,180,30,130,1);
break;
case '16':
$database->updateUserField($_SESSION['username'],'quest','16',0);
$_SESSION['qst']= 16;
@@ -215,21 +215,21 @@ if (isset($qact)){
//Give Reward
$database->modifyResource($session->villages[0],50,30,60,20,1);
break;
case '18':
$database->updateUserField($_SESSION['username'],'quest','18',0);
$_SESSION['qst']= 18;
//Give Reward
$database->modifyResource($session->villages[0],75,75,40,40,1);
break;
case '19':
$database->updateUserField($_SESSION['username'],'quest','19',0);
$_SESSION['qst']= 19;
//Give Reward
$database->modifyResource($session->villages[0],100,90,100,60,1);
break;
case '20':
$database->updateUserField($_SESSION['username'],'quest','20',0);
$_SESSION['qst']= 20;
@@ -242,28 +242,28 @@ if (isset($qact)){
//Give Reward granary
$database->modifyResource($session->villages[0],80,90,60,40,1);
break;
case '22':
$database->updateUserField($_SESSION['username'],'quest','22',0);
$_SESSION['qst']= 22;
//Give Reward warehouse
$database->modifyResource($session->villages[0],70,120,90,50,1);
break;
case '23':
$database->updateUserField($_SESSION['username'],'quest','23',0);
$_SESSION['qst']= 23;
//Give Reward
//$database->modifyResource($session->villages[0],80,90,60,40,1);
break;
case '24':
$database->updateUserField($_SESSION['username'],'quest','24',0);
$_SESSION['qst']= 24;
//Give Reward rally point
$database->modifyResource($session->villages[0],80,90,60,40,1);
break;
case '25':
//$dataarray[3] = 1;
$database->updateUserField($_SESSION['username'],'quest','25',0);
@@ -294,11 +294,11 @@ if (isset($qact)){
$gold+=15;
$database->updateUserField($_SESSION['username'],'gold',$gold,0);
break;
case 'gold':
$lSubmited=$qact2;
break;
case '28':
//$dataarray[6] = 1;
$database->updateUserField($_SESSION['username'],'quest','28',0);
@@ -306,7 +306,7 @@ if (isset($qact)){
//Give Reward
$database->modifyResource($session->villages[0],80,70,60,40,1);
break;
case '29':
//$dataarray[7] = 1;
$database->updateUserField($_SESSION['username'],'quest','29',0);
@@ -314,7 +314,7 @@ if (isset($qact)){
//Give Reward
$database->modifyResource($session->villages[0],100,60,90,40,1);
break;
case '30':
//$dataarray[8] = 1;
$database->updateUserField($_SESSION['username'],'quest','30',0);
@@ -322,7 +322,7 @@ if (isset($qact)){
//Give Reward
$database->modifyResource($session->villages[0],100,140,90,50,1);
break;
case '91':
$database->updateUserField($_SESSION['username'],'quest','91',0);
$database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0);
@@ -340,7 +340,7 @@ if (isset($qact)){
$gold+=15;
$database->updateUserField($_SESSION['username'],'gold',$gold,0);
break;
case '92':
$database->updateUserField($_SESSION['username'],'quest','92',0);
$database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0);
@@ -348,8 +348,8 @@ if (isset($qact)){
$_SESSION['qst_time'] = time()+$skipp_time;
//Give Reward
$database->modifyResource($session->villages[0],217,247,177,207,1);
break;
break;
case '93':
$database->updateUserField($_SESSION['username'],'quest','93',0);
$database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0);
@@ -357,8 +357,8 @@ if (isset($qact)){
$_SESSION['qst_time'] = time()+$skipp_time;
//Give Reward
$database->modifyResource($session->villages[0],217,247,177,207,1);
break;
break;
case '94':
$database->updateUserField($_SESSION['username'],'quest','94',0);
$database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0);
@@ -366,8 +366,8 @@ if (isset($qact)){
$_SESSION['qst_time'] = time()+$skipp_time;
//Give Reward
$database->modifyResource($session->villages[0],217,247,177,207,1);
break;
break;
case '95':
$database->updateUserField($_SESSION['username'],'quest','95',0);
$database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0);
@@ -375,8 +375,8 @@ if (isset($qact)){
$_SESSION['qst_time'] = time()+$skipp_time;
//Give Reward
$database->modifyResource($session->villages[0],217,247,177,207,1);
break;
break;
case '96':
$database->updateUserField($_SESSION['username'],'quest','96',0);
$database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0);
@@ -384,8 +384,8 @@ if (isset($qact)){
$_SESSION['qst_time'] = time()+$skipp_time;
//Give Reward
$database->modifyResource($session->villages[0],217,247,177,207,1);
break;
break;
case '97':
$database->updateUserField($_SESSION['username'],'quest','97',0);
$database->updateUserField($_SESSION['username'],'quest_time',''.(time()).'',0);
@@ -403,7 +403,7 @@ if (isset($qact)){
$gold+=20;
$database->updateUserField($_SESSION['username'],'gold',$gold,0);
break;
}
}
}
}
@@ -424,14 +424,14 @@ if($session->access!=BANNED){
<?php } elseif($_SESSION['qst']== 1){
//Check one of Woodcutters is level 1 or upper
//Check one of Woodcutters is level 1 or upper
$tRes = $database->getResourceLevel($session->villages[0]);
$woodL=$tRes['f1']+$tRes['f3']+$tRes['f14']+$tRes['f17'];
//check if you are building a woodcutter to level 1
foreach($building->buildArray as $jobs) {
if($jobs['type']==1){
$woodL="99";
}
}
}
if ($woodL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q1; ?><\/h1><br \/><i>&rdquo;<?php echo Q1_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q1_ORDER; ?><\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"wood\"><\/div>\n\t\t","number":"-1","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
@@ -439,9 +439,9 @@ if ($woodL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q1; ?><\/h1><br \/><i>&rdquo;<?php echo Q1_RESP; ?>&rdquo;<\/i><br \/><br \/><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q1_REWARD; ?><br \/><\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','2')\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"wood\"><\/div>\n\t\t","number":"-1","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99,"ar":1}
<?php }?>
<?php } elseif($_SESSION['qst']== 2){
<?php } elseif($_SESSION['qst']== 2){
//Check one of Croplands is level 1 or upper
//Check one of Croplands is level 1 or upper
$tRes = $database->getResourceLevel($session->villages[0]);
$cropL=$tRes['f2']+$tRes['f8']+$tRes['f9']+$tRes['f12']+$tRes['f13']+$tRes['f15'];
if ($cropL<1){?>
@@ -450,11 +450,11 @@ if ($cropL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q2; ?><\/h1><br \/><i>&rdquo;<?php echo Q2_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q2_REWARD; ?> <b><span class=\"plus_g\">P</span><span class=\"plus_o\">l</span><span class=\"plus_g\">u</span><span class=\"plus_o\">s</span></b><\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','3');\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"farm\"><\/div>\n\t\t","number":2,"reward":{"plus":1},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 3){
<?php } elseif($_SESSION['qst']== 3){
//Check the village name is changed or is default name
$vName=$village->vname;
$vName=str_replace('&#039;', "'", $village->vname);
if ($vName==$session->userinfo['username']."'s village"){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q3; ?><\/h1><br \/><i>&rdquo;<?php echo Q3_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q3_ORDER; ?><\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"village_name\"><\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
@@ -477,9 +477,9 @@ if ($rRes!=$rSubmited && $rRes !== 'Multihunter'){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q4; ?><\/h1><br \/><i>&rdquo;<?php echo Q4_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p><img src=\"img\/x.gif\" class=\"r1\" alt=\"Lumber\" title=\"Lumber\" \/>40&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r2\" alt=\"Clay\" title=\"Clay\" \/>30&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r3\" alt=\"Iron\" title=\"Iron\" \/>20&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r4\" alt=\"Crop\" title=\"Crop\" \/>30&nbsp;&nbsp;<\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','5');\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 5){
<?php } elseif($_SESSION['qst']== 5){
//Check one of Iron Mines and one of Clay Pites are level 1 or upper
//Check one of Iron Mines and one of Clay Pites are level 1 or upper
$tRes = $database->getResourceLevel($session->villages[0]);
$ironL=$tRes['f4']+$tRes['f7']+$tRes['f10']+$tRes['f11'];
$clayL=$tRes['f5']+$tRes['f6']+$tRes['f16']+$tRes['f18'];
@@ -489,7 +489,7 @@ if ($ironL<1 || $clayL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q5; ?><\/h1><br \/><i>&rdquo;<?php echo Q5_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p><img src=\"img\/x.gif\" class=\"r1\" alt=\"Lumber\" title=\"Lumber\" \/>50&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r2\" alt=\"Clay\" title=\"Clay\" \/>60&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r3\" alt=\"Iron\" title=\"Iron\" \/>30&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r4\" alt=\"Crop\" title=\"Crop\" \/>30&nbsp;&nbsp;<\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','6');\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"clay_iron\"><\/div>\n\t\t","number":5,"reward":{"wood":50,"clay":60,"iron":30,"crop":30},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 6){
<?php } elseif($_SESSION['qst']== 6){
//Check message is viewed or no
if (!isset($RB)) {
@@ -537,14 +537,14 @@ if ($ironL<2 || $clayL<2 || $woodL<2 || $cropL<2){?>
<?php } elseif($_SESSION['qst']== 10){
//comming soon
//Check rat is in villa
$rat = $database->getEnforce($session->villages[0], 0);
if ($rat['u31']<1){?>
$rat = $database->getEnforce(0, $village->wid);
if ($rat['u31'] < 1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_10; ?><\/h1><br \/><i>&rdquo;<?php echo Q25_10_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q25_10_ORDER; ?><\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"army\"><\/div>\n\t\t","number":-10,"reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_10; ?><\/h1><br \/><i>&rdquo;<?php echo Q25_10_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q25_10_REWARD; ?> <b><span class=\"plus_g\">P</span><span class=\"plus_o\">l</span><span class=\"plus_g\">u</span><span class=\"plus_o\">s</span></b><\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','11');\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"army\"><\/div>\n\t\t","number":10,"reward":{"plus":2},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 11){
<?php } elseif($_SESSION['qst']== 11){
//Check report is viewed or no
if (count($database->getUnViewNotice($session->uid))>0) {?>
@@ -568,7 +568,7 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_12; ?><\/h1><br \/><i>&rdquo;<?php echo Q25_12_RESP; ?>.&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p><img src=\"img\/x.gif\" class=\"r1\" alt=\"Lumber\" title=\"Lumber\" \/>75&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r2\" alt=\"Clay\" title=\"Clay\" \/>80&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r3\" alt=\"Iron\" title=\"Iron\" \/>30&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r4\" alt=\"Crop\" title=\"Crop\" \/>50&nbsp;&nbsp;<\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','13');\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"allres\"><\/div>\n\t\t","number":12,"reward":{"wood":75,"clay":80,"iron":30,"crop":50},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 13){
<?php } elseif($_SESSION['qst']== 13){
//Check player Descriptions for [#0]
$Dave= strrpos ($uArray['desc1'],'[#0]');
@@ -604,7 +604,7 @@ if ($ironL<1 || $clayL<1 || $woodL<1 || $cropL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_15; ?><\/h1><br \/><i>&rdquo;<?php echo Q25_15_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p><img src=\"img\/x.gif\" class=\"r1\" alt=\"Lumber\" title=\"Lumber\" \/>60&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r2\" alt=\"Clay\" title=\"Clay\" \/>50&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r3\" alt=\"Iron\" title=\"Iron\" \/>40&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r4\" alt=\"Crop\" title=\"Crop\" \/>30&nbsp;&nbsp;<\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','16');\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"allres\"><\/div>\n\t\t","number":15,"reward":{"wood":60,"clay":50,"iron":40,"crop":30},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 16){
<?php } elseif($_SESSION['qst']== 16){
//Check player submited number Barracks cost lumber
if ($lSubmited!=210){?>
@@ -718,7 +718,7 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_26; ?><\/h1><br \/><i>&rdquo;<?php echo Q24_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p>15 <img src=\"img\/x.gif\" class=\"gold\" alt=\"Gold\" title=\"Gold\" \/><br \/><\/div><br \/><span id=\"qst_accpt\"><a href=\"javascript: qst_next('','27');\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"allres\"><\/div>\n\t\t","number":26,"reward":{"gold":15},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php } ?>
<?php } elseif($_SESSION['qst']== 27){
<?php } elseif($_SESSION['qst']== 27){
//Check player submited number gold
if ($lSubmited!=50){?>
@@ -837,7 +837,7 @@ $_SESSION['qst']= 31; ?>
<?php } elseif($_SESSION['qst']== 1){
//Check one of Woodcutters is level 1 or upper
//Check one of Woodcutters is level 1 or upper
$tRes = $database->getResourceLevel($session->villages[0]);
$woodL=$tRes['f1']+$tRes['f3']+$tRes['f14']+$tRes['f17'];
if ($woodL<1){?>
@@ -846,9 +846,9 @@ if ($woodL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q1; ?><\/h1><br \/><i>&rdquo;<?php echo Q1_RESP; ?>&rdquo;<\/i><br \/><br \/><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q1_REWARD; ?><br \/><\/div><br \/><span id=\"qst_accpt\"><a href=\"banned.php\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"wood\"><\/div>\n\t\t","number":"-1","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 2){
<?php } elseif($_SESSION['qst']== 2){
//Check one of Croplands is level 1 or upper
//Check one of Croplands is level 1 or upper
$tRes = $database->getResourceLevel($session->villages[0]);
$cropL=$tRes['f2']+$tRes['f8']+$tRes['f9']+$tRes['f12']+$tRes['f13']+$tRes['f15'];
if ($cropL<1){?>
@@ -857,10 +857,10 @@ if ($cropL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q2; ?><\/h1><br \/><i>&rdquo;<?php echo Q2_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q2_REWARD; ?> <b><span class=\"plus_g\">P</span><span class=\"plus_o\">l</span><span class=\"plus_g\">u</span><span class=\"plus_o\">s</span></b><\/div><br \/><span id=\"qst_accpt\"><a href=\"banned.php\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"farm\"><\/div>\n\t\t","number":2,"reward":{"plus":1},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 3){
<?php } elseif($_SESSION['qst']== 3){
//Check the village name is changed or is default name
$vName=$village->vname;
$vName=str_replace('&#039;', "'", $village->vname);
if ($vName==$session->userinfo['username']."'s village"){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q3; ?><\/h1><br \/><i>&rdquo;<?php echo Q3_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q3_ORDER; ?><\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"village_name\"><\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
@@ -880,9 +880,9 @@ if (!isset($rSubmited) || $rRes!=$rSubmited){ ?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q4; ?><\/h1><br \/><i>&rdquo;<?php echo Q4_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p><img src=\"img\/x.gif\" class=\"r1\" alt=\"Lumber\" title=\"Lumber\" \/>40&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r2\" alt=\"Clay\" title=\"Clay\" \/>30&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r3\" alt=\"Iron\" title=\"Iron\" \/>20&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r4\" alt=\"Crop\" title=\"Crop\" \/>30&nbsp;&nbsp;<\/div><br \/><span id=\"qst_accpt\"><a href=\"banned.php\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 5){
<?php } elseif($_SESSION['qst']== 5){
//Check one of Iron Mines and one of Clay Pites are level 1 or upper
//Check one of Iron Mines and one of Clay Pites are level 1 or upper
$tRes = $database->getResourceLevel($session->villages[0]);
$ironL=$tRes['f4']+$tRes['f7']+$tRes['f10']+$tRes['f11'];
$clayL=$tRes['f5']+$tRes['f6']+$tRes['f16']+$tRes['f18'];
@@ -892,7 +892,7 @@ if ($ironL<1 || $clayL<1){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q5; ?><\/h1><br \/><i>&rdquo;<?php echo Q5_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p><img src=\"img\/x.gif\" class=\"r1\" alt=\"Lumber\" title=\"Lumber\" \/>50&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r2\" alt=\"Clay\" title=\"Clay\" \/>60&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r3\" alt=\"Iron\" title=\"Iron\" \/>30&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r4\" alt=\"Crop\" title=\"Crop\" \/>30&nbsp;&nbsp;<\/div><br \/><span id=\"qst_accpt\"><a href=\"banned.php\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"clay_iron\"><\/div>\n\t\t","number":5,"reward":{"wood":50,"clay":60,"iron":30,"crop":30},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 6){
<?php } elseif($_SESSION['qst']== 6){
//Check message is viewed or no
if ($message->unread || $RB==true){?>
@@ -918,7 +918,7 @@ if (!isset($x) || !isset($y) || $x!=$ncoor['x'] || $y!=$ncoor['y']){?>
?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_8; ?><\/h1><br \/><i>&rdquo;<?php echo Q25_8_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q25_8_ORDER; ?><\/div><br \/><img class=\"r4\" src=\"img\/x.gif\" title=\"Crop\" alt=\"Crop\" \/>200 <input type=\"hidden\" id=\"qst_val\" value=\"set\" \/><input onclick=\"banned.php\" name=\"qstin\" type=\"button\" value=\"<?php echo Q25_8_BUTN; ?>\" \/><br \/><font color='#FF0000'><?php if(isset($NoCrop)){echo $NoCrop;}?><font\/><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"army\"><\/div>\n\t\t","number":-8,"reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php } elseif($_SESSION['qst']== 9){
<?php } elseif($_SESSION['qst']== 9){
//one each
//Check additional of each resource upgraded to lvl1 or upper
@@ -955,7 +955,7 @@ if (count($database->getUnViewNotice($session->uid))>0) {?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_11; ?><\/h1><br \/><i>&rdquo;<?php echo Q25_11_RESP; ?>.&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p><img src=\"img\/x.gif\" class=\"r1\" alt=\"Lumber\" title=\"Lumber\" \/>75&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r2\" alt=\"Clay\" title=\"Clay\" \/>140&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r3\" alt=\"Iron\" title=\"Iron\" \/>40&nbsp;&nbsp;<img src=\"img\/x.gif\" class=\"r4\" alt=\"Crop\" title=\"Crop\" \/>40&nbsp;&nbsp;<\/div><br \/><span id=\"qst_accpt\"><a href=\"banned.php\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"report\"><\/div>\n\t\t","number":11,"reward":{"wood":75,"clay":140,"iron":40,"crop":40},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php }?>
<?php } elseif($_SESSION['qst']== 12){
<?php } elseif($_SESSION['qst']== 12){
//everything to One
//Check additional of each resource upgraded to lvl1 or upper
@@ -1121,7 +1121,7 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?>
{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q25_26; ?><\/h1><br \/><i>&rdquo;<?php echo Q24_RESP; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><input type=\"hidden\" id=\"qst_val\" value=\"2\" \/><?php echo Q_REWARD; ?><\/p>15 Gold<br \/><\/div><br \/><span id=\"qst_accpt\"><a href=\"banned.php\"><?php echo Q_CONTINUE; ?><\/a><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"allres\"><\/div>\n\t\t","number":26,"reward":{"gold":15},"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>g","msrc":"<?php echo $messagelol; ?>","altstep":99}
<?php } ?>
<?php } elseif($_SESSION['qst']== 27){
<?php } elseif($_SESSION['qst']== 27){
//Check player submited number gold
if ($lSubmited!=50){?>
File diff suppressed because one or more lines are too long
+4 -4
View File
@@ -52,7 +52,7 @@ foreach($forumcat as $arr) {
}
}
echo '<tr><td class="ico">';
if($database->CheckEditRes($aid)=="1"){
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top">
<img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit">
<img src="img/x.gif" alt="edit" /></a><br />
@@ -113,7 +113,7 @@ foreach($forumcat as $arr) {
}
}
echo '<tr><td class="ico">';
if($database->CheckEditRes($aid)=="1"){
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
}else{
echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
@@ -168,7 +168,7 @@ foreach($forumcat as $arr) {
}
}
echo '<tr><td class="ico">';
if($database->CheckEditRes($aid)=="1"){
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
}else{
echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
@@ -223,7 +223,7 @@ if($closed1 != 0){
}
}
echo '<tr><td class="ico">';
if($database->CheckEditRes($aid)=="1"){
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
}else{
echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
+2 -2
View File
@@ -38,7 +38,7 @@ if($ChckTopic){
}
echo '<tr><td class="ico">';
if($database->CheckEditRes($aid)=="1"){
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arrs['owner'] == $session->uid)){
if($database->CheckCloseTopic($arrs['id']) == 1){
$locks = '<a class="unlock" href="?s=2&fid='.$_GET['fid'].'&idt='.$arrs['id'].'&admin=unlock" title="open topic"><img src="img/x.gif" alt="open topic" /></a>';
}else{
@@ -72,7 +72,7 @@ if($ChckTopic){
}
echo '<tr><td class="ico">';
if($database->CheckEditRes($aid)=="1"){
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
if($database->CheckCloseTopic($arr['id']) == 1){
$lock = '<a class="unlock" href="?s=2&fid='.$_GET['fid'].'&idt='.$arr['id'].'&admin=unlock" title="open topic"><img src="img/x.gif" alt="open topic" /></a>';
}else{
+6 -6
View File
@@ -61,8 +61,8 @@ $bbcode_topic = stripslashes(nl2br($bbcoded));
</td>
<td class="pcontent"><div class="posted">created: <?php echo $date; ?></div>
<?php
if($database->CheckEditRes($aid)=="1"){
echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&idf='.$arr['cat'].'&idt='.$arr['id'].'&admin=editans"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&tid='.$arr['id'].'&admin=deltopic" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $arr['owner'] == $session->uid)){
echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&fid2='.$_GET['fid2'].'&idf='.$arr['cat'].'&idt='.$arr['id'].'&admin=editans"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&tid='.$arr['id'].'&admin=deltopic" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
}
?>
<div class="clear dotted"></div><div class="text"><?php echo $bbcode_topic; ?></div></td>
@@ -135,7 +135,7 @@ foreach($posts as $po) {
$trip = "Teutons";
}else if($displayarray['tribe'] == 3) {
$trip = "Gauls";
}
}
$owner = $database->getUserArray($po['owner'],1);
$allianceinfo = $database->getAlliance($owner['alliance']);
$input = $po['post'];
@@ -154,8 +154,8 @@ echo '<tr><td class="pinfo"><a class="name" href="spieler.php?uid='.$po['owner']
'.$trip.'
</td>
<td class="pcontent"><div class="posted">created: '.$date.'</div>';
if($database->CheckEditRes($aid)=="1"){
echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&idt='.$_GET['tid'].'&pod='.$po['id'].'&admin=editpost"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&pod='.$po['id'].'&tid='.$_GET['tid'].'&admin=delpost" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
if($database->CheckEditRes($aid)=="1" && ($database->isAllianceOwner($session->uid) == $session->alliance || $po['owner'] == $session->uid)){
echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&fid2='.$_GET['fid2'].'&idt='.$_GET['tid'].'&pod='.$po['id'].'&admin=editpost"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&pod='.$po['id'].'&tid='.$_GET['tid'].'&admin=delpost" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
}
echo '<div class="clear dotted"></div><div class="text">'.$bbcode_post.'</div></td>
</tr>';
@@ -169,7 +169,7 @@ echo '<div class="clear dotted"></div><div class="text">'.$bbcode_post.'</div></
if($opt['opt5'] == 1){
echo '<a href="allianz.php?s=2&pid='.$aid.'&tid='.$arr['id'].'&admin=switch_admin" title="Toggle Admin mode"><img class="switch_admin dynamic_img" src="img/x.gif" alt="Toggle Admin mode" /></a>';
}
echo '</div>';
}else{
header("Location: banned.php");
+17 -8
View File
@@ -1,17 +1,26 @@
<?php
<?php
if(isset($aid)) {
$aid = $aid;
}
else {
$aid = $session->alliance;
}
$varmedal = $database->getProfileMedalAlly($aid);
}
$varmedal = $database->getProfileMedalAlly($aid);
$allianceinfo = $database->getAlliance($aid);
$memberlist = $database->getAllMember($aid);
$totalpop = 0;
$memberIDs = [];
foreach($memberlist as $member) {
$totalpop += $database->getVSumField($member['id'],"pop");
$memberIDs[] = $member['id'];
}
$data = $database->getVSumField($memberIDs,"pop");
if (count($data)) {
foreach ($data as $row) {
$totalpop += $row['Total'];
}
}
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
@@ -80,9 +89,9 @@ INDELING CATEGORIEEN:
== 7. in top 3 - verdediging ==
== 8. in top 3 - klimmers ==
== 9. in top 3 - overval ==
******************************/
******************************/
foreach($varmedal as $medal) {
$titel="Bonus";
switch ($medal['categorie']) {
@@ -122,7 +131,7 @@ INDELING CATEGORIEEN:
case "12":
$titel="Top 10 of Rank Attackers of week ".$medal['points']." in a row";
break;
}
}
echo"<tr>
<td> ".$titel."</td>
<td>".$medal['plaats']."</td>
+14 -12
View File
@@ -19,7 +19,7 @@ $aid = $session->alliance;
$allianceinfo = $database->getAlliance($aid);
$opt = $database->getAlliPermissions($session->uid, $aid);
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
include("alli_menu.tpl");
$ids = $_GET['s'];
if(isset($_POST['new'])){
@@ -27,14 +27,14 @@ if(isset($_POST['new'])){
$forum_des = $_POST['u2'];
$forum_owner = $session->uid;
$forum_area = $_POST['bid'];
$database->CreatForum($forum_owner,$aid,$forum_name,$forum_des,$forum_area);
}
if(isset($_POST['edittopic'])){
$topic_name = $_POST['thema'];
$topic_cat = $_POST['fid'];
$topic_id = $_POST['tid'];
$database->UpdateEditTopic($topic_id,$topic_name,$topic_cat);
}
if(isset($_POST['editforum'])){
@@ -43,7 +43,7 @@ if(isset($_POST['editforum'])){
$forum_des = $_POST['u2'];
$forum_des = htmlspecialchars($forum_des);
$forum_id = $_POST['fid'];
$database->UpdateEditForum($forum_id,$forum_name,$forum_des);
}
if(isset($_POST['newtopic'])){
@@ -297,10 +297,12 @@ if(isset($_POST['editpost'])){
$text = preg_replace('/\[coor'.$i.'\]/', '[coor0]', $text);
$text = preg_replace('/\[\/coor'.$i.'\]/', '[/coor0]', $text);
}
for($i=0;$i<=$text['report0'];$i++){
$text = preg_replace('/\[report'.$i.'\]/', '[report0]', $text);
$text = preg_replace('/\[\/report'.$i.'\]/', '[/report0]', $text);
}
if (isset($text['report0'])) {
for ( $i = 0; $i <= $text['report0']; $i ++ ) {
$text = preg_replace( '/\[report' . $i . '\]/', '[report0]', $text );
$text = preg_replace( '/\[\/report' . $i . '\]/', '[/report0]', $text );
}
}
$posts_id = $_POST['pod'];
if($text != ""){
if(!preg_match('/\[message\]/',$text) && !preg_match('/\[\/message\]/',$text)){
@@ -370,7 +372,7 @@ if($opt['opt5'] == 1){
if($database->CheckResultEdit($aid) != 1){
$database->CreatResultEdit($aid,1);
}else{
if($database->CheckEditRes($aid) == 1){
if($database->CheckEditRes($aid) == 1 && $database->isAllianceOwner($session->uid) == $session->alliance){
$database->UpdateResultEdit($aid,'');
}else{
$database->UpdateResultEdit($aid,1);
@@ -420,11 +422,11 @@ if($_GET['admin']== "newforum"){
if(isset($_GET['ac'])){
include("Forum/forum_7.tpl"); // new post
}else{
include("Forum/forum_6.tpl"); // showtopic
include("Forum/forum_6.tpl"); // showtopic
}
}else{
if($database->CheckForum($aid)){
include("Forum/forum_2.tpl");
include("Forum/forum_2.tpl");
}else if($opt['opt5'] == 1){
if($session->access==BANNED){
echo '<p class="error">Forum is not created yet</p><p>
@@ -435,5 +437,5 @@ if($_GET['admin']== "newforum"){
}}else{
echo '<p class="error">Forum is not created yet</p>';
}
}
}
?>
+31 -22
View File
@@ -5,7 +5,7 @@ $aid = $_GET['aid'];
else {
$aid = $session->alliance;
}
$varmedal = $database->getProfileMedalAlly($aid);
$varmedal = $database->getProfileMedalAlly($aid);
$allianceinfo = $database->getAlliance($aid);
$memberlist = $database->getAllMember($aid);
@@ -14,16 +14,25 @@ if($allianceinfo['tag']==""){
header("Location: allianz.php");
exit;
}
$memberIDs = [];
foreach($memberlist as $member) {
$totalpop += $database->getVSumField($member['id'],"pop");
$memberIDs[] = $member['id'];
}
$data = $database->getVSumField($memberIDs,"pop");
if (count($data)) {
foreach ($data as $row) {
$totalpop += $row['Total'];
}
}
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
$profiel="".$allianceinfo['notice']."".md5('skJkev3')."".$allianceinfo['desc']."";
require("medal.php");
$profiel=explode("".md5('skJkev3')."", $profiel);
include("alli_menu.tpl");
include("alli_menu.tpl");
?>
<table cellpadding="1" cellspacing="1" id="profile">
@@ -69,25 +78,25 @@ include("alli_menu.tpl");
</tr>
<?php
foreach($memberlist as $member) {
//rank name
$rank = $database->getAlliancePermission($member['id'],"rank",0);
//username
$name = $database->getUserField($member['id'],"username",0);
//if there is no rank defined, user will not be printed
if($rank == ''){
echo '';
}
//if there is user rank defined, user will be printed
else if($rank != ''){
echo "<tr>";
echo "<th>".stripslashes($rank)."</th>";
echo "<td><a href='spieler.php?uid=".$member['id']."'>".$name."</td>";
echo "</tr>";
}
}
}
if($allianceinfo['forumlink'] != '' && $allianceinfo['forumlink'] != '0'){
echo "<tr>";
@@ -115,7 +124,7 @@ include("alli_menu.tpl");
<th>Player</th>
<th>Population</th>
<th>Villages</th>
<?php
<?php
if($aid == $session->alliance){
echo "<th>&nbsp;</th>";
}
@@ -139,31 +148,31 @@ foreach($memberlist as $member) {
$rank = $rank+1;
$TotalUserPop = $database->getVSumField($member['id'],"pop");
$TotalVillages = $database->getProfileVillages($member['id']);
$TotalVillages = $database->getProfileVillages($member['id']);
echo " <tr>";
echo " <td class=ra>".$rank.".</td>";
echo " <td class=pla><a href=spieler.php?uid=".$member['id'].">".$member['username']."</a></td>";
echo " <td class=hab>".$TotalUserPop."</td>";
echo " <td class=pla><a href=spieler.php?uid=".$member['id'].">".$member['username']."</a></td>";
echo " <td class=hab>".$TotalUserPop."</td>";
echo " <td class=vil>".count($TotalVillages)."</td>";
if($aid == $session->alliance){
if($aid == $session->alliance){
if ((time()-600) < $member['timestamp']){ // 0 Min - 10 Min
echo " <td class=on><img class=online1 src=img/x.gif title='Now online' alt='Now online' /></td>";
}elseif ((time()-86400) < $member['timestamp'] && (time()-600) > $member['timestamp']){ // 10 Min - 1 Days
echo " <td class=on><img class=online2 src=img/x.gif title='Offline' alt='Offline' /></td>";
echo " <td class=on><img class=online2 src=img/x.gif title='Offline' alt='Offline' /></td>";
}elseif ((time()-259200) < $member['timestamp'] && (time()-86400) > $member['timestamp']){ // 1-3 Days
echo " <td class=on><img class=online3 src=img/x.gif title='Last 3 days' alt='Last 3 days' /></td>";
echo " <td class=on><img class=online3 src=img/x.gif title='Last 3 days' alt='Last 3 days' /></td>";
}elseif ((time()-604800) < $member['timestamp'] && (time()-259200) > $member['timestamp']){
echo " <td class=on><img class=online4 src=img/x.gif title='Last 7 days' alt='Last 7 days' /></td>";
echo " <td class=on><img class=online4 src=img/x.gif title='Last 7 days' alt='Last 7 days' /></td>";
}else{
echo " <td class=on><img class=online5 src=img/x.gif title=inactive alt=inactive /></td>";
echo " <td class=on><img class=online5 src=img/x.gif title=inactive alt=inactive /></td>";
}
}
echo " </tr>";
echo " </tr>";
}
?>
?>
</tbody>
</table>
+9 -9
View File
@@ -19,12 +19,12 @@ if($units[$y]['attack_type'] == 4){
$attack_type = RAID_ON;
}
$isoasis = $database->isVillageOases($units[$y]['to']);
if ($isoasis ==0){
if ($isoasis ==0){
$to = $database->getMInfo($units[$y]['to']);
} else {
$to = $database->getOMInfo($units[$y]['to']);}
?>
<table class="troop_details" cellpadding="1" cellspacing="1">
<table class="troop_details" cellpadding="1" cellspacing="1">
<thead>
<tr>
<td class="role"><a href="karte.php?d=<?php echo $village->wid."&c=".$generator->getMapCheck($village->wid); ?>"><?php echo $village->vname; ?></a></td>
@@ -35,10 +35,10 @@ $to = $database->getOMInfo($units[$y]['to']);}
<?php
echo "<tr><th>&nbsp;</th>";
for($i=($session->tribe-1)*10+1;$i<=$session->tribe*10;$i++) {
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
}
if($units[$y]['t11'] != 0) {
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
}
?>
</tr>
@@ -84,17 +84,17 @@ $to = $database->getOMInfo($units[$y]['to']);}
<?php
}
?>
<?php
$settlers = $database->getMovement(5,$village->wid,0);
$settlers = $database->getMovement(5,$village->wid,0);
if($settlers){
$total_for = count($settlers);
for($y=0;$y<$total_for;$y++){
$timer += 1;
?>
<table class="troop_details" cellpadding="1" cellspacing="1">
<table class="troop_details" cellpadding="1" cellspacing="1">
<thead>
<tr>
<td class="role"><a href="karte.php?d=<?php echo $village->wid."&c=".$generator->getMapCheck($village->wid); ?>"><?php echo $village->vname; ?></a></td>
@@ -108,7 +108,7 @@ $timer += 1;
$end = ($tribe*10);
echo "<tr><th>&nbsp;</th>";
for($i=$start;$i<=($end);$i++) {
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
}
?>
</tr>
+3 -2
View File
@@ -31,10 +31,11 @@ else if(!empty($_POST['dname'])){
if(isset($checkexist) && $checkexist){
$villageOwner = $database->getVillageField($getwref,'owner');
$userAccess = $database->getUserField($villageOwner,'access',0);
$userID = $database->getUserField($villageOwner,'id',0);
}
$maxcarry = $market->maxcarry;
$maxcarry *= $market->merchantAvail();
if(isset($_POST['ft'])=='check' && $allres!=0 && $allres <= $maxcarry && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist && ($userAccess == 2 || (ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == 9))){
if(isset($_POST['ft'])=='check' && $allres!=0 && $allres <= $maxcarry && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist && ($userAccess == 2 || $userAccess == MULTIHUNTER || (ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN))){
?>
<form method="POST" name="snd" action="build.php">
<input type="hidden" name="ft" value="mk1">
@@ -218,7 +219,7 @@ if(isset($_POST['ft'])=='check'){
$error = '<span class="error"><b>'.NO_COORDINATES_SELECTED.'</b></span>';
}elseif($getwref == $village->wid){
$error = '<span class="error"><b>'.CANNOT_SEND_RESOURCES.'</b></span>';
}elseif($userAccess == '0' or $userAccess == '8' or (!ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == '9')){
}elseif($userAccess == '0' or ($userAccess == MULTIHUNTER && $userID == 5) or (!ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN)){
$error = '<span class="error"><b>'.BANNED_CANNOT_SEND_RESOURCES.'.</b></span>';
}elseif($_POST['r1']==0 && $_POST['r2']==0 && $_POST['r3']==0 && $_POST['r4']==0){
$error = '<span class="error"><b>'.RESOURCES_NO_SELECTED.'.</b></span>';
+65 -41
View File
@@ -8,7 +8,8 @@
| Copyright: TravianX Project All rights reserved |
\*-------------------------------------------------------*/
$hero_info = $units->Hero($session->uid, 0, true);
$hero_info = $units->Hero($session->uid);
$heroes = $units->Hero($session->uid, 1);
$define['reset_level'] = 3; // Until which level you are able to reset your points
?>
@@ -22,47 +23,72 @@
<p class="build_desc"><?php echo HEROSMANSION_DESC; ?></p>
<?php
if($hero_info['unit'] == 1) {
$name = U1;
} else if($hero_info['unit'] == 2) {
$name = U2;
} else if($hero_info['unit'] == 3) {
$name = U3;
} else if($hero_info['unit'] == 5) {
$name = U5;
} else if($hero_info['unit'] == 6) {
$name = U6;
} else if($hero_info['unit'] == 11) {
$name = U11;
} else if($hero_info['unit'] == 12) {
$name = U12;
} else if($hero_info['unit'] == 13) {
$name = U13;
} else if($hero_info['unit'] == 15) {
$name = U15;
} else if($hero_info['unit'] == 16) {
$name = U16;
} else if($hero_info['unit'] == 21) {
$name = U21;
} else if($hero_info['unit'] == 22) {
$name = U22;
} else if($hero_info['unit'] == 24) {
$name = U24;
} else if($hero_info['unit'] == 25) {
$name = U25;
} else if($hero_info['unit'] == 26) {
$name = U26;
<?php
if ($hero_info) {
if ( $hero_info['unit'] == 1 ) {
$name = U1;
} else if ( $hero_info['unit'] == 2 ) {
$name = U2;
} else if ( $hero_info['unit'] == 3 ) {
$name = U3;
} else if ( $hero_info['unit'] == 5 ) {
$name = U5;
} else if ( $hero_info['unit'] == 6 ) {
$name = U6;
} else if ( $hero_info['unit'] == 11 ) {
$name = U11;
} else if ( $hero_info['unit'] == 12 ) {
$name = U12;
} else if ( $hero_info['unit'] == 13 ) {
$name = U13;
} else if ( $hero_info['unit'] == 15 ) {
$name = U15;
} else if ( $hero_info['unit'] == 16 ) {
$name = U16;
} else if ( $hero_info['unit'] == 21 ) {
$name = U21;
} else if ( $hero_info['unit'] == 22 ) {
$name = U22;
} else if ( $hero_info['unit'] == 24 ) {
$name = U24;
} else if ( $hero_info['unit'] == 25 ) {
$name = U25;
} else if ( $hero_info['unit'] == 26 ) {
$name = U26;
}
$name1 = $hero_info['name'];
} else {
$name = 'Mr. Nobody';
$name1 = 'unknown';
}
$name1 = $hero_info['name'];
if(isset($_GET['land'])) {
include("37_land.tpl");
include_once("37_land.tpl");
} else {
if($hero_info === false){
include("37_train.tpl");
}elseif($hero_info['intraining'] == 1){
$timeleft = $generator->getTimeFormat($hero_info['trainingtime'] - time());
$include_training = true;
$include_revive = false;
if (isset($heroes) && is_array($heroes) && count($heroes)) {
foreach ( $heroes as $hdata ) {
if ( $hdata['dead'] == 1 ) {
$include_revive = true;
}
if ( $hdata['inrevive'] == 1 ) {
$name1 = $hdata['name'];
$include_training = false;
}
}
}
if($hero_info === false && $include_revive){
include_once("37_revive.tpl");
}
if ($hero_info === false && $include_training) {
include_once("37_train.tpl");
} else if($hero_info['intraining'] == 1) {
$timeleft = $generator->getTimeFormat($hero_info['trainingtime'] - time());
?>
<table id="distribution" cellpadding="1" cellspacing="1">
<thead>
@@ -85,9 +111,7 @@
</table>
<?php
}
if($hero_info !== false AND $hero_info['dead'] == 1 AND $hero_info['intraining'] == 0){
include("37_revive.tpl");
}
if($hero_info !== false AND $hero_info['dead'] == 0 AND $hero_info['trainingtime'] <= time() AND $hero_info['inrevive'] == 0 AND $hero_info['intraining'] == 0){
include("37_hero.tpl");
}
+17 -18
View File
@@ -16,8 +16,7 @@ if (isset($_POST['name'])) {
$_POST['name'] = stripslashes($_POST['name']);
mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."hero SET `name`='".($database->escape($_POST['name']))."' where `uid`='".$database->escape($session->uid)."' AND dead = 0") or die("ERROR:".mysqli_error($database->dblink));
echo "".NAME_CHANGED."";
}
$hero_info = $units->Hero($session->uid);
}
?>
<table id="distribution" cellpadding="1" cellspacing="1">
@@ -172,12 +171,12 @@ if (isset($_POST['name'])) {
if($_GET['add'] == "reset") {
if($hero_info['level'] <= 3){
if($hero_info['attack'] != 0 OR $hero_info['defence'] != 0 OR $hero_info['attackbonus'] != 0 OR $hero_info['defencebonus'] != 0 OR $hero_info['regeneration'] != 0){
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = '".(($hero_info['level']*5)+5)."' WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attack` = '0' WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defence` = '0' WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attackbonus` = '0' WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defencebonus` = '0' WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `regeneration` = '0' WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = '".(($hero_info['level']*5)+5)."' WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attack` = '0' WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defence` = '0' WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attackbonus` = '0' WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defencebonus` = '0' WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `regeneration` = '0' WHERE `heroid` = " . $hero_info['heroid']);
header("Location: build.php?id=".$id."");
exit;
}
@@ -185,40 +184,40 @@ if (isset($_POST['name'])) {
}
if($_GET['add'] == "off" && $hero_info['attack'] < 100) {
if($hero_info['points'] > 0) {
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attack` = `attack` + 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attack` = `attack` + 1 WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `heroid` = " . $hero_info['heroid']);
header("Location: build.php?id=".$id."");
exit;
}
}
if($_GET['add'] == "deff" && $hero_info['defence'] < 100) {
if($hero_info['points'] > 0) {
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defence` = `defence` + 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defence` = `defence` + 1 WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `heroid` = " . $hero_info['heroid']);
header("Location: build.php?id=".$id."");
exit;
}
}
if($_GET['add'] == "obonus" && $hero_info['attackbonus'] < 100) {
if($hero_info['points'] > 0) {
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attackbonus` = `attackbonus` + 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `attackbonus` = `attackbonus` + 1 WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `heroid` = " . $hero_info['heroid']);
header("Location: build.php?id=".$id."");
exit;
}
}
if($_GET['add'] == "dbonus" && $hero_info['defencebonus'] < 100) {
if($hero_info['points'] > 0) {
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defencebonus` = `defencebonus` + 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `defencebonus` = `defencebonus` + 1 WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `heroid` = " . $hero_info['heroid']);
header("Location: build.php?id=".$id."");
exit;
}
}
if($_GET['add'] == "reg" && $hero_info['regeneration'] < 100) {
if($hero_info['points'] > 0) {
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `regeneration` = `regeneration` + 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `uid` = '" . $database->escape($session->uid) . "'");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `regeneration` = `regeneration` + 1 WHERE `heroid` = " . $hero_info['heroid']);
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "hero SET `points` = `points` - 1 WHERE `heroid` = " . $hero_info['heroid']);
header("Location: build.php?id=".$id."");
exit;
}
-1
View File
@@ -29,7 +29,6 @@
| Dzoki < dzoki.travian@gmail.com > |
| Copyright: TravianX Project All rights reserved |
\*-------------------------------------------------------*/
$heroes = $units->Hero($session->uid, 1);
// check if there is a hero in revive already
$reviving = false;
+53 -352
View File
@@ -34,8 +34,8 @@
//check if there is unit needed in the village
$result = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."units WHERE `vref` = ".(int) $village->wid."");
$units = mysqli_fetch_array($result);
$result = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."units WHERE `vref` = ".(int) $village->wid."");
$units_array = mysqli_fetch_array($result);
$count_hero = mysqli_fetch_array(mysqli_query($GLOBALS['link'],"SELECT Count(*) as Total FROM " . TB_PREFIX . "hero WHERE `uid` = " . $database->escape($session->uid) . ""), MYSQLI_ASSOC);
$count_hero = $count_hero['Total'];
@@ -75,7 +75,7 @@ if($session->tribe == 1) {
if($village->awood < $u1['wood'] || $village->aclay < $u1['clay'] || $village->airon < $u1['iron'] || $village->acrop < $u1['crop'])
$output.="<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
elseif($units['u1'] == 0)
elseif( $units_array['u1'] == 0)
$output.="<span class=\"none\">".NOT_UNITS."</span>";
else $output.="<a href=\"build.php?id=".$id."&train=1\">".TRAIN."</a>";
@@ -112,7 +112,7 @@ if($session->tribe == 1) {
if($village->awood < $u2['wood'] OR $village->aclay < $u2['clay'] OR $village->airon < $u2['iron'] OR $village->acrop < $u2['crop'])
$output.="<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
elseif($units['u2'] == 0)
elseif( $units_array['u2'] == 0)
$output.="<span class=\"none\">".NOT_UNITS."</span>";
else
$output.="<a href=\"build.php?id=".$id."&train=2\">".TRAIN."</a>";
@@ -150,7 +150,7 @@ if($session->tribe == 1) {
if($village->awood < $u3['wood'] OR $village->aclay < $u3['clay'] OR $village->airon < $u3['iron'] OR $village->acrop < $u3['crop']) {
$output.="<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u3'] == 0){
}else if( $units_array['u3'] == 0){
$output.="<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.="<a href=\"build.php?id=".$id."&train=3\">".TRAIN."</a>";
@@ -187,7 +187,7 @@ if($session->tribe == 1) {
if($village->awood < $u5['wood'] OR $village->aclay < $u5['clay'] OR $village->airon < $u5['iron'] OR $village->acrop < $u5['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u5'] == 0){
}else if( $units_array['u5'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=5\">".TRAIN."</a>";
@@ -224,7 +224,7 @@ if($session->tribe == 1) {
if($village->awood < $u6['wood'] OR $village->aclay < $u6['clay'] OR $village->airon < $u6['iron'] OR $village->acrop < $u6['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u6'] == 0){
}else if( $units_array['u6'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=6\">".TRAIN."</a>";
@@ -264,7 +264,7 @@ $output.="<tr>
if($village->awood < $u11['wood'] OR $village->aclay < $u11['clay'] OR $village->airon < $u11['iron'] OR $village->acrop < $u11['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u11'] == 0){
}else if( $units_array['u11'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=11\">".TRAIN."</a>";
@@ -301,7 +301,7 @@ $output.="<tr>
if($village->awood < $u12['wood'] OR $village->aclay < $u12['clay'] OR $village->airon < $u12['iron'] OR $village->acrop < $u12['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u12'] == 0){
}else if( $units_array['u12'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=12\">".TRAIN."</a>";
@@ -340,7 +340,7 @@ $output.="<tr>
if($village->awood < $u13['wood'] OR $village->aclay < $u13['clay'] OR $village->airon < $u13['iron'] OR $village->acrop < $u13['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u13'] == 0){
}else if( $units_array['u13'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=13\">".TRAIN."</a>";
@@ -377,7 +377,7 @@ $output.="<tr>
if($village->awood < $u15['wood'] OR $village->aclay < $u15['clay'] OR $village->airon < $u15['iron'] OR $village->acrop < $u15['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u15'] == 0){
}else if( $units_array['u15'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=15\">".TRAIN."</a>";
@@ -415,7 +415,7 @@ $output.="<tr>
if($village->awood < $u16['wood'] OR $village->aclay < $u16['clay'] OR $village->airon < $u16['iron'] OR $village->acrop < $u16['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u16'] == 0){
}else if( $units_array['u16'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=16\">".TRAIN."</a>";
@@ -455,7 +455,7 @@ $output.="<tr>
if($village->awood < $u21['wood'] OR $village->aclay < $u21['clay'] OR $village->airon < $u21['iron'] OR $village->acrop < $u21['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u21'] == 0){
}else if( $units_array['u21'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=21\">".TRAIN."</a>";
@@ -492,7 +492,7 @@ $output.="<tr>
if($village->awood < $u22['wood'] OR $village->aclay < $u22['clay'] OR $village->airon < $u22['iron'] OR $village->acrop < $u22['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u22'] == 0){
}else if( $units_array['u22'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=22\">".TRAIN."</a>";
@@ -530,7 +530,7 @@ $output.="<tr>
if($village->awood < $u24['wood'] OR $village->aclay < $u24['clay'] OR $village->airon < $u24['iron'] OR $village->acrop < $u24['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u24'] == 0){
}else if( $units_array['u24'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=24\">".TRAIN."</a>";
@@ -567,7 +567,7 @@ $output.="<tr>
if($village->awood < $u25['wood'] OR $village->aclay < $u25['clay'] OR $village->airon < $u25['iron'] OR $village->acrop < $u25['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u25'] == 0){
}else if( $units_array['u25'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=25\">".TRAIN."</a>";
@@ -605,7 +605,7 @@ $output.="<tr>
if($village->awood < $u26['wood'] OR $village->aclay < $u26['clay'] OR $village->airon < $u26['iron'] OR $village->acrop < $u26['crop']) {
$output.= "<span class=\"none\">".NOT."".ENOUGH_RESOURCES."</span>";
}else if($units['u26'] == 0){
}else if( $units_array['u26'] == 0){
$output.= "<span class=\"none\">".NOT_UNITS."</span>";
}else {
$output.= "<a href=\"build.php?id=".$id."&train=26\">".TRAIN."</a>";
@@ -618,343 +618,44 @@ $output.="<tr>
//HERO TRAINING
if($session->tribe == 1){
if(isset($_GET['train']) && $_GET['train'] == 1){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '1', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u1['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u1` = `u1` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u1['wood'].",
`clay` = `clay` - ".(int) $u1['clay'].",
`iron` = `iron` - ".(int) $u1['iron'].",
`crop` = `crop` - ".(int) $u1['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 2){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '2', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u1['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u2` = `u2` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u2['wood'].",
`clay` = `clay` - ".(int) $u2['clay'].",
`iron` = `iron` - ".(int) $u2['iron'].",
`crop` = `crop` - ".(int) $u2['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 3){
if($session->access != BANNED){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '3', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u3['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u3` = `u3` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u3['wood'].",
`clay` = `clay` - ".(int) $u3['clay'].",
`iron` = `iron` - ".(int) $u3['iron'].",
`crop` = `crop` - ".(int) $u3['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 5){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '5', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u5['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u5` = `u5` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u5['wood'].",
`clay` = `clay` - ".(int) $u5['clay'].",
`iron` = `iron` - ".(int) $u5['iron'].",
`crop` = `crop` - ".(int) $u5['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 6){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '6', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u6['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u6` = `u6` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u6['wood'].",
`clay` = `clay` - ".(int) $u6['clay'].",
`iron` = `iron` - ".(int) $u6['iron'].",
`crop` = `crop` - ".(int) $u6['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
}
if($session->tribe == 2){
if(isset($_GET['train']) && $_GET['train'] == 11){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '11', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u11['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u11` = `u11` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u11['wood'].",
`clay` = `clay` - ".(int) $u11['clay'].",
`iron` = `iron` - ".(int) $u11['iron'].",
`crop` = `crop` - ".(int) $u11['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 12){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '12', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u12['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u12` = `u12` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u12['wood'].",
`clay` = `clay` - ".(int) $u12['clay'].",
`iron` = `iron` - ".(int) $u12['iron'].",
`crop` = `crop` - ".(int) $u12['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 13){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '13', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u13['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u13` = `u13` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u13['wood'].",
`clay` = `clay` - ".(int) $u13['clay'].",
`iron` = `iron` - ".(int) $u13['iron'].",
`crop` = `crop` - ".(int) $u13['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 15){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '15', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u15['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u15` = `u15` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u15['wood'].",
`clay` = `clay` - ".(int) $u15['clay'].",
`iron` = `iron` - ".(int) $u15['iron'].",
`crop` = `crop` - ".(int) $u15['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 16){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '16', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u16['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u16` = `u16` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u16['wood'].",
`clay` = `clay` - ".(int) $u16['clay'].",
`iron` = `iron` - ".(int) $u16['iron'].",
`crop` = `crop` - ".(int) $u16['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if (isset($_GET['train'])) {
$validationArray = [];
switch ($session->tribe) {
case 1: $validationArray = [1, 2, 3, 5, 6];
break;
case 2: $validationArray = [11, 12, 13, 15, 16];
break;
case 3: $validationArray = [21, 22, 24, 25, 26];
break;
}
if($session->tribe == 3){
if(isset($_GET['train']) && $_GET['train'] == 21){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '21', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u21['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u21` = `u21` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u21['wood'].",
`clay` = `clay` - ".(int) $u21['clay'].",
`iron` = `iron` - ".(int) $u21['iron'].",
`crop` = `crop` - ".(int) $u21['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 22){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '22', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u22['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u22` = `u22` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u22['wood'].",
`clay` = `clay` - ".(int) $u22['clay'].",
`iron` = `iron` - ".(int) $u22['iron'].",
`crop` = `crop` - ".(int) $u22['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 24){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '24', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u24['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u24` = `u24` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u24['wood'].",
`clay` = `clay` - ".(int) $u24['clay'].",
`iron` = `iron` - ".(int) $u24['iron'].",
`crop` = `crop` - ".(int) $u24['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 25){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '25', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u25['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u25` = `u25` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u25['wood'].",
`clay` = `clay` - ".(int) $u25['clay'].",
`iron` = `iron` - ".(int) $u25['iron'].",
`crop` = `crop` - ".(int) $u25['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
if(isset($_GET['train']) && $_GET['train'] == 26){
if($session->access != BANNED){
if($count_hero < 3){
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$database->escape($session->uid)."', '" . (int) $village->wid . "', '0', '26', '".$database->escape($session->username)."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".round((time() + ($u26['time'] / SPEED)*3))."', '50', '1')");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u26` = `u26` - 1 WHERE `vref` = '" . (int) $village->wid . "'");
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) $u26['wood'].",
`clay` = `clay` - ".(int) $u26['clay'].",
`iron` = `iron` - ".(int) $u26['iron'].",
`crop` = `crop` - ".(int) $u26['crop']."
WHERE
`wref` = '" . (int) $village->wid . "'");
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
}
// check for a valid unit value
if (in_array($_GET['train'], $validationArray)) {
if($session->access != BANNED){
if($count_hero < 3){
$unitID = $_GET['train'];
mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES (".$database->escape($session->uid).", " . (int) $village->wid . ", 0, ".$unitID.", '".$database->escape($session->username)."', 0, 5, 0, 0, 100, 0, 0, 0, 0, ".round((time() + (${'u'.$unitID}['time'] / SPEED)*3)).", 50, 1)");
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET `u$unitID` = `u$unitID` - 1 WHERE `vref` = " . (int) $village->wid);
mysqli_query($GLOBALS['link'],"
UPDATE " . TB_PREFIX . "vdata
SET
`wood` = `wood` - ".(int) ${'u'.$unitID}['wood'].",
`clay` = `clay` - ".(int) ${'u'.$unitID}['clay'].",
`iron` = `iron` - ".(int) ${'u'.$unitID}['iron'].",
`crop` = `crop` - ".(int) ${'u'.$unitID}['crop']."
WHERE
`wref` = " . (int) $village->wid);
}
header("Location: build.php?id=".$id."");
exit;
}else{
header("Location: banned.php");
exit;
}
}
}
echo $output;
}
+6 -3
View File
@@ -98,6 +98,10 @@ $greatwarehouse1 = getTypeCount(38);
$greatgranary1 = getTypeCount(39);
$greatworkshop1 = getTypeCount(42);
$residenceOrPalaceInProgress = $building->residenceOfPalaceBuildInProgress();
$residenceBuildInProgress = $residenceOrPalaceInProgress['residence'];
$palaceBuildInProgress = $residenceOrPalaceInProgress['palace'];
?>
<div id="build" class="gid0"><h1<?php echo CONSTRUCT_NEW_BUILDING;?></h1>
<?php
@@ -163,7 +167,7 @@ include("avaliable/grainmill.tpl");
if($granary >= 1 && $warehouse >= 1 && $mainbuilding >= 3 && $market == 0 && $market1 == 0 && $id != 39 && $id != 40) {
include("avaliable/marketplace.tpl");
}
if($mainbuilding >= 5 && $residence == 0 && $residence1 == 0 && $id != 39 && $id != 40 && $palace == 0) {
if($mainbuilding >= 5 && $residence == 0 && $residence1 == 0 && $id != 39 && $id != 40 && $palace == 0 && !$palaceBuildInProgress) {
include("avaliable/residence.tpl");
}
if($academy == 0 && $academy1 == 0 && $mainbuilding >= 3 && $barrack >= 3 && $id != 39 && $id != 40) {
@@ -195,9 +199,8 @@ if ($test){
}
//if Castle no ready include palace.tpl
if (!$test){
if (!$test && !$residenceBuildInProgress){
include("avaliable/palace.tpl");
}
+8 -1
View File
@@ -11,11 +11,18 @@ if($bindicate == 1) {
$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
$master = count($database->getMasterJobsByField($village->wid,$id));
// master and loopsame would have duplicated level display,
// so we need to decrease loopsame if master is the only job left
if ($master == 1 && $loopsame == 1) {
$loopsame = 0;
}
$uprequire = $building->resourceRequired($id,$village->resarray['f'.$id.'t'],1+$loopsame+$doublebuild+$master);
$mastertime = $uprequire['time'];
?>
<p id="contract"><b><?php echo COSTS_UPGRADING_LEVEL;?> <?php echo $village->resarray['f'.$id]+1+$loopsame+$doublebuild+$master; ?>:<br />
<img class="r1" src="img/x.gif" alt="Lumber" title="Lumber" /><span class="little_res"><?php echo $uprequire['wood']; ?></span> | <img class="r2" src="img/x.gif" alt="Clay" title="Clay" /><span class="little_res"><?php echo $uprequire['clay']; ?></span> | <img class="r3" src="img/x.gif" alt="Iron" title="Iron" /><span class="little_res"><?php echo $uprequire['iron']; ?></span> | <img class="r4" src="img/x.gif" alt="Crop" title="Crop" /><span class="little_res"><?php echo $uprequire['crop']; ?></span> | <img class="r5" src="img/x.gif" alt="Crop consumption" title="Crop consumption" /><?php echo $uprequire['pop']; ?> | <img class="clock" src="img/x.gif" alt="duration" title="duration" /><?php echo $generator->getTimeFormat($uprequire['time']);
<img class="r1" src="img/x.gif" alt="Lumber" title="Lumber" /><span class="little_res"><?php echo $uprequire['wood']; ?></span> | <img class="r2" src="img/x.gif" alt="Clay" title="Clay" /><span class="little_res"><?php echo $uprequire['clay']; ?></span> | <img class="r3" src="img/x.gif" alt="Iron" title="Iron" /><span class="little_res"><?php echo $uprequire['iron']; ?></span> | <img class="r4" src="img/x.gif" alt="Crop" title="Crop" /><span class="little_res"><?php echo $uprequire['crop']; ?></span> | <img class="r5" src="img/x.gif" alt="Crop consumption" title="Crop consumption" /><?php echo $uprequire['pop']; ?> | <img class="clock" src="img/x.gif" alt="duration" title="duration" /><?php echo $generator->getTimeFormat($uprequire['time']);
if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
echo "|<a href=\"build.php?gid=17&t=3&r1=".$uprequire['wood']."&r2=".$uprequire['clay']."&r3=".$uprequire['iron']."&r4=".$uprequire['crop']."\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
} ?><br />
+1 -25
View File
@@ -8,31 +8,7 @@ if ( $wwlevel >= 50 ) {
$needed_plan = 0;
}
$wwbuildingplan = 0;
$villages = $database->getVillagesID( $session->uid );
foreach ( $villages as $village1 ) {
$plan = count( $database->getOwnArtefactInfoByType2( $village1, 11 ) );
if ( $plan > 0 ) {
$wwbuildingplan = 1;
}
}
if ( $session->alliance != 0 ) {
$alli_users = $database->getUserByAlliance( $session->alliance );
foreach ( $alli_users as $users ) {
$villages = $database->getVillagesID( $users['id'] );
if ( $users['id'] != $session->uid ) {
foreach ( $villages as $village1 ) {
$plan = count( $database->getOwnArtefactInfoByType2( $village1, 11 ) );
if ( $plan > 0 ) {
$wwbuildingplan += 1;
}
}
}
}
}
if ( $wwbuildingplan > $needed_plan ) {
if ( $building->allowWwUpgrade() ) {
if ( $bindicate == 1 ) {
echo "<p><span class=\"none\">" . MAX_LEVEL . "</span></p>";
} else if ( $bindicate == 10 ) {
+2 -2
View File
@@ -1,6 +1,6 @@
<h1><img class="unit ugeb" src="img/x.gif"> Brewery</h1><img class="building g35" src="img/x.gif" alt="Brewery" title="Brewery" />Tasty mead is brewed in the brewery and later quaffed by the soldiers during the celebrations.
<h1><img class="unit ugeb" src="img/x.gif"> Brewery</h1><img class="building g35" src="img/x.gif" alt="Brewery" title="Brewery" />Tasty mead is brewed in the brewery and later quaffed by the soldiers during the celebrations.
<br /><br />
These drinks make your soldiers braver and stronger in battles (1% per level). Unfortunately the chiefs power of persuasion is decreased and catapults can only do random hits.
These drinks make your soldiers braver and stronger in battles (1% per level). Unfortunately the chiefs' power of persuasion is decreased and catapults can only do random hits.
<br /><br />
It can only be built by Teutons and only in their capital. It affects the whole empire.<p><b>Costs</b> and <b>construction time</b> for level 1:<br /><img class="r1" src="img/x.gif" alt="Lumber" title="Lumber" />1460 | <img class="r2" src="img/x.gif" alt="Clay" title="Clay" />930 | <img class="r3" src="img/x.gif" alt="Iron" title="Iron" />1250 | <img class="r4" src="img/x.gif" alt="Crop" title="Crop" />1740 | <img class="r5" src="img/x.gif" alt="Crop consumption" title="Crop consumption" />6 | <span class="dur"><img class="clock" alt="duration" title="duration" src="img/x.gif" />2:13:20</span></p>
<p><b>Prerequisites</b><br /><a href="manual.php?typ=4&gid=11">Granary</a> Level 20, <a href="manual.php?typ=4&gid=16">Rally Point</a> Level 10</p><map id="nav" name="nav">
+2 -2
View File
@@ -515,7 +515,7 @@ if($type==18 or $type==19 or $type==20 or $type==21){
$data1 = mysqli_fetch_assoc($query1);
$query2 = mysqli_query($GLOBALS['link'],'SELECT * FROM `' . TB_PREFIX . 'users` WHERE `id` = ' . $data1['owner']);
$data2 = mysqli_fetch_assoc($query2);
if($data2['access']=='0' or $data2['access']=='8' or (!ADMIN_ALLOW_INCOMING_RAIDS && $data2['access']=='9')) {
if($data2['access']=='0' or ($data2['access']== MULTIHUNTER && $data2['id'] == 5) or (!ADMIN_ALLOW_INCOMING_RAIDS && $data2['access']=='9')) {
echo "&raquo; ".SENDTROOP." (".BAN.")";
} else if($data2['vac_mode']=='1') {
echo "&raquo; Send troops. (Vacation mode on)";
@@ -530,7 +530,7 @@ if($type==18 or $type==19 or $type==20 or $type==21){
<tr>
<td class="none">
<?php
if($data2['access']=='0' or $data2['access']=='8' or (!ADMIN_ALLOW_INCOMING_RAIDS && $data2['access']=='9')) {
if($data2['access']=='0' or ($data2['access']== MULTIHUNTER && $data2['id'] == 5) or (!ADMIN_ALLOW_INCOMING_RAIDS && $data2['access']=='9')) {
echo "&raquo; ".SENDMERC." (".BAN.")";
} else if($data2['vac_mode']=='1') {
echo "&raquo; Send merchant(s). (Vacation mode on)";
+9 -9
View File
@@ -1,6 +1,6 @@
<div id="content" class="messages">
<h1>Messages</h1>
<?php
<?php
include("menu.tpl");
?>
<form method="post" action="nachrichten.php" name="msg" ><input type="hidden" name="ft" value="m5" /><table cellpadding="1" cellspacing="1" id="overview">
@@ -14,26 +14,26 @@ include("menu.tpl");
</th>
<th colspan="2" class="buttons">
<input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" /> <input name="start" type="image" value="Back" alt="Back" id="btn_back" class="dynamic_img" src="img/x.gif" /></th>
<th class="navi"><?php
<th class="navi"><?php
if(!isset($_GET['s']) && count($message->archived1) < 10) {
echo "&laquo;&raquo;";
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($message->archived1) > 10) {
echo "&laquo;<a href=\"?s=10&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=10&o=0\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($message->archived1) > $_GET['s']) {
if(count($message->archived1) > ($_GET['s']+10) && $_GET['s']-10 < count($message->archived1) && $_GET['s'] != 0) {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else if(count($message->archived1) > $_GET['s']+10) {
echo "&laquo;<a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
else if (count($message->archived1) > 10) {
echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
}
}
?></th></tr></tfoot><tbody>
<?php
<?php
if(isset($_GET['s'])) {
$s = $_GET['s'];
}
+20 -8
View File
@@ -8,7 +8,7 @@
<tr>
<th colspan="2">Subject</th>
<th>Sender</th>
<th class="sent">Sent</th>
<th class="sent"><a href="nachrichten.php?o=1">Sent</a></th>
</tr></thead><tfoot><tr><th>
<?php
$MyGold = mysqli_query($GLOBALS['link'],"SELECT plus FROM ".TB_PREFIX."users WHERE `id`='".(int) $session->uid."'") or die(mysqli_error($database->dblink));
@@ -28,17 +28,17 @@
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($message->inbox1) > 10) {
echo "&laquo;<a href=\"?s=10&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=10&o=".(!empty($_GET['o']) )."\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($message->inbox1) > $_GET['s']) {
if(count($message->inbox1) > ($_GET['s']+10) && $_GET['s']-10 < count($message->inbox1) && $_GET['s'] != 0) {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else if(count($message->inbox1) > $_GET['s']+10) {
echo "&laquo;<a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
else if(count($message->inbox1) > 10) {
echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
}
}
?></th></tr></tfoot><tbody>
@@ -55,7 +55,8 @@
$s = 0;
}
$name = 1;
$support_messages = (($session->access == MULTIHUNTER || $session->access == ADMIN) && ADMIN_RECEIVE_SUPPORT_MESSAGES);
$support_messages = ($session->access == ADMIN && ADMIN_RECEIVE_SUPPORT_MESSAGES);
$multihunter_messages = ($session->access == MULTIHUNTER);
for($i=(1+$s);$i<=(10+$s);$i++) {
if(count($message->inbox1) >= $i) {
@@ -67,7 +68,18 @@
else {
echo "<tr>";
}
echo "<td class=\"sel\">".((!$support_messages || ($support_messages && $message->inbox1[$i-1]['target'] != 1)) ? "<input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->inbox1[$i-1]['id']."\" />" : '<u><b title="Message for Support"><i>S</i></b></u>')."</td>
$message_for_text = '';
if (!$support_messages || ($support_messages && $message->inbox1[$i-1]['target'] != 1) || ($multihunter_messages && $message->inbox1[$i-1]['target'] != 5)) {
$message_for_text = "<input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->inbox1[$i-1]['id']."\" />";
} else if ($support_messages) {
$message_for_text = '<u><b title="Message for Support"><i>S</i></b></u>';
} else if ($multihunter_messages) {
$message_for_text = '<u><b title="Message for Multihunter"><i>M</i></b></u>';
}
echo "<td class=\"sel\">".$message_for_text."</td>
<td class=\"top\"><a href=\"nachrichten.php?id=".$message->inbox1[$i-1]['id']."\">".$message->inbox1[$i-1]['topic']."</a> ";
if($message->inbox1[$i-1]['viewed'] == 0) {
echo "(new)";
+23 -11
View File
@@ -29,27 +29,27 @@
<?php } else { ?>
<input class="check" type="checkbox" id="s10" name="s10" onclick="Allmsg(this.form);" />
<?php } ?></th>
<th colspan="2" class="buttons"><input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" /></th><th class="navi"><?php
<th colspan="2" class="buttons"><input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" /></th><th class="navi"><?php
if(!isset($_GET['s']) && count($message->sent1) < 10) {
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($message->sent1) > 10) {
echo "&laquo;<a href=\"?t=2&s=10&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?t=2&s=10&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($message->sent1) > $_GET['s']) {
if(count($message->sent1) > ($_GET['s']+10) && $_GET['s']-10 < count($message->sent1) && $_GET['s'] != 0) {
echo "<a href=\"?t=2&s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?t=2&s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "<a href=\"?t=2&s=".($_GET['s']-10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&laquo;</a><a href=\"?t=2&s=".($_GET['s']+10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
}
else if(count($message->sent1) > $_GET['s']+10) {
echo "&laquo;<a href=\"?t=2&s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?t=2&s=".($_GET['s']+10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
}
else {
echo "<a href=\"?t=2&s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
else if (count($message->sent1) > 10) {
echo "<a href=\"?t=2&s=".($_GET['s']-10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&laquo;</a>&raquo;";
}
}
?></th></tr></tfoot>
<tbody>
<?php
<?php
if(isset($_GET['s'])) {
$s = $_GET['s'];
}
@@ -57,8 +57,9 @@
$s = 0;
}
$name = 1;
$support_messages = (($session->access == MULTIHUNTER || $session->access == ADMIN) && ADMIN_RECEIVE_SUPPORT_MESSAGES);
$support_messages = ($session->access == ADMIN && ADMIN_RECEIVE_SUPPORT_MESSAGES);
$multihunter_messages = ($session->access == MULTIHUNTER);
for($i=(1+$s);$i<=(10+$s);$i++) {
if(count($message->sent1) >= $i) {
if($message->sent1[$i-1]['target'] == 0) {
@@ -67,8 +68,19 @@
else {
echo "<tr>";
}
echo "<td class=\"sel\">".((!$support_messages || ($support_messages && $message->inbox1[$i-1]['target'] != 1)) ? "<input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->sent1[$i-1]['id']."\" />" : '<u><b title="Sent as Support"><i>S</i></b></u>')."</td>
<td class=\"top\"><a href=\"nachrichten.php?id=".$message->sent1[$i-1]['id']."\">".$message->sent1[$i-1]['topic']."</a> ";
$sent_as_text = '';
if (!$support_messages || ($support_messages && $message->inbox1[$i-1]['target'] != 1) || ($multihunter_messages && $message->inbox1[$i-1]['target'] != 5)) {
$sent_as_text = "<input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->sent1[$i-1]['id']."\" />";
} else if ($support_messages) {
$sent_as_text = '<u><b title="Sent as Support"><i>S</i></b></u>';
} else if ($multihunter_messages) {
$sent_as_text = '<u><b title="Sent as Multihunter"><i>M</i></b></u>';
}
echo "<td class=\"sel\">".$sent_as_text."</td>
<td class=\"top\"><a href=\"nachrichten.php?t=2a&amp;id=".$message->sent1[$i-1]['id']."\">".$message->sent1[$i-1]['topic']."</a> ";
if($message->sent1[$i-1]['viewed'] == 0) {
echo "(unread)";
}
+7 -3
View File
@@ -98,12 +98,16 @@ Reply: ".$database->getUserField($id,'username',0)."
<input type="hidden" name="ft" value="m2" />
<input type="image" value="" name="s1" id="btn_send" class="dynamic_img" src="img/x.gif" alt="send" onclick="this.disabled=true;this.form.submit();" tabindex=4; />
<?php
if (($session->access == MULTIHUNTER || $session->access == ADMIN) && ADMIN_RECEIVE_SUPPORT_MESSAGES && !empty($_GET['mid'])) {
if ($session->access == ADMIN && ADMIN_RECEIVE_SUPPORT_MESSAGES && !empty($_GET['mid'])) {
?><br />
<input type="checkbox" name="as_support"<?php echo ((!empty($_GET['tid']) && $_GET['tid'] == 1) ? ' checked="checked"' : ''); ?> /> Send as Support
<?php
}
?>
} else if ($session->access == MULTIHUNTER) {
?><br />
<input type="checkbox" name="as_multihunter"<?php echo ((!empty($_GET['tid']) && $_GET['tid'] == 5) ? ' checked="checked"' : ''); ?> /> Send as Multihunter
<?php
}
?>
</p>
</form>
<div id="adressbook" class="hide"><h2>Addressbook</h2>
+14 -15
View File
@@ -1,4 +1,4 @@
<?php
<?php
$noticeClass = array("Scout Report","Won as attacker without losses","Won as attacker with losses","Lost as attacker with losses","Won as defender without losses","Won as defender with losses","Lost as defender with losses","Lost as defender without losses","Reinforcement arrived","","Wood Delivered","Clay Delivered","Iron Delivered","Crop Delivered","","Won as defender without losses","Won as defender with losses","Lost as defender with losses","Won scouting as attacker","Lost scouting as attacker","Won scouting as defender","Lost scouting as defender","Scout Report");
?>
<form method="post" action="berichte.php" name="msg">
@@ -8,7 +8,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
<tr>
<th colspan="2">Subject:</th>
<th class="sent">
<a href="berichte.php?s=0&amp;o=1">Sent</a></th>
<a href="berichte.php?o=1<?php echo (isset($_GET['t']) ? '&amp;t='.$_GET['t'] : ''); ?>">Sent</a></th>
</tr>
</thead><tfoot>
<tr><th><?php
@@ -20,32 +20,32 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
<input class="check" type="checkbox" id="s10" name="s10" onclick="Allmsg(this.form);" />
<?php } ?></th>
<th class="buttons"><input name="del" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" value="delete" alt="delete" />
<?php if($session->plus) {
<?php if($session->plus) {
if(isset($_GET['t']) && $_GET['t'] == 5) {
echo "<input name=\"start\" type=\"image\" value=\"back\" alt=\"back\" id=\"btn_back\" class=\"dynamic_img\" src=\"img/x.gif\" />";
}
else {
echo "<input name=\"archive\" type=\"image\" value=\"Archive\" alt=\"Archive\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" />";
echo "<input name=\"archive\" type=\"image\" value=\"Archive\" alt=\"Archive\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" />";
}
}?>
</th>
<th class=navi>
<?php
<?php
if(!isset($_GET['s']) && count($message->noticearray) < 10) {
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($message->noticearray) > 10) {
echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=10&amp;o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=10&amp;o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($message->noticearray) > $_GET['s']) {
if(count($message->noticearray) > ($_GET['s']+10) && $_GET['s']-10 < count($message->noticearray) && $_GET['s'] != 0) {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&laquo;</a><a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
}
else if(count($message->noticearray) > $_GET['s']+10) {
echo "&laquo;<a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
}
else {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
else if (count($message->noticearray) > 10) {
echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&laquo;</a>&raquo;";
}
}
?>
@@ -53,7 +53,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
</tr>
</tfoot>
<tbody>
<?php
<?php
if(isset($_GET['s'])) {
$s = $_GET['s'];
@@ -61,7 +61,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
else {
$s = 0;
}
$name = 1;
$count = 0;
for($i=(1+$s);$i<=(10+$s);$i++) {
@@ -88,10 +88,9 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
}
if(count($message->noticearray) == 0) {
echo "<td colspan=\"3\" class=\"none\">There are no reports available.</td></tr>";
}
}
?>
</tbody>
</table>
+6 -6
View File
@@ -1,4 +1,4 @@
<?php
<?php
#################################################################################
@@ -16,7 +16,7 @@
## ##
#################################################################################
//gp link
$separator=isset($separator)? $separator:"";
$gpack_load=isset($user['gpack'])? $user['gpack']:$database->getUserField($_SESSION['username'], 'gpack', 1);
@@ -24,14 +24,14 @@
$gpack= $separator.GP_LOCATE;
} else {
$gpack= $separator.$gpack_load;
}
}
//de bird
if($displayarray['protect'] > time()){
$secondsDiff = $displayarray['protect'] - time();
$remainingDay = floor($secondsDiff/(3600*24));
$left = "$remainingDay days ".date("H:i:s", $secondsDiff);
$left = \App\Utils\DateTime::getTimeFormat($secondsDiff);
$profiel = preg_replace("/\[#0]/is",'<img src="'.$gpack.'img/t/tn.gif" border="0" onmouseout="med_closeDescription()" onmousemove="med_mouseMoveHandler(arguments[0],\'<table><tr><td>This player has '.$left.' hours of beginners protection left.</td></tr></table>\')">', $profiel, 1);
} else {
$geregistreerd=date('d-m-Y', ($displayarray['regtime']));
@@ -169,7 +169,7 @@ switch ($medal['categorie']) {
break;
case "10":
$titel="Rank Climbers of the week.";
$woord="Ranks";
$woord="Ranks";
break;
case "11":
$titel="Receiving this medal shows that you were in the top 3 of the Rank Climbers of the week ".$medal['points']." in a row.";
@@ -195,7 +195,7 @@ switch ($medal['categorie']) {
$titel="Receiving this medal shows that you were in the top 10 Rank Climbers of the week ".$medal['points']." in a row.";
$bonus[$medal['id']]=1;
break;
}
+16 -16
View File
@@ -1,6 +1,6 @@
<h1>Player profile</h1>
<?php
<?php
#################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
@@ -24,12 +24,12 @@ include("menu.tpl"); ?>
<form action="spieler.php" method="POST">
<input type="hidden" name="ft" value="p1" />
<input type="hidden" name="uid" value="<?php echo $session->uid; ?>" />
<input type="hidden" name="id" value="<?php echo $id; ?>" />
<input type="hidden" name="id" value="<?php echo (isset($id) ? $id : ''); ?>" />
<table cellpadding="1" cellspacing="1" id="edit" ><thead>
<tr>
<th colspan="3">Player <?php echo $session->username; ?> </th>
</tr>
</tr>
<tr>
<td colspan="2">Details</td>
@@ -40,7 +40,7 @@ include("menu.tpl"); ?>
<tr>
<td colspan="2" class="empty"></td><td class="empty"></td></tr>
<tr>
<?php
<?php
if($session->userinfo['birthday'] != 0) {
$bday = explode("-",$session->userinfo['birthday']);
}
@@ -63,10 +63,10 @@ include("menu.tpl"); ?>
<label><input class="radio" type="radio" name="mw" value="1" <?php if($session->userinfo['gender'] == 1) { echo "checked"; } ?> >m</label>
<label><input class="radio" type="radio" name="mw" value="2" <?php if($session->userinfo['gender'] == 2) { echo "checked"; } ?> >f</label>
</td></tr>
<tr><th>Location</th><td><input tabindex="5" type="text" name="ort" value="<?php echo $session->userinfo['location']; ?>" maxlength="30" class="text"></td></tr>
<tr><td colspan="2" class="empty"></td></tr>
<?php
for($i=0;$i<=count($varray)-1;$i++) {
@@ -76,7 +76,7 @@ include("menu.tpl"); ?>
<tr><td colspan="2" class="desc2"><textarea tabindex="8" name="be2"><?php echo $session->userinfo['desc1']; ?></textarea></td></tr>
</table>
<p>
<table cellspacing="1" cellpadding="2" class="tbg">
<tr><td class="rbg" colspan="4">Medals</td></tr>
@@ -99,9 +99,9 @@ INDELING CATEGORIEEN:
== 7. in top 3 - verdediging ==
== 8. in top 3 - klimmers ==
== 9. in top 3 - overval ==
******************************/
******************************/
foreach($varmedal as $medal) {
$titel="Bonus";
switch ($medal['categorie']) {
@@ -141,7 +141,7 @@ INDELING CATEGORIEEN:
case "12":
$titel="Top 10 of Rank Attackers of week ".$medal['points']." in a row";
break;
}
}
echo"<tr>
<td> ".$titel."</td>
<td>".$medal['plaats']."</td>
@@ -155,7 +155,7 @@ INDELING CATEGORIEEN:
<td></td>
<td>[#0]</td>
</tr>
<?php
<?php
// Added by Shadow - cata7007@gmail.com / Skype : cata7007
if($session->userinfo['tribe'] == 1 && $session->userinfo['username'] == "Shadow") {
echo"<tr><td>Tribe Romans</td><td></td><td></td><td>[#roman]</td></tr>";
@@ -171,8 +171,8 @@ INDELING CATEGORIEEN:
echo"<tr><td>Multihunter</td><td></td><td></td><td>[#TEAM]</td></tr>";
} ?>
</table></p>
<p class="btn"><input type="image" value="" tabindex="9" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></p>
</form>
+43 -47
View File
@@ -38,16 +38,16 @@ $ckey= $generator->generateRandStr(6);
if (!isset($process['t1']) || $process['t1'] == ''){ $t1='0'; }else{ $t1=$process['t1']; }
if (!isset($process['t2']) || $process['t2'] == ''){ $t2='0'; }else{ $t2=$process['t2']; }
if (!isset($process['t3']) || $process['t3'] == ''){ $t3='0'; }else{ $t3=$process['t3']; if ($session->tribe == 3){ $scout=1; } }
if (!isset($process['t4']) || $process['t4'] == ''){ $t4='0'; }else{ $t4=$process['t4']; if ($session->tribe == 1 || $session->tribe == 2 || $session->tribe == 4 || $session->tribe == 5){ $scout=1;} }
if (!isset($process['t5']) || $process['t5'] == ''){ $t5='0'; }else{ $t5=$process['t5']; }
if (!isset($process['t6']) || $process['t6'] == ''){ $t6='0'; }else{ $t6=$process['t6']; }
if (!isset($process['t7']) || $process['t7'] == ''){ $t7='0'; }else{ $t7=$process['t7']; }
if (!isset($process['t8']) || $process['t8'] == ''){ $t8='0'; }else{ $t8=$process['t8']; }
if (!isset($process['t9']) || $process['t9'] == ''){ $t9='0'; }else{ $t9=$process['t9']; }
if (!isset($process['t10']) || $process['t10'] == ''){ $t10='0'; }else{ $t10=$process['t10']; }
if (!isset($process['t11']) || $process['t11'] == ''){ $t11='0'; }else{ $t11=$process['t11']; $showhero=1;}
if (!isset($process['t2']) || $process['t2'] == ''){ $t2='0'; }else{ $t2=$process['t2']; }
if (!isset($process['t3']) || $process['t3'] == ''){ $t3='0'; }else{ $t3=$process['t3']; if ($session->tribe == 3){ $scout=1; } }
if (!isset($process['t4']) || $process['t4'] == ''){ $t4='0'; }else{ $t4=$process['t4']; if ($session->tribe == 1 || $session->tribe == 2 || $session->tribe == 4 || $session->tribe == 5){ $scout=1;} }
if (!isset($process['t5']) || $process['t5'] == ''){ $t5='0'; }else{ $t5=$process['t5']; }
if (!isset($process['t6']) || $process['t6'] == ''){ $t6='0'; }else{ $t6=$process['t6']; }
if (!isset($process['t7']) || $process['t7'] == ''){ $t7='0'; }else{ $t7=$process['t7']; }
if (!isset($process['t8']) || $process['t8'] == ''){ $t8='0'; }else{ $t8=$process['t8']; }
if (!isset($process['t9']) || $process['t9'] == ''){ $t9='0'; }else{ $t9=$process['t9']; }
if (!isset($process['t10']) || $process['t10'] == ''){ $t10='0'; }else{ $t10=$process['t10']; }
if (!isset($process['t11']) || $process['t11'] == ''){ $t11='0'; }else{ $t11=$process['t11']; $showhero=1;}
if ($session->tribe == 3){
$totalunits = (!empty($process['t1']) ? $process['t1'] : 0) +
(!empty($process['t2']) ? $process['t2'] : 0) +
@@ -59,7 +59,7 @@ $ckey= $generator->generateRandStr(6);
(!empty($process['t9']) ? $process['t9'] : 0) +
(!empty($process['t10']) ? $process['t10'] : 0) +
(!empty($process['t11']) ? $process['t11'] : 0);
}else{
$totalunits = (!empty($process['t1']) ? $process['t1'] : 0) +
(!empty($process['t2']) ? $process['t2'] : 0) +
@@ -106,7 +106,7 @@ $start = ($tribe-1)*10+1;
$end = ($tribe*10);
?>
<h1><?php echo $actionType." to ".$process[1]; ?></h1>
<h1><?php echo $actionType." to ".$process[1]; ?></h1>
<form method="post" action="a2b.php">
<table id="short_info" cellpadding="1" cellspacing="1">
@@ -154,14 +154,14 @@ $end = ($tribe*10);
<tr>
<td></td>
<?php
<?php
for($i=$start;$i<=($end);$i++) {
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} if (!empty($process['t11'])){
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
}?>
</tr>
<tr>
@@ -204,7 +204,7 @@ $end = ($tribe*10);
</tr>
</tbody>
<?php } ?>
<?php if(isset($kata) AND $process['c']!='2'){?><tr>
@@ -212,7 +212,7 @@ $end = ($tribe*10);
<tr>
<th>Destination:</th>
<td colspan="<?php if(!empty($process['t11'])){ echo"11"; }else{ echo"10"; } ?>">
<select name="ctar1" class="dropdown">
<option value="0">Random</option>
<?php if($building->getTypeLevel(16) >= 5) { ?>
@@ -223,7 +223,7 @@ $end = ($tribe*10);
<option value="4">Cropland</option>
<option value="5">Sawmill</option>
<option value="6">Brickyard</option>
<option value="7">Iron Foundry</option>
<option value="8">Grain Mill</option>
<option value="9">Bakery</option>
@@ -245,7 +245,7 @@ $end = ($tribe*10);
<?php } ?>
<option value="38">Great warehouse</option>
<option value="39">Great granary</option>
<option value="40">Wonder of the World</option>
<option value="40">Wonder of the World</option>
</optgroup>
<?php } ?>
<?php if($building->getTypeLevel(16) >= 10) { ?>
@@ -257,7 +257,7 @@ $end = ($tribe*10);
<option value="19">Barracks</option>
<option value="20">Stable</option>
<option value="21">Workshop</option>
<option value="22">Academy</option>
<option value="29">Great barracks</option>
<option value="30">Great stable</option>
@@ -278,7 +278,7 @@ $end = ($tribe*10);
<option value="4">Cropland</option>
<option value="5">Sawmill</option>
<option value="6">Brickyard</option>
<option value="7">Iron Foundry</option>
<option value="8">Grain Mill</option>
<option value="9">Bakery</option>
@@ -295,13 +295,13 @@ $end = ($tribe*10);
<option value="24">Townhall</option>
<option value="25">Residence</option>
<option value="26">Palace</option>
<option value="27">Treasury</option>
<option value="28">Trade office</option>
<?php } ?>
<option value="38">Great warehouse</option>
<option value="39">Great granary</option>
<option value="40">Wonder of the World</option>
<option value="40">Wonder of the World</option>
</optgroup>
<?php } ?>
<?php if($building->getTypeLevel(16) >= 10) { ?>
@@ -313,7 +313,7 @@ $end = ($tribe*10);
<option value="19">Barracks</option>
<option value="20">Stable</option>
<option value="21">Workshop</option>
<option value="22">Academy</option>
<option value="29">Great barracks</option>
<option value="30">Great stable</option>
@@ -326,16 +326,16 @@ $end = ($tribe*10);
<span class="info">(will be attacked by catapult(s))</span>
</td>
</tr>
</tbody><?PHP
</tbody><?PHP
}
else if($process['c']=='4')
{
?><tbody class="infos">
?><tbody class="infos">
<th>Destination:</th>
<td colspan="<?php if(!empty($process['t11'])){ echo"11"; }else{ echo"10"; } ?>">
<?PHP
echo"Warning: Catapult will <b>ONLY</b> shoot with a normal attack (they dont shoot with raids!)";
?>
</td>
@@ -354,7 +354,7 @@ $end = ($tribe*10);
<th>Arrived:</th>
<?php
$speeds = array();
@@ -375,16 +375,12 @@ $end = ($tribe*10);
{
if ($i<11)
$speeds[] = ${'u'.(($session->tribe-1)*10+$i)}['speed'];
if ($i<11)
$speeds[] = ${'u'.(($session->tribe-1)*10+$i)}['speed'];
else
{
//$uid
$q = "SELECT unit FROM ".TB_PREFIX."hero WHERE uid = ".(int) $uid." AND dead = 0";
$result = mysqli_query($GLOBALS['link'],$q);
$hero_f=mysqli_fetch_array($result);
$hero_unit=$hero_f['unit'];
$speeds[] = ${'u'.$hero_unit}['speed'];
$hero_unit = $database->getHeroField($uid, 'unit');
$speeds[] = ${'u'.$hero_unit}['speed'];
}
if($i != 4)
@@ -393,7 +389,7 @@ $end = ($tribe*10);
}
}
@@ -401,7 +397,7 @@ $end = ($tribe*10);
if($scout)
@@ -434,7 +430,7 @@ $end = ($tribe*10);
?>
<td colspan="<?php if(!empty($process['t11'])){ echo"11"; }else{ echo"10"; } ?>">
@@ -450,13 +446,13 @@ $end = ($tribe*10);
</table>
<input name="timestamp" value="<?php echo time(); ?>" type="hidden">
<input name="timestamp" value="<?php echo time(); ?>" type="hidden">
<input name="timestamp_checksum" value="<?php echo $ckey; ?>" type="hidden">
<input name="timestamp_checksum" value="<?php echo $ckey; ?>" type="hidden">
<input name="ckey" value="<?php echo $id; ?>" type="hidden">
<input name="ckey" value="<?php echo $id; ?>" type="hidden">
<input name="id" value="39" type="hidden">
<input name="id" value="39" type="hidden">
<input name="a" value="533374" type="hidden">
<input name="c" value="3" type="hidden">
@@ -465,11 +461,11 @@ $end = ($tribe*10);
if(($database->hasBeginnerProtection($village->wid)==1)&&($database->hasBeginnerProtection($process['0'])==0)){
echo"<span style=\"color: #DD0000\"><b>Caution:</b> Attacking a player will lose the protection!</span>";
}
if($database->hasBeginnerProtection($process['0'])==1) {
if($database->hasBeginnerProtection($process['0'])==1) {
echo"<b>User presently has beginners protection</b>";
} else {
?>
<p class="btn"><input value="ok" name="s1" id="btn_ok"
<p class="btn"><input value="ok" name="s1" id="btn_ok"
class="dynamic_img " src="img/x.gif" alt="OK" type="image" onclick="if (this.disabled==false) {document.getElementsByTagName('form')[0].submit();} this.disabled=true;" onLoad="this.disabled=false;"></p>
+36 -36
View File
@@ -40,22 +40,22 @@ $ckey= $generator->generateRandStr(6);
if (!isset($process['t1']) || $process['t1'] == ''){ $t1='0'; }else{ $t1=$process['t1']; }
if (!isset($process['t2']) || $process['t2'] == ''){ $t2='0'; }else{ $t2=$process['t2']; }
if (!isset($process['t3']) || $process['t3'] == ''){ $t3='0'; }else{ $t3=$process['t3']; $scout=1; }
if (!isset($process['t4']) || $process['t4'] == ''){ $t4='0'; }else{ $t4=$process['t4']; }
if (!isset($process['t5']) || $process['t5'] == ''){ $t5='0'; }else{ $t5=$process['t5']; }
if (!isset($process['t6']) || $process['t6'] == ''){ $t6='0'; }else{ $t6=$process['t6']; }
if (!isset($process['t7']) || $process['t7'] == ''){ $t7='0'; }else{ $t7=$process['t7']; }
if (!isset($process['t8']) || $process['t8'] == ''){ $t8='0'; }else{ $t8=$process['t8']; }
if (!isset($process['t9']) || $process['t9'] == ''){ $t9='0'; }else{ $t9=$process['t9']; }
if (!isset($process['t10']) || $process['t10'] == ''){ $t10='0'; }else{ $t10=$process['t10']; }
if (!isset($process['t11']) || $process['t11'] == ''){ $t11='0'; }else{ $t11=$process['t11']; }
if (!isset($process['t2']) || $process['t2'] == ''){ $t2='0'; }else{ $t2=$process['t2']; }
if (!isset($process['t3']) || $process['t3'] == ''){ $t3='0'; }else{ $t3=$process['t3']; $scout=1; }
if (!isset($process['t4']) || $process['t4'] == ''){ $t4='0'; }else{ $t4=$process['t4']; }
if (!isset($process['t5']) || $process['t5'] == ''){ $t5='0'; }else{ $t5=$process['t5']; }
if (!isset($process['t6']) || $process['t6'] == ''){ $t6='0'; }else{ $t6=$process['t6']; }
if (!isset($process['t7']) || $process['t7'] == ''){ $t7='0'; }else{ $t7=$process['t7']; }
if (!isset($process['t8']) || $process['t8'] == ''){ $t8='0'; }else{ $t8=$process['t8']; }
if (!isset($process['t9']) || $process['t9'] == ''){ $t9='0'; }else{ $t9=$process['t9']; }
if (!isset($process['t10']) || $process['t10'] == ''){ $t10='0'; }else{ $t10=$process['t10']; }
if (!isset($process['t11']) || $process['t11'] == ''){ $t11='0'; }else{ $t11=$process['t11']; }
$totalunits =$process['t1']+$process['t2']+$process['t4']+$process['t5']+$process['t6']+$process['t7']+$process['t8']+$process['t9']+$process['t10']+$process['t11'];
if ($scout==1 && $totalunits==0) {
$process['c'] = 1;
}
}
$id = $database->addA2b($ckey,time(),$process['0'],$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11,$process['c']);
@@ -77,7 +77,7 @@ $actionType = "Raid";
?>
<h1><?php echo $actionType." to ".$process[1]; ?></h1>
<h1><?php echo $actionType." to ".$process[1]; ?></h1>
<form method="post" action="a2b.php">
@@ -123,7 +123,7 @@ $actionType = "Raid";
</thead>
<tbody class="units">
<tr>
@@ -189,7 +189,7 @@ $actionType = "Raid";
</tr>
</tbody>
<?php } ?>
<?php if(isset($kata) AND $process['c']!='2'){?><tr>
@@ -208,7 +208,7 @@ $actionType = "Raid";
<option value="0">Cropland</option>
<option value="5">Sawmill</option>
<option value="6">Brickyard</option>
<option value="7">Iron Foundry</option>
<option value="8">Grain Mill</option>
<option value="9">Bakery</option>
@@ -225,13 +225,13 @@ $actionType = "Raid";
<option value="24">Townhall</option>
<option value="25">Residence</option>
<option value="26">Palace</option>
<option value="27">Treasury</option>
<option value="28">Trade office</option>
<?php } ?>
<option value="38">Great warehouse</option>
<option value="39">Great granary</option>
<option value="40">Wonder of the World</option>
<option value="40">Wonder of the World</option>
</optgroup>
<?php } ?>
<?php if($building->getTypeLevel(16) >= 10) { ?>
@@ -243,7 +243,7 @@ $actionType = "Raid";
<option value="19">Barracks</option>
<option value="20">Stable</option>
<option value="21">Workshop</option>
<option value="22">Academy</option>
<option value="29">Great barracks</option>
<option value="30">Great stable</option>
@@ -262,7 +262,7 @@ $actionType = "Raid";
<option value="0">Cropland</option>
<option value="5">Sawmill</option>
<option value="6">Brickyard</option>
<option value="7">Iron Foundry</option>
<option value="8">Grain Mill</option>
<option value="9">Bakery</option>
@@ -279,13 +279,13 @@ $actionType = "Raid";
<option value="24">Townhall</option>
<option value="25">Residence</option>
<option value="26">Palace</option>
<option value="27">Treasury</option>
<option value="28">Trade office</option>
<?php } ?>
<option value="38">Great warehouse</option>
<option value="39">Great granary</option>
<option value="40">Wonder of the World</option>
<option value="40">Wonder of the World</option>
</optgroup>
<?php } ?>
<?php if($building->getTypeLevel(16) >= 10) { ?>
@@ -297,7 +297,7 @@ $actionType = "Raid";
<option value="19">Barracks</option>
<option value="20">Stable</option>
<option value="21">Workshop</option>
<option value="22">Academy</option>
<option value="29">Great barracks</option>
<option value="30">Great stable</option>
@@ -308,16 +308,16 @@ $actionType = "Raid";
<span class="info">(will be attacked by catapult(s))</span>
</td>
</tr>
</tbody><?PHP
</tbody><?PHP
}
else if($process['c']=='4')
{
?><tbody class="infos">
?><tbody class="infos">
<th>Destination:</th>
<td colspan="<?php if($process['t11'] != ''){ echo"11"; }else{ echo"10"; } ?>">
<?PHP
echo"Warning: Catapult will <b>ONLY</b> shoot with a normal attack (they dont shoot with raids!)";
?>
</td>
@@ -337,7 +337,7 @@ $actionType = "Raid";
<th>Arrived:</th>
<?php
@@ -346,7 +346,7 @@ $actionType = "Raid";
$start = ($att_tribe == 1)? 1 : (($att_tribe == 2)? 11: 21);
$end = ($att_tribe == 1)? 10 : (($att_tribe == 2)? 20: 30);
$speeds = array();
$scout = 1;
@@ -373,13 +373,13 @@ $actionType = "Raid";
}
}
}
if($scout)
@@ -411,12 +411,12 @@ $actionType = "Raid";
}
?>
<td colspan="<?php if($process['t11'] != ''){ echo"11"; }else{ echo"10"; } ?>">
<div class="in">in <?php echo $generator->getTimeFormat($time); ?></div>
<div class="at">at <span id="tp2"> <?php echo $generator->procMtime(date('U')+$time,9)?></span><span> hours</span></div>
</td>
@@ -427,18 +427,18 @@ $actionType = "Raid";
</table>
<input name="timestamp" value="<?php echo time(); ?>" type="hidden">
<input name="timestamp" value="<?php echo time(); ?>" type="hidden">
<input name="timestamp_checksum" value="<?php echo $ckey; ?>" type="hidden">
<input name="timestamp_checksum" value="<?php echo $ckey; ?>" type="hidden">
<input name="ckey" value="<?php echo $id; ?>" type="hidden">
<input name="ckey" value="<?php echo $id; ?>" type="hidden">
<input name="id" value="39" type="hidden">
<input name="id" value="39" type="hidden">
<input name="a" value="533374" type="hidden">
<input name="c" value="3" type="hidden">
<p class="btn"><input value="ok" name="s1" id="btn_ok"
<p class="btn"><input value="ok" name="s1" id="btn_ok"
class="dynamic_img " src="img/x.gif" alt="OK" type="image" onclick="if (this.disabled==false) {document.getElementsByTagName('form')[0].submit();} this.disabled=true;" onLoad="this.disabled=false;"></p>
+133 -81
View File
@@ -15,89 +15,141 @@
$t11 = 0;
$villageOwner = $database->getVillageField($wref,'owner');
$userAccess = $database->getUserField($villageOwner,'access',0);
if($userAccess != '0' && $userAccess != '8' && ($userAccess != '9' || (ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == '9'))){
if($tribe == 1){ $uname = "u"; } elseif($tribe == 2){ $uname = "u1"; } elseif($tribe == 3){ $uname = "u2"; }elseif($tribe == 4){ $uname = "u3"; }else {$uname = "u4"; }
if($tribe == 1){ $uname1 = "u1"; } elseif($tribe == 2){ $uname1 = "u2"; } elseif($tribe == 3){ $uname1 = "u3"; }elseif($tribe == 4){ $uname1 = "u4"; }else {$uname1 = "u5"; }
if($tribe == 1){ $uname2 = ""; } elseif($tribe == 2){ $uname2 = "1"; } elseif($tribe == 3){ $uname2 = "2"; }elseif($tribe == 4){ $uname2 = "3"; }else {$uname2 = "4"; }
if($sql1[$uname.'1']>=$t1 && $sql1[$uname.'2']>=$t2 && $sql1[$uname.'3']>=$t3 && $sql1[$uname.'4']>=$t4 && $sql1[$uname.'5']>=$t5 && $sql1[$uname.'6']>=$t6 && $sql1[$uname.'7']>=$t7 && $sql1[$uname.'8']>=$t8 && $sql1[$uname.'9']>=$t9 && $sql1[$uname1.'0']>=$t10 && $sql1['hero']>=$t11){
if($_POST['slot'.$sid]=='on'){
$ckey = $generator->generateRandStr(6);
$id = $database->addA2b($ckey,time(),$wref,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11,4);
$data = $database->getA2b($ckey, time());
$eigen = $database->getCoor($getFLData['wref']);
$from = array('x'=>$eigen['x'], 'y'=>$eigen['y']);
$ander = $database->getCoor($data['to_vid']);
$to = array('x'=>$ander['x'], 'y'=>$ander['y']);
$start = ($tribe-1)*10+1;
$end = ($tribe*10);
$speeds = array();
$scout = 1;
//find slowest unit.
for($i=1;$i<=10;$i++){
if ($data['u'.$i]){
if($data['u'.$i] != '' && $data['u'.$i] > 0){
if($unitarray) { reset($unitarray); }
$unitarray = $GLOBALS["u".(($tribe-1)*10+$i)];
$speeds[] = $unitarray['speed'];
$userID = $database->getUserField($villageOwner,'id',0);
if ( $userAccess != '0' && !($userAccess == MULTIHUNTER && $userID == 5) && ( $userAccess != ADMIN || ( ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN ) ) ) {
if ( $tribe == 1 ) {
$uname = "u";
$uname1 = "u1";
$uname2 = "";
} elseif ( $tribe == 2 ) {
$uname = "u1";
$uname1 = "u2";
$uname2 = "1";
} elseif ( $tribe == 3 ) {
$uname = "u2";
$uname1 = "u3";
$uname2 = "2";
} elseif ( $tribe == 4 ) {
$uname = "u3";
$uname1 = "u4";
$uname2 = "3";
} else {
$uname = "u4";
$uname1 = "u5";
$uname2 = "4";
}
if (
$sql1[ $uname . '1' ] >= $t1 &&
$sql1[ $uname . '2' ] >= $t2 &&
$sql1[ $uname . '3' ] >= $t3 &&
$sql1[ $uname . '4' ] >= $t4 &&
$sql1[ $uname . '5' ] >= $t5 &&
$sql1[ $uname . '6' ] >= $t6 &&
$sql1[ $uname . '7' ] >= $t7 &&
$sql1[ $uname . '8' ] >= $t8 &&
$sql1[ $uname . '9' ] >= $t9 &&
$sql1[ $uname1 . '0' ] >= $t10 &&
$sql1['hero'] >= $t11
) {
if ( $_POST[ 'slot' . $sid ] == 'on' ) {
$ckey = $generator->generateRandStr( 6 );
$id = $database->addA2b( $ckey, time(), $wref, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, 4 );
$data = $database->getA2b( $ckey, time() );
$eigen = $database->getCoor( $getFLData['wref'] );
$from = array( 'x' => $eigen['x'], 'y' => $eigen['y'] );
$ander = $database->getCoor( $data['to_vid'] );
$to = array( 'x' => $ander['x'], 'y' => $ander['y'] );
$start = ( $tribe - 1 ) * 10 + 1;
$end = ( $tribe * 10 );
$speeds = array();
$scout = 1;
//find slowest unit.
for ( $i = 1; $i <= 10; $i ++ ) {
if ( $data[ 'u' . $i ] ) {
if ( $data[ 'u' . $i ] != '' && $data[ 'u' . $i ] > 0 ) {
if ( $unitarray ) {
reset( $unitarray );
}
$unitarray = $GLOBALS[ "u" . ( ( $tribe - 1 ) * 10 + $i ) ];
$speeds[] = $unitarray['speed'];
}
}
}
$artefact = count( $database->getOwnUniqueArtefactInfo2( $getFLData['owner'], 2, 3, 0 ) );
$artefact1 = count( $database->getOwnUniqueArtefactInfo2( $getFLData['wref'], 2, 1, 1 ) );
$artefact2 = count( $database->getOwnUniqueArtefactInfo2( $getFLData['owner'], 2, 2, 0 ) );
if ( $artefact > 0 ) {
$fastertroops = 3;
} else if ( $artefact1 > 0 ) {
$fastertroops = 2;
} else if ( $artefact2 > 0 ) {
$fastertroops = 1.5;
} else {
$fastertroops = 1;
}
$time = round( $generator->procDistanceTime( $from, $to, min( $speeds ), 1 ) / $fastertroops );
$foolartefact = $database->getFoolArtefactInfo( 2, $village->wid, $session->uid );
if ( count( $foolartefact ) > 0 ) {
foreach ( $foolartefact as $arte ) {
if ( $arte['bad_effect'] == 1 ) {
$time *= $arte['effect2'];
} else {
$time /= $arte['effect2'];
$time = round( $time );
}
}
}
if ( $data['u7'] > 0 ) {
$ctar1 = 99;
} else {
$ctar1 = 0;
}
$ctar2 = 0;
$abdata = $database->getABTech( $getFLData['wref'] );
$reference = $database->addAttack( ( $getFLData['wref'] ), $data['u1'], $data['u2'], $data['u3'], $data['u4'], $data['u5'], $data['u6'], $data['u7'], $data['u8'], $data['u9'], $data['u10'], $data['u11'], $data['type'], $ctar1, $ctar2, 0, $abdata['b1'], $abdata['b2'], $abdata['b3'], $abdata['b4'], $abdata['b5'], $abdata['b6'], $abdata['b7'], $abdata['b8'] );
$totalunits = $data['u1'] + $data['u2'] + $data['u3'] + $data['u4'] + $data['u5'] + $data['u6'] + $data['u7'] + $data['u8'] + $data['u9'] + $data['u10'] + $data['u11'];
$units = [];
$amounts = [];
$modes = [];
for ( $u = 1; $u <= 10; $u ++ ) {
if ($tribe == 1) {
$unitKey = $uname2 . $u;
} else {
$unitKey = $uname2 . ($u < 10 ? $u : 0);
}
$units[] = $uname2 . $unitKey;
$amounts[] = $data[ 'u' . $unitKey ];
$modes[] = 0;
}
$units[] = 'hero';
$amounts[] = $data['u11'];
$modes[] = 0;
$database->modifyUnit( $getFLData['wref'], $units, $amounts, $modes );
$database->addMovement( 3, $getFLData['wref'], $data['to_vid'], $reference, time(), ( $time + time() ) );
// prevent re-use of the same attack via re-POSTing the same data
$database->remA2b( $id );
}
}
$artefact = count($database->getOwnUniqueArtefactInfo2($getFLData['owner'],2,3,0));
$artefact1 = count($database->getOwnUniqueArtefactInfo2($getFLData['wref'],2,1,1));
$artefact2 = count($database->getOwnUniqueArtefactInfo2($getFLData['owner'],2,2,0));
if($artefact > 0){
$fastertroops = 3;
}else if($artefact1 > 0){
$fastertroops = 2;
}else if($artefact2 > 0){
$fastertroops = 1.5;
}else{
$fastertroops = 1;
}
$time = round($generator->procDistanceTime($from,$to,min($speeds),1)/$fastertroops);
$foolartefact = $database->getFoolArtefactInfo(2,$village->wid,$session->uid);
if(count($foolartefact) > 0){
foreach($foolartefact as $arte){
if($arte['bad_effect'] == 1){
$time *= $arte['effect2'];
}else{
$time /= $arte['effect2'];
$time = round($time);
}
}
}
if($data['u7'] > 0){
$ctar1 = 99;
}else{
$ctar1 = 0;
}
$ctar2 = 0;
$abdata = $database->getABTech($getFLData['wref']);
$reference = $database->addAttack(($getFLData['wref']),$data['u1'],$data['u2'],$data['u3'],$data['u4'],$data['u5'],$data['u6'],$data['u7'],$data['u8'],$data['u9'],$data['u10'],$data['u11'],$data['type'],$ctar1,$ctar2,0,$abdata['b1'],$abdata['b2'],$abdata['b3'],$abdata['b4'],$abdata['b5'],$abdata['b6'],$abdata['b7'],$abdata['b8']);
$totalunits = $data['u1']+$data['u2']+$data['u3']+$data['u4']+$data['u5']+$data['u6']+$data['u7']+$data['u8']+$data['u9']+$data['u10']+$data['u11'];
$units = [];
$amounts = [];
$modes = [];
for ($u = 1; $u <= 10; $u++) {
$units[] = $uname2.$u;
$amounts[] = $data['u'.$u];
$modes[] = 0;
}
$units[] = 'hero';
$amounts[] = $data['u11'];
$modes[] = 0;
$database->modifyUnit($getFLData['wref'], $uname2, $amounts, $modes);
$database->addMovement(3,$getFLData['wref'],$data['to_vid'],$reference,time(),($time+time()));
}
}
}
}
+16 -5
View File
@@ -1,4 +1,4 @@
<?php
<?php
#################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ##
@@ -15,15 +15,26 @@ $coorarray = array(1=>"101,33,28","165,32,28","224,46,28","46,63,28","138,74,28"
$arrayVillage = $village->resarray;
?>
<map name="rx" id="rx">
<?php
for($i=1;$i<=18;$i++) {echo " <area href=\"build.php?id=$i\" coords=\"$coorarray[$i]\" shape=\"circle\" title=\"".$building->procResType($arrayVillage['f'.$i.'t'])." Level ".$arrayVillage['f'.$i]."\"/>\r\n";
<?php
$jobs = $database->getJobs($village->wid);
$activeFields = [];
if (count($jobs)) {
foreach ($jobs as $job) {
if ( $job['type'] <= 4 ) {
$activeFields[ $job['field'] ] = true;
}
}
}
for ($i=1; $i<=18; $i++) {
echo " <area href=\"build.php?id=$i\" coords=\"$coorarray[$i]\" shape=\"circle\" title=\"".$building->procResType($arrayVillage['f'.$i.'t'])." Level ".$arrayVillage['f'.$i].(isset($activeFields[$i]) ? ' (upgrade in progress)' : '')."\"/>\r\n";
}
?>
<area href="dorf2.php" coords="144,131,36" shape="circle" title="Village centre" alt="" />
</map>
<div id="village_map" class="f<?php echo $village->type; ?>">
<?php
<?php
for($i=1;$i<=18;$i++) {
if($arrayVillage['f'.$i.'t'] != 0) {
$text = "";
@@ -33,7 +44,7 @@ for($i=1;$i<=18;$i++) {
case 3:$text = "Iron Mine Level";break;
case 4:$text = "Cropland Level";break;
}
echo "<img src=\"img/x.gif\" class=\"reslevel rf$i level".$arrayVillage['f'.$i]."\" alt=\"$text ".$arrayVillage['f'.$i]."\" />";
echo "<img src=\"img/x.gif\" class=\"reslevel rf$i level".$arrayVillage['f'.$i].(isset($activeFields[$i]) ? '_active' : '')."\" alt=\"$text ".$arrayVillage['f'.$i].(isset($activeFields[$i]) ? ' (upgrade in progress)' : '')."\" />";
}
}
?>
+1 -1
View File
@@ -22,7 +22,7 @@
<div class="footer-menu">
<center><br />
<div class="copyright">&copy; 2010 - <?php echo date('Y') . ' ' . (defined('SERVER_NAME') ? SERVER_NAME : 'TravianZ');?> All rights reserved</div>
<div class="copyright">Server running on: <a href="version.php"><b><font color="Red">v.8.3.3 BETA b2</font></b></a>
<div class="copyright">Server running on: <a href="version.php"><b><font color="Red">v.8.3.3 BETA b4</font></b></a>
</div>
</div>
</div></center>
+5 -5
View File
@@ -62,11 +62,11 @@ div.c1 {text-align: center}
<?php
// no support for support :-D
if ($_SESSION['id_user'] != 1) {
?>
?>
<a href="support.php"><b><?php echo SUPPORT;?></b></a>
<?php
}
?>
?>
<br></p>
<?php
$timestamp = $database->isDeleting($session->uid);
@@ -110,9 +110,9 @@ div.c1 {text-align: center}
<div class="footer-stopper"></div>
<div class="clear"></div><?php
include("Templates/footer.tpl");
include("Templates/res.tpl");
<div class="clear"></div><?php
include("Templates/footer.tpl");
include("Templates/res.tpl");
?>
<div id="stime">
+19 -15
View File
@@ -1,4 +1,4 @@
<?php
<?php
#################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ##
@@ -11,12 +11,14 @@
?>
<?php
$wood = round($village->getProd("wood"));
$clay = round($village->getProd("clay"));
$iron = round($village->getProd("iron"));
$crop = round($village->getProd("crop"));
$totalproduction = $village->allcrop; // all crops + bakery + grain mill
?>
// Natars cration script does not have village initialized
if (!empty($village)) {
$wood = round( $village->getProd( "wood" ) );
$clay = round( $village->getProd( "clay" ) );
$iron = round( $village->getProd( "iron" ) );
$crop = round( $village->getProd( "crop" ) );
$totalproduction = $village->allcrop; // all crops + bakery + grain mill
?>
<div id="res">
<div id="resWrap">
@@ -41,13 +43,13 @@ $totalproduction = $village->allcrop; // all crops + bakery + grain mill
</table>
<table cellpadding="1" cellspacing="1">
<tr>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td></td>
<td><?php
<td><?php
if($session->gold <= 1){
echo '<font color="#B3B3B3"><img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Remaining gold" title="You currently have: '.$session->gold.' gold"/> '.$session->gold.' <span><span>G</span><span>o</span><span>l</span><span>d</span></span></font>';
}
@@ -56,11 +58,13 @@ $totalproduction = $village->allcrop; // all crops + bakery + grain mill
}
?>
</td>
</tr>
</table>
</div>
</div>
</div>
<?php
}
+23 -21
View File
@@ -10,34 +10,36 @@
#################################################################################
$txt="World Wonder Construction Plans
Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian.
However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries).
Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends.
Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin.
In the end, we will see whether the free tribes of Travian can once again outwit the Natars and vanquish them once and for all. Do not be so foolish as to assume that the Natars will leave without a fight, though!
$txt="Construction plans
To steal a set of Construction Plans from the Natars, the following things must happen:
- You must Attack the village (NOT Raid!)
- You must WIN the Attack
- You must DESTROY the Treasure Chamber (Treasury)
- Your Hero MUST be in that attack, as he is the only one who may carry the Construction Plans
- An empty level 10 Treasure Chamber (Treasury) MUST be in the village where that attack came from
NOTE: If the above criteria is not met during the attack, the next attack on that village which does meet the above criteria will take the Construction Plans.
Countless days have passed since the first battles upon the walls of the cursed villages of the Dread Natars, many armies of both the free ones and the Natarian empire struggled and died before the walls of the many strongholds from which the Natars had once ruled all creation. Now with the dust settled and a relative calm having settled in, armies began to count their losses and collect their dead, the stench of combat still lingering in the night air, a smell of a slaughter unforgettable in its extent and brutality yet soon to be dwarfed by yet others. The largest armies of the free ones and the Dread Natars were marshalling for yet another renewed assault upon the coveted former strongholds of the Natarian Empire.
Soon scouts arrived telling of a most awesome sight and a chilling reminder, a dread army of an unfathomable size had been spotted marshalling at the end of the world, the Natarian capital, a force so great and unstoppable that the dust from their march would choke off all light, a force so brutal and ruthless that it would crush all hope. The free people knew that they had to race now, race against time and the endless hordes of the Natarian Empire to raise a Wonder of the World to restore the world to peace and vanquish the Natarian threat.
But to raise such a great Wonder would be no easy task, one would need construction plans created in the distant past, plans of such an arcane nature that even the very wisest of sages knew not their contents or locations.
Tens of thousands of scouts roamed across all existence searching in vain for these mystical plans, looking in all places but the dreaded Natarian Capital, yet could not find them. Today however, they return bearing good news, they return baring the locations of the plans, hidden by the armies of the Natars inside secret strongholds constructed to be hidden from the eyes of man.
Now begins the final stretch, when the greatest armies of the Free people and the Natars will clash across the world for the fate of all that lies under heaven. This is the war that will echo across the eons, this is your war, and here you shall etch your name across history, here you shall become legend.
Facts:
To steal one, the following things must happen:
You must attack the village (NO Raid!)
WIN the Attack
Destroy the treasury
An empty treasury lvl 10 MUST be in the village where that attack came from
Have a hero in an attack
To build a Treasure Chamber (Treasury), you will need a Main Building level 10 and the village MUST NOT be contain a World Wonder.
If not, the next attack on that village, winning with a hero and empty treasury will take the building plan.
To build a World Wonder, you must own the Construction Plans yourself (you = the World Wonder Village Owner) from level 0 to 50, and then from level 51 to 100 you will need an additional set of Construction Plans in your Alliance! Two sets of Construction Plans in the World Wonder Village Account will not work!";
To build a WW, you must own a plan yourself (you = the WW village owner) from lvl 0 to 50, from 51 to 100 you need an additional plan in your alliance! Two plans in the WW village account would not work!
The construction plans are conquerable immediately when they appear to the server.
There will be a countdown in game, showing the exact time of the release, 5 days prior to the launch. ";
//bbcode = html code
$txt = preg_replace("/\[b\]/is",'<b>', $txt);
+7 -7
View File
@@ -95,7 +95,7 @@ if(isset($_GET['o'])) {
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php
@@ -106,7 +106,7 @@ if(isset($_GET['o'])) {
echo GP_LOCATE;
?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
@@ -180,10 +180,10 @@ if(isset($_GET['o'])) {
$p_ander = $database->getCoor($prisoner['from']);
$p_to = array('x'=>$p_ander['x'], 'y'=>$p_ander['y']);
$p_tribe = $database->getUserField($p_owner,"tribe",0);
$p_speeds = array();
//find slowest unit.
//find slowest unit.
for($i=1;$i<=10;$i++){
if ($prisoner['t'.$i]){
if($prisoner['t'.$i] != '' && $prisoner['t'.$i] > 0){
@@ -193,7 +193,7 @@ if(isset($_GET['o'])) {
}
}
}
if ($prisoner['t11']>0){
$p_qh = "SELECT unit FROM ".TB_PREFIX."hero WHERE uid = ".(int) $p_owner." AND dead = 0";
$p_resulth = mysqli_query($GLOBALS['link'],$p_qh);
@@ -201,7 +201,7 @@ if(isset($_GET['o'])) {
$p_hero_unit=$p_hero_f['unit'];
$p_speeds[] = $GLOBALS['u'.$p_hero_unit]['speed'];
}
$p_artefact = count($database->getOwnUniqueArtefactInfo2($p_owner,2,3,0));
$p_artefact1 = count($database->getOwnUniqueArtefactInfo2($prisoner['from'],2,1,1));
$p_artefact2 = count($database->getOwnUniqueArtefactInfo2($p_owner,2,2,0));
+2 -2
View File
@@ -40,10 +40,10 @@ $automation->isWinner();
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
echo "
+2 -2
View File
@@ -27,9 +27,9 @@ AccessLogger::logRequest();
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-core.js?0faab" type="text/javascript"></script>
<script src="mt-more.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE ?>travian.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE ?>lang/en/lang.css" rel="stylesheet" type="text/css" />
+2 -2
View File
@@ -109,7 +109,7 @@ if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $sessio
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php
@@ -120,7 +120,7 @@ if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $sessio
echo GP_LOCATE;
?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
+2 -2
View File
@@ -33,9 +33,9 @@ $invited=(isset($_GET['uid'])) ? filter_var($_GET['uid'], FILTER_SANITIZE_NUMBER
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-core.js?0faab" type="text/javascript"></script>
<script src="mt-more.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE ?>travian.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE ?>lang/en/lang.css" rel="stylesheet" type="text/css" />
+2 -2
View File
@@ -29,9 +29,9 @@ if($session->access == BANNED){
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
+2 -2
View File
@@ -47,10 +47,10 @@ if(isset($_GET['newdid'])) {
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
echo "
+3 -3
View File
@@ -329,10 +329,10 @@ if ( isset( $_GET['id'] ) ) {
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?ebe79" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?ebe79" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
echo "
@@ -402,7 +402,7 @@ if(isset($_GET['id']) or isset($_GET['gid']) or $route == 1 or isset($_GET['rout
$building->finishAll("build.php?gid=".$_GET['id']."&ty=".$_GET['ty']);
exit;
}
}
}
}
}else{
header("Location: ".$_SERVER['PHP_SELF']."?id=39");
-4
View File
@@ -1,4 +0,0 @@
<Files ~ "\.cache$">
Order allow,deny
Deny from all
</Files>
+2 -2
View File
@@ -59,9 +59,9 @@ AccessLogger::logRequest();
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
+2 -2
View File
@@ -47,7 +47,7 @@ $start_timer = $generator->pageLoadTimeStart();
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php
@@ -58,7 +58,7 @@ $start_timer = $generator->pageLoadTimeStart();
echo GP_LOCATE;
?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
+2 -2
View File
@@ -39,9 +39,9 @@ if(isset($_GET['newdid'])) {
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
+3 -3
View File
@@ -18,7 +18,7 @@ AccessLogger::logRequest();
if(isset($_GET['newdid'])) {
$_SESSION['wid'] = $_GET['newdid'];
$database->query("UPDATE ".TB_PREFIX."users SET village_select=".$database->escape((int) $_GET['newdid'])." WHERE id=".$session->uid);
$database->query("UPDATE ".TB_PREFIX."users SET village_select=".$database->escape((int) $_GET['newdid'])." WHERE id=".$session->uid);
header("Location: ".$_SERVER['PHP_SELF']);
exit;
}else{
@@ -39,10 +39,10 @@ $automation->isWinner();
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
echo "
+2 -2
View File
@@ -42,10 +42,10 @@ if(isset($_GET['newdid'])) {
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?0faab" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?0faab" type="text/javascript"></script>
<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<?php
if($session->gpack == null || GP_ENABLE == false) {
echo "
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 930 B

+8 -8
View File
@@ -8,12 +8,12 @@
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?2e3d9" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?2e3d9" type="text/javascript"></script>
<link href="gpack/travian_basic/lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/travian.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/travian.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
</head>
<body class="v35 " onload="initCounter()">
@@ -42,13 +42,13 @@
<div id="content" class="error_site"><img class="e404" src="img/x.gif" alt="Nothing here!" style="position:absolute;top:60px;left:55px;" />
<div style="position:absolute;top:0px;left:30px;"><h1>Nothing here!</h1></div>
<div style="position:absolute;top:235px;left:30px;z-index:15;">We looked 404 times already but can't find anything</div>
<img src="img/x.gif" style="height:330px;width:1px;" />
<img src="img/x.gif" style="height:330px;width:1px;" />
</div>
<div id="side_info" class="outgame">
<h5><img src="http://www.travian.com//img/en/t2/newsbox1.gif" alt="newsbox 1" /></h5>
<div class="news"><a href="http://www.facebook.com/group.php?gid=110117025672281&ref=nf" target="_blank"><img src="http://tutorials.travianteam.com/images/boton_fb1.jpg" /></a>
<br /><br />
<a href="http://www.tschena.com/magazine/com_magazine_2010_07.pdf" target="_blank"><img src="http://tutorials.travianteam.com/images/btn_eng.jpg" /></a>
<a href="http://www.tschena.com/magazine/com_magazine_2010_07.pdf" target="_blank"><img src="http://tutorials.travianteam.com/images/btn_eng.jpg" /></a>
</div>
<h5><img src="http://www.travian.com//img/en/t2/newsbox2.gif" alt="newsbox 2" /></h5>
<div class="news">Dear players,
@@ -81,7 +81,7 @@ Tschena &amp; Phanttis
<div id="footer">
<div id="mfoot">
<div class="footer-menu">
<a href="anleitung.php?s=3">FAQ</a>
| <a href="index.php?screenshots">Screenshots</a>
| <a href="rules.php">Game rules</a>
+23 -14
View File
@@ -6883,7 +6883,7 @@ img.iReport19 {
}
div#map a#map_makelarge img {
background-image: url("../../img/m/max.gif");
height: 25px;
width: 33px;
}
@@ -8247,7 +8247,7 @@ img.g16 {
background-image: url("../../img/g/g16.gif");
}
img.g16b {
background-image: url("../../img/g/g16b.gif");
background-image: url("../../img/g/g16b.gif");
}
img.g16e {
background-image: url("../../img/g/g16e.gif");
@@ -8456,40 +8456,49 @@ div.village1 div.f99, div.map img.f99 {
div.village1 div#village_map img.level1, div.village1 div#village_map img.level2, div.village1 div#village_map img.level3, div.village1 div#village_map img.level4, div.village1 div#village_map img.level5, div.village1 div#village_map img.level6, div.village1 div#village_map img.level7, div.village1 div#village_map img.level8, div.village1 div#village_map img.level9, div.village1 div#village_map img.level10 {
background-image: url("../../img/g/s/lvl1_10.gif");
}
div.village1 div#village_map img.level1_active,div.village1 div#village_map img.level2_active,div.village1 div#village_map img.level3_active,div.village1 div#village_map img.level4_active,div.village1 div#village_map img.level5_active,div.village1 div#village_map img.level6_active,div.village1 div#village_map img.level7_active,div.village1 div#village_map img.level8_active,div.village1 div#village_map img.level9_active,div.village1 div#village_map img.level10_active {
background-image: url("../../img/g/s/lvl1_10_active.gif");
}
div.village1 div#village_map img.level11, div.village1 div#village_map img.level12, div.village1 div#village_map img.level13, div.village1 div#village_map img.level14, div.village1 div#village_map img.level15, div.village1 div#village_map img.level16, div.village1 div#village_map img.level17, div.village1 div#village_map img.level18, div.village1 div#village_map img.level19, div.village1 div#village_map img.level20 {
background-image: url("../../img/g/s/lvl11_20.gif");
}
div.village1 div#village_map img.level11_active,div.village1 div#village_map img.level12_active,div.village1 div#village_map img.level13_active,div.village1 div#village_map img.level14_active,div.village1 div#village_map img.level15_active,div.village1 div#village_map img.level16_active,div.village1 div#village_map img.level17_active,div.village1 div#village_map img.level18_active,div.village1 div#village_map img.level19_active,div.village1 div#village_map img.level20_active {
background-image: url("../../img/g/s/lvl11_20_active.gif");
}
div.village1 div#village_map img.level21, div.village1 div#village_map img.level22, div.village1 div#village_map img.level23, div.village1 div#village_map img.level24, div.village1 div#village_map img.level25 {
background-image: url("../../img/g/s/lvl21_30.gif");
}
div.village1 div#village_map img.level1, div.village1 div#village_map img.level11, div.village1 div#village_map img.level21 {
div.village1 div#village_map img.level21_active,div.village1 div#village_map img.level22_active,div.village1 div#village_map img.level23_active,div.village1 div#village_map img.level24_active,div.village1 div#village_map img.level25_active {
background-image: url("../../img/g/s/lvl21_30_active.gif");
}
div.village1 div#village_map img.level1, div#village_map img.level1_active, div.village1 div#village_map img.level11, div.village1 div#village_map img.level11_active, div.village1 div#village_map img.level21, div.village1 div#village_map img.level21_active {
background-position: 0 0;
}
div.village1 div#village_map img.level2, div.village1 div#village_map img.level12, div.village1 div#village_map img.level22 {
div.village1 div#village_map img.level2, div.village1 div#village_map img.level2_active, div.village1 div#village_map img.level12, div.village1 div#village_map img.level12_active, div.village1 div#village_map img.level22, div.village1 div#village_map img.level22_active {
background-position: -17px 0;
}
div.village1 div#village_map img.level3, div.village1 div#village_map img.level13, div.village1 div#village_map img.level23 {
div.village1 div#village_map img.level3, div.village1 div#village_map img.level3_active, div.village1 div#village_map img.level13, div.village1 div#village_map img.level13_active, div.village1 div#village_map img.level23, div.village1 div#village_map img.level23_active {
background-position: -34px 0;
}
div.village1 div#village_map img.level4, div.village1 div#village_map img.level14, div.village1 div#village_map img.level24 {
div.village1 div#village_map img.level4, div.village1 div#village_map img.level4_active, div.village1 div#village_map img.level14, div.village1 div#village_map img.level14_active, div.village1 div#village_map img.level24, div.village1 div#village_map img.level24_active {
background-position: -51px 0;
}
div.village1 div#village_map img.level5, div.village1 div#village_map img.level15, div.village1 div#village_map img.level25 {
div.village1 div#village_map img.level5, div.village1 div#village_map img.level5_active, div.village1 div#village_map img.level15, div.village1 div#village_map img.level15_active, div.village1 div#village_map img.level25, div.village1 div#village_map img.level25_active {
background-position: -68px 0;
}
div.village1 div#village_map img.level6, div.village1 div#village_map img.level16 {
div.village1 div#village_map img.level6, div.village1 div#village_map img.level6_active, div.village1 div#village_map img.level16, div.village1 div#village_map img.level16_active {
background-position: -85px 0;
}
div.village1 div#village_map img.level7, div.village1 div#village_map img.level17 {
div.village1 div#village_map img.level7, div.village1 div#village_map img.level7_active, div.village1 div#village_map img.level17, div.village1 div#village_map img.level17_active {
background-position: -102px 0;
}
div.village1 div#village_map img.level8, div.village1 div#village_map img.level18 {
div.village1 div#village_map img.level8, div.village1 div#village_map img.level8_active, div.village1 div#village_map img.level18, div.village1 div#village_map img.level18_active {
background-position: -119px 0;
}
div.village1 div#village_map img.level9, div.village1 div#village_map img.level19 {
div.village1 div#village_map img.level9, div.village1 div#village_map img.level9_active, div.village1 div#village_map img.level19, div.village1 div#village_map img.level19_active {
background-position: -136px 0;
}
div.village1 div#village_map img.level10, div.village1 div#village_map img.level20 {
div.village1 div#village_map img.level10, div.village1 div#village_map img.level10_active, div.village1 div#village_map img.level20, div.village1 div#village_map img.level20_active {
background-position: -153px 0;
}
div.map img#detailed_map {
@@ -8940,7 +8949,7 @@ div.plus table#plus_features td.preview img.att_mark {
width: 200px;
}
div.logout img.roman, div.signup img.roman {
background-image: url("http://img.travian.org/img/de/temp/roemer.gif");
background-image: url("../../img/un/h/roemer.jpg");
height: 156px;
width: 129px;
}
@@ -9075,4 +9084,4 @@ input.accept{width:12px;height:12px;background-image:url(../../img/a/acc.gif);}
#Frame {
top: 0;
z-index: 1000;
}
}
+72 -1
View File
@@ -15,4 +15,75 @@
@import "../../modules/new_colors.css";
/* --- Icons, Images and Backgrounds ---------- */
@import "../../modules/new_images.css"; input#btn_login {width:97px; background-image: url(b/login.gif);} input#btn_signup {width:97px; background-image: url(b/signup.gif);} input#btn_ok {width:47px; background-image: url(b/ok.gif);} input#btn_reply {width:97px; background-image: url(b/reply.gif);} input#btn_send {width:97px; background-image: url(b/send.gif);} input#btn_save {width:97px; background-image: url(b/save.gif);} input#btn_delete {width:97px; background-image: url(b/delete.gif);} input#btn_archiv {width:97px; background-image: url(b/archiv.gif);} input#btn_back {width:97px; background-image: url(b/zurueck.html);} input#btn_train {width:97px; background-image: url(b/train.gif);} input#btn_back {width:97px; background-image: url(b/back.gif);} input#btn_forward {width:97px; background-image: url(b/forward.gif);} input#btn_demolish {width:97px; background-image: url(b/demolish.gif);} input#btn_search {width:97px; background-image: url(b/search.gif);} /* Ally Forum */ div.forum input#fbtn_ok {width:47px; background-image:url(b/ok.gif);} div.forum input#fbtn_vote {width:97px; background-image:url(f/vote.gif);} div.forum input#fbtn_result {width:97px; background-image:url(f/result.gif);} div.forum input#fbtn_voting {width:97px; background-image:url(f/voting.gif);} div.forum img#fbtn_reply {width:97px; background-image:url(f/reply.gif);} div.forum img#fbtn_post {width:97px; background-image:url(f/post.gif);} div.forum img#fbtn_newforum {width:97px; background-image:url(f/newforum.gif);} /* ------------------- Texts ------------------- */ /* --------------------------------------------- */ /* news */ div#side_info h5 img {width:160px; height:15px;} /* login */ div.login h1 img.img_login {width:468px; height:60px; background-image:url(t1/login.gif);} div.login h5 img.img_u04 {width:160px; height:15px; background-image:url(t2/u04.gif);} /* signup */ div.signup h1 img.anmelden {width:468px; height:60px; background-image:url(t1/anmelden.gif);} div.signup h5 img.img_u05 {width:160px; height:15px; background-image:url(t2/u05.gif);} div.signup img.img_u06 {width:160px; height:15px; background-image:url(t2/u06.gif);} div.signup img.img_u07 {width:160px; height:15px; background-image:url(t2/u07.gif);} /* activate */ div.activate h1 img.passwort {width:468px; height:60px; background-image:url(t1/passwort.gif);} div.activate h5 img.img_u22 {width:160px; height:15px; background-image:url(t2/u22.gif);} /* read/write message */ div.messages div.msg_content img#label {width:77px; height:34px;} div.messages div.msg_content img.send {background-image:url(msg/block_bg24b.gif);} div.messages div.msg_content img.read {background-image:url(msg/block_bg24a.gif);} /* ------------------- Images ------------------- */ /* ---------------------------------------------- */ /* travian logo */ div#side_navi a#logo img {width:116px; height:60px; background-image:url(a/travian0.gif);} div#side_navi a#logo img.logo_plus {background-image:url(a/travian1.gif);} /* plus previews */ div.plus table#plus_features td.preview img.autovv {width:200px; height:56px; background-image:url(p/autovv.gif);} div.plus table#plus_features td.preview img.bfilter {width:200px; height:45px; background-image:url(p/bfilter.gif);} div.plus table#plus_features td.preview img.dorf3 {width:200px; height:186px; background-image:url(p/dorf3.jpg);} div.plus table#plus_features td.preview img.p1 {width:179px; height:29px; background-image:url(p/p1.gif);} div.plus table#plus_features td.preview img.p3 {width:163px; height:120px; background-image:url(p/p3.gif);} div.plus table#plus_features td.preview img.p4 {width:197px; height:41px; background-image:url(p/p4.gif);} div.plus table#plus_features td.preview img.p5 {width:132px; height:51px; background-image:url(p/p5.gif);} div.plus table#plus_features td.preview img.p6 {width:111px; height:29px; background-image:url(p/p6.gif);} div.plus table#plus_features td.preview img.p7 {width:61px; height:86px; background-image:url(p/p7.gif);} div.plus table#plus_features td.preview img.p8 {width:117px; height:121px; background-image:url(p/p8.gif);} div.plus table#plus_features td.preview img.sort {width:200px; height:38px; background-image:url(p/sort.jpg);} div.plus table#plus_features td.preview img.st1 {width:200px; height:90px; background-image:url(p/st1.gif);} div.plus table#plus_features td.preview img.xxl_map {width:146px; height:112px; background-image:url(p/xxl_map.gif);} input#btn_search {width:97px; background-image: url(b/search.gif);}
@import "../../modules/new_images.css";
input#btn_login {width:97px; background-image: url(b/login.gif);}
input#btn_signup {width:97px; background-image: url(b/signup.gif);}
input#btn_ok {width:47px; background-image: url(b/ok.gif);}
input#btn_reply {width:97px; background-image: url(b/reply.gif);}
input#btn_send {width:97px; background-image: url(b/send.gif);}
input#btn_save {width:97px; background-image: url(b/save.gif);}
input#btn_delete {width:97px; background-image: url(b/delete.gif);}
input#btn_archiv {width:97px; background-image: url(b/archiv.gif);}
input#btn_back {width:97px; background-image: url(b/zurueck.html);}
input#btn_train {width:97px; background-image: url(b/train.gif);}
input#btn_back {width:97px; background-image: url(b/back.gif);}
input#btn_forward {width:97px; background-image: url(b/forward.gif);}
input#btn_demolish {width:97px; background-image: url(b/demolish.gif);}
input#btn_search {width:97px; background-image: url(b/search.gif);}
/* Ally Forum */
div.forum input#fbtn_ok {width:47px; background-image:url(b/ok.gif);}
div.forum input#fbtn_vote {width:97px; background-image:url(f/vote.gif);}
div.forum input#fbtn_result {width:97px; background-image:url(f/result.gif);}
div.forum input#fbtn_voting {width:97px; background-image:url(f/voting.gif);}
div.forum img#fbtn_reply {width:97px; background-image:url(f/reply.gif);}
div.forum img#fbtn_post {width:97px; background-image:url(f/post.gif);}
div.forum img#fbtn_newforum {width:97px; background-image:url(f/newforum.gif);}
/* ------------------- Texts ------------------- */
/* --------------------------------------------- */
/* news */
div#side_info h5 img {width:160px; height:15px;}
/* login */
div.login h1 img.img_login {width:468px; height:60px; background-image:url(t1/login.gif);}
div.login h5 img.img_u04 {width:160px; height:15px; background-image:url(t2/u04.gif);}
/* signup */
div.signup h1 img.anmelden {width:468px; height:60px; background-image:url(t1/anmelden.gif);}
div.signup h5 img.img_u05 {width:160px; height:15px; background-image:url(t2/u05.gif);}
div.signup img.img_u06 {width:160px; height:15px; background-image:url(t2/u06.gif);}
div.signup img.img_u07 {width:160px; height:15px; background-image:url(t2/u07.gif);}
/* activate */
div.activate h1 img.passwort {width:468px; height:60px; background-image:url(t1/passwort.gif);}
div.activate h5 img.img_u22 {width:160px; height:15px; background-image:url(t2/u22.gif);}
/* read/write message */
div.messages div.msg_content img#label {width:77px; height:34px;}
div.messages div.msg_content img.send {background-image:url(msg/block_bg24b.gif);}
div.messages div.msg_content img.read {background-image:url(msg/block_bg24a.gif);}
/* ------------------- Images ------------------- */
/* ---------------------------------------------- */
/* travian logo */
div#side_navi a#logo img {width:116px; height:60px; background-image:url(a/travian0.gif);}
div#side_navi a#logo img.logo_plus {background-image:url(a/travian1.gif);}
/* plus previews */
div.plus table#plus_features td.preview img.autovv {width:200px; height:56px; background-image:url(p/autovv.gif);}
div.plus table#plus_features td.preview img.bfilter {width:200px; height:45px; background-image:url(p/bfilter.gif);}
div.plus table#plus_features td.preview img.dorf3 {width:200px; height:186px; background-image:url(p/dorf3.jpg);}
div.plus table#plus_features td.preview img.p1 {width:179px; height:29px; background-image:url(p/p1.gif);}
div.plus table#plus_features td.preview img.p3 {width:163px; height:120px; background-image:url(p/p3.gif);}
div.plus table#plus_features td.preview img.p4 {width:197px; height:41px; background-image:url(p/p4.gif);}
div.plus table#plus_features td.preview img.p5 {width:132px; height:51px; background-image:url(p/p5.gif);}
div.plus table#plus_features td.preview img.p6 {width:111px; height:29px; background-image:url(p/p6.gif);}
div.plus table#plus_features td.preview img.p7 {width:61px; height:86px; background-image:url(p/p7.gif);}
div.plus table#plus_features td.preview img.p8 {width:117px; height:121px; background-image:url(p/p8.gif);}
div.plus table#plus_features td.preview img.sort {width:200px; height:38px; background-image:url(p/sort.jpg);}
div.plus table#plus_features td.preview img.st1 {width:200px; height:90px; background-image:url(p/st1.gif);}
div.plus table#plus_features td.preview img.xxl_map {width:146px; height:112px; background-image:url(p/xxl_map.gif);}
input#btn_search {width:97px; background-image: url(b/search.gif);}
+8 -8
View File
@@ -8,12 +8,12 @@
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?2e3d9" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?2e3d9" type="text/javascript"></script>
<link href="gpack/travian_basic/lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/travian.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/travian.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
</head>
<body class="v35 " onload="initCounter()">
@@ -42,13 +42,13 @@
<div id="content" class="error_site"><img class="e404" src="img/x.gif" alt="Nothing here!" style="position:absolute;top:60px;left:55px;" />
<div style="position:absolute;top:0px;left:30px;"><h1>Nothing here!</h1></div>
<div style="position:absolute;top:235px;left:30px;z-index:15;">We looked 404 times already but can't find anything</div>
<img src="img/x.gif" style="height:330px;width:1px;" />
<img src="img/x.gif" style="height:330px;width:1px;" />
</div>
<div id="side_info" class="outgame">
<h5><img src="http://www.travian.com//img/en/t2/newsbox1.gif" alt="newsbox 1" /></h5>
<div class="news"><a href="http://www.facebook.com/group.php?gid=110117025672281&ref=nf" target="_blank"><img src="http://tutorials.travianteam.com/images/boton_fb1.jpg" /></a>
<br /><br />
<a href="http://www.tschena.com/magazine/com_magazine_2010_07.pdf" target="_blank"><img src="http://tutorials.travianteam.com/images/btn_eng.jpg" /></a>
<a href="http://www.tschena.com/magazine/com_magazine_2010_07.pdf" target="_blank"><img src="http://tutorials.travianteam.com/images/btn_eng.jpg" /></a>
</div>
<h5><img src="http://www.travian.com//img/en/t2/newsbox2.gif" alt="newsbox 2" /></h5>
<div class="news">Dear players,
@@ -81,7 +81,7 @@ Tschena &amp; Phanttis
<div id="footer">
<div id="mfoot">
<div class="footer-menu">
<a href="http://www.travian.com/anleitung.php?s=3">FAQ</a>
| <a href="http://www.travian.com/index.php?screenshots">Screenshots</a>
| <a href="http://www.travian.com/spielregeln.php">Game rules</a>
+22 -13
View File
@@ -6866,7 +6866,7 @@ img.iReport19 {
}
div#map a#map_makelarge img {
background-image: url("../../img/m/max.gif");
height: 25px;
width: 33px;
}
@@ -8415,40 +8415,49 @@ div.village1 div.f99, div.map img.f99 {
div.village1 div#village_map img.level1, div.village1 div#village_map img.level2, div.village1 div#village_map img.level3, div.village1 div#village_map img.level4, div.village1 div#village_map img.level5, div.village1 div#village_map img.level6, div.village1 div#village_map img.level7, div.village1 div#village_map img.level8, div.village1 div#village_map img.level9, div.village1 div#village_map img.level10 {
background-image: url("../../img/g/s/lvl1_10.gif");
}
div.village1 div#village_map img.level1_active,div.village1 div#village_map img.level2_active,div.village1 div#village_map img.level3_active,div.village1 div#village_map img.level4_active,div.village1 div#village_map img.level5_active,div.village1 div#village_map img.level6_active,div.village1 div#village_map img.level7_active,div.village1 div#village_map img.level8_active,div.village1 div#village_map img.level9_active,div.village1 div#village_map img.level10_active {
background-image: url("../../img/g/s/lvl1_10.gif");
}
div.village1 div#village_map img.level11, div.village1 div#village_map img.level12, div.village1 div#village_map img.level13, div.village1 div#village_map img.level14, div.village1 div#village_map img.level15, div.village1 div#village_map img.level16, div.village1 div#village_map img.level17, div.village1 div#village_map img.level18, div.village1 div#village_map img.level19, div.village1 div#village_map img.level20 {
background-image: url("../../img/g/s/lvl11_20.gif");
}
div.village1 div#village_map img.level11_active,div.village1 div#village_map img.level12_active,div.village1 div#village_map img.level13_active,div.village1 div#village_map img.level14_active,div.village1 div#village_map img.level15_active,div.village1 div#village_map img.level16_active,div.village1 div#village_map img.level17_active,div.village1 div#village_map img.level18_active,div.village1 div#village_map img.level19_active,div.village1 div#village_map img.level20_active {
background-image: url("../../img/g/s/lvl11_20.gif");
}
div.village1 div#village_map img.level21, div.village1 div#village_map img.level22, div.village1 div#village_map img.level23, div.village1 div#village_map img.level24, div.village1 div#village_map img.level25 {
background-image: url("../../img/g/s/lvl21_30.gif");
}
div.village1 div#village_map img.level1, div.village1 div#village_map img.level11, div.village1 div#village_map img.level21 {
div.village1 div#village_map img.level21_active,div.village1 div#village_map img.level22_active,div.village1 div#village_map img.level23_active,div.village1 div#village_map img.level24_active,div.village1 div#village_map img.level25_active {
background-image: url("../../img/g/s/lvl21_30.gif");
}
div.village1 div#village_map img.level1, div#village_map img.level1_active, div.village1 div#village_map img.level11, div.village1 div#village_map img.level11_active, div.village1 div#village_map img.level21, div.village1 div#village_map img.level21_active {
background-position: 0 0;
}
div.village1 div#village_map img.level2, div.village1 div#village_map img.level12, div.village1 div#village_map img.level22 {
div.village1 div#village_map img.level2, div.village1 div#village_map img.level2_active, div.village1 div#village_map img.level12, div.village1 div#village_map img.level12_active, div.village1 div#village_map img.level22, div.village1 div#village_map img.level22_active {
background-position: -17px 0;
}
div.village1 div#village_map img.level3, div.village1 div#village_map img.level13, div.village1 div#village_map img.level23 {
div.village1 div#village_map img.level3, div.village1 div#village_map img.level3_active, div.village1 div#village_map img.level13, div.village1 div#village_map img.level13_active, div.village1 div#village_map img.level23, div.village1 div#village_map img.level23_active {
background-position: -34px 0;
}
div.village1 div#village_map img.level4, div.village1 div#village_map img.level14, div.village1 div#village_map img.level24 {
div.village1 div#village_map img.level4, div.village1 div#village_map img.level4_active, div.village1 div#village_map img.level14, div.village1 div#village_map img.level14_active, div.village1 div#village_map img.level24, div.village1 div#village_map img.level24_active {
background-position: -51px 0;
}
div.village1 div#village_map img.level5, div.village1 div#village_map img.level15, div.village1 div#village_map img.level25 {
div.village1 div#village_map img.level5, div.village1 div#village_map img.level5_active, div.village1 div#village_map img.level15, div.village1 div#village_map img.level15_active, div.village1 div#village_map img.level25, div.village1 div#village_map img.level25_active {
background-position: -68px 0;
}
div.village1 div#village_map img.level6, div.village1 div#village_map img.level16 {
div.village1 div#village_map img.level6, div.village1 div#village_map img.level6_active, div.village1 div#village_map img.level16, div.village1 div#village_map img.level16_active {
background-position: -85px 0;
}
div.village1 div#village_map img.level7, div.village1 div#village_map img.level17 {
div.village1 div#village_map img.level7, div.village1 div#village_map img.level7_active, div.village1 div#village_map img.level17, div.village1 div#village_map img.level17_active {
background-position: -102px 0;
}
div.village1 div#village_map img.level8, div.village1 div#village_map img.level18 {
div.village1 div#village_map img.level8, div.village1 div#village_map img.level8_active, div.village1 div#village_map img.level18, div.village1 div#village_map img.level18_active {
background-position: -119px 0;
}
div.village1 div#village_map img.level9, div.village1 div#village_map img.level19 {
div.village1 div#village_map img.level9, div.village1 div#village_map img.level9_active, div.village1 div#village_map img.level19, div.village1 div#village_map img.level19_active {
background-position: -136px 0;
}
div.village1 div#village_map img.level10, div.village1 div#village_map img.level20 {
div.village1 div#village_map img.level10, div.village1 div#village_map img.level10_active, div.village1 div#village_map img.level20, div.village1 div#village_map img.level20_active {
background-position: -153px 0;
}
div.map img#detailed_map {
@@ -8896,7 +8905,7 @@ div.plus table#plus_features td.preview img.att_mark {
width: 200px;
}
div.logout img.roman, div.signup img.roman {
background-image: url("http://img.travian.org/img/de/temp/roemer.gif");
background-image: url("../../img/un/h/roemer.jpg");
height: 156px;
width: 129px;
}
@@ -9031,4 +9040,4 @@ input.accept{width:12px;height:12px;background-image:url(../../img/a/acc.gif);}
#Frame {
top: 0;
z-index: 1000;
}
}
+8 -8
View File
@@ -8,12 +8,12 @@
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script src="mt-full.js?2e3d9" type="text/javascript"></script>
<script src="unx.js?f4b7g" type="text/javascript"></script>
<script src="unx.js?f4b7h" type="text/javascript"></script>
<script src="new.js?2e3d9" type="text/javascript"></script>
<link href="gpack/travian_basic/lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/travian.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css" />
<link href="gpack/travian_basic/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/travian.css?2e3d9" rel="stylesheet" type="text/css" />
<link href="gpack/travian_redesign/lang/en/lang.css?2e3d9" rel="stylesheet" type="text/css" />
</head>
<body class="v35 " onload="initCounter()">
@@ -42,13 +42,13 @@
<div id="content" class="error_site"><img class="e404" src="img/x.gif" alt="Nothing here!" style="position:absolute;top:60px;left:55px;" />
<div style="position:absolute;top:0px;left:30px;"><h1>Nothing here!</h1></div>
<div style="position:absolute;top:235px;left:30px;z-index:15;">We looked 404 times already but can't find anything</div>
<img src="img/x.gif" style="height:330px;width:1px;" />
<img src="img/x.gif" style="height:330px;width:1px;" />
</div>
<div id="side_info" class="outgame">
<h5><img src="http://www.travian.com//img/en/t2/newsbox1.gif" alt="newsbox 1" /></h5>
<div class="news"><a href="http://www.facebook.com/group.php?gid=110117025672281&ref=nf" target="_blank"><img src="http://tutorials.travianteam.com/images/boton_fb1.jpg" /></a>
<br /><br />
<a href="http://www.tschena.com/magazine/com_magazine_2010_07.pdf" target="_blank"><img src="http://tutorials.travianteam.com/images/btn_eng.jpg" /></a>
<a href="http://www.tschena.com/magazine/com_magazine_2010_07.pdf" target="_blank"><img src="http://tutorials.travianteam.com/images/btn_eng.jpg" /></a>
</div>
<h5><img src="http://www.travian.com//img/en/t2/newsbox2.gif" alt="newsbox 2" /></h5>
<div class="news">Dear players,
@@ -81,7 +81,7 @@ Tschena &amp; Phanttis
<div id="footer">
<div id="mfoot">
<div class="footer-menu">
<a href="http://www.travian.com/anleitung.php?s=3">FAQ</a>
| <a href="http://www.travian.com/index.php?screenshots">Screenshots</a>
| <a href="http://www.travian.com/spielregeln.php">Game rules</a>
+1 -1
View File
@@ -204,7 +204,7 @@ AccessLogger::logRequest();
</div>
<div id="footer">
<div class="container">
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/" class="logo"><img alt="Licencia Creative Commons" style="border-width:0; height:31px; width:88px;" src="http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" class="logo_traviangames" /></a>
<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/3.0/" class="logo"><img alt="Licencia Creative Commons" style="border-width:0; height:31px; width:88px;" src="https://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" class="logo_traviangames" /></a>
<ul class="menu">
<li><a href="anleitung.php?s=3"><?php echo FAQ; ?></a>|</li>
<li><a href="index.php?screenshots"><?php echo SCREENSHOTS; ?></a>|</li>

Some files were not shown because too many files have changed in this diff Show More