Merge branch 'main' into calculated-bounding-boxes

packages/core/src/blitzkit/api/server/1_tankDefinitions.ts

@@ -434,6 +434,7 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
             resistance_hard: terrainResistances[0],
             resistance_medium: terrainResistances[1],
             resistance_soft: terrainResistances[2],
+            repair_time: track.hysteresisHealth / track.healthRegenPerSec,
             tier: track.level,
             unlocks: resolveUnlocks(
               this.blitzModuleTypeToBlitzkit,

packages/core/src/protos/tank_definitions.proto

@@ -87,6 +87,7 @@ message TrackDefinition {
   required float        resistance_medium   = 10;
   required float        resistance_soft     = 11;
   repeated Unlock       unlocks             = 12;
+  required float        repair_time         = 13;
 }
 
 message EngineDefinition {

packages/core/src/protos/tank_definitions.ts

@@ -338,6 +338,7 @@ export interface TrackDefinition {
   resistance_medium: number;
   resistance_soft: number;
   unlocks: Unlock[];
+  repair_time: number;
 }
 
 export interface EngineDefinition {
@@ -1759,6 +1760,7 @@ function createBaseTrackDefinition(): TrackDefinition {
     resistance_medium: 0,
     resistance_soft: 0,
     unlocks: [],
+    repair_time: 0,
   };
 }
 
@@ -1800,6 +1802,9 @@ export const TrackDefinition: MessageFns<TrackDefinition> = {
     for (const v of message.unlocks) {
       Unlock.encode(v!, writer.uint32(98).fork()).join();
     }
+    if (message.repair_time !== 0) {
+      writer.uint32(109).float(message.repair_time);
+    }
     return writer;
   },
 
@@ -1906,6 +1911,14 @@ export const TrackDefinition: MessageFns<TrackDefinition> = {
           message.unlocks.push(Unlock.decode(reader, reader.uint32()));
           continue;
         }
+        case 13: {
+          if (tag !== 109) {
+            break;
+          }
+
+          message.repair_time = reader.float();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1929,6 +1942,7 @@ export const TrackDefinition: MessageFns<TrackDefinition> = {
       resistance_medium: isSet(object.resistance_medium) ? globalThis.Number(object.resistance_medium) : 0,
       resistance_soft: isSet(object.resistance_soft) ? globalThis.Number(object.resistance_soft) : 0,
       unlocks: globalThis.Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) : [],
+      repair_time: isSet(object.repair_time) ? globalThis.Number(object.repair_time) : 0,
     };
   },
 
@@ -1970,6 +1984,9 @@ export const TrackDefinition: MessageFns<TrackDefinition> = {
     if (message.unlocks?.length) {
       obj.unlocks = message.unlocks.map((e) => Unlock.toJSON(e));
     }
+    if (message.repair_time !== 0) {
+      obj.repair_time = message.repair_time;
+    }
     return obj;
   },
 
@@ -1994,6 +2011,7 @@ export const TrackDefinition: MessageFns<TrackDefinition> = {
     message.resistance_medium = object.resistance_medium ?? 0;
     message.resistance_soft = object.resistance_soft ?? 0;
     message.unlocks = object.unlocks?.map((e) => Unlock.fromPartial(e)) || [];
+    message.repair_time = object.repair_time ?? 0;
     return message;
   },
 };

packages/core/src/types/vehicleDefinitions.ts

@@ -34,6 +34,8 @@ export interface VehicleDefinitions {
       };
       level: number;
       hullPosition: string;
+      hysteresisHealth: number;
+      healthRegenPerSec: number;
       armor: {
         leftTrack:
           | number