comparison Main.lua @ 61:0d3c915e99bf

Un-comment MERCHANT_UPDATE since it no longer hard-locks the client. Change storage for merchant items to be indexed by the item ID so information about items is updated rather than duplicated.
author James D. Callahan III <jcallahan@curse.com>
date Wed, 18 Jul 2012 12:27:54 -0500
parents 3a6693c99bb3
children fbf535466ae6
comparison
equal deleted inserted replaced
60:3a6693c99bb3 61:0d3c915e99bf
46 COMBAT_LOG_EVENT_UNFILTERED = true, 46 COMBAT_LOG_EVENT_UNFILTERED = true,
47 COMBAT_TEXT_UPDATE = true, 47 COMBAT_TEXT_UPDATE = true,
48 ITEM_TEXT_BEGIN = true, 48 ITEM_TEXT_BEGIN = true,
49 LOOT_OPENED = true, 49 LOOT_OPENED = true,
50 MERCHANT_SHOW = "UpdateMerchantItems", 50 MERCHANT_SHOW = "UpdateMerchantItems",
51 -- MERCHANT_UPDATE = "UpdateMerchantItems", 51 MERCHANT_UPDATE = "UpdateMerchantItems",
52 PET_BAR_UPDATE = true, 52 PET_BAR_UPDATE = true,
53 PLAYER_TARGET_CHANGED = true, 53 PLAYER_TARGET_CHANGED = true,
54 QUEST_COMPLETE = true, 54 QUEST_COMPLETE = true,
55 QUEST_DETAIL = true, 55 QUEST_DETAIL = true,
56 QUEST_LOG_UPDATE = true, 56 QUEST_LOG_UPDATE = true,
960 960
961 for currency_index = 1, #currency_list do 961 for currency_index = 1, #currency_list do
962 price_string = ("%s:%s"):format(price_string, currency_list[currency_index]) 962 price_string = ("%s:%s"):format(price_string, currency_list[currency_index])
963 end 963 end
964 end 964 end
965 merchant.sells[("%s:%s:[%s]"):format(item_id, stack_size, price_string)] = num_available 965 merchant.sells[item_id] = ("%s:%s:[%s]"):format(num_available, stack_size, price_string)
966 end 966 end
967 end 967 end
968 968
969 if _G.CanMerchantRepair() then 969 if _G.CanMerchantRepair() then
970 merchant.can_repair = true 970 merchant.can_repair = true