Added parent pocket functionality to BagPocket, started implementing Bag UI redesign

This commit is contained in:
Maruno17
2024-09-17 00:20:41 +01:00
parent 801c2d35c6
commit 4770057818
9 changed files with 612 additions and 232 deletions

View File

@@ -684,7 +684,7 @@ def pbItemBall(item, quantity = 1)
item = GameData::Item.get(item)
return false if !item || quantity < 1
itemname = (quantity > 1) ? item.portion_name_plural : item.portion_name
pocket = item.pocket
pocket = item.bag_pocket
move = item.move
if $bag.add(item, quantity) # If item can be picked up
meName = (item.is_key_item?) ? "Key item get" : "Item get"
@@ -734,7 +734,7 @@ def pbReceiveItem(item, quantity = 1)
item = GameData::Item.get(item)
return false if !item || quantity < 1
itemname = (quantity > 1) ? item.portion_name_plural : item.portion_name
pocket = item.pocket
pocket = item.bag_pocket
move = item.move
meName = (item.is_key_item?) ? "Key item get" : "Item get"
if item == :DNASPLICERS
@@ -769,7 +769,7 @@ def pbBuyPrize(item, quantity = 1)
item = GameData::Item.get(item)
return false if !item || quantity < 1
item_name = (quantity > 1) ? item.portion_name_plural : item.portion_name
pocket = item.pocket
pocket = item.bag_pocket
return false if !$bag.add(item, quantity)
pbMessage("\\CN" + _INTL("You put the {1} in\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
item_name, pocket, GameData::BagPocket.get(pocket).name))

View File

@@ -457,7 +457,7 @@ def pbPickBerry(berry, qty = 1)
else
pbMessage("\\me[Berry get]" + _INTL("You picked the \\c[1]{1}\\c[0].", berry_name) + "\\wtnp[30]")
end
pocket = berry.pocket
pocket = berry.bag_pocket
pbMessage(_INTL("You put the {1} in\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
berry_name, pocket, GameData::BagPocket.get(pocket).name) + "\1")
if Settings::NEW_BERRY_PLANTS