Skip to content

Commit

Permalink
Add zoro (#101)
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 Feb 23, 2024
1 parent 87d0112 commit 03fc055
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 0 deletions.
28 changes: 28 additions & 0 deletions data/mods/gen9ssb/abilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1461,6 +1461,34 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
flags: {},
},

// zoro
ninelives: {
shortDesc: "Twice per battle, Umbreon will survive a lethal hit with 1 HP remaining, regardless of the HP it was at.",
name: "Nine Lives",
onTryHit(pokemon, target, move) {
if (move.ohko) {
this.add('-immune', pokemon, '[from] ability: Nine Lives');
return null;
}
},
onDamagePriority: -30,
onDamage(damage, target, source, effect) {
if (damage >= target.hp && effect?.effectType === 'Move' && !this.effectState.busted) {
this.add('-ability', target, 'Nine Lives');
if (this.effectState.busted === 0) {
this.effectState.busted = 1;
} else {
this.effectState.busted = 0;
}
return target.hp - 1;
}
},
// Yes, this looks very patchwork-y. declaring new persistent global variables seems to be a no-go here
// so i repurposed one which should likely not affect anything else - have tested with clerica/zoro on both sides
// and their disguise/sturdy state is unaffected by modifying anything here. but let wg know if this breaks stuff.
flags: {breakable: 1},
},

// Modified abilities
baddreams: {
inherit: true,
Expand Down
12 changes: 12 additions & 0 deletions data/mods/gen9ssb/conditions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,18 @@ export const Conditions: {[k: string]: ModdedConditionData & {innateName?: strin
this.add(`c:|${getName('zee')}|Hey everyone it's been a great time working with you all in this Super Staff Bros battle but I think it's the right time for me to step down. Thank you all and see you around.`);
},
},
zoro: {
noCopy: true,
onStart() {
this.add(`c:|${getName('zoro')}|gmeow`);
},
onSwitchOut() {
this.add(`c:|${getName('zoro')}|brb I want to chase some yarn`);
},
onFaint() {
this.add(`c:|${getName('zoro')}|time to take a cat nap`);
},
},

// Custom effects
// Elly
Expand Down
21 changes: 21 additions & 0 deletions data/mods/gen9ssb/moves.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2836,6 +2836,27 @@ export const Moves: {[k: string]: ModdedMoveData} = {
type: "Fire",
},

// zoro
darkestnight: {
accuracy: 100,
basePower: 95,
category: "Physical",
name: "Darkest Night",
pp: 15,
priority: 0,
flags: {contact: 1, protect: 1, mirror: 1, metronome: 1},
overrideOffensivePokemon: 'target',
secondary: null,
target: "normal",
type: "Dark",
onTryMove() {
this.attrLastMove('[still]');
},
onPrepareHit(target, source) {
this.add('-anim', source, "Foul Play", target);
},
},

// Modified moves
bleakwindstorm: {
inherit: true,
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 @@ -523,6 +523,12 @@ export const ssbSets: SSBSets = {
signatureMove: 'Solar Summon',
evs: {hp: 80, atk: 176, spe: 252}, nature: 'Adamant', teraType: 'Fire',
},
zoro: {
species: 'Umbreon', ability: 'Nine Lives', item: 'Leftovers', gender: 'M',
moves: ['Wish', 'Protect', 'Toxic'],
signatureMove: 'Darkest Night',
evs: {hp: 252, def: 240, spd: 16}, nature: 'Calm', teraType: 'Steel', shiny: true,
},
};

export class RandomStaffBrosTeams extends RandomTeams {
Expand Down

0 comments on commit 03fc055

Please sign in to comment.