From 11a0eb16d70b2ca88989e91bafde3f3df346c838 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sat, 9 Mar 2024 17:14:18 +0100
Subject: [PATCH] Use the same requirements type everywhere

---
 src/logic/Logic.ts       | 3 +--
 src/logic/LogicParser.ts | 2 +-
 src/logic/LogicTweaks.ts | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/logic/Logic.ts b/src/logic/Logic.ts
index 6cdb6efb..ed1cd8e9 100644
--- 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
index b0debd5e..d662e978 100644
--- 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
index 7213b982..ebb4b62b 100644
--- 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);