Merge pull request #49 from Zarel/master

update from main
TheImmortals · Oct 31, 2018 · 23c01a7 · 23c01a7
2 parents 86e052a + b0b3475
commit 23c01a7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/mods/gen4/moves.js b/mods/gen4/moves.js
@@ -1158,6 +1158,9 @@ let BattleMovedex = {
 		inherit: true,
 		desc: "This move calls another move for use based on the battle terrain. Tri Attack in Wi-Fi battles.",
 		shortDesc: "Attack changes based on terrain. (Tri Attack)",
+		onHit: function (pokemon) {
+			this.useMove('triattack', pokemon);
+		},
 	},
 	odorsleuth: {
 		inherit: true,

diff --git a/mods/ssb/moves.js b/mods/ssb/moves.js
@@ -785,8 +785,8 @@ let BattleMovedex = {
 		accuracy: 100,
 		basePower: 100,
 		category: "Physical",
-		desc: "Summons Grassy Terrain.",
-		shortDesc: "Summons Grassy Terrain.",
+		desc: "Summons Grassy Terrain. If the user is an Aegislash, it changes forme to Aegislash-Blade, attacks, then goes back to its base forme.",
+		shortDesc: "Summons Grassy Terrain. Aegislash transforms.",
 		id: "aesthetislash",
 		name: "a e s t h e t i s l a s h",
 		isNonstandard: true,
@@ -1119,7 +1119,7 @@ let BattleMovedex = {
 		basePower: 0,
 		damage: 111,
 		category: "Physical",
-		desc: "Deals 111 HP of damage and burns the target. If the target already has a status ailment, it is replaced with a burn. Fails if the target is a Fire-type, or if the user is not a Fire-type.",
+		desc: "Deals 111 HP of damage and burns the target. If the target already has a status ailment, it is replaced with a burn. Fails if the target is a Fire-type or if the user is not a Fire-type.",
 		shortDesc: "Dmg=111HP; replace status w/burn; fail if foe=Fire.",
 		id: "fangofthefireking",
 		name: "Fang of the Fire King",
@@ -3034,7 +3034,7 @@ let BattleMovedex = {
 					}
 				}
 				this.add('-activate', target, 'move: Literally Cheating', target.lastMove.name, target.lastMove.pp);
-				this.add('-message', `${target.name} lost PP!`);
+				this.add('-message', `${target.name} lost all PP for the move ${target.lastMove.name}!`);
 			},
 			onStart: function (battle, source, effect) {
 				this.add('-fieldstart', 'move: Literally Cheating');

diff --git a/mods/ssb/random-teams.js b/mods/ssb/random-teams.js
@@ -446,9 +446,9 @@ class RandomStaffBrosTeams extends RandomTeams {
 			},
 			'Osiris': {
 				species: 'Pumpkaboo-Super', ability: 'Sacred Shadow', item: 'Eviolite', gender: 'M',
-				moves: ['Leech Seed', 'Will-O-Wisp', 'Seed Bomb'],
+				moves: [['Leech Seed', 'Will-O-Wisp'], 'Recover', 'Seed Bomb'],
 				signatureMove: 'Night March',
-				evs: {hp: 252, atk: 144, spd: 112}, nature: 'Adamant', shiny: true,
+				evs: {hp: 252, atk: 144, spd: 112}, ivs: {spe: 0}, nature: 'Brave', shiny: true,
 			},
 			'Overneat': {
 				species: 'Sylveon', ability: 'Fairy Aura', item: 'Life Orb', gender: 'F',
@@ -514,7 +514,7 @@ class RandomStaffBrosTeams extends RandomTeams {
 				species: 'Fletchinder', ability: 'Gale Wings v1', item: 'Eviolite', gender: 'F',
 				moves: ['Dragon Ascent', 'Sacred Fire', 'Roost'],
 				signatureMove: 'GO INDA',
-				evs: {atk: 252, hp: 248, spe: 8}, nature: 'Adamant',
+				evs: {hp: 248, atk: 252, spe: 8}, nature: 'Adamant',
 			},
 			'Slowbroth': {
 				species: 'Beheeyem', ability: 'Psychic Surge', item: 'Psychium Z', gender: 'M',

diff --git a/mods/ssb/statuses.js b/mods/ssb/statuses.js
@@ -963,6 +963,12 @@ let BattleStatuses = {
 		onFaint: function () {
 			this.add(`c|+Osiris|I'm getting too old for this x_x`);
 		},
+		onSourceModifyDamage: function (damage, source, target, move) {
+			if (move.typeMod > 0 && !target.illusion) {
+				this.debug('Solid Rock neutralize');
+				return this.chainModify(0.75);
+			}
+		},
 	},
 	overneat: {
 		noCopy: true,