Merge branch 'main' into main

.github/workflows/eslint.yml

@@ -28,4 +28,4 @@ jobs:
         run: npm ci  # Use 'npm ci' to install dependencies
 
       - name: eslint  # Step to run linters
-        uses: icrawl/action-eslint@v1
+        run: npm run eslint-ci

eslint.config.js

@@ -0,0 +1,42 @@
+import tseslint from '@typescript-eslint/eslint-plugin';
+import parser from '@typescript-eslint/parser';
+import imports from 'eslint-plugin-import';
+
+export default [ 
+    {
+        files: ["src/**/*.{ts,tsx,js,jsx}"],
+        ignores: ["dist/*", "build/*", "coverage/*", "public/*", ".github/*", "node_modules/*", ".vscode/*"],
+        languageOptions: {
+            parser: parser
+        },
+        plugins: {
+            imports: imports.configs.recommended,
+            '@typescript-eslint': tseslint
+        },
+        rules: {
+            "eqeqeq": ["error", "always"], // Enforces the use of === and !== instead of == and !=
+            "indent": ["error", 2], // Enforces a 2-space indentation
+            "quotes": ["error", "double"], // Enforces the use of double quotes for strings
+            "no-var": "error", // Disallows the use of var, enforcing let or const instead
+            "prefer-const": "error", // Prefers the use of const for variables that are never reassigned
+            "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
+            "@typescript-eslint/no-unused-vars": [ "error", {
+                "args": "none", // Allows unused function parameters. Useful for functions with specific signatures where not all parameters are always used.
+                "ignoreRestSiblings": true // Allows unused variables that are part of a rest property in object destructuring. Useful for excluding certain properties from an object while using the rest.
+            }],
+            "eol-last": ["error", "always"], // Enforces at least one newline at the end of files
+            "@typescript-eslint/semi": ["error", "always"], // Requires semicolons for TypeScript-specific syntax
+            "semi": "off", // Disables the general semi rule for TypeScript files
+            "no-extra-semi": ["error"], // Disallows unnecessary semicolons for TypeScript-specific syntax
+            "brace-style": "off", // Note: you must disable the base rule as it can report incorrect errors
+            "curly": ["error", "all"], // Enforces the use of curly braces for all control statements
+            "@typescript-eslint/brace-style": ["error", "1tbs"],
+            "no-trailing-spaces": ["error", { // Disallows trailing whitespace at the end of lines
+                "skipBlankLines": false, // Enforces the rule even on blank lines
+                "ignoreComments": false // Enforces the rule on lines containing comments
+            }],
+            "space-before-blocks": ["error", "always"], // Enforces a space before blocks
+            "keyword-spacing": ["error", { "before": true, "after": true }] // Enforces spacing before and after keywords
+        }
+    }
+]

index.css

@@ -146,11 +146,11 @@ body {
   margin-left: 10%;
 }
 
-#touchControls:not([data-ui-mode='STARTER_SELECT']) #apad .apadRectBtnContainer > .apadSqBtn, #touchControls:not([data-ui-mode='STARTER_SELECT']) #apad .apadSqBtnContainer {
+#touchControls:not([data-ui-mode='STARTER_SELECT']) #apad .apadRectBtnContainer > .apadSqBtn, #touchControls:not([data-ui-mode='STARTER_SELECT']) #apad .apadSqBtnContainer > .apadSqBtn {
   display: none;
 }
 
-#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apad #apadStats {
+#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apad .apadBattle {
   display: none;
 }
 

index.html

@@ -72,10 +72,10 @@
 				<div id="apadCycleShiny" class="apadSqBtn apadBtn" data-key="CYCLE_SHINY">
 					<text class="apadLabel apadLabelSmall">R</text>
 				</div>
-				<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="CYCLE_VARIANT">
+				<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="V">
 					<text class="apadLabel apadLabelSmall">V</text>
 				</div>
-				<div id="apadStats" class="apadRectBtn apadBtn" data-key="STATS">
+				<div id="apadStats" class="apadRectBtn apadBtn apadBattle" data-key="STATS">
 					<text class="apadLabel apadLabelSmall">C</text>
 				</div>
 				<div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU">
@@ -95,11 +95,14 @@
 				<div id="apadCycleNature" class="apadSqBtn apadBtn" data-key="CYCLE_NATURE">
 					<text class="apadLabel apadLabelSmall">N</text>
 				</div>
+				<div id="apadInfo" class="apadRectBtn apadBtn apadBattle" data-key="V">
+					<text class="apadLabel apadLabelSmall">V</text>
+				</div>
 			</div>
 		</div>
 	</div>
 	<script type="module" src="./src/main.ts"></script>
-	<script src="./src/touch-controls.js" type="module"></script>
+	<script src="./src/touch-controls.ts" type="module"></script>
 	<script src="./src/debug.js" type="module"></script>
 </body>
 

package.json

@@ -11,10 +11,12 @@
 		"test": "vitest run",
 		"test:cov": "vitest run --coverage",
 		"test:watch": "vitest watch --coverage",
-		"eslint": "eslint --fix ."
+		"eslint": "eslint --fix .",
+		"eslint-ci": "eslint ."
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.3.0",
+		"@types/node": "^20.12.13",
 		"@typescript-eslint/eslint-plugin": "^7.10.0",
 		"@typescript-eslint/parser": "^7.10.0",
 		"@vitest/coverage-istanbul": "^1.4.0",

public/images/pokemon/exp/shiny/945.json

@@ -146,14 +146,14 @@
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 3,
-						"h": 3
+						"w": 66,
+						"h": 55
 					},
 					"frame": {
-						"x": 132,
-						"y": 0,
-						"w": 3,
-						"h": 3
+						"x": 0,
+						"y": 112,
+						"w": 66,
+						"h": 55
 					}
 				},
 				{