equipment factories

Greegko · Jun 10, 2023 · 8fb7c5b · 8fb7c5b
1 parent b80ff19
commit 8fb7c5b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.../modules/village/lib/equipment-factory.ts → ...core/src/models/item/equipment-factory.ts b/.../modules/village/lib/equipment-factory.ts → ...core/src/models/item/equipment-factory.ts
@@ -1,7 +1,7 @@
 import { generate } from "shortid";
 
-import { AttackEffectType, DefenseEffectType, EffectType } from "@models";
-import { Armor, ItemType, Shield, Weapon } from "@models";
+import { AttackEffectType, DefenseEffectType, EffectType } from "../effect";
+import { Armor, ItemType, Shield, Weapon } from "./item-types";
 
 export function weaponFactory(): Weapon {
   return {

diff --git a/packages/core/src/models/item/index.ts b/packages/core/src/models/item/index.ts
@@ -2,3 +2,4 @@ export * from "./item";
 export * from "./equipment";
 export * from "./base-item";
 export * from "./item-types";
+export * from "./equipment-factory";
diff --git a/packages/core/src/modules/village/buildings/blacksmith/blacksmith-command-handler.ts b/packages/core/src/modules/village/buildings/blacksmith/blacksmith-command-handler.ts
@@ -4,9 +4,19 @@ import { append, evolve } from "rambda";
 import { commandHandler } from "@core";
 
 import { UnitID, UnitService } from "@features/unit";
-import { AttackEffectType, Effect, EffectType, EquipmentItem, Item, ItemID, ItemType } from "@models";
+import {
+  AttackEffectType,
+  Effect,
+  EffectType,
+  EquipmentItem,
+  Item,
+  ItemID,
+  ItemType,
+  armorFactory,
+  shieldFactory,
+  weaponFactory,
+} from "@models";
 import { StashLocation, VillageStashService } from "@modules/village";
-import { armorFactory, shieldFactory, weaponFactory } from "@modules/village/lib/equipment-factory";
 
 import {
   BlacksmithCommand,

diff --git a/packages/core/src/modules/village/lib/hero-factory.ts b/packages/core/src/modules/village/lib/hero-factory.ts
@@ -1,8 +1,7 @@
 import { sample } from "@lib/sample";
 
 import { Unit, UnitType } from "@features/unit";
-
-import { armorFactory, shieldFactory, weaponFactory } from "./equipment-factory";
+import { armorFactory, shieldFactory, weaponFactory } from "@models";
 
 const lastname = [
   "Emperor",