From d151a1ce650c0a1ea440edd8c21d978feab65960 Mon Sep 17 00:00:00 2001 From: Gitoido Date: Thu, 1 Oct 2026 02:44:20 +0300 Subject: [PATCH 1/2] fix: change safari ball catchrate modifier Changed safari ball catchrate modifier to properly account for battle status --- .../api/pokeball/catching/modifiers/CatchRateModifiers.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/modifiers/CatchRateModifiers.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/modifiers/CatchRateModifiers.kt index 04f1d9d3ea..004cb73e90 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/modifiers/CatchRateModifiers.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/modifiers/CatchRateModifiers.kt @@ -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]. From 9b6629db7f0474105e008a4678caeaa7d624c4af Mon Sep 17 00:00:00 2001 From: Gitoido Date: Thu, 1 Oct 2026 02:47:45 +0300 Subject: [PATCH 2/2] chore: update changelog skip-ci --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a95377050b..5808b0f98e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: \ No newline at end of file +- Updated translations for: