Move |badge| message handling to battle.ts

Author: mia-pi-git

play.pokemonshowdown.com/js/client-battle.js

@@ -132,17 +132,6 @@
 			if (this.battle.ended) this.battleEnded = true;
 			this.updateLayout();
 			this.updateControls();
-			for (var i = 0; i < log.length; i++) {
-				var logLine = log[i];
-				// i don't like this hardcode, and my preferred solution would be not this
-				// but i don't know how many bugs would be caused by having BattleRoom#add
-				// not `return` the running of this function - i suspect a lot
-				// and i also don't want to move the |badge| message into battle.ts, since it's not simulator-related
-				// so we're doing this, for now. open to suggestions
-				if (logLine.substr(0, 7) === '|badge|') {
-					this.add(logLine);
-				}
-			}
 		},
 		add: function (data) {
 			if (!data) return;
@@ -227,14 +216,6 @@
 						break;
 					}
 				} else if (logLine.substr(0, 7) === '|title|') { // eslint-disable-line no-empty
-				} else if (logLine.substr(0, 7) === '|badge|') {
-					var parts = logLine.split('|').slice(2);
-					var slot = parts.shift();
-					var side = this.battle[slot];
-					if (!side) return; // weird
-					// handle all the rendering further down
-					side.badges.push(parts.join('|'));
-					this.battle.scene.updateSidebar(side);
 				} else if (logLine.substr(0, 5) === '|win|' || logLine === '|tie') {
 					this.battleEnded = true;
 					this.battle.stepQueue.push(logLine);

play.pokemonshowdown.com/src/battle-animations.ts

@@ -709,8 +709,8 @@ export class BattleScene implements BattleSceneStub {
 		}
 		return (
 			`<div class="trainer trainer-${posStr}"${faded}><strong>${BattleLog.escapeHTML(side.name)}</strong>` +
-			`<div class="trainersprite"${ratinghtml} style="background-image:url(${Dex.resolveAvatar(side.avatar)})">${badgehtml}` +
-			`</div>${pokemonhtml}</div>`
+			`<div class="trainersprite"${ratinghtml} style="background-image:url(${Dex.resolveAvatar(side.avatar)})">` +
+			`</div>${badgehtml}${pokemonhtml}</div>`
 		);
 	}
 	updateSidebar(side: Side) {

play.pokemonshowdown.com/src/battle.ts

@@ -3536,6 +3536,15 @@ export class Battle {
 			this.scene.updateSidebar(side);
 			break;
 		}
+		case 'badge': {
+			const slot = args[1] as SideID;
+			var side = this[slot];
+			if (!side) return; // weird
+			// handle all the rendering further down
+			side.badges.push(args.slice(2).join('|'));
+			this.scene.updateSidebar(side);
+			break;
+		}
 		case 'teamsize': {
 			let side = this.getSide(args[1]);
 			side.totalPokemon = parseInt(args[2], 10);