Update pain.lua

This commit is contained in:
LDDestroier 2018-11-08 20:33:15 -05:00 committed by GitHub
parent 94a7cbc846
commit 3871a53d93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

View File

@ -2964,20 +2964,20 @@ local getInput = function() --gotta catch them all
elseif keysDown[keys.leftShift] then
if #paintEncoded > 1 then
if key == keys.equals and paintEncoded[frame+1] then --basically plus
for a = 1, #paintEncoded[frame+1] do
paintEncoded[frame][#paintEncoded[frame] + 1] = paintEncoded[frame+1][a]
for a = 1, #paintEncoded[frame] do
paintEncoded[frame+1][#paintEncoded[frame+1] + 1] = paintEncoded[frame][a]
end
table.remove(paintEncoded, frame+1)
table.remove(paintEncoded, frame)
paintEncoded = clearAllRedundant(paintEncoded)
barmsg = "Merged next frame."
end
if key == keys.minus and paintEncoded[frame-1] then
for a = 1, #paintEncoded[frame+1] do
paintEncoded[frame][#paintEncoded[frame] + 1] = paintEncoded[frame-1][a]
for a = 1, #paintEncoded[frame] do
paintEncoded[frame-1][#paintEncoded[frame-1] + 1] = paintEncoded[frame][a]
end
table.remove(paintEncoded, frame-1)
table.remove(paintEncoded, frame)
paintEncoded = clearAllRedundant(paintEncoded)
barmsg = "Merged previous frame."
barmsg = "Merged next frame."
end
end
else