DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 06:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed typo relating to AI switching, fixed Pokémon sent from the party to storage in battle not resetting their battle-only conditions, fixed player's sprite in Duel minigame not caring about the player's outfit, added missing move flags

Browse Source
This commit is contained in:
Maruno17
2023-09-21 19:36:10 +01:00
parent bc18aa95f2
commit b2c66b7b0c
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/005_AI/005_AI_ChooseMove.rb
View File

@@ -342,7 +342,7 @@ class Battle::AI
if @trainer.high_skill? && @user.can_switch_lax?
badMoves = false
if max_score <= MOVE_USELESS_SCORE
badMoves = user_battler.can_attack?
badMoves = user.can_attack?
badMoves = true if !badMoves && pbAIRandom(100) < 25
elsif max_score < MOVE_BASE_SCORE * move_score_threshold && user_battler.turnCount > 2
badMoves = true if pbAIRandom(100) < 80

7
Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb
View File

@@ -32,8 +32,13 @@ module Battle::CatchAndStoreMixin
end
next if party_index < 0 # Cancelled
party_size = pbPlayer.party.length
# Send chosen Pokémon to storage
# Get chosen Pokémon and clear battle-related conditions
send_pkmn = pbPlayer.party[party_index]
@peer.pbOnLeavingBattle(self, send_pkmn, @usedInBattle[0][party_index], true)
send_pkmn.statusCount = 0 if send_pkmn.status == :POISON # Bad poison becomes regular
send_pkmn.makeUnmega
send_pkmn.makeUnprimal
# Send chosen Pokémon to storage
stored_box = @peer.pbStorePokemon(pbPlayer, send_pkmn)
pbPlayer.party.delete_at(party_index)
box_name = @peer.pbBoxName(stored_box)