Merge pull request #46 from Zarel/master

update from main
TheImmortals · Oct 29, 2018 · 3d95ed9 · 3d95ed9
2 parents fbb0927 + 0553f42
commit 3d95ed9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/chat-plugins/mafia-data.js b/chat-plugins/mafia-data.js
@@ -1375,7 +1375,7 @@ const IDEAs = {
 			`Mafia Reflexive Doctor`,
 			`Hirsute Mafia Goon`,
 			`Mafia Cupid`,
-			`Alpha Goon`,
+			`Alpha Mafia Goon`,
 			`Mafia Compulsive Hider`,
 			`Mafia Fruit Vendor`,
 			`Werewolf`,
@@ -1528,7 +1528,7 @@ const IDEAs = {
 			`Mafia Reflexive Doctor`,
 			`Hirsute Mafia Goon`,
 			`Mafia Cupid`,
-			`Alpha Goon`,
+			`Alpha Mafia Goon`,
 			`Mafia Compulsive Hider`,
 			`Mafia Fruit Vendor`,
 			`Werewolf`,

diff --git a/chat-plugins/thehappyplace.js b/chat-plugins/thehappyplace.js
@@ -31,7 +31,7 @@ exports.commands = {
 			Rooms.global.writeChatRoomData();
 			return;
 		}
-		const quote = target.split('|')[0].replace('"', '');
+		const quote = target.split('|')[0].replace(/"/g, '');
 		const author = target.split('|')[1];
 		if (!quote) return;
 		if (!author) {

diff --git a/mods/gen3/random-teams.js b/mods/gen3/random-teams.js
@@ -10,7 +10,6 @@ class RandomGen3Teams extends RandomGen4Teams {
 	 * @return {RandomTeamsTypes["RandomSet"]}
 	 */
 	randomSet(template, slot, teamDetails = {}) {
-		if (slot === undefined) slot = 1;
 		let baseTemplate = (template = this.getTemplate(template));
 		let species = template.species;
 
@@ -500,7 +499,6 @@ class RandomGen3Teams extends RandomGen4Teams {
 			}
 		}
 
-		item = 'Leftovers';
 		if (template.requiredItems) {
 			item = this.sample(template.requiredItems);
 

diff --git a/mods/ssb/statuses.js b/mods/ssb/statuses.js
@@ -543,12 +543,15 @@ let BattleStatuses = {
 		noCopy: true,
 		onStart: function () {
 			this.add(`c|@Hippopotas|Something broke. If you're seeing this message, please PM a staff member about it.`);
+			this.add(`c|&HoeenHero|No, its not a bug Hippopotas, stop telling people to PM staff, its annoying.`);
 		},
 		onSwitchOut: function () {
 			this.add(`c|@Hippopotas|Something broke. If you're seeing this message, please PM a staff member about it.`);
+			this.add(`c|&HoeenHero|There's still no bug!`);
 		},
 		onFaint: function () {
 			this.add(`c|@Hippopotas|Something broke. If you're seeing this message, please PM a staff member about it.`);
+			this.add(`c|&HoeenHero|My PMs are flooded with bug reports :(`);
 		},
 	},
 	hipstersigilyph: {

diff --git a/tournaments/index.js b/tournaments/index.js
@@ -1109,7 +1109,7 @@ const commands = {
 				if (result.charAt(0) === '1') {
 					connection.popup("Your team is valid for this tournament.");
 				} else {
-					const format = Dex.getFormat(tournament.originalFormat).name.replace(/\[/, '\\[').replace(/\]/, '\\]');
+					const format = Dex.getFormat(tournament.originalFormat).name.replace(/\[/g, '\\[').replace(/\]/g, '\\]');
 					connection.popup(`Your team was rejected for the following reasons:\n\n- ${result.slice(1).replace(/\n/g, '\n- ').replace(new RegExp(format, 'g'), 'this tournament')}`);
 				}
 			});