@@ -996,11 +996,6 @@ class BattleTooltips {
996
996
if ( statName === 'def' ) sourceStatName = 'atk' ;
997
997
}
998
998
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
- }
1004
999
if ( ! clientPokemon ) continue ;
1005
1000
1006
1001
const clientStatName = clientPokemon . boosts . spc && ( statName === 'spa' || statName === 'spd' ) ? 'spc' : statName ;
@@ -1259,6 +1254,9 @@ class BattleTooltips {
1259
1254
1260
1255
// SSB
1261
1256
if ( this . battle . tier . includes ( 'Super Staff Bros' ) ) {
1257
+ if ( pokemon . name === 'Felucia' ) {
1258
+ speedModifiers . push ( 1.5 ) ;
1259
+ }
1262
1260
if ( ability === 'misspelled' ) {
1263
1261
stats . spa = Math . floor ( stats . spa * 1.5 ) ;
1264
1262
}
@@ -1327,9 +1325,9 @@ class BattleTooltips {
1327
1325
for ( const statName of Dex . statNamesExceptHP ) {
1328
1326
if ( clientPokemon . volatiles [ 'ultramystik' ] ) {
1329
1327
if ( statName === 'spe' ) {
1330
- speedModifiers . push ( 1.5 ) ;
1328
+ speedModifiers . push ( 1.3 ) ;
1331
1329
} else {
1332
- stats [ statName ] = Math . floor ( stats [ statName ] * 1.5 ) ;
1330
+ stats [ statName ] = Math . floor ( stats [ statName ] * 1.3 ) ;
1333
1331
}
1334
1332
}
1335
1333
}
@@ -2245,18 +2243,10 @@ class BattleTooltips {
2245
2243
value . modify ( 2 , 'Terastallized target' ) ;
2246
2244
}
2247
2245
if ( move . id === 'mysticalbonfire' && target ?. status ) {
2248
- value . modify ( 2 , 'Mystical Bonfire + status' ) ;
2246
+ value . modify ( 1.5 , 'Mystical Bonfire + status' ) ;
2249
2247
}
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" ) ;
2260
2250
}
2261
2251
if ( value . value <= 60 ) {
2262
2252
value . abilityModify ( 1.5 , "Confirmed Town" ) ;
@@ -2266,11 +2256,8 @@ class BattleTooltips {
2266
2256
if ( moveType === 'Normal' ) value . abilityModify ( this . battle . gen > 6 ? 1.2 : 1.3 , "I Can Hear The Heart Beating As One" ) ;
2267
2257
value . abilityModify ( this . battle . gen > 6 ? 1.2 : 1.3 , "Acetosa" ) ;
2268
2258
}
2269
- if ( move . flags [ 'sound' ] ) {
2270
- value . abilityModify ( 1.5 , "Cacophony" ) ;
2271
- }
2272
2259
if ( move . flags [ 'punch' ] ) {
2273
- value . abilityModify ( 1.3 , "Harambe Hit" ) ;
2260
+ value . abilityModify ( 1.5 , "Harambe Hit" ) ;
2274
2261
}
2275
2262
if ( move . flags [ 'slicing' ] ) {
2276
2263
value . abilityModify ( 1.5 , "I Can Hear The Heart Beating As One" ) ;
0 commit comments