Quantcast

quest levels

Alex Shubert [10-01-12 - 11:32]
quest levels
Filename
AutoTurnIn.lua
loc/localization_DE.lua
loc/localization_EN.lua
loc/localization_FR.lua
loc/localization_RU.lua
diff --git a/AutoTurnIn.lua b/AutoTurnIn.lua
index 8e247d1..039022b 100644
--- a/AutoTurnIn.lua
+++ b/AutoTurnIn.lua
@@ -3,7 +3,8 @@ Feel free to use this source code for any purpose ( except developing nuclear we
 Please keep original author statement.
 @author Alex Shubert (alex.shubert@gmail.com)
 ]]--
-local _G = _G --Rumors says that global _G is called by lookup in a super-global table. Have no idea whether it is true.
+local _G = _G 	--Rumors say that global _G is called by lookup in a super-global table. Have no idea whether it is true.
+local _ 		--Sometimes blizzard exposes "_" variable as a global.
 local addonName, ptable = ...
 local L = ptable.L
 local C = ptable.CONST
@@ -19,6 +20,7 @@ AutoTurnIn.caption = addonName ..' [%s]'
 AutoTurnIn.funcList = {[1] = function() return false end, [2]=IsAltKeyDown, [3]=IsControlKeyDown, [4]=IsShiftKeyDown}
 AutoTurnIn.OptionsPanel, AutoTurnIn.RewardPanel = nil, nil
 AutoTurnIn.autoEquipList={}
+AutoTurnIn.questCache={}	-- daily quest cache. Initially is built from player's quest log

 AutoTurnIn.ldbstruct = {
 		type = "data source",
@@ -38,6 +40,10 @@ AutoTurnIn.ldbstruct = {
 		end,
 	}

+function AutoTurnIn:OnInitialize()
+	self:RegisterChatCommand("au", "ConsoleComand")
+end
+
 function AutoTurnIn:SetEnabled(enabled)
 	AutoTurnInCharacterDB.enabled = not not enabled
 	if self.ldb then
@@ -77,20 +83,43 @@ function AutoTurnIn:OnEnable()
 	self:RegisterGossipEvents()
 end

+function AutoTurnIn:OnDisable()
+  self:UnregisterAllEvents()
+end
+
 function AutoTurnIn:RegisterGossipEvents()
 	self:RegisterEvent("QUEST_GREETING")
 	self:RegisterEvent("GOSSIP_SHOW")
 	self:RegisterEvent("QUEST_DETAIL")
 	self:RegisterEvent("QUEST_PROGRESS")
 	self:RegisterEvent("QUEST_COMPLETE")
+	self:RegisterEvent("QUEST_LOG_UPDATE")
 end

-function AutoTurnIn:OnDisable()
-  self:UnregisterAllEvents()
+function AutoTurnIn:QUEST_LOG_UPDATE()
+	if ( GetNumQuestLogEntries() > 0 ) then
+		for index=1, GetNumQuestLogEntries() do
+			local title, _, _, _, isHeader , _, _, isDaily = GetQuestLogTitle(index)
+			if not isHeader and isDaily then
+				self.questCache[title] = true
+			end
+		end
+		self:UnregisterEvent("QUEST_LOG_UPDATE")
+	end
 end

-function AutoTurnIn:OnInitialize()
-	self:RegisterChatCommand("au", "ConsoleComand")
+-- returns true if quest offered by gossip is daily
+function AutoTurnIn:AllOrCachedDaily(questname)
+	return AutoTurnInCharacterDB.all or (not not self.questCache[questname])
+end
+
+function AutoTurnIn:AllOrDaily(questname)
+	return AutoTurnInCharacterDB.all or (QuestIsDaily() or QuestIsWeekly())
+end
+
+-- caches offered by gossip quest as daily
+function AutoTurnIn:CacheAsDaily(gossipQuest)
+	self.questCache[gossipQuest] = true
 end

 local p1 = {[true]=L["enabled"], [false]=L["disabled"]}
@@ -104,20 +133,10 @@ function AutoTurnIn:ConsoleComand(arg)
 		self:Print(L["enabled"])
 	elseif arg == "off"  then
 		self:SetEnabled(false)
-		self:Print(L["disabled"])
-	elseif arg == "all" then
-		AutoTurnInCharacterDB.all = true
-		self:Print(L["all"])
-	elseif arg == "list" then
-		AutoTurnInCharacterDB.all = false
-		self:Print(L["list"])
-	elseif arg == "help" then
-		self:Print(p1[AutoTurnInCharacterDB.enabled == true])
-		self:Print(p2[AutoTurnInCharacterDB.all])
+		self:Print(L["disabled"])
 	end
 end

-
 -- returns specified item count on player character. It may be some sort of currency or present in inventory as real items.
 function AutoTurnIn:GetItemAmount(isCurrency, item)
 	local amount = isCurrency and select(2, GetCurrencyInfo(item)) or GetItemCount(item, nil, true)
@@ -139,26 +158,28 @@ end

 -- OldGossip interaction system. Burn in hell. See http://wowprogramming.com/docs/events/QUEST_GREETING
 function AutoTurnIn:QUEST_GREETING()
-	self:Print("OLD GOSSIP")
 	if (not self:AllowedToHandle(true)) then
 		return
 	end

 	for index=1, GetNumActiveQuests() do
-		local quest, completed = GetActiveTitle(index)
-		if (AutoTurnInCharacterDB.all or L.quests[quest]) and (completed) then
+		local quest, isComplete = GetActiveTitle(index)
+		if isComplete and (self:AllOrCachedDaily(quest)) then
 			SelectActiveQuest(index)
 		end
 	end

-	for index=1, GetNumAvailableQuests() do
-		local isTrivial, isDaily, isRepeatable = GetAvailableQuestInfo(index)
+	for index=1, GetNumAvailableQuests() do
+		local isTrivial, isDaily, isRepeatable = GetAvailableQuestInfo(index)
 		local triviaAndAllowedOrNotTrivia = (not isTrivial) or AutoTurnInCharacterDB.trivial
-
 		local quest = L.quests[GetAvailableTitle(index)]
-		local knownAllowedQuest = quest and (not quest.donotaccept)
+		local notBlackListed = not (quest and quest.donotaccept)

-		if (triviaAndAllowedOrNotTrivia and (AutoTurnInCharacterDB.all or knownAllowedQuest or isDaily)) then
+		if isDaily then
+			self:CacheAsDaily(GetAvailableTitle(index))
+		end
+
+		if (triviaAndAllowedOrNotTrivia and notBlackListed and (AutoTurnInCharacterDB.all or isDaily)) then
 			if quest and quest.amount then
 				if self:GetItemAmount(quest.currency, quest.item) >= quest.amount then
 					SelectAvailableQuest(index)
@@ -175,12 +196,13 @@ end
 -- with ending `nil`. So: '#' for {1,nil, "b", nil} returns 1
 function AutoTurnIn:VarArgForActiveQuests(...)
     local MOP_INDEX_CONST = 5 -- was '4' in Cataclysm
+
 	for i=1, select("#", ...), MOP_INDEX_CONST do
-		local completeStatus = select(i+3, ...)
-		if (completeStatus) then  -- complete status
+		local isComplete = select(i+3, ...) -- complete status
+		if ( isComplete ) then
 			local questname = select(i, ...)
-			local quest = L.quests[questname]
-			if AutoTurnInCharacterDB.all or quest  then
+			if self:AllOrCachedDaily(questname) then
+				local quest = L.quests[questname]
 				if quest and quest.amount then
 					if self:GetItemAmount(quest.currency, quest.item) >= quest.amount then
 						SelectGossipActiveQuest(math.floor(i/MOP_INDEX_CONST)+1)
@@ -205,10 +227,10 @@ function AutoTurnIn:VarArgForAvailableQuests(...)
 		local triviaAndAllowedOrNotTrivia = (not isTrivial) or AutoTurnInCharacterDB.trivial

 		local quest = L.quests[questname] -- this quest exists in addons quest DB. There are mostly daily quests
-		local knownAllowedQuest = quest and (not quest.donotaccept)
-
+		local notBlackListed = not (quest and quest.donotaccept)
+
 		-- Quest is appropriate if: (it is trivial and trivial are accepted) and (any quest accepted or (it is daily quest that is not in ignore list))
-		if (triviaAndAllowedOrNotTrivia and (AutoTurnInCharacterDB.all or knownAllowedQuest or isDaily )) then
+		if (triviaAndAllowedOrNotTrivia and notBlackListed and (AutoTurnInCharacterDB.all or isDaily )) then
 			if quest and quest.amount then
 				if self:GetItemAmount(quest.currency, quest.item) >= quest.amount then
 					SelectGossipAvailableQuest(math.floor(i/MOP_INDEX_CONST)+1)
@@ -246,7 +268,11 @@ function AutoTurnIn:GOSSIP_SHOW()
 end

 function AutoTurnIn:QUEST_DETAIL()
-	if self:AllowedToHandle() and (AutoTurnInCharacterDB.all or L.quests[GetTitleText()]) then
+	if (QuestIsDaily() or QuestIsWeekly()) then
+		self:CacheAsDaily(GetTitleText())
+	end
+
+	if self:AllowedToHandle() and self:AllOrDaily() then
 		QuestInfoDescriptionText:SetAlphaGradient(0, -1)
 		QuestInfoDescriptionText:SetAlpha(1)
 		AcceptQuest()
@@ -254,7 +280,7 @@ function AutoTurnIn:QUEST_DETAIL()
 end

 function AutoTurnIn:QUEST_PROGRESS()
-    if  self:AllowedToHandle() and (AutoTurnInCharacterDB.all or L.quests[GetTitleText()]) and IsQuestCompletable() then
+    if  self:AllowedToHandle() and IsQuestCompletable() and self:AllOrDaily() then
 		CompleteQuest()
     end
 end
@@ -316,24 +342,27 @@ function AutoTurnIn:TurnInQuest(rewardIndex)
 			local lootLevel, _, _, _, _, equipSlot = select(4, GetItemInfo(GetQuestItemLink("choice", rewardIndex)))

 			-- Compares reward and already equiped item levels. If reward level is greater than equiped item, auto equip reward
-			local slots = C.SLOTS[equipSlot]
-			local slotNumber = GetInventorySlotInfo(slots[1])
-			local invLink = GetInventoryItemLink("player", slotNumber)
-			local eqLevel = select(4, GetItemInfo(invLink))
-			-- If reward is a ring  trinket or one-handed weapons all slots must be checked in order to swap one with a lesser item-level
-			if (#slots > 1) then
-				invLink = GetInventoryItemLink("player", GetInventorySlotInfo(slots[2]))
-				if (invLink) then
-					local eq2Level = select(4, GetItemInfo(invLink))
-					eqLevel = (eqLevel > eq2Level) and eq2Level or eqLevel
-					slotNumber = (eqLevel > eq2Level) and GetInventorySlotInfo(slots[2]) or slotNumber
+			local slot = C.SLOTS[equipSlot]
+			if (slot) then
+				local slotNumber = GetInventorySlotInfo(slot[1])
+				local invLink = GetInventoryItemLink("player", slotNumber)
+				local eqLevel = invLink and select(4, GetItemInfo(invLink)) or 0
+				-- If reward is a ring  trinket or one-handed weapons all slots must be checked in order to swap one with a lesser item-level
+				if (#slot > 1) then
+					invLink = GetInventoryItemLink("player", GetInventorySlotInfo(slot[2]))
+					if (invLink) then
+						local eq2Level = select(4, GetItemInfo(invLink))
+						eqLevel = (eqLevel > eq2Level) and eq2Level or eqLevel
+						slotNumber = (eqLevel > eq2Level) and GetInventorySlotInfo(slot[2]) or slotNumber
+					end
+				end
+				if(lootLevel > eqLevel) then
+					self.autoEquipList[name] = slotNumber
+					self.delayFrame.delay = time() + 2
+					self.delayFrame:Show()
 				end
 			end
-			if(lootLevel > eqLevel) then
-				self.autoEquipList[name] = slotNumber
-				self.delayFrame.delay = time() + 2
-				self.delayFrame:Show()
-			end
+
 		end
 	end

@@ -473,8 +502,9 @@ function AutoTurnIn:QUEST_COMPLETE()
 		return
 	end

-	local quest = L.quests[GetTitleText()]
-    if AutoTurnInCharacterDB.all or quest then
+    if self:AllOrDaily() then
+		local questname = GetTitleText()
+		local quest = L.quests[questname]
 		-- Tournament quest found
 		if (quest == "tournament") then
 			self:TurnInQuest(AutoTurnInCharacterDB.tournament)
@@ -498,6 +528,30 @@ function AutoTurnIn:QUEST_COMPLETE()
     end
 end

+local QuestLevelFormat = " [%d] %s"
+function AutoTurnIn:ShowQuestLevelInLog()
+	-- see function QuestLog_Update() in function QuestLogFrame.lua for details
+	local scrollOffset = HybridScrollFrame_GetOffset(QuestLogScrollFrame);
+	local numEntries, numQuests = GetNumQuestLogEntries();
+
+	for i=1, #QuestLogScrollFrame.buttons do
+		local questIndex = i + scrollOffset;
+		local button = QuestLogScrollFrame.buttons[i]
+		if ( questIndex <= numEntries ) then
+			local title, level, _, _, isHeader = GetQuestLogTitle(questIndex);
+			if (not isHeader and title) then
+				button:SetText(QuestLevelFormat:format(level, title))
+				QuestLogTitleButton_Resize(button)
+			end
+		end
+	end
+end
+
 -- gossip and quest interaction goes through a sequence of windows: gossip [shows a list of available quests] - quest[describes specified quest]
 -- sometimes some parts of this chain is skipped. For example, priest in Honor Hold show quest window directly. This is a trick to handle 'toggle key'
-hooksecurefunc(QuestFrame, "Hide", function() AutoTurnIn.allowed = nil end)
\ No newline at end of file
+hooksecurefunc(QuestFrame, "Hide", function() AutoTurnIn.allowed = nil end)
+
+-- Quest level in a log.
+hooksecurefunc("QuestLog_Update", AutoTurnIn.ShowQuestLevelInLog)
+hooksecurefunc(QuestLogScrollFrame, "update", AutoTurnIn.ShowQuestLevelInLog)
+-- WatchFrameAutoQuestPopUp1
\ No newline at end of file
diff --git a/loc/localization_DE.lua b/loc/localization_DE.lua
index 7a8b6ef..b8042fb 100644
--- a/loc/localization_DE.lua
+++ b/loc/localization_DE.lua
@@ -119,434 +119,25 @@ privateTable.L.quests = {
 ['Mehr Schattenstaub']={item="Schattenstaub", amount=6, currency=false},
 --SporeGar
 ['Bringt mir ein weiteres Gebüsch!']={item="Bluthibiskus", amount=5, currency=false},
-['Jetzt, da wir immer noch Freunde sind...']="",
 ['Mehr Ranken!']={item="Sumpflordranke", amount=6, currency=false},
 ['Noch ein paar Sporensäcke']={item="Reifer Sporenbeutel", amount=6, currency=false},
 ['Noch mehr fruchtbare Sporen']={item="Fruchtbare Sporen", amount=6, currency=false},
 ['Noch mehr Glühkappen']={item="Glühkappe", amount=10, currency=false},
---Consortium
 --Halaa
 ["Kristallpulver von Oshu'gun"]={item="Kristallpulverprobe von Oshu'gun", amount=10, currency=false},
---Sunwell (Offensive der Zerschmetterten Sonne)
-['Ablenkungsmanöver an der Todesschneise']="",
-['Angriffspläne des Sonnenzorns']="",
-['Belästigung an der Küste der Grünkiemen']="",
-['Blut für Blut']="",
-['Das Sonnenbrunnenportal aufrechterhalten']="",
-['Den Feind vom Leibe halten']="",
-['Den Hafen einnehmen']="",
-['Die Barrieren des Sanktums']="",
-['Die eigenen Wurzeln entdecken']="",
-['Die Luftangriffe müssen weitergehen']="",
-['Die Multiphasen-Vermessung']="",
-['Die Schlacht muss weitergehen']="",
-['Die Schlacht um die Waffenkammer der Sonnenweiten']="",
-['Eine milde Gabe']="",
-['Einen Vorteil gewinnen']="",
-['Eure weitere Unterstützung']="",
-['Eure Wurzeln wiederentdecken']="",
-['Fahrt die Barrieren hoch!']="",
-['Geschäft geöffnet']="",
-["Gesucht: Der Siegelring von Prinz Kael'thas"]="",
-['Gesucht: Schwestern der Qual']="",
-['Haltet die Verstärkung auf']="",
-['Hört jetzt nicht auf!']="",
-['Kenne deine Leylinien']="",
-['Manazellen abfangen']="",
-['Unberechenbares Verhalten']="",
-['Vernichtet den Durchgang']="",
-['Vernichtet die Dämmerklingen']="",
-['Vorbereitungen']="",
-["Waffen von Ata'mal"]="",
-['Weitere Konvertierungen']="",
---Ogri'la
-['Bändigt noch mehr Ätherrochen!']="",
-['Bannt mehr Dämonen']="",
-['Die Strahlung des Relikts']="",
-['Und wieder ein Bombenangriff!']="",
---Netherdrake
-['Balg eines Netherminenschinders']="",
-['Der Schuhmerang: Das Mittel gegen den wertlosen Peon']="",
-['Die Dinge in den Griff bekommen...']="",
-['Die tödlichste Falle aller Zeiten']="",
-['Drachen sind unsere geringste Sorge']="",
-['Ein langsamer Tod']="",
-['Ein Schatten am Horizont']="",
-['Kristalle der Netherschwingen']="",
-['Netheriterz']="",
-['Netherstaubpollen']="",
-['Schwächt das Portal des Zwielichts']="",
---Fishing daily
-['Der Eine, der entkam']="",
-['Garnelenfangen ist nicht einfach']="",
-['Köderbanditen']="",
-['Teufelsblutfilet']="",
---Cooking daily
-['Manaziös']="",
-['Rache ist süß']="",
-['Superheißes Ragout']="",
-['Suppe für die Seele']="",
-
---[[ WOtLK]]--
---Kalu'ak
-['Auf das Schlimmste gefasst sein']="",
-['Der Weg zu seinem Herzen...']="",
-['Zukunftsplanungen']="",
---Oracul
-['Beherrschen der Kristalle']="",
-['Besänftigung des großen Regensteins']="",
-['Ein reinigendes Lied']="",
-['Lied der Besinnung']="",
-['Lied der Fruchtbarkeit']="",
-['Lied von Wind und Wasser']="",
-['Macht der Großen']="",
-['Wille der Titanen']="",
---Frenzyheart Tribe
-['Des Helden Helm']="",
-['Des Herzbluts Stärke']="",
-['Die Stärke des Sturms']="",
-['Geheime Kraft der Wildherzen']="",
-['Hühnerparty!']="",
-['Instrument des Krieges']="",
-['Kartaks Wut']="",
-['Rejek: Erstes Blut']="",
---Knights of the Ebon Blade
-['Ekel mag Feuer!']="",
-['Erhebt euch von den Toten!']="",
-['Flugsperrzone']="",
-['Informationsbeschaffung']="",
-['Schießt sie ab!']="",
-['Setzt ein Zeichen']="",
---Tournament
-['Auf Winters Schneide']="",
-['Bedrohung von oben']="tournament",
-['Todesritter']="",
-['Das Schicksal der Gefallenen']="",
-['Der große Arenakampf']="",
-['Die Barmherzigkeit des Lichts']="",
-['Die Schlacht zum Gegner tragen']="tournament",
-['Die Überreste identifizieren']="",
-['Diesmal habt Ihr Euch wirklich selbst übertroffen, Kul']="",
-['Drottinn Hrothgar']="",
-['Eine Klinge, eines Champions würdig']="",
-['Eine würdige Waffe']="",
-['Einen Beitrag leisten']="",
-['Einhalt den Aggressoren']="",
-['Feldübung']="",
-['Feldübungen eines Recken']="",
-['Frühstück der Champions']="",
-['Gormok will seine Schneebolde']="",
-['Kraken am Haken']="",
-['Legt mal ein Bein zu']="",
-['Nebelrufer Yngvar']="",
-['Ornolf der Vernarbte']="",
-['Reitgrundlagen']="",
-['Rettungseinsatz auf See']="",
-['Schlacht vor der Zitadelle']="tournament",
-['Todessprecher Kharos']="",
-['Unter Champions']="tournament",
-['Vor den Toren des Feindes']="",
-['Vor den Toren des Feindes']="",
-['Was fressen eigentlich Yetis?']="",
-['Wie der Block so der Splitter']="",
-['Wie die Axt im Walde']="",
 --Sons of Hodir
-['Arngrim füttern']="",
-['Den Helm polieren']="",
-['Jagd auf Spione']="",
-['Heiß und kalt']="",
 ['Hodirs Tribut']={item="Relikt von Ulduar", amount=10, currency=false},
-['Hodirs Horn blasen']="",
-['Hodirs Speer werfen']="",
 ['Vergesst das Immerfrosteis nicht!']={item="Immerfrostsplitter", amount=1, currency=false},
---The Wyrmrest Accord
-['Drachenjagd']="",
-['Mysterium der Unendlichkeit']="",
-['Schlacht in den Wolken']="",
-['Verteidigt den Wyrmruhtempel']="",
---Valiance Expedition + Warsong Offensive
-['Blut der Auserwählten']="",
-['Bodenangriff']="",
-['Durchbrecht die Blockade']="",
-['Eine mögliche Verbindung']="",
-['Einzelteile']="",
-['Gemetzel am Schwarzwasser']="",
-['König der Berge']="",
-['Leben oder Tod']="",
-['Luftangriff']="",
-['Mehr Sendungen abfangen']="",
-['Schredder reparieren']="",
-["Tritt rein, solang' sie am Boden liegen"]="",
-['Der Allianz die Augen zuhalten']="",
-['Haltet sie auf Trab']="",
-['Reparaturen']="",
-['Schreddert die Allianz']="",
-['Überfordert!']="",
---Juwelenschleifen
-['Halskettenreparatur']="",
-['Lieferung: aufwändige Knochenfigur']="",
-['Lieferung: Blutrotes Nephritamulett']="",
-['Lieferung: helles Rüstungsrelikt']="",
-['Lieferung: leuchtende Elfenbeinfigur']="",
-['Lieferung: tückische Sonnenbrosche']="",
-['Lieferung: unbeständige Sonnenkuriosität']="",
-['Die Lieferung abfertigen']="",
---Angeln
-['Arm dran, Arm ab!']="",
-['Blut ist dicker']="",
-['Der Geisterfisch']="",
-['Gefährlich köstlich']="",
-['Mehr Glück beim nächsten Mal']="",
-['Perle der Kanalisation']="",
---Kochkunst
-['Durchnässtes Rezept']="",
-['Energieerfüllter Pilzhackbraten']="",
-['Kanaleintopf']="",
-['Käse für Leuchtegold']="",
-['Senfwürstchen!']="",
-['Versammlung im Zauberkasten']="",
-
 --[[ Cataclysm]]--
 --Firelands Invasion
-['A Lieutenant of Flame']="",
-['Ab ins Wasser!']="",
-['Aggressives Wachstum']="",
 ["Befüllung des Mondbrunnens"]={item=416, amount=125, currency=true},
-['Brandopfer']="",
-['Den Druck lindern']="",
 ['Der Einsame Turm']={donotaccept=true},
-['Der Gipfel des Interesses']="",
-['Der Ruf des Rudels']="",
-['Die Bären da in den Bäumen']="",
-['Die Flammenspinnenkönigin']="",
-['Die Hunde des Krieges']="",
-['Die Hunde von Shannox']="",
-['Die Macht von Malorne']="",
-['Die Sorgen einer Mutter']="",
-['Die Verteidiger des Hyjal']="",
-['Die Wächter sehen zu']="",
-['Echos von Nemesis']="",
-['Ein Stich ins Herz']="",
-['Eine bittere Pille']="",
-['Erdulden der Hitze']="",
-['Fallhöhe']="",
-['Fandrals Methoden']="",
-['Feindliche Elemente']="",
-['Feuer am Himmel']="",
-['Feuerblumen']="",
-['Flammende Schwingen']="",
-['Flammenschürer des Geschmolzenen Stroms']="",
-['Gesengte Flügel']="",
-['Glutharz']="",
-['Gut heulen will geübt sein']="",
-['Hinein in die feurigen Tiefen']="",
 ['Ins Feuer']={donotaccept=true},
-['Irrwische los']="",
-['Je größer...']="",
-['Junges Blut']="",
-['Lebendes Obsidium']="",
-['Lindert den Schmerz']="",
-['Lücke in der Verteidigung']="",
-['Magmolien, die ich stahl']="",
-["Manche mögen's heiß"]="",
-['Nachschub für die andere Seite']="",
-['Nervige Netze']="",
-['Pyrorachnophobie']="",
 ["Rufen der Urtume"]={item=416, amount=125, currency=true},
-['Rückkehr der Verräter']="",
-['Schwarmruf']="",
-['Segen der Natur']="",
-['Solarkernzerstörung']="",
-['Sturm gegen die Flammen']="",
-['Territoriale Vögel']="",
-['Verarzten der Wunden']="",
 ["Verstärkung"]={item=416, amount=125, currency=true},
-['Ver-ei-teln']="",
-['Wie heiß']="",
-['Wo ist das Vögelchen?']="",
-['Zwischen den Bäumen']="",
---Tol Barad Peninsula
-
-['Achtung, Splitter']="",
-['Aus der Vergangenheit lernen']="",
-['Ausdünnen der Brut']="",
-['Bergt die Überreste']="",
-['Bom-ben-los!']="",
-['Bringt es zu Ende']="",
-['D-Block']="",
-['Der gefangene Erzmagier']="",
-['Der Wärter']="",
-['Die Rückeroberung der Warte']="",
-['Die Tiefen säubern']="",
-['Die Überreste']="",
-['Die Vergessenen']="",
-['Ein riesiges Problem']="",
-['Eine klebrige Angelegenheit']="",
-['Einnahme der Festung']="",
-['Essen von unten']="",
-['Gefangenenaufstand']="",
-['Geisterjäger']="",
-['GESUCHT: Vorarbeiter Wellson']="",
-['Goblinischer Magnetismus']="",
-['In ihrer Haut']="",
-['Kanonenkugel!']="",
-['Kapitän P. Harris']="",
-['Lasst keine Waffen zurück']="",
-['Lehrt einen hungrigen Mann das Fischen... oder das Stehlen']="",
-['Nicht die freundlichste Stadt']="",
-['Oberleutnant Connor']="",
-['Sieg in Tol Barad']="",
-['Stärkung der Moral']="",
-['Stört ihre vorletzte Ruhe']="",
-['Sumpfköder']="",
-['Svarnos']="",
-['Tank, der Haifisch']="",
-['Verfluchte Fesseln']="",
---Therazane
-['Anhänglich']="",
-['Beharrlichkeit zahlt sich aus']="",
-['Bohrende Angst']="",
-['Der Zorn der Pilze']="",
-['Die rastlose Brut']="",
-['Flug ins Zwielicht']="",
-['Glop, Sohn des Glop']="",
-['In den Tiefen verloren']="",
-['Partikel']="",
-['Unnatürliche Ursachen']="",
-['Unter der Oberfläche']="",
-['Untergrundwirtschaft']="",
-['Verweichlicht']="",
-['Weicher Fels']="",
-['Zerbrechliche Werte']="",
---Ramkahen
-['Diebische Pflücker']="",
-['Feuer vom Himmel']="",
---Wildhammer Clan
-['Bierlieferung']="",
-['Die Angehörigen des Drachenmals in Schach halten']="",
-['Kämpfen wie ein Wildhammer']="",
-['Kein Essen zurücklassen']="",
-['Kriegsherr Halthar ist zurück']="",
-['Persönliche Bitte']="",
---Dragonmaw Clan
-['Bezwingt den Hochschamanen']="",
-['Die nördliche Flanke']="",
-['Ein weiterer Magen zu füllen']="",
-['Flammenkrieg']="",
-['Greifhaken']="",
-['Vernichtet die Wildhämmer']="",
---Jewelcrafter
-['Der letzte Schrei!']="",
-['Ein Geschenk für Lila']="",
-['Elementarglibber']="",
-['Nibbler! Nein!']="",
-['Ogermazonen in Stimmung']="",
---Cooking Alliance
-['Auch Waisen mögen Kekse!']="",
-['Das Geheimnis des perfekten Kimchis']="",
-['Des Königs Apfelwein']="",
-['Ein Fischerschmaus']="",
-['Eine Runde für die Wachen']="",
-['Gedenkt der Vorfahren']="",
-['Geflügelmangel']="",
-['Gewürzbrot en masse']="",
-['Grundnahrungsmittel']="",
-['Haggis für alle!']="",
-['Helft den Bierdürftigen']="",
-['Jede Menge Gewürzbrot']="",
-['Lust auf Krebs?']="",
-['Pennys Kürbiskuchen']="",
-['Rippchen für die Schildwachen']="",
---Cooking Horde
-['"Magische" Pilze']="",
-['Achtung, die Frucht beißt zurück!']="",
-['Auch Diebe bekommen Hunger']="",
-['Aus den eigenen Reihen stehlen']="",
-['Troll']="",
-['Ein wahres Schabsal']="",
-['Flusskrebs à la Creole']="",
-['Fungourmet']="",
-['Gewürzbrot aus Mulgore']="",
-['Leckere Lilien']="",
-['Maisbrei']="",
-['Perfekt ausgewählte Portionen']="",
-['Schneckt lecker!']="",
-['Speck macht alles besser']="",
-['Und als Beilage: Fliegen']="",
-['Wir benötigen mehr Pinienkerne']="",
---Fishing Alliance
-['Aufstockung']="",
-['Der Anhänger der Schwester']="",
-['Der gnomische Köder-o-Matik']="",
-['Der Klassiker']="",
-['Donnerfälle']="",
-['Ein glitschiger Snack']="",
-['Ein großer Schluck']="",
-['Einen Zander erwischen']="",
-['Eisangeln']="",
-['Felshummer']="",
-['Fische für Squirky']="",
-['Für die Nachwelt']="",
-['Lebendköder']="",
-['Muscheltaucher']="",
-['Nach Würmern graben']="",
---Fishing Horde
-['Augen auf beim Angeln']="",
-['Das Monster im Burggraben']="",
-['Ein Ring sie zu knechten']="",
-['Ein toller Hecht']="",
-['Ein wütender Fang']="",
-['Elektrisierender Einfall']="",
-['Fischkopp']="",
-['Glänzende Schmuckstücke']="",
-['Kaulquappen des Todes']="",
-['Lust auf Flusskrebs']="",
-['Müll abladen verboten']="",
-['Muscheln meucheln']="",
-['Neue Fische für Donnerfels']="",
-['Schleim-Time']="",
-['Tümpelschrecken']="",
 --Darkmoon Faire
 ["Spaß für die Kleinen"] = {item=393, amount=15, currency=true},
-['Die menschliche Kanonenkugel']="",
-['Er schießt, er trifft!']="",
-['Hau-den-Gnoll']="",
-['Panzergeneral']="",
-['Werft den Ring']="",
---Love is in the Air
-['Bonbonangriff']="",
-['Die Krone zerschmettern']="",
-['Ein feines Duftwasserwölkchen']="",
-['Ein Geschenk für den König von Sturmwind']="",
-['Ein Geschenk für den Kriegshäuptling']="",
-["Ein Geschenk für den Lordregenten von Quel'Thalas"]="",
-['Ein Geschenk für den Oberhäuptling']="",
-['Ein Geschenk für den Propheten']="",
-['Ein Geschenk für die Bansheekönigin']="",
-['Ein Geschenk für die Hohepriesterin von Elune']="",
-['Ein Geschenk für einen Lord von Eisenschmiede']="",
-['Ein perfekter Hauch von Parfüm']="",
-['Zustellung']="",
---Noblegarden
-['Die große Eiersuche']="",
-['Einen Korb bekommen!']="",
-['Frühlingsernter']="",
-['Frühlingssammler']="",
---Midsummer Fire Festival
-['Beschwört Ahune']="",
-['Gegenschlag']="",
-['Noch einmal Fackeln fangen']="",
-['Noch einmal Fackeln werfen']="",
-['Zurückschlagen']="",
-
---Anglerwettbewerb im Schlingendorntal
-['Anglerlehrling']="",
-['Anglermeister']="",
-['Besonderer Fisch - Braunells blaugestreifter Flitzerfisch']="",
-['Besonderer Fisch - Dezianischer Königinnenfisch']="",
-['Besonderer Fisch - Kiefers Engelfisch']="",
---Angelwettstreit der Kalu'ak
-["Angelwettstreit der Kalu'ak"]="",
-['Mehr Glück beim nächsten Mal']="",
+--MoP
+["Saat der Angst"]={item="Schreckensambersplitter", amount=20, currency=false},
 }
 end
\ No newline at end of file
diff --git a/loc/localization_EN.lua b/loc/localization_EN.lua
index ce72e88..7fab6dc 100644
--- a/loc/localization_EN.lua
+++ b/loc/localization_EN.lua
@@ -112,10 +112,7 @@ privateTable.L.quests = {
 ["Single Firewing Signet"]={item="Firewing Signet", amount=1, currency=false},
 ["Single Sunfury Signet"]={item="Sunfury Signet", amount=1, currency=false},
 ["More Basilisk Eyes"]={item="Dampscale Basilisk Eye", amount=8, currency=false},
---Cenarion Exp
 --Skettis
-["Escape from Skettis"]="",
-["Fires Over Skettis"]="",
 ["More Shadow Dust"]={item="Shadow Dust", amount=6, currency=false},
 --SporeGar
 ["Bring Me Another Shrubbery!"]={item="Sanguine Hibiscus", amount=5, currency=false},
@@ -123,422 +120,18 @@ privateTable.L.quests = {
 ["More Glowcaps"]={item="Glowcap", amount=10, currency=false},
 ["More Spore Sacs"]={item="Mature Spore Sac", amount=10, currency=false},
 ["More Tendrils!"]={item="Bog Lord Tendril", amount=6, currency=false},
-["Now That We're Still Friends..."]="",
--- Consortium
 -- Halaa
 ["Oshu'gun Crystal Powder"]={item="Oshu'gun Crystal Powder Sample", amount=10, currency=false},
--- Sunwell
-["A Charitable Donation"]="",
-["Arm the Wards!"]="",
-["Ata'mal Armaments"]="",
-["Blast the Gateway"]="",
-["Blood for Blood"]="",
-["Crush the Dawnblade"]="",
-["Discovering Your Roots"]="",
-["Disrupt the Greengill Coast"]="",
-["Distraction at the Dead Scar"]="",
-["Don't Stop Now...."]="",
-["Erratic Behavior"]="",
-["Further Conversions"]="",
-["Gaining the Advantage"]="",
-["Intercept the Reinforcements"]="",
-["Intercepting the Mana Cells"]="",
-["Keeping the Enemy at Bay"]="",
-["Know Your Ley Lines"]="",
-["Maintaining the Sunwell Portal"]="",
-["Making Ready"]="",
-["Open for Business"]="",
-["Rediscovering Your Roots"]="",
-["Sunfury Attack Plans"]="",
-["Taking the Harbor"]="",
-["The Air Strikes Must Continue"]="",
-["The Battle for the Sun's Reach Armory"]="",
-["The Battle Must Go On"]="",
-["The Multiphase Survey"]="",
-["The Sanctum Wards"]="",
-["Wanted: Sisters of Torment"]="",
-["Wanted: The Signet Ring of Prince Kael'thas"]="",
-["Your Continued Support"]="",
--- Ogri'la
-["Banish More Demons"]="",
-["Bomb Them Again!"]="",
-["The Relic's Emanation"]="",
-["Wrangle More Aether Rays!"]="",
--- Netherdrake
-["A Slow Death"]="",
-["Disrupting the Twilight Portal"]="",
-["Dragons are the Least of Our Problems"]="",
-["Nethercite Ore"]="",
-["Netherdust Pollen"]="",
-["Nethermine Flayer Hide"]="",
-["Netherwing Crystals"]="",
-["Picking Up The Pieces..."]="",
-["The Booterang: A Cure For The Common Worthless Peon"]="",
-["The Deadliest Trap Ever Laid"]="",
-["The Not-So-Friendly Skies..."]="",
--- Fishing daily
-["Bait Bandits"]="",
-["Crocolisks in the City"]="",
-["Felblood Fillet"]="",
-["Shrimpin' Ain't Easy"]="",
-["The One That Got Away"]="",
--- Cooking daily
-["Manalicious"]="",
-["Revenge is Tasty"]="",
-["Soup for the Soul"]="",
-["Super Hot Stew"]="",

---[[ WOtLK]]--
--- Kalu'ak
-["Planning for the Future"]="",
-["Preparing for the Worst"]="",
-["The Way to His Heart..."]="",
--- Oracul
-["Appeasing the Great Rain Stone"]="",
-["Mastery of the Crystals"]="",
-["Power of the Great Ones"]="",
-["Will of the Titans"]="",
-["A Cleansing Song"]="",
-["Song of Fecundity"]="",
-["Song of Reflection"]="",
-["Song of Wind and Water"]="",
---Frenzyheart Tribe
-["A Hero's Headgear"]="",
-["Chicken Party!"]="",
-["Kartak's Rampage"]="",
-["Rejek: First Blood"]="",
-["Secret Strength of the Frenzyheart"]="",
-["Strength of the Tempest"]="",
-["The Heartblood's Strength"]="",
-["Tools of War"]="",
---Knights of the Ebon Blade
-["From Their Corpses, Rise!"]="",
-["Intelligence Gathering"]="",
-["Leave Our Mark"]="",
-["No Fly Zone"]="",
-["Shoot 'Em Up"]="",
-["Vile Like Fire!"]="",
---Tournament
-["A Blade Fit For A Champion"]="",
-["A Chip Off the Ulduar Block"]="",
-["A Leg Up"]="",
-["A Valiant's Field Training"]="",
-["A Worthy Weapon"]="",
-["Among the Champions"]="tournament",
-["At The Enemy's Gates"]="",
-["Battle Before The Citadel"]="tournament",
-["Breakfast Of Champions"]="",
-["Contributin' To The Cause"]="",
-["Deathspeaker Kharos"]="",
-["Drottinn Hrothgar"]="",
-["Get Kraken!"]="",
-["Gormok Wants His Snobolds"]="",
-["Identifying the Remains"]="",
-["Jack Me Some Lumber"]="",
-["Learning The Reins"]="",
-["Mistcaller Yngvar"]="",
-["Ornolf The Scarred"]="",
-["Rescue at Sea"]="",
-["Stop The Aggressors"]="",
-["Taking Battle To The Enemy"]="tournament",
-["The Edge Of Winter"]="",
-["The Fate Of The Fallen"]="",
-["The Grand Melee"]="",
-["The Light's Mercy"]="",
-["Threat From Above"]="tournament",
-["Training In The Field"]="",
-["What Do You Feed a Yeti, Anyway?"]="",
-["You've Really Done It This Time, Kul"]="",
---Sons of Hodir
-["Blowing Hodir's Horn"]="",
-["Feeding Arngrim"]="",
 ["Hodir's Tribute"]={item="Relic of Ulduar", amount=10, currency=false},
-["Hot and Cold"]="",
-["Polishing the Helm"]="",
 ["Remember Everfrost!"]={item="Everfrost Chip", amount=1, currency=false},
-["Spy Hunter"]="",
-["Thrusting Hodir's Spear"]="",
---The Wyrmrest Accord
-["Aces High!"]="",
-["Defending Wyrmrest Temple"]="",
-["Drake Hunt"]="",
---Valiance Expedition + Warsong Offensive
-["Assault by Air"]="",
-["Assault by Ground"]="",
-["Blackriver Skirmish"]="",
-["Blood of the Chosen"]="",
-["Break the Blockade"]="",
-["Capture More Dispatches"]="",
-["Kick 'Em While They're Down"]="",
-["King of the Mountain"]="",
-["Life or Death"]="",
-["Pieces Parts"]="",
-["Shredder Repair"]="",
-["Keep 'Em on Their Heels"]="",
-["Keeping the Alliance Blind"]="",
-["Making Repairs"]="",
-["Overwhelmed!"]="",
-["Shred the Alliance"]="",
---Jewelcrafting
-['Finish the Shipment']="",
-['Shipment: Blood Jade Amulet ']="",
-['Shipment: Bright Armor Relic']="",
-['Shipment: Glowing Ivory Figurine']="",
-['Shipment: Intricate Bone Figurine']="",
-['Shipment: Shifting Sun Curio ']="",
-['Shipment: Wicked Sun Brooch']="",
-['Necklace Repair']="",
---Fishing
-['Better Luck Next Time']="",
-['Blood Is Thicker']="",
-['Dangerously Delicious']="",
-['Disarmed!']="",
-['Jewel Of The Sewers']="",
-['The Ghostfish']="",
---Cooking
-['Cheese for Glowergold']="",
-['Convention at the Legerdemain']="",
-['Infused Mushroom Meatloaf']="",
-['Mustard Dogs!']="",
-['Sewer Stew']="",
-['Waterlogged Recipe']="",
-
---[[ Cataclysm]]--
--- Firelands Invasion
-["A Bitter Pill"]="",
-["Aggressive Growth"]="",
 ["Additional Armaments"]={item=416, amount=125, currency=true},
-["Between the Trees"]="",
-["Breach in the Defenses"]="",
-["Burn Victims"]="",
-["Bye Bye Burdy"]="",
-["Call the Flock"]="",
 ["Calling the Ancients"]={item=416, amount=125, currency=true},
-["Caught Unawares"]="",
-["Echoes of Nemesis"]="",
-["Egg-stinction"]="",
-["Embergris"]="",
-["Enduring the Heat"]="",
-["Fandral's Methods"]="",
-["Fire Flowers"]="",
-["Fire in the Skies"]="",
 ["Filling the Moonwell"]={item=416, amount=125, currency=true},
-["Flamewakers of the Molten Flow"]="",
-["Hostile Elements"]="",
-["Hounds of Shannox"]="",
-["How Hot"]="",
-["Into the Depths"]="",
 ["Into the Fire"]={donotaccept=true},
-["Little Lasher"]="",
-["Living Obsidium"]="",
-["Mother's Malice"]="",
-["Nature's Blessing"]="",
-["Need... Water... Badly..."]="",
-["Peaked Interest"]="",
-["Perfecting Your Howl"]="",
-["Punting Season"]="",
-["Pyrorachnophobia"]="",
-["Rage Against the Flames"]="",
-["Releasing the Pressure"]="",
-["Relieving the Pain"]="",
-["Singed Wings"]="",
-["Solar Core Destruction"]="",
-["Some Like It Hot"]="",
-["Starting Young"]="",
-["Steal Magmolias"]="",
-["Strike at the Heart"]="",
-["Supplies for the Other Side"]="",
-["Territorial Birds"]="",
-["The Bigger They Are"]="",
-["The Call of the Pack"]="",
-["The Dogs of War"]="",
-["The Flame Spider Queen"]="",
 ["The Forlorn Spire"]={donotaccept=true},
-["The Harder They Fall"]="",
-["The Power of Malorne"]="",
-["The Protectors of Hyjal"]="",
-["The Sanctuary Must Not Fall"]="",
-["The Wardens are Watching"]="",
-["Those Bears Up There"]="",
-["Through the Gates of Hell"]="",
-["Traitors Return"]="",
-["Treating the Wounds"]="",
-["Wicked Webs"]="",
-["Wings Aflame"]="",
-["Wisp Away"]="",
-
--- Tol Barad Peninsula
-["A Huge Problem"]="",
-["A Sticky Task"]="",
-["Bombs Away!"]="",
-["Boosting Morale"]="",
-["Cannonball!"]="",
-["Captain P. Harris"]="",
-["Claiming The Keep"]="",
-["Clearing the Depths"]="",
-["Cursed Shackles"]="",
-["D-Block"]="",
-["Finish The Job"]="",
-["First Lieutenant Connor"]="",
-["Food From Below"]="",
-["Ghostbuster"]="",
-["Learning From The Past"]="",
-["Leave No Weapon Behind"]="",
-["Magnets, How Do They Work?"]="",
-["Not The Friendliest Town"]="",
-["Prison Revolt"]="",
-["Rattling Their Cages"]="",
-["Salvaging the Remains"]="",
-["Shark Tank"]="",
-["Svarnos"]="",
-["Swamp Bait"]="",
-["Taking the Overlook Back"]="",
-["Teach A Man To Fish.... Or Steal"]="",
-["The Forgotten"]="",
-["The Imprisoned Archmage"]="",
-["The Leftovers"]="",
-["The Warden"]="",
-["Thinning the Brood"]="",
-["Victory in Tol Barad"]="",
-["Walk A Mile In Their Shoes"]="",
-["WANTED: Foreman Wellson"]="",
-["Watch Out For Splinters!"]="",
--- Therazane
-["Beneath the Surface"]="",
-["Fear of Boring"]="",
-["Fungal Fury"]="",
-["Glop, Son of Glop"]="",
-["Lost In The Deeps"]="",
-["Motes"]="",
-["Soft Rock"]="",
-["The Restless Brood"]="",
-["Through Persistence"]="",
-["Underground Economy"]="",
---Ramkahen
-["Fire From the Sky"]="",
-["Thieving Little Pluckers"]="",
---Wildhammer Clan
-["Beer Run"]="",
-["Fight Like a Wildhammer"]="",
-["Keeping the Dragonmaw at Bay"]="",
-["Never Leave a Dinner Behind"]="",
-["Warlord Halthar is Back"]="",
---Dragonmaw Clan
-["Another Maw to Feed"]="",
-["Bring Down the High Shaman"]="",
-["Crushing the Wildhammer"]="",
-["Hook 'em High"]="",
-["Total War"]="",
---Jewelcrafter
-["A Present for Lila"]="",
-["Elemental Goo"]="",
-["Nibbler! No!"]="",
-["Ogrezonians in the Mood"]="",
-["The Latest Fashion!"]="",
---Cooking Alliance
-["A Fisherman's Feast"]="",
-["A Fowl Shortage"]="",
-["A Round for the Guards"]="",
-["Back to Basics"]="",
-["Can't Get Enough Spice Bread"]="",
-["Feeling Crabby?"]="",
-["I Need to Cask a Favor"]="",
-["Keepin' the Haggis Flowin'"]="",
-["Orphans Like Cookies Too!"]="",
-["Penny's Pumpkin Pancakes"]="",
-["Remembering the Ancestors"]="",
-["Ribs for the Sentinels"]="",
-["Spice Bread Aplenty"]="",
-["The King's Cider"]="",
-["The Secret to Perfect Kimchi"]="",
--- Cooking Horde
-['"Magic" Mushrooms']="",
-["Careful, This Fruit Bites Back"]="",
-["Corn Mash"]="",
-["Crawfish Creole"]="",
-["Escargot A Go-Go"]="",
-["Even Thieves Get Hungry"]="",
-["Everything Is Better with Bacon"]="",
-["Fungus Among Us"]="",
-["Lily, Oh Lily"]="",
-["Mulgore Spice Bread"]="",
-["Perfectly Picked Portions"]="",
-["Pining for Nuts"]="",
-["Roach Coach"]="",
-["Stealing From Our Own"]="",
-["Would You Like Some Flies With That?"]="",
---Fishing Alliance
-["A Slippery Snack"]="",
-["An Old Favorite"]="",
-["Big Gulp"]="",
-["Cold Water Fishing"]="",
-["Diggin' For Worms"]="",
-["Fish fer Squirky"]="",
-["Happy as a Clam Digger"]="",
-["Hitting a Walleye"]="",
-["Live Bait"]="",
-["One fer the Ages"]="",
-["Rock Lobster"]="",
-["Stocking Up"]="",
-["The Gnomish Bait-o-Matic"]="",
-["The Sister's Pendant"]="",
-["Thunder Falls"]="",
---Fishing Horde
-["A Furious Catch"]="",
-["A Golden Opportunity"]="",
-["A Staggering Effort"]="",
-["Clammy Hands"]="",
-["Craving Crayfish"]="",
-["Fish Head"]="",
-["Like Pike?"]="",
-["Moat Monster!"]="",
-["No Dumping Allowed"]="",
-["Pond Predators"]="",
-["Shiny Baubles"]="",
-["Tadpole Terror"]="",
-["The Race to Restock"]="",
-["The Ring's the Thing"]="",
-["Time for Slime"]="",
---Darkmoon Faire
 ["Fun for the Little Ones"] = {item=393, amount=15, currency=true},
-["He Shoots, He Scores!"]="",
-["It's Hammer Time"]="",
-["Target: Turtle"]="",
-["The Humanoid Cannonball"]="",
-["Tonk Commander"]="",
---Love is in the Air
-["A Cloudlet of Classy Cologne"]="",
-["A Gift for a Lord of Ironforge"]="",
-["A Gift for the Banshee Queen"]="",
-["A Gift for the High Chieftain"]="",
-["A Gift for the High Priestess of Elune"]="",
-["A Gift for the King of Stormwind"]="",
-["A Gift for the Prophet"]="",
-["A Gift for the Regent Lord of Quel'Thalas"]="",
-["A Gift for the Warchief"]="",
-["A Perfect Puff of Perfume"]="",
-["Bonbon Blitz"]="",
-["Crushing the Crown"]="",
-["You've Been Served"]="",
---Noblegarden
-["A Tisket, a Tasket, a Noblegarden Basket"]="",
-["Spring Collectors"]="",
-["Spring Gatherers"]="",
-["The Great Egg Hunt"]="",
---Midsummer Fire Festival
-["More Torch Catching"]="",
-["More Torch Tossing"]="",
-["Striking Back"]="",
-["Summon Ahune"]="",
-
---Stranglethorn Fishing Extravaganza
-['Apprentice Angler']="",
-['Master Angler']="",
-["Rare Fish - Brownell's Blue Striped Racer"]="",
-['Rare Fish - Dezian Queenfish']="",
-["Rare Fish - Keefer's Angelfish"]="",
---Kalu'ak Fishing Derby
-['Better Luck Next Time']="",
-["Kalu'ak Fishing Derby"]="",
+--MoP
+["Seeds of Fear"]={item="Dread Amber Shards", amount=20, currency=false},
 }
 end
\ No newline at end of file
diff --git a/loc/localization_FR.lua b/loc/localization_FR.lua
index 48b7804..c774687 100644
--- a/loc/localization_FR.lua
+++ b/loc/localization_FR.lua
@@ -114,420 +114,23 @@ privateTable.L.quests = {
 ["Plus de chapeluisants"]={item="Chapeluisant", amount=10, currency=false},
 ["Encore des sacs de spores"]={item="Sac de spores à maturité", amount=10, currency=false},
 ["Plus de vrilles !"]={item="Vrille de seigneur-tourbe", amount=6, currency=false},
-["Puisque nous sommes toujours entre amis..."]="",
--- Consortium
 -- Halaa
 ["La poudre de cristal d'Oshu'gun"]={item="Echantillon de poudre de cristal d'Oshu'gun", amount=10, currency=false},
--- Sunwell
-["À la découverte de vos racines"]="",
-["À la redécouverte de vos racines"]="",
-["Armez les protections !"]="",
-["Comportement erratique"]="",
-["Déstabilisation de la Côte de Verte-branchie"]="",
-["Détruire la porte"]="",
-["Diversion à la Malebrèche"]="",
-["Écraser la Lame de l'aube"]="",
-["Intercepter des cellules de mana"]="",
-["Intercepter les renforts"]="",
-["L’examen multiphase"]="",
-["La bataille doit continuer"]="",
-["La bataille pour l'Armurerie des Confins du soleil"]="",
-["Les armes d'Ata'mal"]="",
-["Les frappes aériennes doivent continuer"]="",
-["Les lignes telluriques et vous"]="",
-["Les plans d'attaque solfurie"]="",
-["Les protections du sanctum"]="",
-["Maintenir le portail du Puits de soleil"]="",
-["Ne vous arrêtez pas..."]="",
-["On est ouvert"]="",
-["On recherche : La chevalière du prince Kael'thas"]="",
-["On recherche : Les sœurs du tourment"]="",
-["Plus de conversions"]="",
-["Prendre l'avantage"]="",
-["Prendre le port"]="",
-["Préparatifs"]="",
-["Sang pour sang"]="",
-["Tenir l'ennemi à distance"]="",
-["Un don charitable"]="",
-["Votre soutien indéfectible"]="",
--- Ogri'la
-["Allez dompter d’autres raies de l’éther !"]="",
-["Bannissez plus de démons"]="",
-["Bombardez-les encore !"]="",
-["Les émanations des reliques"]="",
--- Netherdrake
-["Des peaux d'écorcheurs mine-néant"]="",
-["Du minerai de néanticite"]="",
-["Du pollen de pruinéante"]="",
-["Le botterang : un traitement pour les péons bons à rien"]="",
-["Le plus mortel des pièges"]="",
-["Les cieux pas si cléments..."]="",
-["Les cristaux de l'Aile-du-Néant"]="",
-["Les dragons sont les derniers de nos soucis"]="",
-["Perturber la porte du Crépuscule"]="",
-["Ramasser les morceaux..."]="",
-["Une mort lente"]="",
--- Fishing daily
-["Celui qui s'échappa"]="",
-['Filet de gangresang']="",
-['Les crevettes, c’est pas pour les mauviettes']="",
-['Les crocilisques sont lâchés']="",
-['Succomber à vos appâts']="",
--- Cooking daily
-['La vengeance est un plat...']="",
-['Manalicieux']="",
-['Un ragoût très épicé']="",
-["Une soupe pour l'âme"]="",

---[[ WOtLK]]--
--- Kalu'ak
-["Le chemin de son cœur..."]="",
-["Préparer l'avenir"]="",
-["Se préparer au pire"]="",
--- Oracul
-["Apaiser la pierre à Pluie toute-puissante"]="",
-["La maîtrise des cristaux"]="",
-["La volonté des titans"]="",
-["Le chant du Vent et de l'Eau"]="",
-["Le pouvoir des Tout-puissants"]="",
-["Un chant de fécondité"]="",
-["Un chant de purification"]="",
-["Un chant de réflexion"]="",
---Frenzyheart Tribe
-["De drôle d'outils de guerre"]="",
-["Des poulets et des varleus"]="",
-["La force du sang du cœur"]="",
-["La puissance de la tempête"]="",
-["La puissance secrète des Frénécœurs"]="",
-["Le massacre de Kartak"]="",
-["Rejek : le premier sang"]="",
-["Un couvre-chef de héros"]="",
---Knights of the Ebon Blade
-["Descendez-les tous !"]="",
-["Laisser notre marque"]="",
-["Réanimez leurs cadavres !"]="",
-["Trouver des informations"]="",
-["Vil aime feu !"]="",
-["Zone d'exclusion aérienne"]="",
---Tournament
-["Allez bûcher un peu..."]="",
-["Arrêter les agresseurs"]="",
-["Aux portes de l'ennemi"]="",
-["Ça mange quoi, un yéti, d'abord ?"]="",
-["Comment retomber sur ses pattes..."]="",
-["Entraînement sur le terrain"]="",
-["Entre champions..."]="",
-["Fil de l'hiver"]="",
-["Gormok veut ses frigbolds !"]="",
-["La bataille devant la citadelle"]="",
-["La grande mêlée"]="",
-["La menace vient d'en haut"]="",
-["La miséricorde de la Lumière"]="",
-["Le destin des défunts"]="",
-["Le drottinn Hrothgar"]="",
-["Le mandebrume Yngvar"]="",
-["Le nécrorateur Kharos"]="",
-["Le petit-déjeuner des champions"]="",
-["L'entraînement sur le terrain d'un vaillant"]="",
-["L'identification des restes"]="",
-["Oh bravo, Kul !!!"]="",
-["Ornolf le Balafré"]="",
-["Sachez tenir vos rênes"]="",
-["Secours en mer"]="",
-["Sur le territoire ennemi"]="",
-["Sus au kraken !"]="",
-["Un don pour la cause"]="",
-["Un fragment du bloc d'Ulduar"]="",
-["Une arme remarquable"]="",
-["Une lame digne d'un champion"]="",
 --Sons of Hodir
-['À la chasse aux espions']="",
-["Caler la dent creuse d'Arngrim"]="",
-['Chaud et froid']="",
-['Planter la lance de Hodir']="",
-['Polir le heaume']="",
-['Souffler dans le cor de Hodir']="",
 ['Un tribut à Hodir']={item="Relique d'Ulduar", amount=10, currency=false},
 ["N'oubliez pas le permagivre !"]={item="Morceau de permagivre", amount=1, currency=false},
---The Wyrmrest Accord
-['La chasse au drake']="",
-['La défense du temple du Repos du ver']="",
-['Un as dans notre jeu !']="",
---Valiance Expedition + Warsong Offensive
-['Assaut terrestre']="",
-['Attaque aérienne']="",
-['Escarmouches sur la rivière Noire']="",
-['Forcer le blocus']="",
-["Frappez-les tant qu'ils sont à terre"]="",
-['La vie ou la mort']="",
-['Le sang des Élus']="",
-['Pour quelques bouts de ferraille de plus...']="",
-['Récupérez plus de dépêches']="",
-['Réparation de déchiqueteurs']="",
-['Roi de la montagne']="",
-['Débordée !']="",
-["Déchiquetez l'Alliance"]="",
-['Le roi de la montagne']="",
-['Mettez-les sur les dents']="",
-['Procéder aux réparations']="",
-["Que l'Alliance reste aveugle"]="",
---Jewelcrafting
-['Terminer la livraison']="",
-['Livraison : Amulette en jade de sang']="",
-['Livraison : Bibelot du soleil changeant']="",
-['Livraison : Broche du soleil pernicieux']="",
-['Livraison : Figurine complexe en os']="",
-['Livraison : Figurine luminescente en ivoire']="",
-["Livraison : Relique de l'armure éclatante"]="",
-['Réparation du collier']="",
---Fishing
-['Dangereusement délicieux...']="",
-['Le joyau des égouts']="",
-['Le poisson-fantôme']="",
-["Le sang est plus épais que l'eau"]="",
-['Les bras lui en tombent']="",
---Cooking
-["Convention à l'Abracadabar"]="",
-['Du fromage pour Froncelor']="",
-['Hot-dogs à la moutarde !']="",
-['Le ragoût des égouts']="",
-['Pain de viande aux champignons infusés']="",
-['Une recette détrempée']="",

---[[ Cataclysm]]--
--- Firelands Invasion
-["Ailes de flamme"]="",
-["Au revoir, le zoziau"]="",
-["Au-delà des portes de l’enfer"]="",
-["Bénédiction de la nature"]="",
-["Besoin... d’eau... vite..."]="",
-["Braisegris"]="",
-["Ça sent le roussi"]="",
-["Certains l’aiment chaud"]="",
-["Dans des cieux de flammes"]="",
 ["Dans le feu"]={donotaccept=true},
-["Dans les profondeurs"]="",
-["Des échos de Némésis"]="",
-["Des éléments hostiles"]="",
-["Dès le plus jeune âge"]="",
-["Des oiseaux territoriaux"]="",
-["Destruction du noyau solaire"]="",
-["En plein cœur"]="",
-["Entre les arbres"]="",
-["Fleurs du feu"]="",
-["Gare aux gardiennes"]="",
-["Grands brûlés"]="",
-["La colère d’une mère"]="",
+
 ["La flèche Lugubre"]={donotaccept=true},
-["La puissance de Malorne"]="",
-["La reine des araignées de flammes"]="",
-["La saison de la plate"]="",
-["Le sanctuaire ne doit pas tomber"]="",
-["L'appel de la meute"]="",
-["L'appel du vol"]="",
-["Le retour des traîtres"]="",
-["Les attise-flammes du courant du Magma"]="",
-["Les chiens de guerre"]="",
-["Les chiens de Shannox"]="",
-["Les méthodes de Fandral"]="",
-["Les protecteurs d'Hyjal"]="",
-["Libérer la pression"]="",
-["Nounours-ball"]="",
-["Obsidium vivant"]="",
-["Œuf-assez"]="",
-["On se fait une toile ?"]="",
-["Panser les blessures"]="",
-["Pas si follet, ce feu"]="",
-["Perfectionner votre hurlement"]="",
-["Petit flagellant deviendra grand"]="",
-["Plus dure sera la chute"]="",
-["Plus ils sont gros..."]="",
-["Pris par surprise"]="",
-["Pyroarachnophobie"]="",
-["Rage contre les flammes"]="",
-["Ravitaillement pour l’autre rive"]="",
-["Soulager la douleur"]="",
-["Supporter la chaleur"]="",
-["Un oiseau rare"]="",
-["Une brèche dans les défenses"]="",
-["Une croissance agressive"]="",
-["Une pilule amère"]="",
-["Vague de chaleur"]="",
-["Voler des magmolias"]="",
+
 ["Appeler les Anciens"]={item=416, amount=125, currency=true},
 ["Des armes en rab"]={item=416, amount=125, currency=true},
 ["Remplir le puits de lune"]={item=416, amount=125, currency=true},
--- Tol Barad Peninsula
-["Attention aux échardes !"]="",
-["AVIS DE RECHERCHE : le contremaître Wellson"]="",
-["Boulet de canon !"]="",
-["C’est bon pour le moral"]="",
-["Émeute à la prison"]="",
-["Il faut finir le boulot"]="",
-["L’archimage emprisonné"]="",
-["La reprise du donjon"]="",
-["La reprise du surplomb"]="",
-["L'appât à crocos"]="",
-["Le bac à requins"]="",
-["Le bloc D"]="",
-["Le capitaine P. Harris"]="",
-["Le gardien"]="",
-["Le lieutenant Connor"]="",
-["Le nettoyage des profondeurs"]="",
-["Les aimants, ça marche comment ?"]="",
-["Les chaînes maudites"]="",
-["Les leçons du passé"]="",
-["Les Oubliés"]="",
-["Les vivres d’en-bas"]="",
-["Ne laissez rien derrière vous"]="",
-["Nettoyage par le vide"]="",
-["Qu’ils mordent le sable !"]="",
-["Quand ça ne mord pas... On se sert"]="",
-["SOS fantômes"]="",
-["Svarnos"]="",
-["Touché coulé !"]="",
-["Un boulot gluant"]="",
-["Un problème... de taille"]="",
-["Un seul fémur vous manque..."]="",
-["Un si charmant village..."]="",
-["Une bonne balade en bord de mer"]="",
-["Une petite décimation"]="",
-["Victoire à Tol Barad"]="",
--- Therazane
-["Furie fongique"]="",
-["Glop, fils de Glop"]="",
-["La peur de l’érosion"]="",
-["Les granules"]="",
-["L'impatience de la progéniture"]="",
-["Perdu dans les profondeurs"]="",
-["Persistance"]="",
-["Sous la surface"]="",
-["Tendre roche"]="",
-["Une économie souterraine"]="",
---Ramkahen
-["Chapardeurs"]="",
-["Le feu du ciel"]="",
---Wildhammer Clan
-["La route de la bière"]="",
-["Le retour du seigneur de guerre Halthar"]="",
-["Le secret des bièreserkers"]="",
-["Rien ne se perd, rien ne se jette..."]="",
-["Tenir les Gueules-de-dragon à distance"]="",
---Dragonmaw Clan
-["À coups de marteau"]="",
-["À mort le grand chaman"]="",
-["Cours de crochet"]="",
-["Encore une gueule à nourrir"]="",
-["Guerre totale"]="",
---Jewelcrafter
-["C'est la dernière mode !"]="",
-['Grignoteur ! Non !']="",
-['La gelée élémentaire']="",
-['Les ogrezones amoureuses']="",
-['Un présent pour Lila']="",
---Cooking Alliance
-['Des côtelettes pour les sentinelles']="",
-['Des galettes à la citrouille pour Penny']="",
-['En souvenir des ancêtres']="",
-['Il en pince pour les crabes...']="",
-['Il n’y aura jamais assez de pain épicé...']="",
-['La source de haggis']="",
-['Le cidre du roi']="",
-['Le secret pour un kimchi parfait']="",
-['Les orphelins aiment aussi les macarons !']="",
-['Multiplication des pains épicés']="",
-['Pénurie de volaille']="",
-['Retour aux fondamentaux']="",
-['Un festin de pêcheur']="",
-['Une petite faveur']="",
-['Une tournée pour les gardes']="",
--- Cooking Horde
-['Attention, ces fruits se défendent']="",
-['Avec un supplément de mouches en prime ?']="",
-['Bouillon de cafards']="",
-['Dans le cochon, tout est bon']="",
-['Des champignons « magiques »']="",
-['Des écrevisses à la créole']="",
-['Des envies de pignon']="",
-['Escargots à gogo']="",
-['La farine de maïs']="",
-['Le pain épicé de Mulgore']="",
-['Les portions parfaites']="",
-['Même les voleurs ont faim']="",
-['Tous les champi du monde']="",
-['Un bouquet de lys']="",
-['Voler les siens']="",
---Fishing Alliance
-['Du poisson pour Glapie']="",
-['Heureux comme une palourde dans l’eau']="",
-['L’appât-matic gnome']="",
-['La pêche en eau froide']="",
-['Le doré jaune']="",
-['Le pendentif de la sœur']="",
-['Les chutes du Tonnerre']="",
-['Les homards des rochers']="",
-['Pour la postérité']="",
-['Réapprovisionnement']="",
-['Un appât vivant']="",
-['Un en-cas fuyant']="",
-['Un plat traditionnel']="",
-['Un ver, ça va. Trois vers...']="",
-['Une grande goulée']="",
---Fishing Horde
-['À la pêche aux palourdes, lourdes, lourdes...']="",
-["Dépôt d'ordures interdit"]="",
-['Des efforts stupéfiants']="",
-['Empoissonner l’étang']="",
-['Ferrer le brochet']="",
-['J’ai envie d’écrevisses']="",
-['La pêche à la tête']="",
-['La terreur des têtards titanesques']="",
-['Le monstre des douves !']="",
-['Le seigneur de l’anneau']="",
-['Le temps des limons']="",
-['Les prédateurs de l’étang']="",
-['Une occasion en or']="",
-['Une prise furieuse']="",
-['Verroteries rutilantes']="",
 --Darkmoon Faire
 ["Les petits s'amusent aussi"] = {item=393, amount=15, currency=true},
-['Cible : tortue']="",
-['Commandant de chariotte']="",
-['Il est temps de cogner']="",
-['Il tire et... il marque !']="",
-['Le boulet de canon humanoïde']="",
---Love is in the Air
-['Bombardement de bonbons']="",
-['Détrôner la Royale']="",
-["Un cadeau pour la grande prêtresse d'Élune"]="",
-['Un cadeau pour la reine banshee']="",
-['Un cadeau pour le chef de guerre']="",
-['Un cadeau pour le grand chef']="",
-['Un cadeau pour le prophète']="",
-['Un cadeau pour le roi de Hurlevent']="",
-["Un cadeau pour le seigneur régent de Quel'Thalas"]="",
-['Un cadeau pour un seigneur de Forgefer']="",
-['Un nuage de Cologne classieuse']="",
-['Une parfaite petite pointe de parfum']="",
-['Vous êtes servi']="",
---Noblegarden
-['Collecteurs du printemps']="",
-['La grande chasse aux œufs']="",
-['Mettez tous vos œufs dans ce panier']="",
-['Récolteurs du printemps']="",
---Midsummer Fire Festival
-['Attraper plus de torches']="",
-['Contre-attaquer']="",
-['Lancer plus de torches']="",
-["L'invocation d'Ahune"]="",
---Stranglethorn Fishing Extravaganza
-['Apprenti pêcheur']="",
-['Maître pêcheur']="",
-["Poisson rare : le scalaire de Keefer"]="",
-['Poisson rare : le talang dezien']="",
-["Poisson rare : le tassergal à dos rayé"]="",
---Kalu'ak Fishing Derby
-['Plus de chance la prochaine fois']="",
-["Le tournoi de pêche kalu'ak"]="",
+--MoP
+["Les graines de la peur"]={item="Eclats d’ambre d’effroi", amount=20, currency=false},
 }
 end
\ No newline at end of file
diff --git a/loc/localization_RU.lua b/loc/localization_RU.lua
index 53726f1..804e49f 100644
--- a/loc/localization_RU.lua
+++ b/loc/localization_RU.lua
@@ -133,5 +133,7 @@ privateTable.L.quests = {
 ["Призыв Древних"]={item=416, amount=125, currency=true},
 ["Развлечения для самых маленьких"] = {item=393, amount=15, currency=true},

+--MoP
+["Семена Страха"]={item="Осколки жуткого янтаря", amount=20, currency=false},
 }
 end
\ No newline at end of file