From 97b2548a7eb05c96c3f1975a2a048feff9b3f436 Mon Sep 17 00:00:00 2001 From: jonisavo Date: Sun, 6 Sep 2020 15:13:54 +0300 Subject: [PATCH] Refactored PokeBattle_Pokemon#hasItem? --- Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb b/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb index f32354d0a..57ad1c2ed 100644 --- a/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb +++ b/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb @@ -594,11 +594,12 @@ class PokeBattle_Pokemon #============================================================================= # Items #============================================================================= - # Returns whether this Pokémon has a hold item. - def hasItem?(value=0) - itm = self.item - return itm>0 if value==0 - return itm==getID(PBItems,value) + # Returns whether this Pokémon is holding an item. If an item id is passed, + # returns whether the Pokémon is holding that item. + def hasItem?(item = 0) + held_item = self.item + return held_item > 0 if item == 0 + return held_item == getID(PBItems,item) end # Sets this Pokémon's item. Accepts symbols.