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

Merge branch 'master' of https://github.com/Maruno17/pokemon-essentials

Browse Source
This commit is contained in:
Maruno17
2020-09-06 17:32:33 +01:00
parent 681a8331ab 7731893a1c
commit a91d13adcb
20 changed files with 102 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -33,7 +33,7 @@ end
class PokeBattle_Move_003 < PokeBattle_SleepMove
def pbMoveFailed?(user,targets)
if NEWEST_BATTLE_MECHANICS && isConst?(@id,PBMoves,:DARKVOID)
if !isConst?(user.species,PBSpecies,:DARKRAI) &&
if !user.isSpecies?(:DARKRAI) &&
!isConst?(user.effects[PBEffects::TransformSpecies],PBSpecies,:DARKRAI)
@battle.pbDisplay(_INTL("But {1} can't use the move!",user.pbThis))
return true
@@ -46,7 +46,7 @@ class PokeBattle_Move_003 < PokeBattle_SleepMove
return if numHits==0
return if user.fainted? || user.effects[PBEffects::Transform]
return if !isConst?(@id,PBMoves,:RELICSONG)
return if !isConst?(user.species,PBSpecies,:MELOETTA)
return if !user.isSpecies?(:MELOETTA)
return if user.hasActiveAbility?(:SHEERFORCE) && @addlEffect>0
newForm = (oldForm+1)%2
user.pbChangeForm(newForm,_INTL("{1} transformed!",user.pbThis))

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

12
Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
View File

@@ -730,11 +730,11 @@ class PokeBattle_Move_11A < PokeBattle_Move
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
if isConst?(target.species,PBSpecies,:DIGLETT) ||
isConst?(target.species,PBSpecies,:DUGTRIO) ||
isConst?(target.species,PBSpecies,:SANDYGAST) ||
isConst?(target.species,PBSpecies,:PALOSSAND) ||
(isConst?(target.species,PBSpecies,:GENGAR) && target.mega?)
if target.isSpecies?(:DIGLETT) ||
target.isSpecies?(:DUGTRIO) ||
target.isSpecies?(:SANDYGAST) ||
target.isSpecies?(:PALOSSAND) ||
(target.isSpecies?(:GENGAR) && target.mega?)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -1202,7 +1202,7 @@ class PokeBattle_Move_13B < PokeBattle_StatDownMove
end
def pbMoveFailed?(user,targets)
if !isConst?(user.species,PBSpecies,:HOOPA)
if !user.isSpecies?(:HOOPA)
@battle.pbDisplay(_INTL("But {1} can't use the move!",user.pbThis(true)))
return true
elsif user.form!=1