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

Merge pull request #9 from jonisavo/pokemon-use-hasItem

Browse Source 
Refactor PokeBattle_Pokemon#hasItem? and use it instead of Object.isConst?
This commit is contained in:
Maruno17
2020-09-06 17:39:02 +01:00
committed by GitHub
parent a91d13adcb dcf3b18c48
commit 6252407160
9 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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