From 65d8fddd3685f618f24cec542d2a397e183cae74 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Mon, 11 Dec 2023 22:47:05 +0000 Subject: [PATCH] add latest --- src/assets/annoIcons/Absinthe.webp | Bin 0 -> 9140 bytes src/assets/annoIcons/Cone_OCopia.webp | Bin 0 -> 8872 bytes src/assets/annoIcons/Empanadas.webp | Bin 0 -> 9372 bytes src/components/InfoCard.vue | 20 +- ...temWorld.vue => InfoCardItemWorldIcon.vue} | 0 src/pages/AnnoBase.vue | 13 +- src/pages/AnnoMisc.vue | 2 +- src/pages/AnnoSeason3.vue | 2 +- src/pages/data/icons.ts | 6 + src/pages/data/info-card.ts | 162 +++++++----- src/pages/data/models.ts | 2 +- src/pages/data/production-chains-base.ts | 156 +++-------- src/pages/data/production-chains-misc.ts | 246 ++++++++++++------ src/pages/data/production-chains-season-2.ts | 10 +- src/pages/data/production-chains-season-3.ts | 43 +++ src/pages/data/production-chains-season-4.ts | 18 +- 16 files changed, 381 insertions(+), 299 deletions(-) create mode 100644 src/assets/annoIcons/Absinthe.webp create mode 100644 src/assets/annoIcons/Cone_OCopia.webp create mode 100644 src/assets/annoIcons/Empanadas.webp rename src/components/InfoCard/{InfoCardItemWorld.vue => InfoCardItemWorldIcon.vue} (100%) diff --git a/src/assets/annoIcons/Absinthe.webp b/src/assets/annoIcons/Absinthe.webp new file mode 100644 index 0000000000000000000000000000000000000000..a8ecad8d4ac3097530f463bbb3166568cdf0ffb8 GIT binary patch literal 9140 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 literal 0 HcmV?d00001 diff --git a/src/assets/annoIcons/Cone_OCopia.webp b/src/assets/annoIcons/Cone_OCopia.webp new file mode 100644 index 0000000000000000000000000000000000000000..71943d035bc4d38106a2317c191b0345f1796486 GIT binary patch literal 8872 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 WOfHYxC;;9h6H9;<%m4rY0000zQbrO0 literal 0 HcmV?d00001 diff --git a/src/components/InfoCard.vue b/src/components/InfoCard.vue index f297eb6..425209a 100644 --- a/src/components/InfoCard.vue +++ b/src/components/InfoCard.vue @@ -1,30 +1,30 @@ diff --git a/src/components/InfoCard/InfoCardItemWorld.vue b/src/components/InfoCard/InfoCardItemWorldIcon.vue similarity index 100% rename from src/components/InfoCard/InfoCardItemWorld.vue rename to src/components/InfoCard/InfoCardItemWorldIcon.vue diff --git a/src/pages/AnnoBase.vue b/src/pages/AnnoBase.vue index c39611c..402d135 100644 --- a/src/pages/AnnoBase.vue +++ b/src/pages/AnnoBase.vue @@ -5,15 +5,14 @@
-
@@ -53,7 +52,7 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; import { productionChainsBase } from './data/production-chains-base'; // Info Card Data -import { itemDataBase, worldItemDataBase } from 'src/pages/data/info-card'; +import { baseItemData, baseItemWorldData } from 'src/pages/data/info-card'; // Icons import * as icons from './data/icons'; @@ -71,7 +70,7 @@ const expansionInfoItem = ref({ diff --git a/src/pages/AnnoMisc.vue b/src/pages/AnnoMisc.vue index 4de392b..ea768cc 100644 --- a/src/pages/AnnoMisc.vue +++ b/src/pages/AnnoMisc.vue @@ -82,7 +82,7 @@ $column: 3; } .masonry-container { - height: 3900px; + height: 4150px; .masonry-col { width: 1000px; diff --git a/src/pages/AnnoSeason3.vue b/src/pages/AnnoSeason3.vue index 680c70c..2e80d3f 100644 --- a/src/pages/AnnoSeason3.vue +++ b/src/pages/AnnoSeason3.vue @@ -83,7 +83,7 @@ $column: 4; } .masonry-container { - height: 7690px; + height: 8250px; .masonry-col { width: 1000px; diff --git a/src/pages/data/icons.ts b/src/pages/data/icons.ts index c72de79..bc94f83 100644 --- a/src/pages/data/icons.ts +++ b/src/pages/data/icons.ts @@ -1,3 +1,4 @@ +import absintheIcon from 'assets/annoIcons/Absinthe.webp'; import ageOfExplorationIcon from 'assets/annoIcons/Age_of_Exploration.webp'; import airshipIcon from 'assets/annoIcons/Airship.webp'; import alpacaWoolIcon from 'assets/annoIcons/Alpaca_wool.webp'; @@ -51,6 +52,7 @@ import coffeeBeansIcon from 'assets/annoIcons/Coffee_beans.webp'; import coffeeIcon from 'assets/annoIcons/Coffee.webp'; import cognacIcon from 'assets/annoIcons/Cognac.webp'; import concreteFactory from 'assets/annoIcons/Reinforced_concrete.webp'; +import coneocopiaIcon from 'assets/annoIcons/Cone_OCopia.webp'; import copperIcon from 'assets/annoIcons/Copper.webp'; import costumeIcon from 'assets/annoIcons/Costumes.webp'; import cornIcon from 'assets/annoIcons/Corn.webp'; @@ -68,6 +70,7 @@ import electricCablesIcon from 'assets/annoIcons/Electric_Cables.webp'; import electricityIcon from 'assets/electricityBorder.webp'; import elevatorIcon from 'assets/annoIcons/Elevators.webp'; import embroidererIcon from 'assets/annoIcons/Icon_traditional_clothing_0.webp'; +import empanadasIcon from 'assets/annoIcons/Empanadas.webp'; import empireOfTheSkiesIcon from 'assets/annoIcons/Empire_of_the_Skies_DLC_icon.webp'; import enbesaIcon from 'assets/annoIcons/Icon_session_land_of_lions_0.png'; import enbesaSunriseIcon from 'assets/annoIcons/Enbesa_Sunrise.webp'; @@ -237,6 +240,7 @@ import writingDesksIcon from 'assets/annoIcons/Writing_Desks.webp'; import zincIcon from 'assets/annoIcons/Zinc.webp'; export { + absintheIcon, ageOfExplorationIcon, airshipIcon, alpacaWoolIcon, @@ -290,6 +294,7 @@ export { coffeeIcon, cognacIcon, concreteFactory, + coneocopiaIcon, copperIcon, cornIcon, cottonIcon, @@ -307,6 +312,7 @@ export { electricityIcon, elevatorIcon, embroidererIcon, + empanadasIcon, empireOfTheSkiesIcon, enbesaIcon, enbesaSunriseIcon, diff --git a/src/pages/data/info-card.ts b/src/pages/data/info-card.ts index e369f50..f775545 100644 --- a/src/pages/data/info-card.ts +++ b/src/pages/data/info-card.ts @@ -1,74 +1,40 @@ import * as icons from './icons'; import fullChainMultiplierIcon from 'assets/productionChainMultiplier.svg'; -import { InfoCardItem, InfoCardWorldItem } from './models'; +import { InfoCardItem, InfoCardItemWorldIcon } from './models'; // Common items -export const commonItemData: InfoCardItem[] = [ - { - id: 'charcoal', - icon: icons.charcoalKilnIcon, - text: '2 Charcoal Kilns can be replaced with 1 Coal Mine.' - }, - { - id: 'airship', - icon: icons.airshipIcon, - text: 'Airship drop chain ratios are the same for Old World & New World.' - }, - { - id: 'electricity', - icon: icons.electricityIcon, - text: 'Building requires electricity.' - }, - { - id: 'fullChain', - icon: fullChainMultiplierIcon, - text: 'The multiplier for a full chain. To scale chain to 100% multiply together (for every item in the chain): ', - additionalText: ' number of buildings × efficiency % × multiplier' - } -]; +// export const commonItemData: InfoCardItem[] = [ +// { +// id: 'charcoal', +// icon: icons.charcoalKilnIcon, +// text: '2 Charcoal Kilns can be replaced with 1 Coal Mine.' +// }, +// { +// id: 'airship', +// icon: icons.airshipIcon, +// text: 'Airship drop chain ratios are the same for Old World & New World.' +// }, +// { +// id: 'electricity', +// icon: icons.electricityIcon, +// text: 'Building requires electricity.' +// }, +// { +// id: 'fullChain', +// icon: fullChainMultiplierIcon, +// text: 'The multiplier for a full chain. To scale chain to 100% multiply together (for every item in the chain): ', +// additionalText: ' number of buildings × efficiency % × multiplier' +// } +// ]; -const commonWorldItemData: InfoCardWorldItem[] = [ - { - id: 'gold', - icon: icons.goldOreIcon, - textPre: 'Gold mines use New World', - textPost: 'production rates.', - worldIcon: icons.newWorldIcon - }, - { - id: 'hacienda', - icon: icons.haciendaIcon, - textPre: 'Hacienda chains use New World', - textPost: 'buildings.', - worldIcon: icons.newWorldIcon - } -]; - -export const itemDataBase: InfoCardItem[] = [...commonItemData]; - -export const worldItemDataBase: InfoCardWorldItem[] = [ - ...commonWorldItemData, - { - id: 'furs', - icon: icons.fursIcon, - textPre: 'Furs use Old World', - textPost: 'production rates.', - worldIcon: icons.oldWorldIcon - }, - { - id: 'clay', - icon: icons.clayIcon, - textPre: 'Enbesa', - textPost: ' production chains use Clay Collectors.', - worldIcon: icons.enbesaIcon - } -]; - -// S2 to S4 -// export const itemDataExpansions: InfoCardItem[] = [, ...commonItemData]; - -// export const worldItemDataExpansions: InfoCardWorldItem[] = [ -// ...commonWorldItemData, +// const commonWorldItemData: InfoCardItemWorldIcon[] = [ +// { +// id: 'gold', +// icon: icons.goldOreIcon, +// textPre: 'Gold mines use New World', +// textPost: 'production rates.', +// worldIcon: icons.newWorldIcon +// }, // { // id: 'hacienda', // icon: icons.haciendaIcon, @@ -77,3 +43,67 @@ export const worldItemDataBase: InfoCardWorldItem[] = [ // worldIcon: icons.newWorldIcon // } // ]; + +// export const itemDataBase: InfoCardItem[] = [...commonItemData]; + +// export const worldItemDataBase: InfoCardItemWorldIcon[] = [ +// ...commonWorldItemData, +// { +// id: 'furs', +// icon: icons.fursIcon, +// textPre: 'Furs use Old World', +// textPost: 'production rates.', +// worldIcon: icons.oldWorldIcon +// }, +// { +// id: 'clay', +// icon: icons.clayIcon, +// textPre: 'Enbesa', +// textPost: ' production chains use Clay Collectors.', +// worldIcon: icons.enbesaIcon +// } +// ]; + +// Base +export const baseItemData: InfoCardItem[] = [ + { + id: 'charcoal', + icon: icons.charcoalKilnIcon, + text: '2 Charcoal Kilns can be replaced with 1 Coal Mine.' + }, + { + id: 'electricity', + icon: icons.electricityIcon, + text: 'Building requires electricity.' + } +]; + +export const baseItemWorldData: InfoCardItemWorldIcon[] = [ + { + id: 'furs', + icon: icons.fursIcon, + textPre: 'Furs use Old World', + textPost: 'production rates.', + worldIcon: icons.oldWorldIcon + } +]; + +// Misc +export const miscItemData: InfoCardItem[] = []; +export const miscItemWorldData: InfoCardItemWorldIcon[] = []; + +// S1 +export const season1ItemData: InfoCardItem[] = []; +export const season1ItemWorldData: InfoCardItemWorldIcon[] = []; + +// S2 +export const season2ItemData: InfoCardItem[] = []; +export const season2ItemWorldData: InfoCardItemWorldIcon[] = []; + +// S3 +export const season3ItemData: InfoCardItem[] = []; +export const season3ItemWorldData: InfoCardItemWorldIcon[] = []; + +// S4 +export const season4ItemData: InfoCardItem[] = []; +export const season4ItemWorldData: InfoCardItemWorldIcon[] = []; diff --git a/src/pages/data/models.ts b/src/pages/data/models.ts index c648ca6..a26d5d6 100644 --- a/src/pages/data/models.ts +++ b/src/pages/data/models.ts @@ -17,7 +17,7 @@ export interface InfoCardItem { additionalText?: string; } -export interface InfoCardWorldItem { +export interface InfoCardItemWorldIcon { id: string; icon: string; textPre: string; diff --git a/src/pages/data/production-chains-base.ts b/src/pages/data/production-chains-base.ts index 0652508..0dc6fea 100644 --- a/src/pages/data/production-chains-base.ts +++ b/src/pages/data/production-chains-base.ts @@ -28,7 +28,6 @@ export const productionChainsBase: TieredProductionChain[] = [ }, { productionChain: 'sausages', - chainMultiplier: '2', mermaidDefinition: endent` flowchart LR Pig(1) @@ -81,11 +80,11 @@ export const productionChainsBase: TieredProductionChain[] = [ chainMultiplier: '6', mermaidDefinition: endent` flowchart LR - Beef(66.66%2) - RedPepper(66.66%2) - ArtisnalKitchen(66.66%2) + Beef(66.67%2) + RedPepper(66.67%2) + ArtisnalKitchen(66.67%2) Cannery(1) - Iron(16.66%1) + Iron(16.67%1) Beef & RedPepper --> ArtisnalKitchen --> Cannery Iron --> Cannery ` @@ -104,17 +103,6 @@ export const productionChainsBase: TieredProductionChain[] = [ Wood --> SewingMachines ` }, - { - productionChain: 'rum', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - SugarCane(1) - Wood(50%1) - Rum(1) - SugarCane & Wood --> Rum - ` - }, { productionChain: 'furs', mermaidDefinition: endent` @@ -157,7 +145,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Glasses(1) Copper(33.33%1) Zinc(33.33%1) - Brass(66.66%1) + Brass(66.67%1) Sand --> Glass --> Glasses Copper & Zinc --> Brass --> Glasses ` @@ -169,10 +157,10 @@ export const productionChainsBase: TieredProductionChain[] = [ flowchart LR GoldOre(83.33%4) Coal(33.33%1) - Gold(66.66%2) + Gold(66.67%2) PocketWatches(1) - Sand(66.66%1) - Glass(66.66%1) + Sand(66.67%1) + Glass(66.67%1) style PocketWatches stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; GoldOre & Coal --> Gold --> PocketWatches Sand --> Glass --> PocketWatches @@ -210,6 +198,22 @@ export const productionChainsBase: TieredProductionChain[] = [ Grapes --> Champagne ` }, + { + productionChain: 'steamCarriages', + mermaidDefinition: endent` + flowchart LR + SteamMotors(3) + SteamCarriages(2) + Wood(1) + Caoutchouc(4) + Coaches(8) + SteamCarriages + style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 + style SteamCarriages stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 + SteamMotors --> SteamCarriages + Wood & Caoutchouc --> Coaches --> SteamCarriages + ` + }, { productionChain: 'jewelry', mermaidDefinition: endent` @@ -245,6 +249,17 @@ export const productionChainsBase: TieredProductionChain[] = [ colBreak: false, tierName: 'Jornaleros | Obreros', productionChains: [ + { + productionChain: 'rum', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + SugarCane(1) + Wood(50%1) + Rum(1) + SugarCane & Wood --> Rum + ` + }, { productionChain: 'plantains', mermaidDefinition: endent` @@ -322,106 +337,5 @@ export const productionChainsBase: TieredProductionChain[] = [ ` } ] - }, - { - colBreak: false, - tierName: 'Machinery', - productionChains: [ - { - productionChain: 'steamMotors', - mermaidDefinition: endent` - flowchart LR - Coal(1) - Iron(1) - Steel(2) - SteamMotors(3) - Copper(2) - Zinc(2) - Brass(4) - style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 - Coal & Iron --> Steel --> SteamMotors - Copper & Zinc --> Brass --> SteamMotors - ` - }, - { - productionChain: 'steamCarriages', - mermaidDefinition: endent` - flowchart LR - SteamMotors(3) - SteamCarriages(2) - Wood(1) - Caoutchouc(4) - Coaches(8) - SteamCarriages - style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 - style SteamCarriages stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 - SteamMotors --> SteamCarriages - Wood & Caoutchouc --> Coaches --> SteamCarriages - ` - } - ] - }, - { - colBreak: false, - tierName: 'Weapons', - productionChains: [ - { - productionChain: 'weapons', - chainMultiplier: '6', - mermaidDefinition: endent` - flowchart LR - CharcoalKiln(33.33%1) - Iron(16.66%1) - Steel(33.33%1) - Weapons(1) - CharcoalKiln & Iron --> Steel --> Weapons - ` - }, - { - productionChain: 'heavyWeapons', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - Saltpeter(2) - Dynamite(1) - HeavyWeapons(1) - Pig(1) - Tallow(1) - Dynamite - Charcoal(50%1) - Iron(25%1) - Steel(50%1) - style HeavyWeapons stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 - Saltpeter --> Dynamite --> HeavyWeapons - Pig --> Tallow --> Dynamite - Charcoal & Iron --> Steel --> HeavyWeapons - ` - } - ] - }, - { - colBreak: false, - tierName: 'Sails', - productionChains: [ - { - productionChain: 'oldWorldSails', - mermaidDefinition: endent` - flowchart LR - Wool(1) - Sailmakers(1) - Wool --> Sailmakers - ` - }, - { - productionChain: 'newWorldSails', - mermaidDefinition: endent` - flowchart LR - Cotton(2) - CottonMill(1) - Sailmakers(1) - Cotton --> CottonMill --> Sailmakers - ` - } - ] } ]; diff --git a/src/pages/data/production-chains-misc.ts b/src/pages/data/production-chains-misc.ts index 9a7253e..bd02c5e 100644 --- a/src/pages/data/production-chains-misc.ts +++ b/src/pages/data/production-chains-misc.ts @@ -4,6 +4,81 @@ import * as icons from './icons'; // Production Chains export const productionChainsMisc: TieredProductionChain[] = [ + { + colBreak: false, + tierName: 'Region Ratios', + productionChains: [ + { + productionChain: 'coalRatio', + mermaidDefinition: endent` + flowchart LR + Coal(1) + Charcoal(2) + Coal --> Charcoal + ` + }, + { + productionChain: 'goldRatio', + mermaidDefinition: endent` + flowchart LR + ArcticGold(1) + NewWorldGold(2.5) + ArcticGold --> NewWorldGold + ` + }, + { + productionChain: 'furRatio', + mermaidDefinition: endent` + flowchart LR + ArcticFur(1) + OldWorldFur(4) + ArcticFur --> OldWorldFur + ` + }, + { + productionChain: 'clayRatio', + mermaidDefinition: endent` + flowchart LR + EnbesaClay(1) + OldWorldClay(2) + EnbesaClay --> OldWorldClay + ` + } + ] + }, + { + colBreak: false, + tierName: 'Electricity', + productionChains: [ + { + productionChain: 'oilPowerPlant', + mermaidDefinition: endent` + flowchart LR + OilWell(3) + OilPowerPlant(1) + OilWell --> OilPowerPlant + ` + }, + { + productionChain: 'oilTanker', + mermaidDefinition: endent` + flowchart LR + OilTanker(1) + OilPowerPlant(2-3) + OilTanker --> OilPowerPlant + ` + }, + { + productionChain: 'gasPowerPlant', + mermaidDefinition: endent` + flowchart LR + Gas(6) + GasPlant(1) + Gas --> GasPlant + ` + } + ] + }, { colBreak: false, tierName: 'Building Materials | Construction', @@ -32,9 +107,9 @@ export const productionChainsMisc: TieredProductionChain[] = [ chainMultiplier: '3', mermaidDefinition: endent` flowchart LR - CharcoalKiln(66.66%1) + CharcoalKiln(66.67%1) Iron(33.33%1) - Steel(66.66%1) + Steel(66.67%1) SteelBeams(1) CharcoalKiln & Iron --> Steel --> SteelBeams ` @@ -120,82 +195,6 @@ export const productionChainsMisc: TieredProductionChain[] = [ } ] }, - { - colBreak: false, - tierName: 'Region Ratios', - productionChains: [ - { - productionChain: 'coalRatio', - mermaidDefinition: endent` - flowchart LR - Coal(1) - Charcoal(2) - Coal --> Charcoal - ` - }, - { - productionChain: 'goldRatio', - mermaidDefinition: endent` - flowchart LR - ArcticGold(1) - NewWorldGold(2.5) - ArcticGold --> NewWorldGold - ` - }, - { - productionChain: 'furRatio', - mermaidDefinition: endent` - flowchart LR - ArcticFur(1) - OldWorldFur(4) - ArcticFur --> OldWorldFur - ` - }, - { - productionChain: 'clayRatio', - mermaidDefinition: endent` - flowchart LR - EnbesaClay(1) - OldWorldClay(2) - EnbesaClay --> OldWorldClay - ` - } - ] - }, - { - colBreak: false, - tierName: 'Electricity', - productionChains: [ - { - productionChain: 'oilPowerPlant', - mermaidDefinition: endent` - flowchart LR - OilWell(3) - OilPowerPlant(1) - OilWell --> OilPowerPlant - ` - }, - { - productionChain: 'oilTanker', - mermaidDefinition: endent` - flowchart LR - OilTanker(1) - OilPowerPlant(2-3) - OilTanker --> OilPowerPlant - ` - }, - { - productionChain: 'gasPowerPlant', - mermaidDefinition: endent` - flowchart LR - Gas(6) - GasPlant(1) - Gas --> GasPlant - ` - } - ] - }, - { colBreak: true, tierName: 'skip' }, { colBreak: false, tierName: 'Fuel | Silo', @@ -262,6 +261,97 @@ export const productionChainsMisc: TieredProductionChain[] = [ } ] }, + { + colBreak: false, + tierName: 'Weapons', + productionChains: [ + { + productionChain: 'weapons', + chainMultiplier: '6', + mermaidDefinition: endent` + flowchart LR + CharcoalKiln(33.33%1) + Iron(16.67%1) + Steel(33.33%1) + Weapons(1) + CharcoalKiln & Iron --> Steel --> Weapons + ` + }, + { + productionChain: 'heavyWeapons', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + Saltpeter(2) + Dynamite(1) + HeavyWeapons(1) + Pig(1) + Tallow(1) + Dynamite + Charcoal(50%1) + Iron(25%1) + Steel(50%1) + style HeavyWeapons stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 + Saltpeter --> Dynamite --> HeavyWeapons + Pig --> Tallow --> Dynamite + Charcoal & Iron --> Steel --> HeavyWeapons + ` + } + ] + }, + { colBreak: true, tierName: 'skip' }, + { + colBreak: false, + tierName: 'Sails', + productionChains: [ + { + productionChain: 'oldWorldSails', + mermaidDefinition: endent` + flowchart LR + Wool(1) + Sailmakers(1) + Wool --> Sailmakers + ` + }, + { + productionChain: 'newWorldSails', + mermaidDefinition: endent` + flowchart LR + Cotton(2) + CottonMill(1) + Sailmakers(1) + Cotton --> CottonMill --> Sailmakers + ` + } + ] + }, + { colBreak: true, tierName: 'skip' }, + { colBreak: true, tierName: 'skip' }, + { + colBreak: false, + tierName: 'Machinery', + productionChains: [ + { + productionChain: 'steamMotors', + mermaidDefinition: endent` + flowchart LR + Coal(1) + Iron(1) + Steel(2) + SteamMotors(3) + Copper(2) + Zinc(2) + Brass(4) + style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 + Coal & Iron --> Steel --> SteamMotors + Copper & Zinc --> Brass --> SteamMotors + ` + } + ] + }, + { colBreak: true, tierName: 'skip' }, + { colBreak: true, tierName: 'skip' }, + { colBreak: true, tierName: 'skip' }, { colBreak: false, tierName: 'Chemical Plant', diff --git a/src/pages/data/production-chains-season-2.ts b/src/pages/data/production-chains-season-2.ts index c812e38..0bbb184 100644 --- a/src/pages/data/production-chains-season-2.ts +++ b/src/pages/data/production-chains-season-2.ts @@ -34,7 +34,7 @@ export const productionChainsSeason2: TieredProductionChain[] = [ chainMultiplier: '3', mermaidDefinition: endent` flowchart LR - HibiscusFarm(66.66%1) + HibiscusFarm(66.67%1) HibiscusTea(1) HibiscusFarm --> HibiscusTea ` @@ -87,8 +87,8 @@ export const productionChainsSeason2: TieredProductionChain[] = [ chainMultiplier: '6', mermaidDefinition: endent` flowchart LR - Clay(16.66%1) - Tobacco(66.66%2) + Clay(16.67%1) + Tobacco(66.67%2) Pipes(1) Clay & Tobacco --> Pipes ` @@ -156,10 +156,10 @@ export const productionChainsSeason2: TieredProductionChain[] = [ mermaidDefinition: endent` flowchart LR Coal(33.33%1) - Filament(66.66%2) + Filament(66.67%2) Telephones(1) Wood(33.33%1) - Marquetry(66.66%2) + Marquetry(66.67%2) style Telephones stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; Coal --> Filament --> Telephones Wood --> Marquetry --> Telephones diff --git a/src/pages/data/production-chains-season-3.ts b/src/pages/data/production-chains-season-3.ts index 6165612..05b8a8b 100644 --- a/src/pages/data/production-chains-season-3.ts +++ b/src/pages/data/production-chains-season-3.ts @@ -274,6 +274,20 @@ export const productionChainsSeason3: TieredProductionChain[] = [ LobsterCheminee(1) Lobster & Citrus & Tobacco --> LobsterCheminee ` + }, + { + productionChain: 'empanadas', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + Grain(1) + Beef(2) + Empanadas(1) + Flour(50%1) + Herbs(50%1) + Grain --> Flour + Beef & Flour & Herbs --> Empanadas + ` } ] }, @@ -357,6 +371,18 @@ export const productionChainsSeason3: TieredProductionChain[] = [ BananaSurprise(1) Goat & Plantains & Cinnamon --> BananaSurprise ` + }, + { + productionChain: 'coneocopia', + chainMultiplier: '6', + mermaidDefinition: endent` + flowchart LR + Jam(50%1) + Orchid(50%1) + Milk(16.67%1); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; + Coneocopia(1) + Jam & Milk & Orchid --> Coneocopia + ` } ] }, @@ -443,6 +469,23 @@ export const productionChainsSeason3: TieredProductionChain[] = [ Hibiscus --> EnbesaSunrise SugarCane & Wood --> Rum --> EnbesaSunrise Spices --> EnbesaSunrise + ` + }, + { + productionChain: 'absinthe', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + SugarCane(50%1) + Potato(50%1) + Herbs(50%1) + Sugar(50%1) + Schnapps(50%1) + Absinthe(1) + SugarCane --> Sugar + Potato --> Schnapps + Herbs & Sugar & Schnapps --> Absinthe + ` } ] diff --git a/src/pages/data/production-chains-season-4.ts b/src/pages/data/production-chains-season-4.ts index 9b8fb3f..0de8ded 100644 --- a/src/pages/data/production-chains-season-4.ts +++ b/src/pages/data/production-chains-season-4.ts @@ -66,7 +66,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ Citrus(50%1) Cocoa(1) IceCream(1) - Milk(16.66%1); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; + Milk(16.67%1); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; SugarCane --> Sugar --> Chocolate Cocoa --> Chocolate Milk & Chocolate & Citrus --> IceCream @@ -80,7 +80,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ Iron(4.17%1) Steel(8.33%1) Charcoal(8.33%1) - Caoutchouc(16.66%1) + Caoutchouc(16.67%1) FireExtinguisher(12.5%1) FireDepartment(1) Iron & Charcoal --> Steel @@ -128,11 +128,11 @@ export const productionChainsSeason4: TieredProductionChain[] = [ flowchart LR; Iron(4.17%1) Charcoal(8.33%1) - Cotton(16.66%1) + Cotton(16.67%1) Wood(4.17%1) Steel(8.33%1) CottonMill(8.33%1) - PoliceEquipment(16.66%1) + PoliceEquipment(16.67%1) PoliceHeadquarters(1) Iron & Charcoal --> Steel Cotton --> CottonMill @@ -185,10 +185,10 @@ export const productionChainsSeason4: TieredProductionChain[] = [ Wood(8.33%1) Corn(33.33%1) Cotton(33.33%1) - CamphorWax(16.66%1) - Ethanol(16.66%1) - Celluloid(16.66%1) - Film(16.66%1) + CamphorWax(16.67%1) + Ethanol(16.67%1) + Celluloid(16.67%1) + Film(16.67%1) Saltpeter(33.33%1); style Saltpeter stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; Cinema(1) Wood & Corn --> Ethanol @@ -203,7 +203,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ mermaidDefinition: endent` flowchart LR; Wood(4.17%1) - Corn(16.66%1) + Corn(16.67%1) Orchid(8.33%1) Ethanol(8.33%1) Herb(8.33%1)