mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Removes commented code
This commit is contained in:
@@ -89,26 +89,6 @@ end
|
|||||||
|
|
||||||
SWAP_HAT_POSITIONS_CAPTION = "Switch hats position"
|
SWAP_HAT_POSITIONS_CAPTION = "Switch hats position"
|
||||||
|
|
||||||
#unused
|
|
||||||
# def set_hat_adapter_options(adapter)
|
|
||||||
# slot1_hat = $Trainer.hat ? "Swap #{get_hat_by_id($Trainer.hat).name}" : "(Empty slot)"
|
|
||||||
# slot2_hat = $Trainer.hat2 ? "Swap #{get_hat_by_id($Trainer.hat2).name}" : "(Empty slot)"
|
|
||||||
# options = [slot1_hat,slot2_hat]
|
|
||||||
# options << SWAP_HAT_POSITIONS_CAPTION if $Trainer.hat && $Trainer.hat2
|
|
||||||
# options << "Cancel"
|
|
||||||
# hat_options_choice = optionsMenu(options)
|
|
||||||
# if options[hat_options_choice] == SWAP_HAT_POSITIONS_CAPTION
|
|
||||||
# switchHatsPosition()
|
|
||||||
# return nil
|
|
||||||
# end
|
|
||||||
# if hat_options_choice == options.length #cancel
|
|
||||||
# return nil
|
|
||||||
# end
|
|
||||||
# is_secondary = hat_options_choice ==1
|
|
||||||
# adapter.set_secondary_hat(is_secondary)
|
|
||||||
# return adapter
|
|
||||||
# end
|
|
||||||
|
|
||||||
#is_secondary only used for hats
|
#is_secondary only used for hats
|
||||||
def openSelectOutfitMenu(stock = [], itemType =nil, is_secondary=false)
|
def openSelectOutfitMenu(stock = [], itemType =nil, is_secondary=false)
|
||||||
adapter = getAdapter(itemType, stock, false, is_secondary)
|
adapter = getAdapter(itemType, stock, false, is_secondary)
|
||||||
@@ -145,38 +125,6 @@ def changeHatMenu(is_secondary_hat = false)
|
|||||||
openSelectOutfitMenu(stock, :HAT, is_secondary_hat)
|
openSelectOutfitMenu(stock, :HAT, is_secondary_hat)
|
||||||
end
|
end
|
||||||
|
|
||||||
# def changeOutfit()
|
|
||||||
# hat1_name = get_hat_by_id($Trainer.hat) ? get_hat_by_id($Trainer.hat).name : "(Empty)"
|
|
||||||
# hat2_name = get_hat_by_id($Trainer.hat2) ? get_hat_by_id($Trainer.hat2).name : "(Empty)"
|
|
||||||
#
|
|
||||||
# commands = []
|
|
||||||
# commands[cmdClothes = commands.length] = _INTL("Change clothes")
|
|
||||||
# commands[cmdHat = commands.length] = _INTL("Change hat 1 (#{hat1_name})")
|
|
||||||
# commands[cmdHat2 = commands.length] = _INTL("Change hat 2 (#{hat2_name})")
|
|
||||||
# commands[switchHats = commands.length] = _INTL("Switch hat positions")
|
|
||||||
# commands[cmdQuit = commands.length] = _INTL("Quit")
|
|
||||||
#
|
|
||||||
# #TODO change this into a graphical menu with icons
|
|
||||||
# loop do
|
|
||||||
# cmd = pbMessage(_INTL("What would you like to do?"), commands, cmdQuit + 1)
|
|
||||||
# if cmd == cmdClothes
|
|
||||||
# changeClothesMenu()
|
|
||||||
# break
|
|
||||||
# elsif cmd == cmdHat
|
|
||||||
# changeHatMenu()
|
|
||||||
# break
|
|
||||||
# elsif cmd == cmdHat2
|
|
||||||
# changeHatMenu(true)
|
|
||||||
# break
|
|
||||||
# elsif cmd == switchHats
|
|
||||||
# switchHatsPosition()
|
|
||||||
# break
|
|
||||||
# else
|
|
||||||
# break
|
|
||||||
# end
|
|
||||||
# end
|
|
||||||
# end
|
|
||||||
|
|
||||||
def changeOutfit()
|
def changeOutfit()
|
||||||
commands = []
|
commands = []
|
||||||
commands[cmdHat = commands.length] = _INTL("Change hat")
|
commands[cmdHat = commands.length] = _INTL("Change hat")
|
||||||
|
|||||||
@@ -101,13 +101,11 @@ class ClothesShopPresenter < PokemonMartScreen
|
|||||||
item = nil
|
item = nil
|
||||||
loop do
|
loop do
|
||||||
item = @scene.pbChooseBuyItem
|
item = @scene.pbChooseBuyItem
|
||||||
#break if !item
|
|
||||||
if !item
|
if !item
|
||||||
break if @adapter.isShop?
|
break if @adapter.isShop?
|
||||||
quit_menu_choice = quitMenuPrompt()
|
quit_menu_choice = quitMenuPrompt()
|
||||||
break if quit_menu_choice
|
break if quit_menu_choice
|
||||||
next
|
next
|
||||||
#item = @scene.pbChooseBuyItem
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@@ -155,7 +153,6 @@ class ClothesShopPresenter < PokemonMartScreen
|
|||||||
@stock.compact!
|
@stock.compact!
|
||||||
pbDisplayPaused(_INTL("Here you are! Thank you!")) { pbSEPlay("Mart buy item") }
|
pbDisplayPaused(_INTL("Here you are! Thank you!")) { pbSEPlay("Mart buy item") }
|
||||||
@adapter.addItem(item)
|
@adapter.addItem(item)
|
||||||
# break
|
|
||||||
end
|
end
|
||||||
@scene.pbEndBuyScene
|
@scene.pbEndBuyScene
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -125,8 +125,6 @@ class ClothesShopPresenter < PokemonMartScreen
|
|||||||
end
|
end
|
||||||
|
|
||||||
def playerHatActionsMenu(item)
|
def playerHatActionsMenu(item)
|
||||||
echoln caller
|
|
||||||
|
|
||||||
cmd_confirm = "Confirm"
|
cmd_confirm = "Confirm"
|
||||||
cmd_remove = "Remove hat"
|
cmd_remove = "Remove hat"
|
||||||
cmd_cancel = "Cancel"
|
cmd_cancel = "Cancel"
|
||||||
|
|||||||
@@ -53,9 +53,6 @@ class ClothesShopView < PokemonMart_Scene
|
|||||||
pbScrollMap(DIRECTION_LEFT, 7, 6)
|
pbScrollMap(DIRECTION_LEFT, 7, 6)
|
||||||
pbScrollMap(DIRECTION_DOWN, 5, 6)
|
pbScrollMap(DIRECTION_DOWN, 5, 6)
|
||||||
$game_player.turn_generic(@initial_direction)
|
$game_player.turn_generic(@initial_direction)
|
||||||
#$scene.reset_map(true)
|
|
||||||
#pbRefreshSceneMap
|
|
||||||
# $scene.reset_map(false)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def refreshStock(adapter)
|
def refreshStock(adapter)
|
||||||
@@ -70,9 +67,6 @@ class ClothesShopView < PokemonMart_Scene
|
|||||||
@subscene.pbRefresh
|
@subscene.pbRefresh
|
||||||
else
|
else
|
||||||
itemwindow = @sprites["itemwindow"]
|
itemwindow = @sprites["itemwindow"]
|
||||||
#@sprites["icon"].item = itemwindow.item
|
|
||||||
#@sprites["icon"].item = itemwindow.item
|
|
||||||
|
|
||||||
item = itemwindow.item
|
item = itemwindow.item
|
||||||
if itemwindow.item
|
if itemwindow.item
|
||||||
if itemwindow.item.is_a?(Symbol)
|
if itemwindow.item.is_a?(Symbol)
|
||||||
@@ -142,7 +136,6 @@ class ClothesShopView < PokemonMart_Scene
|
|||||||
end
|
end
|
||||||
|
|
||||||
if Input.trigger?(Input::BACK)
|
if Input.trigger?(Input::BACK)
|
||||||
echoln "backibacki"
|
|
||||||
pbPlayCloseMenuSE
|
pbPlayCloseMenuSE
|
||||||
return nil
|
return nil
|
||||||
elsif Input.trigger?(Input::USE)
|
elsif Input.trigger?(Input::USE)
|
||||||
|
|||||||
Reference in New Issue
Block a user