From e7cc45a2e0479134978f8015bcf141b686fc2085 Mon Sep 17 00:00:00 2001 From: ListenerJubatus Date: Tue, 20 Feb 2018 23:24:35 -0600 Subject: [PATCH] tweak lifebar, scrollbar thumb, cdtitle --- .../ScreenSelectMusic decorations/default.lua | 33 ++++++++++++++++++ .../ScreenSelectMusic overlay.lua | 28 --------------- .../DualScrollBar thumb p2 (doubleres).png | Bin 1135 -> 472 bytes .../Graphics/ScreenGameplay lifebar_bar.lua | 6 ++-- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index f05ed66fff..3bfa15f39d 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -419,6 +419,39 @@ t[#t+1] = StandardDecorationFromTable("PercentScore"..ToEnumShortString(PLAYER_2 end; + +if not GAMESTATE:IsCourseMode() then +-- CD title + local function CDTitleUpdate(self) + local song = GAMESTATE:GetCurrentSong(); + local cdtitle = self:GetChild("CDTitle"); + local height = cdtitle:GetHeight(); + + if song then + if song:HasCDTitle() then + cdtitle:visible(true); + cdtitle:Load(song:GetCDTitlePath()); + else + cdtitle:visible(false); + end; + else + cdtitle:visible(false); + end; + + self:zoom(scale(height,64,480,1,64/480)) + end; + t[#t+1] = Def.ActorFrame { + OnCommand=cmd(draworder,46;x,SCREEN_CENTER_X-420;y,SCREEN_CENTER_Y-147;zoom,0;sleep,0.5;decelerate,0.25;zoom,1;SetUpdateFunction,CDTitleUpdate); + OffCommand=cmd(decelerate,0.3;zoomy,0); + Def.Sprite { + Name="CDTitle"; + OnCommand=cmd(draworder,46;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;); + BackCullCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); + OffCommand=cmd(decelerate,0.3;zoomy,0); + }; + }; +end; + -- BPMDisplay t[#t+1] = Def.ActorFrame { InitCommand=cmd(draworder,126;visible,not GAMESTATE:IsCourseMode();); diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua index 1e7050ace5..d917bbc935 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua @@ -42,32 +42,4 @@ t[#t+1] = Def.ActorFrame { }; }; -if not GAMESTATE:IsCourseMode() then --- CD title -t[#t+1] = Def.ActorFrame { - Def.Sprite { - name="CDTitle"; - InitCommand=cmd(x,SCREEN_CENTER_X-40;y,SCREEN_CENTER_Y-140;zoom,0.75;); - OnCommand=cmd(zoomy,0.3;diffusealpha,0;decelerate,0.3;zoomy,0.75;diffusealpha,1); - OffCommand=cmd(decelerate,0.3;zoomy,0.3;diffusealpha,0;); - CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); - SetCommand=function(self) - local song = GAMESTATE:GetCurrentSong(); - if song then - if song:HasCDTitle() then - self:Load(song:GetCDTitlePath()) - self:visible(true) - else - self:Load(nil) - self:visible(false) - end - else - self:Load(nil) - self:visible(false) - end - end; - }; -}; -end; - return t \ No newline at end of file diff --git a/Themes/default/Graphics/DualScrollBar thumb p2 (doubleres).png b/Themes/default/Graphics/DualScrollBar thumb p2 (doubleres).png index 1db4614defa52c4610dfad907637f7aa15326d07..b341b7def81375f700d286a1c44a64d438223f9e 100644 GIT binary patch delta 447 zcmaFQaf5k+ay<>&pI! zNtBh@T%P5^VFm`qR8JSjkc@k8Z*KH!c93BI(7#*QM|x>&$1IItc5xH4yRV)^f00!A z7}^sp-*9s+f537r?ph|H$=hBs@R?ffVOBR=FhQj9Vq6s3wjj6d`Rh=QTV+4&SpIf@&|(Q>Tp>JfdalID8KrK^TYRSeX`8$-ImS5o z-v!%;zQ5wiH-4?xY+3w-jiYf*X1`|!4?~vSLB|Rf1qMbA2L>jA1_m^y7N6(kXZ-Uj z&mUws&;LW}h|-go^|ytK)~$Ecv9W*Pm8T$dsn&a+{VN5hb6h%rj;_E*kY lwgw%qr@=RG@NvHu|DAU6`KRh#*}!OE@O1TaS?83{1OO9Rxc2}6 literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2d_FfdAIhD4M^`1)8S=jZArrsOB3 z>Q&?x0Oc7NZ0suv5|gu2OB9k)(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWU zl3bOYY?-2DZ^va*VFffGH?<^Dp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf_NpP;kyK zN>wn`Gu1Otvg1;)DN0GR3UYCSY6kLbl`=|73as??%gf94%8m8%i_-NCEiEne4UF`S zjC6r2bc-wVN)jt{^NN*0MnKGPNi9w;$}A|!%+FH*nVFcBUs__Tq@)kBL?3Dk(7F0> z_X0U^AE)L4y;%hGkCfNySHNIu%yf1RC=POWQt)(jHZ!y|Gt)KFGh|@Um{>Y-w>Pt+ zK>L1|qYEZ-L`7(@1g>^jGH} zu$M<%y!!J%$b?k3+{e6ge>|UtT)vqqjcG*fc|ozvI;V)3S@tN$v3}E%e#4TBRlA!23@xDy5vH6js`BE3!@q zo!6#d#87!^am)s`{o3U`Q!{EAEMyY4p1pMQ;!o#!pXPUP1?~>Jt>Zb9fmNvb_~k`G zXW1thG&(mkuqZGvayT$B2{fQG9k?7EemvjnT=Fd8zyZm;y?1MD9_yX1PCFL+?CrD1 zjmCGpW;!Tbv;F=0?78L{h0|}&U;n-_;yZ)NU)}jS%Py=kb)Oe;Z-vY5H9@gUrsg~C z7hhYjCQq&t;ucLK6Vzg3{Rl diff --git a/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua b/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua index afcc55eaed..7da9ab9e3c 100644 --- a/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua +++ b/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua @@ -1,7 +1,7 @@ local pn = ... local life_meter_width = 400 -local life_meter_num_segments = 46 +local life_meter_num_segments = 80 local life_meter_height = 20 local life_meter_tip_width = 2 local life_meter_tip_gap = 64 @@ -94,9 +94,9 @@ t[#t+1] = Def.ActorFrame { Def.Quad { Name="Fill", InitCommand=cmd(x,-life_meter_width/2;zoomto,life_meter_width,life_meter_height;horizalign,left), - OnCommand=cmd(diffuse,PlayerColor(pn);), + OnCommand=cmd(diffuse,PlayerColor(pn);diffuse,PlayerColor(pn);), -- - HotCommand=cmd(diffuse,color("#FFB45E");glowshift;effectclock,'beat'), + HotCommand=cmd(diffuse,color("#ff9232");diffuseshift;effectclock,'beat';effectcolor1,color("#ff9232");effectcolor2,color("#ffe263");), AliveCommand=cmd(diffuse,PlayerColor(pn);stopeffect), DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,Color.Red;effectcolor2,color("#FF797C");), DeadCommand=cmd(diffuse,Color.Red;stopeffect)