From b9ee9779ae1acc706cc53311f4aa9de0c8e785f5 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Tue, 12 Dec 2023 01:01:39 +0000 Subject: [PATCH] update layout --- src/components/InfoCard.vue | 10 +- src/pages/AnnoBase.vue | 2 +- src/pages/AnnoMisc.vue | 12 +- src/pages/AnnoSeason1.vue | 13 +- src/pages/AnnoSeason2.vue | 11 +- src/pages/AnnoSeason3.vue | 11 +- src/pages/AnnoSeason4.vue | 13 +- src/pages/data/info-card.ts | 120 ++++++++++++++++-- src/pages/data/production-chains-base.ts | 11 +- src/pages/data/production-chains-misc.ts | 19 +-- src/pages/data/production-chains-season-2.ts | 1 + src/pages/data/production-chains-season-4.ts | 122 +++++++++---------- 12 files changed, 246 insertions(+), 99 deletions(-) diff --git a/src/components/InfoCard.vue b/src/components/InfoCard.vue index 425209a..eb22844 100644 --- a/src/components/InfoCard.vue +++ b/src/components/InfoCard.vue @@ -1,16 +1,16 @@ diff --git a/src/pages/AnnoBase.vue b/src/pages/AnnoBase.vue index 402d135..1c2f348 100644 --- a/src/pages/AnnoBase.vue +++ b/src/pages/AnnoBase.vue @@ -88,7 +88,7 @@ $column: 3; } .masonry-container { - height: 4500px; + height: 4400px; .masonry-col { width: 1000px; diff --git a/src/pages/AnnoMisc.vue b/src/pages/AnnoMisc.vue index ea768cc..2efab68 100644 --- a/src/pages/AnnoMisc.vue +++ b/src/pages/AnnoMisc.vue @@ -10,7 +10,10 @@ :col-break="false" class="masonry-col item" > - + @@ -48,6 +51,9 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsMisc } from './data/production-chains-misc'; +// Info Card Data +import { miscItemData, miscItemWorldData } from 'src/pages/data/info-card'; + // Icons import * as icons from './data/icons'; @@ -82,7 +88,7 @@ $column: 3; } .masonry-container { - height: 4150px; + height: 4510px; .masonry-col { width: 1000px; @@ -93,6 +99,6 @@ $column: 3; } .custom-width { - width: 3200px; + width: 3150px; } diff --git a/src/pages/AnnoSeason1.vue b/src/pages/AnnoSeason1.vue index 4f1bdb4..e2cf4ee 100644 --- a/src/pages/AnnoSeason1.vue +++ b/src/pages/AnnoSeason1.vue @@ -9,7 +9,10 @@ :col-break="false" class="masonry-col item" > - + @@ -47,6 +50,12 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason1 } from './data/production-chains-season-1'; +// Info Card Data +import { + season1ItemData, + season1ItemWorldData +} from 'src/pages/data/info-card'; + // Icons import * as icons from './data/icons'; @@ -81,7 +90,7 @@ $column: 2; } .masonry-container { - height: 1430px; + height: 1450px; .masonry-col { width: 1000px; diff --git a/src/pages/AnnoSeason2.vue b/src/pages/AnnoSeason2.vue index e3a77be..fb3767f 100644 --- a/src/pages/AnnoSeason2.vue +++ b/src/pages/AnnoSeason2.vue @@ -10,7 +10,10 @@ :col-break="false" class="masonry-col item" > - + @@ -48,6 +51,12 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason2 } from './data/production-chains-season-2'; +// Info Card Data +import { + season2ItemData, + season2ItemWorldData +} from 'src/pages/data/info-card'; + // Icons import * as icons from './data/icons'; diff --git a/src/pages/AnnoSeason3.vue b/src/pages/AnnoSeason3.vue index 2e80d3f..d4fc6b5 100644 --- a/src/pages/AnnoSeason3.vue +++ b/src/pages/AnnoSeason3.vue @@ -11,7 +11,10 @@ :col-break="false" class="masonry-col item" > - + @@ -49,6 +52,12 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason3 } from './data/production-chains-season-3'; +// Info Card Data +import { + season3ItemData, + season3ItemWorldData +} from 'src/pages/data/info-card'; + // Icons import * as icons from './data/icons'; diff --git a/src/pages/AnnoSeason4.vue b/src/pages/AnnoSeason4.vue index 88e371c..1583c3f 100644 --- a/src/pages/AnnoSeason4.vue +++ b/src/pages/AnnoSeason4.vue @@ -10,7 +10,10 @@ :col-break="false" class="masonry-col item" > - + @@ -48,6 +51,12 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason4 } from './data/production-chains-season-4'; +// Info Card Data +import { + season4ItemData, + season4ItemWorldData +} from 'src/pages/data/info-card'; + // Icons import * as icons from './data/icons'; @@ -82,7 +91,7 @@ $column: 3; } .masonry-container { - height: 5280px; + height: 5900px; .masonry-col { width: 1000px; diff --git a/src/pages/data/info-card.ts b/src/pages/data/info-card.ts index f775545..35fc938 100644 --- a/src/pages/data/info-card.ts +++ b/src/pages/data/info-card.ts @@ -75,35 +75,137 @@ export const baseItemData: InfoCardItem[] = [ 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 baseItemWorldData: InfoCardItemWorldIcon[] = [ { - id: 'furs', + id: 'baseFurs', icon: icons.fursIcon, textPre: 'Furs use Old World', textPost: 'production rates.', worldIcon: icons.oldWorldIcon + }, + { + id: 'gold', + icon: icons.goldOreIcon, + textPre: 'Gold mines use New World', + textPost: 'production rates.', + worldIcon: icons.newWorldIcon } ]; // Misc -export const miscItemData: InfoCardItem[] = []; -export const miscItemWorldData: InfoCardItemWorldIcon[] = []; +export const miscItemData: InfoCardItem[] = [ + { + 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 miscItemWorldData: InfoCardItemWorldIcon[] = [ + { + id: 'clay', + icon: icons.clayIcon, + textPre: 'Enbesa', + textPost: ' production chains use Clay Collectors.', + worldIcon: icons.enbesaIcon + } +]; // S1 -export const season1ItemData: InfoCardItem[] = []; +export const season1ItemData: InfoCardItem[] = [ + { + 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 season1ItemWorldData: InfoCardItemWorldIcon[] = []; // S2 -export const season2ItemData: InfoCardItem[] = []; -export const season2ItemWorldData: InfoCardItemWorldIcon[] = []; +export const season2ItemData: InfoCardItem[] = [ + { + 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 season2ItemWorldData: InfoCardItemWorldIcon[] = [ + { + id: 'clay', + icon: icons.clayIcon, + textPre: 'Enbesa', + textPost: ' production chains use Clay Collectors.', + worldIcon: icons.enbesaIcon + } +]; // S3 -export const season3ItemData: InfoCardItem[] = []; +export const season3ItemData: InfoCardItem[] = [ + { + 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 season3ItemWorldData: InfoCardItemWorldIcon[] = []; // S4 -export const season4ItemData: InfoCardItem[] = []; -export const season4ItemWorldData: InfoCardItemWorldIcon[] = []; +export const season4ItemData: InfoCardItem[] = [ + { + id: 'airship', + icon: icons.airshipIcon, + text: 'Airship drop chain ratios are the same for Old World & New World.' + }, + { + 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.' + }, + { + 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 season4ItemWorldData: InfoCardItemWorldIcon[] = [ + { + id: 'hacienda', + icon: icons.haciendaIcon, + textPre: 'Hacienda chains use New World', + textPost: 'buildings.', + worldIcon: icons.newWorldIcon + } +]; diff --git a/src/pages/data/production-chains-base.ts b/src/pages/data/production-chains-base.ts index 0dc6fea..f8775e9 100644 --- a/src/pages/data/production-chains-base.ts +++ b/src/pages/data/production-chains-base.ts @@ -200,13 +200,14 @@ export const productionChainsBase: TieredProductionChain[] = [ }, { productionChain: 'steamCarriages', + chainMultiplier: '2', mermaidDefinition: endent` flowchart LR - SteamMotors(3) - SteamCarriages(2) - Wood(1) - Caoutchouc(4) - Coaches(8) + SteamMotors(150%2); style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; + SteamCarriages(1) + Wood(50%1) + Caoutchouc(2) + Coaches(4) SteamCarriages style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 style SteamCarriages stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 diff --git a/src/pages/data/production-chains-misc.ts b/src/pages/data/production-chains-misc.ts index bd02c5e..ddcccfa 100644 --- a/src/pages/data/production-chains-misc.ts +++ b/src/pages/data/production-chains-misc.ts @@ -253,9 +253,9 @@ export const productionChainsMisc: TieredProductionChain[] = [ productionChain: 'siloss3', mermaidDefinition: endent` flowchart LR - Dung(1) + Dung(3) Fertiliser(1) - Silo(5) + Silo(10) Dung --> Fertiliser --> Silo ` } @@ -333,15 +333,16 @@ export const productionChainsMisc: TieredProductionChain[] = [ productionChains: [ { productionChain: 'steamMotors', + chainMultiplier: '3', mermaidDefinition: endent` flowchart LR - Coal(1) - Iron(1) - Steel(2) - SteamMotors(3) - Copper(2) - Zinc(2) - Brass(4) + SteamMotors(1) + Coal(33.33%1) + Iron(33.33%1) + Steel(66.67%1) + Copper(66.67%1) + Zinc(66.67%1) + Brass(66.67%2) style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 Coal & Iron --> Steel --> SteamMotors Copper & Zinc --> Brass --> SteamMotors diff --git a/src/pages/data/production-chains-season-2.ts b/src/pages/data/production-chains-season-2.ts index 0bbb184..3247811 100644 --- a/src/pages/data/production-chains-season-2.ts +++ b/src/pages/data/production-chains-season-2.ts @@ -169,6 +169,7 @@ export const productionChainsSeason2: TieredProductionChain[] = [ }, { colBreak: true, tierName: 'skip' }, { colBreak: true, tierName: 'skip' }, + { colBreak: true, tierName: 'skip' }, { colBreak: false, tierName: 'Advanced Chains (Scholars)', diff --git a/src/pages/data/production-chains-season-4.ts b/src/pages/data/production-chains-season-4.ts index 0de8ded..1ed8ecc 100644 --- a/src/pages/data/production-chains-season-4.ts +++ b/src/pages/data/production-chains-season-4.ts @@ -76,7 +76,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ productionChain: 'firestation', chainMultiplier: '24', mermaidDefinition: endent` - flowchart LR; + flowchart TB; Iron(4.17%1) Steel(8.33%1) Charcoal(8.33%1) @@ -248,6 +248,66 @@ export const productionChainsSeason4: TieredProductionChain[] = [ } ] }, + { + colBreak: false, + tierName: 'Hacienda', + productionChains: [ + { + productionChain: 'hotSauce', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + Spices(50%1) + HotSauce(1) + Spices --> HotSauce + ` + }, + { + productionChain: 'atole', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + Corn(1) + SugarCane(50%1) + Atole(1) + Corn & SugarCane --> Atole + ` + }, + { + productionChain: 'haciendaRum', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + SugarCane(1) + Wood(50%1) + Rum(1) + SugarCane & Wood --> Rum + ` + }, + { + productionChain: 'haciendaSchnapps', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + Potato(50%1) + Schnapps(1) + Potato --> Schnapps + ` + }, + { + productionChain: 'haciendaBeer', + mermaidDefinition: endent` + flowchart LR + Grain(1) + Corn(1) + Beer(1) + Grain & Corn --> Beer + ` + } + ] + }, + { colBreak: true, tierName: 'skip' }, + { colBreak: true, tierName: 'skip' }, { colBreak: false, tierName: 'Supply Factories | Airships', @@ -329,65 +389,5 @@ export const productionChainsSeason4: TieredProductionChain[] = [ ` } ] - }, - { colBreak: true, tierName: 'skip' }, - { colBreak: true, tierName: 'skip' }, - { - colBreak: false, - tierName: 'Hacienda', - productionChains: [ - { - productionChain: 'hotSauce', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - Spices(50%1) - HotSauce(1) - Spices --> HotSauce - ` - }, - { - productionChain: 'atole', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - Corn(1) - SugarCane(50%1) - Atole(1) - Corn & SugarCane --> Atole - ` - }, - { - productionChain: 'haciendaRum', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - SugarCane(1) - Wood(50%1) - Rum(1) - SugarCane & Wood --> Rum - ` - }, - { - productionChain: 'haciendaSchnapps', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - Potato(50%1) - Schnapps(1) - Potato --> Schnapps - ` - }, - { - productionChain: 'haciendaBeer', - mermaidDefinition: endent` - flowchart LR - Grain(1) - Corn(1) - Beer(1) - Grain & Corn --> Beer - ` - } - ] } ];