add latest

src/assets/annoIcons/productionChainMultiplier.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="48" height="48" viewBox="0, 0, 48, 48">
-  <g id="Layer_1">
-    <path d="M45.5,24 C45.5,25.9 43.5,27.49 43.06,29.19 C42.62,30.89 43.73,33.37 42.89,34.93 C42.05,36.49 39.45,36.93 38.18,38.18 C36.91,39.43 36.55,42 34.93,42.89 C33.31,43.78 31.02,42.63 29.19,43.06 C27.36,43.49 25.9,45.5 24,45.5 C22.1,45.5 20.51,43.5 18.81,43.06 C17.11,42.62 14.63,43.73 13.07,42.89 C11.51,42.05 11.07,39.45 9.82,38.18 C8.57,36.91 6,36.55 5.11,34.93 C4.22,33.31 5.37,31.02 4.94,29.19 C4.51,27.36 2.5,25.9 2.5,24 C2.5,22.1 4.55,20.51 4.94,18.81 C5.33,17.11 4.27,14.63 5.11,13.07 C5.95,11.51 8.55,11.07 9.82,9.82 C11.09,8.57 11.45,6 13.07,5.11 C14.69,4.22 16.98,5.37 18.81,4.94 C20.64,4.51 22.1,2.5 24,2.5 C25.9,2.5 27.49,4.55 29.19,4.94 C30.89,5.33 33.37,4.27 34.93,5.11 C36.49,5.95 36.93,8.55 38.18,9.82 C39.43,11.09 42.02,11.45 42.89,13.07 C43.76,14.69 42.63,16.98 43.06,18.81 C43.49,20.64 45.5,22.1 45.5,24 z" fill-opacity="0" stroke="#906C40" stroke-width="3.91" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M29.86,16.18 L18.14,31.82" fill-opacity="0" stroke="#906C40" stroke-width="3.91" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M31.82,30.35 C31.82,31.162 31.162,31.82 30.35,31.82 C29.538,31.82 28.88,31.162 28.88,30.35 C28.88,29.538 29.538,28.88 30.35,28.88 C31.162,28.88 31.82,29.538 31.82,30.35 z" fill-opacity="0" stroke="#906C40" stroke-width="3.91" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M19.12,17.65 C19.12,18.462 18.462,19.12 17.65,19.12 C16.838,19.12 16.18,18.462 16.18,17.65 C16.18,16.838 16.838,16.18 17.65,16.18 C18.462,16.18 19.12,16.838 19.12,17.65 z" fill-opacity="0" stroke="#906C40" stroke-width="3.91" stroke-linecap="round" stroke-linejoin="round"/>
-  </g>
-</svg>

src/components/InfoCardBase.vue

@@ -6,7 +6,7 @@
       v-bind="item"
     ></InfoCardItemWorld>
     <InfoCardItem
-      v-for="item in itemData"
+      v-for="item in itemDataBase"
       :key="item.icon"
       v-bind="item"
     ></InfoCardItem>
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 import InfoCardItem from './InfoCard/InfoCardItem.vue';
 import InfoCardItemWorld from './InfoCard/InfoCardItemWorld.vue';
-import { itemData, worldItemData } from 'src/pages/data/info-card';
+import { itemDataBase, worldItemData } from 'src/pages/data/info-card';
 </script>
 
 <style lang="scss">

src/components/InfoCardExpansions.vue

@@ -0,0 +1,28 @@
+<template>
+  <q-list separator class="big-font text-left">
+    <InfoCardItem
+      v-for="item in itemDataExpansions"
+      :key="item.id"
+      v-bind="item"
+    ></InfoCardItem>
+  </q-list>
+</template>
+
+<script setup lang="ts">
+import InfoCardItem from './InfoCard/InfoCardItem.vue';
+import { itemDataExpansions } from 'src/pages/data/info-card';
+</script>
+
+<style lang="scss">
+.big-font {
+  font-size: 2rem;
+}
+
+.info-icon {
+  width: 100px;
+}
+
+.info-small-icon {
+  width: 50px;
+}
+</style>

src/pages/AnnoExpansions.vue

@@ -6,6 +6,13 @@
       <div class="flex-break item"></div>
       <div class="flex-break item"></div>
       <div class="flex-break item"></div>
+      <ChainTiers
+        title="Information"
+        class="masonry-col item"
+        :col-break="false"
+      >
+        <InfoCardExpansions></InfoCardExpansions>
+      </ChainTiers>
       <ChainTiers
         v-for="tier in productionChainsExpansions"
         :key="tier.tierName"
@@ -18,6 +25,7 @@
             v-for="chain in tier.productionChains"
             :key="chain.productionChain"
             :production-chain="chain.productionChain"
+            :chain-multiplier="chain.chainMultiplier"
             :mermaid-definition="chain.mermaidDefinition"
           ></ProductionChain>
         </div>
@@ -36,6 +44,7 @@ import { initialiseMermaid } from 'composables/mermaid';
 // Components
 import ChainTiers from 'components/ChainTiers.vue';
 import ProductionChain from 'components/ProductionChain.vue';
+import InfoCardExpansions from 'components/InfoCardExpansions.vue';
 
 initialiseMermaid();
 </script>

src/pages/data/icons.ts

@@ -3,6 +3,7 @@ import apiaryIcon from 'assets/annoIcons/Icon_beeswax_0.webp';
 import archdukeSchnitzel from 'assets/annoIcons/Archdukes_Schnitzel.webp';
 import arcticIcon from 'assets/annoIcons/Icon_session_passage_0.png';
 import artisnalKitchenIcon from 'assets/annoIcons/Goulash.webp';
+import bananaSurpriseIcon from 'assets/annoIcons/Banana_Surprise.webp';
 import bearIcon from 'assets/annoIcons/Bear_Hunting_Cabin.webp';
 import beefIcon from 'assets/annoIcons/Beef.webp';
 import bootsIcon from 'assets/annoIcons/Icon_leather_shoes_0.webp';
@@ -35,8 +36,10 @@ import copperIcon from 'assets/annoIcons/Copper.webp';
 import cornIcon from 'assets/annoIcons/Corn.webp';
 import cottonIcon from 'assets/annoIcons/Cotton.webp';
 import cottonMillIcon from 'assets/annoIcons/Cotton_fabric.webp';
+import donutFourrerIcon from 'assets/annoIcons/Donut_Fourre.webp';
 import dryHouseIcon from 'assets/annoIcons/Icon_dried_meat_0.webp';
 import dynamiteIcon from 'assets/annoIcons/Dynamite.webp';
+import eclairIcon from 'assets/annoIcons/Eclair.webp';
 import electricityIcon from 'assets/electricityBorder.webp';
 import embroidererIcon from 'assets/annoIcons/Icon_traditional_clothing_0.webp';
 import enbesaIcon from 'assets/annoIcons/Icon_session_land_of_lions_0.png';
@@ -54,6 +57,7 @@ import gasIcon from 'assets/annoIcons/Arctic_Gas.webp';
 import gasPowerPlantIcon from 'assets/annoIcons/Icon_electric_works_gas_0.webp';
 import glassesIcon from 'assets/annoIcons/Glasses.webp';
 import glassIcon from 'assets/annoIcons/Glass.webp';
+import goatMilkIcon from 'assets/annoIcons/Icon_goat_milk_0.webp';
 import goldIcon from 'assets/annoIcons/Gold.webp';
 import goldOreIcon from 'assets/annoIcons/Gold_Ore.webp';
 import gooseIcon from 'assets/annoIcons/Goose_Farm.webp';
@@ -69,6 +73,7 @@ import huskyIcon from 'assets/annoIcons/Husky_Farm.webp';
 import huskySledIcon from 'assets/annoIcons/Husky_Sled_Factory.webp';
 import indigoIcon from 'assets/annoIcons/Icon_indigo_0.webp';
 import ironIcon from 'assets/annoIcons/Iron.webp';
+import jamIcon from 'assets/annoIcons/Jam.webp';
 import jewelryIcon from 'assets/annoIcons/Jewelry.webp';
 import lanternsIcon from 'assets/annoIcons/Icon_lanterns_0.webp';
 import lemonadeIcon from 'assets/annoIcons/Lemonade.webp';
@@ -88,6 +93,7 @@ import oilPowerPlantIcon from 'assets/annoIcons/Oil_Power_Plant.webp';
 import oilTankerIcon from 'assets/annoIcons/Oil_tanker.webp';
 import oilWellIcon from 'assets/annoIcons/OilWell.webp';
 import oldWorldIcon from 'assets/annoIcons/Icon_session_moderate_0.png';
+import palmierBiscuitIcon from 'assets/annoIcons/Palmier_Biscuit.webp';
 import paperIcon from 'assets/annoIcons/Icon_paper_0.webp';
 import parkasIcon from 'assets/annoIcons/Parka_Factory.webp';
 import pearlsIcon from 'assets/annoIcons/Pearls.webp';
@@ -134,6 +140,7 @@ import tobaccoIcon from 'assets/annoIcons/Tobacco.webp';
 import tortillasIcon from 'assets/annoIcons/Tortilla.webp';
 import tractorIcon from 'assets/annoIcons/TractorBarn.webp';
 import venisonEnCrouteIcon from 'assets/annoIcons/Venison_en_Croute.webp';
+import venisonTartareIcon from 'assets/annoIcons/Venison_Tartare.webp';
 import watIcon from 'assets/annoIcons/Icon_wat_stew_0.webp';
 import weaponsIcon from 'assets/annoIcons/Weapons.webp';
 import whalingIcon from 'assets/annoIcons/Whaling_Station.webp';
@@ -149,6 +156,7 @@ export {
   archdukeSchnitzel,
   arcticIcon,
   artisnalKitchenIcon,
+  bananaSurpriseIcon,
   bearIcon,
   beefIcon,
   bootsIcon,
@@ -181,8 +189,10 @@ export {
   cornIcon,
   cottonIcon,
   cottonMillIcon,
+  donutFourrerIcon,
   dryHouseIcon,
   dynamiteIcon,
+  eclairIcon,
   electricityIcon,
   embroidererIcon,
   enbesaIcon,
@@ -200,6 +210,7 @@ export {
   gasPowerPlantIcon,
   glassesIcon,
   glassIcon,
+  goatMilkIcon,
   goldIcon,
   goldOreIcon,
   gooseIcon,
@@ -215,6 +226,7 @@ export {
   huskySledIcon,
   indigoIcon,
   ironIcon,
+  jamIcon,
   jewelryIcon,
   lanternsIcon,
   lemonadeIcon,
@@ -234,6 +246,7 @@ export {
   oilTankerIcon,
   oilWellIcon,
   oldWorldIcon,
+  palmierBiscuitIcon,
   paperIcon,
   parkasIcon,
   pearlsIcon,
@@ -280,6 +293,7 @@ export {
   tortillasIcon,
   tractorIcon,
   venisonEnCrouteIcon,
+  venisonTartareIcon,
   watIcon,
   weaponsIcon,
   whalingIcon,

src/pages/data/info-card.ts

@@ -1,34 +1,51 @@
 import * as icons from './icons';
 import fullChainMultiplierIcon from 'assets/productionChainMultiplier.svg';
+import { InfoCardItem, InfoCardWorldItem } from './models';
 
-export const worldItemData = [
+export const worldItemData: InfoCardWorldItem[] = [
   {
+    id: 'furs',
     icon: icons.fursIcon,
-    worldIcon: icons.oldWorldIcon,
+    text: 'Furs use Old World',
-    text: 'Furs use Old World'
+    worldIcon: icons.oldWorldIcon
   },
   {
+    id: 'clay',
     icon: icons.clayIcon,
-    worldIcon: icons.oldWorldIcon,
+    text: 'Clay uses Old World',
-    text: 'Clay uses Old World'
+    worldIcon: icons.oldWorldIcon
   },
   {
+    id: 'gold',
     icon: icons.goldOreIcon,
-    worldIcon: icons.newWorldIcon,
+    text: 'Gold mines use New World',
-    text: 'Gold mines use New World'
+    worldIcon: icons.newWorldIcon
   }
 ];
 
-export const itemData = [
+export const itemDataBase: InfoCardItem[] = [
   {
+    id: 'charcoal',
     icon: icons.charcoalKilnIcon,
     text: '2 Charcoal Kilns can be replaced with 1 Coal Mine'
   },
   {
+    id: 'electricity',
     icon: icons.electricityIcon,
     text: 'Building has electricity'
   },
   {
+    id: 'fullChain',
+    icon: fullChainMultiplierIcon,
+    text: 'Multiplier for a full chain. To scale chain to 100%:',
+    additionalText:
+      'multiply together number * efficiency * multiplier for each building in the chain.'
+  }
+];
+
+export const itemDataExpansions: InfoCardItem[] = [
+  {
+    id: 'fullChain',
     icon: fullChainMultiplierIcon,
     text: 'Multiplier for a full chain. To scale chain to 100%:',
     additionalText:

src/pages/data/models.ts

@@ -9,3 +9,17 @@ export interface ProductionChain {
   chainMultiplier?: string;
   mermaidDefinition: string;
 }
+
+export interface InfoCardItem {
+  id: string;
+  icon: string;
+  text: string;
+  additionalText?: string;
+}
+
+export interface InfoCardWorldItem {
+  id: string;
+  icon: string;
+  text: string;
+  worldIcon: string;
+}

src/pages/data/production-chains-expansions.ts

@@ -111,6 +111,7 @@ export const productionChainsExpansions: TieredProductionChain[] = [
     productionChains: [
       {
         productionChain: 'archdukeSchnitzel',
+        chainMultiplier: '2',
         mermaidDefinition: endent`
         flowchart LR
         Pigs0(<img src='${icons.pigsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
@@ -137,6 +138,7 @@ export const productionChainsExpansions: TieredProductionChain[] = [
       },
       {
         productionChain: 'fishFrites',
+        chainMultiplier: '2',
         mermaidDefinition: endent`
         flowchart LR
         Fish(<span class='icon-flex-row'><img src='${icons.fishIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
@@ -148,6 +150,7 @@ export const productionChainsExpansions: TieredProductionChain[] = [
       },
       {
         productionChain: 'venisonEnCroute',
+        chainMultiplier: '2',
         mermaidDefinition: endent`
         flowchart LR
         Grain(<img src='${icons.grainIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
@@ -162,6 +165,7 @@ export const productionChainsExpansions: TieredProductionChain[] = [
       },
       {
         productionChain: 'lobsterCheminee',
+        chainMultiplier: '2',
         mermaidDefinition: endent`
         flowchart LR
         Lobster(<img src='${icons.lobstersIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
@@ -172,5 +176,93 @@ export const productionChainsExpansions: TieredProductionChain[] = [
         `
       }
     ]
+  },
+  {
+    colBreak: false,
+    tierName: 'Café',
+    productionChains: [
+      {
+        productionChain: 'donut',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Grain(<img src='${icons.grainIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Flour(<span class='icon-flex-row'><img src='${icons.flourIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Donut(<img src='${icons.donutFourrerIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Pig(<img src='${icons.pigsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Tallow(<img src='${icons.tallowIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Jam(<span class='icon-flex-row'><img src='${icons.jamIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Grain --> Flour --> Donut
+        Pig --> Tallow --> Donut
+        Jam --> Donut
+        `
+      },
+      {
+        productionChain: 'eclair',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Grain(<img src='${icons.grainIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Flour(<span class='icon-flex-row'><img src='${icons.flourIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Eclair(<img src='${icons.eclairIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        SugarCane0(<span class='icon-flex-row'><img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Sugar0(<span class='icon-flex-row'><img src='${icons.sugarIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        SugarCane1(<span class='icon-flex-row'><img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Sugar1(<span class='icon-flex-row'><img src='${icons.sugarIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Cocoa(<img src='${icons.cocoaIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Chocolate(<span class='icon-flex-row'><img src='${icons.chocolateIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Grain --> Flour --> Eclair
+        SugarCane0 --> Sugar0 --> Eclair
+        SugarCane1 --> Sugar1 --> Chocolate
+        Cocoa --> Chocolate
+        Chocolate --> Eclair
+        `
+      },
+      {
+        productionChain: 'palmierBiscuit',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Grain(<img src='${icons.grainIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Flour(<span class='icon-flex-row'><img src='${icons.flourIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        PalmierBiscuit(<img src='${icons.palmierBiscuitIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Pig(<img src='${icons.pigsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Tallow(<img src='${icons.tallowIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Cinnamon(<span class='icon-flex-row'><img src='${icons.cinnamonIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Grain --> Flour --> PalmierBiscuit
+        Pig --> Tallow --> PalmierBiscuit
+        Cinnamon --> PalmierBiscuit
+        `
+      },
+      {
+        productionChain: 'venisonTartare',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Grapes(<img src='${icons.grapesIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
+        VenisonTartare(<img src='${icons.venisonTartareIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Caribou(<img src='${icons.caribouIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Citrus(<span class='icon-flex-row'><img src='${icons.citrusIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Grapes & Caribou & Citrus --> VenisonTartare
+        `
+      },
+      {
+        productionChain: 'bananaSurprise',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Goat(<img src='${icons.goatMilkIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Plantains(<span class='icon-flex-row'><img src='${icons.plantainPlantationIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Cinnamon(<span class='icon-flex-row'><img src='${icons.cinnamonIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        BananaSurprise(<img src='${icons.bananaSurpriseIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Goat & Plantains & Cinnamon --> BananaSurprise
+        `
+      }
+    ]
+  },
+  {
+    colBreak: false,
+    tierName: 'Bar',
+    productionChains: []
   }
 ];