Fixed Certain Colors not Working (alesan99#615)

* Fixed Certain Colors and some Nitpicks

The more important parts were fixing the custom background color in the menu, the dialogue text, enemy colors so Kirby would be fixed, and fixed not detecting half slants with the tiles.

The rest are just nitpicks of mine like Toad's colors, P2 Mario's hat, the Ice Flower Entity Tooltip, and some global color var tweaking

* Fixed Custom Powerup Colors

Also fuck it I'm making `convertcolors` global, I'm gonna need that

* fix: parse user input

`curcolor` comes from user input along the lines of %rrr,ggg,bbb%; for backwards compatibility it needs to be parsed as 0..255 then converted to 0..1

---------

Co-authored-by: Lexi Larkin <[email protected]>

Author: KirbyKid256

alesans_entities/characters/mario/config.json

@@ -6,7 +6,7 @@
 		[134,112,0],
 		[252,151,58]],
 
-		[[225,255,255],
+		[[255,255,255],
 		[0,168,0],
 		[252,151,58]],
 

alesans_entities/characters/toad/config.json

@@ -14,19 +14,19 @@
 	"defaultcolors": [
 		[[252,252,252],
 		[32,56,236],
-		[252,151,58]],
+		[252,152,56]],
 
-		[[225,255,255],
+		[[252,252,252],
 		[255,160,68],
-		[252, 188, 176]],
+		[252,152,56]],
 
 		[[252,252,252],
 		[216,40,0],
-		[252,151,58]],
+		[252,152,56]],
 
 		[[252,252,252],
 		[0,168,0],
-		[252,151,58]]
+		[252,152,56]]
 		],
 	"flowercolor": [[60,188,252], [216,40,0], [252,152,56]],
 	"hammersuitcolor": [[252,252,252], [0,0,0], [252,152,56]],

characters.lua

@@ -13,7 +13,7 @@ local function iscolorvariable(key)
 	return false
 end
 
-local function convertcolors(table)
+function convertcolors(table)
 	if table == nil or #table == 0 then
 		return
 	end

game.lua

@@ -3049,7 +3049,12 @@ function drawentity(j, w, i, v, currentscissor, drop)
 	else
 		if v.graphic and v.quad then
 			if v.graphiccolor and (not drop) then
-				love.graphics.setColor(v.graphiccolor)
+				local graphiccolor = {}
+				for gci = 1, #v.graphiccolor do
+					local color = tonumber(v.graphiccolor[gci])
+					graphiccolor[gci] = color
+				end
+				love.graphics.setColor(graphiccolor)
 			end
 			love.graphics.draw(v.graphic, v.quad, math.floor(((v.x-xscroll)*16+v.offsetX)*scale), math.floor(((v.y-yscroll)*16-v.offsetY)*scale), v.rotation, dirscale, horscale, v.quadcenterX, v.quadcenterY)
 			if v.overlaygraphic then
@@ -3097,7 +3102,11 @@ function drawentity(j, w, i, v, currentscissor, drop)
 			else
 				if v.graphic and v.quad then
 					if v.graphiccolor and (not drop) then
-						love.graphics.setColor(v.graphiccolor)
+						local graphiccolor = {}
+						for gci = 1, #v.graphiccolor do
+							graphiccolor[gci] = tonumber(v.graphiccolor[i])
+						end
+						love.graphics.setColor(graphiccolor)
 					end
 					love.graphics.draw(v.graphic, v.quad, math.floor(((px-xscroll)*16+v.offsetX)*scale), math.floor(((py-yscroll)*16-v.offsetY)*scale), pr, dirscale, horscale, v.quadcenterX, v.quadcenterY)
 					if v.overlaygraphic then

graphics/entitytooltips/iceflower.png

@@ -1590,7 +1590,7 @@ function defaultconfig()
 	--3: skin (yellow-orange)
 
 	mariocolors = {}
-	mariocolors[1] = {{224/255,  32/255,       0}, {136/255, 112/255,       0}, {252/255, 152/255,  56/255}}
+	mariocolors[1] = {{225/255,  32/255,       0}, {136/255, 112/255,       0}, {252/255, 152/255,  56/255}}
 	mariocolors[2] = {{      1,       1,       1}, {      0, 160/255,       0}, {252/255, 152/255,  56/255}}
 	mariocolors[3] = {{      0,       0,       0}, {200/255,  76/255,  12/255}, {252/255, 188/255, 176/255}}
 	mariocolors[4] = {{ 32/255,  56/255, 236/255}, {      0, 128/255, 136/255}, {252/255, 152/255,  56/255}}

main.lua

@@ -6363,6 +6363,7 @@ function mario:globalcollide(a, b)
 					self.fireenemy = b.makesmarioshoot
 					self.dofireenemy = self.fireenemy
 					if b.makesmariocolor then
+						convertcolors(b.makesmariocolor)
 						self.customcolors = b.makesmariocolor
 						for i, v in pairs(self.customcolors) do
 							for j, w in pairs(v) do

mario.lua

@@ -1803,7 +1803,7 @@ function loadbackground(background)
 				else
 					local s4 = s3[2]:split(",")
 					local backgroundrgbon = true
-					local backgroundrgb = {tonumber(s4[1]), tonumber(s4[2]), tonumber(s4[3])}
+					local backgroundrgb = {tonumber(s4[1])/255, tonumber(s4[2])/255, tonumber(s4[3])/255}
 					love.graphics.setBackgroundColor(unpack(backgroundrgb))
 				end
 			elseif s3[1] == "spriteset" then

menu.lua

@@ -44,7 +44,7 @@ flowercolor = {{252/255, 216/255, 168/255}, {216/255, 40/255, 0}, {252/255, 152/
 hammersuitcolor = {{0, 0, 0}, {1, 1, 1}, {252/255, 152/255, 56/255}}
 frogsuitcolor = {{0, 168/255, 0}, {0, 0, 0}, {252/255, 152/255, 56/255}}
 leafcolor = {{224/255, 32/255, 0}, {136/255, 112/255, 0}, {252/255, 152/255, 56/255}}
-iceflowercolor = {{1, 1, 1}, {60/255, 188/255, 252/255}, {252/255, 152/255, 56/255}}
+iceflowercolor = {{225/255,1,1}, {60/255, 188/255, 252/255}, {252/255, 152/255, 56/255}}
 tanookisuitcolor =  {{200/255, 76/255, 12/255}, {0, 0, 0}, {252/255, 152/255, 56/255}}
 statuecolor =  {{116/255, 116/255, 116/255}, {0, 0, 0}, {188/255, 188/255, 188/255}}
 superballcolor = {{100/255, 100/255, 50/255}, {160/255, 160/255, 110/255}, {230/255, 230/255, 180/255}}