From e9c891ee62d6eee08e67798a90f3efdd5442e5f0 Mon Sep 17 00:00:00 2001 From: Misterkister Date: Sat, 11 Mar 2017 01:28:11 -0600 Subject: [PATCH] Changes made for this pull request (#65) * Updating Common splash * Keeping the screen title colortype the same This change is made to keep this colortype and ScreenSelectMusic's colortype the same. I want to make sure the color visibility remains one color and not having two different colors. Changing colortype in ScreenSelectProfile overlay This change also have the same reason as the commit above. Cleaning ScreenNetSelectMusic song sort to look like offline This commit focuses on cleaning up comments and removing quads in song sort because it's not needed anymore. I'm not in the mood of having it look like purple recolor of Prim's spawnhack, so I decide to change it. Cleaning up song sort to look like offline This also have the same reason as the previous explanation. Comment removed and cleaned up This commit is made so people don't have to see this mess when they open up this file. --- .../ScreenNetRoom overlay/currentsort.lua | 43 +----------------- .../ScreenNetRoom overlay/default.lua | 2 +- .../ScreenNetSelectBase overlay/default.lua | 1 - .../default.lua | 25 ---------- .../ScreenSelectProfile overlay.lua | 40 +--------------- Themes/_fallback/Graphics/Common splash.png | Bin 7044 -> 6940 bytes 6 files changed, 3 insertions(+), 108 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/currentsort.lua b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/currentsort.lua index 6f3a70ebcc..7b171483fd 100644 --- a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/currentsort.lua +++ b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/currentsort.lua @@ -33,30 +33,6 @@ local sortTable = { SortOrder_Recent = 'Recently Played' }; --- t[#t+1] = Def.Quad{ - -- Name="CurrentSort"; - -- InitCommand=cmd(xy,frameX,frameY;halign,1;zoomto,frameWidth,frameHeight;diffuse,getMainColor(1);); --- }; - --- t[#t+1] = LoadFont("Common Normal") .. { - -- InitCommand=cmd(xy,frameX-frameWidth+5,frameY;halign,0;zoom,0.45;maxwidth,(frameWidth-40)/0.45); - -- BeginCommand=cmd(queuecommand,"Set"); - -- SetCommand=function(self) - -- local sort = GAMESTATE:GetSortOrder() - -- local song = GAMESTATE:GetCurrentSong() - -- if sort == nil then - -- self:settext("Sort: ") - -- elseif sort == "SortOrder_Group" and song ~= nil then - -- self:settext(song:GetGroupName()) - -- else - -- self:settext("Sort: "..sortTable[sort]) - -- end - - -- end; - -- SortOrderChangedMessageCommand=cmd(queuecommand,"Set"); - -- CurrentSongChangedMessageCommand=cmd(queuecommand,"Set"); --- }; - t[#t+1] = LoadFont("Common Normal") .. { InitCommand=cmd(xy,frameX-5,frameY;halign,1;zoom,0.3;maxwidth,40/0.45); BeginCommand=cmd(queuecommand,"Set"); @@ -71,21 +47,4 @@ t[#t+1] = LoadFont("Common Normal") .. { CurrentSongChangedMessageCommand=cmd(queuecommand,"Set"); }; ---t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay"); ---t[#t+1] = StandardDecorationFromFileOptional("BPMLabel","BPMLabel"); - ---just a simple mouse rollover test. ---[[ -local function Update(self) - t.InitCommand=cmd(SetUpdateFunction,Update); - if isOver(self:GetChild("CurrentSort")) then - self:GetChild("CurrentSort"):diffusealpha(0.5) - else - self:GetChild("CurrentSort"):diffusealpha(1) - end; -end; - -t.InitCommand=cmd(SetUpdateFunction,Update); ---]] - -return t \ No newline at end of file +return t diff --git a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua index 6ba7590074..34cdb8c537 100644 --- a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua @@ -33,7 +33,7 @@ t[#t+1] = LoadActor("../_frame"); t[#t+1] = LoadActor("../_PlayerInfo") t[#t+1] = LoadActor("currentsort"); t[#t+1] = LoadFont("Common Large")..{ - InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('highlight');settext,"Lobby";); + InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('positive');settext,"Lobby";); } t[#t+1] = LoadActor("../_cursor"); t[#t+1] = LoadActor("../_mouseselect") diff --git a/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/default.lua index d8f8df24e8..98b352cba9 100644 --- a/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/default.lua @@ -41,7 +41,6 @@ t[#t+1] = LoadFont("Common Large")..{InitCommand=cmd(xy,5,32;halign,0;valign,1;z t[#t+1] = LoadActor("../_cursor") t[#t+1] = LoadActor("../_mouseselect") t[#t+1] = LoadActor("../_halppls") ---t[#t+1] = LoadActor("wifesearchbar") t[#t+1] = LoadActor("../_userlist") return t diff --git a/Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/default.lua b/Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/default.lua index 1d57e0c559..bcaa9fd31d 100644 --- a/Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/default.lua @@ -1,12 +1,6 @@ local t = Def.ActorFrame{} t[#t+1] = LoadActor("../_chatbox") --- adding this function for average nps. This is to check the relative difficulty of song's nps. -Misterkister ---t[#t+1] = LoadActor("yolo") --- adding other stuff ---t[#t+1] = LoadActor("kappa") ---t[#t+1] = LoadActor("msd stuff") ---t[#t+1] = LoadActor("matra") t[#t+1] = LoadActor("../ScreenSelectMusic decorations/profile") t[#t+1] = LoadActor("../ScreenSelectMusic decorations/msd") t[#t+1] = LoadActor("../ScreenSelectMusic decorations/songsearch") @@ -82,23 +76,6 @@ g[#g+1] = LoadFont("Common Normal") .. { g[#g+1] = LoadActor("wifeonline") g[#g+1] = LoadActor("onlinebpm") g[#g+1] = LoadActor("radaronline") --- t[#t+1] = LoadFont("Common Normal") .. { - -- Name="songLength"; - -- InitCommand=cmd(xy,5+(capWideScale(get43size(384),384)),60+capWideScale(get43size(120),120)-capWideScale(get43size(10),10);visible,true;halign,1;zoom,capWideScale(get43size(0.45),0.45);maxwidth,capWideScale(get43size(360),360)/capWideScale(get43size(0.45),0.45)); - -- BeginCommand=cmd(queuecommand,"Set"); - -- SetCommand=function(self) - -- local song = GAMESTATE:GetCurrentSong() - -- local seconds = 0 - -- if song ~= nil then - -- seconds = song:GetStepsSeconds() --song:MusicLengthSeconds() - -- self:settext(SecondsToMMSS(seconds)) - -- --self:diffuse(getSongLengthColor(seconds))--Function no longer in color_config - -- else - -- self:settext("") - -- end - -- end; - -- CurrentSongChangedMessageCommand=cmd(queuecommand,"Set"); --- }; g[#g+1] = Def.ActorFrame { InitCommand=cmd(xy,capWideScale(get43size(384),384)+26,70,halign,0;valign,0;zoom,math.min(1,SCREEN_WIDTH/854)); @@ -115,11 +92,9 @@ g[#g+1] = Def.ActorFrame { CurrentSongChangedMessageCommand=function(self) local song = GAMESTATE:GetCurrentSong(); if song then --- self:setaux(0); self:finishtweening(); self:playcommand("TweenOn"); elseif not song and self:GetZoomX() == 1 then --- self:setaux(1); self:finishtweening(); self:playcommand("TweenOff"); end; diff --git a/Themes/Til Death/BGAnimations/ScreenSelectProfile overlay.lua b/Themes/Til Death/BGAnimations/ScreenSelectProfile overlay.lua index 58d247faf0..2d14a1fef1 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectProfile overlay.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectProfile overlay.lua @@ -7,10 +7,6 @@ function GetLocalProfiles() local profileID = PROFILEMAN:GetLocalProfileIDFromIndex(p) local profile=PROFILEMAN:GetLocalProfileFromIndex(p); local ProfileCard = Def.ActorFrame { ---[[ Def.Quad { - InitCommand=cmd(zoomto,200,1;y,40/2); - OnCommand=cmd(diffuse,Color('Outline');); - }; --]] LoadFont("Common Large") .. { Text=profile:GetDisplayName(); InitCommand=cmd(xy,34/2,-10;zoom,0.4;ztest,true,maxwidth,(200-34-4)/0.4); @@ -44,11 +40,6 @@ end; function LoadCard(cColor) local t = Def.ActorFrame { - --LoadActor( THEME:GetPathG("ScreenSelectProfile","CardBackground") ) .. { - -- InitCommand=cmd(diffuse,cColor); - --}; - --LoadActor( THEME:GetPathG("ScreenSelectProfile","CardFrame") ); - Def.Quad { InitCommand=cmd(zoomto,200+4,230+4); OnCommand=cmd(diffuse,color("1,1,1,1")); @@ -65,20 +56,9 @@ function LoadPlayerStuff(Player) local pn = (Player == PLAYER_1) and 1; ---[[ local t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 200, 230) .. { - Name = 'BigFrame'; - }; --]] t[#t+1] = Def.ActorFrame { Name = 'JoinFrame'; LoadCard(Color('Purple')); ---[[ Def.Quad { - InitCommand=cmd(zoomto,200+4,230+4); - OnCommand=cmd(shadowlength,1;diffuse,color("0,0,0,0.5")); - }; - Def.Quad { - InitCommand=cmd(zoomto,200,230); - OnCommand=cmd(diffuse,Color('Orange');diffusealpha,0.5); - }; --]] LoadFont("Common Normal") .. { Text="Press &START; to join."; InitCommand=cmd(shadowlength,1); @@ -102,15 +82,11 @@ function LoadPlayerStuff(Player) t[#t+1] = Def.ActorScroller{ Name = 'Scroller'; NumItemsToDraw=6; --- InitCommand=cmd(y,-230/2+20;); OnCommand=cmd(y,1;SetFastCatchup,true;SetMask,200,58;SetSecondsPerItem,0.15); TransformFunction=function(self, offset, itemIndex, numItems) local focus = scale(math.abs(offset),0,2,1,0); self:visible(false); self:y(math.floor( offset*40 )); --- self:zoomy( focus ); --- self:z(-math.abs(offset)); --- self:zoom(focus); end; children = GetLocalProfiles(); }; @@ -120,7 +96,6 @@ function LoadPlayerStuff(Player) }; t[#t+1] = LoadFont("Common Normal") .. { Name = 'SelectedProfileText'; - --InitCommand=cmd(y,160;shadowlength,1;diffuse,PlayerColor(Player)); InitCommand=cmd(y,160;shadowlength,1;); }; @@ -239,7 +214,6 @@ t[#t+1] = Def.ActorFrame{ UpdateInternal2Command=function(self) UpdateInternal3(self, PLAYER_1); - -- UpdateInternal3(self, PLAYER_2); end; children = { @@ -255,18 +229,6 @@ t[#t+1] = Def.ActorFrame{ end; children = LoadPlayerStuff(PLAYER_1); }; - -- Def.ActorFrame { - -- Name = 'P2Frame'; - -- InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y); - -- OnCommand=cmd(zoom,0;bounceend,0.35;zoom,1); - -- OffCommand=cmd(bouncebegin,0.35;zoom,0); - -- PlayerJoinedMessageCommand=function(self,param) - -- if param.Player == PLAYER_2 then - -- (cmd(zoom,1.15;bounceend,0.175;zoom,1.0;))(self); - -- end; - -- end; - -- children = LoadPlayerStuff(PLAYER_2); - -- }; -- sounds LoadActor( THEME:GetPathS("Common","start") )..{ StartButtonMessageCommand=cmd(play); @@ -281,7 +243,7 @@ t[#t+1] = Def.ActorFrame{ }; t[#t+1] = LoadActor("_frame"); t[#t+1] = LoadFont("Common Large")..{ - InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('highlight');settext,"Select Profile:";); + InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('positive');settext,"Select Profile:";); } return t; diff --git a/Themes/_fallback/Graphics/Common splash.png b/Themes/_fallback/Graphics/Common splash.png index a214f84ab83c76a3f38bd461e8bdf84d0faf42a1..5836bd7fe35a125970935b4d4faed19c2d8d2dd5 100644 GIT binary patch delta 4228 zcmY*ccTiJ7_YEN3P$EsLbU}(JB?t`-sPBhdE5-GM9&eMKm z`B!~A8rnG`09(^rVMxk!F$M$;e+-KT)Ib&d8ynN|$1u@}g8`u?34G6ecFck}8l#(Z5WZE^8$uVl#sw+6fqA|#h!-zaUdReP;;3nEPgVanpAI6P zPRDaHtL}Z`_6O@7qg&E%(`EuZjHx&aFDvLA&8&;>eRUVjgoxL-d?!P^oAi!qYeOYA z?_hM;1FC4xg}xvorx1%wJY-7jg-3xIA&@cSRgxVFT4}OirN=eULVGMvr$Und-9?BElcmCP;`L{)bG?_n@KYXecZ=GEb%yOw z+0kf{v;G{S9%zEYb>9Gp5y-~~%f9g^1*6GzqEciKsTb$GLq}YHv=M43G@W=ib5+?^ zWB%pA6MQPbke;;t8$V=(96S}yv^ozylY+B*%`N@W?z?@V{&K5WSxgjuDuQ#3v!Up; zMH~g~Ol8WGnCZ2V{RjvW%O_WSnvbr68=j|wEti{%)5wrDEq|ul?fx43I16eKBS02R zQTaSiz2z6Nb+@upb5D_Uk-0IFq=+FRSE0=}GQ^OT-!A$qHeEbHR>^fv>@pAKHOI)CDM;lU)8zwu z9hHgae4ipRbG5FP3E=S`a{4{S+FJ*E3oNiZU1ro10{osdT*DLZ5>4}=_b5D4nd%z? zS87OfJQ;?7>lkP9JD6&f3|j-YiQ!dPWLG$ATLJaK&0<=khQO48_uK%>m?qF(!Px#A~mv}`&Ff9Te!2lRmtN%QLp7wD16#7=)U3% zz@DQ=ivb+d-Dtct$VAiTfb=Y7%pzf#bpsa?tuH8C2LJuojliu zaXe{H{s`h0G+f&aDZQio(}vo2@Ch@+;rPtuAjKa-xigE1pAXiw9D944l}S3EC6%y* zCLU+&HaXD-m47wzRPgb0cx=HW#~v>LN|r81sN+1(B=OZf__DWlT0EQ|XnOTQX4uV$ z>uK;oxA1;o4)Q9jo%rh4o4yth@IK(^D(Bu@ax3hO~4xlS^HK-HO*xvbIZi zTr_x{J3Om9XBE)jJ^@Epst#E2O%ILiI#u7=yRU=Tbfz_Jn=ZF9qkpTAK;gx}A4CU^ z@}eAvqdkTaS8Dh5j8?E|+L(MNQak^;jM!qK^Rfwvy)o=_v)upq=hvHGGmzb*H@DY4YydfbgF8811#smel? zbL6>|7Kn}*f(&Se=kj|HThmZ8meJ$Syl^)(H*rB9~neR%W! z0&%fl;6QG(s*EAHrPgYKXu0N#(rwplskh_}Tmv;B3@(79zHq~P=L@CGl`_+^#v1*1 zcE&*PT6>?mJhywuTY=~2z@Kq5eHH%hBAZ-_(kgUnP`G(q{z#^oP4$_DZiSIJ%kRLXY@GW(ZEJ zM8wZ=M^a@Or|H{tvrwXqAXT!EvYGF>yXFu34kbrl?BserzNQUGmwv+T=O9y9ut`Un zy9QtWydAs~VZGD=zN@^_vvK}j7fEyFyE!YTDm)er&@^qu220+1t+v)Fja{3zk5XS! z3oh0Q*}4)ero5k;XBCjQ>;7QOJPcKK_z+jdB$*w8e0G&rdM0|{hUb3wmo4VG3Y>ZJHKKfaD4vMV8;-F-lFV&Tb86p76<%5|(xzE228b9+T_$Z@ z;NC0;hCPz9Vg1)6n=WlgT6~($;pqTnNVj0iu9*xclKNoSvs%RPhOeU-yg%qI-hbmj zGiUuwpl@?FQV(x*jc!D4x#!~_2UkL@0GS={`2}{vaH72BZsvAwvk-3J(M_UuIVDy{ z6qEe#rFg|Rea!V$Ia@B@8^i@G?R-|ybSzV)j{r)~CP)J+}@{Mj=- z^)b&pABxp`<09DaoG(#`B}A;P%Cr@TK1#8Y0*SmMUZ%gJ>l)wK$be*gykO;F1oXwP z*~mT*-7{-GpGL6_e19fTT6-yTTKC?kyubC*69Zg6CH63L8}JOXD-6E+`9`OydOvvQ#Ag`89p|vX1mOIkmBggbB^~d%VdT?0h*HfVf`9_(jITrr( zUZXQM?% z**>o%3kEhVw$@qgdB(b+8Aj4$RRi9;&Y(G{FwKR(ZSXECD02(ijW`INFv8 zQ)B!}RbJnqrQfMaLn()pcjDS^3nAxkB(v>3xqi7(l%s=hzhjleKp(-_gGqs@+Rd{z zwcW=zBKp%7s6%~&0ruCN5|BtAq4<_XBu8j%pzMKnG7zu6G)VpaeGECr*)QFp#dli9 znnr=7Ud8Ttnf=CmAhxBjrR?yqLh9GSG)LYEF22W^dlf_k_F%y2u{~!Ix!ZSz;=|m- zLKBZS-vVqXk{b^o?HNVys-}upLNOWT;%bzUR>~p??k|XzuCr67m=h_SLpx?URQWJe zv7eUzK6UVxD!Z&ZlAxZ1+IfOz~RD@%ql6_33NM3@h)3x8qdmvN+EOm&+m<>Fy>A~iiG=HY*`df z%njoEGaRa4`k__}OGDDrjLx6U9*n~O*2$L@^sgSn=YvVb>|j^D?H8C@oXv!IoT7!J z{Y9JuO23_{@f~E_)DVK1st|f^RSlc#kd!a)74`>SjFc&e7?OqhD)iN%Y%1T~Hc!ng zPt5XBntSq!#>y1UG!?nLcuBvRhs6v*^Yh-C2UmfK$9LWv0;NF}qhl@~9c;7z5`LW_ z!8GLB_kSqi@zDhC^XtogsI5Zu>EF+BI)_a_JRP&uV4N_;1A*Eah8J73o57;}BndDf zR(7IzUB@YlVPG~I5_z&`rjxgXY&>u0-&1mxdwloKoP}L-l(@6-pE&7Tm1VzzArnib2p)JfGQu>oY;HY))(`W?g{tg*fBd(9!yTaNlnz(U zT>67a>P#27y*5Lp#O6cC;o!o-wfm6KZzAHGf8`J~VxklB7R;g`7J*U|C<==h%;^j zDBJ1gvbxTR@nJRtKR4}z=i973&Df5p(YTY6pkiVJ)b-Jts(JkUZ0Af)e~GEda^XM6 z>1mV1^Y?J`#dnesuZB=YnrNi!cZG$Z#=B~$Gzpc%EIX^(Gp*?P-HQqxPF z&XF<$D!%*e|Fi2Uj|yT%u7KY2{|xAV8Fr2Nb81M*9*_(5q+W)ApN^)XMkV5I)PDdy CoH9B9 delta 4333 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