Merge pull request #18 from Spythere/development

Wersja 1.7.3
bump: 1.7.3
2026-05-03 11:45:34 +00:00 · 2024-01-18 17:57:01 +01:00 · 2024-01-18 16:37:15 +01:00 · 2024-01-18 16:36:57 +01:00 · 2023-11-07 17:43:34 +01:00 · 2023-11-06 21:20:22 +01:00
73 changed files with 11829 additions and 6195 deletions
@@ -0,0 +1,18 @@
+/* eslint-env node */
+require('@rushstack/eslint-patch/modern-module-resolution')
+
+module.exports = {
+  root: true,
+  extends: [
+    'plugin:vue/vue3-essential',
+    'eslint:recommended',
+    '@vue/eslint-config-typescript',
+    '@vue/eslint-config-prettier/skip-formatting'
+  ],
+  rules: {
+    'vue/multi-word-component-names': 'off'
+  },
+  parserOptions: {
+    ecmaVersion: 'latest'
+  }
+}
@@ -1,20 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true,
-  },
-  extends: [
-    "plugin:vue/vue3-essential",
-    "eslint:recommended",
-    "@vue/typescript/recommended",
-    "@vue/prettier",
-    "@vue/prettier/@typescript-eslint",
-  ],
-  parserOptions: {
-    ecmaVersion: 2020,
-  },
-  rules: {
-    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
-    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
-  },
-};
@@ -25,4 +25,7 @@ pnpm-debug.log*
 node_modules

 # Dev files
-stockInfoDev.json
+stockInfoDev.json
+
+# Lock files
+yarn.lock
@@ -1,3 +0,0 @@
-module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
-};
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
  <head>
    <meta charset="utf-8" />
@@ -8,22 +8,20 @@
    <title>Pojazdownik</title>
    <meta name="description" content="Edytor pociągów online do symulatora Train Driver 2" />

-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="manifest" href="/site.webmanifest" />
+    <link rel="icon" href="/favicon.ico" sizes="any" />
+    <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
+    <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" />
    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
+    <link rel="manifest" href="/site.webmanifest" />
+
    <meta name="msapplication-TileColor" content="#da532c" />
-    <meta name="theme-color" content="#e4c428" />
+    <meta name="theme-color" content="#111" />
  </head>
  <body>
    <noscript>
-      <strong>
-        We're sorry but Pojazdownik doesn't work properly without JavaScript enabled. Please enable it to continue.
-      </strong>
+      <strong> We're sorry but Pojazdownik doesn't work properly without JavaScript enabled. Please enable it to continue. </strong>
    </noscript>
    <div id="app"></div>
    <script type="module" src="/src/main.ts"></script>
  </body>
 </html>
-
@@ -1,24 +1,35 @@
 {
  "name": "pojazdownik",
-  "version": "1.6.0",
+  "version": "1.7.3",
  "private": true,
  "scripts": {
    "dev": "vite",
    "build": "vue-tsc --noEmit && vite build",
-    "preview": "yarn build && vite preview --port 4174"
+    "preview": "yarn build && vite preview --port 4174",
+    "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "format": "prettier --write src/"
  },
  "dependencies": {
    "axios": "^1.4.0",
    "pinia": "^2.0.17",
+    "prettier": "^3.0.3",
    "vue": "^3.2.37",
    "vue-i18n": "9"
  },
  "devDependencies": {
+    "@rushstack/eslint-patch": "^1.3.3",
+    "@vite-pwa/assets-generator": "^0.0.10",
    "@vitejs/plugin-vue": "^4.1.0",
+    "@vue/eslint-config-prettier": "^8.0.0",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "@vue/tsconfig": "^0.4.0",
+    "eslint": "^8.49.0",
+    "eslint-plugin-vue": "^9.17.0",
    "sass": "^1.59.3",
    "typescript": "^5.0.2",
    "vite": "^4.2.1",
-    "vite-plugin-pwa": "^0.14.6",
+    "vite-plugin-pwa": "^0.16.5",
    "vue-tsc": "^1.2.0"
  }
 }
@@ -0,0 +1,24 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_102_63" fill="white">
+<path d="M0 250C0 111.929 111.929 6.10352e-05 250 6.10352e-05C388.071 6.10352e-05 500 111.929 500 250C500 388.071 388.071 500 250 500C111.929 500 0 388.071 0 250Z"/>
+</mask>
+<path d="M0 250C0 111.929 111.929 6.10352e-05 250 6.10352e-05C388.071 6.10352e-05 500 111.929 500 250C500 388.071 388.071 500 250 500C111.929 500 0 388.071 0 250Z" fill="#242424"/>
+<path d="M0 222.821C0 84.7503 111.929 -27.1785 250 -27.1785C388.071 -27.1785 500 84.7503 500 222.821V250C500 126.939 388.071 27.1787 250 27.1787C111.929 27.1787 0 126.939 0 250V222.821ZM500 277.179C500 415.25 388.071 527.179 250 527.179C111.929 527.179 0 415.25 0 277.179V250C0 373.061 111.929 472.821 250 472.821C388.071 472.821 500 373.061 500 250V277.179ZM0 500V6.10352e-05V500ZM500 6.10352e-05V500V6.10352e-05Z" fill="#FFD600" mask="url(#path-1-inside-1_102_63)"/>
+<path d="M210.369 301.604C210.369 301.604 210.369 341.807 210.369 364.846C210.369 387.885 202.798 417.491 171.591 417.491C140.385 417.491 132.813 417.491 132.813 417.491L132.812 78.125L250.754 78.125C274.312 78.125 294.504 80.9665 311.331 86.6494C328.311 92.1788 342.232 99.8585 353.093 109.689C364.107 119.519 372.214 131.115 377.415 144.478C382.616 157.84 385.217 172.278 385.217 187.791C385.217 204.533 382.54 219.892 377.186 233.869C371.832 247.846 363.648 259.827 352.634 269.81C341.62 279.794 327.623 287.627 310.643 293.31C293.816 298.839 273.853 301.604 250.754 301.604L210.369 301.604ZM210.369 242.854L250.754 242.854C270.946 242.854 285.479 238.016 294.351 228.34C303.224 218.663 307.66 205.147 307.66 187.791C307.66 180.111 306.512 173.123 304.218 166.825C301.923 160.528 298.405 155.152 293.663 150.698C289.074 146.09 283.184 142.558 275.995 140.1C268.958 137.643 260.544 136.414 250.754 136.414L210.369 136.414L210.369 242.854Z" fill="url(#paint0_linear_102_63)"/>
+<path d="M239.215 301.604C239.215 301.604 239.215 341.807 239.215 364.846C239.215 387.885 231.643 417.491 200.437 417.491C169.231 417.491 161.659 417.491 161.659 417.491L161.658 78.125L279.6 78.125C303.158 78.125 323.35 80.9665 340.177 86.6494C357.157 92.1788 371.077 99.8585 381.938 109.689C392.952 119.519 401.06 131.115 406.261 144.478C411.462 157.84 414.062 172.278 414.062 187.791C414.062 204.533 411.385 219.892 406.031 233.869C400.677 247.846 392.493 259.827 381.479 269.81C370.465 279.794 356.468 287.627 339.488 293.31C322.662 298.839 302.699 301.604 279.6 301.604L239.215 301.604ZM239.215 242.854L279.6 242.854C299.792 242.854 314.325 238.016 323.197 228.34C332.069 218.663 336.505 205.147 336.505 187.791C336.505 180.111 335.358 173.123 333.064 166.825C330.769 160.528 327.251 155.152 322.509 150.698C317.919 146.09 312.03 142.558 304.84 140.1C297.804 137.643 289.39 136.414 279.6 136.414L239.215 136.414L239.215 242.854Z" fill="url(#paint1_linear_102_63)"/>
+<path d="M210.685 301.604C210.685 301.604 210.685 341.807 210.685 364.846C210.685 387.885 203.082 417.491 171.749 417.491C140.416 417.491 132.813 417.491 132.813 417.491L132.812 78.125L251.233 78.125C274.887 78.125 295.161 80.9665 312.057 86.6494C329.105 92.1788 343.083 99.8585 353.988 109.689C365.046 119.519 373.187 131.115 378.409 144.478C383.631 157.84 386.242 172.278 386.242 187.791C386.242 204.533 383.555 219.892 378.179 233.869C372.803 247.846 364.586 259.827 353.527 269.81C342.468 279.794 328.414 287.627 311.365 293.31C294.47 298.839 274.426 301.604 251.233 301.604L210.685 301.604ZM210.685 242.854L251.233 242.854C271.508 242.854 286.099 238.016 295.008 228.34C303.916 218.663 308.37 205.147 308.37 187.791C308.37 180.111 307.218 173.123 304.914 166.825C302.611 160.528 299.078 155.152 294.316 150.698C289.709 146.09 283.795 142.558 276.576 140.1C269.511 137.643 261.063 136.414 251.233 136.414L210.685 136.414L210.685 242.854Z" fill="url(#paint2_radial_102_63)"/>
+<defs>
+<linearGradient id="paint0_linear_102_63" x1="259.015" y1="78.125" x2="259.015" y2="417.491" gradientUnits="userSpaceOnUse">
+<stop offset="0.135417" stop-color="#FFD600"/>
+<stop offset="1"/>
+</linearGradient>
+<linearGradient id="paint1_linear_102_63" x1="287.86" y1="78.125" x2="287.86" y2="417.491" gradientUnits="userSpaceOnUse">
+<stop offset="0.135417" stop-color="#FFD600"/>
+<stop offset="1"/>
+</linearGradient>
+<radialGradient id="paint2_radial_102_63" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(259.527 247.808) rotate(0.36307) scale(345.948 325.206)">
+<stop offset="0.484375" stop-color="white"/>
+<stop offset="1"/>
+</radialGradient>
+</defs>
+</svg>
@@ -5,15 +5,26 @@
  "description": "Generator składów online dla symulatora Train Driver 2",
  "icons": [
    {
-      "src": "/android-chrome-192x192.png",
+      "src": "pwa-64x64.png",
+      "sizes": "64x64",
+      "type": "image/png"
+    },
+    {
+      "src": "pwa-192x192.png",
      "sizes": "192x192",
      "type": "image/png"
    },
    {
-      "src": "/android-chrome-512x512.png",
+      "src": "pwa-512x512.png",
      "sizes": "512x512",
      "type": "image/png",
-      "purpose": "any maskable"
+      "purpose": "any"
+    },
+    {
+      "src": "maskable-icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
    }
  ],
  "theme_color": "#2c3149",
@@ -5,19 +5,29 @@
  "description": "Generator składów online dla symulatora Train Driver 2",
  "icons": [
    {
-      "src": "/android-chrome-192x192.png",
+      "src": "pwa-64x64.png",
+      "sizes": "64x64",
+      "type": "image/png"
+    },
+    {
+      "src": "pwa-192x192.png",
      "sizes": "192x192",
      "type": "image/png"
    },
    {
-      "src": "/android-chrome-512x512.png",
+      "src": "pwa-512x512.png",
      "sizes": "512x512",
      "type": "image/png",
-      "purpose": "any maskable"
+      "purpose": "any"
+    },
+    {
+      "src": "maskable-icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
    }
  ],
  "theme_color": "#2c3149",
  "background_color": "#2c3149",
  "display": "standalone"
 }
-
@@ -18,11 +18,6 @@ export default defineComponent({
    };
  },
  async created() {
-    /* dev info testing */
-    // if (import.meta.env['VITE_STOCK_DEV'] == '1') {
-    //   const data = await import('../stockInfoDev.json');
-    //   this.store.stockData = data.default as any;
-    // }
    this.store.fetchStockInfoData();
    this.store.handleRouting();
  },
@@ -40,30 +35,13 @@ export default defineComponent({
  color: $textColor;
  font-size: 1em;
  padding: 1em 0.5em;
-}

-/* HEADER SECTION */
-
-h2 {
-  margin: 0;
-  margin-bottom: 0.5em;
-
-  color: $accentColor;
-  font-weight: 700;
-  font-size: 1.2em;
-}
-
-.header-bottom {
-  margin: 0;
-  font-size: 1.5em;
-
-  color: #d1d1d1;
-}
-
-@media screen and (max-width: $breakpointMd) {
-  #app {
+  @media screen and (max-width: $breakpointMd) {
    font-size: calc(0.7rem + 0.75vw);
  }
+
+  @media screen and (orientation: landscape) and (max-width: $breakpointMd) {
+    font-size: calc(0.75rem + 0.4vw);
+  }
 }
 </style>
-
@@ -1,24 +1,24 @@
-<template>
-  <div>
-    <keep-alive>
-      <RealStockCard v-if="store.isRealStockListCardOpen" />
-    </keep-alive>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { useStore } from '../../store';
-import RealStockCard from '../cards/RealStockCard.vue';
-
-export default defineComponent({
-  components: { RealStockCard },
-  data() {
-    return {
-      store: useStore(),
-    };
-  },
-});
-</script>
-
-<style scoped></style>
+<template>
+  <div>
+    <keep-alive>
+      <RealStockCard v-if="store.isRealStockListCardOpen" />
+    </keep-alive>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import { useStore } from "../../store";
+import RealStockCard from "../cards/RealStockCard.vue";
+
+export default defineComponent({
+  components: { RealStockCard },
+  data() {
+    return {
+      store: useStore(),
+    };
+  },
+});
+</script>
+
+<style scoped></style>
@@ -1,49 +1,52 @@
-<template>
-  <footer>
-    <i18n-t keypath="footer.disclaimer" tag="div" class="text--grayed">
-      <template #tos>
-        <a style="color: #ccc" :href="$t('footer.tos-href')" target="_blank">
-          {{ $t('footer.tos') }}
-        </a>
-      </template>
-    </i18n-t>
-
-    <div class="text--grayed" v-if="store.stockData">
-      {{ $t('footer.version-check', { version: store.stockData.version }) }}
-    </div>
-
-    <div>
-      &copy;
-      <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
-      {{ new Date().getUTCFullYear() }} | v{{ VERSION }}{{ !isOnProductionHost ? 'dev' : '' }}
-    </div>
-  </footer>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import packageInfo from '../../../package.json';
-import { useStore } from '../../store';
-
-export default defineComponent({
-  data() {
-    return {
-      isOnProductionHost: location.hostname == 'pojazdownik-td2.web.app',
-      VERSION: packageInfo.version,
-      store: useStore(),
-    };
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-footer {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25em;
-
-  text-align: center;
-  padding: 1em 1em 0 1em;
-  margin-top: auto;
-}
-</style>
+<template>
+  <footer>
+    <i18n-t keypath="footer.disclaimer" tag="div" class="text--grayed">
+      <template #tos>
+        <a style="color: #ccc" :href="$t('footer.tos-href')" target="_blank">
+          {{ $t("footer.tos") }}
+        </a>
+      </template>
+    </i18n-t>
+
+    <div class="text--grayed" v-if="store.stockData">
+      {{ $t("footer.version-check", { version: store.stockData.version }) }}
+    </div>
+
+    <div>
+      &copy;
+      <a href="https://td2.info.pl/profile/?u=20777" target="_blank"
+        >Spythere</a
+      >
+      {{ new Date().getUTCFullYear() }} | v{{ VERSION
+      }}{{ !isOnProductionHost ? "dev" : "" }}
+    </div>
+  </footer>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import packageInfo from "../../../package.json";
+import { useStore } from "../../store";
+
+export default defineComponent({
+  data() {
+    return {
+      isOnProductionHost: location.hostname == "pojazdownik-td2.web.app",
+      VERSION: packageInfo.version,
+      store: useStore(),
+    };
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+footer {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25em;
+
+  text-align: center;
+  padding: 1em 1em 0 1em;
+  margin-top: auto;
+}
+</style>
@@ -1,45 +1,45 @@
-<template>
-  <main>
-    <LogoSection />
-    <InputsSection />
-    <TrainImageSection />
-    <StockSection />
-  </main>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import LogoSection from '../sections/LogoSection.vue';
-import InputsSection from '../sections/InputsSection.vue';
-import TrainImageSection from '../sections/TrainImageSection.vue';
-import StockSection from '../sections/StockSection.vue';
-
-export default defineComponent({
-  components: { LogoSection, InputsSection, TrainImageSection, StockSection },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/global.scss';
-
-main {
-  display: grid;
-  gap: 1em;
-
-  width: 100%;
-  max-width: 1500px;
-  min-height: 75vh;
-
-  grid-template-columns: 1fr 2fr;
-  grid-template-rows: auto 360px minmax(400px, 1fr);
-}
-
-@media screen and (max-width: $breakpointMd) {
-  main {
-    display: flex;
-    flex-direction: column;
-    grid-template-columns: 1fr;
-    grid-template-rows: 1fr;
-  }
-}
-</style>
+<template>
+  <main>
+    <LogoSection />
+    <InputsSection />
+    <TrainImageSection />
+    <StockSection />
+  </main>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import LogoSection from "../sections/LogoSection.vue";
+import InputsSection from "../sections/InputsSection.vue";
+import TrainImageSection from "../sections/TrainImageSection.vue";
+import StockSection from "../sections/StockSection.vue";
+
+export default defineComponent({
+  components: { LogoSection, InputsSection, TrainImageSection, StockSection },
+});
+</script>
+
+<style lang="scss" scoped>
+@import "../../styles/global.scss";
+
+main {
+  display: grid;
+  gap: 1em;
+
+  width: 100%;
+  max-width: 1300px;
+  min-height: 75vh;
+
+  grid-template-columns: 1fr 2fr;
+  grid-template-rows: auto 360px minmax(400px, 1fr);
+}
+
+@media screen and (max-width: $breakpointMd) {
+  main {
+    display: flex;
+    flex-direction: column;
+    grid-template-columns: 1fr;
+    grid-template-rows: 1fr;
+  }
+}
+</style>
@@ -1,14 +1,25 @@
 <template>
-  <div class="real-stock-card g-card" @keydown.esc="store.isRealStockListCardOpen = false">
+  <div
+    class="real-stock-card g-card"
+    @keydown.esc="store.isRealStockListCardOpen = false"
+  >
    <div class="g-card_bg" @click="store.isRealStockListCardOpen = false"></div>

    <div class="card_content">
      <div class="card_nav">
        <div class="top-pane">
          <h1>
-            {{ $t('realstock.title') }} <a href="https://td2.info.pl/profile/?u=17708" target="_blank">Railtrains997</a>
+            {{ $t("realstock.title") }}
+            <a href="https://td2.info.pl/profile/?u=17708" target="_blank"
+              >Railtrains997</a
+            >
          </h1>
-          <button class="btn exit-btn" @click="store.isRealStockListCardOpen = false">&Cross;</button>
+          <button
+            class="btn exit-btn"
+            @click="store.isRealStockListCardOpen = false"
+          >
+            &Cross;
+          </button>
        </div>

        <div class="filters" ref="focus" tabindex="0">
@@ -19,7 +30,11 @@
          />

          <datalist id="readyStockDataList">
-            <option v-for="stock in store.readyStockList" :value="stock.stockId">
+            <option
+              v-for="stock in store.readyStockList"
+              :value="stock.stockId"
+              :key="stock.name"
+            >
              {{ stock.stockId }}
            </option>
          </datalist>
@@ -31,12 +46,18 @@
          />

          <datalist id="readyStockStringList">
-            <option v-for="stock in computedAvailableStockTypes" :value="stock">
-              {{ stock }}
+            <option
+              v-for="stockType in computedAvailableStockTypes"
+              :value="stockType"
+              :key="stockType"
+            >
+              {{ stockType }}
            </option>
          </datalist>

-          <button class="btn" @click="resetStockFilters">{{ $t('realstock.action-reset') }}</button>
+          <button class="btn" @click="resetStockFilters">
+            {{ $t("realstock.action-reset") }}
+          </button>
        </div>
      </div>

@@ -46,14 +67,29 @@
          :key="rStock.stockId"
          :data-last-selected="store.chosenRealStockName === rStock.stockId"
        >
-          <div class="stock-title" tabindex="0" @click="chooseStock(rStock)" @keydown.enter="chooseStock(rStock)">
-            <img class="stock-icon" :src="getIconURL(rStock.type)" :alt="rStock.type" />
-            <b class="text--accent" style="margin-left: 5px"> {{ rStock.name }}</b>
+          <div
+            class="stock-title"
+            tabindex="0"
+            @click="chooseStock(rStock)"
+            @keydown.enter="chooseStock(rStock)"
+          >
+            <img
+              class="stock-icon"
+              :src="getIconURL(rStock.type)"
+              :alt="rStock.type"
+            />
+            <b class="text--accent" style="margin-left: 5px">
+              {{ rStock.name }}</b
+            >
            <div>{{ rStock.number }}</div>
          </div>

          <div class="stock-thumbnails" ref="thumbnailsRef">
-            <div class="thumbnail-item" v-for="stockType in rStock.stockString.split(';')">
+            <div
+              class="thumbnail-item"
+              v-for="stockType in rStock.stockString.split(';')"
+              :key="stockType"
+            >
              <div class="thumbnail-container">
                <div>{{ stockType }}</div>
                <img
@@ -61,7 +97,7 @@
                  :title="stockType"
                  style="opacity: 0"
                  @error="(e) => onStockItemError(e, stockType)"
-                  @load="e => (e.target as HTMLElement).style.opacity = '1'"
+                  @load="(e) => ((e.target as HTMLElement).style.opacity = '1')"
                />
              </div>
            </div>
@@ -75,23 +111,24 @@
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent } from "vue";

-import { useStore } from '../../store';
-import imageMixin from '../../mixins/imageMixin';
-import stockMixin from '../../mixins/stockMixin';
+import { useStore } from "../../store";
+import imageMixin from "../../mixins/imageMixin";
+import stockMixin from "../../mixins/stockMixin";

-import { IReadyStockItem } from '../../types';
+import { IReadyStockItem } from "../../types";
+import http from "../../http";

 interface ResponseJSONData {
  [key: string]: string;
 }

 function getVehicleType(stockType: string) {
-  if (/^E/.test(stockType)) return 'loco-e';
-  if (/^S/.test(stockType)) return 'loco-s';
+  if (/^E/.test(stockType)) return "loco-e";
+  if (/^S/.test(stockType)) return "loco-s";

-  return 'car-passenger';
+  return "car-passenger";
 }

 export default defineComponent({
@@ -99,11 +136,15 @@ export default defineComponent({

  data: () => ({
    store: useStore(),
-    responseStatus: 'loading',
-    isMobile: 'ontouchstart' in document.documentElement && navigator.userAgent.match(/Mobi/) ? true : false,
+    responseStatus: "loading",
+    isMobile:
+      "ontouchstart" in document.documentElement &&
+      navigator.userAgent.match(/Mobi/)
+        ? true
+        : false,
    observer: null as IntersectionObserver | null,
-    searchedReadyStockName: '',
-    searchedReadyStockString: '',
+    searchedReadyStockName: "",
+    searchedReadyStockString: "",
    visibleIndexesTo: 0,
    lastSelectedStockId: null as string | null,
    scrollTop: 0,
@@ -115,11 +156,11 @@ export default defineComponent({
  },

  activated() {
-    (this.$refs['focus'] as HTMLElement).focus();
+    (this.$refs["focus"] as HTMLElement).focus();

-    (this.$refs['list'] as HTMLElement).scrollTo({
+    (this.$refs["list"] as HTMLElement).scrollTo({
      top: this.scrollTop,
-      behavior: 'auto',
+      behavior: "auto",
    });
  },

@@ -130,8 +171,12 @@ export default defineComponent({
      return this.store.readyStockList
        .filter(
          (rs) =>
-            rs.stockId.toLocaleLowerCase().includes(this.searchedReadyStockName.toLocaleLowerCase()) &&
-            rs.stockString.toLocaleLowerCase().includes(this.searchedReadyStockString.toLocaleLowerCase())
+            rs.stockId
+              .toLocaleLowerCase()
+              .includes(this.searchedReadyStockName.toLocaleLowerCase()) &&
+            rs.stockString
+              .toLocaleLowerCase()
+              .includes(this.searchedReadyStockString.toLocaleLowerCase()),
        )
        .filter((_, i) => i <= this.visibleIndexesTo);
    },
@@ -139,7 +184,7 @@ export default defineComponent({
    computedAvailableStockTypes() {
      return this.store.readyStockList
        .reduce((acc, rs) => {
-          rs.stockString.split(';').forEach((s) => {
+          rs.stockString.split(";").forEach((s) => {
            if (!acc.includes(s)) acc.push(s);
          });

@@ -153,7 +198,7 @@ export default defineComponent({
    computedReadyStockList(curr, prev) {
      if (curr.length < prev.length) {
        this.visibleIndexesTo = 20;
-        (this.$refs['list'] as HTMLElement).scrollTo({
+        (this.$refs["list"] as HTMLElement).scrollTo({
          top: 0,
        });
      }
@@ -162,21 +207,21 @@ export default defineComponent({

  methods: {
    async fetchStockListData() {
-      const readyStockJSONData: ResponseJSONData = await (
-        await fetch(`https://spythere.github.io/api/td2/data/readyStock.json?t=${Math.floor(Date.now() / 60000)}`)
-      ).json();
+      const readyStockJSONData = (
+        await http.get<ResponseJSONData>("td2/data/readyStock.json")
+      ).data;

      if (!readyStockJSONData) {
-        this.responseStatus = 'error';
+        this.responseStatus = "error";
        return;
      }

      for (let stockKey in readyStockJSONData) {
-        const [type, number, ...name] = stockKey.split(' ');
+        const [type, number, ...name] = stockKey.split(" ");

        const obj = {
-          number: number.replace(/_/g, '/'),
-          name: name.join(' '),
+          number: number.replace(/_/g, "/"),
+          name: name.join(" "),
          stockString: readyStockJSONData[stockKey],
          type,
        };
@@ -187,7 +232,7 @@ export default defineComponent({
        });
      }

-      this.responseStatus = 'loaded';
+      this.responseStatus = "loaded";
    },

    mountObserver() {
@@ -195,7 +240,7 @@ export default defineComponent({
        if (entries[0].intersectionRatio > 0) this.visibleIndexesTo += 20;
      });

-      this.observer.observe(this.$refs['bottom'] as HTMLElement);
+      this.observer.observe(this.$refs["bottom"] as HTMLElement);
    },

    getImageUrl(name: string) {
@@ -203,8 +248,8 @@ export default defineComponent({
    },

    resetStockFilters() {
-      this.searchedReadyStockName = '';
-      this.searchedReadyStockString = '';
+      this.searchedReadyStockName = "";
+      this.searchedReadyStockString = "";
    },

    chooseStock(stockItem: IReadyStockItem) {
@@ -216,7 +261,7 @@ export default defineComponent({
    onStockItemError(e: Event, stockType: string) {
      const imageEl = e.target as HTMLImageElement;
      imageEl.src = `images/${getVehicleType(stockType)}-unknown.png`;
-      imageEl.style.opacity = '1';
+      imageEl.style.opacity = "1";
    },

    onListScroll(e: Event) {
@@ -230,7 +275,7 @@ export default defineComponent({
 </script>

 <style lang="scss" scoped>
-@import '../../styles/global.scss';
+@import "../../styles/global.scss";

 .exit-btn {
  font-size: 1.2em;
@@ -316,7 +361,7 @@ ul {
    gap: 1rem;
    padding: 0.1em;

-    &[data-last-selected='true'] .stock-title {
+    &[data-last-selected="true"] .stock-title {
      border: 1px solid $accentColor;
    }

@@ -378,4 +423,3 @@ ul {
  padding: 1em;
 }
 </style>
-
@@ -7,6 +7,7 @@
        <div class="vehicle-types locos">
          <button
            v-for="locoType in locomotiveTypeList"
+            :key="locoType.id"
            class="btn btn--choice"
            :data-selected="locoType.id == store.chosenLocoPower"
            @click="selectLocoType(locoType.id)"
@@ -23,10 +24,10 @@
          @keydown.enter.prevent="addOrSwitchVehicle"
          @keydown.backspace="removeVehicle"
        >
-          <option :value="null" disabled>{{ $t('inputs.input-vehicle') }}</option>
-          <option v-for="loco in locoOptions" :value="loco" :key="loco.type">
-            {{ loco.type }}<b v-if="loco.supportersOnly">*</b>
+          <option :value="null" disabled>
+            {{ $t('inputs.input-vehicle') }}
          </option>
+          <option v-for="loco in locoOptions" :value="loco" :key="loco.type">{{ loco.type }}<b v-if="loco.isSponsorsOnly">*</b></option>
        </select>
      </div>

@@ -34,6 +35,7 @@
        <div class="vehicle-types carwagons">
          <button
            v-for="carType in carTypeList"
+            :key="carType.id"
            class="btn btn--choice"
            :data-selected="carType.id == store.chosenCarUseType"
            @click="selectCarWagonType(carType.id)"
@@ -50,11 +52,11 @@
          @keydown.enter.prevent="addOrSwitchVehicle"
          @keydown.backspace="removeVehicle"
        >
-          <option :value="null" disabled>{{ $t('inputs.input-carwagon') }}</option>
-
-          <option v-for="car in carOptions" :value="car" :key="car.type">
-            {{ car.type }}<b v-if="car.supportersOnly">*</b>
+          <option :value="null" disabled>
+            {{ $t('inputs.input-carwagon') }}
          </option>
+
+          <option v-for="car in carOptions" :value="car" :key="car.type">{{ car.type }}<b v-if="car.isSponsorsOnly">*</b></option>
        </select>
      </div>

@@ -63,9 +65,7 @@
        <select
          id="cargo-select"
          :disabled="
-            (store.chosenCar && !store.chosenCar.loadable) ||
-            (store.chosenCar && store.chosenCar.useType == 'car-passenger') ||
-            !store.chosenCar
+            (store.chosenCar && !store.chosenCar.loadable) || (store.chosenCar && store.chosenCar.useType == 'car-passenger') || !store.chosenCar
          "
          data-select="cargo"
          data-ignore-outside="1"
@@ -90,12 +90,7 @@
        <button class="btn" @click="addVehicle(store.chosenVehicle, store.chosenCargo)">
          {{ $t('inputs.action-add') }}
        </button>
-        <button
-          class="btn"
-          @click="switchVehicles"
-          :disabled="store.chosenStockListIndex == -1"
-          :data-disabled="store.chosenStockListIndex == -1"
-        >
+        <button class="btn" @click="switchVehicles" :disabled="store.chosenStockListIndex == -1" :data-disabled="store.chosenStockListIndex == -1">
          {{ $t('inputs.action-swap') }}
          <b class="text--accent">
            {{ store.chosenStockListIndex == -1 ? '' : `${store.chosenStockListIndex + 1}.` }}
@@ -122,6 +117,7 @@ export default defineComponent({
  mixins: [imageMixin, stockPreviewMixin, stockMixin],

  data: () => ({
+    store: useStore(),
    locomotiveTypeList: [
      {
        id: 'loco-e',
@@ -153,12 +149,20 @@ export default defineComponent({
    ],
  }),

-  setup() {
-    const store = useStore();
+  computed: {
+    locoOptions() {
+      return this.store.locoDataList
+        .slice()
+        .sort((a, b) => (a.type > b.type ? 1 : -1))
+        .filter((loco) => loco.power == this.store.chosenLocoPower);
+    },

-    return {
-      store,
-    };
+    carOptions() {
+      return this.store.carDataList
+        .slice()
+        .sort((a, b) => (a.type > b.type ? 1 : -1))
+        .filter((car) => car.useType == this.store.chosenCarUseType);
+    },
  },

  methods: {
@@ -192,6 +196,29 @@ export default defineComponent({
      const stockObject = this.getStockObject(vehicle, this.store.chosenCargo);
      this.store.stockList[this.store.chosenStockListIndex] = stockObject;
    },
+
+    selectLocoType(locoTypeId: string) {
+      this.store.chosenLocoPower = locoTypeId;
+      this.store.chosenVehicle = this.locoOptions[0];
+      this.store.chosenLoco = this.locoOptions[0];
+    },
+
+    selectCarWagonType(carWagonTypeId: string) {
+      this.store.chosenCarUseType = carWagonTypeId;
+      this.store.chosenVehicle = this.carOptions[0];
+      this.store.chosenCar = this.carOptions[0];
+      this.store.chosenCargo = null;
+    },
+
+    previewVehicleByType(type: 'loco' | 'car' | 'cargo') {
+      this.$nextTick(() => {
+        if (!this.store.chosenLoco && !this.store.chosenCar) return;
+
+        this.store.chosenVehicle = type == 'loco' ? this.store.chosenLoco : this.store.chosenCar;
+
+        this.store.chosenCargo = this.store.chosenCar?.cargoList.find((cargo) => cargo.id == this.store.chosenCargo?.id) || null;
+      });
+    },
  },
 });
 </script>
@@ -207,6 +234,11 @@ export default defineComponent({
  grid-column: 1;
 }

+.input_container {
+  width: 100%;
+  max-width: 380px;
+}
+
 .input_header {
  margin-bottom: 1em;
 }
@@ -226,6 +258,10 @@ button.btn--choice {
 .input_list {
  margin: 0.5em 0;

+  select {
+    width: 100%;
+  }
+
  label {
    display: block;

@@ -267,4 +303,3 @@ button.btn--choice {
  }
 }
 </style>
-
@@ -1,11 +1,16 @@
 <template>
  <section class="logo-section">
-    <img :src="`/logo-${$i18n.locale}.svg`" alt="logo pojazdownik" @click="navigate" />
+    <img
+      :src="`/logo-${$i18n.locale}.svg`"
+      alt="logo pojazdownik"
+      @click="navigate"
+    />

    <div class="actions">
      <button
-        class="btn btn--text"
        v-for="action in localeActions"
+        :key="action.name"
+        class="btn btn--text"
        :data-selected="$i18n.locale == action.locale"
        @click="chooseLocale(action.locale)"
      >
@@ -21,31 +26,31 @@ export default {
    return {
      localeActions: [
        {
-          name: 'POLSKI',
-          locale: 'pl',
+          name: "POLSKI",
+          locale: "pl",
        },
        {
-          name: 'ENGLISH',
-          locale: 'en',
+          name: "ENGLISH",
+          locale: "en",
        },
      ],
    };
  },
  methods: {
    navigate() {
-      window.location.pathname = '';
+      window.location.pathname = "";
    },

    chooseLocale(locale: string) {
      this.$i18n.locale = locale;
-      window.localStorage.setItem('locale', locale);
+      window.localStorage.setItem("locale", locale);
    },
  },
 };
 </script>

 <style lang="scss" scoped>
-@import '../../styles/global.scss';
+@import "../../styles/global.scss";

 .logo-section {
  grid-row: 1;
@@ -64,7 +69,7 @@ export default {
  display: flex;
  gap: 0.5em;

-  button[data-selected='true'] {
+  button[data-selected="true"] {
    font-weight: bold;
    color: $accentColor;
    text-decoration: underline;
@@ -76,4 +81,3 @@ img {
  width: 100%;
 }
 </style>
-
@@ -2,9 +2,10 @@
  <section class="stock-section">
    <div class="section_modes">
      <button
+        v-for="(id, i) in sectionModes"
+        :key="id"
        class="btn"
        ref="sectionButtonRefs"
-        v-for="(id, i) in sectionModes"
        @click="chooseSection(id)"
        :data-selected="store.stockSectionMode == id"
      >
@@ -15,14 +16,14 @@

    <transition name="tab-change" mode="out-in">
      <keep-alive>
-        <component :is="chosenSectionComponent" :key="chosenSectionComponent"></component>
+        <component :is="chosenSectionComponent"></component>
      </keep-alive>
    </transition>
  </section>
 </template>

 <script lang="ts" setup>
-import { computed, KeepAlive, onMounted, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { useStore } from '../../store';
 import StockListTab from '../tabs/StockListTab.vue';
 import StockGeneratorTab from '../tabs/StockGeneratorTab.vue';
@@ -134,4 +135,3 @@ function chooseSection(sectionId: SectionMode) {
  }
 }
 </style>
-
@@ -1,58 +1,44 @@
 <template>
  <section class="train-image-section">
-    <div class="train-image__wrapper">
-      <div class="train-image__content" :class="{ supporter: store.chosenVehicle?.supportersOnly }">
-        <transition name="img-message-anim">
-          <div class="empty-message" v-if="store.imageLoading && store.chosenVehicle?.imageSrc">
-            {{ $t('preview.loading') }}
-          </div>
-        </transition>
-
-        <div class="no-img" v-if="!store.chosenVehicle">{{ $t('preview.title') }}</div>
-
-        <img
-          v-if="store.chosenVehicle"
-          :src="`https://spythere.github.io/api/td2/images/${store.chosenVehicle.type}--300px.jpg`"
-          :alt="store.chosenVehicle.type"
-          @load="onImageLoad"
-          @click="onImageClick"
-        />
-
-        <!-- <div class="empty-message" v-if="store.chosenVehicle && !store.chosenVehicle.imageSrc">Ten pojazd nie ma jeszcze podglądu!</div> -->
-      </div>
-
-      <div class="train-image__info" v-if="store.chosenVehicle">
-        <b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull;
-        <b style="color: #ccc">
-          {{
-            $t(`preview.${isLocomotive(store.chosenVehicle) ? store.chosenVehicle.power : store.chosenVehicle.useType}`)
-          }}
-        </b>
-
-        <div style="color: #ccc">
-          <div>
-            {{ store.chosenVehicle.length }}m | {{ store.chosenVehicle.mass }}t |
-            {{ store.chosenVehicle.maxSpeed }} km/h
-          </div>
-
-          <div v-if="isLocomotive(store.chosenVehicle)">
-            {{ $t('preview.cabin') }} {{ store.chosenVehicle.cabinType }}
-          </div>
-
-          <div v-else>
-            {{
-              store.chosenVehicle.useType == 'car-cargo' // ? store.stockData?.usage[store.chosenVehicle.constructionType]
-                ? $t(`usage.${store.chosenVehicle.constructionType}`)
-                : `${$t('preview.construction')} ${store.chosenVehicle.constructionType}`
-            }}
-          </div>
-
-          <b style="color: salmon" v-if="store.chosenVehicle.supportersOnly">{{ $t('preview.sponsor-only') }}</b>
-        </div>
-      </div>
-
-      <div class="train-image__info" v-else>{{ $t('preview.desc') }}</div>
+    <div class="train-image__content" :class="{ sponsor: store.chosenVehicle?.isSponsorsOnly }">
+      <img
+        tabindex="0"
+        :src="store.chosenVehicle ? getThumbnailURL(store.chosenVehicle.type, 'small') : '/images/placeholder.jpg'"
+        @click="onImageClick"
+        @keydown.enter="onImageClick"
+        @error="onImageError"
+        type="image/jpeg"
+      />
    </div>
+
+    <div class="train-image__info" v-if="store.chosenVehicle">
+      <b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull;
+      <b style="color: #ccc">
+        {{ $t(`preview.${isLocomotive(store.chosenVehicle) ? store.chosenVehicle.power : store.chosenVehicle.useType}`) }}
+      </b>
+
+      <div style="color: #ccc">
+        <div>{{ store.chosenVehicle.length }}m | {{ store.chosenVehicle.mass }}t | {{ store.chosenVehicle.maxSpeed }} km/h</div>
+
+        <div v-if="isLocomotive(store.chosenVehicle)">{{ $t('preview.cabin') }} {{ store.chosenVehicle.cabinType }}</div>
+
+        <div v-else>
+          {{
+            store.chosenVehicle.useType == 'car-cargo'
+              ? $t(`usage.${store.chosenVehicle.constructionType}`)
+              : `${$t('preview.construction')} ${store.chosenVehicle.constructionType}`
+          }}
+        </div>
+
+        <b style="color: salmon" v-if="store.chosenVehicle.isSponsorsOnly">{{
+          $t('preview.sponsor-only', [
+            new Date(store.chosenVehicle.sponsorsOnlyTimestamp).toLocaleDateString($i18n.locale == 'pl' ? 'pl-PL' : 'en-GB'),
+          ])
+        }}</b>
+      </div>
+    </div>
+
+    <div class="train-image__info" v-else>{{ $t('preview.desc') }}</div>
  </section>
 </template>

@@ -61,8 +47,17 @@ import { computed, defineComponent } from 'vue';
 import { useStore } from '../../store';
 import { isLocomotive } from '../../utils/vehicleUtils';
 import { ILocomotive, Vehicle } from '../../types';
+import imageMixin from '../../mixins/imageMixin';

 export default defineComponent({
+  mixins: [imageMixin],
+
+  data() {
+    return {
+      noImageAvailable: false,
+    };
+  },
+
  setup() {
    const store = useStore();

@@ -85,16 +80,26 @@ export default defineComponent({
      this.store.imageLoading = false;
    },

+    onImageError(e: Event) {
+      const el = e.target as HTMLImageElement;
+      if (el.src == '/images/placeholder.jpg') return;
+
+      el.src = '/images/placeholder.jpg';
+    },
+
    isLocomotive(vehicle: Vehicle): vehicle is ILocomotive {
      return isLocomotive(vehicle);
    },

-    onImageClick() {
+    onImageClick(e: Event) {
+      const target = e.target as HTMLElement;
+
      const chosenVehicle = this.store.chosenVehicle;

      if (!chosenVehicle) return;

-      this.store.vehiclePreviewSrc = `https://spythere.github.io/api/td2/images/${chosenVehicle.type}--800px.jpg`;
+      this.store.lastFocusedElement = target;
+      this.store.vehiclePreviewSrc = this.getThumbnailURL(chosenVehicle.type, 'large');
    },
  },
 });
@@ -104,66 +109,45 @@ export default defineComponent({
@import '../../styles/global.scss';

 .train-image-section {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+
  grid-row: 3;
  grid-column: 1;

-  margin-top: 2em;
+  margin-top: 1em;
  height: 22em;
 }

 .train-image {
-  &__wrapper {
-    text-align: center;
-  }
-
  &__content {
-    border: 1px solid white;
-    position: relative;
-    overflow: hidden;
-
-    max-width: 22em;
-    height: 13em;
-    margin: 0 auto;
-
-    &.supporter {
+    &.sponsor img {
      border: 1px solid salmon;
    }

    img {
+      max-width: 380px;
      width: 100%;
      height: 100%;
+      border: 1px solid white;

      cursor: zoom-in;
    }
-
-    .empty-message,
-    .no-img {
-      position: absolute;
-      left: 0;
-      bottom: 0;
-
-      padding: 0.3em 0;
-      width: 100%;
-    }
-
-    .empty-message {
-      background: rgba(#000, 0.75);
-    }
  }
 }

 .train-image__info {
-  margin: 1em 0;
  font-size: 1.1em;
-  padding: 0 1em;
+  padding: 0.5em;
+  margin: 0.5em auto;
+  line-height: 1.35;

-  b {
-    font-size: 1.1em;
-  }
+  width: 100%;
+  max-width: 380px;

-  div {
-    margin: 0.25em 0;
-  }
+  background-color: $secondaryColor;
+  font-weight: bold;
 }

 // Transition animations
@@ -185,4 +169,3 @@ export default defineComponent({
  }
 }
 </style>
-
@@ -1,34 +1,55 @@
 <template>
  <div class="number-generator tab">
    <div class="tab_header">
-      <h2>{{ $t('numgen.title') }}</h2>
+      <h2>{{ $t("numgen.title") }}</h2>
    </div>

    <div class="tab_content">
      <div class="options">
        <select v-model="chosenCategory" @change="randomizeTrainNumber()">
-          <option :value="null" disabled>{{ $t('numgen.train-category') }}</option>
-          <option v-for="(_, category) in genData.categories" :value="category">
+          <option :value="null" disabled>
+            {{ $t("numgen.train-category") }}
+          </option>
+          <option
+            v-for="(_, category) in genData.categories"
+            :key="category"
+            :value="category"
+          >
            {{ $t(`numgen.categories.${category}`) }}
          </option>
        </select>

        <select v-model="beginRegionName" @change="randomizeTrainNumber()">
-          <option :value="null" disabled>{{ $t('numgen.start-region') }}</option>
-          <option v-for="(_, name) in genData.regionNumbers" :value="name">{{ name }}</option>
+          <option :value="null" disabled>
+            {{ $t("numgen.start-region") }}
+          </option>
+          <option
+            v-for="(_, name) in genData.regionNumbers"
+            :key="name"
+            :value="name"
+          >
+            {{ name }}
+          </option>
        </select>

        <select v-model="endRegionName" @change="randomizeTrainNumber()">
-          <option :value="null" disabled>{{ $t('numgen.end-region') }}</option>
-          <option v-for="(_, name) in genData.regionNumbers" :value="name">{{ name }}</option>
+          <option :value="null" disabled>{{ $t("numgen.end-region") }}</option>
+          <option
+            v-for="(_, name) in genData.regionNumbers"
+            :key="name"
+            :value="name"
+          >
+            {{ name }}
+          </option>
        </select>
      </div>

      <div class="generated-number" @click="copyNumber">
        <span v-if="trainNumber">
-          {{ $t('numgen.number-info') }} <b class="text--accent">{{ trainNumber }}</b>
+          {{ $t("numgen.number-info") }}
+          <b class="text--accent">{{ trainNumber }}</b>
        </span>
-        <span v-else>{{ $t('numgen.warning') }}</span>
+        <span v-else>{{ $t("numgen.warning") }}</span>
      </div>

      <!-- <div v-if="chosenCategory">
@@ -50,25 +71,29 @@

      <div class="tab_links">
        <a :href="$t('numgen.td2-wiki-link')" target="_blank">
-          {{ $t('numgen.td2-wiki') }}
+          {{ $t("numgen.td2-wiki") }}
        </a>
      </div>

      <hr />

      <div class="tab_actions">
-        <button class="btn" @click="randomizeTrainNumber(true)">{{ $t('numgen.action-random-region') }}</button>
-        <button class="btn" @click="randomizeTrainNumber(false)">{{ $t('numgen.action-random-number') }}</button>
+        <button class="btn" @click="randomizeTrainNumber(true)">
+          {{ $t("numgen.action-random-region") }}
+        </button>
+        <button class="btn" @click="randomizeTrainNumber(false)">
+          {{ $t("numgen.action-random-number") }}
+        </button>
      </div>
    </div>
  </div>
 </template>

 <script setup lang="ts">
-import { Ref, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
+import { Ref, ref } from "vue";
+import { useI18n } from "vue-i18n";

-import genData from '../../constants/numberGeneratorData.json';
+import genData from "../../constants/numberGeneratorData.json";

 const i18n = useI18n();
 type RegionName = keyof typeof genData.regionNumbers;
@@ -83,7 +108,7 @@ const trainNumber = ref(null) as Ref<string | null>;
 const copyNumber = () => {
  if (trainNumber.value) {
    navigator.clipboard.writeText(trainNumber.value);
-    alert(i18n.t('numgen.alert'));
+    alert(i18n.t("numgen.alert"));
  }
 };

@@ -93,16 +118,21 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
  const regionKeys = Object.keys(genData.regionNumbers);

  if (beginRegionName.value == null || randomizeRegions)
-    beginRegionName.value = regionKeys[(regionKeys.length * Math.random()) << 0] as RegionName;
+    beginRegionName.value = regionKeys[
+      (regionKeys.length * Math.random()) << 0
+    ] as RegionName;

  if (endRegionName.value == null || randomizeRegions)
-    endRegionName.value = regionKeys[(regionKeys.length * Math.random()) << 0] as RegionName;
+    endRegionName.value = regionKeys[
+      (regionKeys.length * Math.random()) << 0
+    ] as RegionName;

-  let number = '';
+  let number = "";

  if (beginRegionName.value == endRegionName.value) {
    const sameRegionsNumbers = genData.sameRegions[beginRegionName.value!];
-    const randRegionNumber = sameRegionsNumbers[Math.floor(Math.random() * sameRegionsNumbers.length)];
+    const randRegionNumber =
+      sameRegionsNumbers[Math.floor(Math.random() * sameRegionsNumbers.length)];
    number += randRegionNumber.toString();
  } else {
    const beginRegionNumber = genData.regionNumbers[beginRegionName.value!];
@@ -117,23 +147,30 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
    return;
  }

-  if (chosenCategory.value == null) chosenCategory.value = 'EI';
+  if (chosenCategory.value == null) chosenCategory.value = "EI";

-  const rulesArray = genData.categories[chosenCategory.value].split(';').map((r) => ({
-    index: r.split(':')[0],
-    rule: r.split(':')[1],
-    nums: Number(r.split(':')[2] || '1'),
-  }));
+  const rulesArray = genData.categories[chosenCategory.value]
+    .split(";")
+    .map((r) => ({
+      index: r.split(":")[0],
+      rule: r.split(":")[1],
+      nums: Number(r.split(":")[2] || "1"),
+    }));

  rulesArray.forEach((r) => {
-    const range = r.rule.split('-');
+    const range = r.rule.split("-");

    if (range.length == 1) number += r.rule;
    else {
      const [minRange, maxRange] = range;
-      const randRange = Math.floor(Math.random() * (Number(maxRange) - Number(minRange)) + Number(minRange)).toString();
+      const randRange = Math.floor(
+        Math.random() * (Number(maxRange) - Number(minRange)) +
+          Number(minRange),
+      ).toString();

-      number += new Array(Math.abs(randRange.length - r.nums)).fill('0').join('') + randRange;
+      number +=
+        new Array(Math.abs(randRange.length - r.nums)).fill("0").join("") +
+        randRange;
    }
  });

@@ -142,8 +179,8 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
 </script>

 <style lang="scss" scoped>
-@import '../../styles/tab.scss';
-@import '../../styles/global.scss';
+@import "../../styles/tab.scss";
+@import "../../styles/global.scss";

 .options {
  display: grid;
@@ -189,4 +226,3 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
  }
 }
 </style>
-
@@ -37,12 +37,13 @@

      <div class="generator_cargo">
        <button
+          v-for="cargo in computedCargoData"
+          :key="cargo.name"
          class="btn"
-          :data-chosen="chosenCargoTypes.includes(cargoName.toString())"
-          v-for="(cargoArray, cargoName) in store.stockData?.generator.cargo"
-          @click="toggleCargoChosen(cargoName.toString(), cargoArray)"
+          :data-chosen="chosenCargoTypes.includes(cargo.name)"
+          @click="toggleCargoChosen(cargo.name, cargo.cargoList)"
        >
-          {{ $t(`cargo.${cargoName}`) }}
+          {{ $t(`cargo.${cargo.name}`) }}
        </button>
      </div>

@@ -126,7 +127,20 @@ export default defineComponent({

  computed: {
    computedChosenCarTypes() {
-      return new Set<string>(this.chosenCarTypes.sort((c1, c2) => (c1 > c2 ? 1 : -1)));
+      return new Set<string>(this.chosenCarTypes.slice().sort((c1, c2) => (c1 > c2 ? 1 : -1)));
+    },
+
+    computedCargoData() {
+      if (!this.store.stockData?.generator.cargo) return [];
+
+      const cargoGeneratorData = this.store.stockData.generator.cargo;
+
+      return Object.keys(cargoGeneratorData)
+        .sort((v1, v2) => this.$t(`cargo.${v1}`).localeCompare(this.$t(`cargo.${v2}`)))
+        .map((v) => ({
+          name: v,
+          cargoList: cargoGeneratorData[v],
+        }));
    },
  },

@@ -150,44 +164,52 @@ export default defineComponent({
    },

    generateStock(empty = false) {
-      const generatedChosenStockList = this.chosenCargoTypes.reduce((acc, type) => {
-        this.store.stockData?.generator.cargo[type]
-          .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
-          .forEach((c) => {
-            const [type, cargoType] = c.split(':');
+      const generatedChosenStockList = this.chosenCargoTypes.reduce(
+        (acc, type) => {
+          this.store.stockData?.generator.cargo[type]
+            .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
+            .forEach((c) => {
+              const [type, cargoType] = c.split(':');

-            const carWagonObjs = this.store.carDataList.filter((cw) => cw.type.startsWith(type));
-            const cargoObjs = [] as (ICargo | undefined)[];
+              const carWagonObjs = this.store.carDataList.filter((cw) => cw.type.startsWith(type));
+              const cargoObjs = [] as (ICargo | undefined)[];

-            if (!cargoType || empty) cargoObjs.push(undefined);
-            else if (cargoType == 'all') cargoObjs.push(...carWagonObjs[0]?.cargoList);
-            else cargoObjs.push(carWagonObjs[0]?.cargoList.find((cargo) => cargo.id == cargoType));
+              if (!cargoType || empty) cargoObjs.push(undefined);
+              else if (cargoType == 'all') cargoObjs.push(...carWagonObjs[0]!.cargoList);
+              else cargoObjs.push(carWagonObjs[0]?.cargoList.find((cargo) => cargo.id == cargoType));

-            carWagonObjs.forEach((cw) => {
-              cargoObjs.forEach((cargoObj) => {
-                const chosenStock = acc.find((a) => a.constructionType.includes(cw.constructionType));
+              carWagonObjs.forEach((cw) => {
+                cargoObjs.forEach((cargoObj) => {
+                  const chosenStock = acc.find((a) => a.constructionType.includes(cw.constructionType));

-                if (!chosenStock)
-                  acc.push({
-                    constructionType: cw.constructionType,
-                    carPool: [{ carWagon: cw, cargo: cargoObj }],
-                  });
-                else chosenStock.carPool.push({ carWagon: cw, cargo: cargoObj });
+                  if (!chosenStock)
+                    acc.push({
+                      constructionType: cw.constructionType,
+                      carPool: [{ carWagon: cw, cargo: cargoObj }],
+                    });
+                  else chosenStock.carPool.push({ carWagon: cw, cargo: cargoObj });
+                });
              });
            });
-          });

-        return acc;
-      }, [] as { constructionType: string; carPool: { carWagon: ICarWagon; cargo?: ICargo }[] }[]);
+          return acc;
+        },
+        [] as {
+          constructionType: string;
+          carPool: { carWagon: ICarWagon; cargo?: ICargo }[];
+        }[]
+      );

-      let bestGeneration: { stockList: IStock[]; value: number } = { stockList: [], value: 0 };
+      let bestGeneration: { stockList: IStock[]; value: number } = {
+        stockList: [],
+        value: 0,
+      };

      for (let i = 0; i < 10; i++) {
        const headingLoco = this.store.stockList[0]?.isLoco ? this.store.stockList[0] : undefined;
        this.store.stockList.length = headingLoco ? 1 : 0;

-        const maxMass =
-          this.store.acceptableMass > 0 ? Math.min(this.store.acceptableMass, this.maxMass) : this.maxMass;
+        const maxMass = this.store.acceptableMass > 0 ? Math.min(this.store.acceptableMass, this.maxMass) : this.maxMass;

        let exceeded = false;

@@ -277,13 +299,6 @@ export default defineComponent({

    background-color: $secondaryColor;

-    &[data-chosen='true'] {
-      background-color: $accentColor;
-      color: black;
-
-      box-shadow: 0 0 5px 1px $accentColor;
-    }
-
    &[data-excluded='true'] {
      background-color: gray;
      box-shadow: none;
@@ -316,4 +331,3 @@ export default defineComponent({
  color: black;
 }
 </style>
-
@@ -5,14 +5,11 @@
    </div>

    <div class="stock_actions">
-      <label class="file-label">
-        <div class="btn btn--image">
-          <img src="/images/icon-upload.svg" alt="" />
-          {{ $t('stocklist.action-upload') }}
-        </div>
-
+      <button class="btn btn--image" @click="clickFileInput">
        <input type="file" @change="uploadStock" ref="conFile" accept=".con,.txt" />
-      </label>
+        <img src="/images/icon-upload.svg" alt="upload icon" />
+        {{ $t('stocklist.action-upload') }}
+      </button>

      <button class="btn btn--image" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="downloadStock">
        <img src="/images/icon-download.svg" alt="download icon" />
@@ -37,36 +34,26 @@

    <div class="stock_controls" :data-disabled="store.chosenStockListIndex == -1">
      <b v-if="store.chosenStockListIndex >= 0">
-        {{ $t('stocklist.vehicle-no') }} <span class="text--accent">{{ store.chosenStockListIndex + 1 }}</span> &nbsp;
+        {{ $t('stocklist.vehicle-no') }}
+        <span class="text--accent">{{ store.chosenStockListIndex + 1 }}</span>
+        &nbsp;
      </b>

      <b v-else>
        {{ $t('stocklist.no-vehicle-chosen') }}
      </b>

-      <button
-        class="btn"
-        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
-        @click="moveUpStock(store.chosenStockListIndex)"
-      >
+      <button class="btn" :tabindex="store.chosenStockListIndex == -1 ? -1 : 0" @click="moveUpStock(store.chosenStockListIndex)">
        <img :src="getIconURL('higher')" alt="move up vehicle" />
        {{ $t('stocklist.action-move-up') }}
      </button>

-      <button
-        class="btn"
-        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
-        @click="moveDownStock(store.chosenStockListIndex)"
-      >
+      <button class="btn" :tabindex="store.chosenStockListIndex == -1 ? -1 : 0" @click="moveDownStock(store.chosenStockListIndex)">
        <img :src="getIconURL('lower')" alt="move down vehicle" />
        {{ $t('stocklist.action-move-down') }}
      </button>

-      <button
-        class="btn"
-        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
-        @click="removeStock(store.chosenStockListIndex)"
-      >
+      <button class="btn" :tabindex="store.chosenStockListIndex == -1 ? -1 : 0" @click="removeStock(store.chosenStockListIndex)">
        <img :src="getIconURL('remove')" alt="remove vehicle" />
        {{ $t('stocklist.action-remove') }}
      </button>
@@ -82,45 +69,40 @@
      </b>

      <span>
-        {{ $t('stocklist.mass') }} <span class="text--accent">{{ store.totalMass }}t</span> ({{
-          $t('stocklist.mass-accepted')
-        }}: <span class="text--accent">{{ store.acceptableMass ? store.acceptableMass + 't' : '-' }}</span
+        {{ $t('stocklist.mass') }}
+        <span class="text--accent">{{ store.totalMass }}t</span> ({{ $t('stocklist.mass-accepted') }}:
+        <span class="text--accent">{{ store.acceptableMass ? store.acceptableMass + 't' : '-' }}</span
        >) - {{ $t('stocklist.length') }}:
        <span class="text--accent">{{ store.totalLength }}m</span>
-        - {{ $t('stocklist.vmax') }}: <span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
+        - {{ $t('stocklist.vmax') }}:
+        <span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
      </span>
    </div>

-    <div class="stock_cold-start">
-      <label>
-        <input
-          type="checkbox"
-          v-model="store.isColdStart"
-          :disabled="!locoSupportsColdStart(store.stockList[0]?.constructionType || '')"
-        />
+    <div class="stock_spawn-settings">
+      <label v-if="store.stockSupportsColdStart" :data-checked="store.isColdStart">
+        <input type="checkbox" v-model="store.isColdStart" />
        {{ $t('stocklist.coldstart-info') }}
      </label>
+
+      <label v-if="store.stockSupportsDoubleManning" :data-checked="store.isDoubleManned">
+        <input type="checkbox" v-model="store.isDoubleManned" />
+        {{ $t('stocklist.doublemanning-info') }}
+      </label>
    </div>

    <div class="stock_warnings" v-if="stockHasWarnings">
      <div class="warning" v-if="locoNotSuitable">(!) {{ $t('stocklist.warning-not-suitable') }}</div>

-      <div class="warning" v-if="trainTooLong && store.isTrainPassenger">
-        (!) {{ $t('stocklist.warning-passenger-too-long') }}
-      </div>
+      <div class="warning" v-if="trainTooLong && store.isTrainPassenger">(!) {{ $t('stocklist.warning-passenger-too-long') }}</div>

-      <div class="warning" v-if="trainTooLong && !store.isTrainPassenger">
-        (!) {{ $t('stocklist.warning-freight-too-long') }}
-      </div>
+      <div class="warning" v-if="trainTooLong && !store.isTrainPassenger">(!) {{ $t('stocklist.warning-freight-too-long') }}</div>

      <div class="warning" v-if="trainTooHeavy">
        (!)
        <i18n-t keypath="stocklist.warning-too-heavy">
          <template #href>
-            <a
-              target="_blank"
-              href="https://docs.google.com/spreadsheets/d/1bFXUsHsAu4youmNz-46Q1HslZaaoklvfoBDS553TnNk/edit"
-            >
+            <a target="_blank" href="https://docs.google.com/spreadsheets/d/1KVa5vn2d8XGkXQFwbavVudwKqUQxbLOucHWs2VYqAUE">
              {{ $t('stocklist.acceptable-mass-docs') }}
            </a>
          </template>
@@ -153,23 +135,19 @@
          @keydown.backspace="removeStock(i)"
          ref="itemRefs"
        >
-          <div
-            class="stock-info"
-            @dragstart="onDragStart(i)"
-            @drop="onDrop($event, i)"
-            @dragover="allowDrop"
-            draggable="true"
-          >
+          <div class="stock-info" @dragstart="onDragStart(i)" @drop="onDrop($event, i)" @dragover="allowDrop" draggable="true">
            <span class="stock-info__no" :data-selected="i == store.chosenStockListIndex">
              <span v-if="i == store.chosenStockListIndex">&bull;&nbsp;</span>
              {{ i + 1 }}.
            </span>

-            <span class="stock-info__type" :class="{ supporter: stock.supportersOnly }">
+            <span class="stock-info__type" :class="{ sponsor: stock.isSponsorsOnly }">
              {{ stock.isLoco ? stock.type : getCarSpecFromType(stock.type) }}
            </span>

-            <span class="stock-info__cargo" v-if="stock.cargo"> {{ stock.cargo.id }} </span>
+            <span class="stock-info__cargo" v-if="stock.cargo">
+              {{ stock.cargo.id }}
+            </span>
            <span class="stock-info__length"> {{ stock.length }}m </span>
            <span class="stock-info__mass">{{ stock.cargo ? stock.cargo.totalMass : stock.mass }}t </span>
            <span class="stock-info__speed"> {{ stock.maxSpeed }}km/h </span>
@@ -182,11 +160,9 @@

 <script lang="ts">
 import { defineComponent } from 'vue';
-import TrainImage from '../sections/TrainImageSection.vue';

 import { useStore } from '../../store';

-import { locoSupportsColdStart } from '../../utils/locoUtils';
 import warningsMixin from '../../mixins/warningsMixin';
 import imageMixin from '../../mixins/imageMixin';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
@@ -195,7 +171,7 @@ import stockMixin from '../../mixins/stockMixin';

 export default defineComponent({
  name: 'stock-list',
-  components: { TrainImage, StockThumbnails },
+  components: { StockThumbnails },

  mixins: [warningsMixin, imageMixin, stockMixin, stockPreviewMixin],

@@ -216,13 +192,19 @@ export default defineComponent({

  computed: {
    stockString() {
+      if (this.store.stockList.length == 0) return '';
+
+      const includeColdStart = this.store.isColdStart && this.store.stockSupportsColdStart;
+      const includeDoubleManned = this.store.isDoubleManned && this.store.stockSupportsDoubleManning;
+
      return this.store.stockList
        .map((stock, i) => {
          let stockTypeStr = stock.isLoco || !stock.cargo ? stock.type : `${stock.type}:${stock.cargo.id}`;
-          let coldStart =
-            i == 0 && this.store.isColdStart && locoSupportsColdStart(stock.constructionType || '') ? ',c' : '';

-          return stockTypeStr + coldStart;
+          if (i == 0 && (includeColdStart || includeDoubleManned))
+            return `${stockTypeStr},${includeColdStart ? 'c' : ''}${includeDoubleManned ? 'd' : ''}`;
+
+          return stockTypeStr;
        })
        .join(';');
    },
@@ -241,8 +223,6 @@ export default defineComponent({
  },

  methods: {
-    locoSupportsColdStart,
-
    copyToClipboard() {
      navigator.clipboard.writeText(this.stockString);

@@ -251,11 +231,14 @@ export default defineComponent({
      }, 20);
    },

+    clickFileInput() {
+      (this.$refs['conFile'] as HTMLInputElement).click();
+    },
+
    onListItemClick(stockID: number) {
      const stock = this.store.stockList[stockID];

-      this.store.chosenStockListIndex =
-        this.store.chosenStockListIndex == stockID && this.store.chosenVehicle?.type == stock.type ? -1 : stockID;
+      this.store.chosenStockListIndex = this.store.chosenStockListIndex == stockID && this.store.chosenVehicle?.type == stock.type ? -1 : stockID;

      if (this.store.chosenStockListIndex == -1) {
        this.store.chosenVehicle = null;
@@ -352,9 +335,9 @@ export default defineComponent({
    downloadStock() {
      if (this.store.stockList.length == 0) return alert(this.$t('stocklist.alert-empty'));

-      const defaultName = `${this.store.chosenRealStockName || this.store.stockList[0].type} ${
-        this.store.totalMass
-      }t; ${this.store.totalLength}m; vmax ${this.store.maxStockSpeed}`;
+      const defaultName = `${this.store.chosenRealStockName || this.store.stockList[0].type} ${this.store.totalMass}t; ${
+        this.store.totalLength
+      }m; vmax ${this.store.maxStockSpeed}`;

      const fileName = prompt(this.$t('stocklist.prompt-file'), defaultName);

@@ -487,12 +470,51 @@ export default defineComponent({

  grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));

-  label.file-label {
-    text-align: center;
-    cursor: pointer;
+  button {
+    width: 100%;

    input {
-      display: none;
+      opacity: 0;
+      width: 0;
+      height: 0;
+    }
+  }
+}
+
+.stock_spawn-settings {
+  display: flex;
+  gap: 0.5em;
+
+  label > input {
+    position: absolute;
+    clip: rect(1px, 1px, 1px, 1px);
+    padding: 0;
+    border: 0;
+    height: 1px;
+    width: 1px;
+    overflow: hidden;
+  }
+
+  label {
+    padding: 0.25em 0.5em;
+    border-radius: 0.25em;
+    background-color: #222;
+    color: #aaa;
+    cursor: pointer;
+
+    text-transform: uppercase;
+    transition: color 200ms;
+
+    &::before {
+      content: '\2716';
+    }
+  }
+
+  label[data-checked='true'] {
+    color: palegreen;
+
+    &::before {
+      content: '\2714';
    }
  }
 }
@@ -549,7 +571,7 @@ li > .stock-info {
  }
 }

-.supporter {
+.sponsor {
  color: salmon;
 }

@@ -610,4 +632,3 @@ li > .stock-info {
  }
 }
 </style>
-
@@ -1,356 +1,327 @@
-<template>
-  <section class="wiki-list tab">
-    <div class="tab_header">
-      <h2>{{ $t('wiki.title') }}</h2>
-    </div>
-
-    <div class="tab_content">
-      <div class="actions-panel">
-        <div class="actions-panel_vehicles">
-          <button class="btn btn--choice" @click="changeWikiMode('locomotives')">
-            {{ $t('wiki.action-vehicles') }}
-          </button>
-          <button class="btn btn--choice" @click="changeWikiMode('carWagons')">
-            {{ $t('wiki.action-carriages') }}
-          </button>
-        </div>
-
-        <div class="actions-panel_search">
-          <input type="text" :placeholder="$t('wiki.search')" v-model="searchedVehicleTypeName" />
-        </div>
-      </div>
-
-      <div class="table-wrapper" @scroll="scrollEvent" ref="table-wrapper">
-        <table>
-          <thead>
-            <tr>
-              <th v-for="header in wikiMode == 'locomotives' ? locoHeaders : carHeaders" @click="toggleSorter(header)">
-                {{ $t(`wiki.header.${header.id}`) }}
-
-                <span v-if="currentModeSorter.id == header.id">
-                  {{ currentModeSorter.direction == 1 ? `&uArr;` : `&dArr;` }}
-                </span>
-              </th>
-            </tr>
-          </thead>
-
-          <tbody v-if="wikiMode == 'locomotives'">
-            <tr
-              v-for="loco in computedLocoList"
-              @click="previewLocomotive(loco)"
-              @keydown.enter="previewLocomotive(loco)"
-              @dblclick="addLocomotive(loco)"
-              tabindex="0"
-            >
-              <td>
-                <img
-                  :src="`https://spythere.github.io/api/td2/images/${loco.type}--300px.jpg`"
-                  loading="lazy"
-                  :alt="`Lokomotywa ${loco.type}`"
-                />
-              </td>
-
-              <td>{{ loco.type }}</td>
-              <td>{{ $t(`wiki.${loco.power}`) }}</td>
-              <td>{{ loco.constructionType }}</td>
-              <td>{{ locoSupportsColdStart(loco.constructionType) ? `&check;` : '&cross;' }}</td>
-              <td>{{ loco.length }}m</td>
-              <td>{{ loco.mass }}t</td>
-              <td>{{ loco.maxSpeed }}km/h</td>
-            </tr>
-          </tbody>
-
-          <tbody v-else>
-            <tr
-              v-for="car in computedCarList"
-              @keydow.enter="previewCarWagon(car)"
-              @click="previewCarWagon(car)"
-              @dblclick="addCarWagon(car)"
-              tabindex="0"
-            >
-              <td>
-                <img
-                  :src="`https://spythere.github.io/api/td2/images/${car.type}--300px.jpg`"
-                  loading="lazy"
-                  :alt="`Lokomotywa ${car.type}`"
-                />
-              </td>
-
-              <td>{{ car.type }}</td>
-              <td>{{ car.constructionType }}</td>
-              <td>{{ car.length }}m</td>
-              <td>{{ car.mass }}t</td>
-              <td>{{ car.maxSpeed }}km/h</td>
-              <td>{{ car.cargoList.length == 0 ? '-' : car.cargoList.length }}</td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { useStore } from '../../store';
-import stockPreviewMixin from '../../mixins/stockPreviewMixin';
-import { Vehicle } from '../../types';
-import { isLocomotive } from '../../utils/vehicleUtils';
-import stockMixin from '../../mixins/stockMixin';
-import { locoSupportsColdStart } from '../../utils/locoUtils';
-
-type WikiMode = 'locomotives' | 'carWagons';
-type SorterID =
-  | 'type'
-  | 'constructionType'
-  | 'image'
-  | 'length'
-  | 'mass'
-  | 'maxSpeed'
-  | 'cargoCount'
-  | 'power'
-  | 'coldStart';
-
-interface WikiHeader {
-  id: SorterID;
-  sortable: boolean;
-}
-
-const locoHeaders: WikiHeader[] = [
-  { id: 'image', sortable: false },
-  { id: 'type', sortable: true },
-  { id: 'power', sortable: true },
-  { id: 'constructionType', sortable: true },
-  { id: 'coldStart', sortable: true },
-  { id: 'length', sortable: true },
-  { id: 'mass', sortable: true },
-  { id: 'maxSpeed', sortable: true },
-];
-
-const carHeaders: WikiHeader[] = [
-  { id: 'image', sortable: false },
-  { id: 'type', sortable: true },
-  { id: 'constructionType', sortable: true },
-  { id: 'length', sortable: true },
-  { id: 'mass', sortable: true },
-  { id: 'maxSpeed', sortable: true },
-  { id: 'cargoCount', sortable: true },
-];
-
-export default defineComponent({
-  mixins: [stockPreviewMixin, stockMixin],
-
-  data() {
-    return {
-      store: useStore(),
-      locoHeaders,
-      carHeaders,
-
-      locosScrollTop: 0,
-      carsScrollTop: 0,
-
-      wikiMode: 'locomotives' as WikiMode,
-      searchedVehicleTypeName: '',
-
-      currentLocoSorter: {
-        id: 'type' as SorterID,
-        direction: 1,
-      },
-
-      currentCarSorter: {
-        id: 'type' as SorterID,
-        direction: 1,
-      },
-    };
-  },
-
-  activated() {
-    const tableWrapperRef = this.$refs['table-wrapper'] as HTMLElement;
-    tableWrapperRef.scrollTo({ top: this.wikiMode == 'locomotives' ? this.locosScrollTop : this.carsScrollTop });
-  },
-
-  methods: {
-    locoSupportsColdStart,
-
-    scrollEvent(e: Event) {
-      const tableScrollTop = (e.target as HTMLElement).scrollTop;
-
-      if (this.wikiMode == 'locomotives') this.locosScrollTop = tableScrollTop;
-      else this.carsScrollTop = tableScrollTop;
-    },
-
-    changeWikiMode(wikiMode: WikiMode) {
-      this.searchedVehicleTypeName = '';
-      this.wikiMode = wikiMode;
-    },
-
-    toggleSorter(header: WikiHeader) {
-      if (!header.sortable) return;
-
-      if (header.id == this.currentModeSorter.id) this.currentModeSorter.direction *= -1;
-      this.currentModeSorter.id = header.id;
-    },
-
-    sortVehicles(vA: Vehicle, vB: Vehicle) {
-      const { id, direction } = this.currentModeSorter;
-      const vehiclesAreLocos = isLocomotive(vA) && isLocomotive(vB);
-      const vehiclesAreCars = !isLocomotive(vA) && !isLocomotive(vB);
-
-      switch (id) {
-        case 'type':
-        case 'constructionType':
-          return direction == 1 ? vA[id].localeCompare(vB[id]) : vB[id].localeCompare(vA[id]);
-
-        case 'mass':
-        case 'length':
-        case 'maxSpeed':
-          return Math.sign(vA[id] - vB[id]) * direction;
-
-        case 'cargoCount':
-          if (vehiclesAreCars) return Math.sign((vA.cargoList.length || -1) - (vB.cargoList.length || -1)) * direction;
-
-        case 'coldStart':
-          if (vehiclesAreLocos)
-            return (
-              (locoSupportsColdStart(vA.constructionType) > locoSupportsColdStart(vB.constructionType) ? 1 : -1) *
-              direction
-            );
-
-        default:
-          break;
-      }
-
-      return direction == 1 ? vA.type.localeCompare(vB.type) : vB.type.localeCompare(vA.type);
-    },
-  },
-
-  computed: {
-    currentModeSorter() {
-      return this.wikiMode == 'carWagons' ? this.currentCarSorter : this.currentLocoSorter;
-    },
-
-    computedLocoList() {
-      const trimmedSearchValue = this.searchedVehicleTypeName.trim();
-
-      return this.store.locoDataList
-        .filter((loco) => new RegExp(`${trimmedSearchValue}`, 'i').test(loco.type))
-        .sort(this.sortVehicles);
-    },
-
-    computedCarList() {
-      const trimmedSearchValue = this.searchedVehicleTypeName.trim();
-
-      return this.store.carDataList
-        .filter((car) => new RegExp(`${trimmedSearchValue}`, 'i').test(car.type))
-        .sort(this.sortVehicles);
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/tab.scss';
-
-.actions-panel {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  flex-wrap: wrap;
-  gap: 0.5em;
-
-  margin: 0.5em 0;
-}
-
-.actions-panel_vehicles {
-  display: flex;
-  gap: 0.5em;
-}
-
-.actions-panel_search {
-  input {
-    width: auto;
-  }
-}
-
-.table-wrapper {
-  overflow: auto;
-  height: 750px;
-  max-height: 95vh;
-}
-
-.wiki-list table {
-  border-collapse: collapse;
-  width: 100%;
-
-  thead {
-    position: sticky;
-    top: 0;
-  }
-
-  th {
-    background-color: #111;
-    padding: 0.5em;
-    user-select: none;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-  }
-
-  tr {
-    cursor: pointer;
-    background-color: #333;
-
-    &:nth-child(odd) {
-      background-color: #444;
-    }
-
-    &:hover {
-      background-color: #666;
-    }
-  }
-
-  td {
-    text-align: center;
-    padding: 0.25em;
-    height: 85px;
-  }
-
-  td:first-child {
-    width: 120px;
-  }
-
-  td img {
-    display: block;
-    width: 120px;
-  }
-}
-
-@media screen and (max-width: $breakpointMd) {
-  .wiki-list table {
-    td {
-      width: 100px;
-      height: auto;
-
-      img {
-        width: 6em;
-      }
-    }
-  }
-}
-
-@media screen and (max-width: $breakpointSm) {
-  .actions-panel {
-    align-items: stretch;
-    flex-direction: column;
-  }
-
-  .actions-panel_vehicles {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-  }
-
-  .actions-panel_search {
-    display: grid;
-  }
-}
-</style>
+<template>
+  <section class="wiki-list tab">
+    <div class="tab_header">
+      <h2>{{ $t('wiki.title') }}</h2>
+    </div>
+
+    <div class="tab_content">
+      <div class="actions-panel">
+        <div class="actions-panel_vehicles">
+          <button class="btn" :data-chosen="currentFilterMode == 'tractions'" @click="toggleFilter('tractions')">
+            {{ $t('wiki.action-vehicles') }}
+          </button>
+          <button class="btn" :data-chosen="currentFilterMode == 'carriages'" @click="toggleFilter('carriages')">
+            {{ $t('wiki.action-carriages') }}
+          </button>
+        </div>
+
+        <div class="actions-panel_search">
+          <input type="text" :placeholder="$t('wiki.search')" v-model="searchedVehicleTypeName" />
+        </div>
+      </div>
+
+      <div class="table-wrapper" ref="table-wrapper">
+        <table>
+          <thead>
+            <tr>
+              <th v-for="header in visibleHeaders" @click="toggleSorter(header)" :key="header.id">
+                {{ $t(`wiki.header.${header.id}`) }}
+
+                <span v-if="currentSorter.id == header.id">
+                  {{ currentSorter.direction == 1 ? `&uArr;` : `&dArr;` }}
+                </span>
+              </th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr
+              v-for="{ vehicle, show } in computedTableData"
+              tabindex="0"
+              v-show="show"
+              :key="vehicle.type"
+              @click="previewVehicle(vehicle)"
+              @keydown.enter="previewVehicle(vehicle)"
+              @dblclick="addVehicle(vehicle)"
+            >
+              <td style="width: 120px">
+                <img
+                  width="120"
+                  :src="getThumbnailURL(vehicle.type, 'small')"
+                  :alt="`${vehicle.type}`"
+                  loading="lazy"
+                  @error="(e) => ((e.target as HTMLElement).style.display = 'none')"
+                />
+              </td>
+
+              <td :data-sponsoronly="vehicle.isSponsorsOnly">{{ vehicle.type }}</td>
+
+              <td v-if="isLocomotive(vehicle)">{{ $t(`wiki.${vehicle.power}`) }}</td>
+              <td v-else>{{ $t(`wiki.${vehicle.useType}`) }}</td>
+
+              <td>{{ vehicle.constructionType }}</td>
+              <td>{{ vehicle.length }}m</td>
+              <td>{{ vehicle.mass }}t</td>
+              <td>{{ vehicle.maxSpeed }}km/h</td>
+
+              <td v-if="currentFilterMode == 'carriages'">{{ !isLocomotive(vehicle) ? vehicle.cargoList.length : '---' }}</td>
+              <td v-if="currentFilterMode == 'tractions'">
+                {{ isLocomotive(vehicle) ? (vehicle.coldStart ? `&check;` : '&cross;') : '---' }}
+              </td>
+            </tr>
+          </tbody>
+
+          <span ref="table-bottom"></span>
+        </table>
+      </div>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useStore } from '../../store';
+import stockPreviewMixin from '../../mixins/stockPreviewMixin';
+import { Vehicle } from '../../types';
+import { isLocomotive } from '../../utils/vehicleUtils';
+import stockMixin from '../../mixins/stockMixin';
+import imageMixin from '../../mixins/imageMixin';
+
+type SorterID = 'type' | 'constructionType' | 'image' | 'length' | 'mass' | 'maxSpeed' | 'cargoCount' | 'group' | 'coldStart';
+
+interface IWikiHeader {
+  id: SorterID;
+  sortable: boolean;
+  for: 'all' | 'carriages' | 'tractions';
+}
+
+interface IWikiRow {
+  vehicle: Vehicle;
+  show: boolean;
+}
+
+const headers: IWikiHeader[] = [
+  { id: 'image', sortable: false, for: 'all' },
+  { id: 'type', sortable: true, for: 'all' },
+  { id: 'group', sortable: true, for: 'all' },
+  { id: 'constructionType', sortable: true, for: 'all' },
+  { id: 'length', sortable: true, for: 'all' },
+  { id: 'mass', sortable: true, for: 'all' },
+  { id: 'maxSpeed', sortable: true, for: 'all' },
+  { id: 'coldStart', sortable: true, for: 'tractions' },
+  { id: 'cargoCount', sortable: true, for: 'carriages' },
+];
+
+export default defineComponent({
+  mixins: [stockPreviewMixin, stockMixin, imageMixin],
+
+  data() {
+    return {
+      store: useStore(),
+      headers,
+
+      scrollTop: 0,
+
+      searchedVehicleTypeName: '',
+
+      currentSorter: {
+        id: 'type' as SorterID,
+        direction: 1,
+      },
+
+      currentFilterMode: 'all' as 'all' | 'tractions' | 'carriages',
+    };
+  },
+
+  activated() {
+    const tableWrapperRef = this.$refs['table-wrapper'] as HTMLElement;
+
+    tableWrapperRef.scrollTo({
+      top: this.scrollTop,
+    });
+  },
+
+  methods: {
+    isLocomotive,
+
+    toggleFilter(name: typeof this.currentFilterMode) {
+      this.currentFilterMode = this.currentFilterMode == name ? 'all' : name;
+    },
+
+    toggleSorter(header: IWikiHeader) {
+      if (!header.sortable) return;
+
+      if (header.id == this.currentSorter.id) this.currentSorter.direction *= -1;
+      this.currentSorter.id = header.id;
+    },
+
+    sortTableRows(row1: IWikiRow, row2: IWikiRow) {
+      if (!row1.show) return 0;
+
+      const { id, direction } = this.currentSorter;
+
+      switch (id) {
+        case 'type':
+        case 'constructionType':
+        case 'group':
+          return direction == 1 ? row1.vehicle[id].localeCompare(row2.vehicle[id]) : row2.vehicle[id].localeCompare(row1.vehicle[id]);
+
+        case 'mass':
+        case 'length':
+        case 'maxSpeed':
+          return Math.sign(row1.vehicle[id] - row2.vehicle[id]) * direction;
+
+        case 'cargoCount':
+          return (
+            (!isLocomotive(row1.vehicle) ? Math.sign(row1.vehicle.cargoList.length || -1) : -1) -
+            (!isLocomotive(row2.vehicle) ? (row2.vehicle.cargoList.length || -1) * direction : -1)
+          );
+
+        case 'coldStart':
+          return (
+            ((isLocomotive(row1.vehicle) && row1.vehicle.coldStart ? 1 : -1) - (isLocomotive(row2.vehicle) && row2.vehicle.coldStart ? 1 : -1)) *
+            direction
+          );
+
+        default:
+          break;
+      }
+
+      return direction == 1 ? row1.vehicle.type.localeCompare(row2.vehicle.type) : row2.vehicle.type.localeCompare(row1.vehicle.type);
+    },
+  },
+
+  computed: {
+    computedTableData(): IWikiRow[] {
+      return this.store.vehicleDataList
+        .map((vehicle) => ({
+          vehicle,
+          show:
+            new RegExp(`${this.searchedVehicleTypeName.trim()}`, 'i').test(vehicle.type) &&
+            (this.currentFilterMode == 'all' ||
+              (this.currentFilterMode == 'tractions' && isLocomotive(vehicle)) ||
+              (this.currentFilterMode == 'carriages' && !isLocomotive(vehicle))),
+        }))
+        .sort((a, b) => this.sortTableRows(a, b));
+    },
+
+    visibleHeaders() {
+      const filtersActive = this.currentFilterMode;
+
+      return this.headers.filter((header) => header.for == 'all' || header.for == filtersActive);
+    },
+
+    areTractionVehiclesShown() {
+      return this.currentFilterMode == 'all' || this.currentFilterMode == 'tractions';
+    },
+
+    areCarriagesShown() {
+      return this.currentFilterMode == 'all' || this.currentFilterMode == 'carriages';
+    },
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/tab.scss';
+
+.actions-panel {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  flex-wrap: wrap;
+  gap: 0.5em;
+
+  margin: 0.5em 0;
+}
+
+.actions-panel_vehicles {
+  display: flex;
+  gap: 0.5em;
+}
+
+.actions-panel_search {
+  input {
+    width: auto;
+  }
+}
+
+.table-wrapper {
+  overflow: auto;
+  height: 750px;
+  max-height: 95vh;
+}
+
+.wiki-list table {
+  border-collapse: collapse;
+  width: 100%;
+
+  thead {
+    position: sticky;
+    top: 0;
+  }
+
+  th {
+    background-color: #111;
+    padding: 0.5em;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+  }
+
+  tr {
+    cursor: pointer;
+    background-color: #333;
+
+    &:first-child {
+      min-width: 120px;
+    }
+
+    &:nth-child(odd) {
+      background-color: #444;
+    }
+
+    &:hover {
+      background-color: #666;
+    }
+  }
+
+  td {
+    text-align: center;
+    height: 70px;
+
+    &[data-sponsoronly='true'] {
+      color: salmon;
+    }
+  }
+}
+
+@media screen and (max-width: $breakpointMd) {
+  .wiki-list table {
+    th {
+      min-width: 100px;
+    }
+
+    img {
+      max-width: 100px;
+    }
+  }
+}
+
+@media screen and (max-width: $breakpointSm) {
+  .actions-panel {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  .actions-panel_vehicles {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .actions-panel_search {
+    display: grid;
+  }
+}
+</style>
@@ -1,52 +1,52 @@
-<template>
-  <div
-    class="image-preview"
-    @click="store.vehiclePreviewSrc = ''"
-    @keydown.esc="store.vehiclePreviewSrc = ''"
-    tabindex="0"
-  >
-    <img :src="store.vehiclePreviewSrc" alt="preview" />
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { useStore } from '../../store';
-
-export default defineComponent({
-  data() {
-    return {
-      store: useStore(),
-    };
-  },
-
-  mounted() {
-    this.$el.focus();
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-.image-preview {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 99;
-
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  width: 100%;
-  height: 100%;
-
-  background: rgba(black, 0.85);
-  cursor: zoom-out;
-
-  img {
-    max-width: 100%;
-    height: auto;
-    max-height: 100%;
-  }
-}
-</style>
+<template>
+  <div
+    class="image-preview"
+    @click="store.vehiclePreviewSrc = ''"
+    @keydown.esc="store.vehiclePreviewSrc = ''"
+    tabindex="0"
+  >
+    <img :src="store.vehiclePreviewSrc" alt="preview" />
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import { useStore } from "../../store";
+
+export default defineComponent({
+  data() {
+    return {
+      store: useStore(),
+    };
+  },
+
+  mounted() {
+    this.$el.focus();
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+.image-preview {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 99;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  width: 100%;
+  height: 100%;
+
+  background: rgba(black, 0.85);
+  cursor: zoom-out;
+
+  img {
+    max-width: 100%;
+    height: auto;
+    max-height: 100%;
+  }
+}
+</style>
@@ -1,28 +1,28 @@
 <template>
-  <div class="stock_thumbnails" ref="thumbnailsRef">
+  <div class="stock-thumbnails" ref="thumbnailsRef">
    <div
+      class="thumbnail-item"
      v-for="(stock, stockIndex) in store.stockList"
+      :key="stockIndex"
      :data-selected="store.chosenStockListIndex == stockIndex"
+      :data-sponsor="stock.isSponsorsOnly"
      draggable="true"
      @dragstart="onDragStart(stockIndex)"
      @drop="onDrop($event, stockIndex)"
      @dragover="allowDrop"
+      @click="onListItemClick(stockIndex)"
    >
-      <span @click="onListItemClick(stockIndex)" :key="stock.id">
-        <b :class="{ supporter: stock.supportersOnly }">
-          {{ stock.type }}
-        </b>
+      <b>
+        {{ stock.type }}
+      </b>

-        <span>
-          <img
-            draggable="false"
-            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.type}.png`"
-            :alt="stock.type"
-            :title="stock.type"
-            @error="stockImageError($event, stock)"
-          />
-        </span>
-      </span>
+      <img
+        draggable="false"
+        :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.type}.png`"
+        :alt="stock.type"
+        :title="stock.type"
+        @error="stockImageError($event, stock)"
+      />
    </div>
  </div>
 </template>
@@ -52,9 +52,11 @@ watch(
    if (index < 0) return;

    nextTick(() => {
-      (thumbnailsRef.value as HTMLElement)
-        .querySelector(`div:nth-child(${index + 1})`)
-        ?.scrollIntoView({ block: 'nearest', inline: 'start', behavior: 'smooth' });
+      (thumbnailsRef.value as HTMLElement).querySelector(`div:nth-child(${index + 1})`)?.scrollIntoView({
+        block: 'nearest',
+        inline: 'start',
+        behavior: 'smooth',
+      });
    });
  }
 );
@@ -84,42 +86,45 @@ const allowDrop = (e: DragEvent) => {
 </script>

 <style lang="scss" scoped>
-.stock_thumbnails {
+.stock-thumbnails {
  display: flex;
  overflow: auto;
  background-color: #353a57;
+}

-  > div {
-    display: flex;
-    align-items: flex-end;
-    cursor: pointer;
-    min-height: 100px;
+.thumbnail-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;

-    &[data-selected='true'] {
-      background-color: rebeccapurple;
-    }
+  flex-direction: column;
+  gap: 0.5em;

-    > span {
-      display: flex;
-      flex-direction: column;
-      gap: 0.5em;
-      padding: 0.5em 0;
+  padding-top: 0.5em;

-      text-align: center;
+  cursor: pointer;
+  min-height: 100px;
+  font-size: 0.85em;

-      font-size: 0.85em;
-      user-select: none;
-      -moz-user-select: none;
-    }
+  user-select: none;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+
+  &[data-selected='true'] {
+    background-color: rebeccapurple;
+  }
+
+  b {
+    color: #ccc;
+    margin: 0 1em;
+  }
+
+  &[data-sponsor='true'] > b {
+    color: salmon;
  }

  img {
    max-height: 60px;
  }
 }
-
-.supporter {
-  color: salmon;
-}
 </style>
-
@@ -0,0 +1,10 @@
+{
+  "EU06": [650, 2000],
+  "EU07": [650, 2000],
+  "EU07E": [650, 2000],
+  "EP07": [650, 650],
+  "EP08": [650, 650],
+  "EP09": [800, 800],
+  "ET41": [700, 4000],
+  "SM42": [2400, 2400]
+}
@@ -12,8 +12,8 @@
  },
  "sameRegions": {
    "Losowy": [
-      10, 11, 19, 91, 93, 97, 99, 20, 22, 29, 30, 33, 39, 40, 44, 49, 94, 50, 55, 59, 90, 95, 96, 66, 60, 69, 77, 70,
-      79, 88, 80, 89, 92, 98
+      10, 11, 19, 91, 93, 97, 99, 20, 22, 29, 30, 33, 39, 40, 44, 49, 94, 50,
+      55, 59, 90, 95, 96, 66, 60, 69, 77, 70, 79, 88, 80, 89, 92, 98
    ],
    "Warszawa": [10, 11, 19, 91, 93, 97, 99],
    "Lublin": [20, 22, 29],
@@ -35,4 +35,3 @@
    "LT": "2:5;3:0-899:3"
  }
 }
-
@@ -27,6 +27,12 @@
    },
    "cargo": null
  },
+  "EP09": {
+    "passenger": {
+      "650": 160
+    },
+    "cargo": null
+  },
  "ET41": {
    "passenger": {
      "700": 125
@@ -58,5 +64,3 @@
    }
  }
 }
-
-
@@ -1,9 +1,9 @@
 export const enum EVehicleUseType {
-    LOCO_ELECTRICAL = 'loco-e',
-    LOCO_DIESEL = "loco-s",
-    EMU = "loco-ezt",
-    DMU = "loco-szt",
+  LOCO_ELECTRICAL = "loco-e",
+  LOCO_DIESEL = "loco-s",
+  EMU = "loco-ezt",
+  DMU = "loco-szt",

-    CAR_PASSENGER = "car-passenger",
-    CAR_CARGO = "car-cargo"
-}
+  CAR_PASSENGER = "car-passenger",
+  CAR_CARGO = "car-cargo",
+}
@@ -0,0 +1,10 @@
+import axios from "axios";
+
+const http = axios.create({
+  baseURL:
+    import.meta.env.VITE_API_DEV === "1" && import.meta.env.DEV
+      ? "http://localhost:5500"
+      : "https://spythere.github.io/api",
+});
+
+export default http;
@@ -1,33 +1,35 @@
-import localePL from './locales/pl.json';
-import localeEN from './locales/en.json';
-import { createI18n } from 'vue-i18n';
-import axios from 'axios';
-
-type LocaleMessageSchema = typeof localePL;
-type LocaleKey = 'en' | 'pl';
-
-const locales: { [key in LocaleKey]: LocaleMessageSchema } = {
-  en: localeEN,
-  pl: localePL,
-};
-
-const locale = window.localStorage.getItem('locale') || (/^pl\b/.test(navigator.language) ? 'pl' : 'en');
-
-const i18n = createI18n<[LocaleMessageSchema], 'en' | 'pl'>({
-  locale,
-  fallbackLocale: 'pl',
-  legacy: false,
-  globalInjection: true,
-  messages: locales,
-});
-
-async function fetchBackendTranslations() {
-  const localeData = (await axios.get(`https://spythere.github.io/api/td2/data/locales.json`)).data;
-
-  i18n.global.mergeLocaleMessage('pl', localeData.pl);
-  i18n.global.mergeLocaleMessage('en', localeData.en);
-}
-
-fetchBackendTranslations();
-
-export default i18n;
+import localePL from "./locales/pl.json";
+import localeEN from "./locales/en.json";
+import { createI18n } from "vue-i18n";
+import http from "./http";
+
+type LocaleMessageSchema = typeof localePL;
+type LocaleKey = "en" | "pl";
+
+const locales: { [key in LocaleKey]: LocaleMessageSchema } = {
+  en: localeEN,
+  pl: localePL,
+};
+
+const locale =
+  window.localStorage.getItem("locale") ||
+  (/^pl\b/.test(navigator.language) ? "pl" : "en");
+
+const i18n = createI18n<[LocaleMessageSchema], "en" | "pl">({
+  locale,
+  fallbackLocale: "pl",
+  legacy: false,
+  globalInjection: true,
+  messages: locales,
+});
+
+async function fetchBackendTranslations() {
+  const localeData = (await http.get(`td2/data/locales.json`)).data;
+
+  i18n.global.mergeLocaleMessage("pl", localeData.pl);
+  i18n.global.mergeLocaleMessage("en", localeData.en);
+}
+
+fetchBackendTranslations();
+
+export default i18n;
@@ -1,150 +1,153 @@
-{
-  "app": {
-    "title": "ROLLING STOCK EDITOR"
-  },
-  "footer": {
-    "disclaimer": "This site has only an informational intent. The author does not carry any responsibility for creating trains against {tos}!",
-    "tos": "Train Driver 2 simulator rules",
-    "tos-href": "https://docs.google.com/document/d/1UAAPUtN0d_RoS4RgOzEzllJZJhA0VcizzCzKW4QylbY/edit#heading=h.1ldcvhomwjp9",
-    "version-check": "Site is complete for version {version} of Train Driver 2 simulator"
-  },
-  "inputs": {
-    "title": "CHOOSE A VEHICLE",
-    "input-vehicle": "Choose a traction unit",
-    "input-carwagon": "Choose a carriage",
-    "cargo-title": "Cargo (only selected freight cars)",
-    "no-cargo-available": "no cargo available",
-    "cargo-empty": "empty",
-    "loco-e": "ELECTR.",
-    "loco-s": "DIESEL",
-    "loco-ezt": "EMU",
-    "loco-szt": "DMU",
-    "car-passenger": "PASSENGER",
-    "car-cargo": "FREIGHT",
-    "action-add": "ADD NEW",
-    "action-swap": "SWAP WITH",
-    "real-stock": "POLISH TRAIN COMPOSITIONS"
-  },
-  "preview": {
-    "title": "RAILWAY VEHICLE PREVIEW",
-    "loading": "IMAGE LOADING...",
-    "desc": "Choose a railway vehicle above to see its preview",
-    "sponsor-only": "* SPONSORS ONLY",
-    "loco-e": "ELECTRIC LOCO",
-    "loco-s": "DIESEL LOCO",
-    "loco-ezt": "ELECTRIC M.U.",
-    "loco-szt": "DIESEL M.U.",
-    "car-passenger": "PASSENGER CARRIAGE",
-    "car-cargo": "FREIGHT CAR",
-    "cabin": "Cabin type:",
-    "construction": "Construction type:"
-  },
-  "topbar": {
-    "stock-list": "STOCK",
-    "wiki-list": "VEHICLES",
-    "number-generator": "NUMBER GEN.",
-    "stock-generator": "STOCK GEN."
-  },
-  "stocklist": {
-    "title": "STOCK EDITOR",
-    "alert-copied": "The rolling stock has been copied to your clipboard!",
-    "alert-empty": "Lista pojazdów jest pusta!",
-    "prompt-file": "Name a file and download it to the Presets folder (Documents/TTSK/TrainDriver2):",
-    "vehicle-no": "VEHICLE NO.",
-    "no-vehicle-chosen": "NO VEHICLE CHOSEN",
-    "action-move-up": "MOVE UP",
-    "action-move-down": "MOVE DOWN",
-    "action-remove": "REMOVE",
-    "action-upload": "LOAD",
-    "action-download": "DOWNLOAD",
-    "action-copy": "COPY",
-    "action-reset": "RESET",
-    "action-shuffle": "SHUFFLE",
-    "mass": "Mass",
-    "mass-accepted": "accepted",
-    "length": "Length",
-    "vmax": "vMax",
-    "coldstart-info": "Cold start heading locomotive (only locos 303E & 203E type)",
-    "list-empty": "Stock list is empty!",
-    "warning-not-suitable": "EP07 & EP08 type locomotives are designed for passenger traffic only!",
-    "warning-passenger-too-long": "Maximum length of a passenger train may not be greater than 350m!",
-    "warning-freight-too-long": "Maximum length of a freight train may not be greater than 650m!",
-    "warning-too-many-locos": "This train has too many traction units!",
-    "warning-too-heavy": "This train is too heavy! Check {href}",
-    "acceptable-mass-docs": "acceptable rolling stock masses (PL)"
-  },
-  "stockgen": {
-    "title": "FREIGHT TRAIN GENERATOR",
-    "properties-title": "ROLLING STOCK PROPERTIES",
-    "properties-desc": "⇐ Add a locomotive in the first place of the stock list to include it in a drawing!",
-    "input-mass": "Max. mass (t)",
-    "input-length": "Max. length (m)",
-    "input-carcount": "Max. car count",
-    "cargo-title": "CARGO",
-    "cargo-desc": "Choose cargo you want to fill available cars with:",
-    "chosen-title": "CARS WITH CHOSEN CARGO",
-    "chosen-empty-warning": "Choose at least one cargo type to see available cars!",
-    "chosen-warning": "Cars containing chosen cargo are shown below. Hover over a type to see a preview of the car. Click it to include/exclude it from a drawing (only highlighted types will be included).",
-    "action-generate": "GENERATE",
-    "action-generate-empty": "GENERATE EMPTY",
-    "action-reset": "RESET CARGO"
-  },
-  "numgen": {
-    "title": "TRAIN NUMBER GENERATOR",
-    "alert": "The number has been copied to your clipboard!",
-    "start-region": "Beginning construction region",
-    "end-region": "Terminating construction region",
-    "train-category": "Train category",
-    "number-info": "Generated train number:",
-    "warning": "Choose category and (optionally) construction regions",
-    "td2-wiki": "> Polish rules of train numbering (TD2 wiki)",
-    "td2-wiki-link": "https://wiki.td2.info.pl/index.php?title=Zasady_numeracji_poci%C4%85g%C3%B3w/en",
-    "action-random-region": "DRAW REGIONS",
-    "action-random-number": "DRAW A NUMBER",
-    "categories": {
-      "EI": "domestic express (EI)",
-      "MP/RP": "(inter)voivodeship bullet (MP/RP)",
-      "RO": "regional passenger (RO)",
-      "PW": "empty passenger (PW)",
-      "TM": "mass transport freight (TM)",
-      "TK": "non-mass transport freight (TK)",
-      "LT": "locomotive alone (LT)"
-    },
-    "rules": {
-      "EI": "4 digits - ends within the range of 00-99",
-      "MP/RP": "5 digits - ends within the range of 050-169",
-      "RO": "5 digits - ends within the range of 200-999",
-      "PW": "6 digits - '6' on the 3rd place; ends within the range of 000-899",
-      "TM": "6 digits - '4' on the 3rd place; ends within the range of 000-899",
-      "TK": "6 digits - '3' on the 3rd place; ends within the range of 000-899",
-      "LT": "6 digits - '5' on the 3rd place; ends within the range of 000-899"
-    }
-  },
-  "wiki": {
-    "title": "LIST OF AVAILABLE VEHICLES",
-    "action-vehicles": "TRACTION UNITS",
-    "action-carriages": "CARRIAGES",
-    "search": "Search for a vehicle...",
-    "header": {
-      "image": "Image",
-      "type": "Name",
-      "power": "Type",
-      "constructionType": "Construction",
-      "coldStart": "Cold start",
-      "length": "Length",
-      "mass": "Mass",
-      "maxSpeed": "Speed",
-      "cargoCount": "Cargo count"
-    },
-    "loco-ezt": "EMU",
-    "loco-szt": "DMU",
-    "loco-s": "Diesel locomotive",
-    "loco-e": "Electric locomotive"
-  },
-  "realstock": {
-    "title": "POLISH TRAIN COMPOSITIONS by",
-    "search-name": "Search by name",
-    "search-stock": "Search by vehicles",
-    "action-reset": "RESET"
-  }
-}
+{
+  "app": {
+    "title": "ROLLING STOCK EDITOR"
+  },
+  "footer": {
+    "disclaimer": "This site has only an informational intent. The author does not carry any responsibility for creating trains against {tos}!",
+    "tos": "Train Driver 2 simulator rules",
+    "tos-href": "https://docs.google.com/document/d/1UAAPUtN0d_RoS4RgOzEzllJZJhA0VcizzCzKW4QylbY/edit#heading=h.1ldcvhomwjp9",
+    "version-check": "Site is complete for version {version} of Train Driver 2 simulator"
+  },
+  "inputs": {
+    "title": "CHOOSE A VEHICLE",
+    "input-vehicle": "Choose a traction unit",
+    "input-carwagon": "Choose a carriage",
+    "cargo-title": "Cargo (only selected freight cars)",
+    "no-cargo-available": "no cargo available",
+    "cargo-empty": "empty",
+    "loco-e": "ELECTR.",
+    "loco-s": "DIESEL",
+    "loco-ezt": "EMU",
+    "loco-szt": "DMU",
+    "car-passenger": "PASSENGER",
+    "car-cargo": "FREIGHT",
+    "action-add": "ADD NEW",
+    "action-swap": "SWAP WITH",
+    "real-stock": "POLISH TRAIN COMPOSITIONS"
+  },
+  "preview": {
+    "title": "RAILWAY VEHICLE PREVIEW",
+    "loading": "IMAGE LOADING...",
+    "desc": "Choose a railway vehicle above to see its preview",
+    "sponsor-only": "* SPONSORS ONLY UNTIL {0}",
+    "loco-e": "ELECTRIC LOCO",
+    "loco-s": "DIESEL LOCO",
+    "loco-ezt": "ELECTRIC M.U.",
+    "loco-szt": "DIESEL M.U.",
+    "car-passenger": "PASSENGER CARRIAGE",
+    "car-cargo": "FREIGHT CARRIAGE",
+    "cabin": "Cabin type:",
+    "construction": "Construction type:"
+  },
+  "topbar": {
+    "stock-list": "STOCK",
+    "wiki-list": "VEHICLES",
+    "number-generator": "NUMBER GEN.",
+    "stock-generator": "STOCK GEN."
+  },
+  "stocklist": {
+    "title": "STOCK EDITOR",
+    "alert-copied": "The rolling stock has been copied to your clipboard!",
+    "alert-empty": "Lista pojazdów jest pusta!",
+    "prompt-file": "Name a file and download it to the Presets folder (Documents/TTSK/TrainDriver2):",
+    "vehicle-no": "VEHICLE NO.",
+    "no-vehicle-chosen": "NO VEHICLE CHOSEN",
+    "action-move-up": "MOVE UP",
+    "action-move-down": "MOVE DOWN",
+    "action-remove": "REMOVE",
+    "action-upload": "LOAD",
+    "action-download": "DOWNLOAD",
+    "action-copy": "COPY",
+    "action-reset": "RESET",
+    "action-shuffle": "SHUFFLE",
+    "mass": "Mass",
+    "mass-accepted": "accepted",
+    "length": "Length",
+    "vmax": "vMax",
+    "coldstart-info": "Locomotive cold start",
+    "doublemanning-info": "Double manning",
+    "list-empty": "Stock list is empty!",
+    "warning-not-suitable": "EP07 & EP08 type locomotives are designed for passenger traffic only!",
+    "warning-passenger-too-long": "Maximum length of a passenger train may not be greater than 350m!",
+    "warning-freight-too-long": "Maximum length of a freight train may not be greater than 650m!",
+    "warning-too-many-locos": "This train has too many traction units!",
+    "warning-too-heavy": "This train is too heavy! Check {href}",
+    "acceptable-mass-docs": "acceptable rolling stock masses (PL)"
+  },
+  "stockgen": {
+    "title": "FREIGHT TRAIN GENERATOR",
+    "properties-title": "ROLLING STOCK PROPERTIES",
+    "properties-desc": "⇐ Add a locomotive in the first place of the stock list to include it in a drawing!",
+    "input-mass": "Max. mass (t)",
+    "input-length": "Max. length (m)",
+    "input-carcount": "Max. car count",
+    "cargo-title": "CARGO",
+    "cargo-desc": "Choose cargo you want to fill available cars with:",
+    "chosen-title": "CARS WITH CHOSEN CARGO",
+    "chosen-empty-warning": "Choose at least one cargo type to see available cars!",
+    "chosen-warning": "Cars containing chosen cargo are shown below. Hover over a type to see a preview of the car. Click it to include/exclude it from a drawing (only highlighted types will be included).",
+    "action-generate": "GENERATE",
+    "action-generate-empty": "GENERATE EMPTY",
+    "action-reset": "RESET CARGO"
+  },
+  "numgen": {
+    "title": "TRAIN NUMBER GENERATOR",
+    "alert": "The number has been copied to your clipboard!",
+    "start-region": "Beginning construction region",
+    "end-region": "Terminating construction region",
+    "train-category": "Train category",
+    "number-info": "Generated train number:",
+    "warning": "Choose category and (optionally) construction regions",
+    "td2-wiki": "> Polish rules of train numbering (TD2 wiki)",
+    "td2-wiki-link": "https://wiki.td2.info.pl/index.php?title=Zasady_numeracji_poci%C4%85g%C3%B3w/en",
+    "action-random-region": "DRAW REGIONS",
+    "action-random-number": "DRAW A NUMBER",
+    "categories": {
+      "EI": "domestic express (EI)",
+      "MP/RP": "(inter)voivodeship bullet (MP/RP)",
+      "RO": "regional passenger (RO)",
+      "PW": "empty passenger (PW)",
+      "TM": "mass transport freight (TM)",
+      "TK": "non-mass transport freight (TK)",
+      "LT": "locomotive alone (LT)"
+    },
+    "rules": {
+      "EI": "4 digits - ends within the range of 00-99",
+      "MP/RP": "5 digits - ends within the range of 050-169",
+      "RO": "5 digits - ends within the range of 200-999",
+      "PW": "6 digits - '6' on the 3rd place; ends within the range of 000-899",
+      "TM": "6 digits - '4' on the 3rd place; ends within the range of 000-899",
+      "TK": "6 digits - '3' on the 3rd place; ends within the range of 000-899",
+      "LT": "6 digits - '5' on the 3rd place; ends within the range of 000-899"
+    }
+  },
+  "wiki": {
+    "title": "LIST OF AVAILABLE VEHICLES",
+    "action-vehicles": "TRACTION UNITS",
+    "action-carriages": "CARRIAGES",
+    "search": "Search for a vehicle...",
+    "header": {
+      "image": "Image",
+      "type": "Name",
+      "group": "Type group",
+      "constructionType": "Construction",
+      "coldStart": "Cold start",
+      "length": "Length",
+      "mass": "Mass",
+      "maxSpeed": "Speed",
+      "cargoCount": "Cargo count"
+    },
+    "loco-ezt": "EMU",
+    "loco-szt": "DMU",
+    "loco-s": "Diesel locomotive",
+    "loco-e": "Electric locomotive",
+    "car-passenger": "Passenger carriage",
+    "car-cargo": "Frieght carriage"
+  },
+  "realstock": {
+    "title": "POLISH TRAIN COMPOSITIONS by",
+    "search-name": "Search by name",
+    "search-stock": "Search by vehicles",
+    "action-reset": "RESET"
+  }
+}
@@ -1,150 +1,153 @@
-{
-  "app": {
-    "title": "EDYTOR SKŁADÓW ONLINE"
-  },
-  "footer": {
-    "disclaimer": "Ta strona ma charakter informacyjny. Autor nie ponosi odpowiedzialności za tworzenie pociągów niezgodnych z {tos}!",
-    "tos": "regulaminem symulatora Train Driver 2",
-    "tos-href": "https://docs.google.com/document/d/1UAAPUtN0d_RoS4RgOzEzllJZJhA0VcizzCzKW4QylbY/edit",
-    "version-check": "Strona jest kompletna dla wersji {version} symulatora TD2"
-  },
-  "inputs": {
-    "title": "WYBIERZ POJAZD SZYNOWY",
-    "input-vehicle": "Wybierz pojazd trakcyjny",
-    "input-carwagon": "Wybierz wagon",
-    "cargo-title": "Ładunek (tylko wybrane towarowe)",
-    "no-cargo-available": "brak dostępnych ładunków",
-    "cargo-empty": "próżny",
-    "loco-e": "ELEKTR.",
-    "loco-s": "SPAL.",
-    "loco-ezt": "EZT",
-    "loco-szt": "SZT",
-    "car-passenger": "PASAŻERSKIE",
-    "car-cargo": "TOWAROWE",
-    "action-add": "DODAJ NOWY",
-    "action-swap": "ZAMIEŃ ZA",
-    "real-stock": "REALNE ZESTAWIENIA"
-  },
-  "preview": {
-    "title": "PODGLĄD WYBRANEGO POJAZDU",
-    "loading": "ŁADOWANIE OBRAZU...",
-    "desc": "Wybierz pojazd lub wagon, aby zobaczyć jego podgląd powyżej",
-    "sponsor-only": "* TYLKO DLA SPONSORÓW",
-    "loco-e": "ELEKTROWÓZ",
-    "loco-s": "SPALINOWÓZ",
-    "loco-ezt": "EZT",
-    "loco-szt": "SZT",
-    "car-passenger": "WAGON PASAŻERSKI",
-    "car-cargo": "WAGON TOWAROWY",
-    "cabin": "Typ kabiny:",
-    "construction": "Typ konstrukcji:"
-  },
-  "topbar": {
-    "stock-list": "SKŁAD",
-    "wiki-list": "POJAZDY",
-    "number-generator": "GNR NUMERU",
-    "stock-generator": "GNR SKŁADU"
-  },
-  "stocklist": {
-    "title": "EDYTOR SKŁADU",
-    "alert-copied": "Skład został skopiowany do twojego schowka!",
-    "alert-empty": "Lista pojazdów jest pusta!",
-    "prompt-file": "Nazwij plik, a następnie pobierz do folderu Presets (Dokumenty/TTSK/TrainDriver2):",
-    "vehicle-no": "POJAZD NR",
-    "no-vehicle-chosen": "NIE WYBRANO POJAZDU",
-    "action-move-up": "PRZENIEŚ WYŻEJ",
-    "action-move-down": "PRZENIEŚ NIŻEJ",
-    "action-remove": "USUŃ",
-    "action-upload": "WCZYTAJ",
-    "action-download": "POBIERZ",
-    "action-copy": "SKOPIUJ",
-    "action-reset": "ZRESETUJ",
-    "action-shuffle": "PRZETASUJ",
-    "mass": "Masa",
-    "mass-accepted": "dopuszczalna",
-    "length": "Długość",
-    "vmax": "vMax",
-    "coldstart-info": "Zimny start lokomotywy czołowej (tylko elektrowozy typów 303E i 203E)",
-    "list-empty": "Lista pojazdów jest pusta!",
-    "warning-not-suitable": "Lokomotywy EP07 i EP08 są przeznaczone jedynie do ruchu pasażerskiego!",
-    "warning-passenger-too-long": "Maksymalna długość składów pasażerskich nie może przekraczać 350m!",
-    "warning-freight-too-long": "Maksymalna długość składów innych niż pasażerskie nie może przekraczać 650m!",
-    "warning-too-many-locos": "Ten skład posiada za dużo pojazdów trakcyjnych!",
-    "warning-too-heavy": "Ten skład jest za ciężki! Sprawdź {href}",
-    "acceptable-mass-docs": "dopuszczalne masy składów"
-  },
-  "stockgen": {
-    "title": "GENERATOR SKŁADU TOWAROWEGO",
-    "properties-title": "WŁAŚCIWOŚCI SKŁADU",
-    "properties-desc": "⇐ Dodaj lokomotywę na pierwsze miejsce listy, aby uwzględnić ją przy losowaniu składu!",
-    "input-mass": "Maksymalna masa (t)",
-    "input-length": "Maks. długość (m)",
-    "input-carcount": "Maks. liczba wagonów",
-    "cargo-title": "ŁADUNEK",
-    "cargo-desc": "Wybierz ładunki, którymi chcesz wypełnić dostępne wagony:",
-    "chosen-title": "WAGONY Z WYBRANYMI ŁADUNKAMI",
-    "chosen-empty-warning": "Wybierz co najmniej jeden ładunek, aby zobaczyć wagony, które go posiadają!",
-    "chosen-warning": "Wagony posiadające wybrane ładunki. Najedź na nazwę, aby zobaczyć podgląd wagonu. Kliknij, aby wyłączyć z losowania (tylko podświetlone nazwy będą uwzględnione).",
-    "action-generate": "WYGENERUJ",
-    "action-generate-empty": "WYGENERUJ PRÓŻNE WAGONY",
-    "action-reset": "ZRESETUJ ŁADUNKI"
-  },
-  "numgen": {
-    "title": "GENERATOR NUMERU POCIĄGU",
-    "alert": "Numer został skopiowany do twojego schowka!",
-    "start-region": "Początkowy obszar konstrukcyjny",
-    "end-region": "Końcowy obszar konstrukcyjny",
-    "train-category": "Kategoria pociągu",
-    "number-info": "Wygenerowany numer pociągu:",
-    "warning": "Wybierz kategorię oraz (opcjonalnie) obszary konstrukcyjne",
-    "td2-wiki": "> Szczegółowe zasady numeracji (wikipedia TD2)",
-    "td2-wiki-link": "https://wiki.td2.info.pl/index.php?title=Zasady_numeracji_poci%C4%85g%C3%B3w",
-    "action-random-region": "LOSUJ OBSZARY",
-    "action-random-number": "LOSUJ NUMER",
-    "categories": {
-      "EI": "ekspres krajowy (EI)",
-      "MP/RP": "(między)wojewódzki pośpieszny (MP/RP)",
-      "RO": "wojewódzki osobowy (RO)",
-      "PW": "próżny \"służbowy\" (PW)",
-      "TM": "towarowy do przewozów masowych (TM)",
-      "TK": "towarowy do obsługi stacji (TK)",
-      "LT": "lokomotywa luzem (LT)"
-    },
-    "rules": {
-      "EI": "4 cyfry - końcówka z przedziału 00-99",
-      "MP/RP": "5 cyfr - końcówka z przedziału 050-169",
-      "RO": "5 cyfr - końcówka z przedziału 200-999",
-      "PW": "6 cyfr - '6' na 3. miejscu; końcówka z przedziału 000-899",
-      "TM": "6 cyfr - '4' na 3. miejscu; końcówka z przedziału 000-899",
-      "TK": "6 cyfr - '3' na 3. miejscu; końcówka z przedziału 000-899",
-      "LT": "6 cyfr - '5' na 3. miejscu; końcówka z przedziału 000-899"
-    }
-  },
-  "wiki": {
-    "title": "LISTA DOSTĘPNYCH POJAZDÓW",
-    "action-vehicles": "POJ. TRAKCYJNE",
-    "action-carriages": "WAGONY",
-    "search": "Wyszukaj pojazd...",
-    "header": {
-      "image": "Zdjęcie",
-      "type": "Nazwa",
-      "power": "Rodzaj",
-      "constructionType": "Konstrukcja",
-      "coldStart": "Zimny start",
-      "length": "Długość",
-      "mass": "Masa",
-      "maxSpeed": "Prędkość",
-      "cargoCount": "Ładunki"
-    },
-    "loco-ezt": "EZT",
-    "loco-szt": "SZT",
-    "loco-s": "Spalinowóz",
-    "loco-e": "Elektrowóz"
-  },
-  "realstock": {
-    "title": "ZESTAWIENIA REALNE by",
-    "search-name": "Szukaj po nazwie",
-    "search-stock": "Szukaj po pojazdach",
-    "action-reset": "RESETUJ"
-  }
-}
+{
+  "app": {
+    "title": "EDYTOR SKŁADÓW ONLINE"
+  },
+  "footer": {
+    "disclaimer": "Ta strona ma charakter informacyjny. Autor nie ponosi odpowiedzialności za tworzenie pociągów niezgodnych z {tos}!",
+    "tos": "regulaminem symulatora Train Driver 2",
+    "tos-href": "https://docs.google.com/document/d/1UAAPUtN0d_RoS4RgOzEzllJZJhA0VcizzCzKW4QylbY/edit",
+    "version-check": "Strona jest kompletna dla wersji {version} symulatora TD2"
+  },
+  "inputs": {
+    "title": "WYBIERZ POJAZD SZYNOWY",
+    "input-vehicle": "Wybierz pojazd trakcyjny",
+    "input-carwagon": "Wybierz wagon",
+    "cargo-title": "Ładunek (tylko wybrane towarowe)",
+    "no-cargo-available": "brak dostępnych ładunków",
+    "cargo-empty": "próżny",
+    "loco-e": "ELEKTR.",
+    "loco-s": "SPAL.",
+    "loco-ezt": "EZT",
+    "loco-szt": "SZT",
+    "car-passenger": "PASAŻERSKIE",
+    "car-cargo": "TOWAROWE",
+    "action-add": "DODAJ NOWY",
+    "action-swap": "ZAMIEŃ ZA",
+    "real-stock": "REALNE ZESTAWIENIA"
+  },
+  "preview": {
+    "title": "PODGLĄD WYBRANEGO POJAZDU",
+    "loading": "ŁADOWANIE OBRAZU...",
+    "desc": "Wybierz pojazd lub wagon, aby zobaczyć jego podgląd powyżej",
+    "sponsor-only": "* TYLKO DLA SPONSORÓW DO {0}",
+    "loco-e": "ELEKTROWÓZ",
+    "loco-s": "SPALINOWÓZ",
+    "loco-ezt": "EZT",
+    "loco-szt": "SZT",
+    "car-passenger": "WAGON PASAŻERSKI",
+    "car-cargo": "WAGON TOWAROWY",
+    "cabin": "Typ kabiny:",
+    "construction": "Typ konstrukcji:"
+  },
+  "topbar": {
+    "stock-list": "SKŁAD",
+    "wiki-list": "POJAZDY",
+    "number-generator": "GNR NUMERU",
+    "stock-generator": "GNR SKŁADU"
+  },
+  "stocklist": {
+    "title": "EDYTOR SKŁADU",
+    "alert-copied": "Skład został skopiowany do twojego schowka!",
+    "alert-empty": "Lista pojazdów jest pusta!",
+    "prompt-file": "Nazwij plik, a następnie pobierz do folderu Presets (Dokumenty/TTSK/TrainDriver2):",
+    "vehicle-no": "POJAZD NR",
+    "no-vehicle-chosen": "NIE WYBRANO POJAZDU",
+    "action-move-up": "PRZENIEŚ WYŻEJ",
+    "action-move-down": "PRZENIEŚ NIŻEJ",
+    "action-remove": "USUŃ",
+    "action-upload": "WCZYTAJ",
+    "action-download": "POBIERZ",
+    "action-copy": "SKOPIUJ",
+    "action-reset": "ZRESETUJ",
+    "action-shuffle": "PRZETASUJ",
+    "mass": "Masa",
+    "mass-accepted": "dopuszczalna",
+    "length": "Długość",
+    "vmax": "vMax",
+    "coldstart-info": "Zimny start",
+    "doublemanning-info": "Podwójna obsada",
+    "list-empty": "Lista pojazdów jest pusta!",
+    "warning-not-suitable": "Lokomotywy EP07 i EP08 są przeznaczone jedynie do ruchu pasażerskiego!",
+    "warning-passenger-too-long": "Maksymalna długość składów pasażerskich nie może przekraczać 350m!",
+    "warning-freight-too-long": "Maksymalna długość składów innych niż pasażerskie nie może przekraczać 650m!",
+    "warning-too-many-locos": "Ten skład posiada za dużo pojazdów trakcyjnych!",
+    "warning-too-heavy": "Ten skład jest za ciężki! Sprawdź {href}",
+    "acceptable-mass-docs": "dopuszczalne masy składów"
+  },
+  "stockgen": {
+    "title": "GENERATOR SKŁADU TOWAROWEGO",
+    "properties-title": "WŁAŚCIWOŚCI SKŁADU",
+    "properties-desc": "⇐ Dodaj lokomotywę na pierwsze miejsce listy, aby uwzględnić ją przy losowaniu składu!",
+    "input-mass": "Maksymalna masa (t)",
+    "input-length": "Maks. długość (m)",
+    "input-carcount": "Maks. liczba wagonów",
+    "cargo-title": "ŁADUNEK",
+    "cargo-desc": "Wybierz ładunki, którymi chcesz wypełnić dostępne wagony:",
+    "chosen-title": "WAGONY Z WYBRANYMI ŁADUNKAMI",
+    "chosen-empty-warning": "Wybierz co najmniej jeden ładunek, aby zobaczyć wagony, które go posiadają!",
+    "chosen-warning": "Wagony posiadające wybrane ładunki. Najedź na nazwę, aby zobaczyć podgląd wagonu. Kliknij, aby wyłączyć z losowania (tylko podświetlone nazwy będą uwzględnione).",
+    "action-generate": "WYGENERUJ",
+    "action-generate-empty": "WYGENERUJ PRÓŻNE WAGONY",
+    "action-reset": "ZRESETUJ ŁADUNKI"
+  },
+  "numgen": {
+    "title": "GENERATOR NUMERU POCIĄGU",
+    "alert": "Numer został skopiowany do twojego schowka!",
+    "start-region": "Początkowy obszar konstrukcyjny",
+    "end-region": "Końcowy obszar konstrukcyjny",
+    "train-category": "Kategoria pociągu",
+    "number-info": "Wygenerowany numer pociągu:",
+    "warning": "Wybierz kategorię oraz (opcjonalnie) obszary konstrukcyjne",
+    "td2-wiki": "> Szczegółowe zasady numeracji (wikipedia TD2)",
+    "td2-wiki-link": "https://wiki.td2.info.pl/index.php?title=Zasady_numeracji_poci%C4%85g%C3%B3w",
+    "action-random-region": "LOSUJ OBSZARY",
+    "action-random-number": "LOSUJ NUMER",
+    "categories": {
+      "EI": "ekspres krajowy (EI)",
+      "MP/RP": "(między)wojewódzki pośpieszny (MP/RP)",
+      "RO": "wojewódzki osobowy (RO)",
+      "PW": "próżny \"służbowy\" (PW)",
+      "TM": "towarowy do przewozów masowych (TM)",
+      "TK": "towarowy do obsługi stacji (TK)",
+      "LT": "lokomotywa luzem (LT)"
+    },
+    "rules": {
+      "EI": "4 cyfry - końcówka z przedziału 00-99",
+      "MP/RP": "5 cyfr - końcówka z przedziału 050-169",
+      "RO": "5 cyfr - końcówka z przedziału 200-999",
+      "PW": "6 cyfr - '6' na 3. miejscu; końcówka z przedziału 000-899",
+      "TM": "6 cyfr - '4' na 3. miejscu; końcówka z przedziału 000-899",
+      "TK": "6 cyfr - '3' na 3. miejscu; końcówka z przedziału 000-899",
+      "LT": "6 cyfr - '5' na 3. miejscu; końcówka z przedziału 000-899"
+    }
+  },
+  "wiki": {
+    "title": "LISTA DOSTĘPNYCH POJAZDÓW",
+    "action-vehicles": "POJ. TRAKCYJNE",
+    "action-carriages": "WAGONY",
+    "search": "Wyszukaj pojazd...",
+    "header": {
+      "image": "Zdjęcie",
+      "type": "Nazwa",
+      "group": "Rodzaj",
+      "constructionType": "Konstrukcja",
+      "coldStart": "Zimny start",
+      "length": "Długość",
+      "mass": "Masa",
+      "maxSpeed": "Prędkość",
+      "cargoCount": "Ładunki"
+    },
+    "loco-ezt": "EZT",
+    "loco-szt": "SZT",
+    "loco-s": "Spalinowóz",
+    "loco-e": "Elektrowóz",
+    "car-passenger": "Wagon pasażerski",
+    "car-cargo": "Wagon towarowy"
+  },
+  "realstock": {
+    "title": "ZESTAWIENIA REALNE by",
+    "search-name": "Szukaj po nazwie",
+    "search-stock": "Szukaj po pojazdach",
+    "action-reset": "RESETUJ"
+  }
+}
@@ -1,14 +1,8 @@
 import { createApp } from 'vue';
 import { createPinia } from 'pinia';
-import { registerSW } from 'virtual:pwa-register';

 import App from './App.vue';
 import i18n from './i18n-setup';
 const pinia = createPinia();

-registerSW({
-  immediate: true,
-});
-
 createApp(App).use(pinia).use(i18n).mount('#app');
-
@@ -1,9 +1,17 @@
-import { defineComponent } from 'vue';
+import { defineComponent } from "vue";

 export default defineComponent({
  methods: {
-    getIconURL(name: string, ext = 'svg'): string {
+    getIconURL(name: string, ext = "svg"): string {
      return `/images/icon-${name}.${ext}`;
    },
+
+    getThumbnailURL(vehicleType: string, size: "small" | "large") {
+      return `${
+        import.meta.env.VITE_API_DEV === "1"
+          ? "http://localhost:5500"
+          : "https://spythere.github.io/api"
+      }/td2/images/${vehicleType}--${size == "small" ? 300 : 800}px.jpg`;
+    },
  },
 });
@@ -29,8 +29,9 @@ export default defineComponent({
        count,
        imgSrc: vehicle.imageSrc,
        useType: isLoco ? vehicle.power : vehicle.useType,
-        supportersOnly: vehicle.supportersOnly,
+        isSponsorsOnly: vehicle.isSponsorsOnly,
        constructionType: vehicle.constructionType,
+        sponsorsOnlyTimestamp: vehicle.sponsorsOnlyTimestamp,
      };
    },

@@ -72,11 +73,17 @@ export default defineComponent({
        let vehicle: Vehicle | null = null;
        let vehicleCargo: ICargo | null = null;

-        if (/^(EU|EP|ET|SM|EN|2EN|SN)/.test(type)) {
-          const [locoType, coldStart] = type.split(',');
+        const isLoco = /^(EU|EP|ET|SM|EN|2EN|SN)/.test(type);
+
+        if (isLoco) {
+          const [locoType, spawnProps] = type.split(',');
          vehicle = this.store.locoDataList.find((loco) => loco.type == locoType) || null;

-          if (i == 0 && coldStart == 'c') this.store.isColdStart = true;
+          // Spawn settings
+          if (i == 0 && spawnProps) {
+            this.store.isColdStart = spawnProps.includes('c');
+            this.store.isDoubleManned = spawnProps.includes('d');
+          }
        } else {
          const [carType, cargo] = type.split(':');
          vehicle = this.store.carDataList.find((car) => car.type == carType) || null;
@@ -84,11 +91,10 @@ export default defineComponent({
          if (cargo) vehicleCargo = vehicle?.cargoList.find((c) => c.id == cargo) || null;
        }

-        if (!vehicle) console.log('Brak pojazdu:', type);
+        if (!vehicle) console.log('Brak pojazdu / rodzaj pojazdu źle wczytany:', type);

        this.addVehicle(vehicle, vehicleCargo);
      });
    },
  },
 });
-
@@ -1,6 +1,7 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../store';
 import { ICarWagon, ILocomotive, IStock, Vehicle } from '../types';
+import { isLocomotive } from '../utils/vehicleUtils';

 export default defineComponent({
  setup() {
@@ -9,45 +10,9 @@ export default defineComponent({
    };
  },

-  computed: {
-    locoOptions() {
-      return this.store.locoDataList
-        .sort((a, b) => (a.type > b.type ? 1 : -1))
-        .filter((loco) => loco.power == this.store.chosenLocoPower);
-    },
-
-    carOptions() {
-      return this.store.carDataList
-        .sort((a, b) => (a.type > b.type ? 1 : -1))
-        .filter((car) => car.useType == this.store.chosenCarUseType);
-    },
-  },
+  computed: {},

  methods: {
-    selectLocoType(locoTypeId: string) {
-      this.store.chosenLocoPower = locoTypeId;
-      this.store.chosenVehicle = this.locoOptions[0];
-      this.store.chosenLoco = this.locoOptions[0];
-    },
-
-    selectCarWagonType(carWagonTypeId: string) {
-      this.store.chosenCarUseType = carWagonTypeId;
-      this.store.chosenVehicle = this.carOptions[0];
-      this.store.chosenCar = this.carOptions[0];
-      this.store.chosenCargo = null;
-    },
-
-    previewVehicleByType(type: 'loco' | 'car' | 'cargo') {
-      this.$nextTick(() => {
-        if (!this.store.chosenLoco && !this.store.chosenCar) return;
-
-        this.store.chosenVehicle = type == 'loco' ? this.store.chosenLoco : this.store.chosenCar;
-
-        this.store.chosenCargo =
-          this.store.chosenCar?.cargoList.find((cargo) => cargo.id == this.store.chosenCargo?.id) || null;
-      });
-    },
-
    previewStock(stock: IStock) {
      if (this.store.chosenVehicle?.imageSrc != stock.imgSrc) this.store.imageLoading = true;

@@ -81,6 +46,11 @@ export default defineComponent({
      this.store.chosenCargo = null;
    },

+    previewVehicle(vehicle: Vehicle) {
+      if (isLocomotive(vehicle)) this.previewLocomotive(vehicle);
+      else this.previewCarWagon(vehicle);
+    },
+
    resetPreview() {
      this.store.chosenVehicle = null;
      this.store.chosenCar = null;
@@ -89,4 +59,3 @@ export default defineComponent({
    },
  },
 });
-
@@ -1,5 +1,5 @@
-import { defineComponent } from 'vue';
-import { useStore } from '../store';
+import { defineComponent } from "vue";
+import { useStore } from "../store";

 export default defineComponent({
  setup() {
@@ -18,7 +18,10 @@ export default defineComponent({
    },

    trainTooHeavy() {
-      return this.store.acceptableMass && this.store.totalMass > this.store.acceptableMass;
+      return (
+        this.store.acceptableMass &&
+        this.store.totalMass > this.store.acceptableMass
+      );
    },

    locoNotSuitable() {
@@ -26,15 +29,19 @@ export default defineComponent({
        !this.store.isTrainPassenger &&
        this.store.stockList.length > 1 &&
        !this.store.stockList.every((stock) => stock.isLoco) &&
-        this.store.stockList.some((stock) => stock.isLoco && stock.type.startsWith('EP'))
+        this.store.stockList.some(
+          (stock) => stock.isLoco && stock.type.startsWith("EP"),
+        )
      );
    },

    tooManyLocomotives() {
-      return this.store.stockList.reduce((acc, stock) => {
-        if (stock.isLoco) acc += stock.count;
-        return acc;
-      }, 0) > 2;
+      return (
+        this.store.stockList.reduce((acc, stock) => {
+          if (stock.isLoco) acc += stock.count;
+          return acc;
+        }, 0) > 2
+      );
    },
  },
 });
@@ -1,4 +1,4 @@
-import { IStore } from './types';
+import { IStockData, IStore } from './types';
 import { defineStore } from 'pinia';
 import {
  acceptableMass,
@@ -10,6 +10,7 @@ import {
  totalLength,
  totalMass,
 } from './utils/vehicleUtils';
+import http from './http';

 export const useStore = defineStore({
  id: 'store',
@@ -21,6 +22,7 @@ export const useStore = defineStore({
      chosenVehicle: null,

      isColdStart: false,
+      isDoubleManned: false,

      showSupporter: false,
      imageLoading: false,
@@ -46,22 +48,43 @@ export const useStore = defineStore({
      isRealStockListCardOpen: false,

      stockData: undefined,
-    } as IStore),
+
+      lastFocusedElement: null,
+    }) as IStore,

  getters: {
    locoDataList: (state) => locoDataList(state),
    carDataList: (state) => carDataList(state),
+    vehicleDataList: (state) => [...locoDataList(state), ...carDataList(state)],
    totalMass: (state) => totalMass(state),
    totalLength: (state) => totalLength(state),
    maxStockSpeed: (state) => maxStockSpeed(state),
    isTrainPassenger: (state) => isTrainPassenger(state),
    chosenRealStock: (state) => chosenRealStock(state),
    acceptableMass: (state) => acceptableMass(state),
+
+    stockSupportsColdStart: (state) => {
+      if (state.stockList.length == 0) return false;
+      if (!state.stockList[0].isLoco) return false;
+
+      const headingLoco = state.stockList[0];
+
+      return state.stockData?.props.find((stock) => stock.type == headingLoco.constructionType)?.coldStart ?? false;
+    },
+
+    stockSupportsDoubleManning: (state) => {
+      if (state.stockList.length == 0) return false;
+      if (!state.stockList[0].isLoco) return false;
+
+      const headingLoco = state.stockList[0];
+
+      return state.stockData?.props.find((stock) => stock.type == headingLoco.constructionType)?.doubleManned ?? false;
+    },
  },

  actions: {
    async fetchStockInfoData() {
-      const stockData = await (await fetch(`https://spythere.github.io/api/td2/data/stockInfo.json`)).json();
+      const stockData = (await http.get<IStockData>('td2/data/stockInfo.json')).data;
      this.stockData = stockData;
    },

@@ -82,5 +105,3 @@ export const useStore = defineStore({
    },
  },
 });
-
-
@@ -1,268 +1,305 @@
-@import url('https://fonts.googleapis.com/css2?family=Lato:wght@400;700;900&display=swap');
-
-$breakpointMd: 960px;
-$breakpointSm: 550px;
-
-$bgColor: #2b3552;
-$textColor: #fff;
-$secondaryColor: #222;
-$accentColor: #e4c428;
-
-::-webkit-scrollbar {
-  width: 7px;
-  height: 7px;
-
-  &-track {
-    background: #222;
-    border-radius: 0.5rem;
-  }
-
-  &-thumb {
-    border-radius: 1rem;
-    background: #777;
-  }
-
-  &-corner {
-    background: #222;
-  }
-}
-
-body,
-html {
-  margin: 0;
-  padding: 0;
-
-  font-family: 'Lato', sans-serif;
-
-  background-color: $bgColor;
-  overflow-x: hidden;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
-
-a {
-  color: white;
-  text-decoration: none;
-
-  transition: color 250ms;
-
-  &:visited {
-    color: white;
-  }
-
-  &:hover,
-  &:focus {
-    color: $accentColor;
-  }
-}
-
-select,
-option,
-input,
-button {
-  font-family: 'Lato', sans-serif;
-  font-size: 1em;
-}
-
-button {
-  border: none;
-  outline: none;
-  background: none;
-
-  padding: 0;
-  margin: 0;
-
-  cursor: pointer;
-
-  font-size: 1em;
-  color: white;
-
-  &:hover {
-    color: $accentColor;
-  }
-}
-
-.btn {
-  padding: 0.4em 0.75em;
-
-  outline: none;
-  background-color: #222;
-  border-radius: 8px;
-  font-weight: bold;
-
-  transition: all 250ms;
-
-  &:hover {
-    color: $accentColor;
-  }
-
-  &.btn--outline {
-    background: none;
-    font-weight: bold;
-    outline: 1px solid $accentColor;
-  }
-
-  &:focus-visible {
-    color: $accentColor;
-    outline: 1px solid white;
-  }
-
-  &[data-disabled='true'] {
-    user-select: none;
-    pointer-events: none;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-
-    opacity: 0.75;
-    background-color: #2b2b2b;
-  }
-
-  &--image {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    gap: 0.5em;
-
-    img {
-      width: 1.3em;
-      vertical-align: middle;
-    }
-  }
-
-  &--text {
-    font-weight: bold;
-    transition: all 250ms;
-    background: none;
-    padding: 0;
-
-    &:focus-visible {
-      outline: 1px solid white;
-    }
-  }
-}
-
-select,
-input[type='text'],
-input[type='number'] {
-  background: none;
-  border: 2px solid #aaa;
-  outline: none;
-
-  padding: 0.25em 0.35em;
-
-  color: white;
-  font-size: 1em;
-
-  width: 18em;
-
-  &:focus-visible {
-    border-color: $accentColor;
-  }
-
-  &::placeholder {
-    color: #aaa;
-  }
-}
-
-option {
-  color: white;
-  border: none;
-  background-color: $bgColor;
-}
-
-ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.text {
-  &--accent {
-    color: $accentColor;
-  }
-
-  &--grayed {
-    color: #aaa;
-  }
-}
-
-.g-card {
-  position: fixed;
-  top: 1em;
-  left: 0;
-
-  width: 100vw;
-  height: 100vh;
-
-  display: flex;
-  justify-content: center;
-
-  z-index: 200;
-
-  &_bg {
-    position: fixed;
-    top: 0;
-    left: 0;
-
-    width: 100vw;
-    height: 100vh;
-
-    background-color: #000000aa;
-    z-index: 10;
-  }
-}
-
-.g-choice {
-  input {
-    display: none;
-  }
-
-  span {
-    padding: 0.25em 1em;
-    border-radius: 0.25em;
-    border: 2px solid white;
-    margin: 0.25em;
-    cursor: pointer;
-
-    transition: all 100ms ease;
-  }
-
-  span:focus {
-    color: $accentColor;
-    outline: none;
-  }
-
-  label > input:checked + span {
-    color: $accentColor;
-    border-color: $accentColor;
-  }
-}
-
-// Vue Transition anims
-.slide-top {
-  &-enter-from,
-  &-leave-to {
-    transform: translateY(-100%);
-  }
-
-  &-enter-active,
-  &-leave-active {
-    transition: transform 100ms ease-in-out;
-  }
-}
-
-.card-appear {
-  &-enter-from,
-  &-leave-to {
-    opacity: 0;
-  }
-
-  &-enter-active,
-  &-leave-active {
-    transition: all 100ms ease-in-out;
-  }
-}
+$breakpointMd: 960px;
+$breakpointSm: 550px;
+
+$bgColor: #2b3552;
+$textColor: #fff;
+$secondaryColor: #222;
+$accentColor: #e4c428;
+
+@font-face {
+  font-family: 'Lato';
+  src:
+    url('/fonts/Lato-Light.woff2') format('woff2'),
+    url('/fonts/Lato-Light.woff') format('woff');
+  font-weight: 300;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'Lato';
+  src:
+    url('/fonts/Lato-Bold.woff2') format('woff2'),
+    url('/fonts/Lato-Bold.woff') format('woff');
+  font-weight: bold;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'Lato';
+  src:
+    url('/fonts/Lato-Regular.woff2') format('woff2'),
+    url('/fonts/Lato-Regular.woff') format('woff');
+  font-weight: normal;
+  font-style: normal;
+  font-display: swap;
+}
+
+::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+
+  &-track {
+    background: #222;
+    border-radius: 0.5rem;
+  }
+
+  &-thumb {
+    border-radius: 1rem;
+    background: #777;
+  }
+
+  &-corner {
+    background: #222;
+  }
+}
+
+body,
+html {
+  margin: 0;
+  padding: 0;
+
+  font-family: Lato, sans-serif;
+
+  background-color: $bgColor;
+  overflow-x: hidden;
+}
+
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+a {
+  color: white;
+  text-decoration: none;
+
+  transition: color 250ms;
+
+  &:visited {
+    color: white;
+  }
+
+  &:hover,
+  &:focus {
+    color: $accentColor;
+  }
+}
+
+select,
+option,
+input,
+button {
+  font-family: Lato, sans-serif;
+  font-size: 1em;
+}
+
+button {
+  border: none;
+  outline: none;
+  background: none;
+
+  padding: 0;
+  margin: 0;
+
+  cursor: pointer;
+
+  font-size: 1em;
+  color: white;
+
+  &:hover {
+    color: $accentColor;
+  }
+}
+
+.btn {
+  padding: 0.4em 0.75em;
+
+  outline: none;
+  background-color: #222;
+  border-radius: 8px;
+  font-weight: bold;
+
+  transition:
+    color 150ms,
+    background-color 150ms;
+
+  &:hover {
+    color: $accentColor;
+  }
+
+  &.btn--outline {
+    background: none;
+    font-weight: bold;
+    outline: 1px solid $accentColor;
+  }
+
+  &:focus-visible {
+    color: $accentColor;
+    outline: 1px solid white;
+  }
+
+  &[data-chosen='true'] {
+    background-color: $accentColor;
+    color: black;
+
+    box-shadow: 0 0 5px 1px $accentColor;
+  }
+
+  &[data-disabled='true'] {
+    user-select: none;
+    pointer-events: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+
+    opacity: 0.75;
+    background-color: #2b2b2b;
+  }
+
+  &--image {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 0.5em;
+
+    img {
+      width: 1.3em;
+      vertical-align: middle;
+    }
+  }
+
+  &--text {
+    font-weight: bold;
+    transition: all 250ms;
+    background: none;
+    padding: 0;
+
+    &:focus-visible {
+      outline: 1px solid white;
+    }
+  }
+}
+
+select,
+input[type='text'],
+input[type='number'] {
+  background: $bgColor;
+  border: 2px solid #aaa;
+  outline: none;
+
+  padding: 0.25em 0.35em;
+
+  color: white;
+  font-size: 1em;
+
+  width: 18em;
+
+  &:focus-visible {
+    border-color: $accentColor;
+  }
+
+  &::placeholder {
+    color: #aaa;
+  }
+}
+
+option {
+  color: white;
+  border: none;
+  background-color: $bgColor;
+}
+
+ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.text {
+  &--accent {
+    color: $accentColor;
+  }
+
+  &--grayed {
+    color: #aaa;
+  }
+}
+
+.g-card {
+  position: fixed;
+  top: 1em;
+  left: 0;
+
+  width: 100vw;
+  height: 100vh;
+
+  display: flex;
+  justify-content: center;
+
+  z-index: 200;
+
+  &_bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+
+    width: 100vw;
+    height: 100vh;
+
+    background-color: #000000aa;
+    z-index: 10;
+  }
+}
+
+.g-choice {
+  input {
+    display: none;
+  }
+
+  span {
+    padding: 0.25em 1em;
+    border-radius: 0.25em;
+    border: 2px solid white;
+    margin: 0.25em;
+    cursor: pointer;
+
+    transition: all 100ms ease;
+  }
+
+  span:focus {
+    color: $accentColor;
+    outline: none;
+  }
+
+  label > input:checked + span {
+    color: $accentColor;
+    border-color: $accentColor;
+  }
+}
+
+// Vue Transition anims
+.slide-top {
+  &-enter-from,
+  &-leave-to {
+    transform: translateY(-100%);
+  }
+
+  &-enter-active,
+  &-leave-active {
+    transition: transform 100ms ease-in-out;
+  }
+}
+
+.card-appear {
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+
+  &-enter-active,
+  &-leave-active {
+    transition: all 100ms ease-in-out;
+  }
+}
@@ -1,4 +1,4 @@
-@import './global.scss';
+@import "./global.scss";

 .tab {
  height: 100%;
@@ -77,4 +77,3 @@ hr {
    }
  }
 }
-
@@ -8,6 +8,7 @@ export interface IStore {
  chosenVehicle: Vehicle | null;

  isColdStart: boolean;
+  isDoubleManned: boolean;

  showSupporter: boolean;
  imageLoading: boolean;
@@ -30,15 +31,20 @@ export interface IStore {

  stockSectionMode: 'stock-list' | 'stock-generator' | 'number-generator' | 'wiki-list';
  stockData?: IStockData;
+
+  lastFocusedElement: HTMLElement | null;
 }

-export type TStockInfoKey = 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt' | 'car-passenger' | 'car-cargo';
+export type TLocoGroup = 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt';
+export type TCarWagonGroup = 'car-passenger' | 'car-cargo';

 export interface IStockProps {
  type: string;
  length: number;
  mass: number;
-  cargo: string;
+  cargo?: string | null;
+  coldStart?: boolean;
+  doubleManned?: boolean;
 }

 export interface IStockData {
@@ -52,39 +58,42 @@ export interface IStockData {
  };

  info: {
-    'car-cargo': [string, string, boolean, boolean, string][];
-    'car-passenger': [string, string, boolean, boolean, string][];
-    'loco-e': [string, string, string, string, boolean][];
-    'loco-s': [string, string, string, string, boolean][];
-    'loco-szt': [string, string, string, string, boolean][];
-    'loco-ezt': [string, string, string, string, boolean][];
+    'car-cargo': [string, string, boolean, number | null, string][];
+    'car-passenger': [string, string, boolean, number | null, string][];
+    'loco-e': [string, string, string, string, number | null][];
+    'loco-s': [string, string, string, string, number | null][];
+    'loco-szt': [string, string, string, string, number | null][];
+    'loco-ezt': [string, string, string, string, number | null][];
  };

  props: IStockProps[];
-
-  usage: { [key: string]: string };
 }

 export interface ILocomotive {
  type: string;
-  power: string;
+  power: TLocoGroup;
+  group: TLocoGroup;
  constructionType: string;
  cabinType: string;
  maxSpeed: number;
-  supportersOnly: boolean;
+  isSponsorsOnly: boolean;
+  sponsorsOnlyTimestamp: number;
  imageSrc: string;

  mass: number;
  length: number;
+  coldStart: boolean;
+  doubleManned: boolean;
 }

 export interface ICarWagon {
-  //"203V_PKPC_Fll_01","203V",true,false,"100",img
  type: string;
-  useType: 'car-passenger' | 'car-cargo';
+  useType: TCarWagonGroup;
+  group: TCarWagonGroup;
  constructionType: string;
  loadable: boolean;
-  supportersOnly: boolean;
+  isSponsorsOnly: boolean;
+  sponsorsOnlyTimestamp: number;
  maxSpeed: number;
  imageSrc: string;

@@ -108,7 +117,8 @@ export interface IStock {
  maxSpeed: number;
  cargo?: { id: string; totalMass: number };
  isLoco: boolean;
-  supportersOnly: boolean;
+  isSponsorsOnly: boolean;
+  sponsorsOnlyTimestamp: number;
  count: number;
  imgSrc?: string;
 }
@@ -120,4 +130,3 @@ export interface IReadyStockItem {
  number: string;
  name: string;
 }
-
@@ -1,5 +0,0 @@
-const supportedConstructions = ['303e', '203e'];
-
-export function locoSupportsColdStart(constructionType: string) {
-  return new RegExp(`(${supportedConstructions.join('|')})`).test(constructionType);
-}
@@ -1,14 +0,0 @@
-import speedLimitTable from '../constants/speedLimits.json';
-export type LocoType = keyof typeof speedLimitTable;
-
-export const calculateSpeedLimit = (locoType: LocoType, stockMass: number, isTrainPassenger: boolean) => {
-  const speedTable = speedLimitTable[locoType][isTrainPassenger ? 'passenger' : 'cargo'];
-
-  if (!speedTable) return undefined;
-
-  let speedLimit = 0;
-  for (let mass in speedTable) if (stockMass > Number(mass)) speedLimit = (speedTable as any)[mass];
-
-  return speedLimit;
-};
-
@@ -0,0 +1,26 @@
+import speedLimits from '../constants/speedLimits.json';
+import massLimits from '../constants/massLimits.json';
+
+export type SpeedLimitLocoType = keyof typeof speedLimits;
+export type MassLimitLocoType = keyof typeof massLimits;
+
+export function calculateSpeedLimit(locoType: SpeedLimitLocoType, stockMass: number, isTrainPassenger: boolean) {
+  console.log(speedLimits[locoType]);
+
+  if (speedLimits[locoType] === undefined) return 0;
+
+  const speedTable = speedLimits[locoType][isTrainPassenger ? 'passenger' : 'cargo'];
+
+  if (!speedTable) return undefined;
+
+  let speedLimit = 0;
+  for (const mass in speedTable) if (stockMass > Number(mass)) speedLimit = (speedTable as any)[mass];
+
+  return speedLimit;
+}
+
+export function calculateMassLimit(locoType: MassLimitLocoType, isTrainPassenger: boolean) {
+  if (massLimits[locoType] === undefined) return 0;
+
+  return massLimits[locoType][isTrainPassenger ? 0 : 1] || 0;
+}
@@ -1,6 +1,6 @@
 import { EVehicleUseType } from '../enums/EVehicleUseType';
-import { ICarWagon, ILocomotive, IStore, TStockInfoKey } from '../types';
-import { LocoType, calculateSpeedLimit } from './speedLimitUtils';
+import { ICarWagon, ILocomotive, IStore, TCarWagonGroup, TLocoGroup } from '../types';
+import { MassLimitLocoType, SpeedLimitLocoType, calculateMassLimit, calculateSpeedLimit } from './vehicleLimitsUtils';

 export function isLocomotive(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
  return (vehicle as ILocomotive).power !== undefined;
@@ -14,25 +14,30 @@ export function locoDataList(state: IStore) {
  return Object.keys(stockData.info).reduce((acc, vehiclePower) => {
    if (!vehiclePower.startsWith('loco')) return acc;

-    const locoVehiclesData = stockData.info[vehiclePower as 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt'];
+    const locoVehiclesData = stockData.info[vehiclePower as TLocoGroup];

    locoVehiclesData.forEach((loco) => {
      if (state.showSupporter && !loco[4]) return;

-      const [type, constructionType, cabinType, maxSpeed, supportersOnly] = loco;
+      const [type, constructionType, cabinType, maxSpeed, sponsorsTimestamp] = loco;
      const locoProps = stockData.props.find((prop) => constructionType == prop.type);

      acc.push({
-        power: vehiclePower,
+        power: vehiclePower as TLocoGroup,
+        group: vehiclePower as TLocoGroup,
        type,
        constructionType,
        cabinType,
        maxSpeed: Number(maxSpeed),
-        supportersOnly,
+        isSponsorsOnly: Number(sponsorsTimestamp) > Date.now(),
+        sponsorsOnlyTimestamp: Number(sponsorsTimestamp),
        imageSrc: '',

-        length: locoProps?.length && type.startsWith('2EN') ? locoProps.length * 2 : locoProps?.length || 0,
-        mass: locoProps?.mass && type.startsWith('2EN') ? 253 : locoProps?.mass || 0,
+        length: locoProps?.length && type.startsWith('2EN') ? locoProps.length * 2 : locoProps?.length ?? 0,
+        mass: locoProps?.mass && type.startsWith('2EN') ? 253 : locoProps?.mass ?? 0,
+
+        coldStart: locoProps?.coldStart ?? false,
+        doubleManned: locoProps?.doubleManned ?? false,
      });
    });

@@ -48,28 +53,30 @@ export function carDataList(state: IStore) {
  return Object.keys(stockData.info).reduce((acc, vehicleUseType) => {
    if (!vehicleUseType.startsWith('car')) return acc;

-    const carVehiclesData = stockData.info[vehicleUseType as 'car-passenger' | 'car-cargo'];
+    const carVehiclesData = stockData.info[vehicleUseType as TCarWagonGroup];

    carVehiclesData.forEach((car) => {
-      if (state.showSupporter && !car[3]) return;
+      const [type, constructionType, loadable, sponsorsOnlyTimestamp, maxSpeed] = car;

-      const carPropsData = stockData.props.find((v) => car[0].toString().startsWith(v.type));
+      if (state.showSupporter && Number(sponsorsOnlyTimestamp) <= Date.now()) return;
+
+      const carPropsData = stockData.props.find((v) => type.toString().startsWith(v.type));

      acc.push({
-        useType: vehicleUseType as 'car-passenger' | 'car-cargo',
-        type: car[0],
-        constructionType: car[1],
-        loadable: car[2],
-        supportersOnly: car[3],
-        maxSpeed: Number(car[4]),
+        useType: vehicleUseType as TCarWagonGroup,
+        group: vehicleUseType as TCarWagonGroup,
+        type,
+        constructionType,
+        loadable,
+        isSponsorsOnly: Number(sponsorsOnlyTimestamp) > Date.now(),
+        sponsorsOnlyTimestamp: Number(sponsorsOnlyTimestamp),
+        maxSpeed: Number(maxSpeed),
        imageSrc: '',
        cargoList:
-          !carPropsData || carPropsData.cargo === null
-            ? []
-            : carPropsData.cargo.split(';').map((cargo) => ({
-                id: cargo.split(':')[0],
-                totalMass: Number(cargo.split(':')[1]),
-              })),
+          carPropsData?.cargo?.split(';').map((cargo) => ({
+            id: cargo.split(':')[0],
+            totalMass: Number(cargo.split(':')[1]),
+          })) || [],

        mass: carPropsData?.mass || 0,
        length: carPropsData?.length || 0,
@@ -81,10 +88,7 @@ export function carDataList(state: IStore) {
 }

 export function totalMass(state: IStore) {
-  return ~~state.stockList.reduce(
-    (acc, stock) => acc + (stock.cargo ? stock.cargo.totalMass : stock.mass) * stock.count,
-    0
-  );
+  return ~~state.stockList.reduce((acc, stock) => acc + (stock.cargo ? stock.cargo.totalMass : stock.mass) * stock.count, 0);
 }

 export function totalLength(state: IStore) {
@@ -92,10 +96,7 @@ export function totalLength(state: IStore) {
 }

 export function maxStockSpeed(state: IStore) {
-  const stockSpeedLimit = state.stockList.reduce(
-    (acc, stock) => (stock.maxSpeed < acc || acc == 0 ? stock.maxSpeed : acc),
-    0
-  );
+  const stockSpeedLimit = state.stockList.reduce((acc, stock) => (stock.maxSpeed < acc || acc == 0 ? stock.maxSpeed : acc), 0);
  const headingLoco = state.stockList[0]?.isLoco ? state.stockList[0] : undefined;

  if (!headingLoco) return stockSpeedLimit;
@@ -106,42 +107,26 @@ export function maxStockSpeed(state: IStore) {

  const stockMass = totalMass(state);

-  const speedLimitByMass = calculateSpeedLimit(locoType as LocoType, stockMass, isTrainPassenger(state));
+  const speedLimitByMass = calculateSpeedLimit(locoType as SpeedLimitLocoType, stockMass, isTrainPassenger(state));

  return speedLimitByMass ? Math.min(stockSpeedLimit, speedLimitByMass) : stockSpeedLimit;
 }

 export function acceptableMass(state: IStore) {
  if (state.stockList.length == 0 || !state.stockList[0].isLoco) return 0;
-  const activeLocomotiveType = state.stockList[0].type;

-  if (/^SM/.test(activeLocomotiveType)) return 2400;
+  const activeLocomotiveType = state.stockList[0].type.split('-')[0];

-  // Elektryczne EU07 / EP07 / EP08 / ET41
+  const locoMassLimit = calculateMassLimit(activeLocomotiveType as MassLimitLocoType, isTrainPassenger(state));

-  // Pasażerski elektr.
-  if (isTrainPassenger(state)) {
-    if (/^(EU|EP)/.test(activeLocomotiveType)) return 650;
-    if (/^ET/.test(activeLocomotiveType)) return 700;
-
-    return 0;
-  }
-
-  // Towarowy / inny elektr.
-  if (/^EU/.test(activeLocomotiveType)) return 2000;
-  if (/^ET/.test(activeLocomotiveType)) return 4000;
-  if (/^EP/.test(activeLocomotiveType)) return 650;
-
-  return 0;
+  return locoMassLimit;
 }

 export function isTrainPassenger(state: IStore) {
  if (state.stockList.length == 0) return false;
  if (state.stockList.every((stock) => stock.isLoco)) return false;

-  return state.stockList
-    .filter((stock) => !stock.isLoco)
-    .every((stock) => stock.useType === EVehicleUseType.CAR_PASSENGER);
+  return state.stockList.filter((stock) => !stock.isLoco).every((stock) => stock.useType === EVehicleUseType.CAR_PASSENGER);
 }

 export function chosenRealStock(state: IStore) {
@@ -158,4 +143,3 @@ export function chosenRealStock(state: IStore) {

  return realStockObj;
 }
-
@@ -1,35 +1,35 @@
-<template>
-  <div class="app-container">
-    <MainContainer />
-    <Footer />
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { useStore } from '../store';
-
-import MainContainer from '../components/app/MainContainer.vue';
-import Footer from '../components/app/Footer.vue';
-
-export default defineComponent({
-  components: {
-    MainContainer,
-    Footer,
-  },
-
-  data: () => ({
-    store: useStore(),
-  }),
-});
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  min-height: 100vh;
-
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-</style>
+<template>
+  <div class="app-container">
+    <MainContainer />
+    <FooterVue />
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import { useStore } from "../store";
+
+import MainContainer from "../components/app/MainContainer.vue";
+import FooterVue from "../components/app/Footer.vue";
+
+export default defineComponent({
+  components: {
+    MainContainer,
+    FooterVue,
+  },
+
+  data: () => ({
+    store: useStore(),
+  }),
+});
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  min-height: 100vh;
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+</style>
@@ -1,7 +1,7 @@
 /// <reference types="vite/client" />

-declare module '*.vue' {
-  import type { DefineComponent } from 'vue'
-  const component: DefineComponent<{}, {}, any>
-  export default component
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
 }
@@ -13,21 +13,40 @@ export default defineConfig({
    VitePWA({
      registerType: 'autoUpdate',

+      devOptions: {
+        suppressWarnings: true,
+        enabled: true,
+      },
+
      workbox: {
-        // globPatterns: ['**/*.{js,css,html,png,svg,img}'],
+        globPatterns: ['**/*.{js,css,html,jpg,png,svg,img,woff,woff2}'],

        runtimeCaching: [
          {
            urlPattern: /^https:\/\/rj.td2.info.pl\/dist\/img\/thumbnails\/.*/i,
-            handler: 'CacheFirst',
+            handler: 'NetworkFirst',
            options: {
              cacheName: 'swdr-images-cache',
              expiration: {
                maxEntries: 50,
-                maxAgeSeconds: 60 * 60 * 24 * 7, // <== 7 days
+                maxAgeSeconds: 60 * 60 * 24, // <== 1 day
              },
              cacheableResponse: {
-                statuses: [404],
+                statuses: [0, 200, 404],
+              },
+            },
+          },
+          {
+            urlPattern: /^https:\/\/spythere.github.io\/api\/td2\/.*/i,
+            handler: 'NetworkFirst',
+            options: {
+              cacheName: 'spythere-api-cache',
+              expiration: {
+                maxEntries: 150,
+                maxAgeSeconds: 60 * 60 * 24, // <== 1 day
+              },
+              cacheableResponse: {
+                statuses: [0, 200],
              },
            },
          },
@@ -36,5 +55,3 @@ export default defineConfig({
    }),
  ],
 });
-
-
Author	SHA1	Message	Date
Spythere	bd9af9a630	Merge pull request #18 from Spythere/development Wersja 1.7.3	2024-01-18 17:57:01 +01:00
Spythere	2188dbdf9b	bump: 1.7.3	2024-01-18 16:37:15 +01:00
Spythere	c4576d7802	hotfix 4E	2024-01-18 16:36:57 +01:00
Spythere	86cb4cff4d	Merge pull request #17 - Wersja 1.7.2 Wersja 1.7.2	2023-11-07 17:43:34 +01:00
Spythere	0534848677	bump: 1.7.2	2023-11-06 21:20:22 +01:00
Spythere	c5d116e2db	added alphabetical cargo sort	2023-11-06 21:20:07 +01:00
Spythere	3dce5ec7c0	responsive font size	2023-11-06 21:08:01 +01:00
Spythere	956ff8afd7	stock thumbnail labels fix	2023-11-06 20:20:00 +01:00
Spythere	5b629833df	Merge pull request #16 - Wersja 1.7.1 Wersja 1.7.1	2023-10-31 23:05:43 +01:00
Spythere	b53201a7ff	hotfix	2023-10-31 23:02:58 +01:00
Spythere	f0ddd0e27f	custom checkboxes	2023-10-31 03:17:24 +01:00
Spythere	94bfba2c49	resolve fonts edit	2023-10-31 03:17:11 +01:00
Spythere	1e4541ef0d	spawn props checking on stock upload	2023-10-28 15:40:22 +02:00
Spythere	c25a55a7d9	added double manning checkbox & support	2023-10-28 15:33:09 +02:00
Spythere	bea3c59405	thumbnail placeholder fix	2023-10-28 14:12:21 +02:00
Spythere	8cd43adff3	acceptable masses & speeds update	2023-10-28 13:44:55 +02:00
Spythere	5ab1963117	lock files sync	2023-10-27 16:46:57 +02:00
Spythere	50d784a0de	1.7.1 bump	2023-10-27 16:43:39 +02:00
Spythere	f61135ce6b	packages bump; config	2023-10-27 16:39:54 +02:00
Spythere	5e43ece1aa	pwa optimize & fixes	2023-10-27 16:36:25 +02:00
Spythere	37e4149a34	Merge pull request #15 from Spythere/development Wersja 1.7.0	2023-10-26 21:43:46 +02:00
Spythere	e515203557	stockObject & static handling hotfixes	2023-10-26 21:37:33 +02:00
Spythere	0d79c71eba	1.7.0 bump	2023-10-26 21:36:00 +02:00
Spythere	2bbf9a8ac3	section improvements; hotfixes	2023-10-26 21:35:42 +02:00
Spythere	45b2bd01a2	enhanced wiki list	2023-10-26 00:55:13 +02:00
Spythere	665ffb9dce	lock: hotfix; bump 1.6.1	2023-10-24 23:31:45 +02:00
Spythere	1c2a93fbd5	format; linting; aktualizacja do 2023.2.1	2023-10-24 23:28:42 +02:00
Spythere	57ab6cc02d	gitignore	2023-08-25 20:29:17 +02:00