Show treasures

questhelper/map/map_renderer.py

@@ -1,8 +1,10 @@
 import dataclasses
 
-from map.quest_map import MapEncounter, QuestMap, EncounterType, QuestPath
+from map.quest_map import MapEncounter, QuestMap, EncounterType, QuestPath, BattleEncounter
 
-from typing import List, Dict, Optional
+from typing import List, Optional
+
+from map.treasure_hoard import TreasureType, Treasure
 
 _ENCOUNTER_ICONS = {
     EncounterType.BATTLE_REGULAR: 'noun_Battle_3647629_cropped.png',
@@ -12,7 +14,7 @@ _ENCOUNTER_ICONS = {
     EncounterType.TOWN_DOCKS: 'noun_Caravel_2421659_cropped.png',
     EncounterType.TOWN_MARKET: 'noun_Store_786819_cropped.png',
     EncounterType.TOWN_LIBRARY: 'noun_Library_3820590_cropped.png',
-    EncounterType.TOWN_WORKSHOP: 'noun_cogs_442166_cropped.png',
+    EncounterType.TOWN_WORKSHOP: 'noun_Carving Tools_693475_cropped.png',
     EncounterType.TOWN_TOWN_HALL: 'noun_brussels town hall_3284349_cropped.png',
     EncounterType.TOWN_TEMPLE: 'noun_temple_2382601_cropped.png',
     EncounterType.TOWN_REST: 'noun_Tent_3814999_cropped.png',
@@ -27,6 +29,20 @@ _PATH_ICONS = {
 }
 
 
+_TREASURE_ICONS = {
+    TreasureType.GOLD: 'noun_coin_48892_cropped.png',
+    TreasureType.INK: 'noun_Ink_2509717_cropped.png',
+    TreasureType.COG: 'noun_cogs_442166_cropped.png',
+    TreasureType.DEED: 'noun_deed_3309438_cropped.png',
+    TreasureType.ART_OBJECT: 'noun_Art_3410337_cropped.png',
+    TreasureType.GEMS: 'noun_Diamond_3820185_cropped.png',
+    TreasureType.CONSUMABLE: 'noun_potion_34882_cropped.png',
+    TreasureType.NOBILITY_TITLE: 'noun_Crown_1936588_cropped.png',
+    TreasureType.LIFE: 'noun_life_3553107_cropped.png',
+    TreasureType.RELIC: 'noun_Ancient Egyptian religion_248077_cropped.png',
+}
+
+
 @dataclasses.dataclass(frozen=True)
 class RenderedElement:
     description: str
@@ -35,6 +51,14 @@ class RenderedElement:
     y: int
     w: int
     h: int
+    secondary: Optional['SecondaryRenderedElement'] = None
+
+
+@dataclasses.dataclass(frozen=True)
+class SecondaryRenderedElement(RenderedElement):
+    text: str = None
+    text_x: int = None
+    text_y: int = None
 
 
 @dataclasses.dataclass(frozen=True)
@@ -73,34 +97,46 @@ def render_map(quest_map: QuestMap) -> RenderedMap:
     return RenderedMap(rendered_encounters, rendered_paths)
 
 
+_LEFT = 20
+_TOP = 20
 _ENCOUNTER_W = 40
 _ENCOUNTER_H = 40
 _ARROW_W = 40
 _ARROW_H = 20
-_PADDING_W = 10
-_PADDING_V = 5
+_PADDING_W = 15
+_PADDING_V = 10
 _ENCOUNTER_COLUMN_W = _ENCOUNTER_W + _PADDING_W
 _PATH_COLUMN_W = _ARROW_W + _PADDING_W
 _COLUMN_W = _ENCOUNTER_COLUMN_W + _PATH_COLUMN_W
 _ROW_H = _ENCOUNTER_H + _PADDING_V + _ARROW_H + _PADDING_V
 
+_SECONDARY_W = 24
+_SECONDARY_H = 24
+_SECONDARY_PADDING = 6
+
 
 def _render_encounter(r: int, c: int, encounter: MapEncounter) -> Optional[RenderedEncounter]:
     if encounter.type == EncounterType.INACCESSIBLE:
         return None
 
     icon = f'map/{_ENCOUNTER_ICONS[encounter.type]}'
-    x = _COLUMN_W * c
-    y = _ROW_H * r
+    x = _LEFT + _COLUMN_W * c
+    y = _TOP + _ROW_H * r
     w = _ENCOUNTER_W
     h = _ENCOUNTER_H
+    if isinstance(encounter, BattleEncounter):
+        x -= (_SECONDARY_PADDING + _SECONDARY_W) / 2
+        secondary = _render_battle_encounter_secondary_info(encounter, x, y, w, h)
+    else:
+        secondary = None
     return RenderedEncounter(
         description=encounter.description,
         src=icon,
         x=x,
         y=y,
         w=w,
-        h=h
+        h=h,
+        secondary=secondary
     )
 
 
@@ -109,8 +145,8 @@ def _render_path(r: int, c: int, path: QuestPath) -> Optional[RenderedPath]:
         return None
 
     icon = f'map/{_PATH_ICONS[path]}'
-    x = _ENCOUNTER_COLUMN_W * ((c + 1) // 2) + _PATH_COLUMN_W * (c // 2)
-    y = (_ENCOUNTER_H + _PADDING_V) + _ROW_H * r
+    x = _LEFT + _ENCOUNTER_COLUMN_W * ((c + 1) // 2) + _PATH_COLUMN_W * (c // 2)
+    y = _TOP + (_ENCOUNTER_H + _PADDING_V) + _ROW_H * r
     w = _ARROW_W
     h = _ARROW_H
     return RenderedPath(
@@ -119,5 +155,21 @@ def _render_path(r: int, c: int, path: QuestPath) -> Optional[RenderedPath]:
         x=x,
         y=y,
         w=w,
-        h=h
+        h=h,
+    )
+
+
+def _render_battle_encounter_secondary_info(encounter: BattleEncounter, x, y, w, h) -> Optional[RenderedElement]:
+    treasure: Treasure = encounter.treasure_hoard.revealed
+    return SecondaryRenderedElement(
+        description=encounter.treasure_hoard.description,
+        src = f'map/{_TREASURE_ICONS[treasure.treasure_type]}',
+        x=x + w + _SECONDARY_PADDING,
+        y=y,
+        w=_SECONDARY_W,
+        h=_SECONDARY_H,
+        secondary=None,
+        text=treasure.amount,
+        text_x=x + w + _SECONDARY_PADDING,
+        text_y=y + _SECONDARY_H
     )

questhelper/map/templates/map/index.html

@@ -11,6 +11,19 @@
          style="position: absolute; left: {{e.x}}; top: {{e.y}};"
          width="{{e.w}}"
          height="{{e.h}}">
+    {% if e.secondary %}
+        {% with s=e.secondary %}
+    <img src="{% static s.src %}"
+         alt="{{s.description}}"
+         title="{{s.description}}"
+         style="position: absolute; left: {{s.x}}; top: {{s.y}};"
+         width="{{s.w}}"
+         height="{{s.h}}">
+    <div style="position: absolute; left: {{s.text_x}}; top: {{s.text_y}};">
+        {{s.text}}
+    </div>
+        {% endwith %}
+    {% endif %}
 {% endfor %}
 {% for e in map.paths %}
     <img src="{% static e.src %}"