Skip to content

Bugs are small but they are bug #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m-rectifier wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bugs are small but they are bug #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c4b8b9
Axeman's image and name in "instructions" section fixed
m-rectifier Oct 4, 2011
c36f7cc
World wonder Construction view (http://forum.ragezone.com/f582/github…
m-rectifier Oct 4, 2011
dcdf4b1
Train scout in great stable of teuton tribe
m-rectifier Oct 5, 2011
1395c9d
Trapper bug in "Instructions" View
m-rectifier Oct 5, 2011
bc954a9
Header of newsbox 1
m-rectifier Oct 5, 2011
59d36df
WW name in statistiken
m-rectifier Oct 24, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Templates/Build/30_train.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

for ($i=($session->tribe-1)*10+3;$i<=($session->tribe-1)*10+6;$i++) {
if ($i <> 3 && $i <> 13 && i <> 14 && $technology->getTech($i)) {

if ($i <> 14){
echo "<tr><td class=\"desc\">
<div class=\"tit\">
<img class=\"unit u".$i."\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" />
Expand All @@ -15,6 +15,7 @@ echo "</div>
</td>
<td class=\"val\"><input type=\"text\" class=\"text\" name=\"t".$i."\" value=\"0\" maxlength=\"4\"></td>
<td class=\"max\"><a href=\"#\" onClick=\"document.snd.t".$i.".value=".$technology->maxUnit($i,true)."; return false;\">(".$technology->maxUnit($i,true).")</a></td></tr></tbody>";
}
}
}
?>
16 changes: 10 additions & 6 deletions Templates/Build/ww.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<h1>Wonder of the World <br /><span class="level">Level <?php echo $village->resarray['f99']; ?></span></h1>
<p class="build_desc">The World Wonder (otherwise known as a Wonder of the World) is as wonderful as it sounds. "This building" is built in order to win the server. Each level of the World Wonder costs hundreds of thousands (even millions) of resources to build.</p>
<form action="GameEngine/Game/WorldWonderName.php" method="POST">
<input type="hidden" name="vref" value="<?php echo $database->getVillageID($session->uid); ?>" />
<input type="hidden" name="vref" value="<?php echo $_SESSION['wid']; ?>" />
<?php
$vref = $database->getVillageID($session->uid);
$vref = $_SESSION['wid'];
$wwname = $database->getWWName($vref);

if($village->resarray['f99'] < 15){
Expand All @@ -43,9 +43,13 @@ if($village->resarray['f99'] == 100) {
echo "<p><span class=\"none\">Building already at max level</span></p>";
}
else {
$uprequire = $building->resourceRequired($id,$village->resarray['f99t']);
$loopsame = $building->isCurrent($id)?1:0;
if ($loopsame>0 && $building->isLoop($id)) {
$doublebuild = 1;
}
$uprequire = $building->resourceRequired($id,$village->resarray['f'.$id.'t'],($loopsame > 0 ? 2:1)+$doublebuild);
?>
<p id="contract"><b>Costs</b> for upgrading to level <?php echo $village->resarray['f99']+1; ?>:<br />
<p id="contract"><b>Costs</b> for upgrading to level <?php echo $village->resarray['f'.$id]+($loopsame > 0 ? 2:1)+$doublebuild; ?>:<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']);
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>";
Expand Down Expand Up @@ -87,8 +91,8 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
else {
echo "<a class=\"build\" href=\"dorf2.php?a=$id&c=$session->checker\">Upgrade to level ";
}
echo $village->resarray['f99']+1;
echo ".</a> <span class=\"none\">(waiting loop)</span> ";
echo $village->resarray['f99']+2;
echo ".</a> <span class=\"none\">(waiting loop)</span> ";
}
}

Expand Down
1 change: 1 addition & 0 deletions Templates/Manual/113.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<h1><img class="unit u13" src="img/x.gif" alt="Axeman" title="Axeman" /> Axeman <span class="tribe">(Teutons)</span></h1>
<table id="troop_info" cellpadding="1" cellspacing="1">
<thead><tr>
<th><img class="att_all" src="img/x.gif" alt="attack value" title="attack value" /></th>
Expand Down
10 changes: 5 additions & 5 deletions Templates/Manual/436.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<h1><img class="unit ugeb" src="img/x.gif"> Trapper</h1><img class="building g36" src="img/x.gif" alt="Trapper" title="Trapper" />The trapper protects your village with well hidden traps. This means that unwary enemies can be imprisoned and won't be able to harm your village anymore.
<br /><br />
One trap costs
<img src="img/un/r/1.gif" width="18" height="12">20|
<img src="img/un/r/2.gif" width="18" height="12">30|
<img src="img/un/r/3.gif" width="18" height="12">10|
<img src="img/un/r/4.gif" width="18" height="12">20
<img src="img/un/r/5.gif" width="18" height="12">0
<img src="img/un/res/1.gif" width="18" height="12">20|
<img src="img/un/res/2.gif" width="18" height="12">30|
<img src="img/un/res/3.gif" width="18" height="12">10|
<img src="img/un/res/4.gif" width="18" height="12">20
<img src="img/un/res/5.gif" width="18" height="12">0
<br /><br />
Troops cannot be freed with a raid. When the troops get freed with a successful normal attack, 1/3 of the traps are automatically repaired. If the owner of the traps release the captives all of the traps can be repaired.
<br /><br />
Expand Down
16 changes: 14 additions & 2 deletions Templates/News/newsbox1.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
<h5><img src="http://s3.travianx.nl/img/en/t2/newsbox1.gif" alt="newsbox 1"></h5>
<div class="news"> <b><center>TravianX</center></b><br /> <b>Version: <font color="Red">v4.8.5</font></b><br /> <b>Major Changes:</b> New index.php, chief training fixed, graphic packs now work but only for outside links. See more in readme file!<br /> <b>Minor Changes:</b> Admin panel updated a bit, config updated, installation system updated<br /> <b>Script Price:</b> FREE!<br /><br /> <b><u><center>Released by: Dzoki</u></b><br /> <b>Visit: <a href="http://ragezone.com">RageZone.com</a></b><br /></center> </div>
<h5><img src="../img/en/t2/newsbox1.gif" alt="newsbox 1"></h5>

<div class="news">


<b><center>TravianX</center></b><br />
<b>Version: <font color="Red">v4.8.5</font></b><br />
<b>Major Changes:</b> New index.php, chief training fixed, graphic packs now work but only for outside links. See more in readme file!<br />
<b>Minor Changes:</b> Admin panel updated a bit, config updated, installation system updated<br />
<b>Script Price:</b> FREE!<br /><br />
<b><u><center>Released by: Dzoki</u></b><br />
<b>Visit: <a href="http://ragezone.com">RageZone.com</a></b><br /></center>

</div>