xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-09-04 17:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor + BugFix

Browse Source 
1. Fix a bug in Admin Panel that you can edit by yourself your rank, now you cannot edit your rank anymore.

2. Now Alliance Leader can edit his own Position

3. Fix negative value on Demolition Building, now in database at lvl is appear new level not -1

4. Refactor Ajax map, now all is alligned (Ajax folder and Map folder)

5. Fix bug from Palace (when change capital now Automation recount population automaticaly on old capital and new capital)
This commit is contained in:
novgorodschi catalin
2026-05-18 09:18:35 +03:00
parent 2bce101a27
commit 55e6dd60b5
96 changed files with 6176 additions and 6763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Build/15_1.tpl
+134 -110
View File
@@ -1,123 +1,147 @@
<?php
$ty = (isset($_GET['ty']))? $_GET['ty']:"";
if(isset($_REQUEST["cancel"]) && $_REQUEST["cancel"] == "1") {
// MAIN BUILDING DEMOLISH
$ty = isset($_GET['ty'])? $_GET['ty'] : '';
// cancel demolition
if (isset($_REQUEST['cancel']) && $_REQUEST['cancel'] == '1') {
$database->delDemolition($village->wid);
header("Location: build.php?gid=15&ty=$ty&cancel=0&demolish=0");
exit;
exit;
}
if($session->alliance) $memberCount = $database->countAllianceMembers($session->alliance);
else $memberCount = 0;
$memberCount = $session->alliance? $database->countAllianceMembers($session->alliance) : 0;
$VillageLevels = $database->getResourceLevel($village->wid);
if(!empty($_REQUEST["demolish"]) && $_REQUEST["c"] == $session->mchecker) {
if($_REQUEST["type"] != null && ($_REQUEST["type"] >= 19 && $_REQUEST["type"] <= 40 || $_REQUEST["type"] == 99)) {
$type = $_REQUEST['type'];
$demolish_permitted = $database->addDemolition($village->wid,$type);
if ($demolish_permitted === true) {
$session->changeChecker();
header("Location: build.php?gid=15&ty=$type&cancel=0&demolish=0");
}
else header("Location: build.php?gid=15&ty=$type&nodemolish=".$demolish_permitted);
exit;
// start demolition
if (!empty($_REQUEST['demolish']) && $_REQUEST['c'] == $session->mchecker) {
$type = (int)($_REQUEST['type']?? 0);
$instant = isset($_POST['instant']) && $_POST['instant'] == '1';
if ($type >= 19 && $type <= 40 || $type == 99) {
$field = 'f'.$type;
$buildType = $VillageLevels[$field.'t'];
$currentLvl = $VillageLevels[$field];
// blocaj ambasada - la fel ca originalul
if($buildType == 18 && $session->alliance && $database->isAllianceOwner($session->uid) == $session->alliance && $memberCount > 1){
header("Location: build.php?gid=15&ty=$type&nodemolish=18");
exit;
}
if($instant){
// DEMOLARE COMPLETA CU GOLD
if($session->gold < 10){
header("Location: build.php?gid=15&ty=$type&notenoughgold=1");
exit;
}
if($currentLvl > 0){
// sterge orice demolare in curs
$database->delDemolition($village->wid);
// setare nivel 0 direct in DB
$database->query("UPDATE ".TB_PREFIX."fdata SET `$field` = 0, `{$field}t` = 0 WHERE `vref` = ".$village->wid);
// scade gold
$database->modifyGold($session->uid, -10, 0);
$session->gold -= 10;
$session->changeChecker();
header("Location: build.php?gid=15&ty=$type&demolished=1");
exit;
}
}else{
// DEMOLARE CLASICA
$ok = $database->addDemolition($village->wid, $type);
if ($ok === true) {
$session->changeChecker();
header("Location: build.php?gid=15&ty=$type&cancel=0&demolish=0");
} else {
header("Location: build.php?gid=15&ty=$type&nodemolish=$ok");
}
exit;
}
}
}
if($village->resarray['f'.$id] >= DEMOLISH_LEVEL_REQ) {
echo "<h2>".DEMOLITION_BUILDING."";
$VillageResourceLevels = $database->getResourceLevel($village->wid);
$DemolitionProgress = $database->getDemolition($village->wid);
if (!empty($DemolitionProgress)) {
$Demolition = $DemolitionProgress[0];
echo "<b>";
echo "<a href='build.php?id=".$_GET['id']."&ty=".$ty."&cancel=1'><img src='img/x.gif' class='del' title='".CANCEL."' alt='cancel'></a> ";
echo "".DEMOLITION_OF." ".$building->procResType($VillageResourceLevels['f'.$Demolition['buildnumber'].'t']).": <span id=timer1>".$generator->getTimeFormat($Demolition['timetofinish']-time())."</span>";
if($session->gold >= 2) {
?>
<a href="?id=15&buildingFinish=1&ty=<?php echo $ty;?>" onclick="return confirm('Finish all construction and research orders in this village immediately for 2 Gold?');" title="<?php echo FINISH_GOLD; ?>"><img class="clock" alt="Finish all construction and research orders in this village immediately for 2 Gold?" src="img/x.gif"/></a>
<?php
}
echo "</b>";
} else {
if (isset($_GET['nodemolish'])) {
switch ($_GET['nodemolish']) {
case 18:
echo '<p style="color: #ff0000; text-align: left">
Because you are the leader of your alliance, demolition of your current Embassy cannot be started,
since it still holds all of your <b>'.$memberCount.'</b> alliance members.
You can, however <a href="allianz.php?s=5">quit the alliance</a>, while selecting a new leader
in the &quot;quit alliance&quot; form, then continue the demolition.
</p>';
break;
}
}
if ($village->resarray['f'.$id] < DEMOLISH_LEVEL_REQ) return;
echo "
<form action=\"build.php?gid=15&amp;demolish=1&amp;cancel=0&amp;c=".$session->mchecker."\" method=\"POST\" style=\"display:inline\">
<select id=\"demolition_type\" name=\"type\" class=\"dropdown\">";
for ($i=19; $i<=41; $i++) {
$select=($i==$ty)? " SELECTED":"";
if (isset($VillageResourceLevels['f'.$i]) && $VillageResourceLevels['f'.$i] >= 1 && !$building->isCurrent($i) && !$building->isLoop($i)) {
echo "<option value=".$i.$select.">".$i.". ".$building->procResType($VillageResourceLevels['f'.$i.'t'])." (lvl ".$VillageResourceLevels['f'.$i].")</option>";
}
}
if ($village->natar==1) {
$select=($ty==99)? " SELECTED":"";
if ($VillageResourceLevels['f99'] >= 1 && !$building->isCurrent(99) && !$building->isLoop(99)) {
echo "<option value=99".$select.">99. ".$building->procResType(40)." (lvl ".$VillageResourceLevels['f99'].")</option>";
}
}
echo "</select><input id=\"btn_demolish\" name=\"demolish\" class=\"dynamic_img\" value=\"Demolish\" type=\"image\" src=\"img/x.gif\" alt=\"Demolish\" title=\"".DEMOLISH."\" onClick=\"javascript:return verify_demolition();\" /></form>";
}
}
?>
$Demolition = $database->getDemolition($village->wid);
$inProgress =!empty($Demolition)? $Demolition[0] : null;
?>
<h2><?= DEMOLITION_BUILDING?></h2>
<script type="text/javascript">
<!--
function verify_demolition() {
var dType = document.getElementById('demolition_type');
var warnLvl3 = <?php
if (
$session->alliance &&
$database->isAllianceOwner($session->uid) == $session->alliance &&
// don't show the OK/Cancel warning if we have more members, since
// that will be handled by the returned value
$memberCount == 1 &&
$database->getSingleFieldTypeCount($session->uid, 18, '>=', 3) == 1
) {
echo 'true';
} else {
echo 'false';
}
?>;
var warnLvl1 = <?php
if ($session->alliance && $database->getSingleFieldTypeCount($session->uid, 18, '>=', 1) == 1) {
echo 'true';
} else {
echo 'false';
}
?>;
<?php if ($inProgress):?>
<b>
<a href="build.php?id=<?= $_GET['id']?? 15?>&ty=<?= $ty?>&cancel=1">
<img src="img/x.gif" class="del" title="<?= CANCEL?>" alt="cancel">
</a>
<?= DEMOLITION_OF?> <?= $building->procResType($VillageLevels['f'.$inProgress['buildnumber'].'t'])?>:
<span id="timer1"><?= $generator->getTimeFormat($inProgress['timetofinish'] - time())?></span>
<?php if ($session->gold >= 2):?>
<a href="?id=15&buildingFinish=1&ty=<?= $ty?>" onclick="return confirm('Finish all construction and research orders in this village immediately for 2 Gold?');" title="<?= FINISH_GOLD?>">
<img class="clock" alt="Finish" src="img/x.gif">
</a>
<?php endif;?>
</b>
if (warnLvl3 && dType.options[dType.selectedIndex].text.indexOf('Embassy (lvl 3)') > -1) {
// check if we really want to demolish a lvl 3 embassy
if (!window.confirm('WARNING!\n'
+ 'You are about to demolish the last lvl3 Embassy!\n\n'
+ 'Since you are the leader of your alliance and because there are no additional members left, the alliance will be disbanded once the demolition completes.\n\n'
+ 'After that happens, you can found a new alliance or join one that already exists.\n\n'
+ 'Click OK to confirm or Cancel to stop.')) {
return false;
}
} else if (warnLvl1 && dType.options[dType.selectedIndex].text.indexOf('Embassy (lvl 1)') > -1) {
// check if we really want to demolish a lvl 1 embassy
if (!window.confirm('WARNING!\n'
+ 'You are about to demolish your last Embassy!\n\n'
+ 'Since you are in an alliance, you will automatically quit that alliance once the demolition completes.\n\n'
+ 'After that happens, you can found or join an alliance again.\n\n'
+ 'Click OK to confirm or Cancel to stop.')) {
return false;
}
}
return true;
}
//-->
<?php else:?>
<?php if (isset($_GET['nodemolish']) && $_GET['nodemolish'] == 18):?>
<p style="color:#ff0000; text-align:left">
Because you are the leader of your alliance, demolition of your current Embassy cannot be started,
since it still holds all of your <b><?= $memberCount?></b> alliance members.
</p>
<?php endif;?>
<?php if (isset($_GET['notenoughgold'])):?>
<p style="color:#ff0000">You don't have enough gold. You need 10 gold for instant demolition.</p>
<?php endif;?>
<?php if (isset($_GET['demolished'])):?>
<p style="color:#008000">The building was completely demolished for 10 gold!</p>
<?php endif;?>
<form action="build.php?gid=15&amp;demolish=1&amp;cancel=0&amp;c=<?= $session->mchecker?>" method="POST" style="display:inline">
<select id="demolition_type" name="type" class="dropdown">
<?php for ($i = 19; $i <= 41; $i++):
if (!isset($VillageLevels['f'.$i]) || $VillageLevels['f'.$i] < 1) continue;
if ($building->isCurrent($i) || $building->isLoop($i)) continue;
$selected = ($i == $ty)? ' selected' : '';
?>
<option value="<?= $i?>"<?= $selected?>><?= $i?>. <?= $building->procResType($VillageLevels['f'.$i.'t'])?> (lvl <?= $VillageLevels['f'.$i]?>)</option>
<?php endfor;?>
<?php if ($village->natar == 1 && isset($VillageLevels['f99']) && $VillageLevels['f99'] >= 1 &&!$building->isCurrent(99) &&!$building->isLoop(99)):
$selected = ($ty == 99)? ' selected' : '';
?>
<option value="99"<?= $selected?>>99. <?= $building->procResType(40)?> (lvl <?= $VillageLevels['f99']?>)</option>
<?php endif;?>
</select>
<label style="margin:0 10px;">
<input type="checkbox" name="instant" value="1" id="instant_demolish" <?= $session->gold < 10 ? 'disabled' : ''?>>
Demolare completă (10 <img src="img/x.gif" class="gold" style="vertical-align:middle">)
</label>
<input id="btn_demolish" name="demolish" class="dynamic_img" value="Demolish" type="image" src="img/x.gif" alt="Demolish" title="<?= DEMOLISH?>" onclick="return verify_demolition();">
</form>
<?php endif;?>
<script>
function verify_demolition() {
var dType = document.getElementById('demolition_type');
var instant = document.getElementById('instant_demolish').checked;
var warnLvl3 = <?= ($session->alliance && $database->isAllianceOwner($session->uid) == $session->alliance && $memberCount == 1 && $database->getSingleFieldTypeCount($session->uid, 18, '>=', 3) == 1)? 'true' : 'false'?>;
var warnLvl1 = <?= ($session->alliance && $database->getSingleFieldTypeCount($session->uid, 18, '>=', 1) == 1)? 'true' : 'false'?>;
var text = dType.options[dType.selectedIndex].text;
if (instant) {
return confirm('Surely you want to demolish COMPLETELY '+text+' for 10 GOLD?\nThe building will disappear instantly, it cannot be undone.');
}
if (warnLvl3 && text.indexOf('Embassy (lvl 3)') > -1) {
return confirm('WARNING!\n\nYou are about to demolish the last lvl3 Embassy!\n\nSince you are the leader of your alliance and because there are no additional members left, the alliance will be disbanded once the demolition completes.');
}
if (warnLvl1 && text.indexOf('Embassy (lvl 1)') > -1) {
return confirm('WARNING!\n\nYou are about to demolish your last Embassy!\n\nSince you are in an alliance, you will automatically quit that alliance once the demolition completes.');
}
return true;
}
</script>