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

Merge pull request #8 from jonisavo/pokemon-use-isSpecies

Browse Source 
Check for Pokémon species with #isSpecies? instead of Object.isConst?
This commit is contained in:
Maruno17
2020-09-06 12:42:48 +01:00
committed by GitHub
parent 2bd3a6dd99 1473d83a31
commit 7731893a1c
19 changed files with 91 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,6 +271,10 @@ class PokeBattle_Battler
return ret return ret
end end
def isSpecies?(species)
return @pokemon && @pokemon.isSpecies?(species)
end
# Returns the active types of this Pokémon. The array should not include the # Returns the active types of this Pokémon. The array should not include the
# same type more than once, and should not include any invalid type numbers # same type more than once, and should not include any invalid type numbers
# (e.g. -1). # (e.g. -1).

2
Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb
View File

@@ -108,7 +108,7 @@ class PokeBattle_Battler
end end
# These effects are passed on if Baton Pass is used, but they need to be # These effects are passed on if Baton Pass is used, but they need to be
# cancelled in certain circumstances anyway # cancelled in certain circumstances anyway
@effects[PBEffects::Telekinesis] = 0 if isConst?(@species,PBSpecies,:GENGAR) && mega? @effects[PBEffects::Telekinesis] = 0 if isSpecies?(:GENGAR) && mega?
@effects[PBEffects::GastroAcid] = false if nonNegatableAbility? @effects[PBEffects::GastroAcid] = false if nonNegatableAbility?
else else
# These effects are passed on if Baton Pass is used # These effects are passed on if Baton Pass is used

16
Data/Scripts/012_Battle/001_Battler/003_Battler_ChangeSelf.rb
View File

@@ -149,7 +149,7 @@ class PokeBattle_Battler
def pbCheckFormOnStatusChange def pbCheckFormOnStatusChange
return if fainted? || @effects[PBEffects::Transform] return if fainted? || @effects[PBEffects::Transform]
# Shaymin - reverts if frozen # Shaymin - reverts if frozen
if isConst?(@species,PBSpecies,:SHAYMIN) && frozen? if isSpecies?(:SHAYMIN) && frozen?
pbChangeForm(0,_INTL("{1} transformed!",pbThis)) pbChangeForm(0,_INTL("{1} transformed!",pbThis))
end end
end end
@@ -157,7 +157,7 @@ class PokeBattle_Battler
def pbCheckFormOnMovesetChange def pbCheckFormOnMovesetChange
return if fainted? || @effects[PBEffects::Transform] return if fainted? || @effects[PBEffects::Transform]
# Keldeo - knowing Secret Sword # Keldeo - knowing Secret Sword
if isConst?(@species,PBSpecies,:KELDEO) if isSpecies?(:KELDEO)
newForm = 0 newForm = 0
newForm = 1 if pbHasMove?(:SECRETSWORD) newForm = 1 if pbHasMove?(:SECRETSWORD)
pbChangeForm(newForm,_INTL("{1} transformed!",pbThis)) pbChangeForm(newForm,_INTL("{1} transformed!",pbThis))
@@ -167,7 +167,7 @@ class PokeBattle_Battler
def pbCheckFormOnWeatherChange def pbCheckFormOnWeatherChange
return if fainted? || @effects[PBEffects::Transform] return if fainted? || @effects[PBEffects::Transform]
# Castform - Forecast # Castform - Forecast
if isConst?(@species,PBSpecies,:CASTFORM) if isSpecies?(:CASTFORM)
if hasActiveAbility?(:FORECAST) if hasActiveAbility?(:FORECAST)
newForm = 0 newForm = 0
case @battle.pbWeather case @battle.pbWeather
@@ -185,7 +185,7 @@ class PokeBattle_Battler
end end
end end
# Cherrim - Flower Gift # Cherrim - Flower Gift
if isConst?(@species,PBSpecies,:CHERRIM) if isSpecies?(:CHERRIM)
if hasActiveAbility?(:FLOWERGIFT) if hasActiveAbility?(:FLOWERGIFT)
newForm = 0 newForm = 0
case @battle.pbWeather case @battle.pbWeather
@@ -210,7 +210,7 @@ class PokeBattle_Battler
# Form changes upon entering battle and when the weather changes # Form changes upon entering battle and when the weather changes
pbCheckFormOnWeatherChange if !endOfRound pbCheckFormOnWeatherChange if !endOfRound
# Darmanitan - Zen Mode # Darmanitan - Zen Mode
if isConst?(@species,PBSpecies,:DARMANITAN) && isConst?(@ability,PBAbilities,:ZENMODE) if isSpecies?(:DARMANITAN) && isConst?(@ability,PBAbilities,:ZENMODE)
if @hp<=@totalhp/2 if @hp<=@totalhp/2
if @form!=1 if @form!=1
@battle.pbShowAbilitySplash(self,true) @battle.pbShowAbilitySplash(self,true)
@@ -224,7 +224,7 @@ class PokeBattle_Battler
end end
end end
# Minior - Shields Down # Minior - Shields Down
if isConst?(@species,PBSpecies,:MINIOR) && isConst?(@ability,PBAbilities,:SHIELDSDOWN) if isSpecies?(:MINIOR) && isConst?(@ability,PBAbilities,:SHIELDSDOWN)
if @hp>@totalhp/2 # Turn into Meteor form if @hp>@totalhp/2 # Turn into Meteor form
newForm = (@form>=7) ? @form-7 : @form newForm = (@form>=7) ? @form-7 : @form
if @form!=newForm if @form!=newForm
@@ -241,7 +241,7 @@ class PokeBattle_Battler
end end
end end
# Wishiwashi - Schooling # Wishiwashi - Schooling
if isConst?(@species,PBSpecies,:WISHIWASHI) && isConst?(@ability,PBAbilities,:SCHOOLING) if isSpecies?(:WISHIWASHI) && isConst?(@ability,PBAbilities,:SCHOOLING)
if @level>=20 && @hp>@totalhp/4 if @level>=20 && @hp>@totalhp/4
if @form!=1 if @form!=1
@battle.pbShowAbilitySplash(self,true) @battle.pbShowAbilitySplash(self,true)
@@ -255,7 +255,7 @@ class PokeBattle_Battler
end end
end end
# Zygarde - Power Construct # Zygarde - Power Construct
if isConst?(@species,PBSpecies,:ZYGARDE) && isConst?(@ability,PBAbilities,:POWERCONSTRUCT) && if isSpecies?(:ZYGARDE) && isConst?(@ability,PBAbilities,:POWERCONSTRUCT) &&
endOfRound endOfRound
if @hp<=@totalhp/2 && @form<2 # Turn into Complete Forme if @hp<=@totalhp/2 && @form<2 # Turn into Complete Forme
newForm = @form+2 newForm = @form+2

2
Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -216,7 +216,7 @@ class PokeBattle_Battler
end end
end end
# Stance Change # Stance Change
if isConst?(@species,PBSpecies,:AEGISLASH) && isConst?(@ability,PBAbilities,:STANCECHANGE) if isSpecies?(:AEGISLASH) && isConst?(@ability,PBAbilities,:STANCECHANGE)
if move.damagingMove? if move.damagingMove?
pbChangeForm(1,_INTL("{1} changed to Blade Forme!",pbThis)) pbChangeForm(1,_INTL("{1} changed to Blade Forme!",pbThis))
elsif isConst?(move.id,PBMoves,:KINGSSHIELD) elsif isConst?(move.id,PBMoves,:KINGSSHIELD)

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

@@ -96,7 +96,7 @@ class PokeBattle_Battler
end end
# Greninja - Battle Bond # Greninja - Battle Bond
if !user.fainted? && !user.effects[PBEffects::Transform] && if !user.fainted? && !user.effects[PBEffects::Transform] &&
isConst?(user.species,PBSpecies,:GRENINJA) && user.isSpecies?(:GRENINJA) &&
isConst?(user.ability,PBAbilities,:BATTLEBOND) isConst?(user.ability,PBAbilities,:BATTLEBOND)
if !@battle.pbAllFainted?(user.idxOpposingSide) && if !@battle.pbAllFainted?(user.idxOpposingSide) &&
!@battle.battleBond[user.index&1][user.pokemonIndex] !@battle.battleBond[user.index&1][user.pokemonIndex]

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

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

@@ -1969,7 +1969,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) &&
isConst?(user.species,PBSpecies,:GRENINJA) && user.form==1 user.isSpecies?(:GRENINJA) && user.form==1
return 3 return 3
end end
hitChances = [2,2,3,3,4,5] hitChances = [2,2,3,3,4,5]
@@ -1980,7 +1980,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) &&
isConst?(user.species,PBSpecies,:GRENINJA) && user.form==1 user.isSpecies?(:GRENINJA) && user.form==1
return 20 return 20
end end
return super 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!")) @battle.pbDisplay(_INTL("But it failed!"))
return true return true
end end
if isConst?(target.species,PBSpecies,:DIGLETT) || if target.isSpecies?(:DIGLETT) ||
isConst?(target.species,PBSpecies,:DUGTRIO) || target.isSpecies?(:DUGTRIO) ||
isConst?(target.species,PBSpecies,:SANDYGAST) || target.isSpecies?(:SANDYGAST) ||
isConst?(target.species,PBSpecies,:PALOSSAND) || target.isSpecies?(:PALOSSAND) ||
(isConst?(target.species,PBSpecies,:GENGAR) && target.mega?) (target.isSpecies?(:GENGAR) && target.mega?)
@battle.pbDisplay(_INTL("But it failed!")) @battle.pbDisplay(_INTL("But it failed!"))
return true return true
end end
@@ -1202,7 +1202,7 @@ class PokeBattle_Move_13B < PokeBattle_StatDownMove
end end
def pbMoveFailed?(user,targets) 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))) @battle.pbDisplay(_INTL("But {1} can't use the move!",user.pbThis(true)))
return true return true
elsif user.form!=1 elsif user.form!=1

22
Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
View File

@@ -170,17 +170,17 @@ module PokeBattle_BattleCommon
rareness = pbGetSpeciesData(pkmn.species,pkmn.form,SpeciesRareness) rareness = pbGetSpeciesData(pkmn.species,pkmn.form,SpeciesRareness)
end end
# Modify rareness depending on the Poké Ball's effect # Modify rareness depending on the Poké Ball's effect
ultraBeast = (isConst?(battler.species,PBSpecies,:NIHILEGO) || ultraBeast = (battler.isSpecies?(:NIHILEGO) ||
isConst?(battler.species,PBSpecies,:BUZZWOLE) || battler.isSpecies?(:BUZZWOLE) ||
isConst?(battler.species,PBSpecies,:PHEROMOSA) || battler.isSpecies?(:PHEROMOSA) ||
isConst?(battler.species,PBSpecies,:XURKITREE) || battler.isSpecies?(:XURKITREE) ||
isConst?(battler.species,PBSpecies,:CELESTEELA) || battler.isSpecies?(:CELESTEELA) ||
isConst?(battler.species,PBSpecies,:KARTANA) || battler.isSpecies?(:KARTANA) ||
isConst?(battler.species,PBSpecies,:GUZZLORD) || battler.isSpecies?(:GUZZLORD) ||
isConst?(battler.species,PBSpecies,:POIPOLE) || battler.isSpecies?(:POIPOLE) ||
isConst?(battler.species,PBSpecies,:NAGANADEL) || battler.isSpecies?(:NAGANADEL) ||
isConst?(battler.species,PBSpecies,:STAKATAKA) || battler.isSpecies?(:STAKATAKA) ||
isConst?(battler.species,PBSpecies,:BLACEPHALON)) battler.isSpecies?(:BLACEPHALON))
if !ultraBeast || isConst?(ball,PBItems,:BEASTBALL) if !ultraBeast || isConst?(ball,PBItems,:BEASTBALL)
rareness = BallHandlers.modifyCatchRate(ball,rareness,self,battler,ultraBeast) rareness = BallHandlers.modifyCatchRate(ball,rareness,self,battler,ultraBeast)
else else

10
Data/Scripts/012_Battle/003_Battle/009_Battle_Action_Other.rb
View File

@@ -157,7 +157,7 @@ class PokeBattle_Battle
side = battler.idxOwnSide side = battler.idxOwnSide
owner = pbGetOwnerIndexFromBattlerIndex(idxBattler) owner = pbGetOwnerIndexFromBattlerIndex(idxBattler)
@megaEvolution[side][owner] = -2 @megaEvolution[side][owner] = -2
if isConst?(battler.species,PBSpecies,:GENGAR) && battler.mega? if battler.isSpecies?(:GENGAR) && battler.mega?
battler.effects[PBEffects::Telekinesis] = 0 battler.effects[PBEffects::Telekinesis] = 0
end end
pbCalculatePriority(false,[idxBattler]) if NEWEST_BATTLE_MECHANICS pbCalculatePriority(false,[idxBattler]) if NEWEST_BATTLE_MECHANICS
@@ -172,9 +172,9 @@ class PokeBattle_Battle
battler = @battlers[idxBattler] battler = @battlers[idxBattler]
return if !battler || !battler.pokemon return if !battler || !battler.pokemon
return if !battler.hasPrimal? || battler.primal? return if !battler.hasPrimal? || battler.primal?
if isConst?(battler.pokemon.species,PBSpecies,:KYOGRE) if battler.isSpecies?(:KYOGRE)
pbCommonAnimation("PrimalKyogre",battler) pbCommonAnimation("PrimalKyogre",battler)
elsif isConst?(battler.pokemon.species,PBSpecies,:GROUDON) elsif battler.isSpecies?(:GROUDON)
pbCommonAnimation("PrimalGroudon",battler) pbCommonAnimation("PrimalGroudon",battler)
end end
battler.pokemon.makePrimal battler.pokemon.makePrimal
@@ -182,9 +182,9 @@ class PokeBattle_Battle
battler.pbUpdate(true) battler.pbUpdate(true)
@scene.pbChangePokemon(battler,battler.pokemon) @scene.pbChangePokemon(battler,battler.pokemon)
@scene.pbRefreshOne(idxBattler) @scene.pbRefreshOne(idxBattler)
if isConst?(battler.pokemon.species,PBSpecies,:KYOGRE) if battler.isSpecies?(:KYOGRE)
pbCommonAnimation("PrimalKyogre2",battler) pbCommonAnimation("PrimalKyogre2",battler)
elsif isConst?(battler.pokemon.species,PBSpecies,:GROUDON) elsif battler.isSpecies?(:GROUDON)
pbCommonAnimation("PrimalGroudon2",battler) pbCommonAnimation("PrimalGroudon2",battler)
end end
pbDisplay(_INTL("{1}'s Primal Reversion!\nIt reverted to its primal form!",battler.pbThis)) pbDisplay(_INTL("{1}'s Primal Reversion!\nIt reverted to its primal form!",battler.pbThis))

2
Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
View File

@@ -2627,7 +2627,7 @@ class PokeBattle_AI
score += avg/2 score += avg/2
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
when "13B" when "13B"
if !isConst?(user.species,PBSpecies,:HOOPA) || user.form!=1 if !user.isSpecies?(:HOOPA) || user.form!=1
score -= 100 score -= 100
else else
score += 20 if target.stages[PBStats::DEFENSE]>0 score += 20 if target.stages[PBStats::DEFENSE]>0

4
Data/Scripts/012_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb
View File

@@ -234,9 +234,9 @@ class PokemonDataBox < SpriteWrapper
imagePos.push(["Graphics/Pictures/Battle/icon_mega",@spriteBaseX+8,34]) imagePos.push(["Graphics/Pictures/Battle/icon_mega",@spriteBaseX+8,34])
elsif @battler.primal? elsif @battler.primal?
primalX = (@battler.opposes?) ? 208 : -28 # Foe's/player's primalX = (@battler.opposes?) ? 208 : -28 # Foe's/player's
if isConst?(@battler.pokemon.species,PBSpecies,:KYOGRE) if @battler.isSpecies?(:KYOGRE)
imagePos.push(["Graphics/Pictures/Battle/icon_primal_Kyogre",@spriteBaseX+primalX,4]) imagePos.push(["Graphics/Pictures/Battle/icon_primal_Kyogre",@spriteBaseX+primalX,4])
elsif isConst?(@battler.pokemon.species,PBSpecies,:GROUDON) elsif @battler.isSpecies?(:GROUDON)
imagePos.push(["Graphics/Pictures/Battle/icon_primal_Groudon",@spriteBaseX+primalX,4]) imagePos.push(["Graphics/Pictures/Battle/icon_primal_Groudon",@spriteBaseX+primalX,4])
end end
end end

6
Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb
View File

@@ -119,7 +119,7 @@ BattleHandlers::AbilityOnHPDroppedBelowHalf.copy(:EMERGENCYEXIT,:WIMPOUT)
BattleHandlers::StatusCheckAbilityNonIgnorable.add(:COMATOSE, BattleHandlers::StatusCheckAbilityNonIgnorable.add(:COMATOSE,
proc { |ability,battler,status| proc { |ability,battler,status|
next false if !isConst?(battler.species,PBSpecies,:KOMALA) next false if !battler.isSpecies?(:KOMALA)
next true if status.nil? || status==PBStatuses::SLEEP next true if status.nil? || status==PBStatuses::SLEEP
} }
) )
@@ -181,13 +181,13 @@ BattleHandlers::StatusImmunityAbility.copy(:WATERVEIL,:WATERBUBBLE)
BattleHandlers::StatusImmunityAbilityNonIgnorable.add(:COMATOSE, BattleHandlers::StatusImmunityAbilityNonIgnorable.add(:COMATOSE,
proc { |ability,battler,status| proc { |ability,battler,status|
next true if isConst?(battler.species,PBSpecies,:KOMALA) next true if battler.isSpecies?(:KOMALA)
} }
) )
BattleHandlers::StatusImmunityAbilityNonIgnorable.add(:SHIELDSDOWN, BattleHandlers::StatusImmunityAbilityNonIgnorable.add(:SHIELDSDOWN,
proc { |ability,battler,status| proc { |ability,battler,status|
next true if isConst?(battler.species,PBSpecies,:MINIOR) && battler.form<7 next true if battler.isSpecies?(:MINIOR) && battler.form<7
} }
) )

22
Data/Scripts/012_Battle/008_BattleHandlers_Items.rb
View File

@@ -20,7 +20,7 @@ BattleHandlers::SpeedCalcItem.copy(:MACHOBRACE,:POWERANKLET,:POWERBAND,
BattleHandlers::SpeedCalcItem.add(:QUICKPOWDER, BattleHandlers::SpeedCalcItem.add(:QUICKPOWDER,
proc { |item,battler,mult| proc { |item,battler,mult|
next mult*2 if isConst?(battler.species,PBSpecies,:DITTO) && next mult*2 if battler.isSpecies?(:DITTO) &&
!battler.effects[PBEffects::Transform] !battler.effects[PBEffects::Transform]
} }
) )
@@ -442,7 +442,7 @@ BattleHandlers::AccuracyCalcTargetItem.copy(:BRIGHTPOWDER,:LAXINCENSE)
BattleHandlers::DamageCalcUserItem.add(:ADAMANTORB, BattleHandlers::DamageCalcUserItem.add(:ADAMANTORB,
proc { |item,user,target,move,mults,baseDmg,type| proc { |item,user,target,move,mults,baseDmg,type|
if isConst?(user.species,PBSpecies,:DIALGA) && if user.isSpecies?(:DIALGA) &&
(isConst?(type,PBTypes,:DRAGON) || isConst?(type,PBTypes,:STEEL)) (isConst?(type,PBTypes,:DRAGON) || isConst?(type,PBTypes,:STEEL))
mults[BASE_DMG_MULT] = (mults[BASE_DMG_MULT]*1.2).round mults[BASE_DMG_MULT] = (mults[BASE_DMG_MULT]*1.2).round
end end
@@ -499,7 +499,7 @@ BattleHandlers::DamageCalcUserItem.add(:DARKGEM,
BattleHandlers::DamageCalcUserItem.add(:DEEPSEATOOTH, BattleHandlers::DamageCalcUserItem.add(:DEEPSEATOOTH,
proc { |item,user,target,move,mults,baseDmg,type| proc { |item,user,target,move,mults,baseDmg,type|
if isConst?(user.species,PBSpecies,:CLAMPERL) && move.specialMove? if user.isSpecies?(:CLAMPERL) && move.specialMove?
mults[ATK_MULT] *= 2 mults[ATK_MULT] *= 2
end end
} }
@@ -571,7 +571,7 @@ BattleHandlers::DamageCalcUserItem.add(:GRASSGEM,
BattleHandlers::DamageCalcUserItem.add(:GRISEOUSORB, BattleHandlers::DamageCalcUserItem.add(:GRISEOUSORB,
proc { |item,user,target,move,mults,baseDmg,type| proc { |item,user,target,move,mults,baseDmg,type|
if isConst?(user.species,PBSpecies,:GIRATINA) && if user.isSpecies?(:GIRATINA) &&
(isConst?(type,PBTypes,:DRAGON) || isConst?(type,PBTypes,:GHOST)) (isConst?(type,PBTypes,:DRAGON) || isConst?(type,PBTypes,:GHOST))
mults[BASE_DMG_MULT] = (mults[BASE_DMG_MULT]*1.2).round mults[BASE_DMG_MULT] = (mults[BASE_DMG_MULT]*1.2).round
end end
@@ -608,7 +608,7 @@ BattleHandlers::DamageCalcUserItem.add(:LIFEORB,
BattleHandlers::DamageCalcUserItem.add(:LIGHTBALL, BattleHandlers::DamageCalcUserItem.add(:LIGHTBALL,
proc { |item,user,target,move,mults,baseDmg,type| proc { |item,user,target,move,mults,baseDmg,type|
if isConst?(user.species,PBSpecies,:PIKACHU) if user.isSpecies?(:PIKACHU)
mults[ATK_MULT] *= 2 mults[ATK_MULT] *= 2
end end
} }
@@ -616,7 +616,7 @@ BattleHandlers::DamageCalcUserItem.add(:LIGHTBALL,
BattleHandlers::DamageCalcUserItem.add(:LUSTROUSORB, BattleHandlers::DamageCalcUserItem.add(:LUSTROUSORB,
proc { |item,user,target,move,mults,baseDmg,type| proc { |item,user,target,move,mults,baseDmg,type|
if isConst?(user.species,PBSpecies,:PALKIA) && if user.isSpecies?(:PALKIA) &&
(isConst?(type,PBTypes,:DRAGON) || isConst?(type,PBTypes,:WATER)) (isConst?(type,PBTypes,:DRAGON) || isConst?(type,PBTypes,:WATER))
mults[BASE_DMG_MULT] = (mults[BASE_DMG_MULT]*1.2).round mults[BASE_DMG_MULT] = (mults[BASE_DMG_MULT]*1.2).round
end end
@@ -746,8 +746,7 @@ BattleHandlers::DamageCalcUserItem.copy(:SOFTSAND,:EARTHPLATE)
BattleHandlers::DamageCalcUserItem.add(:SOULDEW, BattleHandlers::DamageCalcUserItem.add(:SOULDEW,
proc { |item,user,target,move,mults,baseDmg,type| proc { |item,user,target,move,mults,baseDmg,type|
next if !isConst?(user.species,PBSpecies,:LATIAS) && next if !user.isSpecies?(:LATIAS) && !user.isSpecies?(:LATIOS)
!isConst?(user.species,PBSpecies,:LATIOS)
if NEWEST_BATTLE_MECHANICS if NEWEST_BATTLE_MECHANICS
if isConst?(type,PBTypes,:PSYCHIC) || isConst?(type,PBTypes,:DRAGON) if isConst?(type,PBTypes,:PSYCHIC) || isConst?(type,PBTypes,:DRAGON)
mults[FINAL_DMG_MULT] = (mults[FINAL_DMG_MULT]*1.2).round mults[FINAL_DMG_MULT] = (mults[FINAL_DMG_MULT]*1.2).round
@@ -776,8 +775,7 @@ BattleHandlers::DamageCalcUserItem.add(:STEELGEM,
BattleHandlers::DamageCalcUserItem.add(:THICKCLUB, BattleHandlers::DamageCalcUserItem.add(:THICKCLUB,
proc { |item,user,target,move,mults,baseDmg,type| proc { |item,user,target,move,mults,baseDmg,type|
if (isConst?(user.species,PBSpecies,:CUBONE) || if (user.isSpecies?(:CUBONE) || user.isSpecies?(:MAROWAK)) && move.physicalMove?
isConst?(user.species,PBSpecies,:MAROWAK)) && move.physicalMove?
mults[ATK_MULT] *= 2 mults[ATK_MULT] *= 2
end end
} }
@@ -969,7 +967,7 @@ BattleHandlers::DamageCalcTargetItem.add(:YACHEBERRY,
BattleHandlers::CriticalCalcUserItem.add(:LUCKYPUNCH, BattleHandlers::CriticalCalcUserItem.add(:LUCKYPUNCH,
proc { |item,user,target,c| proc { |item,user,target,c|
next c+2 if isConst?(user.species,PBSpecies,:CHANSEY) next c+2 if user.isSpecies?(:CHANSEY)
} }
) )
@@ -983,7 +981,7 @@ BattleHandlers::CriticalCalcUserItem.copy(:RAZORCLAW,:SCOPELENS)
BattleHandlers::CriticalCalcUserItem.add(:STICK, BattleHandlers::CriticalCalcUserItem.add(:STICK,
proc { |item,user,target,c| proc { |item,user,target,c|
next c+2 if isConst?(user.species,PBSpecies,:FARFETCHD) next c+2 if user.isSpecies?(:FARFETCHD)
} }
) )

39
Data/Scripts/015_Items/002_PItem_ItemEffects.rb
View File

@@ -837,7 +837,7 @@ ItemHandlers::UseOnPokemon.add(:TAMATOBERRY,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:GRACIDEA,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:GRACIDEA,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:SHAYMIN) || pkmn.form!=0 || if !pkmn.isSpecies?(:SHAYMIN) || pkmn.form!=0 ||
pkmn.status==PBStatuses::FROZEN || PBDayNight.isNight? pkmn.status==PBStatuses::FROZEN || PBDayNight.isNight?
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
@@ -854,7 +854,7 @@ ItemHandlers::UseOnPokemon.add(:GRACIDEA,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:REDNECTAR,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:REDNECTAR,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:ORICORIO) || pkmn.form==0 if !pkmn.isSpecies?(:ORICORIO) || pkmn.form==0
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -869,7 +869,7 @@ ItemHandlers::UseOnPokemon.add(:REDNECTAR,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:YELLOWNECTAR,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:YELLOWNECTAR,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:ORICORIO) || pkmn.form==1 if !pkmn.isSpecies?(:ORICORIO) || pkmn.form==1
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -884,7 +884,7 @@ ItemHandlers::UseOnPokemon.add(:YELLOWNECTAR,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:PINKNECTAR,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:PINKNECTAR,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:ORICORIO) || pkmn.form==2 if !pkmn.isSpecies?(:ORICORIO) || pkmn.form==2
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -899,7 +899,7 @@ ItemHandlers::UseOnPokemon.add(:PINKNECTAR,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:PURPLENECTAR,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:PURPLENECTAR,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:ORICORIO) || pkmn.form==3 if !pkmn.isSpecies?(:ORICORIO) || pkmn.form==3
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -914,9 +914,9 @@ ItemHandlers::UseOnPokemon.add(:PURPLENECTAR,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:REVEALGLASS,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:REVEALGLASS,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:TORNADUS) && if !pkmn.isSpecies?(:TORNADUS) &&
!isConst?(pkmn.species,PBSpecies,:THUNDURUS) && !pkmn.isSpecies?(:THUNDURUS) &&
!isConst?(pkmn.species,PBSpecies,:LANDORUS) !pkmn.isSpecies?(:LANDORUS)
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -933,7 +933,7 @@ ItemHandlers::UseOnPokemon.add(:REVEALGLASS,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:PRISONBOTTLE,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:PRISONBOTTLE,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:HOOPA) if !pkmn.isSpecies?(:HOOPA)
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -949,7 +949,7 @@ ItemHandlers::UseOnPokemon.add(:PRISONBOTTLE,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:DNASPLICERS,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:DNASPLICERS,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:KYUREM) if !pkmn.isSpecies?(:KYUREM)
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -967,13 +967,13 @@ ItemHandlers::UseOnPokemon.add(:DNASPLICERS,proc { |item,pkmn,scene|
scene.pbDisplay(_INTL("It cannot be fused with an Egg.")) scene.pbDisplay(_INTL("It cannot be fused with an Egg."))
elsif poke2.fainted? elsif poke2.fainted?
scene.pbDisplay(_INTL("It cannot be fused with that fainted Pokémon.")) scene.pbDisplay(_INTL("It cannot be fused with that fainted Pokémon."))
elsif !isConst?(poke2.species,PBSpecies,:RESHIRAM) && elsif !poke2.isSpecies?(:RESHIRAM) &&
!isConst?(poke2.species,PBSpecies,:ZEKROM) !poke2.isSpecies?(:ZEKROM)
scene.pbDisplay(_INTL("It cannot be fused with that Pokémon.")) scene.pbDisplay(_INTL("It cannot be fused with that Pokémon."))
end end
newForm = 0 newForm = 0
newForm = 1 if isConst?(poke2.species,PBSpecies,:RESHIRAM) newForm = 1 if poke2.isSpecies?(:RESHIRAM)
newForm = 2 if isConst?(poke2.species,PBSpecies,:ZEKROM) newForm = 2 if poke2.isSpecies?(:ZEKROM)
pkmn.setForm(newForm) { pkmn.setForm(newForm) {
pkmn.fused = poke2 pkmn.fused = poke2
pbRemovePokemonAt(chosen) pbRemovePokemonAt(chosen)
@@ -997,7 +997,7 @@ ItemHandlers::UseOnPokemon.add(:DNASPLICERS,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:NSOLARIZER,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:NSOLARIZER,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:NECROZMA) || pkmn.form==0 if !pkmn.isSpecies?(:NECROZMA) || pkmn.form==0
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -1015,7 +1015,7 @@ ItemHandlers::UseOnPokemon.add(:NSOLARIZER,proc { |item,pkmn,scene|
scene.pbDisplay(_INTL("It cannot be fused with an Egg.")) scene.pbDisplay(_INTL("It cannot be fused with an Egg."))
elsif poke2.fainted? elsif poke2.fainted?
scene.pbDisplay(_INTL("It cannot be fused with that fainted Pokémon.")) scene.pbDisplay(_INTL("It cannot be fused with that fainted Pokémon."))
elsif !isConst?(poke2.species,PBSpecies,:SOLGALEO) elsif !poke2.isSpecies?(:SOLGALEO)
scene.pbDisplay(_INTL("It cannot be fused with that Pokémon.")) scene.pbDisplay(_INTL("It cannot be fused with that Pokémon."))
end end
pkmn.setForm(1) { pkmn.setForm(1) {
@@ -1041,7 +1041,7 @@ ItemHandlers::UseOnPokemon.add(:NSOLARIZER,proc { |item,pkmn,scene|
}) })
ItemHandlers::UseOnPokemon.add(:NLUNARIZER,proc { |item,pkmn,scene| ItemHandlers::UseOnPokemon.add(:NLUNARIZER,proc { |item,pkmn,scene|
if !isConst?(pkmn.species,PBSpecies,:NECROZMA) || pkmn.form==1 if !pkmn.isSpecies?(:NECROZMA) || pkmn.form==1
scene.pbDisplay(_INTL("It had no effect.")) scene.pbDisplay(_INTL("It had no effect."))
next false next false
end end
@@ -1059,7 +1059,7 @@ ItemHandlers::UseOnPokemon.add(:NLUNARIZER,proc { |item,pkmn,scene|
scene.pbDisplay(_INTL("It cannot be fused with an Egg.")) scene.pbDisplay(_INTL("It cannot be fused with an Egg."))
elsif poke2.fainted? elsif poke2.fainted?
scene.pbDisplay(_INTL("It cannot be fused with that fainted Pokémon.")) scene.pbDisplay(_INTL("It cannot be fused with that fainted Pokémon."))
elsif !isConst?(poke2.species,PBSpecies,:LUNALA) elsif !poke2.isSpecies?(:LUNALA)
scene.pbDisplay(_INTL("It cannot be fused with that Pokémon.")) scene.pbDisplay(_INTL("It cannot be fused with that Pokémon."))
end end
pkmn.setForm(2) { pkmn.setForm(2) {
@@ -1091,8 +1091,7 @@ ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE,proc { |item,pkmn,scene|
abil1 = i[0] if i[1]==0 abil1 = i[0] if i[1]==0
abil2 = i[0] if i[1]==1 abil2 = i[0] if i[1]==1
end end
if abil1<=0 || abil2<=0 || pkmn.hasHiddenAbility? || if abil1<=0 || abil2<=0 || pkmn.hasHiddenAbility? || pkmn.isSpecies?(:ZYGARDE)
isConst?(pkmn.species,PBSpecies,:ZYGARDE)
scene.pbDisplay(_INTL("It won't have any effect.")) scene.pbDisplay(_INTL("It won't have any effect."))
next false next false
end end

2
Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb
View File

@@ -193,7 +193,7 @@ end
#=============================================================================== #===============================================================================
def pbIsPurifiable?(pkmn) def pbIsPurifiable?(pkmn)
return false if !pkmn return false if !pkmn
return false if isConst?(pkmn.species,PBSpecies,:LUGIA) return false if pkmn.isSpecies?(:LUGIA)
return false if !pkmn.shadowPokemon? || pkmn.heartgauge>0 return false if !pkmn.shadowPokemon? || pkmn.heartgauge>0
return true return true
end end

6
Data/Scripts/016_Pokemon/008_Pokemon_Storage.rb
View File

@@ -181,7 +181,7 @@ class PokemonStorage
pkmn = self[boxSrc,indexSrc] pkmn = self[boxSrc,indexSrc]
raise "Trying to copy nil to storage" if !pkmn raise "Trying to copy nil to storage" if !pkmn
pkmn.formTime = nil if pkmn.respond_to?("formTime") pkmn.formTime = nil if pkmn.respond_to?("formTime")
pkmn.form = 0 if isConst?(pkmn.species,PBSpecies,:SHAYMIN) pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal pkmn.heal
self[boxDst,indexDst] = pkmn self[boxDst,indexDst] = pkmn
end end
@@ -204,7 +204,7 @@ class PokemonStorage
if self[box,i]==nil if self[box,i]==nil
if box>=0 if box>=0
pkmn.formTime = nil if pkmn.respond_to?("formTime") && pkmn.formTime pkmn.formTime = nil if pkmn.respond_to?("formTime") && pkmn.formTime
pkmn.form = 0 if isConst?(pkmn.species,PBSpecies,:SHAYMIN) pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal pkmn.heal
end end
self[box,i] = pkmn self[box,i] = pkmn
@@ -217,7 +217,7 @@ class PokemonStorage
def pbStoreCaught(pkmn) def pbStoreCaught(pkmn)
if @currentBox>=0 if @currentBox>=0
pkmn.formTime = nil if pkmn.respond_to?("formTime") pkmn.formTime = nil if pkmn.respond_to?("formTime")
pkmn.form = 0 if isConst?(pkmn.species,PBSpecies,:SHAYMIN) pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal pkmn.heal
end end
for i in 0...maxPokemon(@currentBox) for i in 0...maxPokemon(@currentBox)

4
Data/Scripts/017_UI/017_PScreen_PokemonStorage.rb
View File

@@ -1760,7 +1760,7 @@ class PokemonStorageScreen
end end
if box>=0 if box>=0
@heldpkmn.formTime = nil if @heldpkmn.respond_to?("formTime") @heldpkmn.formTime = nil if @heldpkmn.respond_to?("formTime")
@heldpkmn.form = 0 if isConst?(@heldpkmn.species,PBSpecies,:SHAYMIN) @heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
@heldpkmn.heal @heldpkmn.heal
end end
@scene.pbPlace(selected,@heldpkmn) @scene.pbPlace(selected,@heldpkmn)
@@ -1789,7 +1789,7 @@ class PokemonStorageScreen
end end
if box>=0 if box>=0
@heldpkmn.formTime = nil if @heldpkmn.respond_to?("formTime") @heldpkmn.formTime = nil if @heldpkmn.respond_to?("formTime")
@heldpkmn.form = 0 if isConst?(@heldpkmn.species,PBSpecies,:SHAYMIN) @heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
@heldpkmn.heal @heldpkmn.heal
end end
@scene.pbSwap(selected,@heldpkmn) @scene.pbSwap(selected,@heldpkmn)

18
Data/Scripts/019_Other battles/004_PBattle_OrgBattleRules.rb
View File

@@ -405,12 +405,12 @@ class StandardRestriction
# Certain named species are not banned # Certain named species are not banned
speciesWhitelist = [:DRAGONITE,:SALAMENCE,:TYRANITAR] speciesWhitelist = [:DRAGONITE,:SALAMENCE,:TYRANITAR]
for i in speciesWhitelist for i in speciesWhitelist
return true if isConst?(pokemon.species,PBSpecies,i) return true if pokemon.isSpecies?(i)
end end
# Certain named species are banned # Certain named species are banned
speciesBlacklist = [:WYNAUT,:WOBBUFFET] speciesBlacklist = [:WYNAUT,:WOBBUFFET]
for i in speciesBlacklist for i in speciesBlacklist
return false if isConst?(pokemon.species,PBSpecies,i) return false if pokemon.isSpecies?(i)
end end
# Species with total base stat 600 or more are banned # Species with total base stat 600 or more are banned
baseStats = pbGetSpeciesData(pokemon.species,pokemon.form,SpeciesBaseStats) baseStats = pbGetSpeciesData(pokemon.species,pokemon.form,SpeciesBaseStats)
@@ -498,7 +498,7 @@ end
class NegativeExtendedGameClause class NegativeExtendedGameClause
def isValid?(pokemon) def isValid?(pokemon)
return false if isConst?(pokemon.species,PBSpecies,:ARCEUS) return false if pokemon.isSpecies?(:ARCEUS)
return false if isConst?(pokemon.item,PBItems,:MICLEBERRY) return false if isConst?(pokemon.item,PBItems,:MICLEBERRY)
return false if isConst?(pokemon.item,PBItems,:CUSTAPBERRY) return false if isConst?(pokemon.item,PBItems,:CUSTAPBERRY)
return false if isConst?(pokemon.item,PBItems,:JABOCABERRY) return false if isConst?(pokemon.item,PBItems,:JABOCABERRY)
@@ -605,12 +605,12 @@ class LittleCupRestriction
return false if isConst?(pokemon.item,PBItems,:DEEPSEATOOTH) return false if isConst?(pokemon.item,PBItems,:DEEPSEATOOTH)
return false if pokemon.hasMove?(:SONICBOOM) return false if pokemon.hasMove?(:SONICBOOM)
return false if pokemon.hasMove?(:DRAGONRAGE) return false if pokemon.hasMove?(:DRAGONRAGE)
return false if isConst?(pokemon.species,PBSpecies,:SCYTHER) return false if pokemon.isSpecies?(:SCYTHER)
return false if isConst?(pokemon.species,PBSpecies,:SNEASEL) return false if pokemon.isSpecies?(:SNEASEL)
return false if isConst?(pokemon.species,PBSpecies,:MEDITITE) return false if pokemon.isSpecies?(:MEDITITE)
return false if isConst?(pokemon.species,PBSpecies,:YANMA) return false if pokemon.isSpecies?(:YANMA)
return false if isConst?(pokemon.species,PBSpecies,:TANGELA) return false if pokemon.isSpecies?(:TANGELA)
return false if isConst?(pokemon.species,PBSpecies,:MURKROW) return false if pokemon.isSpecies?(:MURKROW)
return true return true
end end
end end