bdoap 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c463012b75ab5e6a2ad6d2558aaf0d13d4ca815b0092d7384efa44903c124d
-  data.tar.gz: ffd6889945d22837ba488133f5d364d086352dd945adf95cb4adb6512036963e
+  metadata.gz: a4336121be8b520924050e57400f46e24661e9c9dc4156def8b08802e6eec2e2
+  data.tar.gz: 5011af8aa6f7f7a044786ca134ca8d4cce0bb3ae076409de70cc69a1adf8d6f9
 SHA512:
-  metadata.gz: cf5c5d4011b0febc18953536d8bd94d90fa1df257386685dbce8e6d1dbc745e8ed4afbab2f079be71e1f2d13767802cf8d054ffeb90f2c2342f2dc9093e39c29
-  data.tar.gz: 2c6626ef2c4222dc002db072403d55bec2c06c7b87a860795b739d1b312419283ab6fdc3b6ace8a31f1da9374131a6045d3fd8ce3b2dbd581c40add167cf1ba5
+  metadata.gz: 0b055768a4bad1ebc9b244574d546dd859c4db6f7475d72afd7352d24b3aa9db5a311f6c74b6ce160ae86756ebbbc249df87c8d17b2294bba1a575bec8b6e96d
+  data.tar.gz: f5537518eebae1c5f62d63d9daaa0b2ee29d1570940a165e0c7dcee1b033ed728909f6f7f3940edc51d5dc00672363f8639adb8f8a64780ecc3ed9706716ffa5

data/bin/bdoap

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
+# bin/bdoap
 # frozen_string_literal: true
 
 require_relative '../lib/bdo_alchemy_profits'
 
-profit_calculator = BDOAlchemyProfits.new
+profit_calculator = BDOAP::BDOAlchemyProfits.new
 
 profit_calculator.start_cli

data/lib/bdo_alchemy_profits.rb

@@ -24,71 +24,184 @@
 # SOFTWARE.
 
 require 'optparse'
+require 'httparty'
 
 require_relative './utils/user_cli'
 require_relative './central_market/market_searcher'
 require_relative './bdo_codex/bdo_codex_searcher'
 
-class BDOAlchemyProfits
-  include Utils
-
-  def start_cli
-    options = {}
-
-    OptionParser.new do |opt|
-      opt.on('--silent', '-s') { options[:silent] = true }
-    end.parse!
-
-    cli = UserCLI.new options
-
-    # option setup
+# main module for bdoap. contains the BDOAlchemyProfits class
+module BDOAP
+  # used to search for profitable alchemy recipes
+  class BDOAlchemyProfits
+    include Utils
+
+    def start_enhance(search_string, enhance_starting_level, region, cli)
+      items_at_level = []
+      root_url = ENVData.get_root_url region
+      search_url = "#{root_url}#{ENVData::MARKET_SEARCH_LIST}"
+      sub_url = "#{root_url}#{ENVData::MARKET_SUB_LIST}"
+      category_opts = {
+        url: search_url,
+        query_string: "#{ENVData::RVT}&searchText=#{URI.encode_www_form_component search_string}",
+        update: ->(data) { data['list'] }
+      }
+
+      data = HTTParty.post(
+        URI(category_opts[:url].to_s),
+        headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
+        body: category_opts[:query_string],
+        content_type: 'application/x-www-form-urlencoded'
+      )
+
+      resolved = category_opts[:update].call(data) if data
+
+      return unless resolved
+
+      resolved.each do |item|
+        subdata = HTTParty.post(
+          URI(sub_url),
+          headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
+          body: "#{ENVData::RVT}&mainKey=#{item['mainKey']}&usingCleint=0",
+          content_type: 'application/x-www-form-urlencoded'
+        )
+
+        sleep rand
+
+        if subdata&.dig('detailList')
+          level_map = {
+            0 => 0,
+            1 => 1,
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            6 => 6,
+            7 => 7,
+            8 => 8,
+            9 => 9,
+            10 => 10,
+            11 => 11,
+            12 => 12,
+            13 => 13,
+            14 => 14,
+            15 => 15,
+            16 => 16,
+            17 => 17,
+            18 => 18,
+            19 => 19,
+            20 => 20,
+          }
+
+          level_map_to_bdo = {
+            0 => 0,
+            1 => 1,
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            6 => 6,
+            7 => 7,
+            8 => 8,
+            9 => 9,
+            10 => 10,
+            11 => 11,
+            12 => 12,
+            13 => 13,
+            14 => 14,
+            15 => 15,
+            16 => 'PRI',
+            17 => 'DUO',
+            18 => 'TRI',
+            19 => 'TET',
+            20 => 'PEN',
+          }
+
+          result = subdata['detailList'] .find { |e| e['subKey'].to_s == level_map[enhance_starting_level.to_i].to_s }
+          if result
+            constructed = "    #{result['count']} #{cli.yellow result['name'].downcase} @ #{level_map_to_bdo[result['subKey']]}"
+            items_at_level.push constructed unless result['count'].to_i == 0
+          end
+        end
+      end
+
+      puts "\nthe results are in!\n"
+      items_at_level.each { |item| puts item }
+      puts
+    end
 
-    category = cli.choose_category
+    # begin the configuration and search process
+    def start_cli(search_string = nil, enhance_starting_level = nil, enhancing = false)
+      begin
+        options = {}
 
-    cli.end_cli if category == 'exit'
+        OptionParser.new do |opt|
+          opt.on('--silent', '-s') { options[:silent] = true }
+        end.parse!
 
-    region = cli.choose_region
+        # option setup
+        cli = UserCLI.new options
 
-    cli.end_cli if region == 'exit'
+        unless enhancing
+          category = cli.choose_category
+          cli.end_cli if category == 'exit'
+        end
 
-    lang = cli.choose_lang
+        region = cli.choose_region
+        cli.end_cli if region == 'exit'
 
-    cli.end_cli if lang == 'exit'
+        # start enhancing
+        if enhancing && search_string && enhance_starting_level
+          start_enhance(search_string, enhance_starting_level, region, cli)
+          return
+        end
 
-    aggression = cli.choose_aggression
+        lang = cli.choose_lang
+        cli.end_cli if lang == 'exit'
+        aggression = cli.choose_aggression
+        cli.end_cli if aggression == 'exit'
+        free_ingredients = cli.choose_free_ingredients
+        show_out_of_stock = cli.choose_show_out_of_stock
 
-    cli.end_cli if aggression == 'exit'
+        if aggression == 'hyperaggressive'
+          puts cli.orange("\nWARN: hyperagressive mode is RISKY AND SLOW. this will evaluate every substitution for every recipe. hammers apis violently. you will get rate limited. you will get IP blocked. her royal holiness imperva incapsula WILL get you. select if you know what all that stuff means and you are ok with waiting 20 minutes.")
+        end
 
-    if aggression == 'hyperaggressive'
-      puts cli.orange("\nWARN: hyperagressive mode is RISKY AND SLOW. this will evaluate every substitution for every recipe. hammers apis violently. you will get rate limited. you will get IP blocked. her royal holiness imperva incapsula WILL get you. select if you know what all that stuff means and you are ok with waiting 20 minutes.")
-    end
+        # start searching
+        cli.vipiko("\n♫ let's see if #{cli.yellow category} alchemy items are profitable in #{cli.yellow region}!")
 
-    # start searching
+        market_searcher = MarketSearcher.new(region, cli, free_ingredients)
 
-    cli.vipiko("\n♫ let's see if #{cli.yellow category} alchemy items are profitable in #{cli.yellow region}!")
+        market_item_list = market_searcher.get_alchemy_market_data category
 
-    market_searcher = MarketSearcher.new region, cli
+        cli.vipiko("I'll look for #{cli.yellow(market_item_list.length.to_s)} item#{
+          market_item_list.empty? || market_item_list.length > 1 ? 's' : ''
+        } in #{category == 'all' ? cli.yellow('all categories'): "the #{cli.yellow category} category"}!")
 
-    market_item_list = market_searcher.get_alchemy_market_data category
+        bdo_codex_searcher = BDOCodexSearcher.new(region, lang, cli, aggression == 'hyperaggressive')
 
-    cli.vipiko("I'll look for #{cli.yellow(market_item_list.length)} item#{
-      market_item_list.empty? || market_item_list.length > 1 ? 's' : ''
-    } in #{category == 'all' ? cli.yellow('all categories'): "the #{cli.yellow category} category"}!")
+        item_codex_data = bdo_codex_searcher.get_item_codex_data market_item_list
 
-    bdo_codex_searcher = BDOCodexSearcher.new(region, lang, cli, aggression == 'hyperaggressive')
+        recipe_prices = market_searcher.get_all_recipe_prices item_codex_data, category
 
-    item_codex_data = bdo_codex_searcher.get_item_codex_data market_item_list
+        mapped_prices = recipe_prices.reverse.sort_by { |recipe| recipe[:gain].to_i }.map { |recipe| recipe[:information] }
 
-    recipe_prices = market_searcher.get_all_recipe_prices item_codex_data, category
+        out_of_stock = recipe_prices.dig(0, :out_of_stock) || []
+        out_of_stock_list = ""
+        out_of_stock.each { |item| out_of_stock_list += "\n\t  #{cli.yellow item}" }
 
-    mapped_prices = recipe_prices.sort_by { |recipe| recipe[:silver_per_hour].to_i }.map { |recipe| recipe[:information] }
+        if mapped_prices.length > 0
+          cli.vipiko_overwrite "done!"
+          puts "\n\n"
+          puts mapped_prices
+        else
+          cli.vipiko_overwrite "none of those recipes look profitable right now...let's go gathering!\n\n"
+        end
 
-    if mapped_prices.length > 0
-      cli.vipiko_overwrite "done!"
-      puts "\n\n"
-      puts mapped_prices
-    else
-      cli.vipiko_overwrite "none of those recipes look profitable right now...let's go gathering!"
+        puts "      items that were out of stock: #{out_of_stock_list}" if show_out_of_stock && out_of_stock_list.length > 0
+      rescue Interrupt => e
+        puts "\n\nstopping!"
+      end
     end
   end
 end

data/lib/bdo_codex/bdo_codex_searcher.rb

@@ -24,13 +24,18 @@ class BDO_CODEX_UTILS
     'products',
     'all ingredients',
   ]
+  def self.acc_number_to_enhance_level(number)
+    %w[PRI DUO TRI TET PEN][number]
+  end
 end
 
 # used to retrieve items from BDOCodex
 class BDOCodexSearcher
   include Utils
 
+  RECIPE_PRODUCTS_INDEX = 3
   RECIPE_INGREDIENTS_INDEX = 2
+  RECIPE_NAME_KEY = 1
 
   def initialize(region, lang, cli, hyper_aggressive = false)
     @region = region
@@ -41,14 +46,15 @@ class BDOCodexSearcher
     @hyper_aggressive = hyper_aggressive
   end
 
-  def get_recipe_url(url)
+  def get_recipe_url(url, item_name)
     begin
       data = HTTParty.get(
         URI(url),
         headers: ENVData::REQUEST_OPTS[:bdo_codex_headers],
-        content_type: 'application/x-www-form-urlencoded'
       )
 
+      return {} unless data.length < 1_000_000
+
       JSON.parse data unless data.body.nil? or data.body.empty?
     rescue
       {}
@@ -85,6 +91,11 @@ class BDOCodexSearcher
       permutated_chunks = ArrayUtils.deep_permute chunked_by_substitution_groups, original_recipe_length
 
       permutated_chunks.each do |id_list|
+        if id_list.uniq.length != id_list.length
+          all_recipe_substitutions.push recipe
+          next
+        end
+
         recipe_with_new_items = [*recipe]
         recipe_with_new_items[RECIPE_INGREDIENTS_INDEX] = [*recipe][RECIPE_INGREDIENTS_INDEX].map.with_index do |recipe_list, idx|
           { **recipe_list, id: id_list[idx] }
@@ -100,6 +111,8 @@ class BDOCodexSearcher
 
   def parse_raw_recipe(recipe_data, item_name)
     item_with_ingredients = recipe_data.dig(BDO_CODEX_UTILS::BDOCODEX_QUERY_DATA_KEY)
+    has_subs = false
+
 
     if item_with_ingredients
       recipe_with_substitute_ids = item_with_ingredients.map do |arr|
@@ -109,29 +122,37 @@ class BDOCodexSearcher
       end.first
 
       all_potion_recipes = item_with_ingredients.map do |arr|
+        is_m_recipe = false
         mapped_item_data = arr
           .filter.with_index { |_, idx | !BDO_CODEX_UTILS::RECIPE_COLUMNS[idx].nil? }
           .map.with_index do |raw_element, idx|
             category = BDO_CODEX_UTILS::RECIPE_COLUMNS[idx]
 
-            next if ['skill level', 'exp', 'type', 'icon', 'total weight of materials'].include? category
+            next if ['skill level', 'exp', 'icon', 'total weight of materials'].include? category
 
             element = Nokogiri::HTML5 raw_element.to_s
 
+            has_subs = true if element.to_s.include? 'icon-repeat'
+
             result = {
               :category => category,
               :element => element
             }
 
-            result[:element] = element.text.downcase if category == 'title'
+            if %w[title id].include? category
+              result[:element] = element.text.downcase
+            end
 
-            result[:element] = element.text.downcase if category == 'id'
+            if category == 'type'
+              is_m_recipe = true unless %w[cooking alchemy].include? element.text.downcase
+            end
 
             if %w[materials products].include? category
               quants = element.text.scan(/\](\d+)/im).map { |e| e[0].to_i }
+              enhance_levels = element.text.scan(/](\+?\d)/im).map { |e| e[0].to_s }
 
               ids = element.to_s.scan(/#{@region_lang}\/item\/(\d+)/).map { |e| e[0].to_i }
-              result[:element] = ids.map.with_index { |id, i| { id: id, quant: quants[i]} }.flatten
+              result[:element] = ids.map.with_index { |id, i| { id: id, quant: quants[i] || 1, enhance_level: enhance_levels[i][0] == '+' ?  enhance_levels[i].to_i : 0, is_m_recipe: is_m_recipe } }.flatten
             end
 
             result
@@ -145,6 +166,8 @@ class BDOCodexSearcher
         filtered_item_data
       end
 
+      return all_potion_recipes unless has_subs
+
       get_recipe_substitutions recipe_with_substitute_ids, all_potion_recipes, item_name
     end
   end
@@ -152,21 +175,21 @@ class BDOCodexSearcher
   def get_item_recipes(item_id, item_name)
     recipe_direct_url = "https://bdocodex.com/query.php?a=recipes&type=product&item_id=#{item_id}&l=#{@region_lang}"
     mrecipe_direct_url = "https://bdocodex.com/query.php?a=mrecipes&type=product&item_id=#{item_id}&l=#{@region_lang}"
-    # houserecipe_direct_url = "https://bdocodex.com/query.php?a=designs&type=product&item_id=#{item_id}&l=#{@region_lang}"
+    houserecipe_direct_url = "https://bdocodex.com/query.php?a=designs&type=product&item_id=#{item_id}&l=#{@region_lang}"
 
     # TODO: there MUST be a better way to determine which recipe to use, rather than just trying them both.
     begin
-      direct_data = get_recipe_url recipe_direct_url
+      direct_data = get_recipe_url recipe_direct_url, item_name
 
       if !direct_data || direct_data.empty?
-        mrecipe_data = get_recipe_url mrecipe_direct_url
+        mrecipe_data = get_recipe_url mrecipe_direct_url, item_name
 
         return parse_raw_recipe mrecipe_data, item_name
       else
         parsed = parse_raw_recipe direct_data, item_name
 
         if !parsed || parsed.empty?
-          mrecipe_data = get_recipe_url mrecipe_direct_url
+          mrecipe_data = get_recipe_url mrecipe_direct_url, item_name
 
           return parse_raw_recipe mrecipe_data, item_name
         end
@@ -198,7 +221,7 @@ class BDOCodexSearcher
     cache_data = {}
 
     # TODO: remove this check
-    # return unless item_name.downcase == 'harmony draught'
+    # return unless item_name.downcase == 'essence of dawn - damage reduction'
 
     unless potential_cached_recipes.to_a.empty?
       recipe_to_maybe_select = potential_cached_recipes.filter { |elem| elem[1].downcase == item_name.downcase }
@@ -206,9 +229,33 @@ class BDOCodexSearcher
     end
 
     recipes = get_item_recipes item_id, item_name
-    cache_data[item_index] = recipes
 
-    @cache.write cache_data
+    if recipes
+      cache_data[item_index] = [*recipes]
+      has_uncacheable = recipes.index do |cache_item|
+        has_enhanced_ingredient = cache_item[RECIPE_INGREDIENTS_INDEX].index { |ingredient| ingredient[:enhance_level] > 0 }
+
+        has_enhanced_ingredient
+      end
+
+      cache_data[item_index] = recipes.map do |cache_item|
+        new_cache_recipes = cache_item[RECIPE_INGREDIENTS_INDEX].map do |ingredient|
+          { id: ingredient[:id], quant: ingredient[:quant] }
+        end
+        new_cache_ouputs = cache_item[RECIPE_PRODUCTS_INDEX].map do |ingredient|
+          { id: ingredient[:id], quant: ingredient[:quant] }
+        end
+
+        new_cache_item = [*cache_item]
+
+        new_cache_item[RECIPE_INGREDIENTS_INDEX] = new_cache_recipes
+        new_cache_item[RECIPE_PRODUCTS_INDEX] = new_cache_ouputs
+
+        new_cache_item
+      end
+
+      @cache.write cache_data unless has_uncacheable
+    end
 
     recipes
   end
@@ -239,10 +286,12 @@ class BDOCodexSearcher
           @cli.vipiko_overwrite "(#{index + 1} / #{item_list.length}) let's read the recipe for #{@cli.yellow "[#{item[:name].downcase}]"}. hmm..."
 
           stock_count = item[:total_in_stock].to_i.zero? ? item[:count].to_i : item[:total_in_stock].to_i
+          price = item[:price_per_one]
+
           recipe_hash = {
             name: item[:name],
             recipe_list: all_recipes_for_item,
-            price: item[:price_per_one],
+            price: price,
             id: item[:main_key],
             total_trade_count: item[:total_trade_count],
             total_in_stock: stock_count,

data/lib/central_market/category_search_options.rb

@@ -10,6 +10,7 @@ module MarketSearchTools
     offensive: 1,
     defensive: 2,
     functional: 3,
+    food: 4,
     potion: 5,
     other: 8,
     all: [1, 2, 3, 5, 8]
@@ -23,49 +24,48 @@ module MarketSearchTools
         name: 'black stone',
         url: url,
         query_string: "#{ENVData::RVT}&mainCategory=30&subCategory=1",
-        # update: ->(data) { { blackStoneResponse: data['list'] } },
-        update: ->(data) { data['list'] }
+        update: ->(data) { data['marketList'] }
       },
       {
         name: 'misc',
         url: url,
         query_string: "#{ENVData::RVT}&mainCategory=25&subCategory=8",
-        # update: ->(data) { { blackStoneResponse: data['list'] } },
-        update: ->(data) { data['list'] }
+        update: ->(data) { data['marketList'] }
       },
       {
         name: 'other tools',
         url: url,
         query_string: "#{ENVData::RVT}&mainCategory=40&subCategory=10",
-        # update: ->(data) { { blackStoneResponse: data['list'] } },
-        update: ->(data) { data['list'] }
+        update: ->(data) { data['marketList'] }
       },
       {
         name: 'blood',
         url: search_url,
         query_string: "#{ENVData::RVT}&searchText='s+blood",
-        # update: ->(data) { { bloodResponse: data['list'] } },
+        update: ->(data) { data['list'] }
+      },
+      {
+        name: 'essences of dawn',
+        url: search_url,
+        query_string: "#{ENVData::RVT}&searchText=essence+of+dawn",
         update: ->(data) { data['list'] }
       },
       {
         name: 'reagent',
         url: search_url,
         query_string: "#{ENVData::RVT}&searchText=reagent",
-        # update: ->(data) { { reagentResponse: data['list'] } },
         update: ->(data) { data['list'] }
       },
       {
         name: 'oil',
         url: search_url,
         query_string: "#{ENVData::RVT}&searchText=oil+of",
-        # update: ->(data) { { oilResponse: data['list'] } },
         update: ->(data) { data['list'] }
       },
       {
         name: 'alchemy stone',
         url: search_url,
-        query_string: "#{ENVData::RVT}&searchText=stone+of",
-        # update: ->(data) { { alchemyStoneResponse: data['list'] } },
+        query_string: "#{ENVData::RVT}&searchText=imperfect+alchemy+stone+of",
         update: ->(data) { data['list'].filter { |i| i['grade'] == 0 } }
       },
       # {
@@ -75,12 +75,24 @@ module MarketSearchTools
       #   # update: ->(data) { { magicCrystalResponse: data['list'] } },
       #   update: ->(data) { data['list'] }
       # },
+      {
+        name: 'combined crystals',
+        url: url,
+        query_string: "#{ENVData::RVT}&mainCategory=50&subCategory=4",
+        update: ->(data) { data['marketList'] }
+      },
       {
         name: 'offensive',
         url: url,
         query_string:
           "#{ENVData::RVT}&mainCategory=#{CONSUMABLE_CATEGORY}&subCategory=#{CONSUMABLE_SUBCATEGORIES[:offensive]}",
-        # update: ->(data) { { offensiveResponse: data['marketList'] } },
+        update: ->(data) { data['marketList'] }
+      },
+      {
+        name: 'food',
+        url: url,
+        query_string:
+          "#{ENVData::RVT}&mainCategory=#{CONSUMABLE_CATEGORY}&subCategory=#{CONSUMABLE_SUBCATEGORIES[:food]}",
         update: ->(data) { data['marketList'] }
       },
       {
@@ -114,7 +126,28 @@ module MarketSearchTools
           "#{ENVData::RVT}&mainCategory=#{CONSUMABLE_CATEGORY}&subCategory=#{CONSUMABLE_SUBCATEGORIES[:other]}",
         # update: ->(data) { { otherResponse: data['marketList'] } },
         update: ->(data) { data['marketList'] }
-      }
+      },
+      {
+        name: 'manos',
+        url: search_url,
+        query_string: "#{ENVData::RVT}&searchText=manos",
+        # update: ->(data) { { otherResponse: data['marketList'] } },
+        update: ->(data) { data['list'] }
+      },
+      {
+        name: 'purified lightstone',
+        url: search_url,
+        query_string: "#{ENVData::RVT}&searchText=purified+lightstone+of",
+        # update: ->(data) { { otherResponse: data['marketList'] } },
+        update: ->(data) { data['list'] }
+      },
+      # {
+      #   name: 'stuffed animals',
+      #   url: search_url,
+      #   query_string: "#{ENVData::RVT}&searchText=stuffed",
+      #   # update: ->(data) { { otherResponse: data['marketList'] } },
+      #   update: ->(data) { data['list'] }
+      # }
     ]
   end
 end

data/lib/central_market/exchange_items.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ExchangeItems
+  EXCHANGE_ITEMS = {
+    # magical lightstone crystal
+    766108 => {
+      # items you can exchange for this item. there are technically way more
+      exchange_with: [766105, 766104, 766107, 766106],
+      exchange_with_names: ['imperfect lightstone'],
+      # how many of this item would you get if you exchanged it for the item ID above
+      exchanging_grants: 6,
+      exchange_with_npc: 'dalishain',
+      count: Float::INFINITY,
+      is_npc_item: true,
+      name: 'Magical Lightstone Crystal',
+      id: 766108,
+    }
+  }.freeze
+
+  def get_exchange_item_info(item_to_exchange_id, item_to_exchange_for_id, price_of_exchange, quant_required)
+    exchange_info = EXCHANGE_ITEMS[item_to_exchange_for_id]
+
+    if exchange_info
+      if exchange_info[:exchange_with].include? item_to_exchange_id
+        # if a recipe requires 10 magical lightstone crystals, for example, and the exchange rate is
+        # 1 imperfect lightstone for 6 crystals, you'll have to buy 2 imperfect lightstones to fill
+        # the quant. since you can't buy a fraction of an item, we .ceil the number required.
+        mult = (quant_required.to_f / exchange_info[:exchanging_grants].to_f).ceil
+        return { **exchange_info, price: price_of_exchange * mult, must_exchange: mult }
+      end
+    end
+  end
+end

data/lib/central_market/market_searcher.rb

@@ -8,13 +8,15 @@ require_relative '../utils/price_calculator'
 require_relative '../utils/recipe_logger'
 require_relative '../utils/npc_item_index'
 require_relative './category_search_options'
+require_relative './exchange_items'
 
 # search for information on recipes in given categories
 class MarketSearcher
   include Utils
+  include ExchangeItems
   include MarketSearchTools
 
-  def initialize(region, cli)
+  def initialize(region, cli, free_ingredients)
     @root_url = ENVData.get_root_url region
     @region_subdomain = CLIConstants::REGION_DOMAINS[region.to_sym].split('.')[1..].join('.')
     @market_list_url = "#{@root_url}#{ENVData::WORLD_MARKET_LIST}"
@@ -22,7 +24,10 @@ class MarketSearcher
     @market_sub_url = "#{@root_url}#{ENVData::MARKET_SUB_LIST}"
     @market_sell_buy_url = "#{@root_url}#{ENVData::MARKET_SELL_BUY_INFO}"
     @cli = cli
+    # cache used to store all ingredients for which the price has already been checked
     @ingredient_cache = {}
+    @free_ingredients = free_ingredients
+    @out_of_stock_items = []
   end
 
   def get_alchemy_market_data(category)
@@ -61,6 +66,9 @@ class MarketSearcher
     puts
     mapped_aggregate = filtered_aggregate.map.with_index do |elem, index|
 
+      # TODO: remove this check
+      # next unless elem['name'].downcase == 'essence of dawn - damage reduction'
+
       @cli.vipiko_overwrite "(#{index + 1} / #{filtered_aggregate.length}) researching #{@cli.yellow elem['name'].downcase}... (category: #{subcategory})"
 
       begin
@@ -129,7 +137,8 @@ class MarketSearcher
     aggregate_response.flatten
   end
 
-  def get_item_price_info(ingredient_id, is_recipe_ingredient = true)
+  # set is_recipe_ingredient = true if you're using this function to get the cost of buying an ingredient
+  def get_item_price_info(ingredient_id, is_recipe_ingredient = true, enhance_level = 0)
     npc_item = NPCItemIndex.get_item(ingredient_id)
 
     return npc_item if npc_item
@@ -145,7 +154,7 @@ class MarketSearcher
           content_type: 'application/x-www-form-urlencoded'
         )
 
-        sleep rand(1..3)
+        sleep rand
       rescue StandardError => error
         puts @cli.red("this could be a network failure. get_item_price_info broke.")
 
@@ -156,12 +165,15 @@ class MarketSearcher
         end
       end
 
-      ingredient_data = {} if ingredient_data.include? 'use a different browser'
+      # TODO: actually implement a normal way of handling malformed results
+      ingredient_data = {} if ingredient_data.to_s.downcase.include? 'use a different browser'
+      ingredient_data = {} if ingredient_data.to_s.downcase.include? 'incapsula incident'
 
       if ingredient_data.dig('detailList')
-        resolved_data = ingredient_data['detailList'][0]
+        resolved_data = ingredient_data['detailList'].find { |entry| entry['subKey'].to_i == enhance_level.to_i }
+        resolved_data = ingredient_data['detailList'][0] if resolved_data.nil?
         unless resolved_data.nil?
-          body_string = "#{ENVData::RVT}&mainKey=#{resolved_data['mainKey']}&subKey=0&chooseKey=0&isUp=true&keyType=0&name=#{URI.encode_www_form_component(resolved_data['name'])}"
+          body_string = "#{ENVData::RVT}&mainKey=#{resolved_data['mainKey']}&subKey=#{enhance_level}&chooseKey=0&isUp=true&keyType=0&name=#{URI.encode_www_form_component(resolved_data['name'])}"
 
           detailed_price_list = {}
 
@@ -172,6 +184,9 @@ class MarketSearcher
               body: body_string,
               content_type: 'application/x-www-form-urlencoded'
             )
+
+            detailed_price_list = {} if detailed_price_list.to_s.downcase.include? 'incapsula incident'
+
             sleep rand
           rescue StandardError => error
             puts @cli.red("this could be a network failure. get_item_price_info broke.")
@@ -193,53 +208,65 @@ class MarketSearcher
 
           if optimal_price
             if optimal_price['pricePerOne'] && optimal_price['sellCount']
-              { **resolved_data, count: total_stock, pricePerOne: optimal_price['pricePerOne'] }
+              { **resolved_data, count: total_stock, pricePerOne: optimal_price['pricePerOne'], enhanceLevel: enhance_level }
             else
-              { **resolved_data, count: total_stock, pricePerOne: resolved_data['pricePerOne'] }
+              { **resolved_data, count: total_stock, pricePerOne: resolved_data['pricePerOne'], enhanceLevel: enhance_level }
             end
           end
         end
       end
-
     end
   end
 
   def get_all_recipe_prices(item_codex_data, subcategory)
     mapped_recipe_prices = []
-    out_of_stock_items = []
-    # vipiko is about to start writing carriage returns,
-    # so printing newline here
 
     item_codex_data.each.with_index do |item_with_recipe, index|
       potential_recipes = []
       name = item_with_recipe[:name].downcase
       recipe_list = item_with_recipe[:recipe_list]
 
+      # TODO: remove this line
+      # next unless name == 'essence of dawn - damage reduction'
+
       @cli.vipiko_overwrite "(#{index + 1} / #{item_codex_data.length}) I'll ask a merchant about the price of ingredients for #{@cli.yellow name}!"
 
-      recipe_list.each do |(recipe_id, recipe)|
+      recipe_list.each do |recipe_id, recipe|
         potential_recipe = []
 
-        recipe.each do |ingredient|
+        recipe.each.with_index do |ingredient, ing_index|
           ingredient_id = ingredient['id'] ? ingredient['id'] : ingredient[:id]
           quant = ingredient['quant'] ? ingredient['quant'] : ingredient[:quant]
+          enhance_level = ingredient['enhance_level'] ? ingredient['enhance_level'] : ingredient[:enhance_level]
+          is_m_recipe = ingredient['is_m_recipe'] ? ingredient['is_m_recipe'] : ingredient[:is_m_recipe]
+          quant = 1 if quant.nil?
+          enhance_level = 0 if enhance_level.nil?
 
-          if @ingredient_cache[ingredient_id]
-            cached_ingredient = { **@ingredient_cache[ingredient_id], quant: quant }
+          if @ingredient_cache[ingredient_id] && EXCHANGE_ITEMS[ingredient_id].nil? == true
+            cached_ingredient = { **@ingredient_cache[ingredient_id], quant: quant, for_recipe_id: recipe_id, is_m_recipe: is_m_recipe }
             potential_recipe.push cached_ingredient
             next
           end
 
-          item_price_info_hash = get_item_price_info ingredient_id, true
+          item_price_info_hash = get_item_price_info ingredient_id, true, enhance_level
+          previous_ingredient_id = recipe.dig(ing_index - 1, :id)
+          previous_ingredient_price = potential_recipe.dig(ing_index - 1, :price)
 
-          next if item_price_info_hash.nil?
+          if item_price_info_hash.nil?
+            next if previous_ingredient_id.nil? || previous_ingredient_price.nil?
+            exchange_info = get_exchange_item_info(previous_ingredient_id, ingredient_id, previous_ingredient_price, quant)
+            next unless exchange_info
+            item_price_info_hash = exchange_info
+          end
 
           item_price_info = item_price_info_hash.transform_keys { |key|
             key.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase.to_sym
           }
 
-          if item_price_info[:count].zero? && rand > 0.5
-            out_of_stock_items.push(item_price_info[:name].downcase)
+          # gathering out of stock items to show to the user
+          stock_string = "#{quant}x [#{item_price_info[:main_key]}] #{item_price_info[:name].downcase}"
+          if item_price_info[:count] < quant && !@out_of_stock_items.include?(stock_string)
+            @out_of_stock_items.push(stock_string)
           end
 
           stock_count = get_stock_count item_price_info
@@ -249,6 +276,15 @@ class MarketSearcher
           npc_data = item_price_info if item_price_info[:is_npc_item]
           price_per_one = npc_data[:price].to_i.zero? ? item_price_info[:price_per_one].to_i : npc_data[:price].to_i
 
+          if @free_ingredients.include?(item_price_info[:main_key].to_s) ||
+            @free_ingredients.include?(item_price_info[:id].to_s) ||
+            (item_price_info[:exchange_with] || []).index { |item| @free_ingredients.include? item.to_s }
+            price_per_one = 0
+            stock_count = Float::INFINITY
+            npc_data[:price] = 0
+            npc_data[:price_per_one] = 0
+          end
+
           # TODO: this is ridiculous, dedupe the hash values
           potential_ingredient_hash = {
             name: item_price_info[:name],
@@ -261,13 +297,13 @@ class MarketSearcher
             quant: quant,
             price_per_one: price_per_one,
             count: stock_count,
-            for_recipe_id: recipe_id,
+            enhance_level: item_price_info[:enhance_level],
             **npc_data
           }
 
           @ingredient_cache[ingredient_id] = potential_ingredient_hash
 
-          potential_recipe.push potential_ingredient_hash
+          potential_recipe.push({ **potential_ingredient_hash, for_recipe_id: recipe_id, is_m_recipe: is_m_recipe })
         end
 
         next unless potential_recipe.length == recipe.length
@@ -285,7 +321,7 @@ class MarketSearcher
     average_procs = 1
 
     if [25, 35].include? item[:main_category]
-      unless /oil of|draught|\[mix\]|\[party\]|immortal:|perfume|indignation/im.match item[:name].downcase
+      unless /oil of|draught|\[mix\]|\[party\]|immortal:|perfume|indignation|flame of|essence of dawn|mystical cleaning oil|whale tendon|leather glaze/im.match item[:name].downcase
         average_procs = 2.5
       end
 
@@ -299,6 +335,11 @@ class MarketSearcher
       end
     end
 
+    # 1 in 4 chance to create an imperfect alchemy stone of any specific type with the recipe
+    if /imperfect alchemy stone/.match(item[:name].downcase)
+      average_procs = 0.25
+    end
+
     filtered_recipes = potential_recipes.filter do |recipe|
       recipe.all? do |ingredient|
         if ingredient[:total_in_stock] == Float::INFINITY
@@ -317,7 +358,11 @@ class MarketSearcher
 
     return nil if selected_recipe.nil?
 
-    average_procs = 1 if selected_recipe.find { |a| a[:name].downcase == 'blue reagent' } != nil
+    # set procs to 1 if 1 blue reagent required
+    average_procs = 1 if selected_recipe.find { |a| a[:name].downcase == 'blue reagent' && a[:quant] == 1 }
+
+    # set procs to 1.5 if using magical lightstone crystals to purify lightstones
+    average_procs = 1.5 if selected_recipe.find { |a| a[:name].downcase == 'magical lightstone crystal' }
 
     # remove recipes where one ingredient is used twice
     # this usually happens because of incorrect substitution being
@@ -325,8 +370,6 @@ class MarketSearcher
     # are some seriously mysterious alchemy recipes out there...
     ingredients_already_appeared = []
     filtered_selected_recipe = selected_recipe.filter do |ingredient|
-      # set procs to 1 if blue reagent required
-      average_procs = 1 if ingredient[:name].downcase == 'blue reagent'
       return false if ingredients_already_appeared.include? ingredient[:name]
       ingredients_already_appeared.push(ingredient[:name])
       true
@@ -347,6 +390,8 @@ class MarketSearcher
       content_type: 'application/x-www-form-urlencoded'
     )
 
+    item_price_data = {} if item_price_data.to_s.downcase.include? 'incapsula incident'
+
     # assuming we were able to find the item price list
     if item_price_data&.dig('marketConditionList')
       item_market_sell_price = item_price_data['marketConditionList']&.last&.dig('pricePerOne').to_i
@@ -381,7 +426,6 @@ class MarketSearcher
       # taxed profit on selling max amount of this this recipe, with
       # average procs accounted for
       # @type [Integer]
-      #
       max_taxed_sell_profit_after_procs = (PriceCalculator.calculate_taxed_price(item_market_sell_price * max_potion_count) - total_max_ingredient_cost) * average_procs
 
       return nil if max_taxed_sell_profit_after_procs.to_s.downcase == 'nan'
@@ -389,7 +433,8 @@ class MarketSearcher
 
       recipe_logger = RecipeLogger.new @cli
       results = recipe_logger.log_recipe_data(item, selected_recipe, max_potion_count, item_market_sell_price, total_ingredient_cost, average_procs, total_max_ingredient_cost, raw_max_market_sell_price, max_taxed_sell_profit_after_procs, raw_profit_with_procs, taxed_sell_profit_after_procs)
-      { information: results[:recipe_info], max_profit: max_taxed_sell_profit_after_procs, silver_per_hour: results[:silver_per_hour] }
+
+      { information: results[:recipe_info], max_profit: max_taxed_sell_profit_after_procs, gain: results[:gain], out_of_stock: @out_of_stock_items }
     end
   end
 
@@ -403,10 +448,6 @@ class MarketSearcher
     item_info[:total_in_stock].to_i.zero? ? item_info[:count].to_i : item_info[:total_in_stock].to_i
   end
 
-  # async def do_if_category_matches(options, &procedure)
-  #   procedure.call.wait if options[:subcategory] == options[:subcat_to_match] || options[:all_subcategories]
-  # end
-
   def do_if_category_matches(options, &procedure)
     procedure.call if options[:all_subcategories]
     procedure.call if options[:subcategory] == options[:subcat_to_match]

data/lib/utils/constants.rb

@@ -2,7 +2,20 @@
 
 require 'date'
 
-$request_verification_token = '__RequestVerificationToken=aVYGQPovG8EI6bRIagh8tbHJUhZlM-nH3UKVQaV9R9N0vODzmWcB747BHEsHaphwANvzsaNi5TCPlB-72-e1LadqAlL-bdkDkTqVh4gMnu81' # rubocop:disable Layout/LineLength
+require_relative '../../environment'
+
+if ENV['rvt_dom'].length == 0
+  puts "empty DOM environment variable! set ENV['rvt_dom'] in environment.rb."
+end
+
+if ENV['rvt_cookie'].length == 0
+  puts "empty cookie environment variable! set ENV['rvt_cookie'] in environment.rb."
+end
+
+if ENV['rvt_dom'].length == 0 || ENV['rvt_cookie'].length == 0
+  puts ''
+  exit
+end
 
 module Utils
   # constants to use when user is configuring the tool
@@ -16,13 +29,19 @@ module Utils
       other: 'category 35, subcategory 8',
       blood: 'searches "\'s blood"',
       oil: "searches 'oil of'",
-      'alchemy stone': "searches 'stone of'",
+      'alchemy stone': "searches 'imperfect alchemy stone of'",
       reagent: "searches 'reagent'",
       'black stone': 'category 30, subcategory 1',
+      'food': 'category 35, subcategory 4',
       'misc': 'category 25, subcategory 8',
       'other tools': 'category 40, subcategory 10',
+      'manos': "searches 'manos'",
+      'purified lightstone': "searches 'purified lightstone of' (requires guru 1 alchemy)",
+      'combined crystals': 'category 50, subcategory 4',
+      'essences of dawn': "searches 'essence of dawn'",
+      # 'stuffed animals': "searches 'stuffed'",
       # 'magic crystal': "searches 'magic crystal'",
-      exit: 'stops the search'
+      exit: 'stops the search',
     }.freeze
 
     REGION_DOMAINS = {
@@ -38,8 +57,8 @@ module Utils
       jp: 'trade.jp.playblackdesert.com',
       th: 'trade.th.playblackdesert.com',
       tw: 'trade.tw.playblackdesert.com',
-      sa: 'blackdesert-tradeweb.playredfox.com',
-      exit: 'stops the search'
+      sa: 'trade.sa.playblackdesert.com',
+      exit: 'stops the search',
     }.freeze
 
     REGION_LANGUAGES = {
@@ -59,18 +78,19 @@ module Utils
       id: 'basa indonesia',
       se: 'sea english',
       gl: 'global lab',
-      exit: 'stops the search'
+      exit: 'stops the search',
     }.freeze
 
     AGGRESSION_LEVELS = {
       normal: 'evaluate one permutation of each recipe',
       hyperaggressive: 'evaluate every substitution for every recipe',
-      exit: 'stops the search'
+      exit: 'stops the search',
     }.freeze
 
-    def self.set_rvt(rvt)
-      $request_verification_token = rvt
-    end
+    YES_OR_NO = {
+      no: false,
+      yes: true,
+    }.freeze
   end
 
   # constants that will be used in by search / scraping scripts
@@ -80,8 +100,8 @@ module Utils
     ERROR_LOG = './error.log'
     # note that the following two tokens are different!! the first one is from a request cookie
     # the second is from the dom of the actual BDO central market interface
-    COOKIE = '__RequestVerificationToken=aVYGQPovG8EI6bRIagh8tbHJUhZlM-nH3UKVQaV9R9N0vODzmWcB747BHEsHaphwANvzsaNi5TCPlB-72-e1LadqAlL-bdkDkTqVh4gMnu81' # rubocop:disable Layout/LineLength
-    RVT = '__RequestVerificationToken=yWbqJmiU4wcp2IRQGkbDfqMFs2fjCYx4UqVxg4umK8CvdbLhweMLZ1es-4SFWD8J1UfoqwbaQyo_YuzAkSzHWY8Wjyx4ttwZBvtu_pd--9U1' # rubocop:disable Layout/LineLength
+    COOKIE = ENV['rvt_cookie']
+    RVT = ENV['rvt_dom']
     WORLD_MARKET_LIST = '/GetWorldMarketList'
     MARKET_SUB_LIST = '/GetWorldMarketSubList'
     MARKET_SEARCH_LIST = '/GetWorldMarketSearchList'
@@ -99,13 +119,25 @@ module Utils
         'x-cdn': 'Imperva'
       },
       bdo_codex_headers: {
-        'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
         'User-Agent':
           'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36',
-        Dnt: '1'
+        Dnt: '1',
+        accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7'
       }
     }.freeze
 
+    # TODO: wip...
+    def self.get_bdo_codex_headers(item_id, region)
+      item_url = "https://bdocodex.com/#{region}/item/#{item_id}"
+      cookie_string = "bddatabaselang=#{region}"
+      if rand > 0.5
+        REQUEST_OPTS[:central_market_headers]
+        { **REQUEST_OPTS[:bdo_codex_headers], 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36', Cookie: cookie_string }
+      else
+        { **REQUEST_OPTS[:bdo_codex_headers], 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36', Cookie: cookie_string }
+      end
+    end
+
     def self.get_central_market_headers(incap_cookie = '')
       original_cookie = REQUEST_OPTS[:central_market_headers][:Cookie]
       if rand > 0.5

data/lib/utils/npc_item_index.rb

@@ -155,6 +155,33 @@ module Utils
       count: Float::INFINITY,
       is_npc_item: true,
       npc_type: 'blacksmith',
+    },
+      820020 => {
+      name: 'Fused Crystal of Emotions',
+      id: 820020,
+      price: 50_000_000,
+      price_per_one: 50_000_000,
+      count: Float::INFINITY,
+      is_npc_item: true,
+      npc_type: 'blacksmith',
+    },
+      4929 => {
+      name: 'Restoration Stone',
+      id: 4929,
+      price: 1_000,
+      price_per_one: 1_000,
+      count: Float::INFINITY,
+      is_npc_item: true,
+      npc_type: 'blacksmith',
+    },
+      8172 => {
+      name: "Combatant's Restoration Stone",
+      id: 8172,
+      price: 5_000_000,
+      price_per_one: 5_000_000,
+      count: Float::INFINITY,
+      is_npc_item: true,
+      npc_type: 'blacksmith',
     },
       6656 => {
       name: 'Purified Water',

data/lib/utils/recipe_logger.rb

@@ -31,41 +31,66 @@ module Utils
         formatted_price = @cli.yellow PriceCalculator.format_price ingredient_market_sell_price
         formatted_max_price = @cli.yellow PriceCalculator.format_price raw_max_ingredient_sell_price
         formatted_potion_amount = @cli.yellow PriceCalculator.format_num(ingredient[:quant]).rjust(4, ' ')
+        formatted_ingredient_id = "[#{ingredient[:id]}]".rjust(7, ' ')
         formatted_max_potion_amount = @cli.yellow PriceCalculator.format_num max_potion_count * ingredient[:quant]
         formatted_stock_count = @cli.yellow PriceCalculator.format_num ingredient[:total_in_stock]
         formatted_npc_information = ingredient[:is_npc_item] ? @cli.yellow(" (sold by #{ingredient[:npc_type]} npcs)") : ''
+        if ingredient[:exchange_with_npc]
+          formatted_npc_information = @cli.yellow(" (exchange at least #{ingredient[:must_exchange]} #{ingredient[:exchange_with_names].join(' / ')} for #{ingredient[:exchanging_grants] * ingredient[:must_exchange]} with #{ingredient[:exchange_with_npc]})")
+        end
 
-        stock_counts.push "#{formatted_potion_amount} [max: #{formatted_max_potion_amount}] [#{ingredient[:id]}] #{@cli.yellow "#{ingredient[:name].downcase}: #{formatted_stock_count}"} in stock#{formatted_npc_information}. price: #{formatted_price} [for max: #{formatted_max_price}]"
+        formatted_enhance_level = ['0', ''].include?(ingredient[:enhance_level].to_s) ? ' ' : " +#{ingredient[:enhance_level]} "
+
+        stock_counts.push "#{formatted_potion_amount} [max: #{formatted_max_potion_amount}] #{formatted_ingredient_id}#{@cli.yellow "#{formatted_enhance_level}#{ingredient[:name].downcase}: #{formatted_stock_count}"} in stock#{formatted_npc_information}. price: #{formatted_price} [for max: #{formatted_max_price}]"
       end
 
       market_stock_string = item[:total_in_stock] > 2000 ? @cli.red(PriceCalculator.format_num(item[:total_in_stock])) : @cli.green(PriceCalculator.format_num(item[:total_in_stock]))
 
       trade_count_string = item[:total_trade_count] < 10_000_000 ? @cli.red(PriceCalculator.format_num(item[:total_trade_count])) : @cli.green(PriceCalculator.format_num(item[:total_trade_count]))
 
+      ratio_string = if item[:total_trade_count] / (item[:total_in_stock].zero? ? 1 : item[:total_in_stock]) < 50_000
+                       @cli.red('bad')
+                     else
+                       @cli.green('good')
+                     end
+
       estimated_craft_time = 1.2
       calculated_time = max_potion_count * estimated_craft_time
       crafting_time_string = calculated_time > 21600 ? @cli.red((seconds_to_str(calculated_time))) : @cli.green((seconds_to_str(calculated_time)))
-      silver_per_hour = max_taxed_sell_profit_after_procs.to_f / (calculated_time.to_f / 3600)
+      silver_per_hour = PriceCalculator.format_price(max_taxed_sell_profit_after_procs.to_f / (calculated_time.to_f / 3600))
+      estimated_craft_time_string = "(accounting for average #{estimated_craft_time}s / craft due to typical server delay)"
+
+      if selected_recipe.find { |ingredient| ingredient[:is_m_recipe] == true }
+        crafting_time_string = @cli.yellow "unknown: this is a processing recipe!"
+        estimated_craft_time_string = ''
+        silver_per_hour = 'unknown'
+      end
+
+      return_on_investment = max_taxed_sell_profit_after_procs.to_f / total_max_ingredient_cost.to_f
+      formatted_roi = return_on_investment > 1 ? @cli.green("#{return_on_investment.round(2)}x") : @cli.red("#{return_on_investment.round(2)}x" )
 
       information = "    #{@cli.yellow "[#{item[:id]}] [#{item[:name].downcase}], recipe id: #{selected_recipe[0][:for_recipe_id]}"}
 
       #{padstr("market price of item")}#{@cli.yellow PriceCalculator.format_price item_market_sell_price}
       #{padstr("market stock of item")}#{market_stock_string}
       #{padstr("total trades of item")}#{trade_count_string}
+      #{padstr("ratio")}#{ratio_string}
       #{padstr("you can craft")}#{@cli.yellow PriceCalculator.format_num max_potion_count}
       #{padstr("theoretical max output")}#{@cli.yellow PriceCalculator.format_num(max_potion_count * average_procs)}
       #{padstr("cost of ingredients")}#{@cli.yellow PriceCalculator.format_price total_ingredient_cost} (accounting for average #{average_procs} / craft)
       #{padstr("max cost of ingredients")}#{@cli.yellow PriceCalculator.format_price total_max_ingredient_cost} (accounting for average #{average_procs} / craft)
-      #{padstr("time to craft max")}#{crafting_time_string} (accounting for average #{estimated_craft_time}s / craft due to typical server delay)
+      #{padstr("time to craft max")}#{crafting_time_string} #{estimated_craft_time_string}
 
   \t#{stock_counts.join "\n\t"}
 
       total income for max items before cost subtraction #{@cli.green PriceCalculator.format_price raw_max_market_sell_price}
-      #{padstr("total taxed silver per hour")}#{@cli.green PriceCalculator.format_price(silver_per_hour) } silver / hour
+      #{padstr("total taxed silver per hour")}#{@cli.green silver_per_hour } silver / hour
       #{padstr("total untaxed profit")}#{@cli.green PriceCalculator.format_price raw_profit_with_procs} [max: #{@cli.green PriceCalculator.format_price(raw_profit_with_procs * max_potion_count)}]
       #{padstr("total taxed profit")}#{@cli.green PriceCalculator.format_price taxed_sell_profit_after_procs} [max: #{@cli.green PriceCalculator.format_price(max_taxed_sell_profit_after_procs)}]
+      #{padstr("multiply initial investment by")}#{formatted_roi}
   "
-      { recipe_info: information, silver_per_hour: silver_per_hour }
+
+      { recipe_info: information, gain: max_taxed_sell_profit_after_procs }
     end
   end
 end

data/lib/utils/user_cli.rb

@@ -8,51 +8,68 @@ module Utils
   class UserCLI
     attr_accessor :silent
 
+    # @param [Hash] options options from ARGV
     def initialize(options)
       @silent = options[:silent]
       @prompt = TTY::Prompt.new
     end
 
+    # uses Rainbow to make a string yellow
+    # @param [String] string the string to print
+    # @return [String]
     def yellow(string)
       Rainbow(string).yellow
     end
 
+    # uses Rainbow to make a string orange
+    # @param [String] string the string to print
+    # @return [String]
     def orange(string)
       Rainbow(string).orange
     end
 
+    # uses Rainbow to make a string red
+    # @param [String] string the string to print
     def red(string)
       Rainbow(string).red
     end
 
+    # uses Rainbow to make a string green
+    # @param [String] string the string to print
     def green(string)
       Rainbow(string).green
     end
 
-    def cyan(string)
-      Rainbow(string).cyan
-    end
-
     # log, but cutely
+    # @param [String] string the string to print
     def vipiko(string)
       puts string unless @silent
     end
 
+    # calls print on a string preceded by a line erase and carriage return
+    # also calls $stdout.flush
+    # @param [String] string the string to print
     def vipiko_overwrite(string)
       print "\033[2K\r#{string}"
       $stdout.flush
     end
 
     # log for other stuff
+    # @param [String] string the string to print
     def log(string)
       puts string
     end
 
+    # adds usage info to a tty-prompt menu
+    # @param menu the tty-prompt menu object in the select() block
+    # @param [Hash] options the hash of options
     def add_menu_info(menu, options)
       menu.enum '.'
       menu.help "use arrow keys or numbers 1-#{options.length} to navigate, press enter to select. type to search."
     end
 
+    # prompt the user to choose the category to search through
+    # @return [String] the selected category
     def choose_category
       vipiko "\n♫ hello! oh? you want to sell #{yellow 'potions'} today? that sounds like fun!\n\n"
 
@@ -66,6 +83,8 @@ module Utils
       option.to_s
     end
 
+    # prompt the user to choose the region to search within
+    # @return [String] the selected region
     def choose_region
       option = @prompt.select('and where are you in the world?', { cycle: true, filter: true }) do |menu|
         add_menu_info(menu, CLIConstants::REGION_DOMAINS)
@@ -77,6 +96,8 @@ module Utils
       option.to_s
     end
 
+    # prompt the user to choose the language to show results in
+    # @return [String] the selected language
     def choose_lang
       option = @prompt.select('what language would you like to search bdocodex with?', { cycle: true, filter: true }) do |menu|
         add_menu_info(menu, CLIConstants::REGION_LANGUAGES)
@@ -88,8 +109,11 @@ module Utils
       option.to_s
     end
 
+    # prompt the user to choose the aggression to search with
+    # higher aggression will cause all recipe permutations / item substitutions to be considered in profit calculation
+    # @return [String] the selected aggression level
     def choose_aggression
-      option = @prompt.select('finally, what aggression level would you like to search for recipes with?', { cycle: true, filter: true }) do |menu|
+      option = @prompt.select('what aggression level would you like to search for recipes with?', { cycle: true, filter: true }) do |menu|
         add_menu_info(menu, CLIConstants::AGGRESSION_LEVELS)
         CLIConstants::AGGRESSION_LEVELS.each do |k, v|
           menu.choice "#{k} #{Rainbow(v).faint.white}", k
@@ -99,11 +123,32 @@ module Utils
       option.to_s
     end
 
+    # prompt the user to input item ids that they already have a lot of
+    # the script will consider these as "free" and set their cost to zero and stock to infinite
+    # @return [Array] the selected item ids
+    def choose_free_ingredients
+      option = @prompt.ask('what item ids do you have a lot of already? we can consider that in the final cost calculations.', convert: :list, default: [])
+
+      option&.to_a if option&.to_a.is_a? Array
+    end
+
+    # prompt the user to decide whether to show or hide a list of out of stock items
+    # @return [Boolean] true to show out of stock items, false to hide
+    def choose_show_out_of_stock
+      option = @prompt.select('finally, would you like to see a list the ingredients that were out of stock at the end?', { cycle: true, filter: true }) do |menu|
+        add_menu_info(menu, CLIConstants::YES_OR_NO)
+        CLIConstants::YES_OR_NO.each do |k, v|
+          menu.choice "#{k}", v
+        end
+      end
+
+      !!option
+    end
+
+    # ends the program
     def end_cli
       vipiko "\nnever mind, let's do some #{yellow 'cooking'} together instead! ♫\n\n"
 
-      @prompt.keypress('(press any key to exit)')
-
       exit
     end
   end

data/lib/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module BDOAP
+  VERSION = "0.0.4"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bdoap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - jpegzilla
@@ -22,6 +22,7 @@ files:
 - lib/bdo_alchemy_profits.rb
 - lib/bdo_codex/bdo_codex_searcher.rb
 - lib/central_market/category_search_options.rb
+- lib/central_market/exchange_items.rb
 - lib/central_market/market_searcher.rb
 - lib/utils/array_utils.rb
 - lib/utils/constants.rb
@@ -30,6 +31,7 @@ files:
 - lib/utils/price_calculator.rb
 - lib/utils/recipe_logger.rb
 - lib/utils/user_cli.rb
+- lib/version.rb
 homepage: https://github.com/jpegzilla/bdo-alchemy-profits
 licenses:
 - MIT