Mercurial > wow > reagentmaker

changeset 11:2716889648bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Display the number of crafted items and percent chance for milling
author contrebasse
date Sat, 02 Apr 2011 23:37:19 +0200
parents b6a5902f376f
children 2273a56762cb
files SecureMenu.lua data.lua
diffstat 2 files changed, 130 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/SecureMenu.lua	Sat Apr 02 22:42:53 2011 +0200
+++ b/SecureMenu.lua	Sat Apr 02 23:37:19 2011 +0200
@@ -136,9 +136,10 @@
 	btn.countDetail = countDetail
 
 	local resultNumber = btn:CreateFontString(nil,"ARTWORK","NumberFontNormal")
-	resultNumber:SetPoint("TOPLEFT",icon,"TOPLEFT",1,-1)
+	resultNumber:SetPoint("TOPLEFT",icon,"TOPLEFT",1,-3)
 	resultNumber:SetJustifyH("LEFT")
 	resultNumber:SetJustifyV("TOP")
+	resultNumber:SetFont("Fonts\\ARIALN.TTF", 12, "OUTLINE")
 	btn.resultNumber = resultNumber
 
 	btn:HookScript("OnEnter", btnEntered)
@@ -215,6 +216,8 @@
 	if reagent[3] then
 		if reagent[3]<1 then
 			btn.resultNumber:SetText((reagent[3]*100).."%")
+		elseif reagent[4] and reagent[3]~=reagent[4] then
+			btn.resultNumber:SetText(math.min(reagent[3],reagent[4]).."-"..math.max(reagent[3],reagent[4]))
 		elseif reagent[3]>1 then
 			btn.resultNumber:SetText(reagent[3])
 		end
--- a/data.lua	Sat Apr 02 22:42:53 2011 +0200
+++ b/data.lua	Sat Apr 02 23:37:19 2011 +0200
@@ -6,84 +6,158 @@
 macroProspect = "/cast "..GetSpellInfo(ProspectID).."\n/use "
 A.data = {
 	-- Mill
+	-- Normal pigments
 	[39151] = { -- Alabaster Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{2447,5}, -- Peacebloom
-		{765,5},  -- Silverleaf
-		{2449,5}}, -- Earthroot
+		{2447,5,2,3}, -- Peacebloom
+		{ 765,5,2,3},  -- Silverleaf
+		{2449,5,2,4}}, -- Earthroot
 	[39224] = { -- Dusky Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{785,5},  -- Mageroyal
-		{2450,5}, -- Briarthorn
-		{2452,5}, -- Swiftthistle
-		{2453,5}, -- Bruiseweed
-		{3820,5}}, -- Stranglekelp
+		{ 785,5,2,3}, -- Mageroyal
+		{2450,5,2,3}, -- Briarthorn
+		{2452,5,2,3}, -- Swiftthistle
+		{2453,5,2,4}, -- Bruiseweed
+		{3820,5,2,4}}, -- Stranglekelp
 	[39338] = { -- Golden Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{3369,5}, -- Grave Moss
-		{3355,5}, -- Wild Steelbloom
-		{3356,5}, -- Kingsblood
-		{3357,5}}, -- Liferoot
+		{3369,5,2,3}, -- Grave Moss
+		{3355,5,2,3}, -- Wild Steelbloom
+		{3356,5,2,4}, -- Kingsblood
+		{3357,5,2,4}}, -- Liferoot
 	[39339] = { -- Emerald Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{3818,5}, -- Fadeleaf
-		{3821,5}, -- Goldthorn
-		{3358,5}, -- Khadgar's Whisker
-		{3819,5}}, -- Dragon's Teeth
+		{3818,5,2,3}, -- Fadeleaf
+		{3821,5,2,3}, -- Goldthorn
+		{3358,5,3,4}, -- Khadgar's Whisker
+		{3819,5,3,4}}, -- Dragon's Teeth
 	[39340] = { -- Violet Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{4625,5}, -- Firebloom
-		{8831,5}, -- Purple Lotus
-		{8836,5}, -- Arthas' Tears
-		{8838,5}, -- Sungrass
-		{8839,5}, -- Blindweed
-		{8845,5}, -- Ghost Mushroom
-		{8846,5}}, -- Gromsblood
+		{4625,5,2,3}, -- Firebloom
+		{8831,5,2,3}, -- Purple Lotus
+		{8836,5,2,3}, -- Arthas' Tears
+		{8838,5,2,3}, -- Sungrass
+		{8839,5,2,4}, -- Blindweed
+		{8845,5,2,4}, -- Ghost Mushroom
+		{8846,5,2,4}}, -- Gromsblood
 	[39341] = { -- Silvery Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{13464,5}, -- Golden Sansam
-		{13463,5}, -- Dreamfoil
-		{13465,5}, -- Mountain Silversage
-		{13466,5}, -- Sorrowmoss
-		{13467,5}}, -- Icecap
+		{13464,5,2,3}, -- Golden Sansam
+		{13463,5,2,3}, -- Dreamfoil
+		{13465,5,2,4}, -- Mountain Silversage
+		{13466,5,2,4}, -- Sorrowmoss
+		{13467,5,2,4}}, -- Icecap
 	[39342] = { -- Nether Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{22786,5}, -- Dreaming Glory
-		{22785,5}, -- Felweed
-		{22789,5}, -- Terocone
-		{22787,5}, -- Ragveil
-		{22790,5}, -- Ancient Lichen
-		{22793,5}, -- Mana Thistle
-		{22791,5}, -- Netherbloom
-		{22792,5}}, -- Nightmare Vine
+		{22786,5,2,3}, -- Dreaming Glory
+		{22785,5,2,3}, -- Felweed
+		{22789,5,2,3}, -- Terocone
+		{22787,5,2,3}, -- Ragveil
+		{22790,5,2,4}, -- Ancient Lichen
+		{22793,5,2,4}, -- Mana Thistle
+		{22791,5,2,4}, -- Netherbloom
+		{22792,5,2,4}}, -- Nightmare Vine
 	[39343] = { -- Azure Pigment
 		spellID = MillID,
 		spell = macroMill,
-		{37921,5}, -- Deadnettle
-		{36901,5}, -- Goldclover
-		{36907,5}, -- Talandra's Rose
-		{36904,5}, -- Tiger Lily
-		{39970,5}, -- Fire Leaf
-		{39969,5}, -- Fire Seed
-		{36903,5}, -- Fire Seed
-		{36906,5}, -- Icethorn
-		{36905,5}}, -- Icethorn
+		{37921,5,2,3}, -- Deadnettle
+		{36901,5,2,3}, -- Goldclover
+		{36907,5,2,3}, -- Talandra's Rose
+		{36904,5,2,3}, -- Tiger Lily
+		{39970,5,2,3}, -- Fire Leaf
+		{39969,5,2.5,3}, -- Fire Seed (2:33%/3:67%)
+		{36903,5,2,4}, -- Adder's Tongue
+		{36906,5,2,4}, -- Icethorn
+		{36905,5,2,4}}, -- Lichbloom
 	[61979] = { -- Ashen Pigment
 		spell = macroMill,
 		spellID = MillID,
-		{52983,5}, -- Cinderbloom
-		{52985,5}, -- Azshara's Veil
-		{52984,5}, -- Stormvine
-		{52986,5}, -- Heartblossom
-		{52988,5}, -- Whiptail
-		{52987,5}}, -- Twilight Jasmine
+		{52983,5,2,3}, -- Cinderbloom
+		{52985,5,2,3}, -- Azshara's Veil
+		{52984,5,2,3}, -- Stormvine
+		{52986,5,2,3}, -- Heartblossom
+		{52988,5,2,4}, -- Whiptail
+		{52987,5,2,4}}, -- Twilight Jasmine
+	-- Rare pigments
+	[43103] = { -- Verdant Pigment
+		spell = macroMill,
+		spellID = MillID,
+		{785,5,0.25},  -- Mageroyal
+		{2450,5,0.25}, -- Briarthorn
+		{2452,5,0.25}, -- Swiftthistle
+		{2453,5,0.5}, -- Bruiseweed
+		{3820,5,0.5}}, -- Stranglekelp
+	[43104] = { -- Burnt Pigment
+		spell = macroMill,
+		spellID = MillID,
+		{3369,5,0.25}, -- Grave Moss
+		{3355,5,0.25}, -- Wild Steelbloom
+		{3356,5,0.5}, -- Kingsblood
+		{3357,5,0.5}}, -- Liferoot
+	[43105] = { -- Indigo Pigment
+		spell = macroMill,
+		spellID = MillID,
+		{3818,5,0.25}, -- Fadeleaf
+		{3821,5,0.25}, -- Goldthorn
+		{3358,5,0.5}, -- Khadgar's Whisker
+		{3819,5,0.5}}, -- Dragon's Teeth
+	[43106] = { -- Ruby Pigment
+		spell = macroMill,
+		spellID = MillID,
+		{4625,5,0.25}, -- Firebloom
+		{8831,5,0.25}, -- Purple Lotus
+		{8836,5,0.25}, -- Arthas' Tears
+		{8838,5,0.25}, -- Sungrass
+		{8839,5,0.5}, -- Blindweed
+		{8845,5,0.5}, -- Ghost Mushroom
+		{8846,5,0.5}}, -- Gromsblood
+	[43107] = { -- Sapphire Pigment
+		spell = macroMill,
+		spellID = MillID,
+		{13464,5,0.25}, -- Golden Sansam
+		{13463,5,0.25}, -- Dreamfoil
+		{13465,5,0.5}, -- Mountain Silversage
+		{13466,5,0.5}, -- Sorrowmoss
+		{13467,5,0.5}}, -- Icecap
+	[43108] = { -- Ebon Pigment
+		spell = macroMill,
+		spellID = MillID,
+		{22786,5,0.25}, -- Dreaming Glory
+		{22785,5,0.25}, -- Felweed
+		{22789,5,0.25}, -- Terocone
+		{22787,5,0.25}, -- Ragveil
+		{22790,5,0.5}, -- Ancient Lichen
+		{22793,5,0.5}, -- Mana Thistle
+		{22791,5,0.5}, -- Netherbloom
+		{22792,5,0.5}}, -- Nightmare Vine
+	[43109] = { -- Icy Pigment
+		spellID = MillID,
+		spell = macroMill,
+		{37921,5,0.25}, -- Deadnettle
+		{36901,5,0.25}, -- Goldclover
+		{36907,5,0.25}, -- Talandra's Rose
+		{36904,5,0.25}, -- Tiger Lily
+		{39970,5,0.25}, -- Fire Leaf
+		{39969,5,0.25}, -- Fire Seed
+		{36903,5,0.5}, -- Adder's Tongue
+		{36906,5,0.5}, -- Icethorn
+		{36905,5,0.5}}, -- Lichbloom
+	[61980] = { -- Burning Embers
+		spell = macroMill,
+		spellID = MillID,
+		{52983,5,0.25}, -- Cinderbloom
+		{52985,5,0.25}, -- Azshara's Veil
+		{52984,5,0.25}, -- Stormvine
+		{52986,5,0.25}, -- Heartblossom
+		{52988,5,0.5}, -- Whiptail
+		{52987,5,0.5}}, -- Twilight Jasmine
 
 	-- Prospect
 	[774] = { -- Malachite
@@ -97,7 +171,7 @@
 	[1210] = { -- Shadowgem
 		spell = macroProspect,
 		spellID = ProspectID,
-		{2771,50,38}, -- Tin Ore
+		{2771,50,0.38}, -- Tin Ore
 		{2770,5,0.1}}, -- Copper Ore
 	[1705] = { -- Lesser Moonstone
 		spell = macroProspect,
@@ -161,15 +235,6 @@
 
 	-- To add : enchants, elementals, prospecting
 }
-A.data[43103] = A.data[39224] -- Verdant Pigment
-A.data[43104] = A.data[39338] -- Burnt Pigment
-A.data[43105] = A.data[39339] -- Indigo Pigment
-A.data[43106] = A.data[39340] -- Ruby Pigment
-A.data[43107] = A.data[39341] -- Sapphire Pigment
-A.data[43108] = A.data[39342] -- Ebon Pigment
-A.data[43109] = A.data[39343] -- Icy Pigment
-A.data[61980] = A.data[61979] -- Burning Embers
-
 
 -- @todo improve scanning
 -- @todo rescan when a new refipe appears (TRADESKILL_UPDATE ?)