From faf117d24f1f9ee23880102a61b46f1c3dffdabd Mon Sep 17 00:00:00 2001 From: Alex Shubert Date: Thu, 19 Apr 2012 19:26:53 +0400 Subject: [PATCH 1/3] Reset by version number fixed.Previously it reseted only first logged in character's settings --- AutoTurnIn.lua | 8 +++----- AutoTurnIn.toc | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/AutoTurnIn.lua b/AutoTurnIn.lua index 9cf11bc..c92e8ea 100644 --- a/AutoTurnIn.lua +++ b/AutoTurnIn.lua @@ -1,9 +1,10 @@ local addonName, ptable = ... local L = ptable.L local C = ptable.CONST +local TOCVersion = GetAddOnMetadata(addonName, "Version") AutoTurnIn = LibStub("AceAddon-3.0"):NewAddon("AutoTurnIn", "AceEvent-3.0", "AceConsole-3.0") -AutoTurnIn.defaults = {enabled = true, all = false, dontloot = 1, tournament = 2, darkmoonteleport=true, togglekey=1} +AutoTurnIn.defaults = {enabled = true, all = false, dontloot = 1, tournament = 2, darkmoonteleport=true, togglekey=1, version=TOCVersion} AutoTurnIn.ldb, AutoTurnIn.allowed = nil, nil AutoTurnIn.caption = addonName ..' [%s]' AutoTurnIn.funcList = {[1] = function() return false end, [2]=IsAltKeyDown, [3]=IsControlKeyDown, [4]=IsShiftKeyDown} @@ -35,11 +36,8 @@ function AutoTurnIn:SetEnabled(enabled) end -- quest autocomplete handlers and functions function AutoTurnIn:OnEnable() - local vers = GetAddOnMetadata(addonName, "Version") - - if (not AutoTurnInDB) or (not AutoTurnInDB.version or (AutoTurnInDB.version < vers)) then + if (not AutoTurnInCharacterDB) or (not AutoTurnInCharacterDB.version or (AutoTurnInCharacterDB.version < TOCVersion)) then AutoTurnInCharacterDB = nil - _G.AutoTurnInDB = {version = vers} self:Print(L["reset"]) end diff --git a/AutoTurnIn.toc b/AutoTurnIn.toc index 4394c54..59c013a 100644 --- a/AutoTurnIn.toc +++ b/AutoTurnIn.toc @@ -7,7 +7,6 @@ ## Notes-enUS: Auto accept and complete daily or any quests ## Notes-deDE: Auto akzeptieren und komplett täglich oder alle Quests (send your translation to luraddon@gmail.com pls) ## OptionalDeps: Ace3 -## SavedVariables: AutoTurnInDB ## SavedVariablesPerCharacter: AutoTurnInCharacterDB ## X-Date: 2012-01-16 ## X-Category: Quest -- 1.7.9.5 From 10c9c4bf17c638047e1987bab2ba8293c870b55d Mon Sep 17 00:00:00 2001 From: Alex Shubert Date: Thu, 19 Apr 2012 00:52:40 +0400 Subject: [PATCH 2/3] ps.1 --- AutoTurnIn.lua | 6 ++++-- AutoTurnIn.toc | 2 +- RewardOptions.lua | 8 ++++---- rewards.lua | 6 ------ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/AutoTurnIn.lua b/AutoTurnIn.lua index c92e8ea..b3ae7fc 100644 --- a/AutoTurnIn.lua +++ b/AutoTurnIn.lua @@ -257,7 +257,8 @@ function AutoTurnIn:TurnInQuest(rewardIndex) if (AutoTurnInCharacterDB.showrewardtext) then self:Print((UnitName("target") and UnitName("target") or '')..'\n', GetRewardText()) end - GetQuestReward(rewardIndex) + print(rewardIndex) + --GetQuestReward(rewardIndex) end function AutoTurnIn:Greed() @@ -315,7 +316,8 @@ function AutoTurnIn:Need() wipe(self.stattable) GetItemStats(link, self.stattable) for stat, value in pairs(self.stattable) do - if ( AutoTurnInCharacterDB.stat[C.STATS[stat]] ) then + print(stat, AutoTurnInCharacterDB.stat[stat]) + if ( AutoTurnInCharacterDB.stat[stat] ) then OkByStat = true end end diff --git a/AutoTurnIn.toc b/AutoTurnIn.toc index 59c013a..be7d449 100644 --- a/AutoTurnIn.toc +++ b/AutoTurnIn.toc @@ -1,6 +1,6 @@ ## Interface: 40300 ## Title: AutoTurnIn -## Version: 2.1 +## Version: 3.0 ## Author: Lur ## Notes: Auto accept and complete daily or any quests ## Notes-ruRU: Автоматически принимает и сдает ежедневные либо все задания diff --git a/RewardOptions.lua b/RewardOptions.lua index 892a46c..b86277e 100644 --- a/RewardOptions.lua +++ b/RewardOptions.lua @@ -100,10 +100,10 @@ CreateCheckbox('INVTYPE_CLOAK', ArmorPanel, 402, -40, INVTYPE_CLOAK) -- ATTRIBUTES local StatPanel = CreatePanel("StatPanel", STAT_CATEGORY_ATTRIBUTES, 590, 40) -CreateCheckbox("Strength", StatPanel, 10, -8, SPELL_STAT1_NAME) -CreateCheckbox("Agility", StatPanel, 152, -8, SPELL_STAT2_NAME) -CreateCheckbox("Intellect", StatPanel, 292, -8, SPELL_STAT4_NAME) -CreateCheckbox("Spirit", StatPanel, 436, -8, SPELL_STAT5_NAME) +CreateCheckbox('ITEM_MOD_STRENGTH_SHORT', StatPanel, 10, -8, SPELL_STAT1_NAME) +CreateCheckbox('ITEM_MOD_AGILITY_SHORT', StatPanel, 152, -8, SPELL_STAT2_NAME) +CreateCheckbox('ITEM_MOD_INTELLECT_SHORT', StatPanel, 292, -8, SPELL_STAT4_NAME) +CreateCheckbox('ITEM_MOD_SPIRIT_SHORT', StatPanel, 436, -8, SPELL_STAT5_NAME) -- 'Enable' CheckBox local GreedAfterNeed = CreateFrame("CheckButton", O.."Enable", RewardPanel, "OptionsCheckButtonTemplate") diff --git a/rewards.lua b/rewards.lua index 242c2e8..ff740cd 100644 --- a/rewards.lua +++ b/rewards.lua @@ -8,12 +8,6 @@ local armor = {GetAuctionItemSubClasses(2)} -- C.STOPTOKENS = {['INVTYPE_RELIC']='', ['INVTYPE_TRINKET']='', ['INVTYPE_HOLDABL']=''} C.WEAPONLABEL, C.ARMORLABEL = GetAuctionItemClasses() C.JEWELRY = {['INVTYPE_FINGER']='', ['INVTYPE_NECK']=''} -C.STATS = { - ['ITEM_MOD_STRENGTH_SHORT'] = "Strength", - ['ITEM_MOD_AGILITY_SHORT'] = "Agility", - ['ITEM_MOD_INTELLECT_SHORT'] = "Intellect", - ['ITEM_MOD_SPIRIT_SHORT'] = "Spirit" -} -- Most of the constants are never used but it's convinient to have them here as a reminder and shortcut C.ITEMS = { -- 1.7.9.5 From e3332f0df7bbd6ea3dd1b0b4e0bb0003adbf74d9 Mon Sep 17 00:00:00 2001 From: Alex Shubert Date: Thu, 19 Apr 2012 19:32:52 +0400 Subject: [PATCH 3/3] merge commit 2 --- AutoTurnIn.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/AutoTurnIn.lua b/AutoTurnIn.lua index f3fb782..b3ae7fc 100644 --- a/AutoTurnIn.lua +++ b/AutoTurnIn.lua @@ -38,12 +38,7 @@ end function AutoTurnIn:OnEnable() if (not AutoTurnInCharacterDB) or (not AutoTurnInCharacterDB.version or (AutoTurnInCharacterDB.version < TOCVersion)) then AutoTurnInCharacterDB = nil -<<<<<<< HEAD self:Print(L["reset"]) -======= - _G.AutoTurnInDB = {version = vers} - self:Print(INSTANCE_RESET_SUCCESS:format(GAMEOPTIONS_MENU)) ->>>>>>> 7126ee301cc5a09eff9a8b8d804db1220eaf89cd end if not AutoTurnInCharacterDB then -- 1.7.9.5