Update Spectral colorschemes.HEADmain

3 files changed, 118 insertions, 66 deletions

diff --git a/colors/cooldown.vim b/colors/cooldown.vim
index 62ae356..ebbf92d 100644
--- a/colors/cooldown.vim
+++ b/colors/cooldown.vim
@@ -15,13 +15,13 @@ let g:_snormal = "#fbdeff"
 let g:_sbackground = "#202025"
 let g:_svert = spectral#brighter(g:_sbackground, 2)
 let g:_sstatement = "#50D28C"
-let g:_stype = '#b7b0ff'
+let g:_stype = "#b7b0ff"
 let g:_sabstract_class = spectral#mix(g:_stype,"#ff0000",0.1)
 let g:_sinterface = spectral#mix(g:_stype,"#ff0000",0.2)
 let g:_senum = spectral#mix(g:_stype,"#ff0000",0.3)
 let g:_spreproc = spectral#brighter(g:_snormal,0.6)
-let g:_sfunction = '#d9a7ff'
-let g:_syellow1 = '#e4c692'
+let g:_sfunction = "#d9a7ff"
+let g:_syellow1 = "#e4c692"
 let g:_scodebg = spectral#brighter(g:_sbackground,2)
 
 call spectral#StartCompile()
@@ -102,17 +102,17 @@ Hi EnjinAbstractClass g:_sabstract_class
 Hi EnjinInterface g:_sinterface
 Hi EnjinEnum g:_senum
 
-Hi Pmenu None spectral#mix(g:_sbackground,'#000020',0.3)
+Hi Pmenu None spectral#mix(g:_sbackground,"#000020",0.3)
 
-Hi PreProcEnjinFunction spectral#mix(g:_sfunction,'#ffffff',0.3)
-Hi PreProcEnjinClass spectral#mix(g:_stype,'#ffffff',0.3)
-Hi PreProcEnjinAbstractClass spectral#mix(g:_sabstract_class,'#ffffff',0.3)
-Hi PreProcEnjinInterface spectral#mix(g:_sinterface,'#ffffff',0.3)
-Hi PreProcEnjinEnum spectral#mix(g:_senum,'#ffffff',0.3)
-Hi PreProcEnjinAnnotation spectral#mix(g:_stype,'#ffffff',0.3)
+Hi PreProcEnjinFunction spectral#mix(g:_sfunction,"#ffffff",0.3)
+Hi PreProcEnjinClass spectral#mix(g:_stype,"#ffffff",0.3)
+Hi PreProcEnjinAbstractClass spectral#mix(g:_sabstract_class,"#ffffff",0.3)
+Hi PreProcEnjinInterface spectral#mix(g:_sinterface,"#ffffff",0.3)
+Hi PreProcEnjinEnum spectral#mix(g:_senum,"#ffffff",0.3)
+Hi PreProcEnjinAnnotation spectral#mix(g:_stype,"#ffffff",0.3)
 
-let g:_sstatuslfg='#7aa6d2'
-Hi StatusLine g:_sstatuslfg spectral#mix(g:_svert,'#0000ff',0.2) None ["bold"]
+let g:_sstatuslfg="#7aa6d2"
+Hi StatusLine g:_sstatuslfg spectral#mix(g:_svert,"#0000ff",0.2) None ["bold"]
 Hi StatusLineNC spectral#desaturate(g:_sstatuslfg,0.5) g:_svert None ["bold"]
 
 call spectral#Finish()
diff --git a/colors/royal.vim b/colors/royal.vim
index d1bac40..8a969ab 100644
--- a/colors/royal.vim
+++ b/colors/royal.vim
@@ -11,11 +11,11 @@ if !exists('g:spectral_parameters')
         \               spectral#normalize([0.2, 0.2, 1], 0.8)]}
 endif
 
-let g:_snormal = '#2a1a12'
-let g:_sbg = '#e5dab8'
-let g:_sblueish = '#4e587e'
-let g:_sdarknormal = '#f1dbcf'
-let g:_sdarkbg = '#25211a'
+let g:_snormal = "#2a1a12"
+let g:_sbg = "#e5dab8"
+let g:_sblueish = "#4e587e"
+let g:_sdarknormal = "#f1dbcf"
+let g:_sdarkbg = "#25211a"
 let g:_sdarkvsplit = spectral#brighter(g:_sdarkbg, 2)
 let g:_sdarktablinefill = spectral#brighter(g:_sdarkbg, 0.6)
 let g:_sdarktabline = spectral#brighter(g:_sdarkbg, 0.8)
diff --git a/colors/spectral.vim b/colors/spectral.vim
index 66599d5..20f0ea7 100644
--- a/colors/spectral.vim
+++ b/colors/spectral.vim
@@ -7,86 +7,138 @@ let g:spectral_parameters = {
       \ 'default_bg': 'dark',
       \ 'flip_algorithm': 'sqrt'}
 
-let g:_syellow = '#f0e778'
-let g:_syellowgreen = '#a8f078'
-let g:_sgreen = '#76ec9e'
-let g:_sbluegreen = '#73e6cd'
-let g:_sblue = '#72d9e3'
-let g:_sbluepurple = '#719ae2'
-let g:_sred = '#ec8b76'
-let g:_sviolet = '#ec76e8'
-
-let g:_steal = '#76ece9'
-let g:_sorange = '#ecb976'
-
-
-let g:_snormal = '#e8e8d3'
-let g:_sbackground = '#1e1e1e'
-let g:_slightbg = '#fbf1d7'
+let g:_syellow = "#f0e778"
+let g:_syellowgreen = "#a8f078"
+let g:_sgreen = "#76ec9e"
+let g:_sbluegreen = "#73e6cd"
+let g:_sblue = "#72d9e3"
+let g:_sred = "#ec8b76"
+let g:_sviolet = "#ce74c1"
+
+let g:_steal = "#76ece9"
+let g:_sorange = "#ecb976"
+
+let g:_sbluepurple = "#9fa8f6"
+let g:_sbluepurple_brighter = "#c8b8ff"
+let g:_sbluepurple_darker = "#a186d9"
+
+let g:_snormal = "#e8e1d3"
+let g:_sbackground = "#1e1e1e"
+let g:_spmenu = "#000000"
+let g:_slightbg = "#fbf1d7"
+let g:_sred = "#ec8b76"
+let g:_svividorange = "#ff904a"
+
+let g:_spurple = "#d683bb"
+let g:_sdarkred = "#ac3634"
+let g:_sdarkyellow = "#acac34"
+let g:_sdarkblue = "#65adb7"
+let g:_sdarkgreen = "#55ad67"
 
 call spectral#StartCompile()
 
-let g:_snontext = spectral#brighter(g:_sbackground,0.5)
-let g:_svertsplit = spectral#brighter(g:_sbackground,0.4)
-let g:_ssigncol = spectral#brighter(g:_sbackground,0.5)
-let g:_snrcol = spectral#brighter(g:_sbackground,0.7)
+let g:_snontext = spectral#brighter(g:_sbackground,1.2)
+let g:_sbgdarker = spectral#brighter(g:_sbackground,0.4)
+let g:_ssigncol = g:_sbackground " spectral#brighter(g:_sbackground,0.5)
+let g:_scursorline = spectral#brighter(g:_sbackground,1.4)
+let g:_snrcol = g:_sbackground " spectral#brighter(g:_sbackground,0.7)
 let g:_sgray = spectral#brighter(g:_sbackground,5)
 let g:_slightgray = spectral#brighter(g:_sgray,1.5)
 
 let g:_slightbgbase = g:_sbackground
 let g:_slightnontext = spectral#brighter(g:_slightbgbase,0.5)
-let g:_slightvertsplit = spectral#brighter(g:_slightbgbase,0.4)
+let g:_slightbgdarker = spectral#brighter(g:_slightbgbase,0.4)
 let g:_slightsigncol = spectral#brighter(g:_slightbgbase,0.5)
 let g:_slightnrcol = spectral#brighter(g:_slightbgbase,0.7)
 let g:_slightgray = spectral#brighter(g:_slightbgbase,5)
 
+Hi EnjinParameter g:_sbluegreen
+Hi EnjinField g:_syellowgreen
+Hi EnjinTypeParameter g:_spurple None []
+Hi EnjinClass g:_sbluepurple_darker None []
+Hi EnjinAbstractClass g:_sbluepurple None []
+Hi EnjinInterface g:_sbluepurple_brighter None []
+Hi EnjinAnnotation g:_sbluepurple_brighter None []
+
+Hi PreProcEnjinTypeParameter spectral#saturate(g:_spurple,0.5) None []
+Hi PreProcEnjinClass spectral#saturate(g:_sbluepurple_darker,0.5) None []
+Hi PreProcEnjinAbstractClass spectral#saturate(g:_sbluepurple,0.5) None []
+Hi PreProcEnjinInterface spectral#saturate(g:_sbluepurple_brighter,0.5) None []
+Hi PreProcEnjinFunction     spectral#saturate(g:_sbluegreen,0.5) None    []
+
 HiDark Normal      g:_snormal g:_sbackground ["None"]
 HiLight Normal      #444635 g:_slightbg ["None"]
 
 Hi SignColumn  g:_snormal g:_ssigncol ["None"]
 
-Hi StorageClass g:_syellow None    ["bold"]
-Hi Structure    g:_syellowgreen None    ["bold"]
-Hi String       g:_sgreen None    ["bold"]
-Hi Type         g:_sbluepurple None    ["bold"]
-Hi Statement    g:_sblue None    ["bold"]
+Hi PMenu g:_svividorange g:_spmenu
+Hi PMenuSel g:_sred g:_spmenu ["Inverse",]
+Hi StorageClass g:_syellowgreen None    ["Bold"]
+Hi Folded g:_sred g:_ssigncol None ["Bold"]
+Hi FoldColumn g:_sred g:_ssigncol None []
+Hi javaScopeDecl g:_steal None    ["Bold"]
+Hi javaExternalImport g:_steal None    ["Bold"]
+Hi Structure    g:_syellowgreen None    ["Bold"]
+Hi String       g:_sgreen None    []
+Hi Type         g:_sbluepurple None    []
+Hi Statement    g:_sblue None    ["Bold"]
 Hi ColorColumn  spectral#brighter(g:_sbackground,2) None    ["None"] 
-Hi PreProc      g:_sviolet None    ["bold"]
-Hi Function     g:_sred None    ["bold"]
-Hi Identifier   g:_syellow None    ["bold"]
-Hi Number       g:_steal None    ["bold"]
+Hi PreProc      g:_sviolet None    []
+Hi Function     g:_sbluegreen None    []
+Hi Identifier   g:_sred None
+Hi Number       g:_steal None    ["Bold"]
 Hi Comment      g:_sgray None    ["Italic"]
-Hi Directory    g:_syellow None    ["None"]
+Hi Directory    g:_syellow None    ["Bold"]
 Hi Constant     g:_sred None ["Bold"]
 Hi Specialcomment g:_slightgray None ["Bold"]
-Hi Operator g:_sred
+Hi Operator g:_svividorange None ["Bold"]
+Hi Special g:_sorange None ["Bold"]
 
 Hi Visual      g:_sbackground g:_sred
 
-Hi LineNrAbove g:_sblue g:_snrcol ["bold"]
-Hi LineNrBelow g:_sred g:_snrcol ["bold"]
-Hi LineNr g:_syellow g:_snrcol ["bold"]
-Hi CursorLineNr g:_syellow g:_snrcol ["inverse","bold"]
-Hi NonText     g:_sred g:_snontext ["bold"]
-
-HiDark VertSplit g:_svertsplit g:_svertsplit
-HiDark TabLineFill None g:_svertsplit
-HiDark TabLine None g:_snontext ["bold"]
-HiDark StatusLine g:_sred g:_svertsplit
-HiDark StatusLineNC g:_snormal g:_svertsplit
-
-HiLight VertSplit g:_slightvertsplit g:_slightvertsplit
-HiLight TabLineFill None g:_slightvertsplit
-HiLight TabLine None g:_slightnontext ["bold"]
-HiLight StatusLine g:_sred g:_slightvertsplit
-HiLight StatusLineNC g:_snormal g:_slightvertsplit
+Hi LineNrAbove spectral#mix(spectral#saturate(g:_sblue,0.6),g:_snrcol,0.5) g:_snrcol []
+Hi LineNrBelow spectral#mix(spectral#saturate(g:_sred,0.6),g:_snrcol,0.5) g:_snrcol []
+Hi LineNr spectral#mix(spectral#saturate(g:_syellow,0.6),g:_snrcol,0.5) g:_snrcol []
+Hi CursorLineNr spectral#mix(spectral#saturate(g:_syellow,0.6),g:_snrcol,0.5) g:_scursorline []
+Hi NonText     g:_sred g:_snontext ["Bold"]
+
+Hi CursorLine None g:_scursorline
+Hi CursorColumn None g:_scursorline
+
+HiDark VertSplit #000000 g:_sbackground ["Bold"]
+HiDark FloatBorder g:_sred g:_sbgdarker
+HiDark TabLineFill None g:_sbgdarker
+HiDark TabLine None g:_snontext ["Bold"]
+HiDark TabLineSel g:_svividorange None ["Bold"]
+HiDark StatusLine g:_sred g:_sbgdarker
+HiDark StatusLineNC g:_snormal g:_sbgdarker
+
+HiLight FloatBorder g:_sred g:_slightbgdarker
+HiLight VertSplit g:_slightbgdarker g:_slightbgdarker
+HiLight TabLineFill None g:_slightbgdarker
+HiLight TabLine None g:_slightnontext ["Bold"]
+HiLight TabLineSel g:_svividorange None ["Bold"]
+HiLight StatusLine g:_sred g:_slightbgdarker
+HiLight StatusLineNC g:_snormal g:_slightbgdarker
 
 Hi Spellbad None None g:_sred ["undercurl"]
 
 Hi Search g:_syellow None ["Inverse"]
 Hi SearchInc g:_sblue None ["Inverse"]
 
+Hi Error g:_sdarkred
+Hi Warning g:_sdarkyellow
+Hi Info g:_sdarkblue
+Hi Success g:_sdarkgreen
+
+Hi DiagnosticSignWarn g:_sdarkyellow None ["None"] 
+Hi DiagnosticSignError g:_sdarkred None ["None"] 
+Hi DiagnosticVirtualTextWarn g:_sdarkyellow spectral#brighter(g:_sbackground,0.7) ["None"] 
+Hi DiagnosticVirtualTextError g:_sdarkred spectral#brighter(g:_sbackground,0.7) ["None"] 
+
 call spectral#Finish()
 
+call spectral#useDefaultTerminalColors()
+
 hi link vimFunction Function
 hi link PreProcEnjinAnnotation PreProcEnjinInterface