a few more refactors

cursorweb · Jan 14, 2024 · cfbb865 · cfbb865
1 parent b8233b4
commit cfbb865
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 12 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -26,20 +26,11 @@ module.exports = {
     "no-else-return": 2,
     "no-extra-bind": 2,
     "no-multi-spaces": 2,
-    "no-useless-return": 2,
     "yoda": 2,
-    "no-undef-init": 2,
     "prefer-const": 2,
-    "prefer-template": 2,
-    "prefer-arrow-callback": 2,
     "no-var": 2,
-    "no-useless-constructor": 2,
-    "spaced-comment": 2,
     "switch-colon-spacing": 2,
     "quote-props": [2, "consistent-as-needed"],
-    "prefer-exponentiation-operator": 2,
-    "no-unneeded-ternary": 2,
-    "no-lonely-if": 2,
     "key-spacing": 2,
     "func-call-spacing": 2,
     "keyword-spacing": 2,
@@ -68,7 +59,7 @@ module.exports = {
     "no-shadow": 0,
     "@typescript-eslint/no-unused-vars": [2, { argsIgnorePattern: "^_" }],
     "@typescript-eslint/no-explicit-any": 0,
-    "@typescript-eslint/no-non-null-assertion": 1,
+    "@typescript-eslint/no-non-null-assertion": 0,
     "@typescript-eslint/no-empty-function": 0,
     "@typescript-eslint/explicit-module-boundary-types": 0,
     "@typescript-eslint/no-namespace": 0

diff --git a/src/util/data/boosts/boosts-shop.ts → src/data/boosts/boosts-shop.ts b/src/util/data/boosts/boosts-shop.ts → src/data/boosts/boosts-shop.ts
diff --git a/src/util/data/boosts/boosts.ts → src/data/boosts/boosts.ts b/src/util/data/boosts/boosts.ts → src/data/boosts/boosts.ts
diff --git a/src/util/data/boosts/luckboost.ts → src/data/boosts/luckboost.ts b/src/util/data/boosts/luckboost.ts → src/data/boosts/luckboost.ts
diff --git a/src/util/data/boosts/spells.ts → src/data/boosts/spells.ts b/src/util/data/boosts/spells.ts → src/data/boosts/spells.ts
diff --git a/src/util/data/events.ts → src/data/events.ts b/src/util/data/events.ts → src/data/events.ts
diff --git a/src/util/data/craft.ts → src/data/items/craft.ts b/src/util/data/craft.ts → src/data/items/craft.ts
diff --git a/src/util/data/drops.ts → src/data/items/drops.ts b/src/util/data/drops.ts → src/data/items/drops.ts
@@ -2,7 +2,7 @@ import * as Discord from "discord.js";
 import Big from "bignumber.js";
 import { brackets, pluralb, commanum, hidden, Database } from "../../global.js";
 import { items } from "./item.js";
-import { ActionType, checkQuest } from "./quests.js";
+import { ActionType, checkQuest } from "../quests.js";
 
 const code: DropItem[] = [{
   chance: () => Math.random() < 0.1,

diff --git a/src/util/data/item.ts → src/data/items/item.ts b/src/util/data/item.ts → src/data/items/item.ts
diff --git a/src/util/data/open-item.ts → src/data/items/open-item.ts b/src/util/data/open-item.ts → src/data/items/open-item.ts
diff --git a/src/util/data/quests.ts → src/data/quests.ts b/src/util/data/quests.ts → src/data/quests.ts
@@ -1,7 +1,7 @@
 import Big from "bignumber.js";
 import { APIEmbedField } from "discord.js";
 import { Database, brackets, addMs, random, progress } from "../../global.js";
-import { ItemEnum } from "./item.js";
+import { ItemEnum } from "./items/item.js";
 
 export const qDiff = ["easy", "medium", "hard"];
 

diff --git a/src/util/data/shop.ts → src/data/shop.ts b/src/util/data/shop.ts → src/data/shop.ts
diff --git a/src/util/data/social-media.ts → src/data/social-media.ts b/src/util/data/social-media.ts → src/data/social-media.ts
diff --git a/src/util/data/trivia.ts → src/data/trivia.ts b/src/util/data/trivia.ts → src/data/trivia.ts
diff --git a/src/util/index.ts b/src/util/index.ts
@@ -0,0 +1 @@
+// export all