Skip to content

Commit bc98615

Browse files
authored
SSB: Client-side balance patch changes (#2250)
* SSB: Client-side balance patch changes * more changes * oops
1 parent b399117 commit bc98615

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

play.pokemonshowdown.com/src/battle-tooltips.ts

+9-22
Original file line numberDiff line numberDiff line change
@@ -996,11 +996,6 @@ class BattleTooltips {
996996
if (statName === 'def') sourceStatName = 'atk';
997997
}
998998
stats[statName] = serverPokemon.stats[sourceStatName];
999-
// SSB
1000-
if (this.battle.tier.includes('Super Staff Bros') && clientPokemon?.volatiles['ok']) {
1001-
if (statName === 'spa') stats[statName] += Math.floor(stats.atk / 10);
1002-
if (statName === 'spe') stats[statName] += Math.floor(stats.atk * 9 / 10);
1003-
}
1004999
if (!clientPokemon) continue;
10051000

10061001
const clientStatName = clientPokemon.boosts.spc && (statName === 'spa' || statName === 'spd') ? 'spc' : statName;
@@ -1259,6 +1254,9 @@ class BattleTooltips {
12591254

12601255
// SSB
12611256
if (this.battle.tier.includes('Super Staff Bros')) {
1257+
if (pokemon.name === 'Felucia') {
1258+
speedModifiers.push(1.5);
1259+
}
12621260
if (ability === 'misspelled') {
12631261
stats.spa = Math.floor(stats.spa * 1.5);
12641262
}
@@ -1327,9 +1325,9 @@ class BattleTooltips {
13271325
for (const statName of Dex.statNamesExceptHP) {
13281326
if (clientPokemon.volatiles['ultramystik']) {
13291327
if (statName === 'spe') {
1330-
speedModifiers.push(1.5);
1328+
speedModifiers.push(1.3);
13311329
} else {
1332-
stats[statName] = Math.floor(stats[statName] * 1.5);
1330+
stats[statName] = Math.floor(stats[statName] * 1.3);
13331331
}
13341332
}
13351333
}
@@ -2245,18 +2243,10 @@ class BattleTooltips {
22452243
value.modify(2, 'Terastallized target');
22462244
}
22472245
if (move.id === 'mysticalbonfire' && target?.status) {
2248-
value.modify(2, 'Mystical Bonfire + status');
2246+
value.modify(1.5, 'Mystical Bonfire + status');
22492247
}
2250-
if (move.id === 'adaptivebeam' && target) {
2251-
let boostCount = 0;
2252-
let targetBoostCount = 0;
2253-
for (const boost of Object.values(pokemon.boosts)) {
2254-
if (boost > 0) boostCount += boost;
2255-
}
2256-
for (const boost of Object.values(target.boosts)) {
2257-
if (boost > 0) targetBoostCount += boost;
2258-
}
2259-
if (targetBoostCount >= boostCount) value.modify(2, "Target has more boosts");
2248+
if (move.id === 'adaptivebeam' && target && Object.values(target.boosts).some(x => x > 0)) {
2249+
value.set(0, "Target has more boosts");
22602250
}
22612251
if (value.value <= 60) {
22622252
value.abilityModify(1.5, "Confirmed Town");
@@ -2266,11 +2256,8 @@ class BattleTooltips {
22662256
if (moveType === 'Normal') value.abilityModify(this.battle.gen > 6 ? 1.2 : 1.3, "I Can Hear The Heart Beating As One");
22672257
value.abilityModify(this.battle.gen > 6 ? 1.2 : 1.3, "Acetosa");
22682258
}
2269-
if (move.flags['sound']) {
2270-
value.abilityModify(1.5, "Cacophony");
2271-
}
22722259
if (move.flags['punch']) {
2273-
value.abilityModify(1.3, "Harambe Hit");
2260+
value.abilityModify(1.5, "Harambe Hit");
22742261
}
22752262
if (move.flags['slicing']) {
22762263
value.abilityModify(1.5, "I Can Hear The Heart Beating As One");

0 commit comments

Comments
 (0)