Update data for 2.0 (#380)

d4lfteam · Oct 9, 2024 · 32e220d · 32e220d
1 parent c1b6f74
commit 32e220d
Show file tree

Hide file tree

Showing 33 changed files with 636 additions and 363 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,13 +16,15 @@ jobs:
       - name: Setup env
         uses: ./.github/actions/setup_env
 
-      - name: ruff format
-        shell: powershell
-        run: ruff format --check
+      - name: Setup cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
 
-      - name: ruff lint
+      - name: pre-commit
         shell: powershell
-        run: ruff check
+        run: pre-commit run -a
 
       - name: Pytest
         shell: powershell

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,20 +1,24 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
 #      - id: check-added-large-files # Disabled because git-lfs in GH costs?!
       - id: check-ast
       - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-json
       - id: check-toml
+      - id: check-xml
       - id: check-yaml
       - id: end-of-file-fixer
       - id: fix-byte-order-marker
+      - id: pretty-format-json
+        args: [--autofix, --indent=4, --no-ensure-ascii]
+      - id: requirements-txt-fixer
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.1
+    rev: v0.6.9
     hooks:
       - id: ruff
         args: [--fix]

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,67 +1,70 @@
 {
-    "version": "0.2.0",
     "configurations": [
         {
-            "name": "Python: Current File",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${file}",
             "console": "integratedTerminal",
-            "justMyCode": true,
             "cwd": "${workspaceFolder}",
             "env": {
                 "PYDEVD_DISABLE_FILE_VALIDATION": "1"
-            }
+            },
+            "justMyCode": true,
+            "name": "Python: Current File",
+            "program": "${file}",
+            "request": "launch",
+            "type": "debugpy"
         },
         {
-            "name": "Loot Filter",
-            "type": "debugpy",
-            "request": "launch",
-            "module": "src.main",
             "console": "integratedTerminal",
-            "justMyCode": true,
             "cwd": "${workspaceFolder}",
             "env": {
                 "PYDEVD_DISABLE_FILE_VALIDATION": "1"
-            }
+            },
+            "justMyCode": true,
+            "module": "src.main",
+            "name": "Loot Filter",
+            "request": "launch",
+            "type": "debugpy"
         },
         {
-            "name": "GUI",
-            "type": "debugpy",
-            "request": "launch",
-            "module": "src.gui.qt_gui",
             "console": "integratedTerminal",
-            "justMyCode": true,
             "cwd": "${workspaceFolder}",
             "env": {
                 "PYDEVD_DISABLE_FILE_VALIDATION": "1"
-            }
+            },
+            "justMyCode": true,
+            "module": "src.gui.qt_gui",
+            "name": "GUI",
+            "request": "launch",
+            "type": "debugpy"
         },
         {
-            "name": "Gen assets",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "src/tools/gen_data.py",
-            "args": ["../d4data", "../Diablo4Companion"],
+            "args": [
+                "../d4data",
+                "../Diablo4Companion"
+            ],
             "console": "integratedTerminal",
-            "justMyCode": true,
             "cwd": "${workspaceFolder}",
             "env": {
                 "PYDEVD_DISABLE_FILE_VALIDATION": "1"
-            }
+            },
+            "justMyCode": true,
+            "name": "Gen assets",
+            "program": "src/tools/gen_data.py",
+            "request": "launch",
+            "type": "debugpy"
         },
         {
-            "name": "Build .exe",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "build.py",
             "args": [],
             "console": "integratedTerminal",
-            "justMyCode": true,
             "cwd": "${workspaceFolder}",
             "env": {
                 "PYDEVD_DISABLE_FILE_VALIDATION": "1"
-            }
+            },
+            "justMyCode": true,
+            "name": "Build .exe",
+            "program": "build.py",
+            "request": "launch",
+            "type": "debugpy"
         }
-    ]
+    ],
+    "version": "0.2.0"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,12 +1,12 @@
 {
-	"[python]": {
-		"editor.formatOnSave": true,
-		"editor.defaultFormatter": "charliermarsh.ruff"
-	},
-	"python.testing.pytestArgs": [
-		"tests",
-		"-s"
-	],
-	"python.testing.unittestEnabled": false,
-	"python.testing.pytestEnabled": true
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff",
+        "editor.formatOnSave": true
+    },
+    "python.testing.pytestArgs": [
+        "tests",
+        "-s"
+    ],
+    "python.testing.pytestEnabled": true,
+    "python.testing.unittestEnabled": false
 }
diff --git a/README.md b/README.md
@@ -341,21 +341,21 @@ names in [assets/lang/enUS/sigils.json](assets/lang/enUS/sigils.json).
 ### Uniques
 
 Uniques are defined by the top-level key `Uniques`. It contains a list of parameters that you want to filter for. If no
-Unique filter is provided, uniques will be handled according to the handle_uniques configuration. All mythics are 
+Unique filter is provided, uniques will be handled according to the handle_uniques configuration. All mythics are
 marked as favorite regardless of any filter or configuration.
 
-Uniques can be filtered in two ways. First the aspect and affix for a specific unique can be filtered directly. 
-This is how imported profiles are configured. If only aspect filtering is applied, then all other uniques will be 
+Uniques can be filtered in two ways. First the aspect and affix for a specific unique can be filtered directly.
+This is how imported profiles are configured. If only aspect filtering is applied, then all other uniques will be
 handled according to the handle_uniques property. For aspect filtering, since uniques all have a predefined affix,
 you'll only need to specify the threshold that you want to apply (see examples below).
 
-Additionally, you can filter all uniques based on a generic property like their item power or if they have greater 
-affixes. Once a "global" filter like this is applied then all uniques will have a filter that now applies to them 
+Additionally, you can filter all uniques based on a generic property like their item power or if they have greater
+affixes. Once a "global" filter like this is applied then all uniques will have a filter that now applies to them
 and handle_uniques will be ignored.
 
-In vision mode, uniques show as <filename>.<aspect>. For example myuniques.yaml with fists_of_fate aspect defined 
-would show as myuniques.fists_of_fate. The label for the filename can be configured at the aspect level using the 
-profileAlias flag (see examples). 
+In vision mode, uniques show as <filename>.<aspect>. For example myuniques.yaml with fists_of_fate aspect defined
+would show as myuniques.fists_of_fate. The label for the filename can be configured at the aspect level using the
+profileAlias flag (see examples).
 
 <details><summary>Config Examples</summary>
 
@@ -393,7 +393,7 @@ Uniques:
 ```yaml
 # Take all Tibault's Will pants
 Uniques:
-  - aspect: { name: tibaults_will } 
+  - aspect: { name: tibaults_will }
 ```
 
 ```yaml