Skip to content

Commit

Permalink
Add EasyOnTheHills / Update Valerian (#161)
Browse files Browse the repository at this point in the history
Co-authored-by: Kris Johnson <[email protected]>
  • Loading branch information
WarriorGallade and KrisXV authored Apr 17, 2024
1 parent 982c1fd commit ec268b7
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 5 deletions.
29 changes: 29 additions & 0 deletions data/mods/gen9ssb/conditions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,18 @@ export const Conditions: {[k: string]: ModdedConditionData & {innateName?: strin
this.add(`c:|${getName('DianaNicole')}|Guess I didn't roll high enough`);
},
},
easyonthehills: {
noCopy: true,
onStart() {
this.add(`c:|${getName('EasyOnTheHills')}|Yo`);
},
onSwitchOut() {
this.add(`c:|${getName('EasyOnTheHills')}|Would you rather have unlimited bacon, but no more video games, or would you rather have games, unlimited games, but no more games.`);
},
onFaint() {
this.add(`c:|${getName('EasyOnTheHills')}|__loud Dorito bag crinkling noises__`);
},
},
elliot: {
noCopy: true,
onStart() {
Expand Down Expand Up @@ -2665,6 +2677,23 @@ export const Conditions: {[k: string]: ModdedConditionData & {innateName?: strin
},
},

// EasyOnTheHills
snack: {
name: "Snack",
duration: 3,
onStart(target) {
this.add('-start', target, 'snack');
},
onEnd(target) {
this.add('-end', target, 'snack');
},
onResidualOrder: 5,
onResidualSubOrder: 4,
onResidual(target, source, effect) {
this.heal(target.baseMaxhp / 4);
},
},

// Elliot
beefed: {
name: "Beefed",
Expand Down
48 changes: 43 additions & 5 deletions data/mods/gen9ssb/moves.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1632,6 +1632,47 @@ export const Moves: {[k: string]: ModdedMoveData} = {
type: "Fire",
},

// EasyOnTheHills
snacktime: {
accuracy: true,
basePower: 0,
category: "Status",
shortDesc: "Charges first turn. Second turn +2 Atk/Def, 25% recovery for 3 turns. Can't stack.",
name: "Snack Time",
pp: 10,
priority: 0,
flags: {protect: 1, mirror: 1},
volatileStatus: 'snack',
onTryMove(attacker, defender, move) {
if (attacker.volatiles['snack']) {
this.add('-fail', attacker, 'move: Snack Time');
this.attrLastMove('[still]');
return null;
}
if (attacker.removeVolatile(move.id)) {
this.attrLastMove('[still]');
this.add('-anim', attacker, 'Shell Smash', attacker);
return;
}
this.add('-prepare', attacker, move.name);
this.attrLastMove('[still]');
this.add('-anim', attacker, 'Geomancy', attacker);
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
return;
}
attacker.addVolatile('twoturnmove', defender);
return null;
},
boosts: {
atk: 2,
def: 2,
},
// passive recovery implemented in conditions.ts
secondary: null,
target: "self",
type: "Normal",
},

// Elliot
teaparty: {
accuracy: true,
Expand Down Expand Up @@ -5170,7 +5211,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
basePower: 25,
category: "Physical",
name: "First Strike",
shortDesc: "Turn 1: 100% flinch. +1 NVE, +2 NE, +3 SE Atk.",
shortDesc: "Turn 1 only. +1 NVE, +2 NE, +3 SE Atk.",
desc: "This move can only be used on the first turn of battle. It boosts the user's Attack by 1 stage if it's resisted, 2 stages if it's neutral, and 3 stages if it's super effective.",
pp: 15,
priority: 3,
Expand All @@ -5197,10 +5238,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
}
this.boost({atk: boost}, pokemon, pokemon, move);
},
secondary: {
chance: 100,
volatileStatus: 'flinch',
},
secondary: null,
target: "normal",
type: "Steel",
},
Expand Down
6 changes: 6 additions & 0 deletions data/mods/gen9ssb/random-teams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ export const ssbSets: SSBSets = {
signatureMove: 'Breath of Tiamat',
evs: {hp: 252, def: 4, spa: 252}, nature: 'Modest', shiny: true,
},
EasyOnTheHills: {
species: 'Snorlax', ability: 'Immunity', item: 'Life Orb', gender: 'M',
moves: ['Darkest Lariat', 'Body Slam', 'Heavy Slam'],
signatureMove: 'Snack Time',
evs: {hp: 252, atk: 252, spd: 4}, nature: 'Adamant', teraType: 'Ghost', shiny: true,
},
Elliot: {
species: 'Sinistea', ability: 'Natural Cure', item: 'Focus Sash', gender: 'N',
moves: ['Moonblast', 'Shadow Ball', 'Teatime'],
Expand Down

0 comments on commit ec268b7

Please sign in to comment.