Perf/refactor: use StructureTypes, remove territoryBound

src/core/configuration/DefaultConfig.ts

@@ -327,27 +327,23 @@ export class DefaultConfig implements Config {
       case UnitType.TransportShip:
         return {
           cost: () => 0n,
-          territoryBound: false,
         };
       case UnitType.Warship:
         return {
           cost: this.costWrapper(
             (numUnits: number) => Math.min(1_000_000, (numUnits + 1) * 250_000),
             UnitType.Warship,
           ),
-          territoryBound: false,
           maxHealth: 1000,
         };
       case UnitType.Shell:
         return {
           cost: () => 0n,
-          territoryBound: false,
           damage: 250,
         };
       case UnitType.SAMMissile:
         return {
           cost: () => 0n,
-          territoryBound: false,
         };
       case UnitType.Port:
         return {
@@ -357,19 +353,16 @@ export class DefaultConfig implements Config {
             UnitType.Port,
             UnitType.Factory,
           ),
-          territoryBound: true,
           constructionDuration: this.instantBuild() ? 0 : 2 * 10,
           upgradable: true,
         };
       case UnitType.AtomBomb:
         return {
           cost: this.costWrapper(() => 750_000, UnitType.AtomBomb),
-          territoryBound: false,
         };
       case UnitType.HydrogenBomb:
         return {
           cost: this.costWrapper(() => 5_000_000, UnitType.HydrogenBomb),
-          territoryBound: false,
         };
       case UnitType.MIRV:
         return {
@@ -379,22 +372,18 @@ export class DefaultConfig implements Config {
             }
             return 25_000_000n + game.stats().numMirvsLaunched() * 15_000_000n;
           },
-          territoryBound: false,
         };
       case UnitType.MIRVWarhead:
         return {
           cost: () => 0n,
-          territoryBound: false,
         };
       case UnitType.TradeShip:
         return {
           cost: () => 0n,
-          territoryBound: false,
         };
       case UnitType.MissileSilo:
         return {
           cost: this.costWrapper(() => 1_000_000, UnitType.MissileSilo),
-          territoryBound: true,
           constructionDuration: this.instantBuild() ? 0 : 10 * 10,
           upgradable: true,
         };
@@ -404,7 +393,6 @@ export class DefaultConfig implements Config {
             (numUnits: number) => Math.min(250_000, (numUnits + 1) * 50_000),
             UnitType.DefensePost,
           ),
-          territoryBound: true,
           constructionDuration: this.instantBuild() ? 0 : 5 * 10,
         };
       case UnitType.SAMLauncher:
@@ -414,7 +402,6 @@ export class DefaultConfig implements Config {
               Math.min(3_000_000, (numUnits + 1) * 1_500_000),
             UnitType.SAMLauncher,
           ),
-          territoryBound: true,
           constructionDuration: this.instantBuild() ? 0 : 30 * 10,
           upgradable: true,
         };
@@ -425,7 +412,6 @@ export class DefaultConfig implements Config {
               Math.min(1_000_000, Math.pow(2, numUnits) * 125_000),
             UnitType.City,
           ),
-          territoryBound: true,
           constructionDuration: this.instantBuild() ? 0 : 2 * 10,
           upgradable: true,
         };
@@ -437,14 +423,12 @@ export class DefaultConfig implements Config {
             UnitType.Factory,
             UnitType.Port,
           ),
-          territoryBound: true,
           constructionDuration: this.instantBuild() ? 0 : 2 * 10,
           upgradable: true,
         };
       case UnitType.Train:
         return {
           cost: () => 0n,
-          territoryBound: false,
         };
       default:
         assertNever(type);

src/core/execution/PlayerExecution.ts

@@ -1,5 +1,12 @@
 import { Config } from "../configuration/Config";
-import { Cell, Execution, Game, Player, UnitType } from "../game/Game";
+import {
+  Cell,
+  Execution,
+  Game,
+  isStructureType,
+  Player,
+  UnitType,
+} from "../game/Game";
 import { TileRef } from "../game/GameMap";
 import { calculateBoundingBox, getMode, inscribed, simpleHash } from "../Util";
 
@@ -35,7 +42,7 @@ export class PlayerExecution implements Execution {
   tick(ticks: number) {
     this.player.decayRelations();
     for (const u of this.player.units()) {
-      if (!u.info().territoryBound) {
+      if (!isStructureType(u.type())) {
         continue;
       }
 

src/core/game/Game.ts

@@ -227,8 +227,6 @@ export interface PublicGameModifiers {
 
 export interface UnitInfo {
   cost: (game: Game, player: Player) => Gold;
-  // Determines if its owner changes when its tile is conquered.
-  territoryBound: boolean;
   maxHealth?: number;
   damage?: number;
   constructionDuration?: number;

src/core/game/PlayerImpl.ts

@@ -1151,14 +1151,11 @@ export class PlayerImpl implements Player {
     }
     const searchRadius = 15;
     const searchRadiusSquared = searchRadius ** 2;
-    const types = Object.values(UnitType).filter((unitTypeValue) => {
-      return this.mg.config().unitInfo(unitTypeValue).territoryBound;
-    });
 
     const nearbyUnits = this.mg.nearbyUnits(
       tile,
       searchRadius * 2,
-      types,
+      StructureTypes,
       undefined,
       true,
     );