fix: use non-compounding percentages

src/core/blitzkrieg/coefficient.ts

@@ -0,0 +1,3 @@
+export function coefficient(...effects: [boolean, number][]) {
+  return effects.reduce((accumulator, b) => accumulator + (b[0] ? b[1] : 0), 1);
+}

src/core/blitzkrieg/provisionDefinitions.ts

@@ -5,9 +5,9 @@ import { fetchCdonLz4 } from './fetchCdonLz4';
 export interface ProvisionEntry {
   id: number;
   name: string;
-  effects?: Record<string, number>;
   include: TankFilterDefinition[];
   exclude?: TankFilterDefinition[];
+  crew?: number;
 }
 
 export interface ProvisionDefinitions {
@@ -17,3 +17,5 @@ export interface ProvisionDefinitions {
 export const provisionDefinitions = fetchCdonLz4<ProvisionDefinitions>(
   asset('definitions/provisions.cdon.lz4'),
 );
+
+provisionDefinitions.then(console.log);

src/core/blitzkrieg/resolveDpm.ts

@@ -3,24 +3,18 @@ import { GunDefinition, ShellDefinition } from './tankDefinitions';
 export function resolveDpm(
   gun: GunDefinition,
   shell: ShellDefinition,
-  hasRammer = false,
-  hasShellReloadBoost = false,
-  hasAdrenaline = false,
-  hasTungsten = false,
+  damageCoefficient = 1,
+  reloadCoefficient = 1,
+  interClipCoefficient = 1,
 ) {
-  const alpha = shell.damage.armor * (hasTungsten ? 1.15 : 1);
+  const alpha = shell.damage.armor * damageCoefficient;
 
   if (gun.type === 'regular') {
-    return (
-      (alpha /
-        ((hasRammer ? 0.93 : 1) * (hasAdrenaline ? 0.8 : 1) * gun.reload)) *
-      60
-    );
+    return (alpha / (reloadCoefficient * gun.reload)) * 60;
   } else if (gun.type === 'autoLoader') {
     return (
       ((alpha * gun.count) /
-        (gun.reload +
-          (gun.count - 1) * gun.interClip * (hasShellReloadBoost ? 0.7 : 1))) *
+        (gun.reload + (gun.count - 1) * gun.interClip * interClipCoefficient)) *
       60
     );
   } else {

src/core/blitzkrieg/sum.ts

@@ -0,0 +1,3 @@
+export function sum(...effects: [boolean, number][]) {
+  return effects.reduce((accumulator, b) => accumulator + (b[0] ? b[1] : 0), 0);
+}

src/core/blitzkrieg/tankDefinitions.ts

@@ -27,13 +27,6 @@ export const CREW_MEMBER_NAMES: Record<CrewMember, string> = {
   driver: 'Driver',
   loader: 'Loader',
 };
-export const CREW_MEMBER_NAMES_PLURAL: Record<CrewMember, string> = {
-  commander: 'Commanders',
-  radioman: 'Radiomen',
-  gunner: 'Gunners',
-  driver: 'Drivers',
-  loader: 'Loaders',
-};
 export interface Crew {
   type: CrewMember;
   count?: number;

src/core/blitzkrieg/useProvision.ts

@@ -0,0 +1,6 @@
+import { useTankopediaTemporary } from '../../stores/tankopedia';
+
+export function useProvision(id: number) {
+  const provisions = useTankopediaTemporary((state) => state.provisions);
+  return provisions.includes(id);
+}

src/core/blitzkrieg/useProvisions.ts

@@ -0,0 +1,9 @@
+import { use } from 'react';
+import { useTankopediaTemporary } from '../../stores/tankopedia';
+import { provisionDefinitions } from './provisionDefinitions';
+
+export function useProvisions() {
+  const provisions = useTankopediaTemporary((state) => state.provisions);
+  const awaitedProvisionDefinitions = use(provisionDefinitions);
+  return provisions.map((id) => awaitedProvisionDefinitions[id]);
+}