DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed Greninja's forms to add one with the Battle Bond ability

Browse Source
This commit is contained in:
Maruno17
2020-09-12 16:35:56 +01:00
parent a756539651
commit e4436c0fa3
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/012_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb
View File

@@ -102,12 +102,12 @@ class PokeBattle_Battler
!@battle.battleBond[user.index&1][user.pokemonIndex] !@battle.battleBond[user.index&1][user.pokemonIndex]
numFainted = 0 numFainted = 0
targets.each { |b| numFainted += 1 if b.damageState.fainted } targets.each { |b| numFainted += 1 if b.damageState.fainted }
if numFainted>0 && user.form!=1 if numFainted>0 && user.form==1
@battle.battleBond[user.index&1][user.pokemonIndex] = true @battle.battleBond[user.index&1][user.pokemonIndex] = true
@battle.pbDisplay(_INTL("{1} became fully charged due to its bond with its Trainer!",user.pbThis)) @battle.pbDisplay(_INTL("{1} became fully charged due to its bond with its Trainer!",user.pbThis))
@battle.pbShowAbilitySplash(user,true) @battle.pbShowAbilitySplash(user,true)
@battle.pbHideAbilitySplash(user) @battle.pbHideAbilitySplash(user)
user.pbChangeForm(1,_INTL("{1} became Ash-Greninja!",user.pbThis)) user.pbChangeForm(2,_INTL("{1} became Ash-Greninja!",user.pbThis))
end end
end end
end end

4
Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb
View File

@@ -1967,7 +1967,7 @@ class PokeBattle_Move_0C0 < PokeBattle_Move
def pbNumHits(user,targets) def pbNumHits(user,targets)
if isConst?(@id,PBMoves,:WATERSHURIKEN) && if isConst?(@id,PBMoves,:WATERSHURIKEN) &&
user.isSpecies?(:GRENINJA) && user.form==1 user.isSpecies?(:GRENINJA) && user.form==2
return 3 return 3
end end
hitChances = [2,2,3,3,4,5] hitChances = [2,2,3,3,4,5]
@@ -1978,7 +1978,7 @@ class PokeBattle_Move_0C0 < PokeBattle_Move
def pbBaseDamage(baseDmg,user,target) def pbBaseDamage(baseDmg,user,target)
if isConst?(@id,PBMoves,:WATERSHURIKEN) && if isConst?(@id,PBMoves,:WATERSHURIKEN) &&
user.isSpecies?(:GRENINJA) && user.form==1 user.isSpecies?(:GRENINJA) && user.form==2
return 20 return 20
end end
return super return super

2
Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb
View File

@@ -468,7 +468,7 @@ MultipleForms.register(:GENESECT,{
MultipleForms.register(:GRENINJA,{ MultipleForms.register(:GRENINJA,{
"getFormOnLeavingBattle" => proc { |pkmn,battle,usedInBattle,endBattle| "getFormOnLeavingBattle" => proc { |pkmn,battle,usedInBattle,endBattle|
next 0 if pkmn.fainted? || endBattle next 1 if pkmn.form == 2 && (pkmn.fainted? || endBattle)
} }
}) })

5
PBS/Gen 7/pokemonforms.txt
View File

@@ -1170,6 +1170,11 @@ FormName = Chill Drive
FormName = Douse Drive FormName = Douse Drive
#------------------------------- #-------------------------------
[GRENINJA,1] [GRENINJA,1]
Abilities = BATTLEBOND
HiddenAbility = BATTLEBOND
Compatibility = Undiscovered
#-------------------------------
[GRENINJA,2]
FormName = Ash-Greninja FormName = Ash-Greninja
BaseStats = 72,145,67,132,153,71 BaseStats = 72,145,67,132,153,71
Abilities = BATTLEBOND Abilities = BATTLEBOND

5
PBS/pokemonforms.txt
View File

@@ -1170,6 +1170,11 @@ FormName = Chill Drive
FormName = Douse Drive FormName = Douse Drive
#------------------------------- #-------------------------------
[GRENINJA,1] [GRENINJA,1]
Abilities = BATTLEBOND
HiddenAbility = BATTLEBOND
Compatibility = Undiscovered
#-------------------------------
[GRENINJA,2]
FormName = Ash-Greninja FormName = Ash-Greninja
BaseStats = 72,145,67,132,153,71 BaseStats = 72,145,67,132,153,71
Abilities = BATTLEBOND Abilities = BATTLEBOND