From 80e95dc48ad426414d607fe1e99be99c37bc313a Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 24 Jun 2021 20:57:32 +0100 Subject: [PATCH] Fixed slightly inaccurate chances for each number of hits for moves that hit 2-5 times --- .../011_Battle/002_Move/006_Move_Effects_080-0FF.rb | 7 ++++++- Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb b/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb index 347abdb4e..1ce5c2d0d 100644 --- a/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb +++ b/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb @@ -1957,7 +1957,12 @@ class PokeBattle_Move_0C0 < PokeBattle_Move if @id == :WATERSHURIKEN && user.isSpecies?(:GRENINJA) && user.form == 2 return 3 end - hitChances = [2,2,3,3,4,5] + hitChances = [ + 2, 2, 2, 2, 2, 2, 2, + 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, + 5, 5, 5 + ] r = @battle.pbRandom(hitChances.length) r = hitChances.length-1 if user.hasActiveAbility?(:SKILLLINK) return hitChances[r] diff --git a/Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb b/Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb index e25af7437..131c2ae9a 100644 --- a/Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb +++ b/Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb @@ -216,7 +216,7 @@ class PokeBattle_AI if user.hasActiveAbility?(:SKILLLINK) baseDmg *= 5 else - baseDmg = (baseDmg*19/6).floor # Average damage dealt + baseDmg = (baseDmg * 31 / 10).floor # Average damage dealt end when "0C1" # Beat Up mult = 0