DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 14:14: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

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

@@ -823,7 +823,7 @@ def pbGiveItemToPokemon(item,pkmn,scene,pkmnid=0)
end
if pkmn.hasItem?
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))
elsif newitemname.starts_with_vowel?
scene.pbDisplay(_INTL("{1} is already holding an {2}.\1",pkmn.name,olditemname))