v2.64

Jax-Core · Sep 23, 2022 · 6ad92b9 · 6ad92b9
1 parent 9ef8c7d
commit 6ad92b9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/@Resources/Includes/GlobalMusicModern.inc b/@Resources/Includes/GlobalMusicModern.inc
@@ -32,7 +32,8 @@ DynamicVariables=1
 Measure=Plugin
 Plugin=WindowsNowPlaying
 PlayerType=Cover
-Substitute="":"#@#Images\Default.png"
+Substitute="^0$":"#@#Images\Default.png"
+RegexpSubstitute=1
 UpdateDivider=1
 Group=Music | modern
 DynamicVariables=1
@@ -42,6 +43,8 @@ DynamicVariables=1
 Measure=Plugin
 Plugin=WindowsNowPlaying
 PlayerType=Artist
+Substitute="^0$":"N/A"
+RegexpSubstitute=1
 UpdateDivider=1
 Group=Music | modern
 DynamicVariables=1
@@ -53,6 +56,8 @@ Plugin=WindowsNowPlaying
 PlayerType=Title
 OnChangeAction=[!UpdateMeterGroup Music][!Redraw]
 UpdateDivider=1
+Substitute="^0$":"Waiting media"
+RegexpSubstitute=1
 Group=Music | modern
 DynamicVariables=1
 

diff --git a/@Resources/PatchNoteVar.inc b/@Resources/PatchNoteVar.inc
@@ -1,2 +1,2 @@
 [Variables]
-Core.patchNoteCheckvariable=enhan
+Core.patchNoteCheckvariable=Jax
diff --git a/@Resources/Version.inc b/@Resources/Version.inc
diff --git a/Core/AppearanceStyles/Side.inc b/Core/AppearanceStyles/Side.inc
@@ -61,6 +61,14 @@ MeterStyle=Set.Div:S
 Meter=String
 Text=Text scrolling multiplier
 MeterStyle=Set.String:S | Set.OptionName:S
+[Divider8]
+Meter=Shape
+MeterStyle=Set.Div:S
+
+[Option18]
+Meter=String
+Text=Main color
+MeterStyle=Set.String:S | Set.OptionName:S
 
 ; ---------------------------------------------------------------------------- ;
 ;                                   Function                                   ;
@@ -141,6 +149,10 @@ Y=([Option17:Y]-#Set.P#+(-30/2+8)*[Set.S])
 Meter=String
 Text=#RollSpeedMultiplier#x
 MeterStyle=Set.String:S | Set.Value:S
+[MainColor]
+Meter=Shape
+MeterStyle=Set.Color:S
+Y=([Option18:Y]-#Set.P#+(-30/2+8)*[Set.S])
 ; ---------------------------------------------------------------------------- ;
 ;                                    Anchor                                    ;
 ; ---------------------------------------------------------------------------- ;

diff --git a/Core/AppearanceStyles/Simple.inc b/Core/AppearanceStyles/Simple.inc
@@ -12,6 +12,10 @@ Group=Card
 Meter=String
 Text=Accent color 2
 MeterStyle=Set.String:S | Set.OptionName:S
+[Divider113]
+Meter=Shape
+MeterStyle=Set.Div:S
+Group=Card
 [Option13]
 Meter=String
 Text=Background color

diff --git a/Main/Styles/Side.inc b/Main/Styles/Side.inc
@@ -71,11 +71,11 @@ Shape2=
 [B11]
 Shape=Rectangle 0,0,(200*#scale#),#GH# | StrokeWidth 0 | Fill RadialGradient this
 This=(-(200*#scale#)/2),0,0,0,(#GH#/2),(#GH#/2) | [AC] ; 0.2 | 0,0,0,1 ; 1.0
-Shape2=Rectangle (20*#scale#),#P#,(#BarW#*#Scale#),(#GH#-#P#*2),(#BarCorner#*#scale#) | StrokeWidth 0 | Fill Color 255,255,255
+Shape2=Rectangle (20*#scale#),#P#,(#BarW#*#Scale#),(#GH#-#P#*2),(#BarCorner#*#scale#) | StrokeWidth 0 | Fill Color #MainColor#
 [B01]
 Shape=Rectangle 0,0,(200*#scale#),#GH# | StrokeWidth 0 | Fill Color 0,0,0,1
 This=(-(200*#scale#)/2),0,0,0,(#GH#/2),(#GH#/2) | [AC] ; 0.2 | 0,0,0,1 ; 1.0
-Shape2=Rectangle (20*#scale#),#P#,(#BarW#*#Scale#),(#GH#-#P#*2),(#BarCorner#*#scale#) | StrokeWidth 0 | Fill Color 255,255,255
+Shape2=Rectangle (20*#scale#),#P#,(#BarW#*#Scale#),(#GH#-#P#*2),(#BarCorner#*#scale#) | StrokeWidth 0 | Fill Color #MainColor#
 
 
 [CreateShadow0]
@@ -121,7 +121,7 @@ UpdateDivider=1
 ClipString=2
 FontWeight=600
 FontSize=(16*#scale#)
-FontColor=255,255,255
+FontColor=#MainColor#
 DynamicVariables=1
 MeasureName=#PlayerType#Track
 Group=Music
@@ -140,7 +140,7 @@ DynamicVariables=1
 ClipString=1
 FontSize=(12*#scale#)
 FontFace=Nunito Sans SemiBold
-FontColor=255,255,255,150
+FontColor=#MainColor#,150
 MeasureName=#PlayerType#Artist
 Group=Music
 Container=SMetaDataSection

diff --git a/Main/Vars/Side.inc b/Main/Vars/Side.inc
@@ -1,4 +1,5 @@
 [Variables]
+MainColor=255,255,255
 HideAlbum=0
 SideGlow=0
 H=170