sorcery  Diff

Differences From Artifact [9a1b399926]:

• File lib/color.lua — part of check-in [41fdb5b0b8] at 2021-04-21 01:32:38 on branch trunk — ui tweaks, rework enchantment slightly (user: lexi, size: 6281) [annotate] [blame] [check-ins using]

To Artifact [914583aeb0]:

• File lib/color.lua — part of check-in [b82a675e76] at 2021-07-06 19:26:16 on branch trunk — bug fixes (user: lexi, size: 6398) [annotate] [blame] [check-ins using]

   207    207   		}
   208    208   		if g == nil then
   209    209   			if type(r) == 'string' then
   210    210   				assert(false) -- TODO parse color string
   211    211   			elseif type(r) == 'table' then
   212    212   				if r.hue then
   213    213   					return from_hsl(r, r.alpha or g)
          214  +				elseif r.r and r.g and r.b then
          215  +					new.red = r.r
          216  +					new.green = r.g
          217  +					new.blue = r.b
          218  +					new.alpha = r.a
   214    219   				else
   215    220   					new.red = r[1]
   216    221   					new.green = r[2]
   217    222   					new.blue = r[3]
   218    223   					new.alpha = r[4]
   219    224   				end
   220    225   			else assert(false) end