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

Merge branch 'dev' into dev-gen8

Browse Source
This commit is contained in:
Maruno17
2021-06-24 20:59:00 +01:00
parent 49e7374c3d 80e95dc48a
commit 18408d204e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
View File

@@ -1957,7 +1957,12 @@ class PokeBattle_Move_0C0 < PokeBattle_Move
if @id == :WATERSHURIKEN && user.isSpecies?(:GRENINJA) && user.form == 2 if @id == :WATERSHURIKEN && user.isSpecies?(:GRENINJA) && user.form == 2
return 3 return 3
end 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 = @battle.pbRandom(hitChances.length)
r = hitChances.length-1 if user.hasActiveAbility?(:SKILLLINK) r = hitChances.length-1 if user.hasActiveAbility?(:SKILLLINK)
return hitChances[r] return hitChances[r]

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

@@ -216,7 +216,7 @@ class PokeBattle_AI
if user.hasActiveAbility?(:SKILLLINK) if user.hasActiveAbility?(:SKILLLINK)
baseDmg *= 5 baseDmg *= 5
else else
baseDmg = (baseDmg*19/6).floor # Average damage dealt baseDmg = (baseDmg * 31 / 10).floor # Average damage dealt
end end
when "0C1" # Beat Up when "0C1" # Beat Up
mult = 0 mult = 0