Fixed errors in Guild Wars. One of them was assigning instead of comparing which, when right side of score was higher than 0, produced only a tie, eg. 1-1, 2-2, 3-3, 4-4. This resolves #47 issue.

This commit is contained in:
Kuzirashi 2014-04-19 23:58:07 +02:00
parent b0e40e4ccd
commit 9d89836c01

View File

@ -32,9 +32,11 @@ if (!empty($_GET['warid'])) {
$g2c = 0; // kill count $g2c = 0; // kill count
if ($config['TFSVersion'] == 'TFS_02' || $config['TFSVersion'] == 'TFS_10') { if ($config['TFSVersion'] == 'TFS_02' || $config['TFSVersion'] == 'TFS_10') {
foreach ($kills as $kill) { foreach (($kills ? $kills : array()) as $kill) {
if ($kill[killerguild] == $guild1) ++$g1c; if ($kill['killerguild'] == $guild1)
if ($kill[killerguild] == $guild2) ++$g2c; $g1c++;
else
$g2c++;
} }
$green = false; $green = false;
@ -55,9 +57,12 @@ if (!empty($_GET['warid'])) {
</li> </li>
<li> <li>
<?php <?php
if ($green) echo 'Score: <font color="green">'. $g1c .'</font>-<font color="red">'. $g2c .'</font>'; if ($green)
else if ($g1c = $g2c) echo 'Score: <font color="orange">'. $g1c .'</font>-<font color="orange">'. $g2c .'</font>'; echo 'Score: <font color="green">'. $g1c .'</font>-<font color="red">'. $g2c .'</font>';
else echo 'Score: <font color="red">'. $g1c .'</font>-<font color="green">'. $g2c .'</font>'; else if ($g1c == $g2c)
echo 'Score: <font color="orange">'. $g1c .'</font>-<font color="orange">'. $g2c .'</font>';
else
echo 'Score: <font color="red">'. $g1c .'</font>-<font color="green">'. $g2c .'</font>';
?> ?>
</li> </li>
<?php } ?> <?php } ?>
@ -73,7 +78,7 @@ if (!empty($_GET['warid'])) {
<th>Time:</th> <th>Time:</th>
</tr> </tr>
<?php <?php
foreach ($kills as $kill) { foreach (($kills ? $kills : array()) as $kill) {
echo '<tr>'; echo '<tr>';
//echo '<td>'. get_guild_name($kill['killerguild']) .'</td>'; //echo '<td>'. get_guild_name($kill['killerguild']) .'</td>';
echo '<td><a href="guilds.php?name='. get_guild_name($kill['killerguild']) .'">'. get_guild_name($kill['killerguild']) .'</a></td>'; echo '<td><a href="guilds.php?name='. get_guild_name($kill['killerguild']) .'">'. get_guild_name($kill['killerguild']) .'</a></td>';
@ -165,10 +170,18 @@ if (!empty($_GET['warid'])) {
</tr> </tr>
<?php <?php
foreach ($wardata as $wars) { foreach ($wardata as $wars) {
$guild_1_kills = 0;
$guild_2_kills = 0;
foreach (($killsdata[$wars['id']] ? $killsdata[$wars['id']] : array()) as $kill) {
if ($kill['killerguild'] == $wars['guild1'])
$guild_1_kills++;
else
$guild_2_kills++;
}
$url = url("guildwar.php?warid=". $wars['id']); $url = url("guildwar.php?warid=". $wars['id']);
echo '<tr class="special" onclick="javascript:window.location.href=\'' . $url . '\'">'; echo '<tr class="special" onclick="javascript:window.location.href=\'' . $url . '\'">';
echo '<td>'. $wars['name1'] .'</td>'; echo '<td>'. $wars['name1'] .'</td>';
echo '<td>'. count($killsdata[$wars['id']]) .'</td>'; echo '<td>'. $guild_1_kills .' - ' . $guild_2_kills . '</td>';
echo '<td>'. $wars['name2'] .'</td>'; echo '<td>'. $wars['name2'] .'</td>';
echo '</tr>'; echo '</tr>';
} }