Merge branch 'feature/season4' into main

src/components/InfoCard.vue

@@ -1,13 +1,13 @@
 <template>
   <q-list separator class="big-font text-left">
     <slot></slot>
-    <InfoCardItemWorld
+    <InfoCardItemWorldIcon
-      v-for="item in itemWorldData"
+      v-for="item in infoCardItemWorldData"
       :key="item.icon"
       v-bind="item"
-    ></InfoCardItemWorld>
+    ></InfoCardItemWorldIcon>
     <InfoCardItem
-      v-for="item in itemData"
+      v-for="item in infoCardItemData"
       :key="item.icon"
       v-bind="item"
     ></InfoCardItem>
@@ -16,15 +16,15 @@
 
 <script setup lang="ts">
 import InfoCardItem from './InfoCard/InfoCardItem.vue';
-import InfoCardItemWorld from './InfoCard/InfoCardItemWorld.vue';
+import InfoCardItemWorldIcon from './InfoCard/InfoCardItemWorldIcon.vue';
 import {
   InfoCardItem as InfoCardItemModel,
-  InfoCardWorldItem as InfoCardWorldItemModel
+  InfoCardItemWorldIcon as InfoCardItemWorldIconModel
 } from 'pages/data/models';
 
 defineProps<{
-  itemData?: InfoCardItemModel[];
+  infoCardItemData?: InfoCardItemModel[];
-  itemWorldData?: InfoCardWorldItemModel[];
+  infoCardItemWorldData?: InfoCardItemWorldIconModel[];
 }>();
 </script>
 

src/pages/AnnoBase.vue

@@ -5,15 +5,14 @@
         <div class="flex-break hidden item"></div>
         <div class="flex-break item"></div>
         <div class="flex-break item"></div>
-        <div class="flex-break item"></div>
         <ChainTiers
           :title="expansionInfoItem.title"
           :col-break="false"
           class="masonry-col item"
         >
           <InfoCard
-            :item-data="itemDataBase"
+            :info-card-item-data="baseItemData"
-            :item-world-data="worldItemDataBase"
+            :info-card-item-world-data="baseItemWorldData"
           >
             <InfoCardItem v-bind="expansionInfoItem"></InfoCardItem>
           </InfoCard>
@@ -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({
 
 <style lang="scss">
 // Masonry Layout - 5 cols
-$column: 4;
+$column: 3;
 
 .flex-break {
   flex: 1 0 100% !important;
@@ -89,7 +88,7 @@ $column: 4;
 }
 
 .masonry-container {
-  height: 4100px;
+  height: 4400px;
 
   .masonry-col {
     width: 1000px;
@@ -100,6 +99,6 @@ $column: 4;
 }
 
 .custom-width {
-  width: 4200px;
+  width: 3150px;
 }
 </style>

src/pages/AnnoMisc.vue

@@ -10,7 +10,10 @@
           :col-break="false"
           class="masonry-col item"
         >
-          <InfoCard>
+          <InfoCard
+            :info-card-item-data="miscItemData"
+            :info-card-item-world-data="miscItemWorldData"
+          >
             <InfoCardItem v-bind="expansionInfoItem"></InfoCardItem>
           </InfoCard>
         </ChainTiers>
@@ -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: 3900px;
+  height: 4510px;
 
   .masonry-col {
     width: 1000px;
@@ -93,6 +99,6 @@ $column: 3;
 }
 
 .custom-width {
-  width: 3200px;
+  width: 3150px;
 }
 </style>

src/pages/AnnoSeason1.vue

@@ -9,7 +9,10 @@
           :col-break="false"
           class="masonry-col item"
         >
-          <InfoCard>
+          <InfoCard
+            :info-card-item-data="season1ItemData"
+            :info-card-item-world-data="season1ItemWorldData"
+          >
             <InfoCardItem v-bind="expansionInfoItem"></InfoCardItem>
           </InfoCard>
         </ChainTiers>
@@ -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;

src/pages/AnnoSeason2.vue

@@ -10,7 +10,10 @@
           :col-break="false"
           class="masonry-col item"
         >
-          <InfoCard>
+          <InfoCard
+            :info-card-item-data="season2ItemData"
+            :info-card-item-world-data="season2ItemWorldData"
+          >
             <InfoCardItem v-bind="expansionInfoItem"></InfoCardItem>
           </InfoCard>
         </ChainTiers>
@@ -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';
 

src/pages/AnnoSeason3.vue

@@ -11,7 +11,10 @@
           :col-break="false"
           class="masonry-col item"
         >
-          <InfoCard>
+          <InfoCard
+            :info-card-item-data="season3ItemData"
+            :info-card-item-world-data="season3ItemWorldData"
+          >
             <InfoCardItem v-bind="expansionInfoItem"></InfoCardItem>
           </InfoCard>
         </ChainTiers>
@@ -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';
 
@@ -83,7 +92,7 @@ $column: 4;
 }
 
 .masonry-container {
-  height: 7690px;
+  height: 8250px;
 
   .masonry-col {
     width: 1000px;

src/pages/AnnoSeason4.vue

@@ -10,7 +10,10 @@
           :col-break="false"
           class="masonry-col item"
         >
-          <InfoCard>
+          <InfoCard
+            :info-card-item-data="season4ItemData"
+            :info-card-item-world-data="season4ItemWorldData"
+          >
             <InfoCardItem v-bind="expansionInfoItem"></InfoCardItem>
           </InfoCard>
         </ChainTiers>
@@ -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;

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,

src/pages/data/info-card.ts

@@ -1,19 +1,76 @@
 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[] = [
+// 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.'
   },
-  {
-    id: 'airship',
-    icon: icons.airshipIcon,
-    text: 'Airship drop chain ratios are the same for Old World & New World.'
-  },
   {
     id: 'electricity',
     icon: icons.electricityIcon,
@@ -27,34 +84,38 @@ export const commonItemData: InfoCardItem[] = [
   }
 ];
 
-const commonWorldItemData: InfoCardWorldItem[] = [
+export const baseItemWorldData: InfoCardItemWorldIcon[] = [
+  {
+    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
-  },
-  {
-    id: 'hacienda',
-    icon: icons.haciendaIcon,
-    textPre: 'Hacienda chains use New World',
-    textPost: 'buildings.',
-    worldIcon: icons.newWorldIcon
   }
 ];
 
-export const itemDataBase: InfoCardItem[] = [...commonItemData];
+// Misc
-
+export const miscItemData: InfoCardItem[] = [
-export const worldItemDataBase: InfoCardWorldItem[] = [
-  ...commonWorldItemData,
   {
-    id: 'furs',
+    id: 'electricity',
-    icon: icons.fursIcon,
+    icon: icons.electricityIcon,
-    textPre: 'Furs use Old World',
+    text: 'Building requires electricity.'
-    textPost: 'production rates.',
-    worldIcon: icons.oldWorldIcon
   },
+  {
+    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,
@@ -64,16 +125,87 @@ export const worldItemDataBase: InfoCardWorldItem[] = [
   }
 ];
 
-// S2 to S4
+// S1
-// export const itemDataExpansions: InfoCardItem[] = [, ...commonItemData];
+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[] = [];
 
-// export const worldItemDataExpansions: InfoCardWorldItem[] = [
+// S2
-//   ...commonWorldItemData,
+export const season2ItemData: InfoCardItem[] = [
-//   {
+  {
-//     id: 'hacienda',
+    id: 'electricity',
-//     icon: icons.haciendaIcon,
+    icon: icons.electricityIcon,
-//     textPre: 'Hacienda chains use New World',
+    text: 'Building requires electricity.'
-//     textPost: 'buildings.',
+  },
-//     worldIcon: icons.newWorldIcon
+  {
-//   }
+    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[] = [
+  {
+    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[] = [
+  {
+    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
+  }
+];

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;

src/pages/data/production-chains-base.ts

@@ -28,7 +28,6 @@ export const productionChainsBase: TieredProductionChain[] = [
       },
       {
         productionChain: 'sausages',
-        chainMultiplier: '2',
         mermaidDefinition: endent`
         flowchart LR
         Pig(<img src='${icons.pigsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
@@ -81,11 +80,11 @@ export const productionChainsBase: TieredProductionChain[] = [
         chainMultiplier: '6',
         mermaidDefinition: endent`
         flowchart LR
-        Beef(<span class='icon-flex-row'><img src='${icons.beefIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>2</span></span></span>)
+        Beef(<span class='icon-flex-row'><img src='${icons.beefIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
-        RedPepper(<span class='icon-flex-row'><img src='${icons.redPeppersIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>2</span></span></span>)
+        RedPepper(<span class='icon-flex-row'><img src='${icons.redPeppersIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
-        ArtisnalKitchen(<span class='icon-flex-row'><img src='${icons.artisnalKitchenIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>2</span></span></span>)
+        ArtisnalKitchen(<span class='icon-flex-row'><img src='${icons.artisnalKitchenIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
         Cannery(<img src='${icons.cannedFoodIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
         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(<img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
-        Rum(<img src='${icons.rumIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        SugarCane & Wood --> Rum
-        `
-      },
       {
         productionChain: 'furs',
         mermaidDefinition: endent`
@@ -157,7 +145,7 @@ export const productionChainsBase: TieredProductionChain[] = [
         Glasses(<img src='${icons.glassesIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         Copper(<span class='icon-flex-row'><img src='${icons.copperIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
         Zinc(<span class='icon-flex-row'><img src='${icons.zincIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        Brass(<span class='icon-flex-row'><img src='${icons.brassIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>1</span></span></span>)
+        Brass(<span class='icon-flex-row'><img src='${icons.brassIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
         Sand --> Glass --> Glasses
         Copper & Zinc --> Brass --> Glasses
         `
@@ -169,10 +157,10 @@ export const productionChainsBase: TieredProductionChain[] = [
         flowchart LR
         GoldOre(<span class='icon-flex-row'><img src='${icons.goldOreIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>83.33%</span><span class='ratio-count'>4</span></span></span>)
         Coal(<span class='icon-flex-row'><img src='${icons.coalIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        Gold(<span class='icon-flex-row'><img src='${icons.goldIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>2</span></span></span>)
+        Gold(<span class='icon-flex-row'><img src='${icons.goldIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
         PocketWatches(<img src='${icons.pocketWatchesIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Sand(<span class='icon-flex-row'><img src='${icons.sandIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>1</span></span></span>)
+        Sand(<span class='icon-flex-row'><img src='${icons.sandIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
-        Glass(<span class='icon-flex-row'><img src='${icons.glassIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>1</span></span></span>)
+        Glass(<span class='icon-flex-row'><img src='${icons.glassIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
         style PocketWatches stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7;
         GoldOre & Coal --> Gold --> PocketWatches
         Sand --> Glass --> PocketWatches
@@ -210,6 +198,23 @@ export const productionChainsBase: TieredProductionChain[] = [
         Grapes --> Champagne
         `
       },
+      {
+        productionChain: 'steamCarriages',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        SteamMotors(<span class='icon-flex-row'><img src='${icons.steamMotorsIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>150%</span><span class='ratio-count'>2</span></span></span>); style SteamMotors stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7;
+        SteamCarriages(<img src='${icons.steamCarriagesIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Caoutchouc(<img src='${icons.caoutchoucIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
+        Coaches(<img src='${icons.coachMakersIcon}' class='icon-size' /><span class='ratio-count'>4</span>)
+        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 +250,17 @@ export const productionChainsBase: TieredProductionChain[] = [
     colBreak: false,
     tierName: 'Jornaleros | Obreros',
     productionChains: [
+      {
+        productionChain: 'rum',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        SugarCane(<img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Rum(<img src='${icons.rumIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        SugarCane & Wood --> Rum
+        `
+      },
       {
         productionChain: 'plantains',
         mermaidDefinition: endent`
@@ -322,106 +338,5 @@ export const productionChainsBase: TieredProductionChain[] = [
         `
       }
     ]
-  },
-  {
-    colBreak: false,
-    tierName: 'Machinery',
-    productionChains: [
-      {
-        productionChain: 'steamMotors',
-        mermaidDefinition: endent`
-        flowchart LR
-        Coal(<img src='${icons.coalIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Iron(<img src='${icons.ironIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Steel(<img src='${icons.steelIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
-        SteamMotors(<img src='${icons.steamMotorsIcon}' class='icon-size' /><span class='ratio-count'>3</span>)
-        Copper(<img src='${icons.copperIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
-        Zinc(<img src='${icons.zincIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
-        Brass(<img src='${icons.brassIcon}' class='icon-size' /><span class='ratio-count'>4</span>)
-        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(<img src='${icons.steamMotorsIcon}' class='icon-size' /><span class='ratio-count'>3</span>)
-        SteamCarriages(<img src='${icons.steamCarriagesIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
-        Wood(<img src='${icons.woodIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Caoutchouc(<img src='${icons.caoutchoucIcon}' class='icon-size' /><span class='ratio-count'>4</span>)
-        Coaches(<img src='${icons.coachMakersIcon}' class='icon-size' /><span class='ratio-count'>8</span>)
-        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(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
-        Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        Weapons(<img src='${icons.weaponsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        CharcoalKiln & Iron --> Steel --> Weapons
-        `
-      },
-      {
-        productionChain: 'heavyWeapons',
-        chainMultiplier: '2',
-        mermaidDefinition: endent`
-        flowchart LR
-        Saltpeter(<img src='${icons.saltpeterIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
-        Dynamite(<img src='${icons.dynamiteIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        HeavyWeapons(<img src='${icons.heavyWeaponsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Pig(<img src='${icons.pigsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Tallow(<img src='${icons.tallowIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Dynamite
-        Charcoal(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
-        Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>25%</span><span class='ratio-count'>1</span></span></span>)
-        Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
-        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(<img src='${icons.woolIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Sailmakers(<img src='${icons.sailmakersIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Wool --> Sailmakers
-        `
-      },
-      {
-        productionChain: 'newWorldSails',
-        mermaidDefinition: endent`
-        flowchart LR
-        Cotton(<img src='${icons.cottonIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
-        CottonMill(<img src='${icons.cottonMillIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Sailmakers(<img src='${icons.sailmakersIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Cotton --> CottonMill --> Sailmakers
-        `
-      }
-    ]
   }
 ];

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(<img src='${icons.coalIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Charcoal(<img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
+        Coal --> Charcoal
+        `
+      },
+      {
+        productionChain: 'goldRatio',
+        mermaidDefinition: endent`
+        flowchart LR
+        ArcticGold(<span class='icon-flex-row'><img src='${icons.goldOreIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.arcticIcon}' class='electricity-icon' /></span><span class='ratio-count'>1</span></span></span>)
+        NewWorldGold(<span class='icon-flex-row'><img src='${icons.goldOreIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.newWorldIcon}' class='electricity-icon' /></span><span class='ratio-count'>2.5</span></span></span>)
+        ArcticGold --> NewWorldGold
+        `
+      },
+      {
+        productionChain: 'furRatio',
+        mermaidDefinition: endent`
+        flowchart LR
+        ArcticFur(<span class='icon-flex-row'><img src='${icons.fursIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.arcticIcon}' class='electricity-icon' /></span><span class='ratio-count'>1</span></span></span>)
+        OldWorldFur(<span class='icon-flex-row'><img src='${icons.fursIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.oldWorldIcon}' class='electricity-icon' /></span><span class='ratio-count'>4</span></span></span>)
+        ArcticFur --> OldWorldFur
+        `
+      },
+      {
+        productionChain: 'clayRatio',
+        mermaidDefinition: endent`
+        flowchart LR
+        EnbesaClay(<span class='icon-flex-row'><img src='${icons.clayIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.enbesaIcon}' class='electricity-icon' /></span><span class='ratio-count'>1</span></span></span>)
+        OldWorldClay(<span class='icon-flex-row'><img src='${icons.clayIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.oldWorldIcon}' class='electricity-icon' /></span><span class='ratio-count'>2</span></span></span>)
+        EnbesaClay --> OldWorldClay
+        `
+      }
+    ]
+  },
+  {
+    colBreak: false,
+    tierName: 'Electricity',
+    productionChains: [
+      {
+        productionChain: 'oilPowerPlant',
+        mermaidDefinition: endent`
+        flowchart LR
+        OilWell(<img src='${icons.oilWellIcon}' class='icon-size' /><span class='ratio-count'>3</span>)
+        OilPowerPlant(<img src='${icons.oilPowerPlantIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        OilWell --> OilPowerPlant
+        `
+      },
+      {
+        productionChain: 'oilTanker',
+        mermaidDefinition: endent`
+        flowchart LR
+        OilTanker(<img src='${icons.oilTankerIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        OilPowerPlant(<img src='${icons.oilPowerPlantIcon}' class='icon-size' /><span class='ratio-count'>2-3</span>)
+        OilTanker --> OilPowerPlant
+        `
+      },
+      {
+        productionChain: 'gasPowerPlant',
+        mermaidDefinition: endent`
+        flowchart LR
+        Gas(<img src='${icons.gasIcon}' class='icon-size' /><span class='ratio-count'>6</span>)
+        GasPlant(<img src='${icons.gasPowerPlantIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Gas --> GasPlant
+        `
+      }
+    ]
+  },
   {
     colBreak: false,
     tierName: 'Building Materials | Construction',
@@ -32,9 +107,9 @@ export const productionChainsMisc: TieredProductionChain[] = [
         chainMultiplier: '3',
         mermaidDefinition: endent`
         flowchart LR
-        CharcoalKiln(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>1</span></span></span>)
+        CharcoalKiln(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
         Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>1</span></span></span>)
+        Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
         SteelBeams(<img src='${icons.steelBeamsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         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(<img src='${icons.coalIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Charcoal(<img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
-        Coal --> Charcoal
-        `
-      },
-      {
-        productionChain: 'goldRatio',
-        mermaidDefinition: endent`
-        flowchart LR
-        ArcticGold(<span class='icon-flex-row'><img src='${icons.goldOreIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.arcticIcon}' class='electricity-icon' /></span><span class='ratio-count'>1</span></span></span>)
-        NewWorldGold(<span class='icon-flex-row'><img src='${icons.goldOreIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.newWorldIcon}' class='electricity-icon' /></span><span class='ratio-count'>2.5</span></span></span>)
-        ArcticGold --> NewWorldGold
-        `
-      },
-      {
-        productionChain: 'furRatio',
-        mermaidDefinition: endent`
-        flowchart LR
-        ArcticFur(<span class='icon-flex-row'><img src='${icons.fursIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.arcticIcon}' class='electricity-icon' /></span><span class='ratio-count'>1</span></span></span>)
-        OldWorldFur(<span class='icon-flex-row'><img src='${icons.fursIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.oldWorldIcon}' class='electricity-icon' /></span><span class='ratio-count'>4</span></span></span>)
-        ArcticFur --> OldWorldFur
-        `
-      },
-      {
-        productionChain: 'clayRatio',
-        mermaidDefinition: endent`
-        flowchart LR
-        EnbesaClay(<span class='icon-flex-row'><img src='${icons.clayIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.enbesaIcon}' class='electricity-icon' /></span><span class='ratio-count'>1</span></span></span>)
-        OldWorldClay(<span class='icon-flex-row'><img src='${icons.clayIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.oldWorldIcon}' class='electricity-icon' /></span><span class='ratio-count'>2</span></span></span>)
-        EnbesaClay --> OldWorldClay
-        `
-      }
-    ]
-  },
-  {
-    colBreak: false,
-    tierName: 'Electricity',
-    productionChains: [
-      {
-        productionChain: 'oilPowerPlant',
-        mermaidDefinition: endent`
-        flowchart LR
-        OilWell(<img src='${icons.oilWellIcon}' class='icon-size' /><span class='ratio-count'>3</span>)
-        OilPowerPlant(<img src='${icons.oilPowerPlantIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        OilWell --> OilPowerPlant
-        `
-      },
-      {
-        productionChain: 'oilTanker',
-        mermaidDefinition: endent`
-        flowchart LR
-        OilTanker(<img src='${icons.oilTankerIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        OilPowerPlant(<img src='${icons.oilPowerPlantIcon}' class='icon-size' /><span class='ratio-count'>2-3</span>)
-        OilTanker --> OilPowerPlant
-        `
-      },
-      {
-        productionChain: 'gasPowerPlant',
-        mermaidDefinition: endent`
-        flowchart LR
-        Gas(<img src='${icons.gasIcon}' class='icon-size' /><span class='ratio-count'>6</span>)
-        GasPlant(<img src='${icons.gasPowerPlantIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Gas --> GasPlant
-        `
-      }
-    ]
-  },
-  { colBreak: true, tierName: 'skip' },
   {
     colBreak: false,
     tierName: 'Fuel | Silo',
@@ -254,14 +253,106 @@ export const productionChainsMisc: TieredProductionChain[] = [
         productionChain: 'siloss3',
         mermaidDefinition: endent`
         flowchart LR
-        Dung(<img src='${icons.dungIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Dung(<span class='icon-flex-row'><img src='${icons.dungIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span><img src='${icons.alpacaWoolIcon}' class='electricity-icon' /></span><span class='ratio-count'>3</span></span></span>)
         Fertiliser(<img src='${icons.fertiliserIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Silo(<img src='${icons.siloIcon}' class='icon-size' /><span class='ratio-count'>5</span>)
+        Silo(<img src='${icons.siloIcon}' class='icon-size' /><span class='ratio-count'>10</span>)
         Dung --> Fertiliser --> Silo
         `
       }
     ]
   },
+  {
+    colBreak: false,
+    tierName: 'Weapons',
+    productionChains: [
+      {
+        productionChain: 'weapons',
+        chainMultiplier: '6',
+        mermaidDefinition: endent`
+        flowchart LR
+        CharcoalKiln(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
+        Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
+        Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
+        Weapons(<img src='${icons.weaponsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        CharcoalKiln & Iron --> Steel --> Weapons
+        `
+      },
+      {
+        productionChain: 'heavyWeapons',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Saltpeter(<img src='${icons.saltpeterIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
+        Dynamite(<img src='${icons.dynamiteIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        HeavyWeapons(<img src='${icons.heavyWeaponsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Pig(<img src='${icons.pigsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Tallow(<img src='${icons.tallowIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Dynamite
+        Charcoal(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>25%</span><span class='ratio-count'>1</span></span></span>)
+        Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        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(<img src='${icons.woolIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Sailmakers(<img src='${icons.sailmakersIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Wool --> Sailmakers
+        `
+      },
+      {
+        productionChain: 'newWorldSails',
+        mermaidDefinition: endent`
+        flowchart LR
+        Cotton(<img src='${icons.cottonIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
+        CottonMill(<img src='${icons.cottonMillIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Sailmakers(<img src='${icons.sailmakersIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Cotton --> CottonMill --> Sailmakers
+        `
+      }
+    ]
+  },
+  { colBreak: true, tierName: 'skip' },
+  { colBreak: true, tierName: 'skip' },
+  {
+    colBreak: false,
+    tierName: 'Machinery',
+    productionChains: [
+      {
+        productionChain: 'steamMotors',
+        chainMultiplier: '3',
+        mermaidDefinition: endent`
+        flowchart LR
+        SteamMotors(<img src='${icons.steamMotorsIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Coal(<span class='icon-flex-row'><img src='${icons.coalIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
+        Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
+        Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
+        Copper(<span class='icon-flex-row'><img src='${icons.copperIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
+        Zinc(<span class='icon-flex-row'><img src='${icons.zincIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
+        Brass(<span class='icon-flex-row'><img src='${icons.brassIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
+        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',

src/pages/data/production-chains-season-2.ts

@@ -34,7 +34,7 @@ export const productionChainsSeason2: TieredProductionChain[] = [
         chainMultiplier: '3',
         mermaidDefinition: endent`
         flowchart LR
-        HibiscusFarm(<span class='icon-flex-row'><img src='${icons.hibiscusFarmIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>1</span></span></span>)
+        HibiscusFarm(<span class='icon-flex-row'><img src='${icons.hibiscusFarmIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>1</span></span></span>)
         HibiscusTea(<img src='${icons.hibiscusTeaIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         HibiscusFarm --> HibiscusTea
         `
@@ -87,8 +87,8 @@ export const productionChainsSeason2: TieredProductionChain[] = [
         chainMultiplier: '6',
         mermaidDefinition: endent`
         flowchart LR
-        Clay(<span class='icon-flex-row icon-regional-container'><img src='${icons.enbesaIcon}' class='icon-regional' /><img src='${icons.clayIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Clay(<span class='icon-flex-row icon-regional-container'><img src='${icons.enbesaIcon}' class='icon-regional' /><img src='${icons.clayIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
-        Tobacco(<span class='icon-flex-row'><img src='${icons.tobaccoIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>2</span></span></span>)
+        Tobacco(<span class='icon-flex-row'><img src='${icons.tobaccoIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
         Pipes(<img src='${icons.pipesIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         Clay & Tobacco --> Pipes
         `
@@ -156,10 +156,10 @@ export const productionChainsSeason2: TieredProductionChain[] = [
         mermaidDefinition: endent`
         flowchart LR
         Coal(<span class='icon-flex-row'><img src='${icons.coalIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        Filament(<span class='icon-flex-row'><img src='${icons.filamentIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>2</span></span></span>)
+        Filament(<span class='icon-flex-row'><img src='${icons.filamentIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
         Telephones(<img src='${icons.telephonesIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        Marquetry(<span class='icon-flex-row'><img src='${icons.marquetryIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.66%</span><span class='ratio-count'>2</span></span></span>)
+        Marquetry(<span class='icon-flex-row'><img src='${icons.marquetryIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>66.67%</span><span class='ratio-count'>2</span></span></span>)
         style Telephones stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7;
         Coal --> Filament --> Telephones
         Wood --> Marquetry --> Telephones
@@ -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)',

src/pages/data/production-chains-season-3.ts

@@ -274,6 +274,20 @@ export const productionChainsSeason3: TieredProductionChain[] = [
         LobsterCheminee(<img src='${icons.lobsterChemineeIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         Lobster & Citrus & Tobacco --> LobsterCheminee
         `
+      },
+      {
+        productionChain: 'empanadas',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Grain(<img src='${icons.grainIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Beef(<img src='${icons.beefIcon}' class='icon-size' /><span class='ratio-count'>2</span>)
+        Empanadas(<img src='${icons.empanadasIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Flour(<span class='icon-flex-row'><img src='${icons.flourIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Herbs(<span class='icon-flex-row'><img src='${icons.herbIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Grain --> Flour
+        Beef & Flour & Herbs --> Empanadas
+        `
       }
     ]
   },
@@ -357,6 +371,18 @@ export const productionChainsSeason3: TieredProductionChain[] = [
         BananaSurprise(<img src='${icons.bananaSurpriseIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         Goat & Plantains & Cinnamon --> BananaSurprise
         `
+      },
+      {
+        productionChain: 'coneocopia',
+        chainMultiplier: '6',
+        mermaidDefinition: endent`
+        flowchart LR
+        Jam(<span class='icon-flex-row'><img src='${icons.jamIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Orchid(<span class='icon-flex-row'><img src='${icons.orchidIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Milk(<span class='icon-flex-row'><img src='${icons.milkIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7;
+        Coneocopia(<img src='${icons.coneocopiaIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        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(<span class='icon-flex-row'><img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Potato(<span class='icon-flex-row'><img src='${icons.potatoIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Herbs(<span class='icon-flex-row'><img src='${icons.herbIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Sugar(<span class='icon-flex-row'><img src='${icons.sugarIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Schnapps(<span class='icon-flex-row'><img src='${icons.schnappsIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Absinthe(<img src='${icons.absintheIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        SugarCane --> Sugar
+        Potato --> Schnapps
+        Herbs & Sugar & Schnapps --> Absinthe
+
         `
       }
     ]

src/pages/data/production-chains-season-4.ts

@@ -66,7 +66,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [
         Citrus(<span class='icon-flex-row'><img src='${icons.citrusIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
         Cocoa(<img src='${icons.cocoaIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         IceCream(<img src='${icons.iceCreamIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Milk(<span class='icon-flex-row'><img src='${icons.milkIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7;
+        Milk(<span class='icon-flex-row'><img src='${icons.milkIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>); style Milk stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7;
         SugarCane --> Sugar --> Chocolate
         Cocoa --> Chocolate
         Milk & Chocolate & Citrus --> IceCream
@@ -76,11 +76,11 @@ export const productionChainsSeason4: TieredProductionChain[] = [
         productionChain: 'firestation',
         chainMultiplier: '24',
         mermaidDefinition: endent`
-        flowchart LR;
+        flowchart TB;
         Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>4.17%</span><span class='ratio-count'>1</span></span></span>)
         Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
         Charcoal(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
-        Caoutchouc(<span class='icon-flex-row'><img src='${icons.caoutchoucIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Caoutchouc(<span class='icon-flex-row'><img src='${icons.caoutchoucIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
         FireExtinguisher(<span class='icon-flex-row'><img src='${icons.fireExtinguisher}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>12.5%</span><span class='ratio-count'>1</span></span></span>)
         FireDepartment(<img src='${icons.fireDepartment}' class='icon-size' /><span class='ratio-count'>1</span>)
         Iron & Charcoal --> Steel
@@ -128,11 +128,11 @@ export const productionChainsSeason4: TieredProductionChain[] = [
         flowchart LR;
         Iron(<span class='icon-flex-row'><img src='${icons.ironIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>4.17%</span><span class='ratio-count'>1</span></span></span>)
         Charcoal(<span class='icon-flex-row'><img src='${icons.charcoalKilnIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
-        Cotton(<span class='icon-flex-row'><img src='${icons.cottonIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Cotton(<span class='icon-flex-row'><img src='${icons.cottonIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
         Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>4.17%</span><span class='ratio-count'>1</span></span></span>)
         Steel(<span class='icon-flex-row'><img src='${icons.steelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
         CottonMill(<span class='icon-flex-row'><img src='${icons.cottonMillIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
-        PoliceEquipment(<span class='icon-flex-row'><img src='${icons.policeEquipementIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        PoliceEquipment(<span class='icon-flex-row'><img src='${icons.policeEquipementIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
         PoliceHeadquarters(<img src='${icons.policeHeadquartersIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         Iron & Charcoal --> Steel
         Cotton --> CottonMill
@@ -185,10 +185,10 @@ export const productionChainsSeason4: TieredProductionChain[] = [
         Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
         Corn(<span class='icon-flex-row'><img src='${icons.cornIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
         Cotton(<span class='icon-flex-row'><img src='${icons.cottonIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>)
-        CamphorWax(<span class='icon-flex-row'><img src='${icons.camphorWaxIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        CamphorWax(<span class='icon-flex-row'><img src='${icons.camphorWaxIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
-        Ethanol(<span class='icon-flex-row'><img src='${icons.ethanolIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Ethanol(<span class='icon-flex-row'><img src='${icons.ethanolIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
-        Celluloid(<span class='icon-flex-row'><img src='${icons.celluloidIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Celluloid(<span class='icon-flex-row'><img src='${icons.celluloidIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
-        Film(<span class='icon-flex-row'><img src='${icons.filmReelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Film(<span class='icon-flex-row'><img src='${icons.filmReelIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
         Saltpeter(<span class='icon-flex-row'><img src='${icons.saltpeterIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>33.33%</span><span class='ratio-count'>1</span></span></span>); style Saltpeter stroke:#0675BD,stroke-width:5px,stroke-dasharray: 7 7;
         Cinema(<img src='${icons.cinemaIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
         Wood & Corn --> Ethanol
@@ -203,7 +203,7 @@ export const productionChainsSeason4: TieredProductionChain[] = [
         mermaidDefinition: endent`
         flowchart LR;
         Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>4.17%</span><span class='ratio-count'>1</span></span></span>)
-        Corn(<span class='icon-flex-row'><img src='${icons.cornIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.66%</span><span class='ratio-count'>1</span></span></span>)
+        Corn(<span class='icon-flex-row'><img src='${icons.cornIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>16.67%</span><span class='ratio-count'>1</span></span></span>)
         Orchid(<span class='icon-flex-row'><img src='${icons.orchidIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
         Ethanol(<span class='icon-flex-row'><img src='${icons.ethanolIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
         Herb(<span class='icon-flex-row'><img src='${icons.herbIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>8.33%</span><span class='ratio-count'>1</span></span></span>)
@@ -248,6 +248,66 @@ export const productionChainsSeason4: TieredProductionChain[] = [
       }
     ]
   },
+  {
+    colBreak: false,
+    tierName: 'Hacienda',
+    productionChains: [
+      {
+        productionChain: 'hotSauce',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Spices(<span class='icon-flex-row icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.spicesIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        HotSauce(<img src='${icons.hotSauceIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Spices --> HotSauce
+        `
+      },
+      {
+        productionChain: 'atole',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Corn(<img src='${icons.cornIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        SugarCane(<span class='icon-flex-row'><img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Atole(<img src='${icons.atoleIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Corn & SugarCane --> Atole
+        `
+      },
+      {
+        productionChain: 'haciendaRum',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        SugarCane(<img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Rum(<img src='${icons.rumIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        SugarCane & Wood --> Rum
+        `
+      },
+      {
+        productionChain: 'haciendaSchnapps',
+        chainMultiplier: '2',
+        mermaidDefinition: endent`
+        flowchart LR
+        Potato(<span class='icon-flex-row icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.potatoIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
+        Schnapps(<span class='icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.schnappsIcon}' class='icon-size' /><span class='ratio-count'>1</span></span>)
+        Potato --> Schnapps
+        `
+      },
+      {
+        productionChain: 'haciendaBeer',
+        mermaidDefinition: endent`
+        flowchart LR
+        Grain(<span class='icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.grainIcon}' class='icon-size' /><span class='ratio-count'>1</span></span>)
+        Corn(<img src='${icons.cornIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
+        Beer(<span class='icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.breweryIcon}' class='icon-size' /><span class='ratio-count'>1</span></span>)
+        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(<span class='icon-flex-row icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.spicesIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
-        HotSauce(<img src='${icons.hotSauceIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Spices --> HotSauce
-        `
-      },
-      {
-        productionChain: 'atole',
-        chainMultiplier: '2',
-        mermaidDefinition: endent`
-        flowchart LR
-        Corn(<img src='${icons.cornIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        SugarCane(<span class='icon-flex-row'><img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
-        Atole(<img src='${icons.atoleIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Corn & SugarCane --> Atole
-        `
-      },
-      {
-        productionChain: 'haciendaRum',
-        chainMultiplier: '2',
-        mermaidDefinition: endent`
-        flowchart LR
-        SugarCane(<img src='${icons.sugarCaneIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Wood(<span class='icon-flex-row'><img src='${icons.woodIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
-        Rum(<img src='${icons.rumIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        SugarCane & Wood --> Rum
-        `
-      },
-      {
-        productionChain: 'haciendaSchnapps',
-        chainMultiplier: '2',
-        mermaidDefinition: endent`
-        flowchart LR
-        Potato(<span class='icon-flex-row icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.potatoIcon}' class='icon-size' /><span class='icon-flex-col q-pl-sm'><span class='efficiency-perc'>50%</span><span class='ratio-count'>1</span></span></span>)
-        Schnapps(<span class='icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.schnappsIcon}' class='icon-size' /><span class='ratio-count'>1</span></span>)
-        Potato --> Schnapps
-        `
-      },
-      {
-        productionChain: 'haciendaBeer',
-        mermaidDefinition: endent`
-        flowchart LR
-        Grain(<span class='icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.grainIcon}' class='icon-size' /><span class='ratio-count'>1</span></span>)
-        Corn(<img src='${icons.cornIcon}' class='icon-size' /><span class='ratio-count'>1</span>)
-        Beer(<span class='icon-regional-container'><img src='${icons.newWorldIcon}' class='icon-regional' /><img src='${icons.breweryIcon}' class='icon-size' /><span class='ratio-count'>1</span></span>)
-        Grain & Corn --> Beer
-        `
-      }
-    ]
   }
 ];