Merge branch 'beta' into fix-5032

CREDITS.md

@@ -343,45 +343,47 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 
 # 💻 Development
 
-## Server Owner/Administrator
+## Server Developers
 - pancakes aka patapancakes
 
-## Senior Developers
-- Walker
-- NightKev
-- Moka
-- Temp aka Tempo-anon
-- Madmadness65
-
-## Developers
+## Current and former Development Team members
+- bennybroseph
+- Brain Frog
 - CodeTappert
+- Dakurei
 - flx-sta
-- innerthunder
 - frutescens
+- Greenlamp
+- ImperialSympathizer
+- innerthunder
+- KimJeongSun
+- Madmadness65
+- Moka
+- Navori
+- NightKev
 - Opaquer
+- OrangeRed
+- Sam aka Flashfyre (initial developer, started PokéRogue)
+- sirzento
 - SN34KZ
 - Swain aka torranx
-
-## Junior Developers
-- KimJeongSun
-- ImperialSympathizer
+- Temp aka Tempo-anon
+- Walker
+- Xavion
 
 ## Bug/Issue Managers
-- Snailman
 - Daleks
 - Lily
 - PigeonBar
+- Snailman
 
 ## Other Code Contributors
 - Admiral-Billy
 - allen925
 - arColm
 - Arxalc
 - AsdarDevelops
-- bennybroseph
-- Brain Frog
 - Corrade
-- Dakurei
 - DustinLin
 - ElizaAlex
 - EmberCM
@@ -391,7 +393,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - francktrouillez
 - FredeX
 - geeilhan
-- Greenlamp
 - happinyz
 - hayuna
 - InfernoVulpix
@@ -411,7 +412,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - Neverblade
 - NxKarim
 - okimin
-- OrangeRed
 - PigeonBar
 - PrabbyDD
 - prateau
@@ -421,10 +421,8 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - RedstonewolfX
 - ReneGV
 - rnicar245
-- Sam aka Flashfyre (initial developer, started PokéRogue)
 - schmidtc1
 - shayebeadling
-- sirzento
 - snoozbuster
 - sodaMelon
 - td76099

docs/enemy-ai.md

@@ -80,8 +80,8 @@ As part of the move selection process, the enemy Pokémon must compute a **targe
 A move's UBS and TBS are computed with the respective functions in the `Move` class:
 
 ```ts
-getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer;
-getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer;
+getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number;
+getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number;
 ```
 
 Logically, these functions are very similar – they add up their respective benefit scores from each of the move's attributes (as determined by `attr.getUserBenefitScore`, and `attr.getTargetBenefitScore`, respectively) and return the total benefit score. However, there are two key functional differences in how the UBS and TBS of a move are handled:

package.json

@@ -64,11 +64,5 @@
 	},
 	"engines": {
 		"node": ">=20.0.0"
-	},
-	"imports": {
-		"#enums/*": "./enums/*",
-		"#app": "./src/main.js",
-		"#app/*": "./src/*",
-		"#test/*": "./src/test/*"
 	}
 }

src/account.ts

@@ -11,8 +11,8 @@ export function initLoggedInUser(): void {
   loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false };
 }
 
-export function updateUserInfo(): Promise<[boolean, integer]> {
-  return new Promise<[boolean, integer]>(resolve => {
+export function updateUserInfo(): Promise<[boolean, number]> {
+  return new Promise<[boolean, number]>(resolve => {
     if (bypassLogin) {
       loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false };
       let lastSessionSlot = -1;