diff --git a/LA BASE DE SKY/Data/Actors.rxdata b/LA BASE DE SKY/Data/Actors.rxdata index 41edc8e2..7967a543 100644 Binary files a/LA BASE DE SKY/Data/Actors.rxdata and b/LA BASE DE SKY/Data/Actors.rxdata differ diff --git a/LA BASE DE SKY/Data/Animations.rxdata b/LA BASE DE SKY/Data/Animations.rxdata index 9b0110b5..0cccb204 100644 Binary files a/LA BASE DE SKY/Data/Animations.rxdata and b/LA BASE DE SKY/Data/Animations.rxdata differ diff --git a/LA BASE DE SKY/Data/Armors.rxdata b/LA BASE DE SKY/Data/Armors.rxdata index 901f2bb2..2249bec1 100644 Binary files a/LA BASE DE SKY/Data/Armors.rxdata and b/LA BASE DE SKY/Data/Armors.rxdata differ diff --git a/LA BASE DE SKY/Data/CommonEvents.rxdata b/LA BASE DE SKY/Data/CommonEvents.rxdata index 6fc9c280..632ff7ff 100644 Binary files a/LA BASE DE SKY/Data/CommonEvents.rxdata and b/LA BASE DE SKY/Data/CommonEvents.rxdata differ diff --git a/LA BASE DE SKY/Data/Enemies.rxdata b/LA BASE DE SKY/Data/Enemies.rxdata index be622f51..004ee903 100644 Binary files a/LA BASE DE SKY/Data/Enemies.rxdata and b/LA BASE DE SKY/Data/Enemies.rxdata differ diff --git a/LA BASE DE SKY/Data/Items.rxdata b/LA BASE DE SKY/Data/Items.rxdata index fe767fa0..3e62ba6d 100644 Binary files a/LA BASE DE SKY/Data/Items.rxdata and b/LA BASE DE SKY/Data/Items.rxdata differ diff --git a/LA BASE DE SKY/Data/Map042.rxdata b/LA BASE DE SKY/Data/Map042.rxdata index a9fd1d98..8543a6d1 100644 Binary files a/LA BASE DE SKY/Data/Map042.rxdata and b/LA BASE DE SKY/Data/Map042.rxdata differ diff --git a/LA BASE DE SKY/Data/MapInfos.rxdata b/LA BASE DE SKY/Data/MapInfos.rxdata index 13a47adf..44f7bad9 100644 Binary files a/LA BASE DE SKY/Data/MapInfos.rxdata and b/LA BASE DE SKY/Data/MapInfos.rxdata differ diff --git a/LA BASE DE SKY/Data/Scripts/048_UI/021_UI_PokeMart.rb b/LA BASE DE SKY/Data/Scripts/048_UI/021_UI_PokeMart.rb index 490f6643..45809d7a 100644 --- a/LA BASE DE SKY/Data/Scripts/048_UI/021_UI_PokeMart.rb +++ b/LA BASE DE SKY/Data/Scripts/048_UI/021_UI_PokeMart.rb @@ -46,6 +46,26 @@ def getDisplayNamePlural(item) return item_name_plural end + def getDisplayNameMachineNumber(item) + item_data = GameData::Item.get(item) + item_name = item_data.name + if item_data.is_machine? + machine = item_data.move + item_name = _INTL("{1}", item_name) + end + return item_name + end + + def getDisplayNameMachineName(item) + item_data = GameData::Item.get(item) + item_name = item_data.name + if item_data.is_machine? + machine = item_data.move + item_name = _INTL("{1}", GameData::Move.get(machine).name) + end + return item_name + end + def getDescription(item) return GameData::Item.get(item).description end diff --git a/LA BASE DE SKY/Data/Scripts/067_Scripts de la base/004_Bag with interactuable party.rb b/LA BASE DE SKY/Data/Scripts/067_Scripts de la base/004_Bag with interactuable party.rb index e6a25aa2..3e1b5f2e 100644 --- a/LA BASE DE SKY/Data/Scripts/067_Scripts de la base/004_Bag with interactuable party.rb +++ b/LA BASE DE SKY/Data/Scripts/067_Scripts de la base/004_Bag with interactuable party.rb @@ -228,10 +228,17 @@ def drawItem(index, _count, rect) baseColor = Color.new(78, 86, 100) shadowColor = Color.new(157, 171, 178) end - textpos.push( - [@adapter.getDisplayName(item), rect.x, rect.y + 4, :left, baseColor, shadowColor] - ) item_data = GameData::Item.get(item) + if item_data.is_machine? + textpos.push( + [@adapter.getDisplayNameMachineNumber(item), rect.x, rect.y + 4, :left, baseColor, shadowColor], + [@adapter.getDisplayNameMachineName(item), rect.x+70, rect.y + 4, :left, baseColor, shadowColor] + ) + else + textpos.push( + [@adapter.getDisplayName(item), rect.x, rect.y + 4, :left, baseColor, shadowColor] + ) + end showing_register_icon = false if item_data.is_important? if @bag.registered?(item) @@ -249,20 +256,20 @@ def drawItem(index, _count, rect) end end if @bag.favourite?(item) - if !pbCanRegisterItem?(item) && !item_data.show_quantity? + if !pbCanRegisterItem?(item) && !item_data.show_quantity? && !item_data.is_key_item? pbDrawImagePositions( self.contents, [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 30, rect.y + 13, 0, 0, -1, 24]] ) - elsif !pbCanRegisterItem?(item) && item_data.show_quantity? + elsif item_data.is_key_item? pbDrawImagePositions( self.contents, - [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 75, rect.y + 13, 0, 0, -1, 24]] + [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 92, rect.y + 13, 0, 0, -1, 24]] ) else pbDrawImagePositions( self.contents, - [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 95, rect.y + 13, 0, 0, -1, 24]] + [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 88, rect.y + 13, 0, 0, -1, 24]] ) end end @@ -730,8 +737,6 @@ def pbStartScene(bag, party = $player.party, choosing = false, filterproc = nil, @sprites["msgwindow"].letterbyletter = true pbBottomLeftLines(@sprites["msgwindow"], 2) - pbUpdateAnnotation - ## Dibujar textos de Ordenar y Buscar overlay_aux = @sprites["overlay_aux"].bitmap pbSetTinyFont(overlay_aux) @@ -740,14 +745,11 @@ def pbStartScene(bag, party = $player.party, choosing = false, filterproc = nil, [[_INTL("Z: Ordenar"), 232, 7, nil, POCKETNAMEBASECOLOR, POCKETNAMEOUTLINECOLOR, :outline, Graphics.width], [_INTL("D: Buscar"), 317, 7, nil, POCKETNAMEBASECOLOR, POCKETNAMEOUTLINECOLOR, :outline, Graphics.width]] ) - + pbUpdateAnnotation pbDeactivateWindows(@sprites) pbRefresh pbFadeInAndShow(@sprites) $game_temp.bag_scene = self if $bag.has?(:EGGHATCHER) - - - end def pbPocketColor diff --git a/LA BASE DE SKY/Data/Skills.rxdata b/LA BASE DE SKY/Data/Skills.rxdata index a45219f5..61cba7ea 100644 Binary files a/LA BASE DE SKY/Data/Skills.rxdata and b/LA BASE DE SKY/Data/Skills.rxdata differ diff --git a/LA BASE DE SKY/Data/States.rxdata b/LA BASE DE SKY/Data/States.rxdata index 868d49e5..0f9b4ae5 100644 Binary files a/LA BASE DE SKY/Data/States.rxdata and b/LA BASE DE SKY/Data/States.rxdata differ diff --git a/LA BASE DE SKY/Data/System.rxdata b/LA BASE DE SKY/Data/System.rxdata index df8bc44e..9d6c4cef 100644 Binary files a/LA BASE DE SKY/Data/System.rxdata and b/LA BASE DE SKY/Data/System.rxdata differ diff --git a/LA BASE DE SKY/Data/Tilesets.rxdata b/LA BASE DE SKY/Data/Tilesets.rxdata index f36258b7..e34cd1e4 100644 Binary files a/LA BASE DE SKY/Data/Tilesets.rxdata and b/LA BASE DE SKY/Data/Tilesets.rxdata differ diff --git a/LA BASE DE SKY/Data/Weapons.rxdata b/LA BASE DE SKY/Data/Weapons.rxdata index c7ea19a7..d9bd3526 100644 Binary files a/LA BASE DE SKY/Data/Weapons.rxdata and b/LA BASE DE SKY/Data/Weapons.rxdata differ