Implemented usage of GameData::Item

This commit is contained in:
Maruno17
2020-11-08 22:45:59 +00:00
parent ff70791104
commit 1955d3698e
82 changed files with 1986 additions and 2195 deletions

View File

@@ -18,7 +18,7 @@ class Window_PokemonItemStorage < Window_DrawableCommand
def item
item = @bag[self.index]
return item ? item[0] : 0
return item ? item[0] : nil
end
def itemCount
@@ -34,12 +34,12 @@ class Window_PokemonItemStorage < Window_DrawableCommand
else
item = @bag[index][0]
itemname = @adapter.getDisplayName(item)
qty = _ISPRINTF("x{1: 2d}",@bag[index][1])
sizeQty = self.contents.text_size(qty).width
xQty = rect.x+rect.width-sizeQty-2
baseColor = (index==@sortIndex) ? Color.new(248,24,24) : self.baseColor
textpos.push([itemname,rect.x,ypos,false,self.baseColor,self.shadowColor])
if !pbIsImportantItem?(item) # Not a Key item or HM (or infinite TM)
if !GameData::Item.get(item).is_important? # Not a Key item or HM (or infinite TM)
qty = _ISPRINTF("x{1: 2d}",@bag[index][1])
sizeQty = self.contents.text_size(qty).width
xQty = rect.x+rect.width-sizeQty-2
textpos.push([qty,xQty,ypos,false,baseColor,self.shadowColor])
end
end
@@ -73,7 +73,7 @@ class ItemStorage_Scene
@sprites = {}
@sprites["background"] = IconSprite.new(0,0,@viewport)
@sprites["background"].setBitmap("Graphics/Pictures/pcItembg")
@sprites["icon"] = ItemIconSprite.new(50,334,-1,@viewport)
@sprites["icon"] = ItemIconSprite.new(50,334,nil,@viewport)
# Item list
@sprites["itemwindow"] = Window_PokemonItemStorage.new(@bag,98,14,334,32+ITEMSVISIBLE*32)
@sprites["itemwindow"].viewport = @viewport
@@ -134,10 +134,10 @@ class ItemStorage_Scene
# Draw item icon
@sprites["icon"].item = itemwindow.item
# Get item description
if itemwindow.item==0
@sprites["itemtextwindow"].text = _INTL("Close storage.")
if itemwindow.item
@sprites["itemtextwindow"].text = GameData::Item.get(itemwindow.item).description
else
@sprites["itemtextwindow"].text = pbGetMessage(MessageTypes::ItemDescriptions,itemwindow.item)
@sprites["itemtextwindow"].text = _INTL("Close storage.")
end
itemwindow.refresh
end
@@ -155,13 +155,13 @@ class ItemStorage_Scene
self.update
pbRefresh if itemwindow.item!=olditem
if Input.trigger?(Input::B)
return 0
return nil
elsif Input.trigger?(Input::C)
if itemwindow.index<@bag.length
pbRefresh
return @bag[itemwindow.index][0]
else
return 0
return nil
end
end
end
@@ -258,10 +258,10 @@ module UIHelper
(block_given?) ? yield : dw.update
if !dw.busy? && dw.resume
if Input.trigger?(Input::B)
pbPlayCancelSE()
pbPlayCancelSE
break
elsif Input.trigger?(Input::C)
pbPlayDecisionSE()
pbPlayDecisionSE
ret = (cw.index==0)
break
end
@@ -294,32 +294,32 @@ module UIHelper
(block_given?) ? yield : helpwindow.update
if Input.trigger?(Input::B)
ret = 0
pbPlayCancelSE()
pbPlayCancelSE
break
elsif Input.trigger?(Input::C)
ret = curnumber
pbPlayDecisionSE()
pbPlayDecisionSE
break
elsif Input.repeat?(Input::UP)
curnumber += 1
curnumber = 1 if curnumber>maximum
numwindow.text = _ISPRINTF("x{1:03d}",curnumber)
pbPlayCursorSE()
pbPlayCursorSE
elsif Input.repeat?(Input::DOWN)
curnumber -= 1
curnumber = maximum if curnumber<1
numwindow.text = _ISPRINTF("x{1:03d}",curnumber)
pbPlayCursorSE()
pbPlayCursorSE
elsif Input.repeat?(Input::LEFT)
curnumber -= 10
curnumber = 1 if curnumber<1
numwindow.text = _ISPRINTF("x{1:03d}",curnumber)
pbPlayCursorSE()
pbPlayCursorSE
elsif Input.repeat?(Input::RIGHT)
curnumber += 10
curnumber = maximum if curnumber>maximum
numwindow.text = _ISPRINTF("x{1:03d}",curnumber)
pbPlayCursorSE()
pbPlayCursorSE
end
end
}
@@ -347,12 +347,12 @@ module UIHelper
cmdwindow.update
if Input.trigger?(Input::B)
ret = -1
pbPlayCancelSE()
pbPlayCancelSE
break
end
if Input.trigger?(Input::C)
ret = cmdwindow.index
pbPlayDecisionSE()
pbPlayDecisionSE
break
end
end