Troops at outter village

App/GameModule/Model/Units/UnitModel.php

@@ -7,4 +7,14 @@
 class UnitModel extends App\Model\BaseModel
 {
 	protected $table = 'unit';
+
+
+	/**
+	 * @return array
+	 */
+	public function getNames()
+	{
+		return $this->database->select('id, name')->from($this->table)
+			->fetchPairs('id', 'name');
+	}
 }

App/GameModule/Model/Units/UnitService.php

@@ -158,7 +158,7 @@ class UnitService
 	];
 
 	/**
-	 * @var App\GameModule\Model\Units\UnitsModel
+	 * @var App\GameModule\Model\Units\UnitModel
 	 */
 	private $unitModel;
 	/**
@@ -217,6 +217,9 @@ public function train($form, $values, $village)
 				} else {
 					$amount = $trainable;
 				}
+				if ($amount == 0) {
+					continue;
+				}
 
 				$this->VDataModel->update($village->getId(), [
 					'wood' => $village->getActualWood() - $amount * $unit->getWood(),
@@ -411,10 +414,10 @@ public function getTrainableUnits($village, $units)
 	 */
 	public function getTrainableUnit($village, $unit)
 	{
-		$wood = round($village->getActualWood() / $unit->getWood());
-		$clay = round($village->getActualClay() / $unit->getClay());
-		$iron = round($village->getActualIron() / $unit->getIron());
-		$crop = round($village->getActualCrop() / $unit->getCrop());
+		$wood = floor($village->getActualWood() / $unit->getWood());
+		$clay = floor($village->getActualClay() / $unit->getClay());
+		$iron = floor($village->getActualIron() / $unit->getIron());
+		$crop = floor($village->getActualCrop() / $unit->getCrop());
 		return min($wood, $clay, $iron, $crop);
 	}
 
@@ -429,4 +432,13 @@ public function getUnits($village)
 
 		return $unitData;
 	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getNames()
+	{
+		return $this->unitModel->getNames();
+	}
 }

App/GameModule/Presenters/OuterVillagePresenter.php

@@ -15,6 +15,12 @@ class OuterVillagePresenter extends GamePresenter
 	/** @var App\FrontModule\Model\VData\VDataModel @inject */
 	public $VDataModel;
 
+	/** @var App\GameModule\Model\Units\UnitsModel @inject */
+	public $unitsModel;
+
+	/** @var App\GameModule\Model\Units\UnitService @inject */
+	public $unitService;
+
 
 	public function startup()
 	{
@@ -37,6 +43,8 @@ public function actionDefault($id)
 			$id = $field->wref;
 		}
 		$this->template->village = $this->villageService->getVillage($id);
+		$this->template->units = $this->unitsModel->get($id);
+		$this->template->unitNames = $this->unitService->getNames();
 	}
 
 

App/GameModule/Templates/OuterVillage/default.latte

@@ -67,6 +67,36 @@
                     </tr>
                 </tbody>
             </table>
+            <table id="troops" cellpadding="1" cellspacing="1">
+            	<thead>
+            		<tr>
+            			<th colspan="3">Troops</th>
+            		</tr>
+				</thead>
+				<tbody>
+					{var $hasUnits = FALSE}
+            		{for $i = 1; $i < 50; $i++}
+						{if $units['u' . $i] > 0}
+							<tr>
+								<td class="ico">
+									<img class="unit u{$i}" src="{$baseUrl}/img/x.gif"
+										alt="{$unitNames[$i]}" title="{$unitNames[$i]}" />
+								</td>
+								<td class="num">
+									{$units['u' . $i]}
+								</td>
+								<td class="un">
+									{$unitNames[$i]}
+								</td>
+							</tr>
+							{var $hasUnits = TRUE}
+						{/if}
+					{/for}
+					<tr n:if=" ! $hasUnits">
+						<td>none</td>
+					</tr>
+            	</tbody>
+			</table>
         </div>
         {control building}
     </div>

www/dorf1.php

@@ -10,8 +10,6 @@
 
 		<?php
 		include("Templates/movement.tpl");
-		// --production--
-		include("Templates/troops.tpl");
 
 		?>