mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-09 22:24:58 +00:00
Added Gen 9 forms code, evolution code, some item effects
This commit is contained in:
@@ -87,11 +87,6 @@ class Battle::Battler
|
||||
# Do other things
|
||||
@battle.pbClearChoice(@index) # Reset choice
|
||||
pbOwnSide.effects[PBEffects::LastRoundFainted] = @battle.turnCount
|
||||
if $game_temp.party_direct_damage_taken &&
|
||||
$game_temp.party_direct_damage_taken[@pokemonIndex] &&
|
||||
pbOwnedByPlayer?
|
||||
$game_temp.party_direct_damage_taken[@pokemonIndex] = 0
|
||||
end
|
||||
# Check other battlers' abilities that trigger upon a battler fainting
|
||||
pbAbilitiesOnFainting
|
||||
# Check for end of primordial weather
|
||||
|
||||
@@ -238,6 +238,9 @@ class Battle::Battler
|
||||
# Record move as having been used
|
||||
@lastMoveUsed = move.id
|
||||
@lastMoveUsedType = move.calcType # For Conversion 2
|
||||
if @pokemon.isSpecies?(:PRIMEAPE) && @lastMoveUsed == :RAGEFIST
|
||||
@pokemon.evolution_counter += 1
|
||||
end
|
||||
if !specialUsage
|
||||
@lastRegularMoveUsed = move.id # For Disable, Encore, Instruct, Mimic, Mirror Move, Sketch, Spite
|
||||
@lastRegularMoveTarget = choice[3] # For Instruct (remembering original target is fine)
|
||||
@@ -707,7 +710,13 @@ class Battle::Battler
|
||||
move.pbEffectAgainstTarget(user, b)
|
||||
end
|
||||
move.pbEffectGeneral(user)
|
||||
targets.each { |b| b.pbFaint if b&.fainted? }
|
||||
targets.each do |b|
|
||||
next if !b&.fainted?
|
||||
b.pbFaint
|
||||
if user.pokemon.isSpecies?(:BISHARP) && b.isSpecies?(:BISHARP) && b.item == :LEADERSCREST
|
||||
user.pokemon.evolution_counter += 1
|
||||
end
|
||||
end
|
||||
user.pbFaint if user.fainted?
|
||||
# Additional effect
|
||||
if !user.hasActiveAbility?(:SHEERFORCE)
|
||||
|
||||
Reference in New Issue
Block a user