Revert "convert colors from 0..255 scale to 0..1"

This reverts commit 947e208.

Author: qixils

android.lua

@@ -216,7 +216,7 @@ function androidDraw()
 			local x, y, w, h = skin["center"][1]:getViewport()
 			skinSpriteBatch:add(skin["center"][1], skinData["center"][1], skinData["center"][2], 0, skinData["center"][3]/w, skinData["center"][4]/h)
 		end
-		love.graphics.setColor(255, 255, 255)
+		love.graphics.setColor(255,255,255)
 		love.graphics.draw(skinSpriteBatch,0,0)
 		for name, b in pairs(buttons) do
 			if skinData.highlightonpress or not b.held then

animation.lua

@@ -598,7 +598,7 @@ function animation:update(dt)
 					playmusic()
 				end
 			elseif v[1] == "changebackgroundcolor" then
-				love.graphics.setBackgroundColor(tonumber(v[2]), tonumber(v[3]), tonumber(v[4]))
+				love.graphics.setBackgroundColor(tonumber(v[2]) or 255, tonumber(v[3]) or 255, tonumber(v[4]) or 255)
 			elseif v[1] == "killplayer" then
 				if v[2] == "everyone" then
 					for i = 1, players do

characters.lua

@@ -27,8 +27,6 @@ function loadcustomplayers()
 				i = #characters["list"]+1,
 
 				--colors
-				-- !! MAKE SURE to add any new RGB variables to `colorvariables` at the top !!
-				-- !! to ensure they get automatically converted from 0..255 to 0..1        !!
 				colorables = {"hat", "hair", "skin"},
 				colors = {},
 				defaultcolors = false,
@@ -468,18 +466,17 @@ function splitimage(img, color, exclude, imagedata) --split singe image into col
 		for x = 0, input:getWidth()-1 do
 			for y = 0, input:getHeight()-1 do
 				local r, g, b, a = input:getPixel(x, y)
-				local rr, rg, rb = r, g, b
 				local place = false
 				if exclude then
 					place = true
 					for i, c in pairs(color) do
-						if rr == c[1] and rg == c[2] and rb == c[3] then
+						if r == c[1] and g == c[2] and b == c[3] then
 							place = false
 							break
 						end
 					end
 				else
-					if rr == color[1] and rg == color[2] and rb == color[3] then
+					if r == color[1] and g == color[2] and b == color[3] then
 						place = true
 					end
 				end

clearpipe.lua

@@ -774,7 +774,7 @@ function clearpipe:draw()
 					ox, oy = t[2]*dx+self.sucklen*math.max(0,-dx), t[1]
 				end
 				local v = (t[2]/self.sucklen)
-				love.graphics.setColor(255, 255, 255, 255*v)
+				love.graphics.setColor(255,255,255,255*v)
 				love.graphics.draw(dustimg, dustquad[t[5]], (x+ox-xscroll)*16*scale, (y+oy-.5-yscroll)*16*scale, t[3], scale, scale, 8, 8)
 				if self.suckentranceportalx then
 					local dir = self.suckentranceportalfacing
@@ -785,7 +785,7 @@ function clearpipe:draw()
 						ox, oy = t[2]*dx+self.sucklen*math.max(0,-dx), t[1]
 					end
 					local v = (t[2]/self.sucklen)
-					love.graphics.setColor(255, 255, 255, 255*v)
+					love.graphics.setColor(255,255,255,255*v)
 					love.graphics.draw(dustimg, dustquad[t[5]], (x+ox-xscroll)*16*scale, (y+oy-.5-yscroll)*16*scale, t[3], scale, scale, 8, 8)
 				end
 			end
@@ -798,7 +798,7 @@ function clearpipe:draw()
 					ox, oy = t[2]*dx+self.sucklen*math.max(0,-dx), t[1]
 				end
 				local v = 1-(t[2]/self.sucklen)
-				love.graphics.setColor(255, 255, 255, 255*v)
+				love.graphics.setColor(255,255,255,255*v)
 				love.graphics.draw(dustimg, dustquad[t[5]], (x+ox-xscroll)*16*scale, (y+oy-.5-yscroll)*16*scale, t[3], scale, scale, 8, 8)
 				if self.suckexitportalx then
 					local dir = self.suckexitportalfacing
@@ -809,7 +809,7 @@ function clearpipe:draw()
 						ox, oy = t[2]*dx+self.sucklen*math.max(0,-dx), t[1]
 					end
 					local v = 1-(t[2]/self.sucklen)
-					love.graphics.setColor(255, 255, 255, 255*v)
+					love.graphics.setColor(255,255,255,255*v)
 					love.graphics.draw(dustimg, dustquad[t[5]], (x+ox-xscroll)*16*scale, (y+oy-.5-yscroll)*16*scale, t[3], scale, scale, 8, 8)
 				end
 			end

editor.lua

@@ -101,7 +101,7 @@ function editor_load(player_position) --{x, y, xscroll, yscroll}
 	mtsavehighlighttime = 5
 	mtsavetimer = 0
 	mtjustsaved = false
-	mtsavecolors = {255, 112, 112, 127}
+	mtsavecolors = {255, 112, 112, 128}
 	pastingtiles = false
 	pastemode = 1
 	pastecenter = {0, 0}
@@ -272,11 +272,11 @@ function editor_load(player_position) --{x, y, xscroll, yscroll}
 	guielements["portalbutton"].bordercolor = {0, 0, 255}
 	guielements["portalbutton"].bordercolorhigh = {127, 127, 255}
 	guielements["selectionbutton"] = guielement:new("button", 5, 58, TEXT["selection tool"], selectionbutton, 2, false, 1, 120)
-	guielements["selectionbutton"].bordercolor = {1, 106, 0}
-	guielements["selectionbutton"].bordercolorhigh = {1, 206, .5}
+	guielements["selectionbutton"].bordercolor = {255, 106, 0}
+	guielements["selectionbutton"].bordercolorhigh = {255, 206, 127}
 	guielements["powerlinebutton"] = guielement:new("button", 5, 76, TEXT["power line draw"], powerlinebutton, 2, false, 1, 120)
-	guielements["powerlinebutton"].bordercolor = {1, 216, 0}
-	guielements["powerlinebutton"].bordercolorhigh = {1, 1, 220}
+	guielements["powerlinebutton"].bordercolor = {255, 216, 0}
+	guielements["powerlinebutton"].bordercolorhigh = {255, 255, 220}
 	currenttooldesc = 1 --what description should be displayed for the buttons
 
 	guielements["livesdecrease"] = guielement:new("button", 294, 104, "{", livesdecrease, 0)
@@ -1430,7 +1430,7 @@ function editor_draw()
 
 						local transparent = false
 						while (t[4] == "down" and y+offy < mapheight+0.5) or (t[4] == "up" and y+offy > 0) do
-							love.graphics.setColor(255, 255, 255, 255)
+							love.graphics.setColor(255,255,255,255)
 							if transparent then
 								love.graphics.setColor(255, 255, 255, 100)
 							end
@@ -1515,7 +1515,7 @@ function editor_draw()
 							y = tonumber(s[3])
 							tile = tonumber(command:sub(s2+4, -1))
 						end
-						love.graphics.setColor(255, 255, 255, 150)
+						love.graphics.setColor(255,255,255,150)
 						local tx, ty = getMouseTile(mousex, mousey+8*screenzoom*scale)
 						properprint(tx .. "-" .. ty, mousex, mousey)
 					end
@@ -1647,7 +1647,7 @@ function editor_draw()
 						end
 					end
 				elseif customrcopen == "trackpath" then
-					love.graphics.setColor(255, 255, 255)
+					love.graphics.setColor(255,255,255)
 					local rcp = rightclicktrack
 					local lx, ly = rcp.last[1], rcp.last[2]--last pos
 					for i = 1, #rcp.path do
@@ -1693,15 +1693,15 @@ function editor_draw()
 								end
 								local cox, coy = getMouseTile(mousex, mousey+8*screenzoom*scale)
 								if (cox == tx and coy == ty and not trackrightclickmenu.active) or (trackrightclickmenu.active and trackrightclickmenustage == i) then
-									love.graphics.setColor(255, 216, 0, 255)
+									love.graphics.setColor(255,216,0,255)
 								end
 								love.graphics.draw(trackmarkerimg, trackmarkerquad[quadi], math.floor(((tx-xscroll-.5)*16)*scale), math.floor(((ty-yscroll-1)*16)*scale), r, scale, scale, 8, 8)
-								love.graphics.setColor(255, 255, 255)
+								love.graphics.setColor(255,255,255)
 							end
 						end
 					end
 					--next track
-					love.graphics.setColor(255, 216, 0, 150)
+					love.graphics.setColor(255,216,0,150)
 					local left, right, up, down, leftup, leftdown, rightup, rightdown = true,true,true,true,true,true,true,true
 					for i = #rcp.path, 1, -1 do
 						--check overlap
@@ -1874,7 +1874,7 @@ function editor_draw()
 					local sx, sy, sw, sh = x1-1, y1-1, x2-x1+1, y2-y1+1
 					love.graphics.setColor(0, 131, 255, 45)
 					love.graphics.rectangle("fill", ((sx-xscroll)*16)*scale,((sy-yscroll)*16-8)*scale, sw*16*scale, sh*16*scale)
-					love.graphics.setColor(255, 255, 255)
+					love.graphics.setColor(255,255,255)
 					love.graphics.stencil(function() 
 						love.graphics.setLineWidth(scale)
 						love.graphics.rectangle("line", (math.floor((sx-xscroll)*16)+.5)*scale, (math.floor((sy-yscroll)*16)-8+.5)*scale, (sw*16-1)*scale, (sh*16-1)*scale) end, "increment")
@@ -2199,7 +2199,7 @@ function editor_draw()
 		else --just moving camera
 			love.graphics.setColor(255,0,0)
 			love.graphics.rectangle("line", (mapx+(xscroll+nmox)*s)*scale, (mapy+(yscroll+nmoy+.5)*s)*scale, width*s*scale, height*s*scale)
-			love.graphics.setColor(255, 255, 255)
+			love.graphics.setColor(255,255,255)
 			properprintFbackground(TEXT["toggle minimap with m"], 8*scale, (height*16-16)*scale)
 		end
 	else
@@ -2222,7 +2222,7 @@ function editor_draw()
 		guielements["tabcustom"]:draw()
 		guielements["tabanimations"]:draw()
 
-		if editorstate == "tiles" then
+		if editorstate == "tiles" then			
 			--TILES
 			love.graphics.setColor(255, 255, 255)
 
@@ -2680,9 +2680,9 @@ function editor_draw()
 					love.graphics.setColor(0,0,0)
 					love.graphics.rectangle("fill", (lpd.x+1)*scale, (lpd.y+12)*scale, (lpd.width+5-2)*scale, (8*len+1-1)*scale)
 					if high then
-						love.graphics.setColor(255, 255, 255)
+						love.graphics.setColor(255,255,255)
 					else
-						love.graphics.setColor(127, 127, 127)
+						love.graphics.setColor(127,127,127)
 					end
 					drawrectangle(lpd.x, lpd.y+12, lpd.width+5, 8*len+1)
 					guielements["intermissioncheckbox"]:draw()
@@ -4694,7 +4694,7 @@ function createlevelbuttons(i)
 					local d = meta_data[i .. "~" .. j .. "~" .. k]
 					if d.img then
 						guielements[name].image = d.img
-						guielements[name].imagecolor = {127, 127, 127}
+						guielements[name].imagecolor = {128, 128, 128}
 						guielements[name].imageoffsetx = 2
 						guielements[name].imageoffsety = 2
 					end
@@ -5811,11 +5811,11 @@ function openrightclickmenu(x, y, tileX, tileY)
 							rightclickvalues2[variablenum] = dir
 							for i = objstart, objstart+objs-1 do
 								if i == obj then
-									rightclickobjects[i].bordercolorhigh = {255, 127, 127}
-									rightclickobjects[i].bordercolor = {255, 0, 0}
+									rightclickobjects[i].bordercolorhigh = {255,127,127}
+									rightclickobjects[i].bordercolor = {255,0,0}
 								else
-									rightclickobjects[i].bordercolorhigh = {255, 255, 255}
-									rightclickobjects[i].bordercolor = {127, 127, 127}
+									rightclickobjects[i].bordercolorhigh = {255,255,255}
+									rightclickobjects[i].bordercolor = {127,127,127}
 								end
 							end
 						end
@@ -5851,7 +5851,7 @@ function openrightclickmenu(x, y, tileX, tileY)
 					addv = 13
 				elseif obj == "slider" then
 					local d = guielement:new("scrollbar", rx, ry, 100, 33, 9, vt[t[2]], "hor")
-					d.backgroundcolor = {0, 0, 0}
+					d.backgroundcolor = {0,0,0}
 					d.scrollstep = 0
 					d.displayfunction = t[3]
 					d.rightclickvalue = t[2]

enemies/turret.lua

@@ -500,7 +500,7 @@ function turret:draw()
 	else
 		love.graphics.draw(self.graphic, turretquad[1], math.floor(((self.x-xscroll)*16+self.offsetX+1)*scale), ((self.y-.5-yscroll)*16+self.offsetY)*scale,  self.rotation, dirscale, scale, self.quadcenterX, self.quadcenterY)
 	end
-	
+
 	local shade = 255*(1-turretdarkenfactor*self.timer)
 	love.graphics.setColor(shade, shade, shade)
 

errorwindow.lua

@@ -20,30 +20,30 @@ function errorwindow:init(title, text)
 	self.button["retry"] = guielement:new("button", self.x+self.width-8-padding, self.y+self.height-15-padding, "retry", function() end, 2)
 	self.button["retry"].x = self.button["retry"].x - self.button["retry"].width
 
-	self.a = 1
+	self.a = 255
 	self.opened = false
 end
 
 function errorwindow:update(dt)
-	self.a = math.min(1, self.a + 3000*dt)
+	self.a = math.min(255, self.a + 3000*dt)
 	self.button["ignore"]:update(dt)
 	self.button["retry"]:update(dt)
 end
 
 function errorwindow:draw(a)
 	a = a or self.a
 	--window
-	love.graphics.setColor(0, 0, 0, 230*(a/255))
+	love.graphics.setColor(0,0,0,230*(a/255))
 	love.graphics.rectangle("fill", self.x*scale, self.y*scale, self.width*scale, self.height*scale)
-	love.graphics.setColor(255, 255, 255, a)
+	love.graphics.setColor(255,255,255,a)
 	drawrectangle(self.x, self.y, self.width, 19)
 	drawrectangle(self.x, self.y+18, self.width, self.height-18)
 	--text
 	love.graphics.setScissor(self.x*scale, self.y*scale, self.width*scale, (self.height-padding-15)*scale)
-	love.graphics.setColor(255, 255, 255, a)
+	love.graphics.setColor(255,255,255,a)
 	properprintfast(self.title, (self.x+padding)*scale, (self.y+padding)*scale)
 
-	love.graphics.setColor(255, 255, 255, a)
+	love.graphics.setColor(255,255,255,a)
 	properprintfastf(self.text, (self.x+padding)*scale, (self.y+padding+20)*scale, self.width-padding*2)
 	love.graphics.setScissor()
 

game.lua

@@ -1548,9 +1548,9 @@ function game_draw()
 		--BACKGROUND TILES
 		if bmap_on then
 			if editormode then
-				love.graphics.setColor(255, 255, 255, 100)
+				love.graphics.setColor(255,255,255,100)
 			else
-				love.graphics.setColor(255, 255, 255, 255)
+				love.graphics.setColor(255,255,255,255)
 			end
 			love.graphics.draw(smbspritebatch[2], math.floor((-(xoff-math.floor(xscroll))*16)*scale), math.floor((-(yoff-math.floor(yscroll))*16)*scale))
 			love.graphics.draw(portalspritebatch[2], math.floor((-(xoff-math.floor(xscroll))*16)*scale), math.floor((-(yoff-math.floor(yscroll))*16)*scale))
@@ -1569,7 +1569,7 @@ function game_draw()
 					end
 				end
 			end
-			love.graphics.setColor(255, 255, 255, 255)
+			love.graphics.setColor(255,255,255,255)
 		end
 
 		--DROP SHADOW
@@ -1632,7 +1632,7 @@ function game_draw()
 				end
 			end
 			love.graphics.pop()
-			love.graphics.setColor(255, 255, 255, 255)
+			love.graphics.setColor(255,255,255,255)
 		end
 
 		--Mushroom under tiles
@@ -1774,7 +1774,7 @@ function game_draw()
 		end
 
 		--snakeblock
-		love.graphics.setColor(255, 255, 255)
+		love.graphics.setColor(255,255,255)
 		for j, w in pairs(objects["snakeblock"]) do
 			w:draw()
 		end
@@ -2113,7 +2113,7 @@ function game_draw()
 		for j, w in pairs(clearpipes) do
 			w:draw()
 		end
-		love.graphics.setColor(255, 255, 255)
+		love.graphics.setColor(255,255,255)
 
 		--3D Mode
 		if _3DMODE then
@@ -2158,7 +2158,7 @@ function game_draw()
 				end
 				love.graphics.pop()
 			end
-			love.graphics.setColor(255, 255, 255, 255)
+			love.graphics.setColor(255,255,255,255)
 		end
 
 		--lakito
@@ -2520,7 +2520,7 @@ function game_draw()
 		for i, v in pairs(portalprojectiles) do
 			v:particledraw()
 		end
-		love.graphics.setColor(255, 255, 255)
+		love.graphics.setColor(255,255,255)
 		love.graphics.draw(portalprojectilespritebatch,0,0)
 		for i, v in pairs(portalprojectiles) do
 			v:draw()
@@ -2777,17 +2777,17 @@ function game_draw()
 		end
 		love.graphics.stencil(stencil4)
 		love.graphics.setStencilTest("less", 1)
-		love.graphics.setColor(0, 0, 0, .25*255)
+		love.graphics.setColor(0, 0, 0, 255/4)
 		love.graphics.rectangle("fill", 0, 0, width*16*scale, 224*scale)
 		love.graphics.setStencilTest()
 		love.graphics.stencil(stencil3)
 		love.graphics.setStencilTest("less", 1)
-		love.graphics.setColor(0, 0, 0, .33*255)
+		love.graphics.setColor(0, 0, 0, 255/3)
 		love.graphics.rectangle("fill", 0, 0, width*16*scale, 224*scale)
 		love.graphics.setStencilTest()
 		love.graphics.stencil(stencil2)
 		love.graphics.setStencilTest("less", 1)
-		love.graphics.setColor(0, 0, 0, .5*255)
+		love.graphics.setColor(0, 0, 0, 255/2)
 		love.graphics.rectangle("fill", 0, 0, width*16*scale, 224*scale)
 		love.graphics.setStencilTest()
 		love.graphics.stencil(stencil)
@@ -2842,7 +2842,7 @@ function game_draw()
 	love.graphics.translate(0, yoffset*scale)
 
 	if testlevel then
-		love.graphics.setColor(255, 0, 0, .5*255)
+		love.graphics.setColor(255, 0, 0, 127)
 		properprintfast("TESTING LEVEL - PRESS ESC TO RETURN TO EDITOR", 16*scale, 0)
 	end
 
@@ -3678,7 +3678,7 @@ function drawplayer(i, x, y, r, pad, drop)
 
 	--ice block
 	if v.frozen then
-		love.graphics.setColor(255, 255, 255, a)
+		love.graphics.setColor(255,255,255, a)
 		local w, h = math.ceil(v.width)*2+1, math.ceil(v.height)*2+1
 		for x = 1, w do
 			for y = 1, h do
@@ -3728,7 +3728,7 @@ function drawplayer(i, x, y, r, pad, drop)
 			background = {0, 0, 0}
 		end]]
 
-		love.graphics.setColor(playerlist[v.playernumber].colors[1][1], playerlist[v.playernumber].colors[1][2], playerlist[v.playernumber].colors[1][3], .5*255)
+		love.graphics.setColor(playerlist[v.playernumber].colors[1][1], playerlist[v.playernumber].colors[1][2], playerlist[v.playernumber].colors[1][3], 127)
 		properprintbackground(nick, math.floor(((px-xscroll+v.width/2)*16-((#nick*8)/2))*scale), math.floor(((py-yscroll)*16-28)*scale), true)--, background)
 	end
 end