diff --git a/docs/boilerplate_production_chains.md b/docs/boilerplate_production_chains.md index b982050..d365e1a 100644 --- a/docs/boilerplate_production_chains.md +++ b/docs/boilerplate_production_chains.md @@ -15,7 +15,7 @@ NAME(66%1) +NAME(66.66%1) ``` ## chain with electricity @@ -31,7 +31,7 @@ Name(66%1); style Name stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; +NAME(66.66%1); style Name stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; ``` ## chain with world icon diff --git a/src/css/app.scss b/src/css/app.scss index 0fb9546..7fe59dd 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -38,3 +38,13 @@ .card-background { background-color: $burnt-light; } + +.box-border { + border: #8f6c40; + border-style: dashed; + border-width: 7px; +} + +.box-container { + padding: 20px; +} diff --git a/src/pages/AnnoBase.vue b/src/pages/AnnoBase.vue index 94015d7..c39611c 100644 --- a/src/pages/AnnoBase.vue +++ b/src/pages/AnnoBase.vue @@ -1,41 +1,41 @@ @@ -71,7 +71,7 @@ const expansionInfoItem = ref({ diff --git a/src/pages/AnnoMisc.vue b/src/pages/AnnoMisc.vue index 52f6ab4..4de392b 100644 --- a/src/pages/AnnoMisc.vue +++ b/src/pages/AnnoMisc.vue @@ -1,38 +1,37 @@ @@ -49,9 +48,6 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsMisc } from './data/production-chains-misc'; -// Info Card Data -import { itemDataBase, worldItemDataBase } from 'src/pages/data/info-card'; - // Icons import * as icons from './data/icons'; @@ -86,15 +82,17 @@ $column: 3; } .masonry-container { - height: 2250px; + height: 3900px; .masonry-col { width: 1000px; padding: 1px; } + + padding: 10px; } .custom-width { - width: 3100px; + width: 3200px; } diff --git a/src/pages/AnnoSeason1.vue b/src/pages/AnnoSeason1.vue index 977f0ae..4f1bdb4 100644 --- a/src/pages/AnnoSeason1.vue +++ b/src/pages/AnnoSeason1.vue @@ -1,38 +1,36 @@ @@ -49,9 +47,6 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason1 } from './data/production-chains-season-1'; -// Info Card Data -import { itemDataBase, worldItemDataBase } from 'src/pages/data/info-card'; - // Icons import * as icons from './data/icons'; @@ -68,7 +63,7 @@ const expansionInfoItem = ref({ diff --git a/src/pages/AnnoSeason2.vue b/src/pages/AnnoSeason2.vue index a423f21..e3a77be 100644 --- a/src/pages/AnnoSeason2.vue +++ b/src/pages/AnnoSeason2.vue @@ -1,38 +1,37 @@ @@ -49,9 +48,6 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason2 } from './data/production-chains-season-2'; -// Info Card Data -import { itemDataBase, worldItemDataBase } from 'src/pages/data/info-card'; - // Icons import * as icons from './data/icons'; @@ -86,15 +82,17 @@ $column: 3; } .masonry-container { - height: 2750px; + height: 2790px; .masonry-col { width: 1000px; padding: 1px; } + + padding: 10px; } .custom-width { - width: 3100px; + width: 3150px; } diff --git a/src/pages/AnnoSeason3.vue b/src/pages/AnnoSeason3.vue index 46cb60d..680c70c 100644 --- a/src/pages/AnnoSeason3.vue +++ b/src/pages/AnnoSeason3.vue @@ -1,39 +1,38 @@ @@ -50,9 +49,6 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason3 } from './data/production-chains-season-3'; -// Info Card Data -import { itemDataBase, worldItemDataBase } from 'src/pages/data/info-card'; - // Icons import * as icons from './data/icons'; @@ -87,15 +83,17 @@ $column: 4; } .masonry-container { - height: 7650px; + height: 7690px; .masonry-col { width: 1000px; padding: 1px; } + + padding: 10px; } .custom-width { - width: 4100px; + width: 4150px; } diff --git a/src/pages/AnnoSeason4.vue b/src/pages/AnnoSeason4.vue index e7cd9c5..88e371c 100644 --- a/src/pages/AnnoSeason4.vue +++ b/src/pages/AnnoSeason4.vue @@ -1,38 +1,37 @@ @@ -49,9 +48,6 @@ import InfoCardItem from 'components/InfoCard/InfoCardItem.vue'; // Production Chain Data import { productionChainsSeason4 } from './data/production-chains-season-4'; -// Info Card Data -import { itemDataBase, worldItemDataBase } from 'src/pages/data/info-card'; - // Icons import * as icons from './data/icons'; @@ -86,15 +82,17 @@ $column: 3; } .masonry-container { - height: 7000px; + height: 5280px; .masonry-col { width: 1000px; padding: 1px; } + + padding: 10px; } .custom-width { - width: 3100px; + width: 3150px; } diff --git a/src/pages/data/info-card.ts b/src/pages/data/info-card.ts index 0f4b58c..e369f50 100644 --- a/src/pages/data/info-card.ts +++ b/src/pages/data/info-card.ts @@ -9,6 +9,11 @@ export const commonItemData: InfoCardItem[] = [ 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, @@ -17,7 +22,7 @@ export const commonItemData: InfoCardItem[] = [ { id: 'fullChain', icon: fullChainMultiplierIcon, - text: 'The multiplier for a full chain. To scale chain to 100% multiply together (for every building in the chain): ', + 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' } ]; @@ -29,10 +34,16 @@ const commonWorldItemData: InfoCardWorldItem[] = [ 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 } ]; -// Base to S2 export const itemDataBase: InfoCardItem[] = [...commonItemData]; export const worldItemDataBase: InfoCardWorldItem[] = [ @@ -54,22 +65,15 @@ export const worldItemDataBase: InfoCardWorldItem[] = [ ]; // S2 to S4 -export const itemDataExpansions: InfoCardItem[] = [ - { - id: 'airship', - icon: icons.airshipIcon, - text: 'Airship drop chain ratios are the same for Old World & New World.' - }, - ...commonItemData -]; +// export const itemDataExpansions: InfoCardItem[] = [, ...commonItemData]; -export const worldItemDataExpansions: InfoCardWorldItem[] = [ - ...commonWorldItemData, - { - id: 'hacienda', - icon: icons.haciendaIcon, - textPre: 'Hacienda chains use New World', - textPost: 'buildings.', - worldIcon: icons.newWorldIcon - } -]; +// export const worldItemDataExpansions: InfoCardWorldItem[] = [ +// ...commonWorldItemData, +// { +// 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 9a6a7d1..0652508 100644 --- a/src/pages/data/production-chains-base.ts +++ b/src/pages/data/production-chains-base.ts @@ -81,11 +81,11 @@ export const productionChainsBase: TieredProductionChain[] = [ chainMultiplier: '6', mermaidDefinition: endent` flowchart LR - Beef(66%2) - RedPepper(66%2) - ArtisnalKitchen(66%2) + Beef(66.66%2) + RedPepper(66.66%2) + ArtisnalKitchen(66.66%2) Cannery(1) - Iron(16%1) + Iron(16.66%1) Beef & RedPepper --> ArtisnalKitchen --> Cannery Iron --> Cannery ` @@ -152,12 +152,12 @@ export const productionChainsBase: TieredProductionChain[] = [ chainMultiplier: '3', mermaidDefinition: endent` flowchart LR - Sand(33%1) - Glass(33%1) + Sand(33.33%1) + Glass(33.33%1) Glasses(1) - Copper(33%1) - Zinc(33%1) - Brass(66%1) + Copper(33.33%1) + Zinc(33.33%1) + Brass(66.66%1) Sand --> Glass --> Glasses Copper & Zinc --> Brass --> Glasses ` @@ -167,12 +167,12 @@ export const productionChainsBase: TieredProductionChain[] = [ chainMultiplier: '3', mermaidDefinition: endent` flowchart LR - GoldOre(83%4) - Coal(33%1) - Gold(66%2) + GoldOre(83.33%4) + Coal(33.33%1) + Gold(66.66%2) PocketWatches(1) - Sand(66%1) - Glass(66%1) + Sand(66.66%1) + Glass(66.66%1) style PocketWatches stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; GoldOre & Coal --> Gold --> PocketWatches Sand --> Glass --> PocketWatches @@ -370,9 +370,9 @@ export const productionChainsBase: TieredProductionChain[] = [ chainMultiplier: '6', mermaidDefinition: endent` flowchart LR - CharcoalKiln(33%1) - Iron(16%1) - Steel(33%1) + CharcoalKiln(33.33%1) + Iron(16.66%1) + Steel(33.33%1) Weapons(1) CharcoalKiln & Iron --> Steel --> Weapons ` diff --git a/src/pages/data/production-chains-misc.ts b/src/pages/data/production-chains-misc.ts index a013de3..9a7253e 100644 --- a/src/pages/data/production-chains-misc.ts +++ b/src/pages/data/production-chains-misc.ts @@ -32,9 +32,9 @@ export const productionChainsMisc: TieredProductionChain[] = [ chainMultiplier: '3', mermaidDefinition: endent` flowchart LR - CharcoalKiln(66%1) - Iron(33%1) - Steel(66%1) + CharcoalKiln(66.66%1) + Iron(33.33%1) + Steel(66.66%1) SteelBeams(1) CharcoalKiln & Iron --> Steel --> SteelBeams ` @@ -99,8 +99,8 @@ export const productionChainsMisc: TieredProductionChain[] = [ chainMultiplier: '9', mermaidDefinition: endent` flowchart LR - Bauxite(11%1) - Charcoal(33%1) + Bauxite(11.11%1) + Charcoal(33.33%1) Aluminium(1) Bauxite & Charcoal --> Aluminium ` diff --git a/src/pages/data/production-chains-season-1.ts b/src/pages/data/production-chains-season-1.ts index 0a92b5c..3f9e345 100644 --- a/src/pages/data/production-chains-season-1.ts +++ b/src/pages/data/production-chains-season-1.ts @@ -55,7 +55,7 @@ export const productionChainsSeason1: TieredProductionChain[] = [ mermaidDefinition: endent` flowchart LR Bears(1) - Seal(33%1) + Seal(33.33%1) Parkas(1) Bears & Seal --> Parkas ` diff --git a/src/pages/data/production-chains-season-2.ts b/src/pages/data/production-chains-season-2.ts index d93f9df..c812e38 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%1) + HibiscusFarm(66.66%1) HibiscusTea(1) HibiscusFarm --> HibiscusTea ` @@ -87,8 +87,8 @@ export const productionChainsSeason2: TieredProductionChain[] = [ chainMultiplier: '6', mermaidDefinition: endent` flowchart LR - Clay(16%1) - Tobacco(66%2) + Clay(16.66%1) + Tobacco(66.66%2) Pipes(1) Clay & Tobacco --> Pipes ` @@ -155,11 +155,11 @@ export const productionChainsSeason2: TieredProductionChain[] = [ chainMultiplier: '3', mermaidDefinition: endent` flowchart LR - Coal(33%1) - Filament(66%2) + Coal(33.33%1) + Filament(66.66%2) Telephones(1) - Wood(33%1) - Marquetry(66%2) + Wood(33.33%1) + Marquetry(66.66%2) style Telephones stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; Coal --> Filament --> Telephones Wood --> Marquetry --> Telephones @@ -167,6 +167,8 @@ export const productionChainsSeason2: TieredProductionChain[] = [ } ] }, + { colBreak: true, tierName: 'skip' }, + { colBreak: true, tierName: 'skip' }, { colBreak: false, tierName: 'Advanced Chains (Scholars)', diff --git a/src/pages/data/production-chains-season-3.ts b/src/pages/data/production-chains-season-3.ts index d95bed3..6165612 100644 --- a/src/pages/data/production-chains-season-3.ts +++ b/src/pages/data/production-chains-season-3.ts @@ -129,7 +129,7 @@ export const productionChainsSeason3: TieredProductionChain[] = [ Flour(50%1) Bakery(1) Beef(2) - GoldOre(83%3) + GoldOre(83.33%3) Coal(25%1) Gold(1) BriocheRoyale(1) diff --git a/src/pages/data/production-chains-season-4.ts b/src/pages/data/production-chains-season-4.ts index 82d15e1..fc0c004 100644 --- a/src/pages/data/production-chains-season-4.ts +++ b/src/pages/data/production-chains-season-4.ts @@ -12,7 +12,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ chainMultiplier: '6', mermaidDefinition: endent` flowchart LR; - Bauxite(33%1) + Bauxite(33.33%1) Charcoal(1) Aluminium(3) Wood(50%1) @@ -66,7 +66,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ Citrus(50%1) Cocoa(1) IceCream(1) - Milk(17%1); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; + Milk(16.66%1); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; SugarCane --> Sugar --> Chocolate Cocoa --> Chocolate Milk & Chocolate & Citrus --> IceCream @@ -77,11 +77,11 @@ export const productionChainsSeason4: TieredProductionChain[] = [ chainMultiplier: '24', mermaidDefinition: endent` flowchart LR; - Iron(5%1) - Steel(9%1) - Charcoal(9%1) - Caoutchouc(17%1) - FireExtinguisher(13%1) + Iron(4.17%1) + Steel(8.33%1) + Charcoal(8.33%1) + Caoutchouc(16.66%1) + FireExtinguisher(12.5%1) FireDepartment(1) Iron & Charcoal --> Steel Steel & Caoutchouc --> FireExtinguisher --> FireDepartment @@ -109,8 +109,8 @@ export const productionChainsSeason4: TieredProductionChain[] = [ flowchart LR; Cotton(50%1) CottonMill(25%1) - Minerals(13%1) - Pigments(38%1) + Minerals(12.5%1) + Pigments(37.5%1) Costumes(50%1) Saltpeter(50%1); style Saltpeter stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; NanduFeathers(25%1); style NanduFeathers stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; @@ -126,13 +126,13 @@ export const productionChainsSeason4: TieredProductionChain[] = [ chainMultiplier: '24', mermaidDefinition: endent` flowchart LR; - Iron(5%1) - Charcoal(9%1) - Cotton(17%1) - Wood(5%1) - Steel(9%1) - CottonMill(9%1) - PoliceEquipment(17%1) + Iron(4.17%1) + Charcoal(8.33%1) + Cotton(16.66%1) + Wood(4.17%1) + Steel(8.33%1) + CottonMill(8.33%1) + PoliceEquipment(16.66%1) PoliceHeadquarters(1) Iron & Charcoal --> Steel Cotton --> CottonMill @@ -153,7 +153,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ flowchart LR; Wood(50%1) Iron(50%1) - Bauxite(33%1) + Bauxite(33.33%1) Corn(2) Copper(1) Caoutchouc(2) @@ -181,15 +181,15 @@ export const productionChainsSeason4: TieredProductionChain[] = [ productionChain: 'cinema', chainMultiplier: '12', mermaidDefinition: endent` - flowchart LR; - Wood(9%1) - Corn(33%1) - Cotton(33%1) - CamphorWax(17%1) - Ethanol(17%1) - Celluloid(17%1) - Film(17%1) - Saltpeter(33%1); style Saltpeter stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; + flowchart BT; + 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) + Saltpeter(33.33%1); style Saltpeter stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; Cinema(1) Wood & Corn --> Ethanol Cotton & CamphorWax & Ethanol --> Celluloid @@ -202,12 +202,12 @@ export const productionChainsSeason4: TieredProductionChain[] = [ chainMultiplier: '24', mermaidDefinition: endent` flowchart LR; - Wood(5%1) - Corn(17%1) - Orchid(9%1) - Ethanol(9%1) - Herb(9%1) - Medicine(13%1) + Wood(4.17%1) + Corn(16.66%1) + Orchid(8.33%1) + Ethanol(8.33%1) + Herb(8.33%1) + Medicine(12.5%1) Hospital(1) Wood & Corn --> Ethanol Orchid & Ethanol & Herb --> Medicine @@ -236,7 +236,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [ Caoutchouc1(1) Saltpeter(1); style Saltpeter stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; Scooter(1); style Scooter stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; - Motors(50%1); style Motors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; + Motors(1); style Motors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; Wood & Corn --> Ethanol Copper & Caoutchouc0 --> Cables Cotton & CamphorWax & Ethanol --> Celluloid