From c25a55a7d9ae99912933b22ea6f396da53a6b569 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sat, 28 Oct 2023 15:33:09 +0200
Subject: [PATCH] added double manning checkbox & support

---
 src/components/tabs/StockListTab.vue | 29 ++++++++++++++++++++--------
 src/components/tabs/WikiListTab.vue  | 11 +++++------
 src/locales/en.json                  |  3 ++-
 src/locales/pl.json                  |  7 ++++---
 src/store.ts                         | 19 ++++++++++++++++++
 src/types.ts                         |  9 ++++++---
 src/utils/locoUtils.ts               |  7 -------
 src/utils/vehicleLimitsUtils.ts      |  2 ++
 src/utils/vehicleUtils.ts            | 17 ++++++++--------
 vite.config.ts                       |  4 ++--
 10 files changed, 70 insertions(+), 38 deletions(-)
 delete mode 100644 src/utils/locoUtils.ts

diff --git a/src/components/tabs/StockListTab.vue b/src/components/tabs/StockListTab.vue
index c597d21..b02183a 100644
--- a/src/components/tabs/StockListTab.vue
+++ b/src/components/tabs/StockListTab.vue
@@ -79,11 +79,20 @@
       </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">
+        <input type="checkbox" v-model="store.isColdStart" />
         {{ $t('stocklist.coldstart-info') }}
       </label>
+
+      <label v-if="store.stockSupportsDoubleManning">
+        <input type="checkbox" v-model="store.isDoubleManned" />
+        {{ $t('stocklist.doublemanning-info') }}
+      </label>
+      <!-- <label v-if="store.stockList.length > 0 && locoSupportsDoubleManning(store.stockList[0].constructionType)">
+        <input type="checkbox" v-model="store.isDoubleManned" />
+        {{ $t('stocklist.coldstart-info') }}
+      </label> -->
     </div>
 
     <div class="stock_warnings" v-if="stockHasWarnings">
@@ -158,7 +167,6 @@ import { defineComponent } from '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';
@@ -188,12 +196,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(';');
     },
@@ -212,8 +227,6 @@ export default defineComponent({
   },
 
   methods: {
-    locoSupportsColdStart,
-
     copyToClipboard() {
       navigator.clipboard.writeText(this.stockString);
 
diff --git a/src/components/tabs/WikiListTab.vue b/src/components/tabs/WikiListTab.vue
index 4e2d208..08ac11c 100644
--- a/src/components/tabs/WikiListTab.vue
+++ b/src/components/tabs/WikiListTab.vue
@@ -66,7 +66,7 @@
 
               <td v-if="currentFilterMode == 'carriages'">{{ !isLocomotive(vehicle) ? vehicle.cargoList.length : '---' }}</td>
               <td v-if="currentFilterMode == 'tractions'">
-                {{ isLocomotive(vehicle) ? (locoSupportsColdStart(vehicle.constructionType) ? `&check;` : '&cross;') : '---' }}
+                {{ isLocomotive(vehicle) ? (vehicle.coldStart ? `&check;` : '&cross;') : '---' }}
               </td>
             </tr>
           </tbody>
@@ -86,7 +86,6 @@ import { Vehicle } from '../../types';
 import { isLocomotive } from '../../utils/vehicleUtils';
 import stockMixin from '../../mixins/stockMixin';
 import imageMixin from '../../mixins/imageMixin';
-import { locoSupportsColdStart } from '../../utils/locoUtils';
 
 type SorterID = 'type' | 'constructionType' | 'image' | 'length' | 'mass' | 'maxSpeed' | 'cargoCount' | 'group' | 'coldStart';
 
@@ -143,7 +142,6 @@ export default defineComponent({
   },
 
   methods: {
-    locoSupportsColdStart,
     isLocomotive,
 
     toggleFilter(name: typeof this.currentFilterMode) {
@@ -180,7 +178,10 @@ export default defineComponent({
           );
 
         case 'coldStart':
-          return (locoSupportsColdStart(row1.vehicle.constructionType) > locoSupportsColdStart(row2.vehicle.constructionType) ? 1 : -1) * direction;
+          return (
+            ((isLocomotive(row1.vehicle) && row1.vehicle.coldStart ? 1 : -1) - (isLocomotive(row2.vehicle) && row2.vehicle.coldStart ? 1 : -1)) *
+            direction
+          );
 
         default:
           break;
@@ -200,8 +201,6 @@ export default defineComponent({
             (this.currentFilterMode == 'all' ||
               (this.currentFilterMode == 'tractions' && isLocomotive(vehicle)) ||
               (this.currentFilterMode == 'carriages' && !isLocomotive(vehicle))),
-
-          // ((this.filters.tractions && isLocomotive(vehicle)) || (this.filters.carriages && !isLocomotive(vehicle))),
         }))
         .sort((a, b) => this.sortTableRows(a, b));
     },
diff --git a/src/locales/en.json b/src/locales/en.json
index 000857b..62bccc0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -64,7 +64,8 @@
     "mass-accepted": "accepted",
     "length": "Length",
     "vmax": "vMax",
-    "coldstart-info": "Cold start heading locomotive (only locos 303E & 203E type)",
+    "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!",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 607d5d0..f2e8823 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -29,7 +29,7 @@
     "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}",
+    "sponsor-only": "* TYLKO DLA SPONSORÓW DO {0}",
     "loco-e": "ELEKTROWÓZ",
     "loco-s": "SPALINOWÓZ",
     "loco-ezt": "EZT",
@@ -64,7 +64,8 @@
     "mass-accepted": "dopuszczalna",
     "length": "Długość",
     "vmax": "vMax",
-    "coldstart-info": "Zimny start lokomotywy czołowej (tylko elektrowozy typów 303E i 203E)",
+    "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!",
@@ -141,7 +142,7 @@
     "loco-s": "Spalinowóz",
     "loco-e": "Elektrowóz",
     "car-passenger": "Wagon pasażerski",
-    "car-cargo": "Wagon towarowy" 
+    "car-cargo": "Wagon towarowy"
   },
   "realstock": {
     "title": "ZESTAWIENIA REALNE by",
diff --git a/src/store.ts b/src/store.ts
index 280e238..47df771 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -22,6 +22,7 @@ export const useStore = defineStore({
       chosenVehicle: null,
 
       isColdStart: false,
+      isDoubleManned: false,
 
       showSupporter: false,
       imageLoading: false,
@@ -61,6 +62,24 @@ export const useStore = defineStore({
     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: {
diff --git a/src/types.ts b/src/types.ts
index 4480891..99fc72e 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -8,6 +8,7 @@ export interface IStore {
   chosenVehicle: Vehicle | null;
 
   isColdStart: boolean;
+  isDoubleManned: boolean;
 
   showSupporter: boolean;
   imageLoading: boolean;
@@ -41,7 +42,9 @@ export interface IStockProps {
   type: string;
   length: number;
   mass: number;
-  cargo: string;
+  cargo?: string | null;
+  coldStart?: boolean;
+  doubleManned?: boolean;
 }
 
 export interface IStockData {
@@ -64,8 +67,6 @@ export interface IStockData {
   };
 
   props: IStockProps[];
-
-  usage: { [key: string]: string };
 }
 
 export interface ILocomotive {
@@ -81,6 +82,8 @@ export interface ILocomotive {
 
   mass: number;
   length: number;
+  coldStart: boolean;
+  doubleManned: boolean;
 }
 
 export interface ICarWagon {
diff --git a/src/utils/locoUtils.ts b/src/utils/locoUtils.ts
deleted file mode 100644
index 2a373de..0000000
--- a/src/utils/locoUtils.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-const supportedConstructions = ["303e", "203e"];
-
-export function locoSupportsColdStart(constructionType: string) {
-  return new RegExp(`(${supportedConstructions.join("|")})`).test(
-    constructionType,
-  );
-}
diff --git a/src/utils/vehicleLimitsUtils.ts b/src/utils/vehicleLimitsUtils.ts
index b55921c..a8e6264 100644
--- a/src/utils/vehicleLimitsUtils.ts
+++ b/src/utils/vehicleLimitsUtils.ts
@@ -16,5 +16,7 @@ export function calculateSpeedLimit(locoType: SpeedLimitLocoType, stockMass: num
 }
 
 export function calculateMassLimit(locoType: MassLimitLocoType, isTrainPassenger: boolean) {
+  if(massLimits[locoType] === undefined) return 0;
+  
   return massLimits[locoType][isTrainPassenger ? 0 : 1] || 0;
 }
diff --git a/src/utils/vehicleUtils.ts b/src/utils/vehicleUtils.ts
index f23fac4..4901723 100644
--- a/src/utils/vehicleUtils.ts
+++ b/src/utils/vehicleUtils.ts
@@ -33,8 +33,11 @@ export function locoDataList(state: IStore) {
         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,
       });
     });
 
@@ -70,12 +73,10 @@ export function carDataList(state: IStore) {
         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,
diff --git a/vite.config.ts b/vite.config.ts
index c570604..5cabf9b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -32,7 +32,7 @@ export default defineConfig({
         runtimeCaching: [
           {
             urlPattern: /^https:\/\/rj.td2.info.pl\/dist\/img\/thumbnails\/.*/i,
-            handler: 'CacheFirst',
+            handler: 'NetworkFirst',
             options: {
               cacheName: 'swdr-images-cache',
               expiration: {
@@ -46,7 +46,7 @@ export default defineConfig({
           },
           {
             urlPattern: /^https:\/\/spythere.github.io\/api\/td2\/.*/i,
-            handler: 'CacheFirst',
+            handler: 'NetworkFirst',
             options: {
               cacheName: 'spythere-api-cache',
               expiration: {