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

Use PokeBattle_Pokemon#hasItem? instead of isConst?

Browse Source
This commit is contained in:
jonisavo
2020-09-06 15:41:46 +03:00
parent 97b2548a7e
commit e73bef533d
8 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
View File

@@ -25,7 +25,7 @@ class PokeBattle_Battle
if !expAll if !expAll
eachInTeam(0,0) do |pkmn,i| eachInTeam(0,0) do |pkmn,i|
next if !pkmn.able? next if !pkmn.able?
next if !isConst?(pkmn.item,PBItems,:EXPSHARE) && next if !pkmn.hasItem?(:EXPSHARE) &&
!isConst?(@initialItems[0][i],PBItems,:EXPSHARE) !isConst?(@initialItems[0][i],PBItems,:EXPSHARE)
expShare.push(i) expShare.push(i)
end end

24
Data/Scripts/013_Overworld/013_PField_DayCare.rb
View File

@@ -282,12 +282,12 @@ def pbDayCareGenerateEgg
lightball = false lightball = false
if (isConst?(father.species,PBSpecies,:PIKACHU) || if (isConst?(father.species,PBSpecies,:PIKACHU) ||
isConst?(father.species,PBSpecies,:RAICHU)) && isConst?(father.species,PBSpecies,:RAICHU)) &&
isConst?(father.item,PBItems,:LIGHTBALL) father.hasItem?(:LIGHTBALL)
lightball = true lightball = true
end end
if (isConst?(mother.species,PBSpecies,:PIKACHU) || if (isConst?(mother.species,PBSpecies,:PIKACHU) ||
isConst?(mother.species,PBSpecies,:RAICHU)) && isConst?(mother.species,PBSpecies,:RAICHU)) &&
isConst?(mother.item,PBItems,:LIGHTBALL) mother.hasItem?(:LIGHTBALL)
lightball = true lightball = true
end end
if lightball && isConst?(babyspecies,PBSpecies,:PICHU) && if lightball && isConst?(babyspecies,PBSpecies,:PICHU) &&
@@ -313,12 +313,12 @@ def pbDayCareGenerateEgg
ivinherit = [] ivinherit = []
for i in 0...2 for i in 0...2
parent = [mother,father][i] parent = [mother,father][i]
ivinherit[i] = PBStats::HP if isConst?(parent.item,PBItems,:POWERWEIGHT) ivinherit[i] = PBStats::HP if parent.hasItem?(:POWERWEIGHT)
ivinherit[i] = PBStats::ATTACK if isConst?(parent.item,PBItems,:POWERBRACER) ivinherit[i] = PBStats::ATTACK if parent.hasItem?(:POWERBRACER)
ivinherit[i] = PBStats::DEFENSE if isConst?(parent.item,PBItems,:POWERBELT) ivinherit[i] = PBStats::DEFENSE if parent.hasItem?(:POWERBELT)
ivinherit[i] = PBStats::SPATK if isConst?(parent.item,PBItems,:POWERLENS) ivinherit[i] = PBStats::SPATK if parent.hasItem?(:POWERLENS)
ivinherit[i] = PBStats::SPDEF if isConst?(parent.item,PBItems,:POWERBAND) ivinherit[i] = PBStats::SPDEF if parent.hasItem?(:POWERBAND)
ivinherit[i] = PBStats::SPEED if isConst?(parent.item,PBItems,:POWERANKLET) ivinherit[i] = PBStats::SPEED if parent.hasItem?(:POWERANKLET)
end end
num = 0; r = rand(2) num = 0; r = rand(2)
for i in 0...2 for i in 0...2
@@ -330,8 +330,8 @@ def pbDayCareGenerateEgg
end end
r = (r+1)%2 r = (r+1)%2
end end
limit = (NEWEST_BATTLE_MECHANICS && (isConst?(mother.item,PBItems,:DESTINYKNOT) || limit = (NEWEST_BATTLE_MECHANICS && (mother.hasItem?(:DESTINYKNOT) ||
isConst?(father.item,PBItems,:DESTINYKNOT))) ? 5 : 3 father.hasItem?(:DESTINYKNOT))) ? 5 : 3
loop do loop do
freestats = [] freestats = []
PBStats.eachStat { |s| freestats.push(s) if !ivinherit.include?(s) } PBStats.eachStat { |s| freestats.push(s) if !ivinherit.include?(s) }
@@ -345,8 +345,8 @@ def pbDayCareGenerateEgg
end end
# Inheriting nature # Inheriting nature
newnatures = [] newnatures = []
newnatures.push(mother.nature) if isConst?(mother.item,PBItems,:EVERSTONE) newnatures.push(mother.nature) if mother.hasItem?(:EVERSTONE)
newnatures.push(father.nature) if isConst?(father.item,PBItems,:EVERSTONE) newnatures.push(father.nature) if father.hasItem?(:EVERSTONE)
if newnatures.length>0 if newnatures.length>0
egg.setNature(newnatures[rand(newnatures.length)]) egg.setNature(newnatures[rand(newnatures.length)])
end end

2
Data/Scripts/015_Items/001_PItem_Items.rb
View File

@@ -826,7 +826,7 @@ def pbGiveItemToPokemon(item,pkmn,scene,pkmnid=0)
end end
if pkmn.hasItem? if pkmn.hasItem?
olditemname = PBItems.getName(pkmn.item) olditemname = PBItems.getName(pkmn.item)
if isConst?(pkmn.item,PBItems,:LEFTOVERS) if pkmn.hasItem?(:LEFTOVERS)
scene.pbDisplay(_INTL("{1} is already holding some {2}.\1",pkmn.name,olditemname)) scene.pbDisplay(_INTL("{1} is already holding some {2}.\1",pkmn.name,olditemname))
elsif newitemname.starts_with_vowel? elsif newitemname.starts_with_vowel?
scene.pbDisplay(_INTL("{1} is already holding an {2}.\1",pkmn.name,olditemname)) scene.pbDisplay(_INTL("{1} is already holding an {2}.\1",pkmn.name,olditemname))

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

@@ -330,8 +330,7 @@ MultipleForms.register(:ROTOM,{
MultipleForms.register(:GIRATINA,{ MultipleForms.register(:GIRATINA,{
"getForm" => proc { |pkmn| "getForm" => proc { |pkmn|
maps = [49,50,51,72,73] # Map IDs for Origin Forme maps = [49,50,51,72,73] # Map IDs for Origin Forme
if isConst?(pkmn.item,PBItems,:GRISEOUSORB) || if pkmn.hasItem?(:GRISEOUSORB) || maps.include?($game_map.map_id)
maps.include?($game_map.map_id)
next 1 next 1
end end
next 0 next 0
@@ -369,8 +368,8 @@ MultipleForms.register(:ARCEUS,{
} }
ret = 0 ret = 0
typeArray.each do |f, items| typeArray.each do |f, items|
for i in items for item in items
next if !isConst?(pkmn.item,PBItems,i) next if !pkmn.hasItem?(item)
ret = f ret = f
break break
end end
@@ -460,10 +459,10 @@ MultipleForms.register(:MELOETTA,{
MultipleForms.register(:GENESECT,{ MultipleForms.register(:GENESECT,{
"getForm" => proc { |pkmn| "getForm" => proc { |pkmn|
next 1 if isConst?(pkmn.item,PBItems,:SHOCKDRIVE) next 1 if pkmn.hasItem?(:SHOCKDRIVE)
next 2 if isConst?(pkmn.item,PBItems,:BURNDRIVE) next 2 if pkmn.hasItem?(:BURNDRIVE)
next 3 if isConst?(pkmn.item,PBItems,:CHILLDRIVE) next 3 if pkmn.hasItem?(:CHILLDRIVE)
next 4 if isConst?(pkmn.item,PBItems,:DOUSEDRIVE) next 4 if pkmn.hasItem?(:DOUSEDRIVE)
next 0 next 0
} }
}) })
@@ -606,8 +605,8 @@ MultipleForms.register(:SILVALLY,{
} }
ret = 0 ret = 0
typeArray.each do |f, items| typeArray.each do |f, items|
for i in items for item in items
next if !isConst?(pkmn.item,PBItems,i) next if !pkmn.hasItem?(item)
ret = f ret = f
break break
end end

4
Data/Scripts/016_Pokemon/003_Pokemon_MegaEvolution.rb
View File

@@ -97,14 +97,14 @@ end
MultipleForms.register(:GROUDON,{ MultipleForms.register(:GROUDON,{
"getPrimalForm" => proc { |pkmn| "getPrimalForm" => proc { |pkmn|
next 1 if isConst?(pkmn.item,PBItems,:REDORB) next 1 if pkmn.hasItem?(:REDORB)
next next
} }
}) })
MultipleForms.register(:KYOGRE,{ MultipleForms.register(:KYOGRE,{
"getPrimalForm" => proc { |pkmn| "getPrimalForm" => proc { |pkmn|
next 1 if isConst?(pkmn.item,PBItems,:BLUEORB) next 1 if pkmn.hasItem?(:BLUEORB)
next next
} }
}) })

2
Data/Scripts/016_Pokemon/005_Pokemon_Evolution.rb
View File

@@ -309,7 +309,7 @@ end
# Pokemon to check; evolution type; level or other parameter; ID of the new species # Pokemon to check; evolution type; level or other parameter; ID of the new species
def pbCheckEvolutionEx(pokemon) def pbCheckEvolutionEx(pokemon)
return -1 if pokemon.species<=0 || pokemon.egg? || pokemon.shadowPokemon? return -1 if pokemon.species<=0 || pokemon.egg? || pokemon.shadowPokemon?
return -1 if isConst?(pokemon.item,PBItems,:EVERSTONE) return -1 if pokemon.hasItem?(:EVERSTONE)
return -1 if isConst?(pokemon.ability,PBAbilities,:BATTLEBOND) return -1 if isConst?(pokemon.ability,PBAbilities,:BATTLEBOND)
ret = -1 ret = -1
for form in pbGetEvolvedFormData(pbGetFSpeciesFromForm(pokemon.species,pokemon.form),true) for form in pbGetEvolvedFormData(pbGetFSpeciesFromForm(pokemon.species,pokemon.form),true)

2
Data/Scripts/017_UI/022_PScreen_Trading.rb
View File

@@ -238,7 +238,7 @@ def pbTradeCheckEvolution(pokemon,pokemon2)
next poke next poke
end end
when PBEvolution::TradeSpecies when PBEvolution::TradeSpecies
if !isConst?(pokemon2.item,PBItems,:EVERSTONE) if !pokemon2.hasItem?(:EVERSTONE)
next poke if pokemon2.species==level next poke if pokemon2.species==level
end end
end end

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

@@ -482,7 +482,7 @@ end
class SoulDewClause class SoulDewClause
def isValid?(pokemon) def isValid?(pokemon)
return !isConst?(pokemon.item,PBItems,:SOULDEW) return !pokemon.hasItem?(:SOULDEW)
end end
end end
@@ -499,10 +499,10 @@ end
class NegativeExtendedGameClause class NegativeExtendedGameClause
def isValid?(pokemon) def isValid?(pokemon)
return false if pokemon.isSpecies?(:ARCEUS) return false if pokemon.isSpecies?(:ARCEUS)
return false if isConst?(pokemon.item,PBItems,:MICLEBERRY) return false if pokemon.hasItem?(:MICLEBERRY)
return false if isConst?(pokemon.item,PBItems,:CUSTAPBERRY) return false if pokemon.hasItem?(:CUSTAPBERRY)
return false if isConst?(pokemon.item,PBItems,:JABOCABERRY) return false if pokemon.hasItem?(:JABOCABERRY)
return false if isConst?(pokemon.item,PBItems,:ROWAPBERRY) return false if pokemon.hasItem?(:ROWAPBERRY)
end end
end end
@@ -601,8 +601,8 @@ end
class LittleCupRestriction class LittleCupRestriction
def isValid?(pokemon) def isValid?(pokemon)
return false if isConst?(pokemon.item,PBItems,:BERRYJUICE) return false if pokemon.hasItem?(:BERRYJUICE)
return false if isConst?(pokemon.item,PBItems,:DEEPSEATOOTH) return false if pokemon.hasItem?(: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 pokemon.isSpecies?(:SCYTHER) return false if pokemon.isSpecies?(:SCYTHER)