runecrafting combination runes, and refactoring

src/plugins/skills/runecrafting/altar.ts → src/plugins/skills/runecrafting/runecrafting-altar.ts

@@ -5,20 +5,20 @@ import {
     getEntityIds,
     runes,
     talismans,
-} from '@server/plugins/skills/runecrafting/constants';
+} from '@server/plugins/skills/runecrafting/runecrafting-constants';
 import { itemOnObjectAction, ItemOnObjectActionDetails } from '@server/world/actor/player/action/item-on-object-action';
 import { cache } from '@server/game-server';
 import { objectAction, ObjectActionDetails } from '@server/world/actor/player/action/object-action';
-import { Altar, Rune } from '@server/plugins/skills/runecrafting/types';
+import { RunecraftingAltar, RunecraftingRune } from '@server/plugins/skills/runecrafting/runecrafting-types';
 import { itemIds } from '@server/world/config/item-ids';
 import { Player } from '@server/world/actor/player/player';
 import { Item } from '@server/world/items/item';
 
 
 const enterAltar: itemOnObjectAction = (details: ItemOnObjectActionDetails) => {
     const {player, object, item} = details;
-    const altar: Altar = getEntityByAttr(altars, 'entranceId', object.objectId);
-    const rune: Rune = getEntityByAttr(runes, 'altar.entranceId', object.objectId);
+    const altar: RunecraftingAltar = getEntityByAttr(altars, 'entranceId', object.objectId);
+    const rune: RunecraftingRune = getEntityByAttr(runes, 'altar.entranceId', object.objectId);
 
     if (item.itemId === itemIds.talismans.elemental) {
         if (rune.talisman.id === itemIds.talismans.air
@@ -43,7 +43,7 @@ const enterAltar: itemOnObjectAction = (details: ItemOnObjectActionDetails) => {
     }
 };
 
-function finishEnterAltar(player: Player, item: Item, altar: Altar): void {
+function finishEnterAltar(player: Player, item: Item, altar: RunecraftingAltar): void {
     const talisman = cache.itemDefinitions.get(item.itemId);
     player.sendMessage(`You hold the ${talisman.name} towards the mysterious ruins.`);
     player.sendMessage(`You feel a powerful force take hold of you..`);

src/plugins/skills/runecrafting/constants.ts → src/plugins/skills/runecrafting/runecrafting-constants.ts

@@ -14,10 +14,10 @@
  */
 
 import { itemIds } from '@server/world/config/item-ids';
-import { Altar, CombinationRune, Rune, Talisman, Tiara } from '@server/plugins/skills/runecrafting/types';
+import { RunecraftingAltar, RunecraftingCombinationRune, RunecraftingRune, RunecraftingTalisman, RunecraftingTiara } from '@server/plugins/skills/runecrafting/runecrafting-types';
 import { Position } from '@server/world/position';
 
-export const tiaras: Map<string, Tiara> = new Map<string, Tiara>([
+export const tiaras: Map<string, RunecraftingTiara> = new Map<string, RunecraftingTiara>([
     ['air', {
         id: itemIds.tiaras.air,
         config: 1,
@@ -97,7 +97,7 @@ export const tiaras: Map<string, Tiara> = new Map<string, Tiara>([
     }],
 ]);
 
-export const talismans: Map<string, Talisman> = new Map<string, Talisman>([
+export const talismans: Map<string, RunecraftingTalisman> = new Map<string, RunecraftingTalisman>([
     ['air', {id: itemIds.talismans.air}],
     ['mind', {id: itemIds.talismans.mind}],
     ['water', {id: itemIds.talismans.water}],
@@ -112,7 +112,7 @@ export const talismans: Map<string, Talisman> = new Map<string, Talisman>([
     ['elemental', {id: itemIds.talismans.elemental}],
 ]);
 
-export const altars: Map<string, Altar> = new Map<string, Altar>([
+export const altars: Map<string, RunecraftingAltar> = new Map<string, RunecraftingAltar>([
     ['air', {
         entranceId: 2452,
         craftingId: 2478,
@@ -192,7 +192,7 @@ export const altars: Map<string, Altar> = new Map<string, Altar>([
     }],
 ]);
 
-export const runes: Map<string, Rune> = new Map<string, Rune>([
+export const runes: Map<string, RunecraftingRune> = new Map<string, RunecraftingRune>([
     ['air', {
         id: 556,
         xp: 5.0,
@@ -297,7 +297,7 @@ export const runes: Map<string, Rune> = new Map<string, Rune>([
 
 
 
-export const combinationRunes: Map<string, CombinationRune> = new Map<string, CombinationRune>([
+export const combinationRunes: Map<string, RunecraftingCombinationRune> = new Map<string, RunecraftingCombinationRune>([
     ['mist', {
         altar: [altars.get('air'), altars.get('water')],
         id: 4695,

src/plugins/skills/runecrafting/runecrafting-plugin.ts → src/plugins/skills/runecrafting/runecrafting-crafting.ts

@@ -7,9 +7,9 @@ import {
     getEntityByAttr,
     getEntityIds, runeMultiplier,
     runes,
-} from '@server/plugins/skills/runecrafting/constants';
+} from '@server/plugins/skills/runecrafting/runecrafting-constants';
 import { itemOnObjectAction, ItemOnObjectActionDetails } from '@server/world/actor/player/action/item-on-object-action';
-import { CombinationRune } from '@server/plugins/skills/runecrafting/types';
+import { RunecraftingCombinationRune } from '@server/plugins/skills/runecrafting/runecrafting-types';
 import { randomBetween } from '@server/util/num';
 import { itemIds } from '@server/world/config/item-ids';
 import { cache } from '@server/game-server';
@@ -44,7 +44,7 @@ const craftRune: objectAction = (details: ObjectActionDetails) => {
     player.sendMessage(`You do not have any rune essence to bind.`);
 };
 
-function getCombinationRuneByAltar(itemId: number, objectId: number): CombinationRune | undefined {
+function getCombinationRuneByAltar(itemId: number, objectId: number): RunecraftingCombinationRune | undefined {
     let rune = undefined;
     for (const combinationRune of combinationRunes.values()) {
         const altarIndex = combinationRune.altar.findIndex((altar) => altar.craftingId === objectId);

src/plugins/skills/runecrafting/tiara.ts → src/plugins/skills/runecrafting/runecrafting-tiara.ts

@@ -1,5 +1,5 @@
 import { ActionType, RunePlugin } from '@server/plugins/plugin';
-import { getEntityByAttr, getEntityIds, tiaras } from '@server/plugins/skills/runecrafting/constants';
+import { getEntityByAttr, getEntityIds, tiaras } from '@server/plugins/skills/runecrafting/runecrafting-constants';
 import { equipAction } from '@server/world/actor/player/action/equip-action';
 
 

src/plugins/skills/runecrafting/runecrafting-types.ts

@@ -0,0 +1,46 @@
+import { Item } from '@server/world/items/item';
+import { Position } from '@server/world/position';
+import { altars, talismans, tiaras } from '@server/plugins/skills/runecrafting/runecrafting-constants';
+
+export interface RunecraftingRecipe {
+    ingredients: Item[] | number[];
+}
+
+export interface RunecraftingTiara {
+    id: number;
+    config: number;
+    recipe: RunecraftingRecipe;
+    level: number;
+    xp: number;
+}
+
+export interface RunecraftingTalisman {
+    id: number;
+}
+
+export interface RunecraftingAltar {
+    entranceId: number;
+    craftingId: number;
+    portalId: number;
+    entrance: Position;
+    exit: Position;
+}
+
+export interface RunecraftingRune {
+    id: number;
+    xp: number;
+    level: number;
+    essence: number[];
+    altar: RunecraftingAltar;
+    tiara: RunecraftingTiara;
+    talisman: RunecraftingTalisman;
+}
+export interface RunecraftingCombinationRune {
+    id: number;
+    xp: [number, number];
+    level: number;
+    altar: [RunecraftingAltar, RunecraftingAltar];
+    tiara: [RunecraftingTiara, RunecraftingTiara];
+    talisman: [RunecraftingTalisman, RunecraftingTalisman];
+    runes: [RunecraftingRune, RunecraftingRune];
+}