From edfa310800b2da56fb7d8980e3af7d1ceb9062a9 Mon Sep 17 00:00:00 2001 From: Munglunch Date: Tue, 14 Oct 2014 11:15:07 -0500 Subject: [PATCH] 5.0.1 --- Interface/AddOns/SVUI/scripts/ego.lua | 102 ++++---------------- Interface/BUTTONS/UI-SILVER-BUTTON-DOWN.blp | Bin 0 -> 6676 bytes Interface/BUTTONS/UI-SILVER-BUTTON-UP.blp | Bin 0 -> 6676 bytes Interface/BUTTONS/UI-SilverButtonLG-Left-Down.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Left-Hi.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Left-Up.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Mid-Down.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Mid-Hi.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Mid-Up.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Right-Down.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Right-Hi.blp | Bin 0 -> 3940 bytes Interface/BUTTONS/UI-SilverButtonLG-Right-Up.blp | Bin 0 -> 3940 bytes 12 files changed, 17 insertions(+), 85 deletions(-) create mode 100644 Interface/BUTTONS/UI-SILVER-BUTTON-DOWN.blp create mode 100644 Interface/BUTTONS/UI-SILVER-BUTTON-UP.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Left-Down.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Left-Hi.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Left-Up.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Mid-Down.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Mid-Hi.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Mid-Up.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Right-Down.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Right-Hi.blp create mode 100644 Interface/BUTTONS/UI-SilverButtonLG-Right-Up.blp diff --git a/Interface/AddOns/SVUI/scripts/ego.lua b/Interface/AddOns/SVUI/scripts/ego.lua index ea57280..4cebace 100644 --- a/Interface/AddOns/SVUI/scripts/ego.lua +++ b/Interface/AddOns/SVUI/scripts/ego.lua @@ -33,73 +33,27 @@ local L = SV.L local Sequences = { {65, 1000}, --shrug - {68, 1000}, --cheer {70, 1000}, --laugh {74, 1000}, --roar - {77, 1000}, --cry - {84, 1000}, --point {82, 1000}, --flex }; -local EgoFrame = CreateFrame("Frame", "SVUI_EgoFrame", UIParent); - local function rng() return random(1, #Sequences) end -local EgoPop_OnUpdate = function(self) - self.parent:SetAlpha(0) - self:SetScript("OnFinished", nil) -end - -local LaunchAnimation = function(self, key) +local GoGoGadget = function(self, key) key = key or rng() local emote = Sequences[key][1] self:SetAlpha(1) - self.Model:SetAnimation(emote) - self.Pane.anim[1]:SetOffset(25, -25) - self.Pane.anim[2]:SetOffset(-50, 50) - self.Pane.anim[4]:SetOffset(25, -25) - self.Pane.anim[4]:SetScript("OnFinished", EgoPop_OnUpdate) - self.Pane.anim:Play() -end - -local LaunchFreezeFrame = function(self) - self:SetAlpha(1) - self.Model:SetAnimation(70) - self.Model2:SetAnimation(70) -end - -local ResetPosition = function(self) - local size = SVUIParent:GetHeight() - self:SetPoint("TOP", SV.UIParent, "TOP", 0, 0) - self:SetWidth(size) - self:SetHeight(size) - self.Model:SetUnit("player") -end - -local Ego_OnEvent = function(self, event) - if event == "ACHIEVEMENT_EARNED" then - self:LaunchAnimation(4) - else - self:LaunchAnimation(6) - end -end - -function SV:ToggleEgo() - if not SV.db.general.ego then - EgoFrame:UnregisterEvent("ACHIEVEMENT_EARNED") - EgoFrame:UnregisterEvent("SCREENSHOT_SUCCEEDED") - EgoFrame:SetScript("OnEvent", nil) - else - EgoFrame:RegisterEvent("ACHIEVEMENT_EARNED") - EgoFrame:RegisterEvent("SCREENSHOT_SUCCEEDED") - EgoFrame:SetScript("OnEvent", Ego_OnEvent) - end + self.Model1:SetAnimation(emote) + self.Model2:SetAnimation(emote) end local function LoadSVEgo() local GameMenuFrame = _G.GameMenuFrame + + local EgoFrame = CreateFrame("Frame", "SVUI_EgoFrame", UIParent); EgoFrame:SetParent(GameMenuFrame) EgoFrame:SetFrameLevel(0) EgoFrame:SetAllPoints(SV.UIParent) @@ -116,28 +70,14 @@ local function LoadSVEgo() EgoFrame.BG2:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) EgoFrame.BG2:SetVertexColor(0, 0, 0, 0.8) - EgoFrame.Pane = CreateFrame("Frame", nil, EgoFrame); - EgoFrame.Pane:SetPoint("LEFT", EgoFrame, "LEFT", 100, 0) - EgoFrame.Pane:SetWidth(512) - EgoFrame.Pane:SetHeight(512) - - SV.Animate:Slide(EgoFrame.Pane, 100, 0, true, 0.1) - - EgoFrame.Pane.image = EgoFrame.Pane:CreateTexture(nil, "BORDER", nil, -1) - EgoFrame.Pane.image:SetAllPoints(EgoFrame.Pane) - EgoFrame.Pane.image:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Panes\COMIC-PANE1]]) - - EgoFrame.Pane:Hide() - - EgoFrame.Model = CreateFrame("PlayerModel", "SVUI_EgoModel1", EgoFrame); - EgoFrame.Model:SetUnit("player") - EgoFrame.Model:SetRotation(1) - EgoFrame.Model:SetPortraitZoom(0.3) - EgoFrame.Model:SetPosition(0,0,-0.25) - EgoFrame.Model:SetFrameStrata("BACKGROUND") - local w, h = EgoFrame:GetSize() - EgoFrame.Model:SetSize(w, h - 280) - EgoFrame.Model:SetPoint("LEFT", EgoFrame, "LEFT", -250, 0) + EgoFrame.Model1 = CreateFrame("PlayerModel", "SVUI_EgoModel1", EgoFrame); + EgoFrame.Model1:SetUnit("player") + EgoFrame.Model1:SetRotation(1) + EgoFrame.Model1:SetPortraitZoom(0.3) + EgoFrame.Model1:SetPosition(0,0,-0.25) + EgoFrame.Model1:SetFrameStrata("BACKGROUND") + EgoFrame.Model1:SetPoint("TOPLEFT", EgoFrame, "TOPLEFT", -250, -300) + EgoFrame.Model1:SetPoint("BOTTOMRIGHT", EgoFrame, "BOTTOM", 0, 300) EgoFrame.Model2 = CreateFrame("PlayerModel", "SVUI_EgoModel2", EgoFrame); EgoFrame.Model2:SetUnit("player") @@ -145,22 +85,14 @@ local function LoadSVEgo() EgoFrame.Model2:SetPortraitZoom(0.3) EgoFrame.Model2:SetPosition(0,0,-0.25) EgoFrame.Model2:SetFrameStrata("BACKGROUND") - local w, h = EgoFrame:GetSize() - EgoFrame.Model2:SetSize(w, h - 280) - EgoFrame.Model2:SetPoint("RIGHT", EgoFrame, "RIGHT", 250, 0) + EgoFrame.Model2:SetPoint("TOPRIGHT", EgoFrame, "TOPRIGHT", 250, -300) + EgoFrame.Model2:SetPoint("BOTTOMLEFT", EgoFrame, "BOTTOM", 250, 300) - EgoFrame.LaunchAnimation = LaunchAnimation - EgoFrame.LaunchFreezeFrame = LaunchFreezeFrame - EgoFrame.ResetPosition = ResetPosition + EgoFrame.GoGoGadget = GoGoGadget EgoFrame:SetScript("OnShow", function(self) - self:LaunchFreezeFrame() + self:GoGoGadget() end) end -_G.SlashCmdList["BADASS"] = function() - EgoFrame:LaunchAnimation(4) -end -_G.SLASH_BADASS1 = "/badass" - SV:NewScript(LoadSVEgo) \ No newline at end of file diff --git a/Interface/BUTTONS/UI-SILVER-BUTTON-DOWN.blp b/Interface/BUTTONS/UI-SILVER-BUTTON-DOWN.blp new file mode 100644 index 0000000000000000000000000000000000000000..bfc7cf2b66b8c23906d0052f0fb92a63961db771 GIT binary patch literal 6676 zcmeI0L1@!Z7{_00Wm(Ix2M^JMG*V@8c&MP@Z5u1tAu8x&N9$n|g@Nc{;H6So4}zew zT?WEv4?;q%ipxzh=}mD5XPHpk!4(QJ*w6*$BtE~d@uf+ib`BYCB;?Wl`sICJ^8MfU z^7{JEUN{jTgan0-z#aIEL7NCc+Ye2Ic7Tu%(AJ=Z4id6|6OBZ{3HTu3xEDTR(C{a0 z{^4i9&w!tSKV@K@q#ngnlhFdqKa?8AyZ72?_3j!gH<+=xd0?{2`UJESvRQ7|-)r~s z-^San>tC9XkLv1G9*^wxWOs-0I_Z2Eg)<8;j2SrU%N;ieoMkZ|y&MdZ`m*(WWicDA zz*i^#@bFI;_X&!NuXs2g{qC}7qs+zb{x}d8Hj~|lCB4v8m#g6+;%1a_GsmHiI zDZBmU5+RAIifvB~0yD<=_4U&QktvEDkF)tE-hUX*kwl+xJDpDN7X9-c{g=eDXu`qs zacz(gNROSLf6W+=(u%?3p}v&`raPIbks#-!40;)? z@smpo%O!`tHz(ZB*NVCRInW>E_x1lhKX}Ij>IuUo!}DJThVr)Ok6H}$u9&uds5jF~ zwtjJ`7Bd};dK-F4<^Ga#Tq>zydpw}NwDQWXS7fKYxx}~}bi{9^FZbWd&h^Lo_w{ei z2bSJLLp*=TnT%o2AE>us>bAb9x8Bp#5B05pz`Q^5imKe>Y}IqgRnMP_?s`_YP|w_d zE4{t;rvB1y(m!5+>YOnQx~G2rD`WfM{SU>$7;tJ!yyWR0lHC5hd_;EJpWc!LMyVaY zyI&F%2j>!!01HyvzFizJQyWh*VS@3}5Pzq?|NZ-iapydC*!tbq&nX^!_w{opq)k3f ze$%?Nbnqz7_taD)b9Jo?w*(r@!h~}z26m>{jPp10RMBxgRmjA1?Re+t{HaEN`enAA z9*m?u2M*QxtoV^geOWW{f1ni~*NYZg@tbVLC#0xrkK=HCgQ=n*50FrAS&YH!VYY4j zcK7Go-NVVx$L`9<*rIkn4qIBd|3jf-iZ7s^Im3dB+Z*+mZQ6%ny+&bywn!!iaK0$O z{K0~hP8G=m?hkov2&6~-N zoj!Z4hcTAw>+QLT&n)U<8g&3wLp{XUYt*l(>BEc-?4q&*Z~`9;jz{p3MWvspCMAhL z5`iQFJ4ImIcV=r&ad0!s80VhH_Mx>9;t~=F=cd^y{2~}nh)((M)cn^dUUQ#%Tjs9@ znBu3FJ&wVDaS+dVjxi6VzSVo3;n~otn(%$UzSUezfH~(o;;AVi?de=qbG=5`o^Zw$ z4QU_BZ)m2y65@$`I#;mW5SNW~&V&wS`?4{SFD!eZKf=tkDv`YeY?__M{+d2^1W(z> zvT2k+zyA^6@%c*rA7H;Pp{V?W{*eD`r-HN)^3e{HUgqW^{;I$fCdtocwyGVqeNW;* z9}s}Vqz7A&9-F}p^kGHz8AH!mcI2P*V45po`?662wk+BI#$xOI{}xOBXN=Llg#Rf1 z?eq}0lRi9Ue-m~a(f%eq6kPE}@<*7Z_J@3u9!xvRCxkNvGqjT)?3R2%da#$Jzp^o7 zAYFv*cdG}qM@E2#nzc4>U`HcISOnuAo1tOpm#utf) za2l!@|GolTah7hkB#rOAHUuF z5_{`*NaE35@hH7>7IeJQ3ie-$^U71Fp8>xdrv1#hwA1~GEA~gy{_*6zgZ8xF1>P7| z+{qO6pT~WVa7nTI)IVn5YkGS8;r5jp=0A%2@OQlLy8pI`X?^#8fuFPEi~8gpo$R;d W`%*S1Y-4$vl7qOJCqM#j&ix3DM z6-DXpR$QILEQ(NC&hH|jO;L0(PIuhL<>T)19^bw9?qaKJ(+Ux(;T}cDI0uxvfPP?* zXe2^311tdRz}7E7Vf;iT%3;ufp*G-CHmQJAKq~O90(Dw08r2EyW{iljw`SC_(={p> z^QbF~5e3cTiKk5CF4GY9n`l;ra}ICwC}iAZ%;OvI$IP|3SkHNj3x9>j-uh1N?pIs$ z9*-wr99^te(5#AIs-U^FFZGx4*Pj2#Ka_x5U1T%oZvKI9q8>12nt#oe{EIVrnXb9{ z-^u7#JFW zlmZY7AYmYL6pV(zXb6mk0L~CNbbMRx?QOZz|8f`@LPJAEcOL@rWrglR_zX+dgZOh9 zVf@7_Kzv>XsCouU`9S-UXK%}t2AMAk1UpR{+BPoQZ}%_fUe5pj_4AuWC%8=7_E!bM z|Ibh=#^5k%+gu=jU(Tvk455_rf&NRb-j)crzgcvFzSSaSE0BHmK)@(;)9l7(+uQTQ znFLk^g@v*6FeCuO>-K!0dqDw4DIXYqiPAs>3Qv&#OT`v2TLBTse_lYq&a;8{HV}dA z3jqQKRX1%@-+yFVBC!0q4YfZs=g`6l1)fQ_ z?*YvRf>8ezOb2q2_yJ28Hc*pK?fg7y9ys0*1cl|}a1YNF44#uz^h?&u=Q?qOhH`To zmI5m`PbO&n&cLvf!SfN*dWp;bbDBAT(%fQ;ftBxVHU?1s0Oh|32E|#YR?azfFULcY z`|H=Q==GtTUswVw5D6J;NG@5rbm?#p&!Of&u4&u$u8?4HjE+$N#^;B-T${fwN)%vm zl+RrvpsExaN^AefB!#gt0F#_l3S1Y-4$vl7qOJCqM#j&ix3DM z6-DXpR$QILEQ(NC&hH|jO;L0(PIuhL<>T)19^bw9?qaKJ(+Ux(;T}cDI0uxvfPP?* zXe2^311tdRz}7E7Vf;iT%3;ufp*G-CHmQJAKq~O90(Dw08r2EyW{iljw`SC_(={p> z^QbF~5e3cTiKk5CF4GY9n`l;ra}ICwC}iAZ%;OvI$IP|3SkHNj3x9>j-uh1N?pIs$ z9*-wr99^te(5#AIs-U^FFZGx4*Pj2#Ka_x5U1T%oZvKI9q8>12nt#oe{EIVrnXb9{ z-^y~mWIU5)$d8JmB-ITZCMU`K@Xg#ilbyYT^&Sy<{-774+=6cApdqwGv@#;vfOern z=;Rk7AB}iK=O{vGxgy-kB?N?k5crlrkf-sKuA*(^5oV&Uz0Qm=7~K*2S3a}zmq=tr zmHurN-ju%izUhBzul&A_MrY!y1cXPG29fY+fd^8+G2)$Bse8X6j$7RJc=q+{b%gwD`#bxh eKX0%$?r)C!A^ww-Ns_qn3~^q3xL3+~NAUwhb6rpX literal 0 HcmV?d00001 diff --git a/Interface/BUTTONS/UI-SilverButtonLG-Mid-Hi.blp b/Interface/BUTTONS/UI-SilverButtonLG-Mid-Hi.blp new file mode 100644 index 0000000000000000000000000000000000000000..454fcc2a8950320b83f5e802c469a59e69c16969 GIT binary patch literal 3940 zcmZ?r2{2-0U|?Y4U}sbS(hfj8g$0OtfS8YgL4==y!32n1fH(w*Q;5I}96&>u7#JFW zlmZY7AYmYL6pV(zXb6mk0L~CtykcAK?QOga|8f`@LPJ9t=*=$`V{n+XZLZ3{oP9Z~ zRxyOqo6pX}kZ>Cq1oMIZ2L%AV`3$URQ8UU%4Up0B7}nvzt_Li9ZckI$2P%JnKBYH5 zUc6RIz1?fy~oQIiX);lWBv4PrO|8pEUc*8O6Ywa>fU^Yu&&N5y~mWIU5)$d8JmB-ITZCMU`K@Xg#ilbyYT^&Sy<{-774+=6cApdqwGv@#;vfOern z=;Rk7AB}iK=O{vGxgy-kB?N?k5crlrkf-sKuA*(^5oV&Uz0Qm=7~K*2S3a}zmq=tr zmHurN-ju%izUhBzul&A_MrY!y1cXPG29fY+fd^8+G2)$Bse8X6j$7RJc=q+{b%gwD`#bxh eKX0%$?r)C!A^ww-Ns_qn3~^q3xL3+~NAUwhb6rpX literal 0 HcmV?d00001 diff --git a/Interface/BUTTONS/UI-SilverButtonLG-Right-Down.blp b/Interface/BUTTONS/UI-SilverButtonLG-Right-Down.blp new file mode 100644 index 0000000000000000000000000000000000000000..deaf17d0cce3665652401ddf71ae66ff3466c05f GIT binary patch literal 3940 zcmeHJF-yZh6n<&7Mo_EhQ0fvPKR`vqL1+~h!NI}9MX;5w`3Fj3ht49d#X+iglNdPa zCR94PIrc{chayPJ`CTAriba=*!yWm!e0j-x$Cvls-R92jvOz>CbIhyT zn#&Tc09(KwQ27POgp(AJhsgq_zW}#-Xa%$aT7jVoz=eC<# zYvokDL)ULgDY3dT;&YF&VO*_GeG%CQx$-CFr#v_KV~ zqdz3gjjCIJ7UfP@|0Q(X(RlySTj$E4 zqeMcEN3~Z`ugHg)kbBe}++W(Y`TGT2%HGBJ$*%J~_P6P;^|%Q{f4yp%;r}!l3v%Ok xPDeP3do20>^hQgu7#JFW zlmZY7AYmYL6pV(zXb6mk0L~CtykcAK?QOga|8f`@LPJ9tDCI9%4>nKd9@MlUAN%MhxPykTMXB4`fl)NpydVV;Qz^c}%Q=3K2 z1%nMmgF*KH0fHs#H`?CbfUuu|6)kEg0{?YJ92?6S)zv%sV)1NLP|LFk>pWD+^_5sz00v*CmA>V?*^WXhkO-@ky z76qEONU?Hyx%pGR|G@nB_iudtvi%!uZ*P@_r~iN@3>$Jilfdo)Di5WU@4td!OD~dn zIfn#{)sXo6k8A*zKe;gbL#dtrM$JP>%?zXAfj>M9OM#W2Clj>(XJBY!@SLP_AncZW zt`kRS=z|Ahi-DE%Z8io_eF@5+s~9|)a#E`Q|IcaW07^eVuP@aYj=oimd!%|V$3yZ# ze0)55_%q6OZ$Zboo&}{`jJH_^?-Qn>&Gl=Wuk40x*6*lrLf6O!yB> z0`j>_1X??Q4MGa*148>Rg0$Yq|?gIb}t+7S` literal 0 HcmV?d00001 diff --git a/Interface/BUTTONS/UI-SilverButtonLG-Right-Up.blp b/Interface/BUTTONS/UI-SilverButtonLG-Right-Up.blp new file mode 100644 index 0000000000000000000000000000000000000000..deaf17d0cce3665652401ddf71ae66ff3466c05f GIT binary patch literal 3940 zcmeHJF-yZh6n<&7Mo_EhQ0fvPKR`vqL1+~h!NI}9MX;5w`3Fj3ht49d#X+iglNdPa zCR94PIrc{chayPJ`CTAriba=*!yWm!e0j-x$Cvls-R92jvOz>CbIhyT zn#&Tc09(KwQ27POgp(AJhsgq_zW}#-Xa%$aT7jVoz=eC<# zYvokDL)ULgDY3dT;&YF&VO*_GeG%CQx$-CFr#v_KV~ zqdz3gjjCIJ7UfP@|0Q(X(RlySTj$E4 zqeMcEN3~Z`ugHg)kbBe}++W(Y`TGT2%HGBJ$*%J~_P6P;^|%Q{f4yp%;r}!l3v%Ok xPDeP3do20>^hQg