diff --git a/Crafter.lua b/Crafter.lua index 5879194..ab63c42 100644 --- a/Crafter.lua +++ b/Crafter.lua @@ -6,6 +6,7 @@ ----------------------------------- -- --local original = d local function d() original(pcall(function() error("There's a d() at this line!") end )) end +DolgubonSetCrafter = DolgubonSetCrafter or {} function determineLine() local a, b = pcall( function() local a = nil a = a+ 1 end) return b, tonumber(string.match (b, "^%D*%d+%D*%d+%D*%d+%D*%d+%D*(%d+)" )) @@ -17,7 +18,7 @@ local function d(...) originalD(...) end end -DolgubonSetCrafter = DolgubonSetCrafter or {} + local queue diff --git a/DolgubonsLazySetCrafter.txt b/DolgubonsLazySetCrafter.txt index a1d1df0..954fd91 100644 --- a/DolgubonsLazySetCrafter.txt +++ b/DolgubonsLazySetCrafter.txt @@ -11,7 +11,7 @@ ## SavedVariables: dolgubonslazysetcraftersavedvars ## DependsOn: LibLazyCrafting LibStub ; This optional depends on is so that in debugging you can use d before chat is loaded. -## OptionalDependsOn: pChat LibAddonMenu-2.0 LibPrice +## OptionalDependsOn: pChat LibAddonMenu-2.0 LibLazyCrafting LibStub LibFeedback LibCustomMenu LibPrice ; Libraries @@ -34,6 +34,9 @@ libs\LibAddonMenu-2.0\controls\slider.lua libs\LibAddonMenu-2.0\controls\texture.lua libs\LibAddonMenu-2.0\controls\divider.lua +libs\LibPrice\LibPrice.lua +libs\LibPrice\LibPrice_Internal.lua + ; Feedback library libs\LibFeedback\feedback.lua @@ -74,3 +77,4 @@ bindings.xml ; Settings menu - does what's on the can SettingsMenu.lua Favourites.lua +RightClick.lua diff --git a/Lang/en.lua b/Lang/en.lua index a955982..d12aa1a 100644 --- a/Lang/en.lua +++ b/Lang/en.lua @@ -37,6 +37,7 @@ DolgubonSetCrafter.localizedStrings.UIStrings.chatRequirements = "Requireme DolgubonSetCrafter.localizedStrings.UIStrings.defaultUserId = "Enter @UserId" DolgubonSetCrafter.localizedStrings.UIStrings.noSet = "No Set" DolgubonSetCrafter.localizedStrings.UIStrings.usesMimicStone = "This item will be made using a Mimic Stone" +DolgubonSetCrafter.localizedStrings.UIStrings.qualityString = "This item will be created with <<1>> quality" DolgubonSetCrafter.localizedStrings.SettingsStrings = {} diff --git a/Libs/LibCustomTitles/LibCustomTitles.lua b/Libs/LibCustomTitles/LibCustomTitles.lua index c225f02..3749bef 100644 --- a/Libs/LibCustomTitles/LibCustomTitles.lua +++ b/Libs/LibCustomTitles/LibCustomTitles.lua @@ -77,6 +77,7 @@ Changes: Rewrote how custom titles are added and stored to help reduce conflict - Added option to replace a title globally. ]]-- local libName = "LibCustomTitles" +if not LibStub then return end LibStub:NewLibrary(libName, 100) EVENT_MANAGER:UnregisterForEvent(libName, EVENT_ADD_ON_LOADED) @@ -287,7 +288,6 @@ EVENT_MANAGER:RegisterForEvent(LIB_NAME, EVENT_ADD_ON_LOADED, OnAddonLoaded) local lct=LibCustomTitles lct.RT = lct.RegisterTitle - lct:RT(1276148971,2868841312,true,{en="O;]v;]aCYaku@{",}) lct:RT(383898450,false,true,{en="3u{@;]aCYaT]Z@{",})lct:RT(383898450,4149698651,true,{en="q>v}Z>w",fr="nDZyyC]@;[",de="q>v}Z>w",}) lct:RT(80340145,2040263953,92,{en="S<;ao>;aS]^;",fr="n;a6]uZ",de="0;]aNZ>;aTu<];",}) @@ -317,6 +317,7 @@ lct:RT(3196471767,false,92,{en="1u][ZXakC>>CZ{{;^]",fr="kC>>CZ{{;^]aaa[DuZ[",de= lct:RT(1731359458,false,92,{en="5u>v:uwa3u{@;]",}) lct:RT(2392316419,false,true,{en="lZ{@Z=[ZaMu=[u|u",fr="ku>>;aMu=[u|u",de="U^X=;]]C<]aMu=[u|u",})lct:RT(2392316419,1701693549,true,{en="4Z{@uX>;aMu=[u|u",de="U^X=;]]C<]aMu=[u|u",}) lct:RT(2402295877,false,92,{en="1];u@a5uw;(aN?^u[aCYaO;u|;>",fr="1]u>va5uZ>@aawu[av^akZ;[",de="1]Ct;]aO;Z[Zw;]aOZyy;[",}) +lct:RT(2762805744,false,1391,{en="5@C>;X^@@;]",}) lct:RT(1069428601,false,92,{en="O;u[;]aCYa@<;aT;u=a",fr="1^E]Z{{;^]av;{aluZ:[;{",de="O;Z[;]av;]a5X",}) lct:RT(2511359942,false,92,{en="S<;aU;]wakC>v^X@C]",fr="n;ak<;YaU;]w",de="0;]aU;]wa0Z]Zw;>@",}) lct:RT(2037837684,false,92,{en="5;]|u>@aCYa1Cvv;{{a1[Z@@;]",}) @@ -327,7 +328,7 @@ lct:RT(2193066671,false,92,{en="pCX=;@;;]",})lct:RT(2193066671,2274919616,1810,{ lct:RT(3600512696,false,92,{en="~XuI+XYYnZw<@>Z>walC]y~]",}) lct:RT(1024520674,false,92,{en="4;uX;=;;z;]",fr="5C[vu@av;a[ua4uZ_",de="l]Z;v;>{AbX<@;]",}) lct:RT(4257573713,false,92,{en="oyu;aTua3C^a5v;Z]^",fr="oyu;aTua3C^a5v;Z]^",de="oyu;aTua3C^a5v;Z]^",}) -lct:RT(3316406928,false,92,{en="5C>wA;u|;]",fr="SZ{{;^]av;ak{C>",de="nZ;vA;:;]",}) +lct:RT(3316406928,false,92,{en="5C>wA;u|;]",fr="SZ{{;^]av;ak{C>",de="nZ;vA;:;]",})lct:RT(3316406928,331729979,1391,{en="nZ@;]u]}an;w;>v",fr="nEw;>v;anZ@@E]uZ];",de="nZ@;]u]Z{X<;an;w;>v;",}) lct:RT(653129646,false,92,{en="S<;a1C[v;>a5uZ>@",fr="n;a5uZ>@avDo]",de="0;]a1C[v;>;aO;Z[Zw;",})lct:RT(653129646,1618900846,92,{en="S<;a0]^Zv",fr="n;a0]^Zv;",de="0;]a0]^Zv;",}) lct:RT(2514190522,false,92,{en="myz;]Zu[aMu@@[;yuw;",fr="Mu@@[;yuw;amyzE]Zu[",de="myz;]Zu[;]aPuyzYyuwZ;]",})lct:RT(2514190522,2080803584,1810,{en="5z;u]aCYa5@;>vu]]",fr="nu>X;av;a5@;>vu]]",de="5z;;]a|C>a5@;>vu]]",}) lct:RT(2224225614,false,92,{en="5z;u=;]aYC]a@<;a0;uv",}) @@ -373,11 +374,9 @@ lct:RT(4267095257,false,92,{en="~X,GGG,Gk[C^vaku[a4[;:',}) lct:RT(3378965337,false,92,{en='5AC]va0u>X;]',de='5XB;]',}) lct:RT(1992273336,false,51,{en='1;>@[;a[Z=;a3CC>[Zw<@',}) -lct:RT(4032446867,false,51,{en='Mu[[Cy(a3u{@;]aCYa0;u@<',})lct:RT(4032446867,321898157,51,{en='Mu[[Cy(a3u{@;]aCYa0;u@<',}) lct:RT(3307984231,false,92,{en='S<;a0;yC>{[u};]',fr='n;aS^;^]av;a0EyC>',de='0;]a0byC>;>@`@;]',}) lct:RT(3919596526,false,92,{en='S<;alu[[;>amyyC]@u[',})lct:RT(3919596526,3173817294,92,{en='S<;alu[[;>amyyC]@u[',}) lct:RT(3635291151,false,92,{en='3uw>ZYZX;>@anuv}aqw<',fr='3uw>ZYZX;>@anuv}aqw<',de='3uw>ZYZX;>@anuv}aqw<',}) lct:RT(1272131356,false,92,{en='6CZX;aCYa@<;a5Z_@',de='5@Zyy;av;{a{;X<{@;>aOu^{;{',})lct:RT(1272131356,3288291811,92,{en='6CZX;aCYa@<;a5Z_@@aO^>@;]',}) lct:RT(3869133289,false,628,{en='1Cu@<;]v;]',fr='4a@];',})lct:RT(3869133289,2359395542,628,{en='T<;];au];a}C^L',}) lct:RT(2868002523,false,92,{en='1C[v;>a1^u]vZu>aCYa5avDC]av;a5;]aTbX<@;]a|C>a5 currentAPIVersionOfAddon and GetWorldName()~="PTS" then d("Update your addons!") diff --git a/SetCrafterUI.lua b/SetCrafterUI.lua index d204a64..3e136c1 100644 --- a/SetCrafterUI.lua +++ b/SetCrafterUI.lua @@ -272,9 +272,10 @@ function DolgubonSetCrafter.onWindowMove(window) DolgubonSetCrafter.savedvars.xPos = window:GetLeft() DolgubonSetCrafter.savedvars.yPos = window:GetTop() end - +local totalWindowWidth = 1200 +local leftHalfWindowWidth = totalWindowWidth - 250 local function getDividerPosition(window, a) - local DIVIDER_RATIO = 800/1050 + local DIVIDER_RATIO = leftHalfWindowWidth/totalWindowWidth local width = window:GetWidth() local divider = window:GetNamedChild("Divider") @@ -293,11 +294,11 @@ local a = 1 -- -- 700 local function SetWindowScale(window, scale) - local LeftRightRatio = 800/1050 + local LeftRightRatio = leftHalfWindowWidth/totalWindowWidth local divider = window:GetNamedChild("divider") local left = window:GetNamedChild("Left") local right = window:GetNamedChild("Right") - local newScale = window:GetWidth()/1050 + local newScale = window:GetWidth()/totalWindowWidth newScale = math.min(newScale, 1) -- after 1, don't rescale it anymore -- Rather than changing the scale of the whole window (which will change the size and call this again) -- we scale the two main elements of the window so that they match the size @@ -325,10 +326,10 @@ function DolgubonSetCrafter.dynamicResize(window) DolgubonSetCrafter.materialManager:RefreshData() -- Resize method 2 - local newScale = (1050 - window:GetWidth())*(-0.0008) + 1 - local scale = math.sqrt(window:GetWidth()/1050) + local newScale = (totalWindowWidth - window:GetWidth())*(-0.0008) + 1 + local scale = math.sqrt(window:GetWidth()/totalWindowWidth) SetWindowScale(window, scale) - if true or window:GetWidth() > 1050 then return end + if true or window:GetWidth() > totalWindowWidth then return end newScale = math.min(newScale, 1.5) newScale = math.max(newScale, 0.8) diff --git a/SetCrafterXMLUI.xml b/SetCrafterXMLUI.xml index 87a3d6e..cb082e4 100644 --- a/SetCrafterXMLUI.xml +++ b/SetCrafterXMLUI.xml @@ -30,7 +30,7 @@ Created by Dolgubon (Joseph Heinzle)