diff --git a/resources/images/buildings/Extra/city1.png b/resources/images/buildings/Extra/city1.png new file mode 100644 index 000000000..fa8c8bdca Binary files /dev/null and b/resources/images/buildings/Extra/city1.png differ diff --git a/resources/images/buildings/Extra/city2.png b/resources/images/buildings/Extra/city2.png new file mode 100644 index 000000000..86b81895f Binary files /dev/null and b/resources/images/buildings/Extra/city2.png differ diff --git a/resources/images/buildings/Extra/city3.png b/resources/images/buildings/Extra/city3.png new file mode 100644 index 000000000..b0e970503 Binary files /dev/null and b/resources/images/buildings/Extra/city3.png differ diff --git a/resources/images/buildings/Extra/city4.png b/resources/images/buildings/Extra/city4.png new file mode 100644 index 000000000..b0e970503 Binary files /dev/null and b/resources/images/buildings/Extra/city4.png differ diff --git a/resources/images/buildings/Extra/city5.png b/resources/images/buildings/Extra/city5.png new file mode 100644 index 000000000..247ae53a7 Binary files /dev/null and b/resources/images/buildings/Extra/city5.png differ diff --git a/resources/images/buildings/Extra/fort0.png b/resources/images/buildings/Extra/fort0.png new file mode 100644 index 000000000..5214224df Binary files /dev/null and b/resources/images/buildings/Extra/fort0.png differ diff --git a/resources/images/buildings/Extra/fort1.png b/resources/images/buildings/Extra/fort1.png new file mode 100644 index 000000000..ea1afd494 Binary files /dev/null and b/resources/images/buildings/Extra/fort1.png differ diff --git a/resources/images/buildings/Extra/fort2.png b/resources/images/buildings/Extra/fort2.png new file mode 100644 index 000000000..37d1da28b Binary files /dev/null and b/resources/images/buildings/Extra/fort2.png differ diff --git a/resources/images/buildings/Extra/fort3.png b/resources/images/buildings/Extra/fort3.png new file mode 100644 index 000000000..7a17d93c1 Binary files /dev/null and b/resources/images/buildings/Extra/fort3.png differ diff --git a/resources/images/buildings/Extra/fort4.png b/resources/images/buildings/Extra/fort4.png new file mode 100644 index 000000000..e0e5ef5d1 Binary files /dev/null and b/resources/images/buildings/Extra/fort4.png differ diff --git a/resources/images/buildings/Extra/fort5.png b/resources/images/buildings/Extra/fort5.png new file mode 100644 index 000000000..fbc513313 Binary files /dev/null and b/resources/images/buildings/Extra/fort5.png differ diff --git a/resources/images/buildings/Extra/fort6.png b/resources/images/buildings/Extra/fort6.png new file mode 100644 index 000000000..8d5e37699 Binary files /dev/null and b/resources/images/buildings/Extra/fort6.png differ diff --git a/resources/images/buildings/Extra/fortAlt1.png b/resources/images/buildings/Extra/fortAlt1.png new file mode 100644 index 000000000..1ccdff9d6 Binary files /dev/null and b/resources/images/buildings/Extra/fortAlt1.png differ diff --git a/resources/images/buildings/Extra/port2.png b/resources/images/buildings/Extra/port2.png new file mode 100644 index 000000000..6a951a037 Binary files /dev/null and b/resources/images/buildings/Extra/port2.png differ diff --git a/resources/images/buildings/Extra/port3.png b/resources/images/buildings/Extra/port3.png new file mode 100644 index 000000000..fdaafa97d Binary files /dev/null and b/resources/images/buildings/Extra/port3.png differ diff --git a/resources/images/buildings/Extra/port4.png b/resources/images/buildings/Extra/port4.png new file mode 100644 index 000000000..ea18e9b06 Binary files /dev/null and b/resources/images/buildings/Extra/port4.png differ diff --git a/resources/images/buildings/Extra/port5.png b/resources/images/buildings/Extra/port5.png new file mode 100644 index 000000000..398425683 Binary files /dev/null and b/resources/images/buildings/Extra/port5.png differ diff --git a/resources/images/buildings/Extra/portAlt1.png b/resources/images/buildings/Extra/portAlt1.png new file mode 100644 index 000000000..e8e2bf1b2 Binary files /dev/null and b/resources/images/buildings/Extra/portAlt1.png differ diff --git a/resources/images/buildings/Extra/silo2.png b/resources/images/buildings/Extra/silo2.png new file mode 100644 index 000000000..1625e6555 Binary files /dev/null and b/resources/images/buildings/Extra/silo2.png differ diff --git a/resources/images/buildings/Extra/silo3.png b/resources/images/buildings/Extra/silo3.png new file mode 100644 index 000000000..eb146f2fc Binary files /dev/null and b/resources/images/buildings/Extra/silo3.png differ diff --git a/resources/images/buildings/Extra/silo4.png b/resources/images/buildings/Extra/silo4.png new file mode 100644 index 000000000..fc37c4694 Binary files /dev/null and b/resources/images/buildings/Extra/silo4.png differ diff --git a/resources/images/buildings/Extra/silo5.png b/resources/images/buildings/Extra/silo5.png new file mode 100644 index 000000000..d3d473c62 Binary files /dev/null and b/resources/images/buildings/Extra/silo5.png differ diff --git a/resources/images/buildings/Extra/silo6.png b/resources/images/buildings/Extra/silo6.png new file mode 100644 index 000000000..d18f36410 Binary files /dev/null and b/resources/images/buildings/Extra/silo6.png differ diff --git a/resources/images/buildings/Extra/siloA45.png b/resources/images/buildings/Extra/siloA45.png new file mode 100644 index 000000000..595ea8895 Binary files /dev/null and b/resources/images/buildings/Extra/siloA45.png differ diff --git a/resources/images/buildings/cityAlt1.png b/resources/images/buildings/cityAlt1.png new file mode 100644 index 000000000..c12b3bf94 Binary files /dev/null and b/resources/images/buildings/cityAlt1.png differ diff --git a/resources/images/buildings/fortAlt2.png b/resources/images/buildings/fortAlt2.png new file mode 100644 index 000000000..37cf5d96a Binary files /dev/null and b/resources/images/buildings/fortAlt2.png differ diff --git a/resources/images/buildings/port1.png b/resources/images/buildings/port1.png new file mode 100644 index 000000000..2341ba5a0 Binary files /dev/null and b/resources/images/buildings/port1.png differ diff --git a/resources/images/buildings/silo1.png b/resources/images/buildings/silo1.png new file mode 100644 index 000000000..01019f0f8 Binary files /dev/null and b/resources/images/buildings/silo1.png differ diff --git a/src/client/graphics/layers/StructureLayer.ts b/src/client/graphics/layers/StructureLayer.ts index 1d6ee47df..35206bc73 100644 --- a/src/client/graphics/layers/StructureLayer.ts +++ b/src/client/graphics/layers/StructureLayer.ts @@ -3,10 +3,10 @@ import { Theme } from "../../../core/configuration/Config"; import { Layer } from "./Layer"; import { EventBus } from "../../../core/EventBus"; -import anchorIcon from "../../../../resources/images/AnchorIcon.png"; -import missileSiloIcon from "../../../../resources/images/MissileSiloUnit.png"; -import shieldIcon from "../../../../resources/images/ShieldIcon.png"; -import cityIcon from "../../../../resources/images/CityIcon.png"; +import anchorIcon from "../../../../resources/images/buildings/port1.png"; +import missileSiloIcon from "../../../../resources/images/buildings/silo1.png"; +import shieldIcon from "../../../../resources/images/buildings/fortAlt2.png"; +import cityIcon from "../../../../resources/images/buildings/cityAlt1.png"; import { GameView, UnitView } from "../../../core/game/GameView"; import { Cell, UnitType } from "../../../core/game/Game"; import { GameUpdateType } from "../../../core/game/GameUpdates"; @@ -30,8 +30,13 @@ export class StructureLayer implements Layer { private readonly unitConfigs: Partial> = { [UnitType.Port]: { icon: anchorIcon, - borderRadius: 8, - territoryRadius: 6, + borderRadius: 8.525, + territoryRadius: 6.525, + }, + [UnitType.City]: { + icon: cityIcon, + borderRadius: 8.525, + territoryRadius: 6.525, }, [UnitType.MissileSilo]: { icon: missileSiloIcon, @@ -43,11 +48,6 @@ export class StructureLayer implements Layer { borderRadius: 8, territoryRadius: 6, }, - [UnitType.City]: { - icon: cityIcon, - borderRadius: 8, - territoryRadius: 6, - }, }; constructor( diff --git a/src/core/game/GameMap.ts b/src/core/game/GameMap.ts index b304f2b92..42ce26a4b 100644 --- a/src/core/game/GameMap.ts +++ b/src/core/game/GameMap.ts @@ -321,7 +321,16 @@ export function euclDistFN( root: TileRef, dist: number, ): (gm: GameMap, tile: TileRef) => boolean { - return (gm: GameMap, n: TileRef) => gm.euclideanDist(root, n) <= dist; + return (gm: GameMap, n: TileRef) => { + // shifts the root tile’s coordinates by -0.5 so that its “center” + // center becomes the corner of four pixels rather than the middle of one pixel. + // just makes things based off even pixels instead of odd. Used to use 9x9 icons now 10x10 icons etc... + const rootX = gm.x(root) - 0.5; + const rootY = gm.y(root) - 0.5; + const dx = gm.x(n) - rootX; + const dy = gm.y(n) - rootY; + return Math.sqrt(dx * dx + dy * dy) <= dist; + }; } export function manhattanDistFN(