Merge branch 'master' into refactor

This commit is contained in:
Maruno17
2020-10-18 21:40:04 +01:00
49 changed files with 2885 additions and 2861 deletions

View File

@@ -135,7 +135,7 @@ class PokeBattle_AI
if @battle.pbRegisterSwitch(idxBattler,list[0])
PBDebug.log("[AI] #{battler.pbThis} (#{idxBattler}) will switch with " +
"#{@battle.pbParty(idxBattler)[list[0]].name}")
return
return true
end
end
end

View File

@@ -1364,7 +1364,7 @@ class PokeBattle_AI
:ROCK, # Cave
:GROUND # Sand
]
type = envtypes[@environment]
type = envtypes[@battle.environment]
score -= 90 if user.pbHasType?(type)
end
#---------------------------------------------------------------------------
@@ -2806,7 +2806,7 @@ class PokeBattle_AI
when "152"
#---------------------------------------------------------------------------
when "153"
score -= 95 if target.pbOwnSide.effects[PBEffects::StickyWeb]
score -= 95 if user.pbOpposingSide.effects[PBEffects::StickyWeb]
#---------------------------------------------------------------------------
when "154"
#---------------------------------------------------------------------------