diff --git a/src/assets/annoIcons/Banana_Surprise.webp b/src/assets/annoIcons/Banana_Surprise.webp
new file mode 100644
index 0000000..210adfb
Binary files /dev/null and b/src/assets/annoIcons/Banana_Surprise.webp differ
diff --git a/src/assets/annoIcons/Black_Muscovy.webp b/src/assets/annoIcons/Black_Muscovy.webp
new file mode 100644
index 0000000..8061010
Binary files /dev/null and b/src/assets/annoIcons/Black_Muscovy.webp differ
diff --git a/src/assets/annoIcons/Daiquiri_Tropic.webp b/src/assets/annoIcons/Daiquiri_Tropic.webp
new file mode 100644
index 0000000..7fc8dfd
Binary files /dev/null and b/src/assets/annoIcons/Daiquiri_Tropic.webp differ
diff --git a/src/assets/annoIcons/Donut_Fourre.webp b/src/assets/annoIcons/Donut_Fourre.webp
new file mode 100644
index 0000000..77bcf5e
Binary files /dev/null and b/src/assets/annoIcons/Donut_Fourre.webp differ
diff --git a/src/assets/annoIcons/Eclair.webp b/src/assets/annoIcons/Eclair.webp
new file mode 100644
index 0000000..35bdae7
Binary files /dev/null and b/src/assets/annoIcons/Eclair.webp differ
diff --git a/src/assets/annoIcons/Enbesa_Sunrise.webp b/src/assets/annoIcons/Enbesa_Sunrise.webp
new file mode 100644
index 0000000..55d0995
Binary files /dev/null and b/src/assets/annoIcons/Enbesa_Sunrise.webp differ
diff --git a/src/assets/annoIcons/Glogg.webp b/src/assets/annoIcons/Glogg.webp
new file mode 100644
index 0000000..7bc5ce5
Binary files /dev/null and b/src/assets/annoIcons/Glogg.webp differ
diff --git a/src/assets/annoIcons/Icon_goat_milk_0.webp b/src/assets/annoIcons/Icon_goat_milk_0.webp
new file mode 100644
index 0000000..21e2ace
Binary files /dev/null and b/src/assets/annoIcons/Icon_goat_milk_0.webp differ
diff --git a/src/assets/annoIcons/Jam.webp b/src/assets/annoIcons/Jam.webp
new file mode 100644
index 0000000..e5d5d17
Binary files /dev/null and b/src/assets/annoIcons/Jam.webp differ
diff --git a/src/assets/annoIcons/Montmartre_75.webp b/src/assets/annoIcons/Montmartre_75.webp
new file mode 100644
index 0000000..e9fe7f1
Binary files /dev/null and b/src/assets/annoIcons/Montmartre_75.webp differ
diff --git a/src/assets/annoIcons/Palmier_Biscuit.webp b/src/assets/annoIcons/Palmier_Biscuit.webp
new file mode 100644
index 0000000..c97af4e
Binary files /dev/null and b/src/assets/annoIcons/Palmier_Biscuit.webp differ
diff --git a/src/assets/annoIcons/Venison_Tartare.webp b/src/assets/annoIcons/Venison_Tartare.webp
new file mode 100644
index 0000000..071368f
Binary files /dev/null and b/src/assets/annoIcons/Venison_Tartare.webp differ
diff --git a/src/assets/annoIcons/productionChainMultiplier.svg b/src/assets/annoIcons/productionChainMultiplier.svg
deleted file mode 100644
index 5880a33..0000000
--- a/src/assets/annoIcons/productionChainMultiplier.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/src/components/InfoCardBase.vue b/src/components/InfoCardBase.vue
index d1fc9c8..6fda4e9 100644
--- a/src/components/InfoCardBase.vue
+++ b/src/components/InfoCardBase.vue
@@ -6,7 +6,7 @@
v-bind="item"
>
@@ -16,7 +16,7 @@
diff --git a/src/pages/AnnoExpansions.vue b/src/pages/AnnoExpansions.vue
index 586e50c..8b3bb61 100644
--- a/src/pages/AnnoExpansions.vue
+++ b/src/pages/AnnoExpansions.vue
@@ -6,6 +6,13 @@
+
+
+
@@ -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();
diff --git a/src/pages/data/icons.ts b/src/pages/data/icons.ts
index 30f8682..ed7d23f 100644
--- a/src/pages/data/icons.ts
+++ b/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,
diff --git a/src/pages/data/info-card.ts b/src/pages/data/info-card.ts
index 25bcaa9..7672af8 100644
--- a/src/pages/data/info-card.ts
+++ b/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:
diff --git a/src/pages/data/models.ts b/src/pages/data/models.ts
index 6c9e8e1..46c6801 100644
--- a/src/pages/data/models.ts
+++ b/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;
+}
diff --git a/src/pages/data/production-chains-expansions.ts b/src/pages/data/production-chains-expansions.ts
index da58a0c..5f609b8 100644
--- a/src/pages/data/production-chains-expansions.ts
+++ b/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(
1)
@@ -137,6 +138,7 @@ export const productionChainsExpansions: TieredProductionChain[] = [
},
{
productionChain: 'fishFrites',
+ chainMultiplier: '2',
mermaidDefinition: endent`
flowchart LR
Fish(
50%1)
@@ -148,6 +150,7 @@ export const productionChainsExpansions: TieredProductionChain[] = [
},
{
productionChain: 'venisonEnCroute',
+ chainMultiplier: '2',
mermaidDefinition: endent`
flowchart LR
Grain(
1)
@@ -162,6 +165,7 @@ export const productionChainsExpansions: TieredProductionChain[] = [
},
{
productionChain: 'lobsterCheminee',
+ chainMultiplier: '2',
mermaidDefinition: endent`
flowchart LR
Lobster(
1)
@@ -172,5 +176,93 @@ export const productionChainsExpansions: TieredProductionChain[] = [
`
}
]
+ },
+ {
+ colBreak: false,
+ tierName: 'Café',
+ productionChains: [
+ {
+ productionChain: 'donut',
+ chainMultiplier: '2',
+ mermaidDefinition: endent`
+ flowchart LR
+ Grain(1)
+ Flour(
50%1)
+ Donut(
1)
+ Pig(1)
+ Tallow(
1)
+ Jam(
50%1)
+ Grain --> Flour --> Donut
+ Pig --> Tallow --> Donut
+ Jam --> Donut
+ `
+ },
+ {
+ productionChain: 'eclair',
+ chainMultiplier: '2',
+ mermaidDefinition: endent`
+ flowchart LR
+ Grain(1)
+ Flour(50%1)
+ Eclair(
1)
+ SugarCane0(
50%1)
+ Sugar0(
50%1)
+ SugarCane1(50%1)
+ Sugar1(50%1)
+ Cocoa(
1)
+ Chocolate(
50%1)
+ Grain --> Flour --> Eclair
+ SugarCane0 --> Sugar0 --> Eclair
+ SugarCane1 --> Sugar1 --> Chocolate
+ Cocoa --> Chocolate
+ Chocolate --> Eclair
+ `
+ },
+ {
+ productionChain: 'palmierBiscuit',
+ chainMultiplier: '2',
+ mermaidDefinition: endent`
+ flowchart LR
+ Grain(1)
+ Flour(50%1)
+ PalmierBiscuit(
1)
+ Pig(1)
+ Tallow(1)
+ Cinnamon(
50%1)
+ Grain --> Flour --> PalmierBiscuit
+ Pig --> Tallow --> PalmierBiscuit
+ Cinnamon --> PalmierBiscuit
+ `
+ },
+ {
+ productionChain: 'venisonTartare',
+ chainMultiplier: '2',
+ mermaidDefinition: endent`
+ flowchart LR
+ Grapes(
2)
+ VenisonTartare(
1)
+ Caribou(
1)
+ Citrus(
50%1)
+ Grapes & Caribou & Citrus --> VenisonTartare
+ `
+ },
+ {
+ productionChain: 'bananaSurprise',
+ chainMultiplier: '2',
+ mermaidDefinition: endent`
+ flowchart LR
+ Goat(
1)
+ Plantains(
50%1)
+ Cinnamon(50%1)
+ BananaSurprise(
1)
+ Goat & Plantains & Cinnamon --> BananaSurprise
+ `
+ }
+ ]
+ },
+ {
+ colBreak: false,
+ tierName: 'Bar',
+ productionChains: []
}
];