Skip to content

Commit 3569595

Browse files
committed
Make it so atleast 1 isntance of each item has a chance.
1 parent a132fe1 commit 3569595

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/event/GenerationsCobblemonEvents.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ import com.cobblemon.mod.common.api.Priority
55
import com.cobblemon.mod.common.api.battles.model.actor.ActorType
66
import com.cobblemon.mod.common.api.events.CobblemonEvents
77
import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
8-
import com.cobblemon.mod.common.api.tags.CobblemonItemTags
98
import com.cobblemon.mod.common.api.text.text
109
import com.cobblemon.mod.common.api.types.tera.TeraTypes
1110
import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
1211
import com.cobblemon.mod.common.client.gui.interact.wheel.InteractWheelOption
1312
import com.cobblemon.mod.common.client.gui.interact.wheel.Orientation
14-
import com.cobblemon.mod.common.pokemon.Pokemon
1513
import com.cobblemon.mod.common.util.asTranslated
1614
import com.cobblemon.mod.common.util.cobblemonResource
17-
import com.cobblemon.mod.common.util.getPlayer
1815
import com.cobblemon.mod.common.util.giveOrDropItemStack
1916
import com.cobblemon.mod.common.util.isInBattle
2017
import generations.gg.generations.core.generationscore.common.GenerationsCore
@@ -24,10 +21,7 @@ import generations.gg.generations.core.generationscore.common.battle.BattleCondi
2421
import generations.gg.generations.core.generationscore.common.battle.BattleConditionsProcessor.sendToPlayersAndSpectators
2522
import generations.gg.generations.core.generationscore.common.battle.BattleSideData
2623
import generations.gg.generations.core.generationscore.common.battle.ConditionsData
27-
import generations.gg.generations.core.generationscore.common.battle.ExpAllCalculator.calculateMultiplier
28-
import generations.gg.generations.core.generationscore.common.battle.ExpAllCalculator.hasExpAll
2924
import generations.gg.generations.core.generationscore.common.battle.GenerationsInstructionProcessor
30-
import generations.gg.generations.core.generationscore.common.battle.grantExpAll
3125
import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
3226
import generations.gg.generations.core.generationscore.common.config.LegendKeys
3327
import generations.gg.generations.core.generationscore.common.config.SpeciesKey
@@ -43,7 +37,6 @@ import net.minecraft.client.Minecraft
4337
import net.minecraft.resources.ResourceLocation
4438
import net.minecraft.world.item.ItemStack
4539
import org.joml.Vector3f
46-
import kotlin.math.PI
4740

4841
class GenerationsCobblemonEvents {
4942

@@ -81,8 +74,10 @@ class GenerationsCobblemonEvents {
8174
.filter { battleActor -> battleActor is PlayerBattleActor }
8275
.map { battleActor -> battleActor as PlayerBattleActor }
8376
.forEach { actor ->
84-
val stack = actor.entity?.inventory?.items?.first { a -> a.item is PostBattleUpdatingItem }
85-
stack.item.instanceOrNull<PostBattleUpdatingItem>()?.afterBattle(actor, stack, data)
77+
actor.entity?.inventory?.items?.filter { a -> a.item is PostBattleUpdatingItem }?.distinctBy { it.item }?.forEach { stack ->
78+
(stack.item as PostBattleUpdatingItem).afterBattle(actor, stack, data)
79+
}
80+
8681

8782
actor.pokemonList.asSequence().map { it.originalPokemon }.forEach { originalPokemon ->
8883
val it: ItemStack = originalPokemon.heldItem()

0 commit comments

Comments
 (0)