mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-07-10 22:56:07 +00:00
Merge branch 'master' of https://github.com/Shadowss/TravianZ
This commit is contained in:
Shadow
@@ -1884,7 +1884,7 @@ class Automation {
|
||||
if($can_destroy==1) {
|
||||
$info_cat = "".$catp_pic.", Village already destroyed.";
|
||||
} else {
|
||||
$info_cat = "".$catp_pic.", Village can't be destroyed.";
|
||||
$info_cat = "".$catp_pic.", Village can\'t be destroyed.";
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
+54
-63
@@ -290,57 +290,47 @@ class Battle {
|
||||
//get every enforcement in defender village/oasis
|
||||
|
||||
$DefendersAll = $database->getEnforceVillage($DefenderWref,0);
|
||||
if(!empty($DefendersAll)){
|
||||
|
||||
// Calculates the total points of the Defender
|
||||
if(!empty($DefendersAll)){
|
||||
foreach($DefendersAll as $defenders) {
|
||||
|
||||
for ($i=1;$i<=50;$i++) {$def_ab[$i]=0;}
|
||||
$fromvillage = $defenders['from'];
|
||||
$enforcetribe = $database->getUserField($database->getVillageField($fromvillage,"owner"),"tribe",0);
|
||||
$ud=($enforcetribe-1)*10;
|
||||
if($defenders['from']>1) { //don't check nature tribe
|
||||
$armory = $database->getABTech($defenders['from']); // Armory level every village enforcement
|
||||
$def_ab[$ud+1] = $armory['a1'];
|
||||
$def_ab[$ud+2] = $armory['a2'];
|
||||
$def_ab[$ud+3] = $armory['a3'];
|
||||
$def_ab[$ud+4] = $armory['a4'];
|
||||
$def_ab[$ud+5] = $armory['a5'];
|
||||
$def_ab[$ud+6] = $armory['a6'];
|
||||
$def_ab[$ud+7] = $armory['a7'];
|
||||
$def_ab[$ud+8] = $armory['a8'];
|
||||
if(!empty($DefendersAll) && $DefenderWref>0){
|
||||
foreach($DefendersAll as $defenders) {
|
||||
for ($i=1;$i<=50;$i++) {$def_ab[$i]=0;}
|
||||
$fromvillage = $defenders['from'];
|
||||
$enforcetribe = $database->getUserField($database->getVillageField($fromvillage,"owner"),"tribe",0);
|
||||
$ud=($enforcetribe-1)*10;
|
||||
if($defenders['from']>0) { //don't check nature tribe
|
||||
$armory = $database->getABTech($defenders['from']); // Armory level every village enforcement
|
||||
$def_ab[$ud+1] = $armory['a1'];
|
||||
$def_ab[$ud+2] = $armory['a2'];
|
||||
$def_ab[$ud+3] = $armory['a3'];
|
||||
$def_ab[$ud+4] = $armory['a4'];
|
||||
$def_ab[$ud+5] = $armory['a5'];
|
||||
$def_ab[$ud+6] = $armory['a6'];
|
||||
$def_ab[$ud+7] = $armory['a7'];
|
||||
$def_ab[$ud+8] = $armory['a8'];
|
||||
}
|
||||
if ($type==1) {
|
||||
$datadefScout=$this->getDataDefScout($defenders,$def_ab,$defender_artefact);
|
||||
$dp+=$datadefScout['dp'];
|
||||
$cdp+=$datadefScout['cdp'];
|
||||
$involve=$datadefScout['involve'];
|
||||
if ($datadefScout['detect']==1) $detected = 1;
|
||||
}else{
|
||||
$datadef=$this->getDataDef($defenders,$def_ab);
|
||||
$dp+=$datadef['dp'];
|
||||
$cdp+=$datadef['cdp'];
|
||||
$involve=$datadef['involve'];
|
||||
}
|
||||
$reinfowner = $database->getVillageField($fromvillage,"owner");
|
||||
$defhero = $this->getBattleHero($reinfowner);
|
||||
//calculate def hero from enforcement
|
||||
if($defenders['hero'] != 0){
|
||||
$cdp += $defhero['dc'];
|
||||
$dp += $defhero['di'];
|
||||
$dp = $dp * $defhero['db'];
|
||||
$cdp = $cdp * $defhero['db'];
|
||||
}
|
||||
}
|
||||
|
||||
if ($type==1) {
|
||||
$datadefScout=$this->getDataDefScout($defenders,$def_ab,$defender_artefact);
|
||||
$dp+=$datadefScout['dp'];
|
||||
$cdp+=$datadefScout['cdp'];
|
||||
$involve=$datadef['involve'];
|
||||
if ($datadefScout['detect']==1) $detected = 1;
|
||||
}else{
|
||||
$datadef=$this->getDataDef($defenders,$def_ab);
|
||||
$dp+=$datadef['dp'];
|
||||
$cdp+=$datade['cdp'];
|
||||
$involve=$datadef['involve'];
|
||||
|
||||
}
|
||||
|
||||
$reinfowner = $database->getVillageField($fromvillage,"owner");
|
||||
$defhero = $this->getBattleHero($reinfowner);
|
||||
//calculate def hero from enforcement
|
||||
if($defenders['hero'] != 0){
|
||||
$cdp += $defhero['dc'];
|
||||
$dp += $defhero['di'];
|
||||
$dp = $dp * $defhero['db'];
|
||||
$cdp = $cdp * $defhero['db'];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Calculate the total number of points Attacker
|
||||
// Calculate the total number of points Attacker
|
||||
$start = ($att_tribe-1)*10+1;
|
||||
$end = ($att_tribe*10);
|
||||
if($att_tribe == 3){
|
||||
@@ -354,12 +344,12 @@ class Battle {
|
||||
global ${'u'.$i};
|
||||
$j = $i-$start+1;
|
||||
if($Attacker['u'.$i]>0 && ($i == 4 || $i == 14 || $i == 23 || $i == 44)){
|
||||
if(${att_ab.$abcount} > 0) {
|
||||
$ap += (35 + (35 + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.004, ${att_ab.$abcount}) - 1)) * $Attacker['u'.$i];// ^ ($Attacker['u'.$i]/100);
|
||||
if(${'att_ab'.$abcount} > 0) {
|
||||
$ap += (35 + (35 + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.00697, ${'att_ab'.$abcount}) - 1)) * $Attacker['u'.$i];
|
||||
}else{
|
||||
$ap += $Attacker['u'.$i]*25;
|
||||
$ap += $Attacker['u'.$i]*35;
|
||||
}
|
||||
}
|
||||
}
|
||||
$involve += $Attacker['u'.$i];
|
||||
$units['Att_unit'][$i] = $Attacker['u'.$i];
|
||||
|
||||
@@ -515,17 +505,18 @@ class Battle {
|
||||
// Formula for calculating lost drives
|
||||
// $type = 1 scout, 2?
|
||||
// $type = 3 Normal, 4 Raid
|
||||
if($type == 1)
|
||||
{
|
||||
|
||||
$holder = pow((($rdp*$moralbonus)/$rap),$Mfactor);
|
||||
$holder = $holder / (1 + $holder);
|
||||
// Attacker
|
||||
$result[1] = $holder;
|
||||
if($type == 1){
|
||||
|
||||
// Defender
|
||||
$result[2] = 0;
|
||||
}
|
||||
$holder = pow(($rdp/$rap),1.5);
|
||||
if($holder>1) $holder=1;
|
||||
|
||||
// Attacker
|
||||
$result[1] = $holder;
|
||||
if ($att_tribe==5) $result[1] = 0; //Birds of Prey cannot die when scout
|
||||
|
||||
// Defender
|
||||
$result[2] = 0;
|
||||
}
|
||||
else if($type == 2)
|
||||
{
|
||||
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
<?php
|
||||
include("Templates/Plus/pmenu.tpl");
|
||||
|
||||
|
||||
|
||||
if(!empty($_GET['gold'])) {
|
||||
|
||||
$gold =$_GET['gold'];
|
||||
$user = $_GET['user'];
|
||||
$q= mysql_query("update ".TB_PREFIX."users set gold=gold+$R_GOLD where id=$id");
|
||||
mysql_query($q);
|
||||
|
||||
$q= mysql_query("update ".TB_PREFIX."users set reflink=0 where id=$user");
|
||||
mysql_query($q);
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
<h2>Invite friends and receive free Gold</h2>
|
||||
@@ -45,13 +31,6 @@ include("Templates/Plus/pmenu.tpl");
|
||||
<tr>
|
||||
<th colspan="6">Players brought in</th>
|
||||
</tr>
|
||||
<!-- Fix Reference Link -->
|
||||
<?php
|
||||
mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS);
|
||||
mysql_select_db(SQL_DB);
|
||||
$query = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE reflink = ".$id."");
|
||||
$row = mysql_num_rows($query);
|
||||
?>
|
||||
<tr>
|
||||
<td>UID</td>
|
||||
|
||||
@@ -60,15 +39,7 @@ $row = mysql_num_rows($query);
|
||||
<td>Inhabitants</td>
|
||||
|
||||
<td>Villages</td>
|
||||
|
||||
<td>Gold</td>
|
||||
</tr>
|
||||
<?php
|
||||
if ($row<>0){
|
||||
while($reference = mysql_fetch_array($query)){
|
||||
}
|
||||
}
|
||||
?>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
@@ -89,15 +60,6 @@ while($reference = mysql_fetch_array($query)){
|
||||
<td><?php echo $totalpop; ?></td>
|
||||
|
||||
<td><?php echo count($varray); ?></td>
|
||||
<td> <?php
|
||||
if ($villaggi >= ACTIVATE4){ ?>
|
||||
<a href="?id=<?php echo $id; ?>&gold=true&user=<?php echo $reference['id']; ?>"><img src="../img/admin/gold.gif"></a>
|
||||
<?php
|
||||
}else{ ?>
|
||||
<img src="../img/admin/gold_g.gif">
|
||||
<?php
|
||||
} ?> </td>
|
||||
|
||||
</tr>
|
||||
<?php
|
||||
}}else{
|
||||
|
||||
@@ -16,5 +16,5 @@
|
||||
## ##
|
||||
#################################################################################
|
||||
?>
|
||||
<p class="date">[Release by: ZravianX]</p>
|
||||
<p>Thank you for using our version!</p>
|
||||
<p class="date">[Release by: TravianZ]</p>
|
||||
<p>Thank you for using our version!</p>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
## ##
|
||||
#################################################################################
|
||||
|
||||
if ($_SESSION['qst']<38 && QUEST==true){?>
|
||||
if ($_SESSION['qst']<38 && QUEST==true or $_SESSION['qst']>80){?>
|
||||
|
||||
<div id="anm" style="width:120px; height:140px; visibility:hidden;"></div>
|
||||
<div id="qge">
|
||||
|
||||
@@ -203,7 +203,7 @@ include ("GameEngine/Lang/".LANG.".php");
|
||||
<li><a href="spielregeln.php"><?php echo SPIELREGELN; ?></a>|</li>
|
||||
<li><a href="agb.php"><?php echo AGB; ?></a>|</li>
|
||||
<li><a href="impressum.php"><?php echo IMPRINT; ?></a></li>
|
||||
<li class="copyright">© 2011 - ZravianX - All rights reserved</li>
|
||||
<li class="copyright">© 2011-2014 - TravianZ - All rights reserved</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -272,4 +272,4 @@ include ("GameEngine/Lang/".LANG.".php");
|
||||
var galarie = new Fx.Screenshots('screen_view', 'screen_hl', 'screen_desc', screenshots);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user