diff --git a/src/core/game/GameImpl.ts b/src/core/game/GameImpl.ts index f2d5c78a1..8e86ce007 100644 --- a/src/core/game/GameImpl.ts +++ b/src/core/game/GameImpl.ts @@ -900,14 +900,6 @@ export class GameImpl implements Game { setDefended(ref: TileRef, value: boolean): void { return this._map.setDefended(ref, value); } - - getRelation(ref: TileRef): number { - return this._map.getRelation(ref); - } - - setRelation(ref: TileRef, relation: number): void { - return this._map.setRelation(ref, relation); - } isBorder(ref: TileRef): boolean { return this._map.isBorder(ref); } diff --git a/src/core/game/GameMap.ts b/src/core/game/GameMap.ts index deeddd845..4e0649435 100644 --- a/src/core/game/GameMap.ts +++ b/src/core/game/GameMap.ts @@ -29,8 +29,6 @@ export interface GameMap { setFallout(ref: TileRef, value: boolean): void; isDefended(ref: TileRef): boolean; setDefended(ref: TileRef, value: boolean): void; - getRelation(ref: TileRef): number; - setRelation(ref: TileRef, relation: number): void; isOnEdgeOfMap(ref: TileRef): boolean; isBorder(ref: TileRef): boolean; neighbors(ref: TileRef): TileRef[]; @@ -77,12 +75,6 @@ export class GameMapImpl implements GameMap { private static readonly PLAYER_ID_MASK = 0xfff; private static readonly FALLOUT_BIT = 13; private static readonly DEFENDED_BIT = 12; - private static readonly RELATION_MASK = 0xc000; // bits 14-15 - private static readonly RELATION_SHIFT = 14; - // Relation values (stored in bits 14-15) - private static readonly RELATION_NEUTRAL = 0; - private static readonly RELATION_FRIENDLY = 1; - private static readonly RELATION_EMBARGO = 2; constructor( width: number, @@ -238,21 +230,6 @@ export class GameMapImpl implements GameMap { } } - getRelation(ref: TileRef): number { - return ( - (this.state[ref] & GameMapImpl.RELATION_MASK) >> - GameMapImpl.RELATION_SHIFT - ); - } - - setRelation(ref: TileRef, relation: number): void { - // Clear existing relation bits - this.state[ref] &= ~GameMapImpl.RELATION_MASK; - // Set new relation bits - this.state[ref] |= - (relation << GameMapImpl.RELATION_SHIFT) & GameMapImpl.RELATION_MASK; - } - isOnEdgeOfMap(ref: TileRef): boolean { const x = this.x(ref); const y = this.y(ref); diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts index dfea4ee2e..9e65f0241 100644 --- a/src/core/game/GameView.ts +++ b/src/core/game/GameView.ts @@ -864,14 +864,6 @@ export class GameView implements GameMap { setDefended(ref: TileRef, value: boolean): void { return this._map.setDefended(ref, value); } - - getRelation(ref: TileRef): number { - return this._map.getRelation(ref); - } - - setRelation(ref: TileRef, relation: number): void { - return this._map.setRelation(ref, relation); - } isBorder(ref: TileRef): boolean { return this._map.isBorder(ref); }