move game and map to features

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";

packages/core/src/features/game/interfaces/general-game-store-state.ts

@@ -0,0 +1,5 @@
+import { Turn } from "@core";
+
+export interface GeneralGameStoreState {
+  turn: Turn;
+}

packages/core/src/modules/game/interfaces/index.ts → 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";

packages/core/src/features/game/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "../../../tsconfig-base.json",
+  "include": ["**/*.ts"],
+  "references": [{ "path": "../../core" }, { "path": "../activity" }]
+}

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";

packages/core/src/modules/map/map-service.ts → 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";

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" }
+  ]
+}

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;
+  }
+}

packages/core/src/modules/map/types/game-state.ts → 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" {

packages/core/src/modules/map/types/index.ts → 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";

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" }
+  ]
 }

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",

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,

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 {

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";

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 = {

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 {

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",

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";

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;

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";

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";

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";

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";
 

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";
 

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";

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";

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";
 

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";
 

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";
 

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";
 

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";

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";