diff --git a/.vscode/settings.json b/.vscode/settings.json index 746cf57..ec79142 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,14 +3,10 @@ "editor.guides.bracketPairs": true, "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.codeActionsOnSave": [ - "source.fixAll.eslint" - ], - "eslint.validate": [ - "javascript", - "javascriptreact", - "typescript", - "vue" - ], - "typescript.tsdk": "node_modules/typescript/lib" -} \ No newline at end of file + "editor.codeActionsOnSave": ["source.fixAll.eslint"], + "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"], + "typescript.tsdk": "node_modules/typescript/lib", + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } +} diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 69a94bf..6acda28 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/src/pages/AnnoBase.vue b/src/pages/AnnoBase.vue index 1c2f348..35f9f16 100644 --- a/src/pages/AnnoBase.vue +++ b/src/pages/AnnoBase.vue @@ -64,7 +64,7 @@ initialiseMermaid(); const expansionInfoItem = ref({ title: 'Base Game', icon: icons.siteLogoIcon, - text: 'All chains for Base Game (including ratios, fuel, electricity and building materials)' + text: 'All chains for Base Game consumer goods.' }); @@ -88,7 +88,7 @@ $column: 3; } .masonry-container { - height: 4400px; + height: 3790px; .masonry-col { width: 1000px; diff --git a/src/pages/AnnoMisc.vue b/src/pages/AnnoMisc.vue index 2efab68..5b3b7e3 100644 --- a/src/pages/AnnoMisc.vue +++ b/src/pages/AnnoMisc.vue @@ -64,7 +64,7 @@ initialiseMermaid(); const expansionInfoItem = ref({ title: 'ratios | fuel | materials', icon: icons.siteLogoIcon, - text: 'All chains for Base Game (including ratios, fuel, electricity and building materials)' + text: 'All chains for building materials, electricity, field and ratios.' }); @@ -88,7 +88,7 @@ $column: 3; } .masonry-container { - height: 4510px; + height: 4610px; .masonry-col { width: 1000px; diff --git a/src/pages/AnnoSeason1.vue b/src/pages/AnnoSeason1.vue index e2cf4ee..b577b8e 100644 --- a/src/pages/AnnoSeason1.vue +++ b/src/pages/AnnoSeason1.vue @@ -66,7 +66,7 @@ initialiseMermaid(); const expansionInfoItem = ref({ title: 'Season 1', icon: icons.passageIcon, - text: 'All chains for Season 1 (Sunken Treasures, Botanica & The Passage).' + text: 'All chains for Season 1 (Sunken Treasures, Botanica & The Passage) consumer goods.' }); diff --git a/src/pages/AnnoSeason2.vue b/src/pages/AnnoSeason2.vue index fb3767f..8e63477 100644 --- a/src/pages/AnnoSeason2.vue +++ b/src/pages/AnnoSeason2.vue @@ -67,7 +67,7 @@ initialiseMermaid(); const expansionInfoItem = ref({ title: 'Season 2', icon: icons.landOfLionsIcon, - text: 'All chains for Season 2 (Seat of Power, Bright Harvest & Land of Lions).' + text: 'All chains for Season 2 (Seat of Power, Bright Harvest & Land of Lions) consumer goods.' }); diff --git a/src/pages/AnnoSeason3.vue b/src/pages/AnnoSeason3.vue index d4fc6b5..480799e 100644 --- a/src/pages/AnnoSeason3.vue +++ b/src/pages/AnnoSeason3.vue @@ -68,7 +68,7 @@ initialiseMermaid(); const expansionInfoItem = ref({ title: 'Season 3', icon: icons.highLifeIcon, - text: 'All chains for Season 3 (Docklands, Tourist Season & The High Life).' + text: 'All chains for Season 3 (Docklands, Tourist Season & The High Life) consumer goods.' }); @@ -92,7 +92,7 @@ $column: 4; } .masonry-container { - height: 8250px; + height: 8240px; .masonry-col { width: 1000px; diff --git a/src/pages/AnnoSeason4.vue b/src/pages/AnnoSeason4.vue index 1583c3f..3af61a6 100644 --- a/src/pages/AnnoSeason4.vue +++ b/src/pages/AnnoSeason4.vue @@ -67,7 +67,7 @@ initialiseMermaid(); const expansionInfoItem = ref({ title: 'Season 4', icon: icons.newWorldRisingIcon, - text: 'All chains for Season 4 (Seeds of Change, Empire of the Skies & New World Rising).' + text: 'All chains for Season 4 (Seeds of Change, Empire of the Skies & New World Rising) consumer goods.' }); diff --git a/src/pages/data/info-card.ts b/src/pages/data/info-card.ts index 35fc938..cdee5f6 100644 --- a/src/pages/data/info-card.ts +++ b/src/pages/data/info-card.ts @@ -2,86 +2,24 @@ import * as icons from './icons'; import fullChainMultiplierIcon from 'assets/productionChainMultiplier.svg'; 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' -// } -// ]; - -// 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, -// textPre: 'Hacienda chains use New World', -// textPost: 'buildings.', -// 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.' + text: '2 Charcoal Kilns can be replaced with 1 Coal Mine (or vice versa).', }, { id: 'electricity', icon: icons.electricityIcon, - text: 'Building requires electricity.' + 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' - } + additionalText: ' number of buildings × efficiency % × multiplier', + }, ]; export const baseItemWorldData: InfoCardItemWorldIcon[] = [ @@ -90,30 +28,35 @@ export const baseItemWorldData: InfoCardItemWorldIcon[] = [ icon: icons.fursIcon, textPre: 'Furs use Old World', textPost: 'production rates.', - worldIcon: icons.oldWorldIcon + worldIcon: icons.oldWorldIcon, }, { id: 'gold', icon: icons.goldOreIcon, textPre: 'Gold mines use New World', textPost: 'production rates.', - worldIcon: icons.newWorldIcon - } + worldIcon: icons.newWorldIcon, + }, ]; // Misc export const miscItemData: InfoCardItem[] = [ + { + id: 'charcoal', + icon: icons.charcoalKilnIcon, + text: '2 Charcoal Kilns can be replaced with 1 Coal Mine (or vice versa).', + }, { id: 'electricity', icon: icons.electricityIcon, - text: 'Building requires electricity.' + 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' - } + additionalText: ' number of buildings × efficiency % × multiplier', + }, ]; export const miscItemWorldData: InfoCardItemWorldIcon[] = [ { @@ -121,8 +64,8 @@ export const miscItemWorldData: InfoCardItemWorldIcon[] = [ icon: icons.clayIcon, textPre: 'Enbesa', textPost: ' production chains use Clay Collectors.', - worldIcon: icons.enbesaIcon - } + worldIcon: icons.enbesaIcon, + }, ]; // S1 @@ -131,24 +74,29 @@ 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' - } + additionalText: ' number of buildings × efficiency % × multiplier', + }, ]; export const season1ItemWorldData: InfoCardItemWorldIcon[] = []; // S2 export const season2ItemData: InfoCardItem[] = [ + { + id: 'charcoal', + icon: icons.charcoalKilnIcon, + text: '2 Charcoal Kilns can be replaced with 1 Coal Mine (or vice versa).', + }, { id: 'electricity', icon: icons.electricityIcon, - text: 'Building requires electricity.' + 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' - } + additionalText: ' number of buildings × efficiency % × multiplier', + }, ]; export const season2ItemWorldData: InfoCardItemWorldIcon[] = [ { @@ -156,49 +104,62 @@ export const season2ItemWorldData: InfoCardItemWorldIcon[] = [ icon: icons.clayIcon, textPre: 'Enbesa', textPost: ' production chains use Clay Collectors.', - worldIcon: icons.enbesaIcon - } + worldIcon: icons.enbesaIcon, + }, ]; // S3 export const season3ItemData: InfoCardItem[] = [ + { + id: 'charcoal', + icon: icons.charcoalKilnIcon, + text: '2 Charcoal Kilns can be replaced with 1 Coal Mine (or vice versa).', + }, { id: 'electricity', icon: icons.electricityIcon, - text: 'Building requires electricity.' + 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' - } + additionalText: ' number of buildings × efficiency % × multiplier', + }, +]; +export const season3ItemWorldData: InfoCardItemWorldIcon[] = [ + { + id: 'gold', + icon: icons.goldOreIcon, + textPre: 'Gold mines use New World', + textPost: 'production rates.', + worldIcon: icons.newWorldIcon, + }, ]; -export const season3ItemWorldData: InfoCardItemWorldIcon[] = []; // S4 export const season4ItemData: InfoCardItem[] = [ { id: 'airship', icon: icons.airshipIcon, - text: 'Airship drop chain ratios are the same for Old World & New World.' + 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.' + text: '2 Charcoal Kilns can be replaced with 1 Coal Mine (or vice versa).', }, { id: 'electricity', icon: icons.electricityIcon, - text: 'Building requires electricity.' + 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' - } + additionalText: ' number of buildings × efficiency % × multiplier', + }, ]; export const season4ItemWorldData: InfoCardItemWorldIcon[] = [ { @@ -206,6 +167,6 @@ export const season4ItemWorldData: InfoCardItemWorldIcon[] = [ icon: icons.haciendaIcon, textPre: 'Hacienda chains use New World', textPost: 'buildings.', - worldIcon: icons.newWorldIcon - } + worldIcon: icons.newWorldIcon, + }, ]; diff --git a/src/pages/data/production-chains-base.ts b/src/pages/data/production-chains-base.ts index f8775e9..9d9877e 100644 --- a/src/pages/data/production-chains-base.ts +++ b/src/pages/data/production-chains-base.ts @@ -15,7 +15,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Wool(1) WorkClothes(1) Wool --> WorkClothes - ` + `, }, { productionChain: 'schnapps', @@ -24,7 +24,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Potato(1) Schnapps(1) Potato --> Schnapps - ` + `, }, { productionChain: 'sausages', @@ -33,7 +33,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Pig(1) Sausages(1) Pig --> Sausages - ` + `, }, { productionChain: 'bread', @@ -44,7 +44,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Flour(50%1) Bread(1) Grain --> Flour --> Bread - ` + `, }, { productionChain: 'soap', @@ -54,7 +54,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Tallow(2) Soap(1) Pigs --> Tallow --> Soap - ` + `, }, { productionChain: 'beer', @@ -67,9 +67,9 @@ export const productionChainsBase: TieredProductionChain[] = [ HopFarm(75%2) Grain --> Malthouse --> Brewery HopFarm --> Brewery - ` - } - ] + `, + }, + ], }, { colBreak: false, @@ -87,7 +87,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Iron(16.67%1) Beef & RedPepper --> ArtisnalKitchen --> Cannery Iron --> Cannery - ` + `, }, { productionChain: 'sewingMachines', @@ -101,7 +101,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Wood(50%1) Charcoal & Iron --> Steel --> SewingMachines Wood --> SewingMachines - ` + `, }, { productionChain: 'furs', @@ -113,9 +113,166 @@ export const productionChainsBase: TieredProductionChain[] = [ Furs(2) Cotton --> CottonMill --> FurCoats Furs --> FurCoats - ` - } - ] + `, + }, + ], + }, + { + 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` + flowchart LR + PlantainPlantation(1) + FishOil(1) + FriedPlantains(1) + PlantainPlantation & FishOil --> FriedPlantains + `, + }, + { + productionChain: 'ponchos', + mermaidDefinition: endent` + flowchart LR + AlpacaWool(1) + Ponchos(1) + AlpacaWool --> Ponchos + `, + }, + { + productionChain: 'tortillas', + mermaidDefinition: endent` + flowchart LR + Beef(2) + Corn(2) + Tortillas(1) + Beef & Corn --> Tortillas + `, + }, + { + productionChain: 'coffee', + mermaidDefinition: endent` + flowchart LR + CoffeeBeans(2) + Coffee(1) + CoffeeBeans --> Coffee + `, + }, + { + productionChain: 'bowlerHats', + mermaidDefinition: endent` + flowchart LR + Cotton(2) + CottonMill(1) + BowlerHats(1) + AlpacaWool(1) + Felt(1) + Cotton --> CottonMill --> BowlerHats + AlpacaWool --> Felt --> BowlerHats + `, + }, + { + productionChain: 'cigars', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + Wood(50%1) + Marquetry(2) + Cigars(1) + Tobacco(4) + Wood --> Marquetry --> Cigars + Tobacco --> Cigars + `, + }, + { + productionChain: 'chocolate', + mermaidDefinition: endent` + flowchart LR + SugarCane(1) + Sugar(1) + Chocolate(1) + Cocoa(2) + SugarCane --> Sugar --> Chocolate + Cocoa --> Chocolate + `, + }, + ], + }, + { + colBreak: false, + tierName: 'Investors', + productionChains: [ + { + productionChain: 'champagne', + mermaidDefinition: endent` + flowchart LR + Sand(1) + Glass(1) + Champagne(1) + Grapes(4) + Sand --> Glass --> Champagne + Grapes --> Champagne + `, + }, + { + productionChain: 'steamCarriages', + chainMultiplier: '2', + mermaidDefinition: endent` + flowchart LR + 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 + SteamMotors --> SteamCarriages + Wood & Caoutchouc --> Coaches --> SteamCarriages + `, + }, + { + productionChain: 'jewelry', + mermaidDefinition: endent` + flowchart LR + Charcoal(1) + GoldOre(5) + Gold(2) + Jewelry(1) + Pearls(3) + Charcoal & GoldOre --> Gold --> Jewelry + Pearls --> Jewelry + `, + }, + { + productionChain: 'gramophone', + chainMultiplier: '4', + mermaidDefinition: endent` + flowchart LR + Wood(25%1) + Marquetry(1) + Gramophone(1) + Copper(50%1) + Zinc(50%1) + Brass(1) + style Gramophone stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 + Wood --> Marquetry --> Gramophone + Copper & Zinc --> Brass --> Gramophone + `, + }, + ], }, { colBreak: false, @@ -133,7 +290,7 @@ export const productionChainsBase: TieredProductionChain[] = [ style HighWheeler stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; Coal & Iron --> Steel --> HighWheeler Caoutchouc --> HighWheeler - ` + `, }, { productionChain: 'glasses', @@ -148,7 +305,7 @@ export const productionChainsBase: TieredProductionChain[] = [ Brass(66.67%1) Sand --> Glass --> Glasses Copper & Zinc --> Brass --> Glasses - ` + `, }, { productionChain: 'pocketWatches', @@ -164,7 +321,7 @@ export const productionChainsBase: TieredProductionChain[] = [ style PocketWatches stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7; GoldOre & Coal --> Gold --> PocketWatches Sand --> Glass --> PocketWatches - ` + `, }, { productionChain: 'lightBulb', @@ -178,165 +335,8 @@ export const productionChainsBase: TieredProductionChain[] = [ Glass(50%1) Charcoal --> Filament --> LightBulb Sand --> Glass --> LightBulb - ` - } - ] + `, + }, + ], }, - { - colBreak: false, - tierName: 'Investors', - productionChains: [ - { - productionChain: 'champagne', - mermaidDefinition: endent` - flowchart LR - Sand(1) - Glass(1) - Champagne(1) - Grapes(4) - Sand --> Glass --> Champagne - Grapes --> Champagne - ` - }, - { - productionChain: 'steamCarriages', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - 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 - SteamMotors --> SteamCarriages - Wood & Caoutchouc --> Coaches --> SteamCarriages - ` - }, - { - productionChain: 'jewelry', - mermaidDefinition: endent` - flowchart LR - Charcoal(1) - GoldOre(5) - Gold(2) - Jewelry(1) - Pearls(3) - Charcoal & GoldOre --> Gold --> Jewelry - Pearls --> Jewelry - ` - }, - { - productionChain: 'gramophone', - chainMultiplier: '4', - mermaidDefinition: endent` - flowchart LR - Wood(25%1) - Marquetry(1) - Gramophone(1) - Copper(50%1) - Zinc(50%1) - Brass(1) - style Gramophone stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7 - Wood --> Marquetry --> Gramophone - Copper & Zinc --> Brass --> Gramophone - ` - } - ] - }, - { - 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` - flowchart LR - PlantainPlantation(1) - FishOil(1) - FriedPlantains(1) - PlantainPlantation & FishOil --> FriedPlantains - ` - }, - { - productionChain: 'ponchos', - mermaidDefinition: endent` - flowchart LR - AlpacaWool(1) - Ponchos(1) - AlpacaWool --> Ponchos - ` - }, - { - productionChain: 'tortillas', - mermaidDefinition: endent` - flowchart LR - Beef(2) - Corn(2) - Tortillas(1) - Beef & Corn --> Tortillas - ` - }, - { - productionChain: 'coffee', - mermaidDefinition: endent` - flowchart LR - CoffeeBeans(2) - Coffee(1) - CoffeeBeans --> Coffee - ` - }, - { - productionChain: 'bowlerHats', - mermaidDefinition: endent` - flowchart LR - Cotton(2) - CottonMill(1) - BowlerHats(1) - AlpacaWool(1) - Felt(1) - Cotton --> CottonMill --> BowlerHats - AlpacaWool --> Felt --> BowlerHats - ` - }, - { - productionChain: 'cigars', - chainMultiplier: '2', - mermaidDefinition: endent` - flowchart LR - Wood(50%1) - Marquetry(2) - Cigars(1) - Tobacco(4) - Wood --> Marquetry --> Cigars - Tobacco --> Cigars - ` - }, - { - productionChain: 'chocolate', - mermaidDefinition: endent` - flowchart LR - SugarCane(1) - Sugar(1) - Chocolate(1) - Cocoa(2) - SugarCane --> Sugar --> Chocolate - Cocoa --> Chocolate - ` - } - ] - } ]; diff --git a/src/pages/data/production-chains-misc.ts b/src/pages/data/production-chains-misc.ts index ddcccfa..e1dc2c8 100644 --- a/src/pages/data/production-chains-misc.ts +++ b/src/pages/data/production-chains-misc.ts @@ -279,7 +279,7 @@ export const productionChainsMisc: TieredProductionChain[] = [ }, { productionChain: 'heavyWeapons', - chainMultiplier: '2', + chainMultiplier: '4', mermaidDefinition: endent` flowchart LR Saltpeter(2)