diff --git a/Core.lua b/Core.lua index 9698d3f6..095d88a5 100644 --- a/Core.lua +++ b/Core.lua @@ -89,9 +89,9 @@ core.EncounterList = { -- Event IDs must be in the exact same order as core } core.MonDKPUI = {} -- global storing entire Configuration UI to hide/show UI -core.MonVersion = "v2.2.7-beta"; +core.MonVersion = "v2.2.8-beta"; core.defaultTable = "__default"; -core.BuildNumber = 20207; +core.BuildNumber = 20208; core.UpgradeSchema = false; core.TableWidth, core.TableRowHeight, core.TableNumRows, core.PriceNumRows = 500, 18, 27, 22; -- width, row height, number of rows core.SelectedData = { player="none"}; -- stores data of clicked row for manipulation. diff --git a/Localization/Localization.cn.lua b/Localization/Localization.cn.lua index 2afa0410..aaa732d1 100644 --- a/Localization/Localization.cn.lua +++ b/Localization/Localization.cn.lua @@ -791,13 +791,13 @@ if GetLocale() == "zhCN" then VALIDATEWARN = "这将根据他们的完整历史记录重新计算所有玩家的dkp,获得的生命和花费的生命。 如果由于缺少历史记录而导致结果不正确,请确保备份已保存的变量文件。 在运行之前,您应该为所有播放器重置先前的dkp(上下文菜单>全选>重置先前的dkp),以便可以看到它们已更改了多少。 你想继续吗?", PASS = "通过", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Localization/Localization.de.lua b/Localization/Localization.de.lua index 77f264b7..1068c59f 100644 --- a/Localization/Localization.de.lua +++ b/Localization/Localization.de.lua @@ -784,13 +784,13 @@ if GetLocale() == "deDE" then ZEROSUMITEMCOSTTTDESC = "Wählen Sie die Art der Artikelkosten aus, die Sie verwenden möchten. Static gibt Artikeln einen definierten Preis. Während Mindestgebot ermöglicht es den Spielern, ein Gebot abzugeben, das die Kosten definiert, während Sie einen Mindestgebotsschwellenwert festlegen.", ZONE = "Zone", PASS = "Passen", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Localization/Localization.en.lua b/Localization/Localization.en.lua index 1682aa9b..36d11839 100644 --- a/Localization/Localization.en.lua +++ b/Localization/Localization.en.lua @@ -783,13 +783,13 @@ core.L = { VALIDATEWARN = "This will recalculate all players dkp, lifetime earned and lifetime spent based on their complete history. Make sure to back up your saved variables file in the event the result is improper due to missing history entries. You should reset previous dkp (context menu > select all > reset previous dkp) for all players prior to running so you can see how much they changed. Would you like to continue?", PASS = "Pass", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Localization/Localization.es.lua b/Localization/Localization.es.lua index 754fa95e..e4f47558 100644 --- a/Localization/Localization.es.lua +++ b/Localization/Localization.es.lua @@ -789,13 +789,13 @@ if GetLocale() == "esES" or GetLocale() == "esMX" then VALIDATEWARN = "Esto volverá a calcular el dkp de todos los jugadores, la vida ganada y la vida gastada en función de su historial completo. Asegúrese de hacer una copia de seguridad del archivo de variables guardado en caso de que el resultado sea incorrecto debido a la falta de entradas en el historial. Debes restablecer dkp anterior (menú contextual> seleccionar todo> restablecer dkp anterior) para todos los jugadores antes de correr para que puedas ver cuánto cambiaron. ¿Te gustaria continuar?", PASS = "Pasar", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Localization/Localization.fr.lua b/Localization/Localization.fr.lua index 9cc4cedb..c184de88 100644 --- a/Localization/Localization.fr.lua +++ b/Localization/Localization.fr.lua @@ -789,13 +789,13 @@ if GetLocale() == "frFR" then VALIDATEWARN = "Cela recalculera tous les dkp des joueurs, la durée de vie gagnée et la durée de vie dépensée en fonction de leur historique complet. Assurez-vous de sauvegarder votre fichier de variables enregistré dans le cas où le résultat serait incorrect en raison d'entrées d'historique manquantes. Vous devez réinitialiser le dkp précédent (menu contextuel> sélectionner tout> réinitialiser le dkp précédent) pour tous les joueurs avant de courir afin que vous puissiez voir combien ils ont changé. Voulez-vous continuer?", PASS = "Passer", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Localization/Localization.kr.lua b/Localization/Localization.kr.lua index f6ed2130..21f7d9e2 100644 --- a/Localization/Localization.kr.lua +++ b/Localization/Localization.kr.lua @@ -789,13 +789,13 @@ if GetLocale() == "koKR" then VALIDATEWARN = "전체 기록을 기준으로 모든 플레이어의 dkp, 평생 획득 한 시간 및 평생을 재 계산합니다. 누락 된 히스토리 항목으로 인해 결과가 올바르지 않은 경우 저장된 변수 파일을 백업하십시오. 달리기 전에 모든 플레이어에 대해 이전 dkp (컨텍스트 메뉴> 모두 선택> 이전 dkp 재설정)를 재설정해야 변경 한 양을 확인할 수 있습니다. 계속 하시겠습니까?", PASS = "통과하다", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Localization/Localization.ru.lua b/Localization/Localization.ru.lua index 48c2440e..f0e81834 100644 --- a/Localization/Localization.ru.lua +++ b/Localization/Localization.ru.lua @@ -784,13 +784,13 @@ if GetLocale() == "ruRU" then ZONE = "зона", PASS = "Отказаться", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Localization/Localization.tw.lua b/Localization/Localization.tw.lua index d274cc9e..27647fce 100644 --- a/Localization/Localization.tw.lua +++ b/Localization/Localization.tw.lua @@ -789,13 +789,13 @@ if GetLocale() == "zhTW" then VALIDATEWARN = "這將根據其完整歷史記錄重新計算所有玩家的dkp,獲得的生命和花費的生命。 如果由於缺少歷史記錄而導致結果不正確,請確保備份已保存的變量文件。 在運行之前,您應該為所有播放器重置先前的dkp(上下文菜單>全選>重置先前的dkp),以便可以看到它們已更改了多少。 你想繼續嗎?", PASS = "通過", - CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.7-beta", + CHANGELOG1 = "Monolith DKP (Vapok Edition) - 2.2.8-beta", CHANGELOG2 = "- Added in Loot Filter to Loot History (Taidtuskecyh)", CHANGELOG3 = "- Small adjustments and fixes to Loot Price and DE communication", CHANGELOG4 = "- Added in Multi-Guild, Multi-Teams supprot (thanks to Taidtuskecyh for the help)", CHANGELOG5 = "- Fixed a few bugs from the 2.1.2 version of the addon", CHANGELOG6 = "- Fixed a rounding issue when adjusting DKP when rounding is enabled. (GH-5)", - CHANGELOG7 = "", + CHANGELOG7 = "- Fixed a Loot History Delete Bug", CHANGELOG8 = "", CHANGELOG9 = "", CHANGELOG10 = "", diff --git a/Modules/LootHistory.lua b/Modules/LootHistory.lua index 4f0c9a35..6bc599a5 100644 --- a/Modules/LootHistory.lua +++ b/Modules/LootHistory.lua @@ -58,7 +58,7 @@ end local function DeleteLootHistoryEntry(index) local search = MonDKP:Table_Search(MonDKP:GetTable(MonDKP_Loot, true), index, "index"); - local search_player = MonDKP:Table_Search(MonDKP_DKPTable, MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]].player); + local search_player = MonDKP:Table_Search(MonDKP:GetTable(MonDKP_DKPTable, true), MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]].player); local curTime = time() local curOfficer = UnitName("player") local newIndex = curOfficer.."-"..curTime @@ -79,8 +79,8 @@ local function DeleteLootHistoryEntry(index) } if search_player then - MonDKP_DKPTable[search_player[1][1]].dkp = MonDKP_DKPTable[search_player[1][1]].dkp + tempTable.cost -- refund previous looter - MonDKP_DKPTable[search_player[1][1]].lifetime_spent = MonDKP_DKPTable[search_player[1][1]].lifetime_spent + tempTable.cost -- remove from lifetime_spent + MonDKP:GetTable(MonDKP_DKPTable, true)[search_player[1][1]].dkp = MonDKP:GetTable(MonDKP_DKPTable, true)[search_player[1][1]].dkp + tempTable.cost -- refund previous looter + MonDKP:GetTable(MonDKP_DKPTable, true)[search_player[1][1]].lifetime_spent = MonDKP:GetTable(MonDKP_DKPTable, true)[search_player[1][1]].lifetime_spent + tempTable.cost -- remove from lifetime_spent end MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]].deletedby = newIndex @@ -94,10 +94,10 @@ end local function MonDKPDeleteMenu(index) local search = MonDKP:Table_Search(MonDKP:GetTable(MonDKP_Loot, true), index, "index") - local search2 = MonDKP:Table_Search(MonDKP_DKPTable, MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["player"]) + local search2 = MonDKP:Table_Search(MonDKP:GetTable(MonDKP_DKPTable, true), MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["player"]) local c, deleteString; if search2 then - c = MonDKP:GetCColors(MonDKP_DKPTable[search2[1][1]].class) + c = MonDKP:GetCColors(MonDKP:GetTable(MonDKP_DKPTable, true)[search2[1][1]].class) deleteString = L["CONFIRMDELETEENTRY1"]..": |cff"..c.hex..MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["player"].."|r "..L["WON"].." "..MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["loot"].." "..L["FOR"].." "..-MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["cost"].." "..L["DKP"].."?\n\n("..L["THISWILLREFUND"].." |cff"..c.hex..MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]].player.."|r "..-MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["cost"].." "..L["DKP"]..")"; else deleteString = L["CONFIRMDELETEENTRY1"]..": |cff444444"..MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["player"].."|r "..L["WON"].." "..MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["loot"].." "..L["FOR"].." "..-MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]]["cost"].." "..L["DKP"].."?\n\n("..L["THISWILLREFUND"].." |cff444444"..MonDKP:GetTable(MonDKP_Loot, true)[search[1][1]].player.."|r "..-DKP_Loot[search[1][1]]["cost"].." "..L["DKP"]..")"; @@ -416,7 +416,6 @@ function MonDKP:LootHistory_Update(filter) -- if "filter" is included in call end if filter and filter ~= L["NOFILTER"] and filter ~= L["DELETEDENTRY"] then -- items or players - for i=1, #MonDKP:GetTable(MonDKP_Loot, true) do if curDropDownMenuFilterCategory == L["PLAYERS"] then if not MonDKP:GetTable(MonDKP_Loot, true)[i].deletes and not MonDKP:GetTable(MonDKP_Loot, true)[i].deletedby and not MonDKP:GetTable(MonDKP_Loot, true)[i].hidden and MonDKP:GetTable(MonDKP_Loot, true)[i].player == filter then @@ -636,7 +635,7 @@ function MonDKP:LootHistory_Update(filter) -- if "filter" is included in call local col local del_date = MonDKP:FormatTime(LootTable[i].date) local del_date1, del_date2, del_date3 = strsplit("/", strtrim(strsub(del_date, 1, 8), " ")) - local s = MonDKP:Table_Search(MonDKP_DKPTable, delOfficer, "player") + local s = MonDKP:Table_Search(MonDKP:GetTable(MonDKP_DKPTable, true), delOfficer, "player") if s then col = MonDKP:GetCColors(MonDKP:GetTable(MonDKP_DKPTable, true)[s[1][1]].class) else diff --git a/MonolithDKP.toc b/MonolithDKP.toc index 3cbab59d..a5c72917 100644 --- a/MonolithDKP.toc +++ b/MonolithDKP.toc @@ -2,7 +2,7 @@ ## Title: M|cffaeaeddonolith|r |cffff0000DKP|r ## Author: Roeshambo-Stalagg ## Notes: Comprehensive DKP and raid management utility. -## Version: 2.2.7 +## Version: 2.2.8 ## DefaultState: enabled ## SavedVariables: MonDKP_DB, MonDKP_Loot, MonDKP_DKPTable, MonDKP_DKPHistory, MonDKP_MinBids, MonDKP_MaxBids, MonDKP_Whitelist, MonDKP_Standby, MonDKP_Archive