diff --git a/src/assets/annoIcons/Bear_Hunting_Cabin.webp b/src/assets/annoIcons/Bear_Hunting_Cabin.webp new file mode 100644 index 0000000..77271f6 Binary files /dev/null and b/src/assets/annoIcons/Bear_Hunting_Cabin.webp differ diff --git a/src/assets/annoIcons/Caribou_Hunting_Cabin.webp b/src/assets/annoIcons/Caribou_Hunting_Cabin.webp new file mode 100644 index 0000000..ce25a96 Binary files /dev/null and b/src/assets/annoIcons/Caribou_Hunting_Cabin.webp differ diff --git a/src/assets/annoIcons/Champagne.webp b/src/assets/annoIcons/Champagne.webp new file mode 100644 index 0000000..2eb8cb4 Binary files /dev/null and b/src/assets/annoIcons/Champagne.webp differ diff --git a/src/assets/annoIcons/Chassis.webp b/src/assets/annoIcons/Chassis.webp new file mode 100644 index 0000000..f68846e Binary files /dev/null and b/src/assets/annoIcons/Chassis.webp differ diff --git a/src/assets/annoIcons/Goose_Farm.webp b/src/assets/annoIcons/Goose_Farm.webp new file mode 100644 index 0000000..2e57952 Binary files /dev/null and b/src/assets/annoIcons/Goose_Farm.webp differ diff --git a/src/assets/annoIcons/Gramophone.webp b/src/assets/annoIcons/Gramophone.webp new file mode 100644 index 0000000..4bcd95f Binary files /dev/null and b/src/assets/annoIcons/Gramophone.webp differ diff --git a/src/assets/annoIcons/Grapes.webp b/src/assets/annoIcons/Grapes.webp new file mode 100644 index 0000000..05c5dac Binary files /dev/null and b/src/assets/annoIcons/Grapes.webp differ diff --git a/src/assets/annoIcons/Husky_Farm.webp b/src/assets/annoIcons/Husky_Farm.webp new file mode 100644 index 0000000..ab45a9a Binary files /dev/null and b/src/assets/annoIcons/Husky_Farm.webp differ diff --git a/src/assets/annoIcons/Husky_Sled_Factory.webp b/src/assets/annoIcons/Husky_Sled_Factory.webp new file mode 100644 index 0000000..ae0b90a Binary files /dev/null and b/src/assets/annoIcons/Husky_Sled_Factory.webp differ diff --git a/src/assets/annoIcons/Icon_dried_meat_0.webp b/src/assets/annoIcons/Icon_dried_meat_0.webp new file mode 100644 index 0000000..9e8bd13 Binary files /dev/null and b/src/assets/annoIcons/Icon_dried_meat_0.webp differ diff --git a/src/assets/annoIcons/Icon_hibiscus_farm_0.webp b/src/assets/annoIcons/Icon_hibiscus_farm_0.webp new file mode 100644 index 0000000..017d307 Binary files /dev/null and b/src/assets/annoIcons/Icon_hibiscus_farm_0.webp differ diff --git a/src/assets/annoIcons/Icon_hibiscus_tea_0.webp b/src/assets/annoIcons/Icon_hibiscus_tea_0.webp new file mode 100644 index 0000000..3b0e170 Binary files /dev/null and b/src/assets/annoIcons/Icon_hibiscus_tea_0.webp differ diff --git a/src/assets/annoIcons/Icon_linen_fabric_0.webp b/src/assets/annoIcons/Icon_linen_fabric_0.webp new file mode 100644 index 0000000..13e5868 Binary files /dev/null and b/src/assets/annoIcons/Icon_linen_fabric_0.webp differ diff --git a/src/assets/annoIcons/Icon_linen_farm_0.webp b/src/assets/annoIcons/Icon_linen_farm_0.webp new file mode 100644 index 0000000..99fe86f Binary files /dev/null and b/src/assets/annoIcons/Icon_linen_farm_0.webp differ diff --git a/src/assets/annoIcons/Icon_traditional_clothing_0.webp b/src/assets/annoIcons/Icon_traditional_clothing_0.webp new file mode 100644 index 0000000..8c1faf6 Binary files /dev/null and b/src/assets/annoIcons/Icon_traditional_clothing_0.webp differ diff --git a/src/assets/annoIcons/Icon_watusi_0.webp b/src/assets/annoIcons/Icon_watusi_0.webp new file mode 100644 index 0000000..f62c45b Binary files /dev/null and b/src/assets/annoIcons/Icon_watusi_0.webp differ diff --git a/src/assets/annoIcons/Jewelry.webp b/src/assets/annoIcons/Jewelry.webp new file mode 100644 index 0000000..3ef0f4e Binary files /dev/null and b/src/assets/annoIcons/Jewelry.webp differ diff --git a/src/assets/annoIcons/Oil_Lamp_Factory.webp b/src/assets/annoIcons/Oil_Lamp_Factory.webp new file mode 100644 index 0000000..51d37d4 Binary files /dev/null and b/src/assets/annoIcons/Oil_Lamp_Factory.webp differ diff --git a/src/assets/annoIcons/Parka_Factory.webp b/src/assets/annoIcons/Parka_Factory.webp new file mode 100644 index 0000000..636508f Binary files /dev/null and b/src/assets/annoIcons/Parka_Factory.webp differ diff --git a/src/assets/annoIcons/Pearls.webp b/src/assets/annoIcons/Pearls.webp new file mode 100644 index 0000000..7fa5ee4 Binary files /dev/null and b/src/assets/annoIcons/Pearls.webp differ diff --git a/src/assets/annoIcons/Pemmican_Cookhouse.webp b/src/assets/annoIcons/Pemmican_Cookhouse.webp new file mode 100644 index 0000000..5332853 Binary files /dev/null and b/src/assets/annoIcons/Pemmican_Cookhouse.webp differ diff --git a/src/assets/annoIcons/Salt.webp b/src/assets/annoIcons/Salt.webp new file mode 100644 index 0000000..6ea3c4e Binary files /dev/null and b/src/assets/annoIcons/Salt.webp differ diff --git a/src/assets/annoIcons/Seal_Hunting_Docks.webp b/src/assets/annoIcons/Seal_Hunting_Docks.webp new file mode 100644 index 0000000..c751783 Binary files /dev/null and b/src/assets/annoIcons/Seal_Hunting_Docks.webp differ diff --git a/src/assets/annoIcons/Sled_Frame_Factory.webp b/src/assets/annoIcons/Sled_Frame_Factory.webp new file mode 100644 index 0000000..ab6915b Binary files /dev/null and b/src/assets/annoIcons/Sled_Frame_Factory.webp differ diff --git a/src/assets/annoIcons/Sleeping_Bag_Factory.webp b/src/assets/annoIcons/Sleeping_Bag_Factory.webp new file mode 100644 index 0000000..83be51d Binary files /dev/null and b/src/assets/annoIcons/Sleeping_Bag_Factory.webp differ diff --git a/src/assets/annoIcons/Steam_carriages.webp b/src/assets/annoIcons/Steam_carriages.webp new file mode 100644 index 0000000..7f9b953 Binary files /dev/null and b/src/assets/annoIcons/Steam_carriages.webp differ diff --git a/src/assets/annoIcons/Whaling_Station.webp b/src/assets/annoIcons/Whaling_Station.webp new file mode 100644 index 0000000..c02fc7e Binary files /dev/null and b/src/assets/annoIcons/Whaling_Station.webp differ diff --git a/src/components/ChainTiers.vue b/src/components/ChainTiers.vue index 59b97f8..1717384 100644 --- a/src/components/ChainTiers.vue +++ b/src/components/ChainTiers.vue @@ -3,7 +3,7 @@ flat bordered square - :class="['bg-grey-3', 'q-ma-sm', 'border', 'col-2', 'text-center']" + :class="['bg-grey-3', 'q-ma-sm', 'border', 'text-center']" >
@@ -18,16 +18,9 @@ + diff --git a/src/components/ProductionChain.vue b/src/components/ProductionChain.vue index 2532d00..6461a3d 100644 --- a/src/components/ProductionChain.vue +++ b/src/components/ProductionChain.vue @@ -38,13 +38,13 @@ watchEffect(() => { .ratio-count { font-weight: bold; - font-size: 1.5rem; + font-size: 1.9rem; text-align: center; } .efficiency-perc { font-weight: bold; - font-size: 1.5rem; + font-size: 1.9rem; color: $green-9 !important; } @@ -53,7 +53,7 @@ watchEffect(() => { } .electricity-icon { - width: 30px; + width: 40px; margin-bottom: -5px; } diff --git a/src/components/models.ts b/src/components/models.ts index 5a061f2..a5e5241 100644 --- a/src/components/models.ts +++ b/src/components/models.ts @@ -1,6 +1,5 @@ export interface TieredProductionChain { tierName: string; - width: number; productionChains: ProductionChain[]; } diff --git a/src/components/production-chains.ts b/src/components/production-chains.ts index 43096d7..205568b 100644 --- a/src/components/production-chains.ts +++ b/src/components/production-chains.ts @@ -61,7 +61,14 @@ import pocketWatchesIcon from '../assets/annoIcons/Pocket_watch.webp'; import filamentIcon from '../assets/annoIcons/Carbon_filament.webp'; import lightBulbIcon from '../assets/annoIcons/Light_bulb.webp'; -// Jornaleros +// Investors +import grapesIcon from '../assets/annoIcons/Grapes.webp'; +import champagneIcon from '../assets/annoIcons/Champagne.webp'; +import pearlsIcon from '../assets/annoIcons/Pearls.webp'; +import jewelryIcon from '../assets/annoIcons/Jewelry.webp'; +import gramophoneIcon from '../assets/annoIcons/Gramophone.webp'; + +// Jornaleros & Obreros import cottonIcon from '../assets/annoIcons/Cotton.webp'; import cottonMillIcon from '../assets/annoIcons/Cotton_fabric.webp'; import plantainPlantationIcon from '../assets/annoIcons/Plantains.webp'; @@ -82,6 +89,32 @@ import sugarIcon from '../assets/annoIcons/Sugar.webp'; import cocoaIcon from '../assets/annoIcons/Cocoa.webp'; import chocolateIcon from '../assets/annoIcons/Chocolate.webp'; +// Explorers +import whalingIcon from '../assets/annoIcons/Whaling_Station.webp'; +import caribouIcon from '../assets/annoIcons/Caribou_Hunting_Cabin.webp'; +import pemmicanIcon from '../assets/annoIcons/Pemmican_Cookhouse.webp'; +import sealIcon from '../assets/annoIcons/Seal_Hunting_Docks.webp'; +import gooseIcon from '../assets/annoIcons/Goose_Farm.webp'; +import sleepingBagIcon from '../assets/annoIcons/Sleeping_Bag_Factory.webp'; +import oilLampIcon from '../assets/annoIcons/Oil_Lamp_Factory.webp'; + +// Technicians +import bearIcon from '../assets/annoIcons/Bear_Hunting_Cabin.webp'; +import parkasIcon from '../assets/annoIcons/Parka_Factory.webp'; +import sledFrameIcon from '../assets/annoIcons/Sled_Frame_Factory.webp'; +import huskyIcon from '../assets/annoIcons/Husky_Farm.webp'; +import huskySledIcon from '../assets/annoIcons/Husky_Sled_Factory.webp'; + +// Shepherds +import linseedIcon from '../assets/annoIcons/Icon_linen_farm_0.webp'; +import linenIcon from '../assets/annoIcons/Icon_linen_fabric_0.webp'; +import embroidererIcon from '../assets/annoIcons/Icon_traditional_clothing_0.webp'; +import saltIcon from '../assets/annoIcons/Salt.webp'; +import sangaIcon from '../assets/annoIcons/Icon_watusi_0.webp'; +import dryHouseIcon from '../assets/annoIcons/Icon_dried_meat_0.webp'; +import hibiscusFarmIcon from '../assets/annoIcons/Icon_hibiscus_farm_0.webp'; +import hibiscusTeaIcon from '../assets/annoIcons/Icon_hibiscus_tea_0.webp'; + // Weapons import weaponsIcon from '../assets/annoIcons/Weapons.webp'; import saltpeterIcon from '../assets/annoIcons/Saltpeter.webp'; @@ -90,12 +123,13 @@ import heavyWeaponsIcon from '../assets/annoIcons/Advanced_weapons.webp'; // Machinery import steamMotorsIcon from '../assets/annoIcons/Steam_motors.webp'; +import coachMakersIcon from '../assets/annoIcons/Chassis.webp'; +import steamCarriagesIcon from '../assets/annoIcons/Steam_carriages.webp'; // Production Chains export const productionChains: TieredProductionChain[] = [ { tierName: 'Building Materials', - width: 1, productionChains: [ { productionChain: 'timber', @@ -121,7 +155,6 @@ export const productionChains: TieredProductionChain[] = [ }, { tierName: 'Farmers | Workers', - width: 1, productionChains: [ { productionChain: 'workClothes', @@ -151,7 +184,6 @@ export const productionChains: TieredProductionChain[] = [ }, { tierName: 'Artisans', - width: 1, productionChains: [ { productionChain: 'cannedFood', @@ -173,7 +205,6 @@ export const productionChains: TieredProductionChain[] = [ }, { tierName: 'Jornaleros | Obreros', - width: 1, productionChains: [ { productionChain: 'plantains', @@ -207,7 +238,6 @@ export const productionChains: TieredProductionChain[] = [ }, { tierName: 'Engineers', - width: 1, productionChains: [ { productionChain: 'highWheeler', @@ -227,9 +257,72 @@ export const productionChains: TieredProductionChain[] = [ } ] }, + { + tierName: 'Explorers', + productionChains: [ + { + productionChain: 'pemmican', + mermaidDefinition: `flowchart LR; Whaling(1) & Caribou(1) --> Pemmican(1)` + }, + { + productionChain: 'sleepingBag', + mermaidDefinition: `flowchart LR; Seal(50%1) & Goose(2) --> SleepingBag(1)` + }, + { + productionChain: 'oilLamp', + mermaidDefinition: `flowchart LR; Copper(50%1) & Zinc(50%1) --> Brass(1) --> OilLamp(1); Whaling(1) --> OilLamp` + } + ] + }, + { + tierName: 'Technicians', + productionChains: [ + { + productionChain: 'parkas', + mermaidDefinition: `flowchart LR; Bears(1) & Seal(33%1) --> Parkas(1)` + }, + { + productionChain: 'huskySled', + mermaidDefinition: `flowchart LR; Wood(25%1) & Seal(50%1) --> SledFrame(1) --> HuskySled(1); Husky(2) --> HuskySled` + } + ] + }, + { + tierName: 'Investors', + productionChains: [ + { + productionChain: 'champagne', + mermaidDefinition: `flowchart LR; Sand(1) --> GlassMakers(1) --> Champagne(1); Grapes(4) --> Champagne` + }, + { + productionChain: 'jewelry', + mermaidDefinition: `flowchart LR; Charcoal(1) & GoldOre(5) --> Gold(2) -->Jewelry(1); Pearls(3) --> Jewelry` + }, + { + productionChain: 'gramophone', + mermaidDefinition: `flowchart LR; Wood(25%1) --> WoodVeneers(1) --> Gramophone(1); Copper(50%1) & Zinc(50%1) --> Brass(1) --> Gramophone` + } + ] + }, + { + tierName: 'Shepherds', + productionChains: [ + { + productionChain: 'finery', + mermaidDefinition: `flowchart LR; Linseed(2) --> Linen(1) --> Embroidery(2)` + }, + { + productionChain: 'driedMeat', + mermaidDefinition: `flowchart LR; Salt(1) & Sanga(2) --> DryHouse(1)` + }, + { + productionChain: 'hibiscusTea', + mermaidDefinition: `flowchart LR; HibiscusFarm(2) --> HibiscusTea(3)` + } + ] + }, { tierName: 'Weapons', - width: 2, productionChains: [ { productionChain: 'weapons', @@ -243,7 +336,6 @@ export const productionChains: TieredProductionChain[] = [ }, { tierName: 'Sails', - width: 1, productionChains: [ { productionChain: 'oldWorldSails', @@ -257,11 +349,14 @@ export const productionChains: TieredProductionChain[] = [ }, { tierName: 'Machinery', - width: 1, productionChains: [ { productionChain: 'steamMotors', mermaidDefinition: `flowchart LR; Coal(1) & Iron(1) --> Steel(2) --> SteamMotors(3); Copper(2) & Zinc(2) --> Brass(4) --> SteamMotors` + }, + { + productionChain: 'steamCarriages', + mermaidDefinition: `flowchart LR; SteamMotors(3) --> SteamCarriages(2); Wood(1) & Caoutchouc(4) --> CoachMakers(8) --> SteamCarriages` } ] } diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index e27d01a..8b08ee1 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -64,6 +64,6 @@ function toggleLeftDrawer() { } .custom-width { - width: 5000px; + width: 5100px; }