Use the same requirements type everywhere

cjs8487 · Mar 9, 2024 · 11a0eb1 · 11a0eb1
1 parent 1b8bd52
commit 11a0eb1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/logic/Logic.ts b/src/logic/Logic.ts
@@ -5,8 +5,7 @@ import crystalLocations from '../data/crystals.json';
 import { completionRequirementToDungeon, splitLocationName } from './Locations';
 import { RawLogic } from './LogicLoader';
 import { applyTweaks } from './LogicTweaks';
-
-export type Requirements = Record<string, string>;
+import { Requirements } from './Requirements';
 
 export interface Area {
     locations: Record<string, ItemLocation>;

diff --git a/src/logic/LogicParser.ts b/src/logic/LogicParser.ts
@@ -5,7 +5,7 @@ import {
     OptionsCommand,
 } from '../permalink/SettingsTypes';
 import BooleanExpression from './BooleanExpression';
-import { Requirements } from './Logic';
+import { Requirements } from './Requirements';
 
 /**
  * Given a requirement name, a list of macros, and the current settings,

diff --git a/src/logic/LogicTweaks.ts b/src/logic/LogicTweaks.ts
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import goddessCubes from '../data/goddessCubes.json';
 import crystalMacros from '../data/gratitudeCrystalMacros.json';
 import type { Settings } from '../permalink/SettingsTypes';
-import { Requirements } from './Logic';
+import { Requirements } from './Requirements';
 
 export function applyTweaks(requirements: Requirements) {
     tweakTMSAndRequiredDungeons(requirements);