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

Many more Rubocop-inspired code improvements

Browse Source
This commit is contained in:
Maruno17
2021-12-18 19:06:22 +00:00
parent d17fc40a47
commit 13a238cc6a
107 changed files with 651 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1689,12 +1689,8 @@ class Battle::AI
when "PowerHigherWithUserHeavierThanTarget"
#---------------------------------------------------------------------------
when "PowerUpAllyMove"
hasAlly = false
user.allAllies.each do |b|
hasAlly = true
score += 30
break
end
hasAlly = !user.allAllies.empty?
score += 30 if hasAlly
score -= 90 if !hasAlly
#---------------------------------------------------------------------------
when "StartWeakenElectricMoves"
@@ -1826,8 +1822,6 @@ class Battle::AI
#---------------------------------------------------------------------------
when "HitTwoTimes"
#---------------------------------------------------------------------------
when "HitTwoTimesPoisonTarget"
#---------------------------------------------------------------------------
when "HitThreeTimesPowersUpWithEachHit"
#---------------------------------------------------------------------------
when "HitTwoToFiveTimes"

13
Data/Scripts/011_Battle/005_AI/006_AI_Move_Utilities.rb
View File

@@ -273,12 +273,11 @@ class Battle::AI
targetTypes = target.pbTypes(true)
mult = Effectiveness.calculate(:FLYING,
targetTypes[0], targetTypes[1], targetTypes[2])
baseDmg = (baseDmg.to_f * mult / Effectiveness::NORMAL_EFFECTIVE).round
else
mult = Effectiveness.calculate(:FLYING,
target.types[0], target.types[1], target.effects[PBEffects::Type3])
baseDmg = (baseDmg.to_f * mult / Effectiveness::NORMAL_EFFECTIVE).round
end
baseDmg = (baseDmg.to_f * mult / Effectiveness::NORMAL_EFFECTIVE).round
end
baseDmg *= 2 if skill >= PBTrainerAI.mediumSkill && target.effects[PBEffects::Minimize]
when "DoublePowerIfUserLastMoveFailed" # Stomping Tantrum
@@ -472,15 +471,17 @@ class Battle::AI
if skill >= PBTrainerAI.mediumSkill
case user.effectiveWeather
when :Sun, :HarshSun
if type == :FIRE
case type
when :FIRE
multipliers[:final_damage_multiplier] *= 1.5
elsif type == :WATER
when :WATER
multipliers[:final_damage_multiplier] /= 2
end
when :Rain, :HeavyRain
if type == :FIRE
case type
when :FIRE
multipliers[:final_damage_multiplier] /= 2
elsif type == :WATER
when :WATER
multipliers[:final_damage_multiplier] *= 1.5
end
when :Sandstorm