Use template strings instead of concatenation

This whole codebase is clearly in need of some modernization. I might
even rewrite the menu code at some point...

Author: fatcerberus

scripts/battleSystem/autoBattler.js

@@ -259,7 +259,8 @@ class AutoBattler
 		let lastPhase = this.currentPhase;
 		this.currentPhase = Math.max(phaseToEnter, this.currentPhase);  // ratcheting
 		if (this.currentPhase > lastPhase) {
-			console.log(`${this.unit.name} is entering phase ${this.currentPhase}`,
+			console.log(
+				`${this.unit.name} is entering Phase ${this.currentPhase}`,
 				`prev: ${lastPhase > 0 ? lastPhase : "none"}`);
 			this.on_phaseChanged(this.currentPhase, lastPhase);
 		}

scripts/battleSystem/battleActor.js

@@ -117,7 +117,7 @@ class BattleActor
 				break;
 			case 'sleep':
 				await new Scene()
-					.talk("maggie", 2.0, this.name + " fell asleep! Hey, does that mean I get to eat him now?")
+					.talk("maggie", 1.0, Infinity, `${this.name} fell asleep! Hey, does that mean I get to eat him now?`)
 					.run();
 				break;
 		}

scripts/battleSystem/battleEngine.js

@@ -10,7 +10,6 @@ import { clone } from '../utilities.js';
 
 import BattleScreen from './battleScreen.js';
 import BattleUnit, { Row } from './battleUnit.js';
-import FieldCondition from './fieldCondition.js';
 import MPPool from './mpPool.js';
 
 export
@@ -45,22 +44,6 @@ class BattleEngine extends Thread
 			: session.party.level;
 	}
 
-	addCondition(conditionID)
-	{
-		if (this.hasCondition(conditionID))
-			return;  // nop if already installed
-		let eventData = { conditionID: conditionID, cancel: false };
-		this.raiseEvent('conditionInstalled', eventData);
-		if (!eventData.cancel) {
-			let effect = new FieldCondition(eventData.conditionID, this);
-			this.conditions.push(effect);
-			console.log(`install field condition ${effect.name}`);
-		}
-		else {
-			console.log(`cancel FC '${conditionID}' per existing FC`);
-		}
-	}
-
 	alliesOf(unit)
 	{
 		if (unit.isPartyMember())
@@ -109,7 +92,7 @@ class BattleEngine extends Thread
 			let battlerInfo = this.session.party.members[key].getInfo();
 			let mpDonated = Math.round(Maths.mp.capacity(battlerInfo));
 			partyMaxMP += mpDonated;
-			console.log(Characters[battlerInfo.characterID].name + " donated " + mpDonated + " MP to shared pool");
+			console.log(`${Characters[battlerInfo.characterID].name} contributes ${mpDonated} MP`);
 		}
 		partyMaxMP = Math.min(Math.max(partyMaxMP, 0), 9999);
 		let partyMPPool = new MPPool('partyMP', Math.min(Math.max(partyMaxMP, 0), 9999));

scripts/battleSystem/battleUnit.js

@@ -514,19 +514,19 @@ class BattleUnit
 			},
 			'inv'(instruction) {
 				if (instruction === undefined) {
-					console.log("'" + this.id + " inv': No instruction provided");
+					console.log(`'${this.id} inv' - no instruction provided`);
 					return;
 				}
 				let itemCount, itemID;
 				switch (instruction) {
 					case 'add': {
 						if (arguments.length < 2) {
-							console.log("'" + this.id + " inv add': Item ID required");
+							console.log(`'${this.id} inv add' - item ID required`);
 							return;
 						}
 						itemID = arguments[1];
 						if (!(itemID in Items))
-							return console.log("no such item ID '" + itemID + "'");
+							return console.log(`no such item ID '${itemID}'`);
 						let defaultUses = 'uses' in Items[itemID] ? Items[itemID].uses : 1;
 						itemCount = arguments[2] > 0 ? arguments[2] : defaultUses;
 						let usables = from(this.items)
@@ -542,33 +542,32 @@ class BattleUnit
 							this.items.push(usable);
 							addCount = itemCount;
 						}
-						console.log(addCount + "x " + Items[itemID].name + " added to " + this.name + "'s inventory");
+						console.log(`${addCount}x ${Items[itemID].name} added to ${this.name}'s inventory`);
 						break;
 					}
 					case 'munch': {
 						new Scene().playSound('Munch.wav').run();
 						this.items.length = 0;
-						console.log("maggie ate " + this.name + "'s entire inventory");
+						console.log(`maggie ate ${this.name}'s entire inventory`);
 						break;
 					}
 					case 'rm': {
 						if (arguments.length < 2)
-							return console.log("'" + this.id + " inv add': Item ID required");
+							return console.log(`'${this.id} inv add' - item ID required`);
 						itemID = arguments[1];
 						itemCount = 0;
 						from(this.items)
 							.where(it => it.itemID === itemID)
 							.besides(it => itemCount += it.usesLeft)
 							.remove();
 						if (itemCount > 0)
-							console.log(itemCount + "x " + Items[itemID].name
-								+ " deleted from " + this.name + "'s inventory");
+							console.log(`${itemCount}x ${Items[itemID].name} removed from ${this.name}'s inventory`);
 						else
-							console.log("No " + Items[itemID].name + " in " + this.name + "'s inventory");
+							console.log(`no ${Items[itemID].name} in ${this.name}'s inventory`);
 						break;
 					}
 					default: {
-						return console.log("'" + this.id + " inv': Unknown instruction '" + instruction + "'");
+						return console.log(`'${this.id} inv' - unknown instruction '${instruction}'`);
 					}
 				}
 			},

scripts/battleSystem/fieldCondition.js

@@ -226,9 +226,9 @@ class TargetMenu extends Thread
 				for (let i = 0; i < this.statusNames.length; ++i)
 					drawTextEx(this.infoFont, 80, y + 16 + 12 * i, this.statusNames[i], statusColor, 1, 'center');
 				this.drawInfoBox(0, y + nameBoxHeight, 80, 20, 0.5);
-				drawTextEx(this.infoFont, 40, y + nameBoxHeight + 4, "HP: " + this.unitToShowInfo.hp, statColor, 1, 'center');
+				drawTextEx(this.infoFont, 40, y + nameBoxHeight + 4, `${this.unitToShowInfo.hp} HP`, statColor, 1, 'center');
 				this.drawInfoBox(80, y + nameBoxHeight, 80, 20, 0.5);
-				drawTextEx(this.infoFont, 120, y + nameBoxHeight + 4, "MP: " + this.unitToShowInfo.mpPool.availableMP, statColor, 1, 'center');
+				drawTextEx(this.infoFont, 120, y + nameBoxHeight + 4, `${this.unitToShowInfo.mpPool.availableMP} MP`, statColor, 1, 'center');
 			}
 			else {
 				let y = 16 - 20 * this.infoBoxFadeness;

scripts/battleSystem/targetMenu.js

@@ -8,7 +8,7 @@ import { Prim, Scene, Thread } from 'sphere-runtime';
 const
 	BoxColor = Color.Black.fadeTo(0.75),
 	BorderColor = Color.Black.fadeTo(0.85),
-	TextColor = Color.Gray,
+	TextColor = Color.Silver,
 	TextShadowColor = Color.Black;
 
 export default
@@ -60,10 +60,8 @@ class TurnPreview extends Thread
 	ensureEntries(unit)
 	{
 		if (!(unit.tag in this.entries)) {
-			let iconColor = unit.isPartyMember()
-				? Color.RoyalBlue
-				: Color.FireBrick;
-			let entry = {
+			const iconColor = unit.isPartyMember() ? Color.RoyalBlue : Color.FireBrick;
+			const entry = {
 				icon:      new BattlerIcon(unit, iconColor),
 				turnBoxes: [],
 			};

scripts/battleSystem/turnPreview.js

@@ -57,7 +57,8 @@ class WeaponUsable
 		if (!this.isUsable(unit, unit.stance))
 			throw new RangeError(`${unit.name} tried to change weapons, which is not currently possible`);
 
-		console.log(unit.name + " is equipping " + this.name,
+		console.log(
+			`${unit.name} is equipping ${this.name}`,
 			`targ: ${targets.length > 1 ? "[multi]" : targets[0].name}`);
 		for (const target of targets)
 			target.setWeapon(this.weaponID);

scripts/battleSystem/weaponUsable.js

@@ -127,9 +127,9 @@ class InGameTime
 
 	toString()
 	{
-		let hourText = ("0" + this.hour).slice(-2);
-		let minuteText = ("0" + this.minute).slice(-2);
-		let secondText = ("0" + this.second).slice(-2);
+		let hourText = `0${this.hour}`.slice(-2);
+		let minuteText = `0${this.minute}`.slice(-2);
+		let secondText = `0${this.second}`.slice(-2);
 		return `${hourText}:${minuteText}:${secondText}`;
 	}
 }

scripts/dayNightClock.js

@@ -179,7 +179,7 @@ Scene.defineOp('talk',
 	start(scene, speaker, showSpeaker, textSpeed, timeout, ...pages)
 	{
 		this.speakerName = speaker;
-		this.speakerText = this.speakerName != null ? this.speakerName + ":" : null;
+		this.speakerText = this.speakerName != null ? `${this.speakerName}:` : null;
 		this.showSpeaker = showSpeaker;
 		this.textSpeed = textSpeed;
 		this.timeout = timeout;