Merge branch 'develop' into feature/xtea-loading

# Conflicts: # src/game-engine/config/index.ts
Jameskmonger · Apr 4, 2021 · 8583e3b · 8583e3b
2 parents 24d412d + 6673f45
commit 8583e3b
Show file tree

Hide file tree

Showing 35 changed files with 2,825 additions and 1,618 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -40,9 +40,41 @@ module.exports = {
         "object-curly-spacing": [ "error", "always" ],
         "no-var": "error",
         "prefer-const": "error",
-        "indent": [ "warn", 4, {
-            "SwitchCase": 1
-        } ],
+        "indent": [
+            "error", 4, {
+                "SwitchCase": 1,
+                "FunctionDeclaration": {
+                    "parameters": "off",
+                    "body": 1
+                },
+                "FunctionExpression": {
+                    "parameters": "off",
+                    "body": 1
+                },
+                "offsetTernaryExpressions": true
+            }
+        ],
+        "@typescript-eslint/indent": [
+            "error", 4, {
+                "SwitchCase": 1,
+                "FunctionDeclaration": {
+                    "parameters": "off",
+                    "body": 1
+                },
+                "FunctionExpression": {
+                    "parameters": "off",
+                    "body": 1
+                },
+                "offsetTernaryExpressions": true,
+                "ignoredNodes": [
+                    "ArrowFunctionExpression > BlockStatement",
+                    "NoSubstitutionTemplateLiteral",
+                    "TemplateLiteral",
+                    "TSTypeAliasDeclaration *"
+                ]
+            }
+        ],
+        "@typescript-eslint/explicit-module-boundary-types": "off",
         "@typescript-eslint/no-inferrable-types": 0,
         "@typescript-eslint/no-empty-function": 0,
         "@typescript-eslint/no-explicit-any": 0,

diff --git a/data/config/items/barrows/dharoks.json b/data/config/items/barrows/dharoks.json
@@ -25,32 +25,34 @@
                 "strength": 105
             }
         },
-        "game_id": 4718,
-        "subitems": [
+        "variations": [
             {
-                "suffix": "100",
-                "tradable": false,
-                "game_id": 4886
+                "game_id": 4718,
+                "suffix": "0"
             },
             {
-                "suffix": "75",
                 "tradable": false,
-                "game_id": 4887
+                "game_id": 4886,
+                "suffix": "1"
             },
             {
-                "suffix": "50",
                 "tradable": false,
-                "game_id": 4888
+                "game_id": 4887,
+                "suffix": "2"
             },
             {
-                "suffix": "25",
                 "tradable": false,
-                "game_id": 4889
+                "game_id": 4888,
+                "suffix": "3"
             },
             {
-                "suffix": "0",
                 "tradable": false,
-                "game_id": 4890
+                "game_id": 4889,
+                "suffix": "4"
+            },
+            {
+                "game_id": 4890,
+                "suffix": "5"
             }
         ]
     }