Fixed ts build errors

eps1lon · Apr 19, 2018 · 5f1f5bb · 5f1f5bb
1 parent a6aa76a
commit 5f1f5bb
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 9 deletions.
diff --git a/src/generators/ViewOnlyOrb.ts b/src/generators/ViewOnlyOrb.ts
@@ -2,12 +2,17 @@ import Orb from './Orb';
 import Item from '../containers/item';
 import { Flags } from '../util';
 
+export interface ApplicableFlags extends Flags {
+  not_applicable: boolean;
+}
+export type ApplicableFlag = keyof ApplicableFlags;
+
 export default class ViewOnlyOrb extends Orb<Item> {
   /**
    * not applicable to anything
    * @param item 
    */
-  public applicableTo(item: Item): Flags {
+  public applicableTo(item: Item): ApplicableFlags {
     return {
       not_applicable: true,
     };

diff --git a/src/generators/mod_types/BestiaryAspectMods.ts b/src/generators/mod_types/BestiaryAspectMods.ts
@@ -1,3 +1,4 @@
+import { GeneratorDetails } from '../Generator';
 import ViewOnlyOrb from '../ViewOnlyOrb';
 import Item from '../../containers/item';
 import { Mod } from '../../mods';
@@ -31,11 +32,14 @@ export default class BestiaryAspectMods extends ViewOnlyOrb {
    * @returns true if the mod can only crafted with the Blood Altar from a
    *          Spirit Beast
    */
-  public static isBestiaryAspect(mod: ModProps) {
+  public static isBestiaryAspect(mod: ModProps): boolean {
     return BestiaryAspectMods.ASPECT_MODS.has(mod.id);
   }
 
-  public modsFor(item: Item, whitelist: string[] = []) {
+  public modsFor(
+    item: Item,
+    whitelist: string[] = [],
+  ): Array<GeneratorDetails<Mod>> {
     // omit everything spawnable related. crafting is deterministic
     return super
       .modsFor(item, whitelist.concat('no_matching_tags', 'spawnweight_zero'))

diff --git a/src/generators/mod_types/ElderMods.ts b/src/generators/mod_types/ElderMods.ts
@@ -1,3 +1,4 @@
+import { GeneratorDetails } from '../Generator';
 import ViewOnlyOrb from '../ViewOnlyOrb';
 import Item from '../../containers/item';
 import { Mod } from '../../mods';
@@ -31,7 +32,10 @@ export default class ElderMods extends ViewOnlyOrb {
    * @param item 
    * @param whitelist
    */
-  public modsFor(item: Item, whitelist: string[] = []) {
+  public modsFor(
+    item: Item,
+    whitelist: string[] = [],
+  ): Array<GeneratorDetails<Mod>> {
     return super.modsFor(item.asElderItem(), whitelist);
   }
 }
diff --git a/src/generators/mod_types/MasterSignatureMods.ts b/src/generators/mod_types/MasterSignatureMods.ts
@@ -1,3 +1,4 @@
+import { GeneratorDetails } from '../Generator';
 import ViewOnlyOrb from '../ViewOnlyOrb';
 import Item from '../../containers/item';
 import { Mod } from '../../mods';
@@ -102,7 +103,10 @@ export default class MasterSignatureMods extends ViewOnlyOrb {
    * @param item 
    * @param whitelist
    */
-  public modsFor(item: Item, whitelist: string[] = []) {
+  public modsFor(
+    item: Item,
+    whitelist: string[] = [],
+  ): Array<GeneratorDetails<Mod>> {
     // basically ignore spawnweight
     const whitelist_spawnable = whitelist.concat(
       'no_matching_tags',

diff --git a/src/generators/mod_types/ShapedMods.ts b/src/generators/mod_types/ShapedMods.ts
@@ -1,3 +1,4 @@
+import { GeneratorDetails } from '../Generator';
 import ViewOnlyOrb from '../ViewOnlyOrb';
 import Item from '../../containers/item';
 import { Mod } from '../../mods';
@@ -30,7 +31,10 @@ export default class ShaperMods extends ViewOnlyOrb {
    * 
    * @param item 
    */
-  public modsFor(item: Item, whitelist: string[] = []) {
+  public modsFor(
+    item: Item,
+    whitelist: string[] = [],
+  ): Array<GeneratorDetails<Mod>> {
     return super.modsFor(item.asShaperItem(), whitelist);
   }
 }
diff --git a/src/generators/mod_types/WarbandsMods.ts b/src/generators/mod_types/WarbandsMods.ts
@@ -1,9 +1,10 @@
+import { GeneratorDetails } from '../Generator';
 import ViewOnlyOrb from '../ViewOnlyOrb';
 import Item from '../../containers/item';
 import { Mod } from '../../mods';
 import { ModProps } from '../../schema';
 
-type Faction = 'brinerot' | 'mutewind' | 'redblade' | 'renegade';
+export type Faction = 'brinerot' | 'mutewind' | 'redblade' | 'renegade';
 
 /**
  * Generator for all mods that can appear on items dropped by Warbands
@@ -53,15 +54,18 @@ export default class WarbandsMods extends ViewOnlyOrb {
    * @param mod 
    * @returns true if the mod can spawn on Warbands drops
    */
-  public static isWarbands(mod: ModProps) {
+  public static isWarbands(mod: ModProps): boolean {
     return (
       Object.values(WarbandsMods.FACTION_MODS).find(mods =>
         mods.has(mod.id),
       ) !== undefined
     );
   }
 
-  public modsFor(item: Item, whitelist: string[] = []) {
+  public modsFor(
+    item: Item,
+    whitelist: string[] = [],
+  ): Array<GeneratorDetails<Mod>> {
     const faction = this.factionOf(item);
     if (faction === undefined) {
       return [];