ogamejs 4.2.0 → 4.3.0

package/README.md

@@ -44,8 +44,8 @@ Ogame.Fleets.getTrip(
   { galaxy: 3, system: 42, position: 6 },
   { drives: { combustion: 16, hyperspace: 12 } },
 );
-// → { distance: 40000, fleetSpeed: 19500, duration: 1595, fuel: 258287,
-//     cargo: 6650000, cargoAfterFuel: 6391713 }
+// → { distance: 40000, fleetSpeed: 19500, duration: 15862, fuel: 216148,
+//     cargo: 6650000, cargoAfterFuel: 6433852 }
 
 // And how it would go
 Ogame.Fleets.simulateCombat(
@@ -259,19 +259,29 @@ Ogame.Research.getResearchTime(Ogame.models.Research[122], 10, 12, 2); // Plasma
 
 ### `Ogame.Fleets`
 
-#### `getDistance(origin, target)`
+#### `getDistance(origin, target, universe = {})`
 
 Coordinates are `{ galaxy, system, position }`. The scale is not linear.
 
 ```javascript
 Ogame.Fleets.getDistance({ galaxy: 1, system: 1, position: 1 }, { galaxy: 4, system: 1, position: 1 });
 // → 60000
+
+// Most universes are donuts: the last galaxy touches the first
+Ogame.Fleets.getDistance(
+  { galaxy: 1, system: 1, position: 1 },
+  { galaxy: 6, system: 1, position: 1 },
+  { galaxies: 6, systems: 499, donutGalaxy: true, donutSystem: true },
+);
+// → 20000
 ```
 
-#### `getShipSpeed(ship, drives = {})` / `getFleetSpeed(fleet, drives = {})` / `getActiveDrive(ship, drives = {})`
+#### `getShipSpeed(ship, drives = {}, bonus = 0)` / `getFleetSpeed(fleet, drives = {})` / `getActiveDrive(ship, drives = {}, bonus = 0)`
 
 `drives` holds the `{ combustion, impulse, hyperspace }` levels. Each level adds 10%, 20% or 30% of the ship's base speed, and only the drive the ship actually flies on counts.
 
+`bonus` adds to that, as a share of the base speed: `1` for the class bonus that doubles a ship's speed (Collector transporters, General warships), `0.05` for a 5% life form bonus. In a fleet, each entry carries its own `speedBonus`.
+
 A few ships switch to a better drive once the matching technology is high enough. `getActiveDrive` tells you which one is in use — and since a switch also changes the fuel burn, it reports that too.
 
 ```javascript
@@ -287,11 +297,15 @@ Ogame.Fleets.getFleetSpeed([{ ship: Ogame.models.Destroyable[1], count: 100 }],
 
 #### `getFlightTime(distance, fleetSpeed, speedPercent = 100, universeFleetSpeed = 1)`
 
-`(10 + 35000 / speedPercent × √(distance × 10 / fleetSpeed)) / universeFleetSpeed`, in seconds.
+`(10 + 350000 / speedPercent × √(distance × 10 / fleetSpeed)) / universeFleetSpeed`, in seconds — at 100%, the familiar `10 + 3500 × √(distance × 10 / fleetSpeed)`.
 
-#### `getFuelConsumption(fleet, distance, speedPercent = 100, drives = {})`
+#### `getFuelConsumption(fleet, distance, speedPercent = 100, drives = {}, options = {})`
 
-`1 + round(Σ(consumption × count) × distance / 35000 × (speedPercent / 100 + 1)²)`, in deuterium.
+Each ship type is billed on its own, at least one unit, then the bills add up:
+`Σ max(1, round(consumption × count × distance / 35000 × (shipSpeedValue / 10 + 1)²))`, in deuterium.
+`shipSpeedValue` is `speedPercent / 10` for the slowest ship and `speedPercent / 10 × √(fleetSpeed / shipSpeed)` for the faster ones it holds back, which burn less than at full throttle.
+
+`consumption` is the ship's own after the universe factor (`options.deuteriumFactor`, `globalDeuteriumSaveFactor` in the API) and the entry's `fuelReduction` (General, life forms, capped at `MAX_FUEL_REDUCTION`, 90%), each rounded down and never below one unit.
 
 #### `getTrip(fleet, origin, target, options = {})`
 
@@ -304,10 +318,12 @@ Ogame.Fleets.getTrip(
   { galaxy: 3, system: 42, position: 6 },
   { drives: { combustion: 16, hyperspace: 12 }, speedPercent: 100, roundTrip: false },
 );
-// → { distance: 40000, fleetSpeed: 19500, duration: 1595, fuel: 258287,
-//     cargo: 6650000, cargoAfterFuel: 6391713 }
+// → { distance: 40000, fleetSpeed: 19500, duration: 15862, fuel: 216148,
+//     cargo: 6650000, cargoAfterFuel: 6433852 }
 ```
 
+`options` also takes `universeFleetSpeed`, `deuteriumFactor` and `universe` (the donut shape passed to `getDistance`).
+
 `cargoAfterFuel` is what is left once the deuterium is loaded — the number that decides whether a raid is worth flying.
 
 #### `getDebris(ship, number, factor, deuteriumFactor = 0)`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ogamejs",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "OGame formulas as a dependency-free ESM library: building and research costs, production, build times, fleet debris and marketplace rates.",
   "type": "module",
   "main": "src/index.js",

package/src/fleets/distance.js

@@ -6,26 +6,49 @@ function assertCoordinates(coordinates, name) {
   }
 }
 
+// In a donut universe the fleet takes the shorter way round.
+function gap(from, to, size, donut) {
+  const direct = Math.abs(from - to);
+
+  if (!donut) {
+    return direct;
+  }
+
+  if (!Number.isInteger(size) || size <= 0) {
+    throw new Error(`a donut universe needs its size, received ${size}`);
+  }
+
+  return Math.min(direct, size - direct);
+}
+
 /**
  *
  * Return the distance between two coordinates, in OGame distance units
  *
  * The scale is not linear: crossing a galaxy costs far more than crossing a
- * system, which costs far more than moving inside one.
+ * system, which costs far more than moving inside one. Most universes are
+ * donuts: the last galaxy (or system) touches the first, and the fleet takes the
+ * shorter way round.
  * @param {import('../types.js').Coordinates} origin Where the fleet leaves from
  * @param {import('../types.js').Coordinates} target Where it goes
+ * @param {import('../types.js').UniverseShape} [universe] How the universe wraps,
+ *   flat when left out
  * @returns {number} The distance
  */
-function getDistance(origin, target) {
+function getDistance(origin, target, universe = {}) {
   assertCoordinates(origin, 'origin');
   assertCoordinates(target, 'target');
 
+  const {
+    galaxies, systems, donutGalaxy = false, donutSystem = false,
+  } = universe;
+
   if (origin.galaxy !== target.galaxy) {
-    return 20000 * Math.abs(origin.galaxy - target.galaxy);
+    return 20000 * gap(origin.galaxy, target.galaxy, galaxies, donutGalaxy);
   }
 
   if (origin.system !== target.system) {
-    return 2700 + 95 * Math.abs(origin.system - target.system);
+    return 2700 + 95 * gap(origin.system, target.system, systems, donutSystem);
   }
 
   if (origin.position !== target.position) {

package/src/fleets/flight.js

@@ -1,6 +1,9 @@
 import getDistance from './distance.js';
 import { getFleetSpeed, getActiveDrive } from './speed.js';
 
+/** The game stops the fuel discounts here, however many add up. */
+const MAX_FUEL_REDUCTION = 0.9;
+
 function assertSpeedPercent(speedPercent) {
   if (!Number.isFinite(speedPercent) || speedPercent <= 0 || speedPercent > 100) {
     throw new Error(`speedPercent must be between 1 and 100, received ${speedPercent}`);
@@ -11,7 +14,9 @@ function assertSpeedPercent(speedPercent) {
  *
  * Return the one way flight time of a fleet
  *
- * `(10 + 35000 / speedPercent * sqrt(distance * 10 / fleetSpeed)) / universeFleetSpeed`
+ * `(10 + 350000 / speedPercent * sqrt(distance * 10 / fleetSpeed)) / universeFleetSpeed`
+ *
+ * At 100% that is the well known `10 + 3500 * sqrt(distance * 10 / fleetSpeed)`.
  * @param {number} distance The distance to cross, from `getDistance`
  * @param {number} fleetSpeed The speed of the slowest ship, from `getFleetSpeed`
  * @param {number} [speedPercent] The fleet speed slider, 10 to 100 in game
@@ -25,7 +30,7 @@ function getFlightTime(distance, fleetSpeed, speedPercent = 100, universeFleetSp
     throw new Error(`fleetSpeed must be greater than 0, received ${fleetSpeed}`);
   }
 
-  const seconds = 10 + (35000 / speedPercent) * Math.sqrt((distance * 10) / fleetSpeed);
+  const seconds = 10 + (350000 / speedPercent) * Math.sqrt((distance * 10) / fleetSpeed);
 
   return Math.round(seconds / universeFleetSpeed);
 }
@@ -34,31 +39,57 @@ function getFlightTime(distance, fleetSpeed, speedPercent = 100, universeFleetSp
  *
  * Return the deuterium a fleet burns for a one way trip
  *
- * `1 + round(sum(consumption * count) * distance / 35000 * (speedPercent / 100 + 1) ** 2)`
+ * Each ship type is billed on its own, then the bills add up:
+ * `max(1, round(consumption * count * distance / 35000 * (shipSpeedValue / 10 + 1) ** 2))`
+ *
+ * `shipSpeedValue` is the speed the ship really flies at, on the game's 1 to 10
+ * scale: `speedPercent / 10` for the slowest ship, less for the faster ones held
+ * back by it, `speedPercent / 10 * sqrt(fleetSpeed / shipSpeed)`. A faster ship
+ * flying slower than it could burns less than at full throttle.
+ *
+ * `consumption` is the ship's own, after the universe deuterium factor and the
+ * entry's `fuelReduction` (General, life forms), each rounded down and never
+ * below one unit.
  * @param {import('../types.js').FleetEntry[]} fleet The ships taking off
  * @param {number} distance The distance to cross, from `getDistance`
  * @param {number} [speedPercent] The fleet speed slider, 10 to 100 in game
  * @param {import('../types.js').Drives} [drives] Drive levels, needed because a
  *   ship that switched drive also changed its consumption
+ * @param {object} [options] Universe settings
+ * @param {number} [options.deuteriumFactor] The universe deuterium consumption
+ *   factor (`globalDeuteriumSaveFactor` in the API), 1 when left out
  * @returns {number} The fuel needed, in deuterium
  */
-function getFuelConsumption(fleet, distance, speedPercent = 100, drives = {}) {
+function getFuelConsumption(fleet, distance, speedPercent = 100, drives = {}, options = {}) {
   assertSpeedPercent(speedPercent);
 
-  if (!Array.isArray(fleet) || fleet.length === 0) {
-    throw new Error('fleet must be a non empty array of { ship, count }');
+  const { deuteriumFactor = 1 } = options;
+
+  if (!Number.isFinite(deuteriumFactor) || deuteriumFactor <= 0) {
+    throw new Error(`deuteriumFactor must be greater than 0, received ${deuteriumFactor}`);
   }
 
-  const speedFactor = (speedPercent / 100 + 1) ** 2;
+  const fleetSpeed = getFleetSpeed(fleet, drives);
 
-  const consumption = fleet.reduce((total, { ship, count }) => {
-    // A ship that switched drive also changed how much it burns.
-    const { fuelConsumption } = getActiveDrive(ship, drives);
+  const total = fleet
+    .filter(({ count }) => count > 0)
+    .reduce((sum, {
+      ship, count, speedBonus = 0, fuelReduction = 0,
+    }) => {
+      // A ship that switched drive also changed how much it burns.
+      const { speed, fuelConsumption } = getActiveDrive(ship, drives, speedBonus);
+      const speedValue = (speedPercent / 10) * Math.sqrt(fleetSpeed / speed);
+      // Kept in percent until the end: 1 - 0.9 lands just under 0.1 in binary.
+      const saved = Math.round(Math.min(Math.max(fuelReduction, 0), MAX_FUEL_REDUCTION) * 10000);
+      const perShip = Math.max(1, Math.floor(
+        (Math.floor(fuelConsumption * deuteriumFactor) * (10000 - saved)) / 10000,
+      ));
+      const base = Math.max(1, Math.round(perShip * count));
 
-    return total + fuelConsumption * count;
-  }, 0);
+      return sum + Math.max(1, Math.round((base * distance) / 35000 * (speedValue / 10 + 1) ** 2));
+    }, 0);
 
-  return 1 + Math.round((consumption * distance) / 35000 * speedFactor);
+  return Math.max(1, total);
 }
 
 /**
@@ -70,6 +101,9 @@ function getFuelConsumption(fleet, distance, speedPercent = 100, drives = {}) {
  * @param {object} [options] Trip options
  * @param {number} [options.speedPercent] The fleet speed slider, 10 to 100 in game
  * @param {number} [options.universeFleetSpeed] The universe fleet speed
+ * @param {number} [options.deuteriumFactor] The universe deuterium consumption factor
+ * @param {import('../types.js').UniverseShape} [options.universe] How the universe
+ *   wraps, for the distance
  * @param {import('../types.js').Drives} [options.drives] The drive technology levels
  * @param {boolean} [options.roundTrip] Whether to account for the way back too
  * @returns {{
@@ -82,14 +116,17 @@ function getTrip(fleet, origin, target, options = {}) {
   const {
     speedPercent = 100,
     universeFleetSpeed = 1,
+    deuteriumFactor = 1,
+    universe = {},
     drives = {},
     roundTrip = false,
   } = options;
 
-  const distance = getDistance(origin, target);
+  const distance = getDistance(origin, target, universe);
   const fleetSpeed = getFleetSpeed(fleet, drives);
   const oneWay = getFlightTime(distance, fleetSpeed, speedPercent, universeFleetSpeed);
-  const fuel = getFuelConsumption(fleet, distance, speedPercent, drives) * (roundTrip ? 2 : 1);
+  const fuel = getFuelConsumption(fleet, distance, speedPercent, drives, { deuteriumFactor })
+    * (roundTrip ? 2 : 1);
   const cargo = fleet.reduce((total, { ship, count }) => total + ship.cargo * count, 0);
 
   return {
@@ -102,4 +139,6 @@ function getTrip(fleet, origin, target, options = {}) {
   };
 }
 
-export { getFlightTime, getFuelConsumption, getTrip };
+export {
+  getFlightTime, getFuelConsumption, getTrip, MAX_FUEL_REDUCTION,
+};

package/src/fleets/index.js

@@ -1,7 +1,9 @@
 import getDebris from './getDebris.js';
 import getDistance from './distance.js';
 import getShipSpeed, { getActiveDrive, getFleetSpeed } from './speed.js';
-import { getFlightTime, getFuelConsumption, getTrip } from './flight.js';
+import {
+  getFlightTime, getFuelConsumption, getTrip, MAX_FUEL_REDUCTION,
+} from './flight.js';
 import simulateCombat, { DEFAULT_REPAIR_FACTOR, DEFAULT_PLUNDER_RATIO } from './combat.js';
 import { getCombatStatistics, simulateCombats, DEFAULT_RUNS } from './combatStatistics.js';
 import {
@@ -52,6 +54,7 @@ export {
   EXPEDITION_TOP_TIER_BASE,
   MOON_DEBRIS_THRESHOLD,
   MAX_MOON_CHANCE,
+  MAX_FUEL_REDUCTION,
   DEFAULT_REPAIR_FACTOR,
   DEFAULT_PLUNDER_RATIO,
   DEFAULT_RUNS,

package/src/fleets/speed.js

@@ -32,9 +32,15 @@ function driveLevel(drives, drive) {
   return level;
 }
 
-function speedWith(baseSpeed, drive, drives) {
+function assertBonus(bonus) {
+  if (!Number.isFinite(bonus) || bonus < 0) {
+    throw new Error(`speed bonus must be a number >= 0, received ${bonus}`);
+  }
+}
+
+function speedWith(baseSpeed, drive, drives, bonus) {
   // eslint-disable-next-line security/detect-object-injection -- drive is a known key
-  return Math.floor(baseSpeed * (1 + DRIVE_BONUS[drive] * driveLevel(drives, drive)));
+  return Math.floor(baseSpeed * (1 + DRIVE_BONUS[drive] * driveLevel(drives, drive) + bonus));
 }
 
 /**
@@ -44,15 +50,21 @@ function speedWith(baseSpeed, drive, drives) {
  * A few ships switch to a better drive once the matching technology is high
  * enough — a small cargo moves to the impulse drive at Impulse 5. When several
  * drives are available the ship uses whichever ends up fastest.
+ *
+ * `bonus` adds to the drive bonus, as a share of the base speed: the class
+ * bonus that doubles a ship's speed is 1, a 5% life form bonus 0.05.
  * @param {import('../types.js').DestroyableEntry} ship An entry of models/destroyable.js
  * @param {import('../types.js').Drives} [drives] Drive levels
+ * @param {number} [bonus] Extra speed, as a share of the base speed
  * @returns {{drive: string, speed: number, fuelConsumption: number}} The active drive
  */
-function getActiveDrive(ship, drives = {}) {
+function getActiveDrive(ship, drives = {}, bonus = 0) {
   if (!ship || !ship.drive) {
     throw new Error('expected an entry of models/destroyable.js');
   }
 
+  assertBonus(bonus);
+
   const candidates = [
     { drive: ship.drive, speed: ship.speed, fuelConsumption: ship.fuelConsumption },
     ...(ship.driveUpgrades ?? [])
@@ -62,7 +74,7 @@ function getActiveDrive(ship, drives = {}) {
   return candidates
     .map(({ drive, speed, fuelConsumption }) => ({
       drive,
-      speed: speedWith(speed, drive, drives),
+      speed: speedWith(speed, drive, drives, bonus),
       fuelConsumption,
     }))
     .reduce((best, candidate) => (candidate.speed > best.speed ? candidate : best));
@@ -73,15 +85,18 @@ function getActiveDrive(ship, drives = {}) {
  * Return the speed of a ship, drive technologies included
  * @param {import('../types.js').DestroyableEntry} ship An entry of models/destroyable.js
  * @param {import('../types.js').Drives} [drives] Drive levels
+ * @param {number} [bonus] Extra speed, as a share of the base speed (class, life forms)
  * @returns {number} The speed the ship flies at
  */
-function getShipSpeed(ship, drives = {}) {
-  return getActiveDrive(ship, drives).speed;
+function getShipSpeed(ship, drives = {}, bonus = 0) {
+  return getActiveDrive(ship, drives, bonus).speed;
 }
 
 /**
  *
  * Return the speed of a whole fleet, which is the speed of its slowest ship
+ *
+ * Each entry may carry its own `speedBonus` (class, life forms).
  * @param {import('../types.js').FleetEntry[]} fleet The ships taking off
  * @param {import('../types.js').Drives} [drives] Drive levels
  * @returns {number} The fleet speed
@@ -93,7 +108,7 @@ function getFleetSpeed(fleet, drives = {}) {
 
   const speeds = fleet
     .filter(({ count }) => count > 0)
-    .map(({ ship }) => getShipSpeed(ship, drives));
+    .map(({ ship, speedBonus = 0 }) => getShipSpeed(ship, drives, speedBonus));
 
   if (speeds.length === 0) {
     throw new Error('fleet must hold at least one ship with a count above 0');

package/src/types.js

@@ -120,6 +120,19 @@
  * @typedef {object} FleetEntry A group of identical ships
  * @property {DestroyableEntry} ship The ship
  * @property {number} count How many of them
+ * @property {number} [speedBonus] Extra speed, as a share of the ship's base
+ *   speed: 1 for the class bonus that doubles it, 0.05 for a 5% life form bonus,
+ *   summed
+ * @property {number} [fuelReduction] Deuterium saved, as a share: the General's
+ *   class discount plus the life form one, capped at 0.9 like the game does
+ */
+
+/**
+ * @typedef {object} UniverseShape How the universe wraps around
+ * @property {number} [galaxies] The number of galaxies
+ * @property {number} [systems] The number of systems per galaxy
+ * @property {boolean} [donutGalaxy] Whether the last galaxy touches the first
+ * @property {boolean} [donutSystem] Whether the last system touches the first
  */
 
 /**

package/types/fleets/distance.d.ts

@@ -3,11 +3,15 @@
  * Return the distance between two coordinates, in OGame distance units
  *
  * The scale is not linear: crossing a galaxy costs far more than crossing a
- * system, which costs far more than moving inside one.
+ * system, which costs far more than moving inside one. Most universes are
+ * donuts: the last galaxy (or system) touches the first, and the fleet takes the
+ * shorter way round.
  * @param {import('../types.js').Coordinates} origin Where the fleet leaves from
  * @param {import('../types.js').Coordinates} target Where it goes
+ * @param {import('../types.js').UniverseShape} [universe] How the universe wraps,
+ *   flat when left out
  * @returns {number} The distance
  */
-declare function getDistance(origin: import('../types.js').Coordinates, target: import('../types.js').Coordinates): number;
+declare function getDistance(origin: import('../types.js').Coordinates, target: import('../types.js').Coordinates, universe?: import('../types.js').UniverseShape): number;
 export default getDistance;
 //# sourceMappingURL=distance.d.ts.map

package/types/fleets/distance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distance.d.ts","sourceRoot":"","sources":["../../src/fleets/distance.js"],"names":[],"mappings":"AAQA;;;;;;;;;GASG;AACH,iBAAS,WAAW,CAAC,MAAM,EAJhB,OAAO,aAAa,EAAE,WAIN,EAAE,MAAM,EAHxB,OAAO,aAAa,EAAE,WAGE,GAFtB,MAAM,CAoBlB;eAEc,WAAW"}
+{"version":3,"file":"distance.d.ts","sourceRoot":"","sources":["../../src/fleets/distance.js"],"names":[],"mappings":"AAuBA;;;;;;;;;;;;;GAaG;AACH,iBAAS,WAAW,CAAC,MAAM,EANhB,OAAO,aAAa,EAAE,WAMN,EAAE,MAAM,EALxB,OAAO,aAAa,EAAE,WAKE,EAAE,QAAQ,AAJ1C,CAEA,EAFQ,OAAO,aAAa,EAAE,aAIiB,GAFrC,MAAM,CAwBlB;eAEc,WAAW"}

package/types/fleets/flight.d.ts

@@ -1,8 +1,12 @@
+/** The game stops the fuel discounts here, however many add up. */
+declare const MAX_FUEL_REDUCTION = 0.9;
 /**
  *
  * Return the one way flight time of a fleet
  *
- * `(10 + 35000 / speedPercent * sqrt(distance * 10 / fleetSpeed)) / universeFleetSpeed`
+ * `(10 + 350000 / speedPercent * sqrt(distance * 10 / fleetSpeed)) / universeFleetSpeed`
+ *
+ * At 100% that is the well known `10 + 3500 * sqrt(distance * 10 / fleetSpeed)`.
  * @param {number} distance The distance to cross, from `getDistance`
  * @param {number} fleetSpeed The speed of the slowest ship, from `getFleetSpeed`
  * @param {number} [speedPercent] The fleet speed slider, 10 to 100 in game
@@ -14,15 +18,30 @@ declare function getFlightTime(distance: number, fleetSpeed: number, speedPercen
  *
  * Return the deuterium a fleet burns for a one way trip
  *
- * `1 + round(sum(consumption * count) * distance / 35000 * (speedPercent / 100 + 1) ** 2)`
+ * Each ship type is billed on its own, then the bills add up:
+ * `max(1, round(consumption * count * distance / 35000 * (shipSpeedValue / 10 + 1) ** 2))`
+ *
+ * `shipSpeedValue` is the speed the ship really flies at, on the game's 1 to 10
+ * scale: `speedPercent / 10` for the slowest ship, less for the faster ones held
+ * back by it, `speedPercent / 10 * sqrt(fleetSpeed / shipSpeed)`. A faster ship
+ * flying slower than it could burns less than at full throttle.
+ *
+ * `consumption` is the ship's own, after the universe deuterium factor and the
+ * entry's `fuelReduction` (General, life forms), each rounded down and never
+ * below one unit.
  * @param {import('../types.js').FleetEntry[]} fleet The ships taking off
  * @param {number} distance The distance to cross, from `getDistance`
  * @param {number} [speedPercent] The fleet speed slider, 10 to 100 in game
  * @param {import('../types.js').Drives} [drives] Drive levels, needed because a
  *   ship that switched drive also changed its consumption
+ * @param {object} [options] Universe settings
+ * @param {number} [options.deuteriumFactor] The universe deuterium consumption
+ *   factor (`globalDeuteriumSaveFactor` in the API), 1 when left out
  * @returns {number} The fuel needed, in deuterium
  */
-declare function getFuelConsumption(fleet: import('../types.js').FleetEntry[], distance: number, speedPercent?: number, drives?: import('../types.js').Drives): number;
+declare function getFuelConsumption(fleet: import('../types.js').FleetEntry[], distance: number, speedPercent?: number, drives?: import('../types.js').Drives, options?: {
+    deuteriumFactor?: number;
+}): number;
 /**
  *
  * Return everything about a trip: distance, duration, fuel and cargo left
@@ -32,6 +51,9 @@ declare function getFuelConsumption(fleet: import('../types.js').FleetEntry[], d
  * @param {object} [options] Trip options
  * @param {number} [options.speedPercent] The fleet speed slider, 10 to 100 in game
  * @param {number} [options.universeFleetSpeed] The universe fleet speed
+ * @param {number} [options.deuteriumFactor] The universe deuterium consumption factor
+ * @param {import('../types.js').UniverseShape} [options.universe] How the universe
+ *   wraps, for the distance
  * @param {import('../types.js').Drives} [options.drives] The drive technology levels
  * @param {boolean} [options.roundTrip] Whether to account for the way back too
  * @returns {{
@@ -43,6 +65,8 @@ declare function getFuelConsumption(fleet: import('../types.js').FleetEntry[], d
 declare function getTrip(fleet: import('../types.js').FleetEntry[], origin: import('../types.js').Coordinates, target: import('../types.js').Coordinates, options?: {
     speedPercent?: number;
     universeFleetSpeed?: number;
+    deuteriumFactor?: number;
+    universe?: import('../types.js').UniverseShape;
     drives?: import('../types.js').Drives;
     roundTrip?: boolean;
 }): {
@@ -53,5 +77,5 @@ declare function getTrip(fleet: import('../types.js').FleetEntry[], origin: impo
     cargo: number;
     cargoAfterFuel: number;
 };
-export { getFlightTime, getFuelConsumption, getTrip };
+export { getFlightTime, getFuelConsumption, getTrip, MAX_FUEL_REDUCTION, };
 //# sourceMappingURL=flight.d.ts.map

package/types/fleets/flight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flight.d.ts","sourceRoot":"","sources":["../../src/fleets/flight.js"],"names":[],"mappings":"AASA;;;;;;;;;;GAUG;AACH,iBAAS,aAAa,CAAC,QAAQ,EANpB,MAMoB,EAAE,UAAU,EALhC,MAKgC,EAAE,YAAY,AAJtD,CACA,EADQ,MAIoD,EAAE,kBAAkB,AAHhF,CACA,EADQ,MAG4E,GAF1E,MAAM,CAYlB;AAED;;;;;;;;;;;GAWG;AACH,iBAAS,kBAAkB,CAAC,KAAK,EAPtB,OAAO,aAAa,EAAE,UAAU,EAOV,EAAE,QAAQ,EANhC,MAMgC,EAAE,YAAY,AALtD,CACA,EADQ,MAKoD,EAAE,MAAM,AAJpE,CAEA,EAFQ,OAAO,aAAa,EAAE,MAI2C,GAF/D,MAAM,CAmBlB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAS,OAAO,CAAC,KAAK,EAdX,OAAO,aAAa,EAAE,UAAU,EAcrB,EAAE,MAAM,EAbnB,OAAO,aAAa,EAAE,WAaH,EAAE,MAAM,EAZ3B,OAAO,aAAa,EAAE,WAYK,EAAE,OAAO,AAX5C,CAKA,EAJA;IAAyB,YAAY,AAArC,CACA,EADQ,MAAM,CACd;IAAyB,kBAAkB,AAA3C,CACA,EADQ,MAAM,CACd;IAA+C,MAAM,AAArD,CACA,EADQ,OAAO,aAAa,EAAE,MAAM,CACpC;IAA0B,SAAS,AAAnC,CACA,EADQ,OAAO,CACf;CAMiD,GANvC;IACR,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IACrE,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;CACvC,CAyBH;AAED,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"flight.d.ts","sourceRoot":"","sources":["../../src/fleets/flight.js"],"names":[],"mappings":"AAGA,mEAAmE;AACnE,QAAA,MAAM,kBAAkB,MAAM,CAAC;AAQ/B;;;;;;;;;;;;GAYG;AACH,iBAAS,aAAa,CAAC,QAAQ,EANpB,MAMoB,EAAE,UAAU,EALhC,MAKgC,EAAE,YAAY,AAJtD,CACA,EADQ,MAIoD,EAAE,kBAAkB,AAHhF,CACA,EADQ,MAG4E,GAF1E,MAAM,CAYlB;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,iBAAS,kBAAkB,CAAC,KAAK,EAVtB,OAAO,aAAa,EAAE,UAAU,EAUV,EAAE,QAAQ,EAThC,MASgC,EAAE,YAAY,AARtD,CACA,EADQ,MAQoD,EAAE,MAAM,AAPpE,CAEA,EAFQ,OAAO,aAAa,EAAE,MAO2C,EAAE,OAAO,AALlF,CAGA,EAFA;IAAyB,eAAe,AAAxC,CAEA,EAFQ,MAAM,CAEd;CAEuF,GAF7E,MAAM,CAgClB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,iBAAS,OAAO,CAAC,KAAK,EAjBX,OAAO,aAAa,EAAE,UAAU,EAiBrB,EAAE,MAAM,EAhBnB,OAAO,aAAa,EAAE,WAgBH,EAAE,MAAM,EAf3B,OAAO,aAAa,EAAE,WAeK,EAAE,OAAO,AAd5C,CAQA,EAPA;IAAyB,YAAY,AAArC,CACA,EADQ,MAAM,CACd;IAAyB,kBAAkB,AAA3C,CACA,EADQ,MAAM,CACd;IAAyB,eAAe,AAAxC,CACA,EADQ,MAAM,CACd;IAAsD,QAAQ,AAA9D,CAEA,EAFQ,OAAO,aAAa,EAAE,aAAa,CAE3C;IAA+C,MAAM,AAArD,CACA,EADQ,OAAO,aAAa,EAAE,MAAM,CACpC;IAA0B,SAAS,AAAnC,CACA,EADQ,OAAO,CACf;CAMiD,GANvC;IACR,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IACrE,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;CACvC,CA4BH;AAED,OAAO,EACL,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,kBAAkB,GAC/D,CAAC"}

package/types/fleets/index.d.ts

@@ -1,7 +1,7 @@
 import getDebris from './getDebris.js';
 import getDistance from './distance.js';
 import getShipSpeed, { getActiveDrive, getFleetSpeed } from './speed.js';
-import { getFlightTime, getFuelConsumption, getTrip } from './flight.js';
+import { getFlightTime, getFuelConsumption, getTrip, MAX_FUEL_REDUCTION } from './flight.js';
 import simulateCombat, { DEFAULT_REPAIR_FACTOR, DEFAULT_PLUNDER_RATIO } from './combat.js';
 import { getCombatStatistics, simulateCombats, DEFAULT_RUNS } from './combatStatistics.js';
 import { getWaveChance, getMoonbreakWaves, getMoonbreakChance, getMoonbreakLosses, MIN_MOON_SIZE, MAX_MOON_SIZE, WAVES_PER_ATTACKER } from './moonbreak.js';
@@ -28,6 +28,6 @@ declare const Fleets: {
     getCargoCapacity: typeof getCargoCapacity;
     getMoonLockShips: typeof getMoonLockShips;
 };
-export { MIN_MOON_SIZE, MAX_MOON_SIZE, WAVES_PER_ATTACKER, EXPEDITION_FIND_TIERS, EXPEDITION_TOP_TIER_BASE, MOON_DEBRIS_THRESHOLD, MAX_MOON_CHANCE, DEFAULT_REPAIR_FACTOR, DEFAULT_PLUNDER_RATIO, DEFAULT_RUNS, };
+export { MIN_MOON_SIZE, MAX_MOON_SIZE, WAVES_PER_ATTACKER, EXPEDITION_FIND_TIERS, EXPEDITION_TOP_TIER_BASE, MOON_DEBRIS_THRESHOLD, MAX_MOON_CHANCE, MAX_FUEL_REDUCTION, DEFAULT_REPAIR_FACTOR, DEFAULT_PLUNDER_RATIO, DEFAULT_RUNS, };
 export default Fleets;
 //# sourceMappingURL=index.d.ts.map

package/types/fleets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fleets/index.js"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,YAAY,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,cAAc,EAAE,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,gBAAgB,EAChB,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEzF,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;CAoBX,CAAC;AAEF,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,GACb,CAAC;eAEa,MAAM"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fleets/index.js"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,YAAY,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EACL,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,kBAAkB,EAC/D,MAAM,aAAa,CAAC;AACrB,OAAO,cAAc,EAAE,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,gBAAgB,EAChB,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEzF,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;CAoBX,CAAC;AAEF,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,GACb,CAAC;eAEa,MAAM"}

package/types/fleets/speed.d.ts

@@ -24,11 +24,15 @@ declare const DRIVE_RESEARCH: Readonly<{
  * A few ships switch to a better drive once the matching technology is high
  * enough — a small cargo moves to the impulse drive at Impulse 5. When several
  * drives are available the ship uses whichever ends up fastest.
+ *
+ * `bonus` adds to the drive bonus, as a share of the base speed: the class
+ * bonus that doubles a ship's speed is 1, a 5% life form bonus 0.05.
  * @param {import('../types.js').DestroyableEntry} ship An entry of models/destroyable.js
  * @param {import('../types.js').Drives} [drives] Drive levels
+ * @param {number} [bonus] Extra speed, as a share of the base speed
  * @returns {{drive: string, speed: number, fuelConsumption: number}} The active drive
  */
-declare function getActiveDrive(ship: import('../types.js').DestroyableEntry, drives?: import('../types.js').Drives): {
+declare function getActiveDrive(ship: import('../types.js').DestroyableEntry, drives?: import('../types.js').Drives, bonus?: number): {
     drive: string;
     speed: number;
     fuelConsumption: number;
@@ -38,12 +42,15 @@ declare function getActiveDrive(ship: import('../types.js').DestroyableEntry, dr
  * Return the speed of a ship, drive technologies included
  * @param {import('../types.js').DestroyableEntry} ship An entry of models/destroyable.js
  * @param {import('../types.js').Drives} [drives] Drive levels
+ * @param {number} [bonus] Extra speed, as a share of the base speed (class, life forms)
  * @returns {number} The speed the ship flies at
  */
-declare function getShipSpeed(ship: import('../types.js').DestroyableEntry, drives?: import('../types.js').Drives): number;
+declare function getShipSpeed(ship: import('../types.js').DestroyableEntry, drives?: import('../types.js').Drives, bonus?: number): number;
 /**
  *
  * Return the speed of a whole fleet, which is the speed of its slowest ship
+ *
+ * Each entry may carry its own `speedBonus` (class, life forms).
  * @param {import('../types.js').FleetEntry[]} fleet The ships taking off
  * @param {import('../types.js').Drives} [drives] Drive levels
  * @returns {number} The fleet speed

package/types/fleets/speed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"speed.d.ts","sourceRoot":"","sources":["../../src/fleets/speed.js"],"names":[],"mappings":"AAEA,QAAA,MAAQ,MAAM;;;;;CAAe,CAAC;AAE9B,+DAA+D;AAC/D,QAAA,MAAM,WAAW;IACf,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;IACxB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAK;IACrB,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;IACxB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAG;EAChB,CAAC;AAEH,sEAAsE;AACtE,QAAA,MAAM,cAAc;IAClB,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;IACxB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAK;IACrB,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;EACxB,CAAC;AAsBH;;;;;;;;;;GAUG;AACH,iBAAS,cAAc,CAAC,IAAI,EAJjB,OAAO,aAAa,EAAE,gBAIL,EAAE,MAAM,AAHjC,CACA,EADQ,OAAO,aAAa,EAAE,MAGQ,GAF5B;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAC,CAoBnE;AAED;;;;;;GAMG;AACH,iBAAS,YAAY,CAAC,IAAI,EAJf,OAAO,aAAa,EAAE,gBAIP,EAAE,MAAM,AAH/B,CACA,EADQ,OAAO,aAAa,EAAE,MAGM,GAF1B,MAAM,CAIlB;AAED;;;;;;GAMG;AACH,iBAAS,aAAa,CAAC,KAAK,EAJjB,OAAO,aAAa,EAAE,UAAU,EAIf,EAAE,MAAM,AAHjC,CACA,EADQ,OAAO,aAAa,EAAE,MAGQ,GAF5B,MAAM,CAgBlB;AAED,OAAO,EACL,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,GAC3D,CAAC;eACa,YAAY"}
+{"version":3,"file":"speed.d.ts","sourceRoot":"","sources":["../../src/fleets/speed.js"],"names":[],"mappings":"AAEA,QAAA,MAAQ,MAAM;;;;;CAAe,CAAC;AAE9B,+DAA+D;AAC/D,QAAA,MAAM,WAAW;IACf,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;IACxB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAK;IACrB,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;IACxB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAG;EAChB,CAAC;AAEH,sEAAsE;AACtE,QAAA,MAAM,cAAc;IAClB,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;IACxB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAK;IACrB,CAAC,MAAM,CAAC,UAAU,CAAC,MAAK;EACxB,CAAC;AA4BH;;;;;;;;;;;;;;GAcG;AACH,iBAAS,cAAc,CAAC,IAAI,EALjB,OAAO,aAAa,EAAE,gBAKL,EAAE,MAAM,AAJjC,CACA,EADQ,OAAO,aAAa,EAAE,MAIQ,EAAE,KAAK,AAH7C,CACA,EADQ,MAGyC,GAFvC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAC,CAsBnE;AAED;;;;;;;GAOG;AACH,iBAAS,YAAY,CAAC,IAAI,EALf,OAAO,aAAa,EAAE,gBAKP,EAAE,MAAM,AAJ/B,CACA,EADQ,OAAO,aAAa,EAAE,MAIM,EAAE,KAAK,AAH3C,CACA,EADQ,MAGuC,GAFrC,MAAM,CAIlB;AAED;;;;;;;;GAQG;AACH,iBAAS,aAAa,CAAC,KAAK,EAJjB,OAAO,aAAa,EAAE,UAAU,EAIf,EAAE,MAAM,AAHjC,CACA,EADQ,OAAO,aAAa,EAAE,MAGQ,GAF5B,MAAM,CAgBlB;AAED,OAAO,EACL,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,GAC3D,CAAC;eACa,YAAY"}

package/types/types.d.ts

@@ -283,6 +283,35 @@ export type FleetEntry = {
      * How many of them
      */
     count: number;
+    /**
+     * Extra speed, as a share of the ship's base
+     * speed: 1 for the class bonus that doubles it, 0.05 for a 5% life form bonus,
+     * summed
+     */
+    speedBonus?: number;
+    /**
+     * Deuterium saved, as a share: the General's
+     * class discount plus the life form one, capped at 0.9 like the game does
+     */
+    fuelReduction?: number;
+};
+export type UniverseShape = {
+    /**
+     * The number of galaxies
+     */
+    galaxies?: number;
+    /**
+     * The number of systems per galaxy
+     */
+    systems?: number;
+    /**
+     * Whether the last galaxy touches the first
+     */
+    donutGalaxy?: boolean;
+    /**
+     * Whether the last system touches the first
+     */
+    donutSystem?: boolean;
 };
 export type Drives = {
     /**
@@ -426,6 +455,18 @@ export type Resources = {
  * @typedef {object} FleetEntry A group of identical ships
  * @property {DestroyableEntry} ship The ship
  * @property {number} count How many of them
+ * @property {number} [speedBonus] Extra speed, as a share of the ship's base
+ *   speed: 1 for the class bonus that doubles it, 0.05 for a 5% life form bonus,
+ *   summed
+ * @property {number} [fuelReduction] Deuterium saved, as a share: the General's
+ *   class discount plus the life form one, capped at 0.9 like the game does
+ */
+/**
+ * @typedef {object} UniverseShape How the universe wraps around
+ * @property {number} [galaxies] The number of galaxies
+ * @property {number} [systems] The number of systems per galaxy
+ * @property {boolean} [donutGalaxy] Whether the last galaxy touches the first
+ * @property {boolean} [donutSystem] Whether the last system touches the first
  */
 /**
  * @typedef {object} Drives The drive technology levels

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGA,YAAuB,IAAI,GAAjB,IAAI,GAAG,IAAI,CACvB;AAGE,YAAkB,KAAK,GACvB;;;;IAAmB,EAAE,EAAV,MAAM,CACjB;;;;IAAmB,EAAE,EAAV,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,YAAY,GAC9B;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAmB,SAAS,EAAjB,MAAM,CACjB;;;;IAAmB,UAAU,EAAlB,MAAM,CACjB;;;;IAAmB,iBAAiB,EAAzB,MAAM,CACjB;;;;IAAmB,oBAAoB,EAA5B,MAAM,CACjB;;;;IAAmB,UAAU,EAAlB,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,aAAa,GAC/B;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAkB,KAAK,EAAZ,KAAK,CAChB;;;;IAAmB,QAAQ,EAAhB,MAAM,CACjB;;;;IAAmB,MAAM,EAAd,MAAM,CACjB;;;;IAAyB,IAAI,EAAlB,YAAY,CACvB;;;;IAAoB,YAAY,AAAhC,CACA,EADW,MAAM,CACjB;;;;IAAoB,OAAO,AAA3B,CACF,EADa,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,YAAY,GAC9B;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAmB,SAAS,EAAjB,MAAM,CACjB;;;;IAAmB,UAAU,EAAlB,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,aAAa,GAC/B;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAkB,KAAK,EAAZ,KAAK,CAChB;;;;IAAmB,QAAQ,EAAhB,MAAM,CACjB;;;;IAAmB,MAAM,EAAd,MAAM,CACjB;;;;IAAyB,IAAI,EAAlB,YAAY,CACvB;;;;IAAoB,OAAO,AAA3B,CACF,EADa,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,IAAI,GACtB;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAmB,SAAS,EAAjB,MAAM,CACjB;;;;IAAmB,UAAU,EAAlB,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,YAAY,GAC9B;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAmB,SAAS,EAAjB,MAAM,CACjB;;;;IAAmB,UAAU,EAAlB,MAAM,CACjB;;;;IAAmB,iBAAiB,EAAzB,MAAM,CACjB;;;;IAAmB,oBAAoB,EAA5B,MAAM,CACjB;;;;IAAmB,UAAU,EAAlB,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,SAAS,GAC3B;;;;IAAmB,MAAM,EAAd,MAAM,CACjB;;;;IAAmB,IAAI,EAAZ,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,YAAY,GAC9B;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,QAAQ,EAAhB,MAAM,CACjB;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,eAAe,EAAvB,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,gBAAgB,GAClC;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAkB,KAAK,EAAZ,KAAK,CAChB;;;;IAAmB,SAAS,EAAjB,MAAM,CACjB;;;;IAAmB,MAAM,EAAd,MAAM,CACjB;;;;IAAmB,MAAM,EAAd,MAAM,CACjB;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,eAAe,EAAvB,MAAM,CACjB;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,IAAI,EAAZ,MAAM,CACjB;;;;IAAmB,QAAQ,EAAhB,MAAM,CACjB;;;;IAAwB,SAAS,EAAtB,SAAS,EAAE,CACtB;;;;IAAgE,IAAI,EAAzD;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,CAC9D;;;;IAA4B,aAAa,AAAzC,CACF,EADa,YAAY,EAAE,CAC3B;CAAA,CAAA;AAGE,YAAkB,WAAW,GAC7B;;;;IAAmB,MAAM,EAAd,MAAM,CACjB;;;;IAAmB,MAAM,EAAd,MAAM,CACjB;;;;IAAmB,QAAQ,EAAhB,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,UAAU,GAC5B;;;;IAA6B,IAAI,EAAtB,gBAAgB,CAC3B;;;;IAAmB,KAAK,EAAb,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,MAAM,GACxB;;;;IAAoB,UAAU,AAA9B,CACA,EADW,MAAM,CACjB;;;;IAAoB,OAAO,AAA3B,CACA,EADW,MAAM,CACjB;;;;IAAoB,UAAU,AAA9B,CACF,EADa,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,WAAW,GAC7B;;;;IAAoB,OAAO,AAA3B,CACA,EADW,MAAM,CACjB;;;;IAAoB,SAAS,AAA7B,CACA,EADW,MAAM,CACjB;;;;IAAoB,MAAM,AAA1B,CACF,EADa,MAAM,CACnB;CAAA,CAAA;AAGE,YAAkB,SAAS,GAC3B;;;;IAAmB,KAAK,EAAb,MAAM,CACjB;;;;IAAmB,OAAO,EAAf,MAAM,CACjB;;;;IAAmB,SAAS,EAAjB,MAAM,CACnB;CAAA,CAAA;AArID;;GAEG;AAEH;;;;GAIG;AAEH;;;;;;;;;GASG;AAEH;;;;;;;;;GASG;AAEH;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;GASG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AAEH,OAAO,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.js"],"names":[],"mappings":"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"}