![\"".WWVILLAGE."\"](\"img/x.gif\" "\\"\".WWVILLAGE.\"\\"")
+
To conquer one, the following things must happen:
diff --git a/src/Models/BuildingModel.php b/src/Models/BuildingModel.php
index c3f3ef6d..f9d01c9f 100644
--- a/src/Models/BuildingModel.php
+++ b/src/Models/BuildingModel.php
@@ -19,29 +19,25 @@ use TravianZ\Account\Session;
use TravianZ\Data\GetInformations;
use TravianZ\Data\Validator;
use TravianZ\Data\Buildings\Academy;
+use TravianZ\Data\Buildings\MainBuilding;
use TravianZ\Data\Buildings\Marketplace;
use TravianZ\Data\Buildings\Palace;
+use TravianZ\Data\Buildings\RallyPoint;
+use TravianZ\Data\Movements\Raid;
use TravianZ\Data\Movements\ReturningTrade;
use TravianZ\Data\Movements\Trade;
use TravianZ\Database\Database;
use TravianZ\Entity\Building;
-use TravianZ\Entity\Training;
use TravianZ\Entity\TrainingField;
use TravianZ\Entity\Village;
+use TravianZ\Entity\Villages;
use TravianZ\Enums\BuildingEnums;
+use TravianZ\Enums\BuildingJobEnums;
use TravianZ\Enums\ResearchEnums;
use TravianZ\Exceptions\InvalidParametersException;
use TravianZ\Factory\BuildingsFactory;
-use TravianZ\Factory\UnitsFactory;
use TravianZ\Mvc\Model;
use TravianZ\Utils\Generator;
-use TravianZ\Enums\BuildingJobEnums;
-use TravianZ\Data\Buildings\MainBuilding;
-use TravianZ\Data\Buildings\Residence;
-use TravianZ\Enums\UnitEnums;
-use TravianZ\Entity\Villages;
-use TravianZ\Data\Buildings\RallyPoint;
-use TravianZ\Data\Movements\Raid;
/**
* @author iopietro
@@ -181,7 +177,7 @@ class BuildingModel extends Model
$selectedBuilding = BuildingsFactory::newBuilding(
$building->id,
$building->position,
- $building->level + $sameBuilding + 1
+ $building->level
);
// Set the building ID
@@ -192,7 +188,7 @@ class BuildingModel extends Model
}
// If the building is more than level 0, check if an action can be executed
- if ($selectedBuilding->level - $sameBuilding - 1 > 0) {
+ if ($selectedBuilding->level > 0) {
// Get the class method name to call
$methodToCall = 'manage'.str_replace(' ', '', $selectedBuilding);
$results = [];
@@ -204,6 +200,9 @@ class BuildingModel extends Model
}
}
+ // Increase building level
+ $selectedBuilding->level += $sameBuilding + 1;
+
// Get the village infomations
$villageInformations = $this->getVillageInformations($selectedVillage);
@@ -708,6 +707,15 @@ class BuildingModel extends Model
return ['villageExpansions' => $villageExpansions];
}
+ /**
+ * Manage the rally point
+ *
+ * @param RallyPoint $building
+ * @param Village $village
+ * @param array $parameters
+ * @throws InvalidParametersException
+ * @return array
+ */
private function manageRallyPoint(RallyPoint $building, Village $village, array $parameters): array
{
// Check if the menu parameter is valid
@@ -727,17 +735,55 @@ class BuildingModel extends Model
$action = self::RALLY_POINT_ACTIONS[$parameters['GET']['t']];
$results = [];
- // Execute the marketplace selected action
+ // Execute the rally point selected action
if (method_exists($this, $action)) {
$results = $this->$action($building, $village, $parameters);
}
-
+
return array_merge_recursive(
$results,
['parameters' => ['t' => $parameters['GET']['t']]]
);
}
+ /**
+ * View the rally point movements
+ *
+ * @param RallyPoint $building
+ * @param Village $village
+ * @param array $parameters
+ * @return array
+ */
+ private function rallyPointViewMovements(RallyPoint $building, Village $village, array $parameters): array
+ {
+ // Check if there is a movement to send
+ $results = $this->rallyPointSendUnits($building, $village, $parameters);
+
+ return $results ?? [];
+ }
+
+ /**
+ * Send units to another village
+ *
+ * @param RallyPoint $building
+ * @param Village $village
+ * @param array $parameters
+ * @return array
+ */
+ private function rallyPointSendUnits(RallyPoint $building, Village $village, array $parameters): array
+ {
+ // Check if there's an action to execute
+ // TODO: Don't repeat it every time
+ if (isset($parameters['POST']['action'])) {
+ $action = $parameters['POST']['action'];
+ if (method_exists($building, $action)) {
+ $results = $building->$action($village, $parameters['POST']);
+ }
+ }
+
+ return $results ?? [];
+ }
+
/**
* Manage the gold club functions (raid list, etc.)
*
diff --git a/src/Models/VillageModel.php b/src/Models/VillageModel.php
index c89658d3..f4581da2 100644
--- a/src/Models/VillageModel.php
+++ b/src/Models/VillageModel.php
@@ -61,7 +61,7 @@ class VillageModel extends Model
if (isset($parameters['GET']['newdid'])) {
$this->session->getUser()->changeSelectedVillage($parameters['GET']['newdid']);
}
-
+
$selectedVillage = new Village(
Database::getInstance(),
$this->session->getUser(),
diff --git a/templates/sendUnits/attack.tpl b/templates/sendUnits/attack.tpl
index 0b2718e4..a6fbf7e7 100644
--- a/templates/sendUnits/attack.tpl
+++ b/templates/sendUnits/attack.tpl
@@ -1,330 +1,117 @@
-generateRandStr(6);
+{$attackType = [1 => $smarty.const.U14, $smarty.const.REINFORCE, $smarty.const.NORMALATTACK, $smarty.const.RAID]}
+
- if (!isset($process['t1']) || $process['t1'] == ''){ $t1 = 0; }else{ $t1 = $process['t1']; }
- if (!isset($process['t2']) || $process['t2'] == ''){ $t2 = 0; }else{ $t2 = $process['t2']; }
- if (!isset($process['t3']) || $process['t3'] == ''){ $t3 = 0; }else{ $t3 = $process['t3']; if ($session->tribe == 3) $scout=1; }
- if (!isset($process['t4']) || $process['t4'] == ''){ $t4 = 0; }else{ $t4 = $process['t4']; if ($session->tribe == 1 || $session->tribe == 2 || $session->tribe == 4 || $session->tribe == 5) $scout=1; }
- if (!isset($process['t5']) || $process['t5'] == ''){ $t5 = 0; }else{ $t5 = $process['t5']; }
- if (!isset($process['t6']) || $process['t6'] == ''){ $t6 = 0; }else{ $t6 = $process['t6']; }
- if (!isset($process['t7']) || $process['t7'] == ''){ $t7 = 0; }else{ $t7 = $process['t7']; }
- if (!isset($process['t8']) || $process['t8'] == ''){ $t8 = 0; }else{ $t8 = $process['t8']; }
- if (!isset($process['t9']) || $process['t9'] == ''){ $t9 = 0; }else{ $t9 = $process['t9']; }
- if (!isset($process['t10']) || $process['t10'] == ''){ $t10 = 0; }else{ $t10 = $process['t10']; }
- if (!isset($process['t11']) || $process['t11'] == ''){ $t11 = 0; }else{ $t11 = $process['t11']; $showhero=1; }
-
+{$colspan = 10}
+{if $units[11] > 0}
+ {$colspan = 11}
+{/if}
-for($i = 1; $i <= 11; $i++){
- $totalunits += (($i != 3 && $session->tribe == 3) ||
- ($i != 4 && $session->tribe != 3)) ? (!empty($process['t'.$i]) ? $process['t'.$i] : 0) : 0;
-}
-
-if (isset($scout) && $scout == 1 && isset($totalunits) && $totalunits == 0 && $process['c'] != 2) {
- $process['c'] = 1;
-}
-$id = $database->addA2b($ckey, time(), $process['0'], $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $process['c']);
-
-$actionType = (["Scout", "Reinforcement", "Normal attack", "Raid"])[$process['c'] - 1];
-
-$uid = $session->uid;
-$tribe = $session->tribe;
-$start = ($tribe - 1) * 10 + 1;
-$end = $tribe * 10;
-?>
-
-
-
+{else}
+
+{/if}
\ No newline at end of file