Merge branch 'main' into LiquidOoze

README.md

@@ -7,8 +7,11 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite
 If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#vote** channel in the discord. 
 
 ### 💻 Environment Setup
-node: 18.3.0
+#### Prerequisites
+- node: 18.3.0
+- npm: [how to install](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
 
+#### Running Locally
 1. Clone the repo and in the root directory run `npm install`
     - *if you run into any errors, reach out in the **#dev-corner** channel in discord*
 2. Run `npm run start:dev` to locally run the project in `localhost:8000`

public/images/items.json

@@ -6058,7 +6058,7 @@
 					}
 				},
 				{
-					"filename": "big_root",
+					"filename": "wide_lens",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6066,16 +6066,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
+						"x": 5,
 						"y": 4,
-						"w": 23,
-						"h": 24
+						"w": 22,
+						"h": 23
 					},
 					"frame": {
 						"x": 66,
 						"y": 301,
-						"w": 23,
-						"h": 24
+						"w": 22,
+						"h": 23
 					}
 				},
 				{
@@ -6093,12 +6093,33 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 89,
+						"x": 88,
 						"y": 302,
 						"w": 24,
 						"h": 23
 					}
 				},
+				{
+					"filename": "big_root",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 112,
+						"y": 303,
+						"w": 23,
+						"h": 24
+					}
+				},
 				{
 					"filename": "catching_charm",
 					"rotated": false,
@@ -6114,7 +6135,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 113,
+						"x": 135,
 						"y": 303,
 						"w": 21,
 						"h": 24
@@ -6135,8 +6156,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 134,
-						"y": 303,
+						"x": 156,
+						"y": 304,
 						"w": 24,
 						"h": 24
 					}
@@ -6156,7 +6177,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 158,
+						"x": 180,
 						"y": 304,
 						"w": 24,
 						"h": 24
@@ -6177,8 +6198,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 182,
-						"y": 304,
+						"x": 204,
+						"y": 305,
 						"w": 24,
 						"h": 24
 					}
@@ -6198,7 +6219,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 206,
+						"x": 228,
 						"y": 305,
 						"w": 24,
 						"h": 24
@@ -6219,8 +6240,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 230,
-						"y": 305,
+						"x": 252,
+						"y": 306,
 						"w": 24,
 						"h": 24
 					}
@@ -6240,8 +6261,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 254,
-						"y": 306,
+						"x": 276,
+						"y": 307,
 						"w": 16,
 						"h": 24
 					}
@@ -6261,7 +6282,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 270,
+						"x": 292,
 						"y": 307,
 						"w": 23,
 						"h": 24
@@ -6282,7 +6303,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 293,
+						"x": 315,
 						"y": 307,
 						"w": 24,
 						"h": 24
@@ -6303,7 +6324,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 317,
+						"x": 339,
 						"y": 307,
 						"w": 24,
 						"h": 24
@@ -6324,28 +6345,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 341,
-						"y": 307,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch_ultra",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 365,
+						"x": 363,
 						"y": 309,
 						"w": 24,
 						"h": 24
@@ -6373,7 +6373,7 @@
 					}
 				},
 				{
-					"filename": "lustrous_globe",
+					"filename": "lucky_punch_ultra",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6393,6 +6393,27 @@
 						"h": 24
 					}
 				},
+				{
+					"filename": "lustrous_globe",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 41,
+						"y": 323,
+						"w": 24,
+						"h": 24
+					}
+				},
 				{
 					"filename": "max_elixir",
 					"rotated": false,
@@ -6408,8 +6429,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 41,
-						"y": 323,
+						"x": 65,
+						"y": 324,
 						"w": 18,
 						"h": 24
 					}
@@ -6429,7 +6450,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 59,
+						"x": 83,
 						"y": 325,
 						"w": 18,
 						"h": 24
@@ -6450,8 +6471,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 77,
-						"y": 325,
+						"x": 101,
+						"y": 327,
 						"w": 17,
 						"h": 24
 					}
@@ -6471,8 +6492,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 94,
-						"y": 325,
+						"x": 118,
+						"y": 327,
 						"w": 18,
 						"h": 24
 					}
@@ -6492,7 +6513,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 112,
+						"x": 136,
 						"y": 327,
 						"w": 16,
 						"h": 24
@@ -6513,8 +6534,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 128,
-						"y": 327,
+						"x": 152,
+						"y": 328,
 						"w": 22,
 						"h": 24
 					}
@@ -6534,7 +6555,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 150,
+						"x": 174,
 						"y": 328,
 						"w": 24,
 						"h": 24
@@ -6555,8 +6576,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 174,
-						"y": 328,
+						"x": 198,
+						"y": 329,
 						"w": 21,
 						"h": 24
 					}
@@ -6576,7 +6597,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 195,
+						"x": 219,
 						"y": 329,
 						"w": 16,
 						"h": 24
@@ -6597,7 +6618,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 211,
+						"x": 235,
 						"y": 329,
 						"w": 16,
 						"h": 24
@@ -6618,8 +6639,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 227,
-						"y": 329,
+						"x": 251,
+						"y": 330,
 						"w": 16,
 						"h": 24
 					}
@@ -6639,8 +6660,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 243,
-						"y": 330,
+						"x": 267,
+						"y": 331,
 						"w": 20,
 						"h": 24
 					}
@@ -6660,7 +6681,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 263,
+						"x": 287,
 						"y": 331,
 						"w": 16,
 						"h": 24
@@ -6681,7 +6702,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 279,
+						"x": 303,
 						"y": 331,
 						"w": 23,
 						"h": 24
@@ -6702,7 +6723,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 302,
+						"x": 326,
 						"y": 331,
 						"w": 24,
 						"h": 24
@@ -6722,52 +6743,10 @@
 						"w": 24,
 						"h": 24
 					},
-					"frame": {
-						"x": 326,
-						"y": 331,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "shiny_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
 					"frame": {
 						"x": 350,
 						"y": 333,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "super_lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 371,
-						"y": 333,
-						"w": 17,
+						"w": 24,
 						"h": 24
 					}
 				},
@@ -6785,10 +6764,52 @@
 						"w": 16,
 						"h": 24
 					},
+					"frame": {
+						"x": 374,
+						"y": 333,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "super_lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
 					"frame": {
 						"x": 0,
 						"y": 346,
-						"w": 16,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "shiny_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 17,
+						"y": 347,
+						"w": 21,
 						"h": 24
 					}
 				},
@@ -6807,7 +6828,7 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 16,
+						"x": 38,
 						"y": 347,
 						"w": 24,
 						"h": 24
@@ -6828,8 +6849,29 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 40,
-						"y": 347,
+						"x": 62,
+						"y": 348,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "zinc",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 78,
+						"y": 349,
 						"w": 16,
 						"h": 24
 					}
@@ -6849,33 +6891,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 56,
-						"y": 349,
+						"x": 94,
+						"y": 351,
 						"w": 24,
 						"h": 24
 					}
 				},
-				{
-					"filename": "zinc",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 80,
-						"y": 349,
-						"w": 16,
-						"h": 24
-					}
-				},
 				{
 					"filename": "black_augurite",
 					"rotated": false,
@@ -6891,7 +6912,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 96,
+						"x": 118,
 						"y": 351,
 						"w": 22,
 						"h": 25
@@ -6912,8 +6933,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 118,
-						"y": 351,
+						"x": 140,
+						"y": 352,
 						"w": 23,
 						"h": 26
 					}
@@ -6933,7 +6954,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 141,
+						"x": 163,
 						"y": 352,
 						"w": 24,
 						"h": 26
@@ -6954,8 +6975,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 165,
-						"y": 352,
+						"x": 187,
+						"y": 353,
 						"w": 27,
 						"h": 26
 					}
@@ -6975,7 +6996,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 192,
+						"x": 214,
 						"y": 353,
 						"w": 32,
 						"h": 27
@@ -6996,8 +7017,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 224,
-						"y": 354,
+						"x": 246,
+						"y": 355,
 						"w": 29,
 						"h": 28
 					}
@@ -7017,7 +7038,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 253,
+						"x": 275,
 						"y": 355,
 						"w": 29,
 						"h": 30
@@ -7038,7 +7059,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 282,
+						"x": 304,
 						"y": 355,
 						"w": 17,
 						"h": 30
@@ -7059,7 +7080,7 @@
 						"h": 31
 					},
 					"frame": {
-						"x": 299,
+						"x": 321,
 						"y": 355,
 						"w": 17,
 						"h": 31
@@ -7080,8 +7101,8 @@
 						"h": 31
 					},
 					"frame": {
-						"x": 316,
-						"y": 355,
+						"x": 338,
+						"y": 357,
 						"w": 17,
 						"h": 31
 					}
@@ -7101,8 +7122,8 @@
 						"h": 31
 					},
 					"frame": {
-						"x": 333,
-						"y": 355,
+						"x": 355,
+						"y": 357,
 						"w": 17,
 						"h": 31
 					}
@@ -7113,6 +7134,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6d684b34b1074ff970152bf5b6c304e3:7c1ae946dd8c91ed5dfd1e2c9a39e1b1:110e074689c9edd2c54833ce2e4d9270$"
+		"smartupdate": "$TexturePacker:SmartUpdate:c16376d506289ffa5c901575af53cc84:c882e2e3aa145f15aae7eaf611efe36c:110e074689c9edd2c54833ce2e4d9270$"
 	}
 }

public/images/pokemon/1024-stellar.json

@@ -4,30 +4,30 @@
 			"image": "1024-stellar.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 96,
-				"h": 96
+				"w": 119,
+				"h": 119
 			},
-			"scale": 0.5,
+			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 96,
-						"h": 96
+						"w": 119,
+						"h": 119
 					},
 					"spriteSourceSize": {
-						"x": 9,
+						"x": 0,
 						"y": 0,
-						"w": 78,
-						"h": 96
+						"w": 115,
+						"h": 119
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 78,
-						"h": 96
+						"w": 115,
+						"h": 119
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c9ee64bda72f2dadb06109338796ccac:1313f1218b7da2c57ad9f290d1323840:c1508f3b01ae78a28a1267fd6caa4f7b$"
+		"smartupdate": "$TexturePacker:SmartUpdate:bc663acf2e62803fce6c3a525dc8dd98:ccd7d0de8a487235cfbd6f372afa931f:c1508f3b01ae78a28a1267fd6caa4f7b$"
 	}
 }

public/images/pokemon/back/1024-stellar.json

@@ -4,30 +4,30 @@
 			"image": "1024-stellar.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 96,
-				"h": 96
+				"w": 119,
+				"h": 119
 			},
-			"scale": 0.333,
+			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 96,
-						"h": 96
+						"w": 119,
+						"h": 119
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 86,
-						"h": 96
+						"w": 115,
+						"h": 119
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 86,
-						"h": 96
+						"w": 115,
+						"h": 119
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ac5e775f77477eeabd029932804747c4:f7a112a87c35dc81cb0da88b7cbb39e8:c1508f3b01ae78a28a1267fd6caa4f7b$"
+		"smartupdate": "$TexturePacker:SmartUpdate:210ba1c2e6e58501571ae226d073a3c5:f12bdf191842f7ec3a4be98a43fb8121:c1508f3b01ae78a28a1267fd6caa4f7b$"
 	}
 }

public/images/pokemon/back/shiny/1024-stellar.json

@@ -4,30 +4,30 @@
 			"image": "1024-stellar.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 96,
-				"h": 96
+				"w": 119,
+				"h": 119
 			},
-			"scale": 0.333,
+			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 96,
-						"h": 96
+						"w": 119,
+						"h": 119
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 86,
-						"h": 96
+						"w": 115,
+						"h": 119
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 86,
-						"h": 96
+						"w": 115,
+						"h": 119
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2bd25bae0fabcfbc35e24bd578a7b4b5:aec60788a0d77f38fb599d721e41a0d6:c1508f3b01ae78a28a1267fd6caa4f7b$"
+		"smartupdate": "$TexturePacker:SmartUpdate:210ba1c2e6e58501571ae226d073a3c5:f12bdf191842f7ec3a4be98a43fb8121:c1508f3b01ae78a28a1267fd6caa4f7b$"
 	}
 }