fix: some linting for new proto 3

packages/core/src/blitz/index.ts

@@ -24,8 +24,7 @@ export * from './rating';
 export * from './regions';
 export * from './regionSubdomainToRegion';
 export * from './regionToRegionSubdomain';
-export * from './resolveNearPenetration';
 export * from './searchClansAcrossRegions';
 export * from './searchCurrentRatingPlayers';
 export * from './searchPlayersAcrossRegions';
-export * from './toUniqueId'; 
+export * from './toUniqueId';

packages/core/src/blitz/resolveNearPenetration.ts

@@ -1,5 +0,0 @@
-import { Vector2Tuple } from 'three';
-
-export function resolveNearPenetration(penetration: number | Vector2Tuple) {
-  return typeof penetration === 'number' ? penetration : penetration[0];
-}

packages/core/src/blitzkit/uniqueGuns.ts

@@ -1,5 +1,5 @@
 import { forEachRight } from 'lodash-es';
-import { GunDefinition, TurretDefinition } from './tankDefinitions';
+import { GunDefinition, TurretDefinition } from '../protos';
 
 export function uniqueGuns(turrets: TurretDefinition[]) {
   const gunIds = new Set<number>();
@@ -7,8 +7,8 @@ export function uniqueGuns(turrets: TurretDefinition[]) {
 
   forEachRight(turrets, (turret) => {
     forEachRight(turret.guns, (gun) => {
-      if (!gunIds.has(gun.id)) {
-        gunIds.add(gun.id);
+      if (!gunIds.has(gun.gunType!.value.base.id)) {
+        gunIds.add(gun.gunType!.value.base.id);
         guns.push({ turret, gun });
       }
     });

packages/core/src/protos/tank_definitions.proto

@@ -70,7 +70,7 @@ message EngineDefinition {
   required string name = 2;
   optional uint32 xp = 3;
   required Tier tier = 4;
-  optional float fire_chance = 5;
+  required float fire_chance = 5;
   required uint32 power = 6;
   required uint32 weight = 7;
   repeated Unlock unlocks = 8;
@@ -98,8 +98,8 @@ message GunDefinition {
 }
 
 message GunDefinitionRegular {
-  required GunDefinitionBase gun = 1;
-  required GunDefinitionRegularProperties regular = 2;
+  required GunDefinitionBase base = 1;
+  required GunDefinitionRegularProperties extension = 2;
 }
 
 message GunDefinitionRegularProperties {
@@ -107,8 +107,8 @@ message GunDefinitionRegularProperties {
 }
 
 message GunDefinitionAutoLoader {
-  required GunDefinitionBase gun = 1;
-  required GunDefinitionAutoLoaderProperties auto_loader = 2;
+  required GunDefinitionBase base = 1;
+  required GunDefinitionAutoLoaderProperties extension = 2;
 }
 
 message GunDefinitionAutoLoaderProperties {
@@ -118,8 +118,8 @@ message GunDefinitionAutoLoaderProperties {
 }
 
 message GunDefinitionAutoReloader {
-  required GunDefinitionBase gun = 1;
-  required GunDefinitionAutoReloaderProperties auto_reloader = 2;
+  required GunDefinitionBase base = 1;
+  required GunDefinitionAutoReloaderProperties extension = 2;
 }
 
 message GunDefinitionAutoReloaderProperties {