Merge branch 'fix/safari-ball-catchrate' into 'main'

fix: change safari ball catchrate modifier

See merge request cable-mc/cobblemon!2440
This commit is contained in:
Polymeta
2026-10-01 05:26:45 +00:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -114,7 +114,7 @@
- Fixed shiny pokemon under certain circumstances forgetting taught TMs
- Fixed certain Pokémon sounds sometimes being doubled when played at specific times in their animations
- Fixed ball capture beam origin coming from behind the ball.
- Fixed Safari Ball catch rate outside of battle
### Developer
- Evolution requirements can now set `pokedexIcon` and `pokedexTooltip` directly in their JSON to control how they're shown on the Pokédex's evolution tree, for example:
```json
@@ -136,4 +136,4 @@
#### New Move Animations
### Localization
- Updated translations for:
- Updated translations for:
@@ -108,7 +108,7 @@ object CatchRateModifiers {
* Used by [PokeBalls.SAFARI_BALL].
* Checks if the target is not battling, if true boost by *1.5
*/
val SAFARI = WorldStateModifier { _, entity -> if (!entity.isBattling) 1.5F else 1F }
val SAFARI = MultiplierModifier(1.5f) { _, poke -> !poke.entity?.isBattling!! }
/**
* Used by [PokeBalls.PARK_BALL].