From 6b089e4e4327601b95a2950d862dc6cdc9f7346d Mon Sep 17 00:00:00 2001 From: KikooDX Date: Fri, 21 Feb 2020 15:35:35 +0100 Subject: [PATCH] Custom texture (force) system --- draw.lua | 4 +++- force_img/glue.png | Bin 0 -> 133 bytes force_img/ice.png | Bin 0 -> 172 bytes tiles.lua | 6 +++++- update.sh | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 force_img/glue.png create mode 100644 force_img/ice.png diff --git a/draw.lua b/draw.lua index 9d3bf54..96a7bab 100644 --- a/draw.lua +++ b/draw.lua @@ -22,7 +22,9 @@ function love.draw() end --draw preview love.graphics.setColor(1, 1, 1, 0.5) - love.graphics.draw(tiles[selected_tile], clip_mouse_x, clip_mouse_y) + if tiles[selected_tile] then + love.graphics.draw(tiles[selected_tile], clip_mouse_x, clip_mouse_y) + end --gui love.graphics.pop() love.graphics.setColor(0.8, 0.8, 0.8, 1) diff --git a/force_img/glue.png b/force_img/glue.png new file mode 100644 index 0000000000000000000000000000000000000000..3a83b68f86b534e4372c41b44b5244cba1771ae5 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|>^)r^Lo9le z|LmXf(4LvKp;PE=h+zZkbeGdlEqOq|beCqu)0qi8PHYdEd~S$LJd~cJH{19~a^jVS bM4)MPJ4Am^3BJ+^G>XB~)z4*}Q$iB}IDRQz literal 0 HcmV?d00001 diff --git a/force_img/ice.png b/force_img/ice.png new file mode 100644 index 0000000000000000000000000000000000000000..3841df50b16eb62897f5b9b5927f54d4e8354d19 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|(mY)pLo9le zuf+WRZ_g}pM#P#i*=WiBO$iR{H=fMYxX5GP5ObCX2zuK2Wk5cMf;r zkF3X2(+{nlIpHBt+Gk2e+ir&GDpm*7&fkbJdu}hb)rDE@ke3^;#2=vDI^E`6_x0S* Q0BvOOboFyt=akR{0CwUzG5`Po literal 0 HcmV?d00001 diff --git a/tiles.lua b/tiles.lua index 24956f3..dae42b0 100644 --- a/tiles.lua +++ b/tiles.lua @@ -4,7 +4,11 @@ tiles = { love.graphics.newImage(img_path.."ground.png"), love.graphics.newImage(img_path.."spike.png"), love.graphics.newImage(img_path.."elevator1.png"), + love.graphics.newImage(img_path.."glue.png"), + love.graphics.newImage(img_path.."ice.png"), + love.graphics.newImage(img_path.."coin.png"), + love.graphics.newImage(img_path.."jitem.png"), } -tiles_char = { '0', 'v', '^' } +tiles_char = { '0', 'v', '^', '~', '#', 'c', 'j' } selected_tile = 1 diff --git a/update.sh b/update.sh index c377cff..73594cb 100755 --- a/update.sh +++ b/update.sh @@ -1,4 +1,5 @@ rm -dr img echo "Repertory 'img' deleted" cp -r ../platformer/assets-cg/img/ img/ -v +cp force_img/* img/ -v echo "Done"