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
2021-02-08 18:38:54 +00:00
parent 6bf749d3f3 9fe513ca16
commit 0c7aab530d
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb
View File

@@ -195,7 +195,7 @@ class PokeBattle_Battler
@effects[PBEffects::Illusion] = nil
if hasActiveAbility?(:ILLUSION)
idxLastParty = @battle.pbLastInTeam(@index)
if idxLastParty!=@pokemonIndex
if idxLastParty >= 0 && idxLastParty != @pokemonIndex
@effects[PBEffects::Illusion] = @battle.pbParty(@index)[idxLastParty]
end
end

2
Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -273,7 +273,7 @@ end
#===============================================================================
class PokeBattle_Move_012 < PokeBattle_FlinchMove
def pbMoveFailed?(user,targets)
if user.turnCount>1 || user.lastRoundMoved>=0
if user.turnCount > 1
@battle.pbDisplay(_INTL("But it failed!"))
return true
end

4
Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
View File

@@ -1556,7 +1556,7 @@ end
#===============================================================================
class PokeBattle_Move_149 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if user.turnCount>1 || user.lastRoundMoved>=0
if user.turnCount > 1
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2575,7 +2575,7 @@ end
#===============================================================================
class PokeBattle_Move_174 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if user.turnCount>1 || user.lastRoundMoved>=0
if user.turnCount > 1
@battle.pbDisplay(_INTL("But it failed!"))
return true
end

6
Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb
View File

@@ -169,7 +169,8 @@ class PokeBattle_Battle
idxPartyForName = idxPartyNew
enemyParty = pbParty(idxBattler)
if enemyParty[idxPartyNew].ability == :ILLUSION
idxPartyForName = pbLastInTeam(idxBattler)
new_index = pbLastInTeam(idxBattler)
idxPartyForName = new_index if new_index >= 0
end
if pbDisplayConfirm(_INTL("{1} is about to send in {2}. Will you switch your Pokémon?",
opponent.full_name, enemyParty[idxPartyForName].name))
@@ -255,7 +256,8 @@ class PokeBattle_Battle
party = pbParty(idxBattler)
newPkmnName = party[idxParty].name
if party[idxParty].ability == :ILLUSION
newPkmnName = party[pbLastInTeam(idxBattler)].name
new_index = pbLastInTeam(idxBattler)
newPkmnName = party[new_index].name if new_index >= 0
end
if pbOwnedByPlayer?(idxBattler)
opposing = @battlers[idxBattler].pbDirectOpposing

2
Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
View File

@@ -3026,7 +3026,7 @@ class PokeBattle_AI
when "173"
#---------------------------------------------------------------------------
when "174"
score -= 90 if user.turnCount>0 || user.lastRoundMoved>=0
score -= 90 if user.turnCount > 0
#---------------------------------------------------------------------------
when "175"
score += 30 if target.effects[PBEffects::Minimize]

2
Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb
View File

@@ -1661,7 +1661,7 @@ BattleHandlers::UserAbilityEndOfMove.add(:BEASTBOOST,
BattleHandlers::UserAbilityEndOfMove.add(:MAGICIAN,
proc { |ability,user,targets,move,battle|
next if !battle.futureSight
next if battle.futureSight
next if !move.pbDamagingMove?
next if user.item
next if battle.wildBattle? && user.opposes?