Merge pull request #13 from cdmichaelb/cdmichaelb-patch-7

Trinket Queue and Druid fixes

CHANGES.txt

@@ -1,36 +1,22 @@
-lightweight tag 7badfac62131358ba5e99c4c03505b6093f1291a 1.2.0
+lightweight tag b6b6e5a314c6cb56c537fe6b7fadad6236137884 1.2.3
 Author:	GitHub <[email protected]>
-Date:	Sun Jan 12 13:47:58 2020 -0800
+Date:	Tue May 5 22:58:15 2020 -0700
 
-commit 0932fd1eccc139918b59762255ecdc95650341e2
-Author: cdmichaelb <broetjem@gmail.com>
-Date:   Sun Jan 12 13:46:31 2020 -0800
+commit 989ce65d3276c2b0eac3819f7b9988c651de9ce7
+Author: Llamatron2112 <[email protected].com>
+Date:   Wed May 6 05:33:07 2020 +0200
 
-    1.2.0
+    parsing french tooltips for duration fix
 
-    Fixed outfit generation for resistances, melee hit, spell hit
-    Fix a few bugs reported on curseforge
-    Changed versioning to make more sense.
+    I haven't tested cUseTooltipLineFormat and cUseDurationTooltipLineFormat2, but there should be spaces around the colon (and it's the case of several items I have which match cUseDurationTooltipLineFormat).
+    Also for cUseDurationTooltipLineFormat, french for "seconds" is "secondes", but I have only seen the short "sec." on my items.
 
-commit 0932fd1eccc139918b59762255ecdc95650341e2
-Author: cdmichaelb <broetjem@gmail.com>
-Date:   Sun Jan 12 13:46:31 2020 -0800
+commit 989ce65d3276c2b0eac3819f7b9988c651de9ce7
+Author: Llamatron2112 <[email protected].com>
+Date:   Wed May 6 05:33:07 2020 +0200
 
-    1.2.0
+    parsing french tooltips for duration fix
 
-    Fixed outfit generation for resistances, melee hit, spell hit
-    Fix a few bugs reported on curseforge
-    Changed versioning to make more sense.
-
-commit 7608b4fecb7c6214a214db42d429a1b5b53faee1
-Author: Stefan <>
-Date:   Sat Jan 11 20:56:10 2020 +0100
-
-    OutfitterButton and Frame position fix
-
-commit 7608b4fecb7c6214a214db42d429a1b5b53faee1
-Author: Stefan <>
-Date:   Sat Jan 11 20:56:10 2020 +0100
-
-    OutfitterButton and Frame position fix
+    I haven't tested cUseTooltipLineFormat and cUseDurationTooltipLineFormat2, but there should be spaces around the colon (and it's the case of several items I have which match cUseDurationTooltipLineFormat).
+    Also for cUseDurationTooltipLineFormat, french for "seconds" is "secondes", but I have only seen the short "sec." on my items.
 

Outfitter.lua

@@ -1158,7 +1158,7 @@ Outfitter.cPanelFrames =
 
 Outfitter.cShapeshiftIDInfo = {
 	-- Druid
-	[5487] = {ID = "Bear", MaybeInCombat = true},
+	[9634] = {ID = "Bear", MaybeInCombat = true},
 	[768] = {ID = "Cat"},
 	[783] = {ID = "Travel"},
 	[24858] = {ID = "Moonkin"},
@@ -6336,7 +6336,7 @@ end
 
 function Outfitter:DepositOutfit(pOutfit, pUniqueItemsOnly)
 	local vUnequipOutfit, vInventoryCache = self:GetDepositList(pOutfit, pUniqueItemsOnly)
-	
+
 	-- Build the change list
 
 	vInventoryCache:ResetIgnoreItemFlags()
@@ -6365,7 +6365,7 @@ function Outfitter:DepositOutfit(pOutfit, pUniqueItemsOnly)
 	local vEmptyBankSlots = self:GetEmptyBankSlotList()
 
 	-- Execute the changes
-	vEquipmentChangeList:execute(vEmptyBankSlots, vExpectedInventoryCache)
+	vEquipmentChangeList:execute(vEmptyBankSlots, vInventoryCache)
 
 	self:DispatchOutfitEvent("EDIT_OUTFIT", pOutfit:GetName(), pOutfit)
 end

OutfitterEquipment.lua

@@ -464,6 +464,7 @@ function Outfitter._EquipmentChanges:optimize()
 end
 
 function Outfitter._EquipmentChanges:execute(emptyBagSlots, expectedInventoryCache)
+	--print(expectedInventoryCache)
 	-- Disable sound effects during the swap
 	local savedEnabledSFXValue
 	if not Outfitter.Settings.EnableEquipSounds then
@@ -887,7 +888,7 @@ function Outfitter:UpdateEquippedItems()
 	vEquipmentChangeList:addChangesToEquipOutfit(vCompiledOutfit, vInventoryCache)
 
 	if vEquipmentChangeList then
-		-- local vExpectedInventoryCache = self:New(self._InventoryCache)
+		 local vExpectedInventoryCache = self:New(self._InventoryCache)
 
 		if self.Debug.EquipmentChanges then
 			self:DebugMessage("UpdateEquippedItems: Executing change list")

OutfitterScripting.lua

@@ -578,6 +578,7 @@ end
 -- $EVENTS TIMER
 -- $DESC The highest trinket in the list that isn't on cooldown will automatically be equipped for you
 
+-- $SETTING Buffcheck={label="Not if Buff", type="stringtable"}
 -- $SETTING Trinkets={label="Upper slot", type="stringtable"}
 -- $SETTING Trinkets2={label="Lower slot", type="stringtable"}
 
@@ -591,6 +592,18 @@ if not isEquipped then
    return
 end
 
+if setting.Buffcheck and #setting.Buffcheck > 0 then
+    local i = 1
+    local buff = UnitBuff("player", i)
+    while buff do
+        for j=0,#setting.Buffcheck,1 do
+            if buff == setting.Buffcheck[j] then return end
+        end;
+        i = i + 1
+        buff = UnitBuff("player", i)
+    end
+end
+
 local itemInfo0, itemInfo1
 
 if setting.Trinkets and #setting.Trinkets > 0 then