Battle Factory improvements

Data/Scripts/016_UI/013_UI_Load.rb

@@ -274,7 +274,23 @@ class PokemonLoadScreen
     end
   end
 
+
+  #todo
+  def copyKeybindings
+    #return
+    keybinding_path = "Data/"
+    keybinding_fileName="keybindings.mkxp1"
+
+    srcPath = keybinding_path+keybinding_fileName
+    destPath = System.data_directory + keybinding_fileName
+    if !File.file?(destPath)
+      File.copy(srcPath,destPath)
+      print("New default controls for controllers were copied. Please re-launch the game to enable them.")
+    end
+  end
+
   def pbStartLoadScreen
+    copyKeybindings()
     commands = []
     cmd_continue     = -1
     cmd_new_game     = -1

Data/Scripts/016_UI/020_UI_PokeMart.rb

@@ -653,7 +653,7 @@ def replaceShopStockWithRandomized(stock)
     newStock = []
     for item in stock
       newItem =$PokemonGlobal.randomItemsHash[item]
-        if newItem != nil && GameData::Item.get(newItem).price >0
+        if newItem != nil && GameData::Item.get(newItem).price >0 && !Settings::EXCLUDE_FROM_RANDOM_SHOPS.include?(newItem)
           newStock << newItem
         else
           newStock << item