DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-11 23:24:59 +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

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)