December 19, 2023: Merge with PS

scoopapa · Dec 19, 2023 · 7b5d9c4 · 7b5d9c4
2 parents 9d6524e + 4c5c6d6
commit 7b5d9c4
Show file tree

Hide file tree

Showing 5 changed files with 574 additions and 521 deletions.
diff --git a/build-tools/build-indexes b/build-tools/build-indexes
@@ -1142,7 +1142,7 @@ function buildTeambuilderTables() {
 			}
 		}
 	}
-	const sliceTiers = ["OU", "AG", "Uber", "UU", "(UU)", "RU", "NU", "(NU)", "PU", "(PU)", "NFE", "LC", "DOU", "DUU", "(DUU)", "New", "Legal", "Regular", "Restricted Legendary", "CAP LC"];
+	const sliceTiers = ["OU", "AG", "Uber", "UU", "(UU)", "RU", "NU", "(NU)", "PU", "(PU)", "ZUBL", "ZU", "NFE", "LC", "DOU", "DUU", "(DUU)", "New", "Legal", "Regular", "Restricted Legendary", "CAP LC"];
 	function buildTiers(modid, tierTable, tiers, customTiers, formatSlices, tierOrder) {
 		for (const tier of tierOrder) {
 			if (ModConfig[modid].excludeStandardTiers) break;

diff --git a/play.pokemonshowdown.com/js/client-chat.js b/play.pokemonshowdown.com/js/client-chat.js
@@ -1054,11 +1054,11 @@
 				if (this.checkBroadcast(cmd, text)) return false;
 				var cleanedTarget = toID(target);
 				if (cleanedTarget === 'off' || cleanedTarget === 'disable') {
-					Config.server.afd = false;
+					Storage.prefs('afd', false);
 					if (typeof BattleTextNotAFD !== 'undefined') BattleText = BattleTextNotAFD;
 					this.add('April Fools\' day mode disabled.');
 				} else {
-					Config.server.afd = true;
+					Storage.prefs('afd', true);
 					if (typeof BattleTextAFD !== 'undefined') BattleText = BattleTextAFD;
 					this.add('April Fools\' day mode enabled.');
 				}

diff --git a/play.pokemonshowdown.com/src/battle-animations-moves.ts b/play.pokemonshowdown.com/src/battle-animations-moves.ts
@@ -35893,3 +35893,7 @@ BattleMoveAnims['trailblaze'] = {anim: BattleMoveAnims['powerwhip'].anim};
 BattleMoveAnims['tripledive'] = {anim: BattleMoveAnims['dive'].anim};
 BattleMoveAnims['hydrosteam'] = {anim: BattleMoveAnims['steameruption'].anim};
 BattleMoveAnims['psyblade'] = {anim: BattleMoveAnims['psychocut'].anim};
+BattleMoveAnims['electroshot'] = {
+	anim: BattleMoveAnims['zapcannon'].anim,
+	prepareAnim: BattleOtherAnims.lightstatus.anim,
+};