6.4 update (minus sprites)

Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopView.rb

@@ -1,14 +1,12 @@
 class ClothesShopView < PokemonMart_Scene
 
-
-  def initialize(currency_name="Money")
+  def initialize(currency_name = "Money")
     @currency_name = currency_name
   end
 
   def pbStartBuyOrSellScene(buying, stock, adapter)
     super(buying, stock, adapter)
-    @initial_direction = $game_player.direction
-    @sprites["icon"].visible=false
+    @sprites["icon"].visible = false
     if @adapter.isShop?
       @sprites["background"].setBitmap("Graphics/Pictures/martScreenOutfit")
     else
@@ -16,7 +14,7 @@ class ClothesShopView < PokemonMart_Scene
     end
 
     preview_y = @adapter.isShop? ? 80 : 0
-    @sprites["trainerPreview"] = TrainerClothesPreview.new(0, preview_y, true,"WALLET")
+    @sprites["trainerPreview"] = TrainerClothesPreview.new(0, preview_y, true, "WALLET")
 
     @sprites["trainerPreview"].show()
     @sprites["moneywindow"].visible = false if !@adapter.isShop?
@@ -26,18 +24,21 @@ class ClothesShopView < PokemonMart_Scene
   end
 
   def scroll_map
-    pbScrollMap(DIRECTION_UP, 5, 5)
-    pbScrollMap(DIRECTION_RIGHT, 7, 5)
+    pbScrollMap(DIRECTION_UP, 5, 6)
+    pbScrollMap(DIRECTION_RIGHT, 7, 6)
+    @initial_direction = $game_player.direction
     $game_player.turn_down
     pbRefreshSceneMap
   end
 
   def scroll_back_map
     @adapter.reset_player_clothes()
-    pbScrollMap(DIRECTION_LEFT, 7, 5)
-    pbScrollMap(DIRECTION_DOWN, 5, 5)
+    pbScrollMap(DIRECTION_LEFT, 7, 6)
+    pbScrollMap(DIRECTION_DOWN, 5, 6)
     $game_player.turn_generic(@initial_direction)
-    pbRefreshSceneMap
+    #$scene.reset_map(true)
+    #pbRefreshSceneMap
+    # $scene.reset_map(false)
   end
 
   def refreshStock(adapter)
@@ -54,11 +55,21 @@ class ClothesShopView < PokemonMart_Scene
       itemwindow = @sprites["itemwindow"]
       #@sprites["icon"].item = itemwindow.item
       #@sprites["icon"].item = itemwindow.item
-      @sprites["itemtextwindow"].text =
-        (itemwindow.item) ? @adapter.getDescription(itemwindow.item) : _INTL("Quit.")
+
+      item = itemwindow.item
+      if itemwindow.item
+        if itemwindow.item.is_a?(Symbol)
+          text = @adapter.getSpecialItemCaption(item)
+        else
+          text = @adapter.getDescription(item)
+        end
+      else
+        text = _INTL("Quit.")
+      end
+      @sprites["itemtextwindow"].text = text
       itemwindow.refresh
     end
-    @sprites["moneywindow"].text = _INTL("{2}:\r\n<r>{1}", @adapter.getMoneyString,@currency_name)
+    @sprites["moneywindow"].text = _INTL("{2}:\r\n<r>{1}", @adapter.getMoneyString, @currency_name)
   end
 
   def updateTrainerPreview()
@@ -66,13 +77,20 @@ class ClothesShopView < PokemonMart_Scene
   end
 
   def displayNewItem(itemwindow)
-    @adapter.updateTrainerPreview(itemwindow.item,@sprites["trainerPreview"])
-    @sprites["itemtextwindow"].text =
-      (itemwindow.item) ? @adapter.getDescription(itemwindow.item) : _INTL("Quit.")
+    item = itemwindow.item
+    if item
+      if item.is_a?(Symbol)
+        description = @adapter.getSpecialItemDescription(itemwindow.item)
+      else
+        description = @adapter.getDescription(itemwindow.item)
+      end
+      @adapter.updateTrainerPreview(itemwindow.item, @sprites["trainerPreview"])
+    else
+      description = _INTL("Quit.")
+    end
+    @sprites["itemtextwindow"].text = description
   end
 
-
-
   def pbChooseBuyItem
     itemwindow = @sprites["itemwindow"]
     displayNewItem(itemwindow)
@@ -87,25 +105,27 @@ class ClothesShopView < PokemonMart_Scene
         if itemwindow.item != olditem
           displayNewItem(itemwindow)
         end
-        if Input.trigger?(Input::AUX1)#L button
-          @adapter.switchVersion(itemwindow.item,-1)
+        if Input.trigger?(Input::AUX1) #L button  - disabled  because same key as speed up...
+          #@adapter.switchVersion(itemwindow.item, -1)
+          #updateTrainerPreview()
+        end
+        if Input.trigger?(Input::AUX2) #R button
+          @adapter.switchVersion(itemwindow.item, 1)
           updateTrainerPreview()
         end
-        if Input.trigger?(Input::AUX2)#R button
-          @adapter.switchVersion(itemwindow.item,1)
-          updateTrainerPreview()
-        end
-        if Input.trigger?(Input::SPECIAL)#R button
+        if Input.trigger?(Input::SPECIAL) #R button
           @adapter.toggleEvent(itemwindow.item)
           updateTrainerPreview()
         end
 
-
         if Input.trigger?(Input::BACK)
           pbPlayCloseMenuSE
           return nil
         elsif Input.trigger?(Input::USE)
-          if itemwindow.index < @stock.length
+          if itemwindow.item.is_a?(Symbol)
+            @adapter.doSpecialItemAction(itemwindow.item)
+            updateTrainerPreview()
+          elsif itemwindow.index < @stock.length
             pbRefresh
             return @stock[itemwindow.index]
           else
@@ -130,10 +150,9 @@ class ClothesShopView < PokemonMart_Scene
     super
   end
 
-
   def pbEndBuyScene
     @sprites["trainerPreview"].erase()
-    @sprites["trainerPreview"]=nil
+    @sprites["trainerPreview"] = nil
     pbDisposeSpriteHash(@sprites)
     @viewport.dispose
     Kernel.pbClearText()