comparison Main.lua @ 390:b00732fa9352

Fixed obvious typo in previous version.
author MMOSimca <MMOSimca@gmail.com>
date Tue, 16 Dec 2014 22:10:13 -0500
parents 1c6098b69ec9
children 7d0ad2573092
comparison
equal deleted inserted replaced
389:7086c27bdc9f 390:b00732fa9352
888 if chat_loot_timer_handle then 888 if chat_loot_timer_handle then
889 chat_loot_timer_handle:Cancel() 889 chat_loot_timer_handle:Cancel()
890 chat_loot_timer_handle = nil 890 chat_loot_timer_handle = nil
891 end 891 end
892 892
893 if current_loot and current_loot.identifier and (CONTAINER_ITEM_ID_LIST[current_loot.identifier] ~= nil) then 893 if current_loot and current_loot.identifier and (private.CONTAINER_ITEM_ID_LIST[current_loot.identifier] ~= nil) then
894 GenericLootUpdate("items") 894 GenericLootUpdate("items")
895 end 895 end
896 current_loot = nil 896 current_loot = nil
897 end 897 end
898 898
1456 local CHAT_MSG_CURRENCY_UPDATE_FUNCS = { 1456 local CHAT_MSG_CURRENCY_UPDATE_FUNCS = {
1457 [AF.ITEM] = function(currency_texture, quantity) 1457 [AF.ITEM] = function(currency_texture, quantity)
1458 local currency_token = ("currency:%s"):format(currency_texture) 1458 local currency_token = ("currency:%s"):format(currency_texture)
1459 local container_id = current_loot.identifier -- For faster access, since this is going to be called 9 times in the next 3 lines 1459 local container_id = current_loot.identifier -- For faster access, since this is going to be called 9 times in the next 3 lines
1460 -- Verify that we're still assigning data to the right items 1460 -- Verify that we're still assigning data to the right items
1461 if container_id and (CONTAINER_ITEM_ID_LIST[container_id] ~= nil) then 1461 if container_id and (private.CONTAINER_ITEM_ID_LIST[container_id] ~= nil) then
1462 Debug("CHAT_MSG_CURRENCY: AF.ITEM %s (%d)", currency_token, quantity) 1462 Debug("CHAT_MSG_CURRENCY: AF.ITEM %s (%d)", currency_token, quantity)
1463 current_loot.sources[container_id] = current_loot.sources[container_id] or {} 1463 current_loot.sources[container_id] = current_loot.sources[container_id] or {}
1464 current_loot.sources[container_id][currency_token] = (current_loot.sources[container_id][currency_token] or 0) + quantity 1464 current_loot.sources[container_id][currency_token] = (current_loot.sources[container_id][currency_token] or 0) + quantity
1465 else -- If not, cancel the timer and wipe the loot table early 1465 else -- If not, cancel the timer and wipe the loot table early
1466 Debug("CHAT_MSG_CURRENCY: We would have assigned the wrong loot!") 1466 Debug("CHAT_MSG_CURRENCY: We would have assigned the wrong loot!")
1514 1514
1515 local CHAT_MSG_LOOT_UPDATE_FUNCS = { 1515 local CHAT_MSG_LOOT_UPDATE_FUNCS = {
1516 [AF.ITEM] = function(item_id, quantity) 1516 [AF.ITEM] = function(item_id, quantity)
1517 local container_id = current_loot.identifier -- For faster access, since this is going to be called 9 times in the next 3 lines 1517 local container_id = current_loot.identifier -- For faster access, since this is going to be called 9 times in the next 3 lines
1518 -- Verify that we're still assigning data to the right items 1518 -- Verify that we're still assigning data to the right items
1519 if container_id and (CONTAINER_ITEM_ID_LIST[container_id] ~= nil) then 1519 if container_id and (private.CONTAINER_ITEM_ID_LIST[container_id] ~= nil) then
1520 Debug("CHAT_MSG_LOOT: AF.ITEM %d (%d)", item_id, quantity) 1520 Debug("CHAT_MSG_LOOT: AF.ITEM %d (%d)", item_id, quantity)
1521 current_loot.sources[container_id] = current_loot.sources[container_id] or {} 1521 current_loot.sources[container_id] = current_loot.sources[container_id] or {}
1522 current_loot.sources[container_id][item_id] = (current_loot.sources[container_id][item_id] or 0) + quantity 1522 current_loot.sources[container_id][item_id] = (current_loot.sources[container_id][item_id] or 0) + quantity
1523 else -- If not, cancel the timer and wipe the loot table early 1523 else -- If not, cancel the timer and wipe the loot table early
1524 Debug("CHAT_MSG_LOOT: We would have assigned the wrong loot!") 1524 Debug("CHAT_MSG_LOOT: We would have assigned the wrong loot!")