diff --git a/RecipeDB/ARL-Alchemy.lua b/RecipeDB/ARL-Alchemy.lua index 3099587..ce785e8 100644 --- a/RecipeDB/ARL-Alchemy.lua +++ b/RecipeDB/ARL-Alchemy.lua @@ -33,7 +33,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitAlchemy(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -1274,6 +1277,6 @@ function addon:InitAlchemy(RecipeDB) self:addTradeAcquire(RecipeDB,63732,1,1386,1,2391,1,2837,1,3009,1,3347,1,4160,1,4609,1,4611,1,5177,1,5499,1,7948,1,11042,1,16588, 1,16642,1,16723,1,18802,1,19052,1,27029,1,3603,1,1470,1,3964,1,2132,1,3184) - return 248 + return 244 end diff --git a/RecipeDB/ARL-Blacksmith.lua b/RecipeDB/ARL-Blacksmith.lua index 18429a2..86b5167 100644 --- a/RecipeDB/ARL-Blacksmith.lua +++ b/RecipeDB/ARL-Blacksmith.lua @@ -39,7 +39,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitBlacksmithing(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -2498,6 +2501,6 @@ function addon:InitBlacksmithing(RecipeDB) self:addTradeFlags(RecipeDB,63182,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,51,72) self:addTradeAcquire(RecipeDB,63182,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591) - return 486 + return 487 end diff --git a/RecipeDB/ARL-Cook.lua b/RecipeDB/ARL-Cook.lua index 783fdb6..b8634b5 100644 --- a/RecipeDB/ARL-Cook.lua +++ b/RecipeDB/ARL-Cook.lua @@ -39,7 +39,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitCooking(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -847,9 +850,6 @@ function addon:InitCooking(RecipeDB) self:addTradeSkill(RecipeDB,6417,90,44977,1,2550) self:addTradeFlags(RecipeDB,6417,1,2,4,8,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,6417,4,862,2,3392) - --self:addTradeSkill(RecipeDB,6417,90,5478,1,2550) - --self:addTradeFlags(RecipeDB,6417,2,8,21,22,23,24,25,26,27,28,29,30,36,40) - --self:addTradeAcquire(RecipeDB,6417,4,862) -- Black Jelly -- 64358 self:addTradeSkill(RecipeDB,64358,400,45932,1,2550) @@ -886,6 +886,6 @@ function addon:InitCooking(RecipeDB) self:addTradeFlags(RecipeDB,62051,1,2,7,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,62051,5,5) - return 168 + return 169 end diff --git a/RecipeDB/ARL-Custom.lua b/RecipeDB/ARL-Custom.lua index 6410152..77411b2 100644 --- a/RecipeDB/ARL-Custom.lua +++ b/RecipeDB/ARL-Custom.lua @@ -36,12 +36,7 @@ local MODNAME = "Ackis Recipe List" local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME) local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) -local initialized = false - function addon:InitCustom(CustomDB) - if initialized then return end - - initialized = true self:addLookupList(CustomDB,1,L["Custom1"],"N/A") self:addLookupList(CustomDB,2,L["Custom2"],"N/A") diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua index d9f2edc..60fb4ec 100644 --- a/RecipeDB/ARL-Enchant.lua +++ b/RecipeDB/ARL-Enchant.lua @@ -33,7 +33,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitEnchanting(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true diff --git a/RecipeDB/ARL-Engineer.lua b/RecipeDB/ARL-Engineer.lua index c382a48..6565dce 100644 --- a/RecipeDB/ARL-Engineer.lua +++ b/RecipeDB/ARL-Engineer.lua @@ -39,7 +39,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitEngineering(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -1503,6 +1506,6 @@ function addon:InitEngineering(RecipeDB) self:addTradeFlags(RecipeDB,63750,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,51,61) self:addTradeAcquire(RecipeDB,63750,1,25277,1,26907,1,26955,1,26991,1,28697,1,16667,1,1702,1,16726,1,11017,1,33586,1,3494,1,5174,1,3290,1,5518) - return 290 + return 291 end diff --git a/RecipeDB/ARL-FirstAid.lua b/RecipeDB/ARL-FirstAid.lua index 59f587f..adca4ff 100644 --- a/RecipeDB/ARL-FirstAid.lua +++ b/RecipeDB/ARL-FirstAid.lua @@ -33,7 +33,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitFirstAid(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true diff --git a/RecipeDB/ARL-Inscription.lua b/RecipeDB/ARL-Inscription.lua index e00fcb2..4ad37a9 100644 --- a/RecipeDB/ARL-Inscription.lua +++ b/RecipeDB/ARL-Inscription.lua @@ -39,7 +39,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitInscription(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -2219,6 +2222,6 @@ function addon:InitInscription(RecipeDB) self:addTradeFlags(RecipeDB,64053,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,53,54,66) self:addTradeAcquire(RecipeDB,64053,1,33603,1,28702) - return 434 + return 435 end diff --git a/RecipeDB/ARL-Jewelcraft.lua b/RecipeDB/ARL-Jewelcraft.lua index 6f35129..d7bc5bd 100644 --- a/RecipeDB/ARL-Jewelcraft.lua +++ b/RecipeDB/ARL-Jewelcraft.lua @@ -39,7 +39,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitJewelcrafting(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -2448,6 +2451,6 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB,63743,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,51,63) self:addTradeAcquire(RecipeDB,63743,1,26915,1,26960,1,26982,1,26997,1,28701,1,19778,1,15501,1,18751,1,33590,1,19775) - return 481 + return 482 end diff --git a/RecipeDB/ARL-Leatherwork.lua b/RecipeDB/ARL-Leatherwork.lua index ace2dfd..fed3603 100644 --- a/RecipeDB/ARL-Leatherwork.lua +++ b/RecipeDB/ARL-Leatherwork.lua @@ -39,7 +39,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitLeatherworking(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -2593,6 +2596,6 @@ function addon:InitLeatherworking(RecipeDB) self:addTradeFlags(RecipeDB,63200,1,2,6,21,22,23,24,25,26,27,28,29,30,36,40,53,54,57) self:addTradeAcquire(RecipeDB,63200,8,39) - return 510 + return 511 end diff --git a/RecipeDB/ARL-Mob.lua b/RecipeDB/ARL-Mob.lua index 0d635c1..774dc79 100644 --- a/RecipeDB/ARL-Mob.lua +++ b/RecipeDB/ARL-Mob.lua @@ -39,12 +39,7 @@ local BFAC = LibStub("LibBabble-Faction-3.0"):GetLookupTable() local BZONE = LibStub("LibBabble-Zone-3.0"):GetLookupTable() local BBOSS = LibStub("LibBabble-Boss-3.0"):GetLookupTable() -local initialized = false - function addon:InitMob(MobDB) - if initialized then return end - - initialized = true -- Cities -- Orgrimmar diff --git a/RecipeDB/ARL-Quest.lua b/RecipeDB/ARL-Quest.lua index e0af8b2..3481882 100644 --- a/RecipeDB/ARL-Quest.lua +++ b/RecipeDB/ARL-Quest.lua @@ -40,12 +40,7 @@ local BFAC = LibStub("LibBabble-Faction-3.0"):GetLookupTable() local BZONE = LibStub("LibBabble-Zone-3.0"):GetLookupTable() local BBOSS = LibStub("LibBabble-Boss-3.0"):GetLookupTable() -local initialized = false - function addon:InitQuest(QuestDB) - if initialized then return end - - initialized = true self:addLookupList(QuestDB,22,L["Goretusk Liver Pie"],BZONE["Westfall"],55.77,30.92,1) self:addLookupList(QuestDB,38,L["Westfall Stew"],BZONE["Westfall"],55.77,30.92,1) diff --git a/RecipeDB/ARL-Reputation.lua b/RecipeDB/ARL-Reputation.lua index 6464313..15e6a3e 100644 --- a/RecipeDB/ARL-Reputation.lua +++ b/RecipeDB/ARL-Reputation.lua @@ -37,12 +37,7 @@ local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME) local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local BFAC = LibStub("LibBabble-Faction-3.0"):GetLookupTable() -local initialized = false - function addon:InitReputation(RepDB) - if initialized then return end - - initialized = true self:addLookupList(RepDB,59,BFAC["Thorium Brotherhood"],"N/A") -- Acquire Flag: 98 self:addLookupList(RepDB,270,BFAC["Zandalar Tribe"],"N/A") -- Acquire Flag: 100 diff --git a/RecipeDB/ARL-Runeforge.lua b/RecipeDB/ARL-Runeforge.lua index 02bb473..f96334d 100644 --- a/RecipeDB/ARL-Runeforge.lua +++ b/RecipeDB/ARL-Runeforge.lua @@ -33,7 +33,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitRuneforging(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true diff --git a/RecipeDB/ARL-Seasonal.lua b/RecipeDB/ARL-Seasonal.lua index 70f4522..3818cc5 100644 --- a/RecipeDB/ARL-Seasonal.lua +++ b/RecipeDB/ARL-Seasonal.lua @@ -37,12 +37,8 @@ local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME) local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local GetCategoryInfo = GetCategoryInfo -local initialized = false function addon:InitSeasons(SeasonDB) - if initialized then return end - - initialized = true local name = "" local seasonal = GetCategoryInfo(155) diff --git a/RecipeDB/ARL-Smelt.lua b/RecipeDB/ARL-Smelt.lua index 42d994f..2b0d21c 100644 --- a/RecipeDB/ARL-Smelt.lua +++ b/RecipeDB/ARL-Smelt.lua @@ -33,7 +33,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitSmelting(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true diff --git a/RecipeDB/ARL-Tailor.lua b/RecipeDB/ARL-Tailor.lua index e021596..756035c 100644 --- a/RecipeDB/ARL-Tailor.lua +++ b/RecipeDB/ARL-Tailor.lua @@ -39,7 +39,10 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local initialized = false function addon:InitTailoring(RecipeDB) - if initialized then return end + + if initialized then + return + end initialized = true @@ -1997,27 +2000,27 @@ function addon:InitTailoring(RecipeDB) self:addTradeAcquire(RecipeDB,59589,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580) -- Flying Carpet -- 60969 - self:addTradeSkill(RecipeDB,60969,410,44554,3,3908,34090) + self:addTradeSkill(RecipeDB,60969,410,44554,3,3908,nil,2,410,420,425,430) self:addTradeFlags(RecipeDB,60969,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41) self:addTradeAcquire(RecipeDB,60969,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580) -- Magnificent Flying Carpet -- 60971 - self:addTradeSkill(RecipeDB,60971,425,44558,4,3908,34091) + self:addTradeSkill(RecipeDB,60971,425,44558,4,3908,nil,2,425,435,445,455) self:addTradeFlags(RecipeDB,60971,1,2,3,21,22,23,24,25,26,27,28,29,30,37,41) self:addTradeAcquire(RecipeDB,60971,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580) -- Glacial Waistband -- 60990 - self:addTradeSkill(RecipeDB,60990,420,43584,1,3908,nil) + self:addTradeSkill(RecipeDB,60990,420,43584,1,3908,nil,2) self:addTradeFlags(RecipeDB,60990,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,56) self:addTradeAcquire(RecipeDB,60990,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580) -- Glacial Robe -- 60993 - self:addTradeSkill(RecipeDB,60993,425,43583,4,3908,nil) + self:addTradeSkill(RecipeDB,60993,425,43583,4,3908,nil,2) self:addTradeFlags(RecipeDB,60993,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,56) self:addTradeAcquire(RecipeDB,60993,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580) -- Glacial Slippers -- 60994 - self:addTradeSkill(RecipeDB,60994,420,43585,1,3908,nil) + self:addTradeSkill(RecipeDB,60994,420,43585,1,3908,nil,2) self:addTradeFlags(RecipeDB,60994,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,56) self:addTradeAcquire(RecipeDB,60994,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580) @@ -2066,6 +2069,6 @@ function addon:InitTailoring(RecipeDB) self:addTradeFlags(RecipeDB,63742,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,53,54) self:addTradeAcquire(RecipeDB,63742,1,26914,1,26964,1,26969,1,27001,1,28699,1,1346,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103) - return 400 + return 401 end diff --git a/RecipeDB/ARL-Trainer.lua b/RecipeDB/ARL-Trainer.lua index 1214ddf..6c93149 100644 --- a/RecipeDB/ARL-Trainer.lua +++ b/RecipeDB/ARL-Trainer.lua @@ -39,12 +39,7 @@ local BFAC = LibStub("LibBabble-Faction-3.0"):GetLookupTable() local BZONE = LibStub("LibBabble-Zone-3.0"):GetLookupTable() local BBOSS = LibStub("LibBabble-Boss-3.0"):GetLookupTable() -local initialized = false - function addon:InitTrainer(TrainerDB) - if initialized then return end - - initialized = true self:addLookupList(TrainerDB,223,L["Dan Golthas"],BZONE["Undercity"],71.24,60.40,2) self:addLookupList(TrainerDB,514,L["Smith Argus"],BZONE["Elwynn Forest"],41.94,65.83,1) diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua index b725747..6ea605d 100644 --- a/RecipeDB/ARL-Vendor.lua +++ b/RecipeDB/ARL-Vendor.lua @@ -38,12 +38,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local BZONE = LibStub("LibBabble-Zone-3.0"):GetLookupTable() local BBOSS = LibStub("LibBabble-Boss-3.0"):GetLookupTable() -local initialized = false - function addon:InitVendor(VendorDB) - if initialized then return end - - initialized = true self:addLookupList(VendorDB,66,L["Tharynn Bouden"],BZONE["Elwynn Forest"],42.20,67.21,1) self:addLookupList(VendorDB,340,L["Kendor Kabonka"],BZONE["Stormwind City"],76.86,52.15,1)