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

Added some more Gen 8 item effects, added Intimidate being blocked by some abilities, fixed Nectars being usable on fainted Oricorio

Browse Source
This commit is contained in:
Maruno17
2021-07-17 20:48:06 +01:00
parent 78f5530cbe
commit 14748f4999
22 changed files with 206 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Data/Scripts/011_Battle/004_AI/005_AI_Move_EffectScores.rb
View File

@@ -455,7 +455,7 @@ class PokeBattle_AI
end
end
if move.function=="028" # Growth
score += 20 if [:Sun, :HarshSun].include?(@battle.pbWeather)
score += 20 if [:Sun, :HarshSun].include?(user.effectiveWeather)
end
end
#---------------------------------------------------------------------------
@@ -1869,7 +1869,7 @@ class PokeBattle_AI
if user.hp==user.totalhp || (skill>=PBTrainerAI.mediumSkill && !user.canHeal?)
score -= 90
else
case @battle.pbWeather
case user.effectiveWeather
when :Sun, :HarshSun
score += 30
when :None
@@ -2159,7 +2159,7 @@ class PokeBattle_AI
if @battle.pbCheckGlobalAbility(:AIRLOCK) ||
@battle.pbCheckGlobalAbility(:CLOUDNINE)
score -= 90
elsif @battle.pbWeather == :Sun
elsif @battle.field.weather == :Sun
score -= 90
else
user.eachMove do |m|
@@ -2172,7 +2172,7 @@ class PokeBattle_AI
if @battle.pbCheckGlobalAbility(:AIRLOCK) ||
@battle.pbCheckGlobalAbility(:CLOUDNINE)
score -= 90
elsif @battle.pbWeather == :Rain
elsif @battle.field.weather == :Rain
score -= 90
else
user.eachMove do |m|
@@ -2185,7 +2185,7 @@ class PokeBattle_AI
if @battle.pbCheckGlobalAbility(:AIRLOCK) ||
@battle.pbCheckGlobalAbility(:CLOUDNINE)
score -= 90
elsif @battle.pbWeather == :Sandstorm
elsif @battle.field.weather == :Sandstorm
score -= 90
end
#---------------------------------------------------------------------------
@@ -2193,7 +2193,7 @@ class PokeBattle_AI
if @battle.pbCheckGlobalAbility(:AIRLOCK) ||
@battle.pbCheckGlobalAbility(:CLOUDNINE)
score -= 90
elsif @battle.pbWeather == :Hail
elsif @battle.field.weather == :Hail
score -= 90
end
#---------------------------------------------------------------------------
@@ -2522,7 +2522,7 @@ class PokeBattle_AI
if @battle.pbCheckGlobalAbility(:AIRLOCK) ||
@battle.pbCheckGlobalAbility(:CLOUDNINE)
score -= 90
elsif @battle.pbWeather == :ShadowSky
elsif @battle.field.weather == :ShadowSky
score -= 90
end
#---------------------------------------------------------------------------
@@ -2929,7 +2929,7 @@ class PokeBattle_AI
when "166"
#---------------------------------------------------------------------------
when "167"
if user.pbOwnSide.effects[PBEffects::AuroraVeil]>0 || @battle.pbWeather != :Hail
if user.pbOwnSide.effects[PBEffects::AuroraVeil]>0 || user.effectiveWeather != :Hail
score -= 90
else
score += 40
@@ -2988,7 +2988,7 @@ class PokeBattle_AI
else
score += 50
score -= user.hp*100/user.totalhp
score += 30 if @battle.pbWeather == :Sandstorm
score += 30 if user.effectiveWeather == :Sandstorm
end
#---------------------------------------------------------------------------
when "16E"

4
Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb
View File

@@ -43,7 +43,7 @@ class PokeBattle_AI
Effectiveness.ineffective_type?(moveType, defType)
end
# Delta Stream's weather
if @battle.pbWeather == :StrongWinds
if target.effectiveWeather == :StrongWinds
ret = Effectiveness::NORMAL_EFFECTIVE_ONE if defType == :FLYING &&
Effectiveness.super_effective_type?(moveType, defType)
end
@@ -439,7 +439,7 @@ class PokeBattle_AI
end
# Weather
if skill>=PBTrainerAI.mediumSkill
case @battle.pbWeather
case user.effectiveWeather
when :Sun, :HarshSun
if type == :FIRE
multipliers[:final_damage_multiplier] *= 1.5