From b80ff19ad09205b2fe1e931fa8e28cf7c970041a Mon Sep 17 00:00:00 2001 From: Greegko Date: Sat, 10 Jun 2023 20:03:43 +0400 Subject: [PATCH] move game and map to features --- packages/core/src/core/index.ts | 1 + .../game/interfaces/turn.ts => core/interfaces.ts} | 0 .../game/game-command-handler.ts | 0 .../src/{modules => features}/game/game-module.ts | 0 .../src/{modules => features}/game/game-service.ts | 0 .../src/{modules => features}/game/game-store.ts | 0 .../src/{modules => features}/game/general-store.ts | 0 .../core/src/{modules => features}/game/index.ts | 0 .../game/interfaces/game-command.ts | 0 .../game/interfaces/general-game-store-state.ts | 5 +++++ .../{modules => features}/game/interfaces/index.ts | 1 - packages/core/src/features/game/tsconfig.json | 5 +++++ .../src/{modules => features}/game/types/command.ts | 0 .../{modules => features}/game/types/game-state.ts | 0 .../src/{modules => features}/game/types/index.ts | 0 packages/core/src/features/index.ts | 2 ++ .../{modules => features}/map/activites/explore.ts | 0 .../src/{modules => features}/map/activites/index.ts | 0 .../{modules => features}/map/activites/travel.ts | 0 packages/core/src/{modules => features}/map/index.ts | 0 .../{modules => features}/map/interfaces/index.ts | 0 .../map/interfaces/map-activity.ts | 0 .../map/interfaces/map-command.ts | 0 .../map/interfaces/map-event.ts | 0 .../map/interfaces/map-location.ts | 0 .../src/{modules => features}/map/interfaces/map.ts | 0 .../{modules => features}/map/lib/generate-enemy.ts | 0 .../core/src/{modules => features}/map/lib/index.ts | 0 .../{modules => features}/map/map-command-handler.ts | 0 .../{modules => features}/map/map-event-handler.ts | 0 .../{modules => features}/map/map-location-store.ts | 0 .../core/src/{modules => features}/map/map-module.ts | 0 .../src/{modules => features}/map/map-service.ts | 3 +-- .../core/src/{modules => features}/map/map-store.ts | 0 .../{modules => features}/map/party-map-service.ts | 0 packages/core/src/features/map/tsconfig.json | 12 ++++++++++++ .../src/{modules => features}/map/types/command.ts | 0 .../src/{modules => features}/map/types/event.ts | 0 packages/core/src/features/map/types/feature-game.ts | 9 +++++++++ .../{modules => features}/map/types/game-state.ts | 2 ++ .../src/{modules => features}/map/types/index.ts | 1 + packages/core/src/features/tsconfig.json | 9 ++++++++- .../src/features/unit/interfaces/unit-command.ts | 2 +- packages/core/src/game/create-game-instance.ts | 4 ++-- packages/core/src/game/game-controller.ts | 2 +- .../game/interfaces/general-game-store-state.ts | 8 -------- packages/core/src/modules/index.ts | 2 -- .../modules/village/buildings/portal/interface.ts | 2 +- .../buildings/portal/portal-command-handler.ts | 2 +- .../village/buildings/portal/portal-command.ts | 2 +- packages/core/src/modules/village/index.ts | 1 + .../src/modules/village/interfaces/village-state.ts | 2 +- .../src/modules/village/village-command-handler.ts | 4 ++-- .../src/modules/village/village-event-handler.ts | 2 +- packages/core/tests/activities/manager.test.ts | 2 +- packages/core/tests/activities/world/explore.test.ts | 2 +- packages/core/tests/activities/world/travel.test.ts | 2 +- .../commands/buildings/portals/enter-portal.test.ts | 2 +- .../commands/buildings/portals/leave-portal.test.ts | 2 +- packages/core/tests/commands/map/battle.test.ts | 2 +- packages/core/tests/commands/map/explore.test.ts | 2 +- packages/core/tests/commands/map/travel.test.ts | 2 +- .../core/tests/event-handlers/map/new-location.ts | 2 +- packages/core/tests/utils/create-state.ts | 4 ++-- packages/core/tests/utils/factories.ts | 4 ++-- 65 files changed, 71 insertions(+), 38 deletions(-) rename packages/core/src/{modules/game/interfaces/turn.ts => core/interfaces.ts} (100%) rename packages/core/src/{modules => features}/game/game-command-handler.ts (100%) rename packages/core/src/{modules => features}/game/game-module.ts (100%) rename packages/core/src/{modules => features}/game/game-service.ts (100%) rename packages/core/src/{modules => features}/game/game-store.ts (100%) rename packages/core/src/{modules => features}/game/general-store.ts (100%) rename packages/core/src/{modules => features}/game/index.ts (100%) rename packages/core/src/{modules => features}/game/interfaces/game-command.ts (100%) create mode 100644 packages/core/src/features/game/interfaces/general-game-store-state.ts rename packages/core/src/{modules => features}/game/interfaces/index.ts (76%) create mode 100644 packages/core/src/features/game/tsconfig.json rename packages/core/src/{modules => features}/game/types/command.ts (100%) rename packages/core/src/{modules => features}/game/types/game-state.ts (100%) rename packages/core/src/{modules => features}/game/types/index.ts (100%) rename packages/core/src/{modules => features}/map/activites/explore.ts (100%) rename packages/core/src/{modules => features}/map/activites/index.ts (100%) rename packages/core/src/{modules => features}/map/activites/travel.ts (100%) rename packages/core/src/{modules => features}/map/index.ts (100%) rename packages/core/src/{modules => features}/map/interfaces/index.ts (100%) rename packages/core/src/{modules => features}/map/interfaces/map-activity.ts (100%) rename packages/core/src/{modules => features}/map/interfaces/map-command.ts (100%) rename packages/core/src/{modules => features}/map/interfaces/map-event.ts (100%) rename packages/core/src/{modules => features}/map/interfaces/map-location.ts (100%) rename packages/core/src/{modules => features}/map/interfaces/map.ts (100%) rename packages/core/src/{modules => features}/map/lib/generate-enemy.ts (100%) rename packages/core/src/{modules => features}/map/lib/index.ts (100%) rename packages/core/src/{modules => features}/map/map-command-handler.ts (100%) rename packages/core/src/{modules => features}/map/map-event-handler.ts (100%) rename packages/core/src/{modules => features}/map/map-location-store.ts (100%) rename packages/core/src/{modules => features}/map/map-module.ts (100%) rename packages/core/src/{modules => features}/map/map-service.ts (98%) rename packages/core/src/{modules => features}/map/map-store.ts (100%) rename packages/core/src/{modules => features}/map/party-map-service.ts (100%) create mode 100644 packages/core/src/features/map/tsconfig.json rename packages/core/src/{modules => features}/map/types/command.ts (100%) rename packages/core/src/{modules => features}/map/types/event.ts (100%) create mode 100644 packages/core/src/features/map/types/feature-game.ts rename packages/core/src/{modules => features}/map/types/game-state.ts (92%) rename packages/core/src/{modules => features}/map/types/index.ts (71%) delete mode 100644 packages/core/src/modules/game/interfaces/general-game-store-state.ts diff --git a/packages/core/src/core/index.ts b/packages/core/src/core/index.ts index a9b6372..fe3ef28 100644 --- a/packages/core/src/core/index.ts +++ b/packages/core/src/core/index.ts @@ -3,3 +3,4 @@ export * from "./store"; export * from "./command"; export * from "./event"; export * from "./game-state"; +export * from "./interfaces"; diff --git a/packages/core/src/modules/game/interfaces/turn.ts b/packages/core/src/core/interfaces.ts similarity index 100% rename from packages/core/src/modules/game/interfaces/turn.ts rename to packages/core/src/core/interfaces.ts diff --git a/packages/core/src/modules/game/game-command-handler.ts b/packages/core/src/features/game/game-command-handler.ts similarity index 100% rename from packages/core/src/modules/game/game-command-handler.ts rename to packages/core/src/features/game/game-command-handler.ts diff --git a/packages/core/src/modules/game/game-module.ts b/packages/core/src/features/game/game-module.ts similarity index 100% rename from packages/core/src/modules/game/game-module.ts rename to packages/core/src/features/game/game-module.ts diff --git a/packages/core/src/modules/game/game-service.ts b/packages/core/src/features/game/game-service.ts similarity index 100% rename from packages/core/src/modules/game/game-service.ts rename to packages/core/src/features/game/game-service.ts diff --git a/packages/core/src/modules/game/game-store.ts b/packages/core/src/features/game/game-store.ts similarity index 100% rename from packages/core/src/modules/game/game-store.ts rename to packages/core/src/features/game/game-store.ts diff --git a/packages/core/src/modules/game/general-store.ts b/packages/core/src/features/game/general-store.ts similarity index 100% rename from packages/core/src/modules/game/general-store.ts rename to packages/core/src/features/game/general-store.ts diff --git a/packages/core/src/modules/game/index.ts b/packages/core/src/features/game/index.ts similarity index 100% rename from packages/core/src/modules/game/index.ts rename to packages/core/src/features/game/index.ts diff --git a/packages/core/src/modules/game/interfaces/game-command.ts b/packages/core/src/features/game/interfaces/game-command.ts similarity index 100% rename from packages/core/src/modules/game/interfaces/game-command.ts rename to packages/core/src/features/game/interfaces/game-command.ts diff --git a/packages/core/src/features/game/interfaces/general-game-store-state.ts b/packages/core/src/features/game/interfaces/general-game-store-state.ts new file mode 100644 index 0000000..a817f57 --- /dev/null +++ b/packages/core/src/features/game/interfaces/general-game-store-state.ts @@ -0,0 +1,5 @@ +import { Turn } from "@core"; + +export interface GeneralGameStoreState { + turn: Turn; +} diff --git a/packages/core/src/modules/game/interfaces/index.ts b/packages/core/src/features/game/interfaces/index.ts similarity index 76% rename from packages/core/src/modules/game/interfaces/index.ts rename to packages/core/src/features/game/interfaces/index.ts index 45cfd4f..aa0b89c 100644 --- a/packages/core/src/modules/game/interfaces/index.ts +++ b/packages/core/src/features/game/interfaces/index.ts @@ -1,3 +1,2 @@ -export * from "./turn"; export * from "./general-game-store-state"; export * from "./game-command"; diff --git a/packages/core/src/features/game/tsconfig.json b/packages/core/src/features/game/tsconfig.json new file mode 100644 index 0000000..b124d70 --- /dev/null +++ b/packages/core/src/features/game/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../tsconfig-base.json", + "include": ["**/*.ts"], + "references": [{ "path": "../../core" }, { "path": "../activity" }] +} diff --git a/packages/core/src/modules/game/types/command.ts b/packages/core/src/features/game/types/command.ts similarity index 100% rename from packages/core/src/modules/game/types/command.ts rename to packages/core/src/features/game/types/command.ts diff --git a/packages/core/src/modules/game/types/game-state.ts b/packages/core/src/features/game/types/game-state.ts similarity index 100% rename from packages/core/src/modules/game/types/game-state.ts rename to packages/core/src/features/game/types/game-state.ts diff --git a/packages/core/src/modules/game/types/index.ts b/packages/core/src/features/game/types/index.ts similarity index 100% rename from packages/core/src/modules/game/types/index.ts rename to packages/core/src/features/game/types/index.ts diff --git a/packages/core/src/features/index.ts b/packages/core/src/features/index.ts index db6d58a..10100f8 100644 --- a/packages/core/src/features/index.ts +++ b/packages/core/src/features/index.ts @@ -2,3 +2,5 @@ export * from "./unit"; export * from "./battle"; export * from "./party"; export * from "./activity"; +export * from "./map"; +export * from "./game"; diff --git a/packages/core/src/modules/map/activites/explore.ts b/packages/core/src/features/map/activites/explore.ts similarity index 100% rename from packages/core/src/modules/map/activites/explore.ts rename to packages/core/src/features/map/activites/explore.ts diff --git a/packages/core/src/modules/map/activites/index.ts b/packages/core/src/features/map/activites/index.ts similarity index 100% rename from packages/core/src/modules/map/activites/index.ts rename to packages/core/src/features/map/activites/index.ts diff --git a/packages/core/src/modules/map/activites/travel.ts b/packages/core/src/features/map/activites/travel.ts similarity index 100% rename from packages/core/src/modules/map/activites/travel.ts rename to packages/core/src/features/map/activites/travel.ts diff --git a/packages/core/src/modules/map/index.ts b/packages/core/src/features/map/index.ts similarity index 100% rename from packages/core/src/modules/map/index.ts rename to packages/core/src/features/map/index.ts diff --git a/packages/core/src/modules/map/interfaces/index.ts b/packages/core/src/features/map/interfaces/index.ts similarity index 100% rename from packages/core/src/modules/map/interfaces/index.ts rename to packages/core/src/features/map/interfaces/index.ts diff --git a/packages/core/src/modules/map/interfaces/map-activity.ts b/packages/core/src/features/map/interfaces/map-activity.ts similarity index 100% rename from packages/core/src/modules/map/interfaces/map-activity.ts rename to packages/core/src/features/map/interfaces/map-activity.ts diff --git a/packages/core/src/modules/map/interfaces/map-command.ts b/packages/core/src/features/map/interfaces/map-command.ts similarity index 100% rename from packages/core/src/modules/map/interfaces/map-command.ts rename to packages/core/src/features/map/interfaces/map-command.ts diff --git a/packages/core/src/modules/map/interfaces/map-event.ts b/packages/core/src/features/map/interfaces/map-event.ts similarity index 100% rename from packages/core/src/modules/map/interfaces/map-event.ts rename to packages/core/src/features/map/interfaces/map-event.ts diff --git a/packages/core/src/modules/map/interfaces/map-location.ts b/packages/core/src/features/map/interfaces/map-location.ts similarity index 100% rename from packages/core/src/modules/map/interfaces/map-location.ts rename to packages/core/src/features/map/interfaces/map-location.ts diff --git a/packages/core/src/modules/map/interfaces/map.ts b/packages/core/src/features/map/interfaces/map.ts similarity index 100% rename from packages/core/src/modules/map/interfaces/map.ts rename to packages/core/src/features/map/interfaces/map.ts diff --git a/packages/core/src/modules/map/lib/generate-enemy.ts b/packages/core/src/features/map/lib/generate-enemy.ts similarity index 100% rename from packages/core/src/modules/map/lib/generate-enemy.ts rename to packages/core/src/features/map/lib/generate-enemy.ts diff --git a/packages/core/src/modules/map/lib/index.ts b/packages/core/src/features/map/lib/index.ts similarity index 100% rename from packages/core/src/modules/map/lib/index.ts rename to packages/core/src/features/map/lib/index.ts diff --git a/packages/core/src/modules/map/map-command-handler.ts b/packages/core/src/features/map/map-command-handler.ts similarity index 100% rename from packages/core/src/modules/map/map-command-handler.ts rename to packages/core/src/features/map/map-command-handler.ts diff --git a/packages/core/src/modules/map/map-event-handler.ts b/packages/core/src/features/map/map-event-handler.ts similarity index 100% rename from packages/core/src/modules/map/map-event-handler.ts rename to packages/core/src/features/map/map-event-handler.ts diff --git a/packages/core/src/modules/map/map-location-store.ts b/packages/core/src/features/map/map-location-store.ts similarity index 100% rename from packages/core/src/modules/map/map-location-store.ts rename to packages/core/src/features/map/map-location-store.ts diff --git a/packages/core/src/modules/map/map-module.ts b/packages/core/src/features/map/map-module.ts similarity index 100% rename from packages/core/src/modules/map/map-module.ts rename to packages/core/src/features/map/map-module.ts diff --git a/packages/core/src/modules/map/map-service.ts b/packages/core/src/features/map/map-service.ts similarity index 98% rename from packages/core/src/modules/map/map-service.ts rename to packages/core/src/features/map/map-service.ts index b0c1f39..967de0d 100644 --- a/packages/core/src/modules/map/map-service.ts +++ b/packages/core/src/features/map/map-service.ts @@ -1,10 +1,9 @@ import { injectable } from "inversify"; import { append, evolve, find, values } from "rambda"; -import { EventSystem } from "@core"; +import { EventSystem, Turn } from "@core"; import { EffectStatic } from "@models"; -import { Turn } from "@modules/game"; import { Map, MapEvent, MapID, MapLocation, MapLocationID, MapLocationType, MapSize } from "./interfaces"; import { MapLocationStore } from "./map-location-store"; diff --git a/packages/core/src/modules/map/map-store.ts b/packages/core/src/features/map/map-store.ts similarity index 100% rename from packages/core/src/modules/map/map-store.ts rename to packages/core/src/features/map/map-store.ts diff --git a/packages/core/src/modules/map/party-map-service.ts b/packages/core/src/features/map/party-map-service.ts similarity index 100% rename from packages/core/src/modules/map/party-map-service.ts rename to packages/core/src/features/map/party-map-service.ts diff --git a/packages/core/src/features/map/tsconfig.json b/packages/core/src/features/map/tsconfig.json new file mode 100644 index 0000000..1ab7689 --- /dev/null +++ b/packages/core/src/features/map/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig-base.json", + "include": ["**/*.ts"], + "references": [ + { "path": "../../core" }, + { "path": "../../models" }, + { "path": "../activity" }, + { "path": "../party" }, + { "path": "../game" }, + { "path": "../battle" } + ] +} diff --git a/packages/core/src/modules/map/types/command.ts b/packages/core/src/features/map/types/command.ts similarity index 100% rename from packages/core/src/modules/map/types/command.ts rename to packages/core/src/features/map/types/command.ts diff --git a/packages/core/src/modules/map/types/event.ts b/packages/core/src/features/map/types/event.ts similarity index 100% rename from packages/core/src/modules/map/types/event.ts rename to packages/core/src/features/map/types/event.ts diff --git a/packages/core/src/features/map/types/feature-game.ts b/packages/core/src/features/map/types/feature-game.ts new file mode 100644 index 0000000..687544c --- /dev/null +++ b/packages/core/src/features/map/types/feature-game.ts @@ -0,0 +1,9 @@ +import "@features/game"; + +import { MapID } from "../interfaces"; + +declare module "@features/game" { + export interface GeneralGameStoreState { + worldMapId: MapID; + } +} diff --git a/packages/core/src/modules/map/types/game-state.ts b/packages/core/src/features/map/types/game-state.ts similarity index 92% rename from packages/core/src/modules/map/types/game-state.ts rename to packages/core/src/features/map/types/game-state.ts index 7fea6f3..abf8c9f 100644 --- a/packages/core/src/modules/map/types/game-state.ts +++ b/packages/core/src/features/map/types/game-state.ts @@ -1,3 +1,5 @@ +import "@core"; + import { Map, MapID, MapLocation, MapLocationID } from "../interfaces"; declare module "@core" { diff --git a/packages/core/src/modules/map/types/index.ts b/packages/core/src/features/map/types/index.ts similarity index 71% rename from packages/core/src/modules/map/types/index.ts rename to packages/core/src/features/map/types/index.ts index 81009c8..5ed477b 100644 --- a/packages/core/src/modules/map/types/index.ts +++ b/packages/core/src/features/map/types/index.ts @@ -1,3 +1,4 @@ export * from "./game-state"; export * from "./command"; export * from "./event"; +export * from "./feature-game"; diff --git a/packages/core/src/features/tsconfig.json b/packages/core/src/features/tsconfig.json index 99b4f4d..a916c09 100644 --- a/packages/core/src/features/tsconfig.json +++ b/packages/core/src/features/tsconfig.json @@ -1,5 +1,12 @@ { "extends": "../../tsconfig-base.json", "include": ["./index.ts"], - "references": [{ "path": "./unit" }, { "path": "./battle" }, { "path": "./party" }, { "path": "./activity" }] + "references": [ + { "path": "./unit" }, + { "path": "./battle" }, + { "path": "./party" }, + { "path": "./activity" }, + { "path": "./game" }, + { "path": "./map" } + ] } diff --git a/packages/core/src/features/unit/interfaces/unit-command.ts b/packages/core/src/features/unit/interfaces/unit-command.ts index e66d29a..fe4ab15 100644 --- a/packages/core/src/features/unit/interfaces/unit-command.ts +++ b/packages/core/src/features/unit/interfaces/unit-command.ts @@ -1,6 +1,6 @@ import { ItemID } from "@models"; -import { UnitID } from "."; +import { UnitID } from "./unit-base"; export enum UnitCommand { EquipItem = "unit/equip-item", diff --git a/packages/core/src/game/create-game-instance.ts b/packages/core/src/game/create-game-instance.ts index 1cbfb7e..2348df4 100644 --- a/packages/core/src/game/create-game-instance.ts +++ b/packages/core/src/game/create-game-instance.ts @@ -21,13 +21,13 @@ import { GameInstance } from "./interfaces"; export type CreateGameInstance = (config?: GameConfig) => GameInstance; const coreModules = [ - modules.gameModule, - modules.mapModule, modules.villageModule, modules.villageBuildingsModule, modules.debugModule, modules.shopModule, modules.optionsModule, + features.gameModule, + features.mapModule, features.activityModule, features.partyModule, features.battleModule, diff --git a/packages/core/src/game/game-controller.ts b/packages/core/src/game/game-controller.ts index 3f28051..f97f335 100644 --- a/packages/core/src/game/game-controller.ts +++ b/packages/core/src/game/game-controller.ts @@ -2,7 +2,7 @@ import { injectable } from "inversify"; import { Command, CommandSystem, Event, EventSystem, GameState } from "@core"; -import { GameCommand, GameStore } from "@modules/game"; +import { GameCommand, GameStore } from "@features/game"; @injectable() export class GameController { diff --git a/packages/core/src/modules/game/interfaces/general-game-store-state.ts b/packages/core/src/modules/game/interfaces/general-game-store-state.ts deleted file mode 100644 index ccf8895..0000000 --- a/packages/core/src/modules/game/interfaces/general-game-store-state.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { MapID } from "@modules/map"; - -import { Turn } from "./turn"; - -export interface GeneralGameStoreState { - turn: Turn; - worldMapId: MapID; -} diff --git a/packages/core/src/modules/index.ts b/packages/core/src/modules/index.ts index 93881b8..59723a2 100644 --- a/packages/core/src/modules/index.ts +++ b/packages/core/src/modules/index.ts @@ -1,8 +1,6 @@ import "@core-types"; -export * from "./game"; export * from "./village"; -export * from "./map"; export * from "./debug"; export * from "./shop"; export * from "./options"; diff --git a/packages/core/src/modules/village/buildings/portal/interface.ts b/packages/core/src/modules/village/buildings/portal/interface.ts index 5d91806..42b97e3 100644 --- a/packages/core/src/modules/village/buildings/portal/interface.ts +++ b/packages/core/src/modules/village/buildings/portal/interface.ts @@ -1,4 +1,4 @@ -import { MapID } from "@modules/map"; +import { MapID } from "@features/map"; export type PortalID = string; export type PortalState = { diff --git a/packages/core/src/modules/village/buildings/portal/portal-command-handler.ts b/packages/core/src/modules/village/buildings/portal/portal-command-handler.ts index 2b3f812..05886e8 100644 --- a/packages/core/src/modules/village/buildings/portal/portal-command-handler.ts +++ b/packages/core/src/modules/village/buildings/portal/portal-command-handler.ts @@ -3,8 +3,8 @@ import { injectable } from "inversify"; import { commandHandler } from "@core"; import { ActivityManager } from "@features/activity"; +import { MapLocationStore, MapLocationType, MapService, MapSize, PartyMapService } from "@features/map"; import { DungeonKey, EffectStatic } from "@models"; -import { MapLocationStore, MapLocationType, MapService, MapSize, PartyMapService } from "@modules/map"; import { PortalActivity, VillageStashService, VillageStore } from "@modules/village"; import { diff --git a/packages/core/src/modules/village/buildings/portal/portal-command.ts b/packages/core/src/modules/village/buildings/portal/portal-command.ts index 3c4abee..52970b1 100644 --- a/packages/core/src/modules/village/buildings/portal/portal-command.ts +++ b/packages/core/src/modules/village/buildings/portal/portal-command.ts @@ -1,6 +1,6 @@ +import { MapLocationID } from "@features/map"; import { PartyID } from "@features/party"; import { ItemID } from "@models"; -import { MapLocationID } from "@modules/map"; export enum PortalCommand { OpenPortal = "portal/open-portal", diff --git a/packages/core/src/modules/village/index.ts b/packages/core/src/modules/village/index.ts index a972ebe..ea25fc3 100644 --- a/packages/core/src/modules/village/index.ts +++ b/packages/core/src/modules/village/index.ts @@ -1,5 +1,6 @@ // Dependencies import "@features/battle"; +import "@features/map"; export * from "./village-store"; export * from "./village-stash-service"; diff --git a/packages/core/src/modules/village/interfaces/village-state.ts b/packages/core/src/modules/village/interfaces/village-state.ts index cd52aef..2b2df2b 100644 --- a/packages/core/src/modules/village/interfaces/village-state.ts +++ b/packages/core/src/modules/village/interfaces/village-state.ts @@ -1,6 +1,6 @@ +import { MapLocationID } from "@features/map"; import { UnitID } from "@features/unit"; import { ItemStash, ResourceStash } from "@models"; -import { MapLocationID } from "@modules/map"; import { ShopID } from "@modules/shop"; export type VillageStash = ItemStash & ResourceStash; diff --git a/packages/core/src/modules/village/village-command-handler.ts b/packages/core/src/modules/village/village-command-handler.ts index 281d968..2c8b903 100644 --- a/packages/core/src/modules/village/village-command-handler.ts +++ b/packages/core/src/modules/village/village-command-handler.ts @@ -4,11 +4,11 @@ import { append, find, head, values, whereEq } from "rambda"; import { commandHandler } from "@core"; import { ActivityManager, ActivityStore } from "@features/activity"; +import { GameCommand, GeneralGameStore } from "@features/game"; +import { MapLocationType, MapService, MapSize, PartyMapService } from "@features/map"; import { PartyActivityManager, PartyOwner, PartyService } from "@features/party"; import { UnitStore, isAlive } from "@features/unit"; import { Resource } from "@models"; -import { GameCommand, GeneralGameStore } from "@modules/game"; -import { MapLocationType, MapService, MapSize, PartyMapService } from "@modules/map"; import { VillageActivity, VillageBuilding, VillageCommand, VillageCommandHealPartyArgs } from "./interfaces"; import { heroFactory, newBuildingCost, newHeroCost } from "./lib"; diff --git a/packages/core/src/modules/village/village-event-handler.ts b/packages/core/src/modules/village/village-event-handler.ts index 68d0c4d..e227f4e 100644 --- a/packages/core/src/modules/village/village-event-handler.ts +++ b/packages/core/src/modules/village/village-event-handler.ts @@ -4,9 +4,9 @@ import { complement, prop } from "rambda"; import { ModuleConfig, ModuleConfigToken, eventHandler } from "@core"; import { BattleEvent, BattleFinishedActivityArgs } from "@features/battle"; +import { MapEvent, PartyEventArrivedToLocationArgs } from "@features/map"; import { PartyID, PartyService } from "@features/party"; import { isAlive } from "@features/unit"; -import { MapEvent, PartyEventArrivedToLocationArgs } from "@modules/map"; import { VillageConfig } from "./interfaces"; import { calculateLoot, calculateXpGain } from "./lib"; diff --git a/packages/core/tests/activities/manager.test.ts b/packages/core/tests/activities/manager.test.ts index 8e9ca37..4f49a4a 100644 --- a/packages/core/tests/activities/manager.test.ts +++ b/packages/core/tests/activities/manager.test.ts @@ -1,5 +1,5 @@ import { ActivityType } from "@features/activity"; -import { MapActivity } from "@modules/map"; +import { MapActivity } from "@features/map"; import { VillageActivity } from "@modules/village"; import { createState, test } from "../utils"; diff --git a/packages/core/tests/activities/world/explore.test.ts b/packages/core/tests/activities/world/explore.test.ts index 9819133..0abbdc6 100644 --- a/packages/core/tests/activities/world/explore.test.ts +++ b/packages/core/tests/activities/world/explore.test.ts @@ -1,6 +1,6 @@ import { values } from "rambda"; -import { MapActivity, MapLocationType } from "@modules/map"; +import { MapActivity, MapLocationType } from "@features/map"; import { createState, test } from "../../utils"; diff --git a/packages/core/tests/activities/world/travel.test.ts b/packages/core/tests/activities/world/travel.test.ts index 300ebdd..6f4b6ad 100644 --- a/packages/core/tests/activities/world/travel.test.ts +++ b/packages/core/tests/activities/world/travel.test.ts @@ -1,5 +1,5 @@ import { ActivityType } from "@features/activity"; -import { MapActivity } from "@modules/map"; +import { MapActivity } from "@features/map"; import { createState, stashFactory, test } from "../../utils"; diff --git a/packages/core/tests/commands/buildings/portals/enter-portal.test.ts b/packages/core/tests/commands/buildings/portals/enter-portal.test.ts index f4097d8..d3d6a21 100644 --- a/packages/core/tests/commands/buildings/portals/enter-portal.test.ts +++ b/packages/core/tests/commands/buildings/portals/enter-portal.test.ts @@ -1,4 +1,4 @@ -import { MapLocationType } from "@modules/map"; +import { MapLocationType } from "@features/map"; import { PortalCommand } from "@modules/village"; import { createState, test } from "../../../utils"; diff --git a/packages/core/tests/commands/buildings/portals/leave-portal.test.ts b/packages/core/tests/commands/buildings/portals/leave-portal.test.ts index 2fa485b..662e9fc 100644 --- a/packages/core/tests/commands/buildings/portals/leave-portal.test.ts +++ b/packages/core/tests/commands/buildings/portals/leave-portal.test.ts @@ -1,4 +1,4 @@ -import { MapLocationType } from "@modules/map"; +import { MapLocationType } from "@features/map"; import { PortalActivity, PortalCommand } from "@modules/village"; import { createState, test } from "../../../utils"; diff --git a/packages/core/tests/commands/map/battle.test.ts b/packages/core/tests/commands/map/battle.test.ts index 7fbb96c..c76e30c 100644 --- a/packages/core/tests/commands/map/battle.test.ts +++ b/packages/core/tests/commands/map/battle.test.ts @@ -1,6 +1,6 @@ import { BattleActivityType } from "@features/battle"; +import { MapCommand } from "@features/map"; import { PartyOwner } from "@features/party"; -import { MapCommand } from "@modules/map"; import { createState, test } from "../../utils"; diff --git a/packages/core/tests/commands/map/explore.test.ts b/packages/core/tests/commands/map/explore.test.ts index 93e427f..c9aba2f 100644 --- a/packages/core/tests/commands/map/explore.test.ts +++ b/packages/core/tests/commands/map/explore.test.ts @@ -1,4 +1,4 @@ -import { MapActivity, MapCommand } from "@modules/map"; +import { MapActivity, MapCommand } from "@features/map"; import { createState, test } from "../../utils"; diff --git a/packages/core/tests/commands/map/travel.test.ts b/packages/core/tests/commands/map/travel.test.ts index 9eac3a3..ee70f86 100644 --- a/packages/core/tests/commands/map/travel.test.ts +++ b/packages/core/tests/commands/map/travel.test.ts @@ -1,4 +1,4 @@ -import { MapActivity, MapCommand } from "@modules/map"; +import { MapActivity, MapCommand } from "@features/map"; import { createState, test } from "../../utils"; diff --git a/packages/core/tests/event-handlers/map/new-location.ts b/packages/core/tests/event-handlers/map/new-location.ts index 8010db6..0aaca1f 100644 --- a/packages/core/tests/event-handlers/map/new-location.ts +++ b/packages/core/tests/event-handlers/map/new-location.ts @@ -1,5 +1,5 @@ +import { MapEvent } from "@features/map"; import { EffectType, MiscEffectType } from "@models"; -import { MapEvent } from "@modules/map"; import { createState, test } from "../../utils"; diff --git a/packages/core/tests/utils/create-state.ts b/packages/core/tests/utils/create-state.ts index 1af0e19..8b0f5d9 100644 --- a/packages/core/tests/utils/create-state.ts +++ b/packages/core/tests/utils/create-state.ts @@ -2,10 +2,10 @@ import { GameState } from "@core"; import { Activity, ActivityID } from "@features/activity"; import { BattleID, BattleStoreState } from "@features/battle"; +import { GeneralGameStoreState } from "@features/game"; +import { Map, MapID, MapLocation, MapLocationID, MapLocationType } from "@features/map"; import { Party, PartyID } from "@features/party"; import { Unit, UnitID } from "@features/unit"; -import { GeneralGameStoreState } from "@modules/game"; -import { Map, MapID, MapLocation, MapLocationID, MapLocationType } from "@modules/map"; import { OptionID, OptionState } from "@modules/options"; import { ShopID, ShopState } from "@modules/shop"; import { VillageState } from "@modules/village"; diff --git a/packages/core/tests/utils/factories.ts b/packages/core/tests/utils/factories.ts index c8aab9b..015d02f 100644 --- a/packages/core/tests/utils/factories.ts +++ b/packages/core/tests/utils/factories.ts @@ -2,11 +2,11 @@ import { Chance } from "chance"; import { Activity, ActivityType } from "@features/activity"; import { BattleStoreState } from "@features/battle"; +import { GeneralGameStoreState } from "@features/game"; +import { Map, MapLocation, MapLocationType, MapSize } from "@features/map"; import { Party, PartyOwner } from "@features/party"; import { Unit, UnitType } from "@features/unit"; import { Armor, ItemStash, ItemType, ResourceStash, Rune, Shield, Weapon } from "@models"; -import { GeneralGameStoreState } from "@modules/game"; -import { Map, MapLocation, MapLocationType, MapSize } from "@modules/map"; import { OptionState } from "@modules/options"; import { ShopState } from "@modules/shop"; import { VillageState } from "@modules/village";