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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2020-12-04 20:56:37 +00:00
parent 01f451b398 06682ba697
commit 0cbaba70d7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/012_Battle/004_AI/004_AI_Move.rb
View File

@@ -88,10 +88,8 @@ class PokeBattle_AI
next if !@battle.pbCanChooseMove?(idxBattler,i,false) next if !@battle.pbCanChooseMove?(idxBattler,i,false)
choices.push([i,100,-1]) # Move index, score, target choices.push([i,100,-1]) # Move index, score, target
end end
if choices.length==0 # No moves are physically possible to use if choices.length==0 # No moves are physically possible to use; use Struggle
user.eachMoveWithIndex do |_m,i| @battle.pbAutoChooseMove(user.index)
choices.push([i,100,-1]) # Move index, score, target
end
end end
end end
# Randomly choose a move from the choices and register it # Randomly choose a move from the choices and register it

1
Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb
View File

@@ -61,6 +61,7 @@ class PokeBattle_RealBattlePeer
# For switching out, including due to fainting, and for the end of battle # For switching out, including due to fainting, and for the end of battle
def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle=false) def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle=false)
return if !pkmn
f = MultipleForms.call("getFormOnLeavingBattle",pkmn,battle,usedInBattle,endBattle) f = MultipleForms.call("getFormOnLeavingBattle",pkmn,battle,usedInBattle,endBattle)
pkmn.form = f if f && pkmn.form!=f pkmn.form = f if f && pkmn.form!=f
pkmn.hp = pkmn.totalhp if pkmn.hp>pkmn.totalhp pkmn.hp = pkmn.totalhp if pkmn.hp>pkmn.totalhp

3
Data/Scripts/017_UI/027_PScreen_HallOfFame.rb
View File

@@ -486,7 +486,8 @@ class PokemonGlobalMetadata
attr_writer :hallOfFameLastNumber attr_writer :hallOfFameLastNumber
def hallOfFame def hallOfFame
return @hallOfFame || [] @hallOfFame = [] if !@hallOfFame
return @hallOfFame
end end
def hallOfFameLastNumber def hallOfFameLastNumber