feat: consumable max

scripts/buildAssets/constants.ts

@@ -4,8 +4,7 @@ export const DATA =
 export const POI = {
   vehicleDefinitions: 'XML/item_defs/vehicles',
   strings: 'Strings',
-  cachedStrings:
-    'C:/Users/coola/Documents/DAVAProject/cache/localizations/en.yaml',
+  cachedStrings: 'https://stufficons.wgcdn.co/localizations/en.yaml',
   tankParameters: '3d/Tanks/Parameters',
   smallIcons: 'Gfx/UI/BattleScreenHUD/SmallTankIcons',
   bigIcons: 'Gfx/UI/BigTankIcons',

scripts/buildAssets/definitions.ts

@@ -1,9 +1,9 @@
 import { readdir } from 'fs/promises';
-import { parse } from 'path';
+import { parse as parsePath } from 'path';
 import { Vector3Tuple } from 'three';
+import { parse as parseYaml } from 'yaml';
 import { TankType } from '../../src/components/Tanks';
 import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
-import { readYAML } from '../../src/core/blitz/readYAML';
 import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
 import { toUniqueId } from '../../src/core/blitz/toUniqueId';
 import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
@@ -60,6 +60,7 @@ type VehicleDefinitionArmor = Record<
 >;
 interface VehicleDefinitions {
   invisibility: { moving: number; still: number; firePenalty: number };
+  consumableSlots: number;
   optDevicePreset: string;
   hull: {
     armor: VehicleDefinitionArmor;
@@ -257,7 +258,9 @@ export async function buildDefinitions(production: boolean) {
   const strings = await readYAMLDVPL<Strings>(
     `${DATA}/${POI.strings}/en.yaml.dvpl`,
   );
-  const stringsCache = await readYAML<Strings>(POI.cachedStrings);
+  const stringsCache = await fetch(POI.cachedStrings)
+    .then((response) => response.text())
+    .then((string) => parseYaml(string) as Strings);
   const optionalDevices = await readXMLDVPL<{ root: OptionalDevices }>(
     `${DATA}/${POI.optionalDevices}.dvpl`,
   );
@@ -338,6 +341,7 @@ export async function buildDefinitions(production: boolean) {
         tankDefinitions[tankId] = {
           id: tankId,
           equipment,
+          consumables: tankDefinition.root.consumableSlots,
           name:
             (tank.shortUserString
               ? strings[tank.shortUserString] ??
@@ -392,7 +396,7 @@ export async function buildDefinitions(production: boolean) {
           (turretKey, turretIndex) => {
             const turret = tankDefinition.root.turrets0[turretKey];
             const turretModel = Number(
-              parse(turret.models.undamaged).name.split('_')[1],
+              parsePath(turret.models.undamaged).name.split('_')[1],
             );
             const turretId = toUniqueId(nation, turretList.root.ids[turretKey]);
             const turretYaw = (
@@ -468,7 +472,7 @@ export async function buildDefinitions(production: boolean) {
                 .split(' ')
                 .map(Number) as [number, number];
               const gunModel = Number(
-                parse(turretGunEntry.models.undamaged).name.split('_')[1],
+                parsePath(turretGunEntry.models.undamaged).name.split('_')[1],
               );
               const gunName =
                 strings[gunListEntry.userString] ?? gunKey.replaceAll('_', ' ');

src/app/tools/tankopedia/[id]/components/Configure.tsx

@@ -21,6 +21,10 @@ export function Configure() {
     (state) => state.equipmentMatrix,
   );
   const consumables = useTankopediaTemporary((state) => state.consumables);
+  const consumablesList = Object.values(awaitedConsumableDefinitions).filter(
+    (consumable) =>
+      checkConsumableInclusivity(consumable, protagonist.tank, protagonist.gun),
+  );
 
   return (
     <Flex gap="4" direction="column">
@@ -94,10 +98,14 @@ export function Configure() {
                       equipment={equipment[0]}
                       first
                       rowChild
-                      selected={equipmentMatrix[rowIndex][columnIndex] === 0}
+                      selected={equipmentMatrix[rowIndex][columnIndex] === -1}
                       onClick={() => {
                         mutateTankopediaTemporary((draft) => {
-                          draft.equipmentMatrix[rowIndex][columnIndex] = 0;
+                          if (equipmentMatrix[rowIndex][columnIndex] === -1) {
+                            draft.equipmentMatrix[rowIndex][columnIndex] = 0;
+                          } else {
+                            draft.equipmentMatrix[rowIndex][columnIndex] = -1;
+                          }
                         });
                       }}
                     />
@@ -109,7 +117,11 @@ export function Configure() {
                       selected={equipmentMatrix[rowIndex][columnIndex] === 1}
                       onClick={() => {
                         mutateTankopediaTemporary((draft) => {
-                          draft.equipmentMatrix[rowIndex][columnIndex] = 1;
+                          if (equipmentMatrix[rowIndex][columnIndex] === 1) {
+                            draft.equipmentMatrix[rowIndex][columnIndex] = 0;
+                          } else {
+                            draft.equipmentMatrix[rowIndex][columnIndex] = 1;
+                          }
                         });
                       }}
                     />
@@ -121,36 +133,41 @@ export function Configure() {
         </Flex>
 
         <Flex gap="2" direction="column">
-          <Heading size="4">Consumables</Heading>
+          <Heading size="4">
+            Consumables (max {protagonist.tank.consumables})
+          </Heading>
 
-          {Object.values(awaitedConsumableDefinitions)
-            .filter((consumable) =>
-              checkConsumableInclusivity(
-                consumable,
-                protagonist.tank,
-                protagonist.gun,
-              ),
-            )
-            .map((consumable) => (
-              <ModuleButton
-                first
-                last
-                type="consumable"
-                consumable={consumable.id}
-                selected={consumables.includes(consumable.id)}
-                onClick={() => {
-                  mutateTankopediaTemporary((draft) => {
-                    if (draft.consumables.includes(consumable.id)) {
-                      draft.consumables = draft.consumables.filter(
-                        (id) => id !== consumable.id,
-                      );
-                    } else {
-                      draft.consumables.push(consumable.id);
-                    }
-                  });
-                }}
-              />
-            ))}
+          <Flex>
+            {consumablesList.map((consumable, index) => {
+              const selected = consumables.includes(consumable.id);
+
+              return (
+                <ModuleButton
+                  first={index === 0}
+                  last={index === consumablesList.length - 1}
+                  rowChild
+                  type="consumable"
+                  disabled={
+                    protagonist.tank.consumables === consumables.length &&
+                    !selected
+                  }
+                  consumable={consumable.id}
+                  selected={selected}
+                  onClick={() => {
+                    mutateTankopediaTemporary((draft) => {
+                      if (selected) {
+                        draft.consumables = draft.consumables.filter(
+                          (id) => id !== consumable.id,
+                        );
+                      } else {
+                        draft.consumables.push(consumable.id);
+                      }
+                    });
+                  }}
+                />
+              );
+            })}
+          </Flex>
         </Flex>
       </Flex>
 

src/components/ModuleButton.tsx

@@ -72,6 +72,7 @@ export function ModuleButton({
       {...(props as unknown as ComponentProps<typeof Button>)}
     >
       <img
+        draggable={false}
         src={asset(
           props.type === 'module'
             ? `icons/modules/${props.module}.webp`

src/core/blitz/readYAML.ts

@@ -3,6 +3,5 @@ import { parse } from 'yaml';
 
 export async function readYAML<Type>(file: string) {
   const yaml = (await readFile(file)).toString();
-
   return parse(yaml) as Type;
 }

src/core/blitzkrieg/tankDefinitions.ts

@@ -19,6 +19,7 @@ export interface TankDefinition {
   name: string;
   name_full?: string;
   tree_type: TreeTypeString;
+  consumables: number;
   tier: Tier;
   type: TankType;
   testing?: boolean;

src/stores/tankopedia.ts

@@ -46,7 +46,7 @@ interface TankopediaPersistent {
   };
 }
 
-export type EquipmentMatrix = (0 | 1)[][];
+export type EquipmentMatrix = (-1 | 0 | 1)[][];
 
 interface TankopediaTemporary {
   model: {
@@ -100,9 +100,9 @@ export const useTankopediaTemporary = create<TankopediaTemporary>()(
       },
     },
     equipmentMatrix: [
-      [1, 0, 0],
-      [0, 1, 1],
-      [0, 1, 0],
+      [0, 0, 0],
+      [0, 0, 0],
+      [0, 0, 0],
     ],
     mode: 'model',
     consumables: [],