Merge pull request smogon#63 from SolarisFox/staff-bros3

Super Staff Bros Melee: add m00ns' sig move & phrases
SolarisFox · Mar 4, 2016 · afb7717 · afb7717
2 parents ed7585d + f9e4790
commit afb7717
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/config/formats.js b/config/formats.js
@@ -884,6 +884,9 @@ exports.Formats = [
 				this.add('c|@LegitimateUsername|``While you\'re dying I\'ll be still alive.``');
 				this.add('c|@LegitimateUsername|``And when you\'re dead I will be still alive.``');
 			}
+			if (name === 'm00ns') {
+				this.add('c|%m00ns|oh');
+			}
 			if (name === 'qtrx') {
 				sentences = ["cutie are ex", "q-trix", "quarters", "cute T-rex", "Qatari", "random letters", "spammy letters", "asgdf"];
 				this.add("c|@qtrx|omg DONT call me '" + sentences[this.random(8)] + "' pls respect my name its very special!!1!");
@@ -938,6 +941,9 @@ exports.Formats = [
 			if (name === 'legitimateusername') {
 				this.add('c|@LegitimateUsername|``This isn\'t brave. It\'s murder. What did I ever do to you?``');
 			}
+			if (name === 'm00ns') {
+				this.add('c|%m00ns|o-oh');
+			}
 			if (name === 'qtrx') {
 				sentences = ['Keyboard not found; press **Ctrl + W** to continue...', 'hfowurfbiEU;DHBRFEr92he', 'At least my name ain\t asgdf...'];
 				this.add('c|@qtrx|' + sentences[this.random(3)]);

diff --git a/mods/seasonal/moves.js b/mods/seasonal/moves.js
@@ -138,7 +138,8 @@ exports.BattleMovedex = {
 		accuracy: 80,
 		basePower: 70,
 		category: "Physical",
-		id: "motherfathergentleman",		name: "Mother, Father, Gentleman",
+		id: "motherfathergentleman",
+		name: "Mother, Father, Gentleman",
 		pp: 15,
 		priority: 0,
 		flags: {contact: 1, protect: 1, mirror: 1},
@@ -147,6 +148,22 @@ exports.BattleMovedex = {
 		target: "normal",
 		type: "Dark",
 	},
+	// m00ns
+	oh: {
+		num: -568;
+		accuracy: 100,
+		category: "Status",
+		id: "oh",
+		name: "oh",
+		pp: 30,
+		priority: 0,
+		flags: {protect: 1, mirror: 1},
+		boosts: {atk: -1, spa: -1},
+		self: {boosts: {spd: 1}},
+		secondary: false,
+		target: "normal",
+		type: "Dark",
+	},
 	// AM
 	predator: {
 		num: -228,

diff --git a/mods/seasonal/scripts.js b/mods/seasonal/scripts.js
@@ -62,7 +62,7 @@ exports.BattleScripts = {
 			'm00ns': {
 				species: 'Wobbuffet', ability: 'Shadow Tag', item: 'Leftovers', gender: 'F',
 				moves: ['counter', 'mirrorcoat', 'encore'],
-				baseSignatureMove: 'nobleroar', signatureMove: "oh",
+				signatureMove: "oh",
 				evs: {hp:52, def:232, spd:224}, ivs: {atk:0}, nature: 'Bold',
 			},
 			'qtrx': {