1 files changed, 89 insertions, 92 deletions
diff --git a/views/gemini/village.twig b/views/gemini/village.twig
index d448020..21c480b 100644
--- a/views/gemini/village.twig
+++ b/views/gemini/village.twig
@@ -19,120 +19,117 @@ Storage Capacity: {{ village.getStorage(village.id).getCapacity() }}
 # Events
 
 {% if events['UpgradeBuilding'] %}
-## Upgrade Building
-{% for typeEvents in events['UpgradeBuilding'] %}
-{% for event in typeEvents %}
-### {{ event.type }}
-Finished: {{ event.event.time | date('c') }}
-=> /village/{{ village.x }}/{{ village.y }}/building/UpgradeBuilding/build/cancel Cancel
-{% endfor %}
-{% endfor %}
+  ## Upgrade Building
+  {% for typeEvents in events['UpgradeBuilding'] %}
+    {% for event in typeEvents %}
+      ### {{ event.type }}
+      Finished: {{ event.event.time | date('c') }}
+      => /village/{{ village.x }}/{{ village.y }}/building/UpgradeBuilding/build/cancel Cancel
+    {% endfor %}
+  {% endfor %}
 {% endif %}
-
 {% if events['TrainUnits'] %}
-## Train Units
-{% for event in events['TrainUnits'] %}
-### {{ event.type }}
-Amount: {{ event.amount }}
-Finished: {{ event.event.time | date('c') }}
-=> /village/{{ village.x }}/{{ village.y }}/unit/train/cancel Cancel
-{% endfor %}
+  ## Train Units
+  {% for event in events['TrainUnits'] %}
+    ### {{ event.type }}
+    Amount: {{ event.amount }}
+    Finished: {{ event.event.time | date('c') }}
+    => /village/{{ village.x }}/{{ village.y }}/unit/train/cancel Cancel
+  {% endfor %}
 {% endif %}
-
 {% if events['SendUnits'] %}
-## Send Units
-{% for event in events['SendUnits'] %}
-### {{ event.unit }} - {{ event.type }}
-Amount: {{ event.amount }}
-Source: {{ village.get(event.source).name }}
-Destination: {{ village.get(event.destination).name }}
-Finished: {{ event.event.time | date('c') }}
-{% if event.isCanceled %}
-Canceled
-{% else %}
-{% if event.event.villageId == village.id %}
-=> /event/{{ event.event.id }}/cancel Cancel
+  ## Send Units
+  {% for event in events['SendUnits'] %}
+    ### {{ event.unit }} - {{ event.type }}
+    Amount: {{ event.amount }}
+    Source: {{ village.get(event.source).name }}
+    Destination: {{ village.get(event.destination).name }}
+    Finished: {{ event.event.time | date('c') }}
+    {% if event.isCanceled %}
+      Canceled
+    {% else %}
+      {% if event.event.villageId == village.id %}
+        => /event/{{ event.event.id }}/cancel Cancel
+      {% endif %}
+    {% endif %}
+  {% endfor %}
 {% endif %}
-{% endif %}
-{% endfor %}
-{% endif %}
-
 {% if events['SendResources'] %}
-## Send Resources
-{% for event in events['SendResources'] %}
-### {{ village.get(event.source).name }} -> {{ village.get(event.destination).name }}
-Wood: {{ event.wood }}
-Clay: {{ event.clay }}
-Iron: {{ event.iron }}
-Food: {{ event.food }}
-Source: {{ village.get(event.source).name }}
-Destination: {{ village.get(event.destination).name }}
-Finished: {{ event.event.time | date('c') }}
-{% if event.isCanceled %}
-Canceled
-{% else %}
-{% if event.event.villageId == village.id %}
-=> /event/{{ event.event.id }}/cancel Cancel
-{% endif %}
-{% endif %}
-{% endfor %}
+  ## Send Resources
+  {% for event in events['SendResources'] %}
+    ### {{ village.get(event.source).name }} -> {{ village.get(event.destination).name }}
+    Wood: {{ event.wood }}
+    Clay: {{ event.clay }}
+    Iron: {{ event.iron }}
+    Food: {{ event.food }}
+    Source: {{ village.get(event.source).name }}
+    Destination: {{ village.get(event.destination).name }}
+    Finished: {{ event.event.time | date('c') }}
+    {% if event.isCanceled %}
+      Canceled
+    {% else %}
+      {% if event.event.villageId == village.id %}
+        => /event/{{ event.event.id }}/cancel Cancel
+      {% endif %}
+    {% endif %}
+  {% endfor %}
 {% endif %}
 
 
 # Buildings
 
 {% for building in buildings %}
-## {{ building.type }}
-Level: {{ building.level | default(0) }}
-Build Time: {{ building.getBuildTimeForLevel(building.getEffectiveLevel() + 1) | buildTime }}
-Resources:
-* Wood: {{ building.getResourceRequirementsForLevel(building.getEffectiveLevel() + 1)['wood'] }}
-* Clay: {{ building.getResourceRequirementsForLevel(building.getEffectiveLevel() + 1)['clay'] }}
-* Iron: {{ building.getResourceRequirementsForLevel(building.getEffectiveLevel() + 1)['iron'] }}
-=> /village/{{ village.x }}/{{ village.y }}/building/{{ building.type }}/manage Manage
-{% if village.canBuild(village, building) %}
-=> /village/{{ village.x }}/{{ village.y }}/building/{{ building.type }}/level-up Level up
-{% endif %}
+  ## {{ building.type }}
+  Level: {{ building.level | default(0) }}
+  Build Time: {{ building.getBuildTimeForLevel(building.getEffectiveLevel() + 1) | buildTime }}
+  Resources:
+  * Wood: {{ building.getResourceRequirementsForLevel(building.getEffectiveLevel() + 1)['wood'] }}
+  * Clay: {{ building.getResourceRequirementsForLevel(building.getEffectiveLevel() + 1)['clay'] }}
+  * Iron: {{ building.getResourceRequirementsForLevel(building.getEffectiveLevel() + 1)['iron'] }}
+  => /village/{{ village.x }}/{{ village.y }}/building/{{ building.type }}/manage Manage
+  {% if village.canBuild(village, building) %}
+    => /village/{{ village.x }}/{{ village.y }}/building/{{ building.type }}/level-up Level up
+  {% endif %}
 {% endfor %}
 
 
 # Units At Home
 
 {% for unit in village.getUnits(village.id, 1, 3) %}
-## {{ unit.type }}
-Amount: {{ unit.amount }}
-{% if not unit.isTraveling %}
-Build Time: {{ unit.getBuildTime(1) | buildTime }}
-Resources:
-* Wood: {{ unit.getResourceRequirements(unit, 1)['wood'] }}
-* Clay: {{ unit.getResourceRequirements(unit, 1)['clay'] }}
-* Iron: {{ unit.getResourceRequirements(unit, 1)['iron'] }}
-* Food: {{ unit.getResourceRequirements(unit, 1)['food'] ?? 0 }}
-{% if village.canTrain(village, unit, 1) %}
-=> /village/{{ village.x }}/{{ village.y }}/unit/{{ unit.type }}/create Train
-{% endif %}
-=> /village/{{ village.x }}/{{ village.y }}/send-units/type/{{ unit.type }} Send
-{% else %}
-~traveling~
-{% endif %}
+  ## {{ unit.type }}
+  Amount: {{ unit.amount }}
+  {% if not unit.isTraveling %}
+    Build Time: {{ unit.getBuildTime(1) | buildTime }}
+    Resources:
+    * Wood: {{ unit.getResourceRequirements(unit, 1)['wood'] }}
+    * Clay: {{ unit.getResourceRequirements(unit, 1)['clay'] }}
+    * Iron: {{ unit.getResourceRequirements(unit, 1)['iron'] }}
+    * Food: {{ unit.getResourceRequirements(unit, 1)['food'] ?? 0 }}
+    {% if village.canTrain(village, unit, 1) %}
+      => /village/{{ village.x }}/{{ village.y }}/unit/{{ unit.type }}/create Train
+    {% endif %}
+    => /village/{{ village.x }}/{{ village.y }}/send-units/type/{{ unit.type }} Send
+  {% else %}
+    ~traveling~
+  {% endif %}
 {% endfor %}
 
 
 # Units Supporting
 
 {% for unit in village.getUnits(village.id, 2) | merge(village.getUnits(village.id, 3)) %}
-## {{ unit.type }}
-Amount: {{ unit.amount }}
-Origin: {{ village.get(unit.homeVillageId).name }}
-Location: {{ not unit.isTraveling ? village.get(unit.residenceVillageId).name : '~traveling~' }}
-Travel Time: {{ unit.getTravelTime(unit, village.getDistance(unit.getHomeVillage().x, unit.getHomeVillage().x, unit.getResidenceVillage().x, unit.getResidenceVillage().y)) | buildTime }}
-{% if not unit.isTraveling %}
-{% if unit.homeVillageId == village.id %}
-=> /village/{{ village.x }}/{{ village.y }}/unit/{{ unit.type }}/location/{{ unit.getResidenceVillage().x }}/{{ unit.getResidenceVillage().y }}/recall Recall Home
-{% else %}
-=> /village/{{ village.x }}/{{ village.y }}/unit/{{ unit.type }}/location/{{ unit.getHomeVillage().x }}/{{ unit.getHomeVillage().y }}/send-back Send Back
-{% endif %}
-{% endif %}
+  ## {{ unit.type }}
+  Amount: {{ unit.amount }}
+  Origin: {{ village.get(unit.homeVillageId).name }}
+  Location: {{ not unit.isTraveling ? village.get(unit.residenceVillageId).name : '~traveling~' }}
+  Travel Time: {{ unit.getTravelTime(unit, village.getDistance(unit.getHomeVillage().x, unit.getHomeVillage().x, unit.getResidenceVillage().x, unit.getResidenceVillage().y)) | buildTime }}
+  {% if not unit.isTraveling %}
+    {% if unit.homeVillageId == village.id %}
+      => /village/{{ village.x }}/{{ village.y }}/unit/{{ unit.type }}/location/{{ unit.getResidenceVillage().x }}/{{ unit.getResidenceVillage().y }}/recall Recall Home
+    {% else %}
+      => /village/{{ village.x }}/{{ village.y }}/unit/{{ unit.type }}/location/{{ unit.getHomeVillage().x }}/{{ unit.getHomeVillage().y }}/send-back Send Back
+    {% endif %}
+  {% endif %}
 {% endfor %}
 
 
@@ -142,9 +139,9 @@ Travel Time: {{ unit.getTravelTime(unit, village.getDistance(unit.getHomeVillage
 
 
 {% if village.canSendResources(village) %}
-# Send Resources
+  # Send Resources
 
-{% include 'send-resources/01-resource-types.twig' %}
+  {% include 'send-resources/01-resource-types.twig' %}
 {% endif %}