mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-06-28 00:24:23 +00:00
bdd3bfd41c
+Troops while adding/editing a raid lists are now inside of a table, this is a graphic enhancement +Reduced the X and Y textboxes size while adding/editing a raid list +Fixed a bug that didn't permit to add a raid list +Fixed a bug that did permit to insert spies in raid lists +The farmlists graphic is now more clear, "Add raid" and "Start raid" are now two general buttons, instead of having two buttons for raid list +"Select all" checkbox, will select all raid without refreshing the page (through JS) +Moved the function "getDistance" to Database.php +Removed a lot of redundant code from crop_finder.php +Removed rams, catapults, chiefs and settlers from the raid list, because the first three can't even loot resources +Removed trooplist2.tpl because of a more general unique template file (trooplist.tpl) +Some minor improvements and bug fixing IMPORTANT NOTE: if you don't want to reinstal the whole server, you can simply run this little query (where "s1_" is the prefix of your server): ALTER TABLE `s1_raidlist` DROP `t7`, DROP `t8`, DROP `t9`, DROP `t10`;
156 lines
6.3 KiB
Smarty
156 lines
6.3 KiB
Smarty
<?php
|
|
if(isset($_GET['action']) == 'editSlot' && $_GET['eid']) {
|
|
$eiddata = $database->getRaidList($_GET['eid']);
|
|
$x = $eiddata['x'];
|
|
$y = $eiddata['y'];
|
|
for($i = 1; $i <= 6; $i++) ${'t'.$i} = $eiddata['t'.$i];
|
|
$FLData = $database->getFLData($eiddata['lid']);
|
|
|
|
//Check if we're editing one of ours raidlists
|
|
if($FLData['owner'] != $session->uid){
|
|
header("Location: build.php?id=39&t=99");
|
|
exit;
|
|
}
|
|
}
|
|
|
|
if(isset($_POST['action']) == 'editSlot' && isset($_GET['eid']) && !empty($_GET['eid']) && isset($_POST['lid']) && !empty($_POST['lid'])) {
|
|
if(!empty($_POST['target_id'])){
|
|
$Wref = $_POST['target_id'];
|
|
$WrefCoor = $database->getCoor($Wref);
|
|
$WrefX = $WrefCoor['x'];
|
|
$WrefY = $WrefCoor['y'];
|
|
$type = $database->getVillageType2($Wref);
|
|
$oasistype = $type;
|
|
$vdata = $database->getVillage($Wref);
|
|
}elseif(!empty($_POST['x']) && !empty($_POST['y']) && is_numeric($_POST['x']) && is_numeric($_POST['y'])){
|
|
$Wref = $database->getVilWref($_POST['x'], $_POST['y']);
|
|
$WrefX = $_POST['x'];
|
|
$WrefY = $_POST['y'];
|
|
$type = $database->getVillageType2($Wref);
|
|
$oasistype = $type;
|
|
$vdata = $database->getVillage($Wref);
|
|
}
|
|
|
|
$troops = 0;
|
|
for($i = 1; $i <= 6; $i++){
|
|
if(!in_array($i + ($session->tribe - 1) * 10, [4, 14, 23])) $troops += $_POST['t'.$i];
|
|
}
|
|
|
|
if(empty($_POST['x']) && empty($_POST['y']) && empty($_POST['target_id'])) $errormsg = "Enter coordinates.";
|
|
elseif((empty($_POST['x']) || empty($_POST['y'])) && empty($_POST['target_id'])) $errormsg = "Enter the correct coordinates.";
|
|
elseif($oasistype == 0 && $vdata == 0) $errormsg = "There is no village on those coordinates.";
|
|
elseif($troops == 0) $errormsg = "No troops has been selected.";
|
|
elseif($database->hasBeginnerProtection($Wref) == 1) $errormsg = "Player under protection.";
|
|
elseif($_POST['target_id'] == $village->wid || $vdata['wref'] == $village->wid) $errormsg = "You can't attack the same village you send troops from.";
|
|
else
|
|
{
|
|
if(!empty($_POST['target_id'])){
|
|
$Wref = $_POST['target_id'];
|
|
$WrefCoor = $database->getCoor($Wref);
|
|
$WrefX = $WrefCoor['x'];
|
|
$WrefY = $WrefCoor['y'];
|
|
}else{
|
|
$Wref = $database->getVilWref($_POST['x'], $_POST['y']);
|
|
$WrefX = $_POST['x'];
|
|
$WrefY = $_POST['y'];
|
|
}
|
|
|
|
$coor = $database->getCoor($village->wid);
|
|
$distance = $database->getDistance($coor['x'], $coor['y'], $WrefX, $WrefY);
|
|
$database->editSlotFarm($_GET['eid'], $_POST['lid'], $database->getRaidList($_GET['eid'])['lid'], $session->uid, $Wref, $WrefX, $WrefY, $distance, $_POST['t1'], $_POST['t2'], $_POST['t3'], $_POST['t4'], $_POST['t5'], $_POST['t6']);
|
|
|
|
header("Location: build.php?id=39&t=99");
|
|
exit;
|
|
}
|
|
}
|
|
?>
|
|
|
|
<div id="raidListSlot">
|
|
<h4>Edit Slot</h4>
|
|
<font color="#FF0000"><b>
|
|
<?php echo $errormsg; ?>
|
|
</b></font>
|
|
|
|
<form id="edit_form" action="build.php?id=39&t=99&action=showSlot&eid=<?php echo $_GET['eid']; ?>" method="post">
|
|
<div class="boxes boxesColor gray"><div class="boxes-tl"></div><div class="boxes-tr"></div><div class="boxes-tc"></div><div class="boxes-ml"></div><div class="boxes-mr"></div><div class="boxes-mc"></div><div class="boxes-bl"></div><div class="boxes-br"></div><div class="boxes-bc"></div><div class="boxes-contents cf">
|
|
|
|
<?php
|
|
$getlid = $database->getRaidList($database->escape($_GET["eid"]));
|
|
$lid2 = $getlid['lid'];
|
|
?>
|
|
<input type="hidden" name="action" value="editSlot">
|
|
<table cellpadding="1" cellspacing="1" class="transparent" id="raidList">
|
|
<tbody><tr>
|
|
<th>List name:</th><?php echo $_GET["lid"]; ?>
|
|
<td>
|
|
<select onchange="getTargetsByLid();" id="lid" name="lid">
|
|
<?php
|
|
$sql = mysqli_query($database->dblink,"SELECT id, name, owner, wref FROM ".TB_PREFIX."farmlist WHERE owner = ".(int) $session->uid." ORDER BY name ASC");
|
|
while($row = mysqli_fetch_array($sql)){
|
|
$lid = $row["id"];
|
|
$lname = $row["name"];
|
|
$lvname = $database->getVillageField($row["wref"], 'name');
|
|
|
|
if($lid == $lid2) $selected = 'selected=""';
|
|
else $selected = '';
|
|
echo '<option value="'.$lid.'" '.$selected.'>'.$lvname.' - '.$lname.'</option>';
|
|
}
|
|
?>
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<th>Target village:</th>
|
|
<td class="target">
|
|
|
|
<div class="coordinatesInput">
|
|
<div class="xCoord">
|
|
<label for="xCoordInput">X:</label>
|
|
<input value="<?php echo $x; ?>" name="x" id="xCoordInput" class="text coordinates x ">
|
|
</div>
|
|
<br />
|
|
<div class="yCoord">
|
|
<label for="yCoordInput">Y:</label>
|
|
<input value="<?php echo $y; ?>" name="y" id="yCoordInput" class="text coordinates y ">
|
|
</div>
|
|
<div class="clear"></div>
|
|
</div>
|
|
<div class="targetSelect"><br />
|
|
<label class="lastTargets">Last targets:</label>
|
|
<select name="target_id">
|
|
<?php
|
|
$getwref = "SELECT movement.to, movement.ref, attacks.* FROM ".TB_PREFIX."movement as movement INNER JOIN ".TB_PREFIX."attacks as attacks ON attacks.id = movement.ref WHERE attacks.attack_type = 4 AND movement.proc = 1 AND movement.from = ".$village->wid;
|
|
$arraywref = $database->query_return($getwref);
|
|
echo '<option value="">Select village</option>';
|
|
if(mysqli_num_rows(mysqli_query($database->dblink, $getwref)) != 0){
|
|
foreach($arraywref as $row){
|
|
$towref = $row["to"];
|
|
$vilInfo = $database->getVillageByWorldID($towref);
|
|
if($vilInfo['fieldtype'] > 0 && !$vilInfo['occupied']) continue;
|
|
$tocoor = $database->getCoor($towref);
|
|
if($vilInfo['oasistype'] == 0) $tovname = $database->getVillageField($towref, 'name');
|
|
else $tovname = $database->getOasisField($towref, 'name');
|
|
|
|
if($row["id"] == $_GET['eid']) $selected = 'selected=""';
|
|
else $selected = '';
|
|
|
|
if($vill[$towref] == 0) echo '<option value="'.$towref.'">'.$tovname.' ('.$tocoor['x'].'|'.$tocoor['y'].')</option>';
|
|
$vill[$towref] = 1;
|
|
}
|
|
}
|
|
?>
|
|
</select>
|
|
</div>
|
|
<div class="clear"></div>
|
|
</td>
|
|
</tr>
|
|
</tbody></table>
|
|
</div>
|
|
</div>
|
|
<?php include "Templates/goldClub/trooplist.tpl"; ?>
|
|
|
|
<br />
|
|
<button type="submit" value="save" name="save" id="save" class="trav_buttons">Save</button>
|
|
<button type="button" value="delete" name="delete" id="delete" class="trav_buttons" onclick="window.location.href = '?gid=16&t=99&action=deleteSlot&eid=<?php echo $_GET["eid"]; ?>&lid=<?php echo $eiddata['lid']; ?>';">Delete</button>
|
|
</form>
|
|
</div> |