Quantcast

fixed twist faters, fixed paperroll sound

Alex Shubert [03-21-15 - 18:17]
fixed twist faters, fixed paperroll sound
Filename
AutoTurnIn.lua
AutoTurnIn.toc
IgnoredNPC.lua
diff --git a/AutoTurnIn.lua b/AutoTurnIn.lua
index 8c76ea5..345b20d 100644
--- a/AutoTurnIn.lua
+++ b/AutoTurnIn.lua
@@ -7,6 +7,7 @@ local _G = _G 	--Rumors say that global _G is called by lookup in a super-global
 local _ 		--Sometimes blizzard exposes "_" variable as a global.
 local addonName, ptable = ...
 local L = ptable.L
+local IGNORED_NPC = ptable.IGNORED_NPC
 local C = ptable.CONST
 local TOCVersion = GetAddOnMetadata(addonName, "Version")
 local Q_ALL, Q_DAILY, Q_EXCEPTDAILY = 1, 2, 3
@@ -197,7 +198,8 @@ function AutoTurnIn:AllowedToHandle(forcecheck)
 		-- it's a simple xor implementation (a ~= b)
 		self.allowed = (not not AutoTurnInCharacterDB.enabled) ~= (IsModifiedClick)
 	end
-	return self.allowed
+
+	return self.allowed and (not IGNORED_NPC[GetNPCGUID()]) and (not QuestGetAutoAccept())
 end

 -- Old 'Quest NPC' interaction system. See http://wowprogramming.com/docs/events/QUEST_GREETING
diff --git a/AutoTurnIn.toc b/AutoTurnIn.toc
index fd0d6f8..85ebe6f 100644
--- a/AutoTurnIn.toc
+++ b/AutoTurnIn.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: AutoTurnIn
 ## Version: 4.5.N
 ## Author: Alexandr Shubert
@@ -22,6 +22,7 @@ loc\localization_FR.lua
 loc\localization_IT.lua

 rewards_const.lua
+IgnoredNPC.lua
 AutoTurnIn.lua
 QuestLevel.lua

diff --git a/IgnoredNPC.lua b/IgnoredNPC.lua
new file mode 100644
index 0000000..94957c6
--- /dev/null
+++ b/IgnoredNPC.lua
@@ -0,0 +1,6 @@
+local addonName, privateTable = ...
+
+privateTable.IGNORED_NPC = {
+	["87391"] = "fate-twister-seress",
+	["88570"] = "Fate-Twister Tiklal"
+}
\ No newline at end of file