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 pull request #10 from jonisavo/additional-refactoring

Browse Source 
Additional #isSpecies? and #hasItem? refactoring
This commit is contained in:
Maruno17
2020-09-06 19:21:17 +01:00
committed by GitHub
parent f035200484 0b1bab3b5c
commit 66671efcde
8 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/013_Overworld/007_PField_Encounters.rb
View File

@@ -338,9 +338,9 @@ class PokemonEncounters
end
firstPkmn = $Trainer.firstPokemon
if firstPkmn
if isConst?(firstPkmn.item,PBItems,:CLEANSETAG)
if firstPkmn.hasItem?(:CLEANSETAG)
encount = encount*2/3
elsif isConst?(firstPkmn.item,PBItems,:PUREINCENSE)
elsif firstPkmn.hasItem?(:PUREINCENSE)
encount = encount*2/3
else # Ignore ability effects if an item effect applies
if isConst?(firstPkmn.ability,PBAbilities,:STENCH)

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

@@ -220,7 +220,7 @@ def pbDayCareGenerateEgg
isConst?(babyspecies,PBSpecies,:ROCKRUFF) ||
isConst?(babyspecies,PBSpecies,:MINIOR)
newForm = mother.form
newForm = 0 if isConst?(mother.species,PBSpecies,:MOTHIM)
newForm = 0 if mother.isSpecies?(:MOTHIM)
egg.form = newForm
end
# Inheriting Alolan form
@@ -280,13 +280,11 @@ def pbDayCareGenerateEgg
end
# Volt Tackle
lightball = false
if (isConst?(father.species,PBSpecies,:PIKACHU) ||
isConst?(father.species,PBSpecies,:RAICHU)) &&
if (father.isSpecies?(:PIKACHU) || father.isSpecies?(:RAICHU)) &&
father.hasItem?(:LIGHTBALL)
lightball = true
end
if (isConst?(mother.species,PBSpecies,:PIKACHU) ||
isConst?(mother.species,PBSpecies,:RAICHU)) &&
if (mother.isSpecies?(:PIKACHU) || mother.isSpecies?(:RAICHU)) &&
mother.hasItem?(:LIGHTBALL)
lightball = true
end