diff --git a/two_player_cleaning_game/assets/level_001.aseprite b/two_player_cleaning_game/assets/level_001.aseprite deleted file mode 100644 index 14f5fb1..0000000 Binary files a/two_player_cleaning_game/assets/level_001.aseprite and /dev/null differ diff --git a/two_player_cleaning_game/assets/level_001.png b/two_player_cleaning_game/assets/level_001.png deleted file mode 100644 index 6e5278a..0000000 Binary files a/two_player_cleaning_game/assets/level_001.png and /dev/null differ diff --git a/two_player_cleaning_game/assets/level_002.aseprite b/two_player_cleaning_game/assets/level_002.aseprite deleted file mode 100644 index 60254ac..0000000 Binary files a/two_player_cleaning_game/assets/level_002.aseprite and /dev/null differ diff --git a/two_player_cleaning_game/assets/player.aseprite b/two_player_cleaning_game/assets/player.aseprite new file mode 100644 index 0000000..2d2c619 Binary files /dev/null and b/two_player_cleaning_game/assets/player.aseprite differ diff --git a/two_player_cleaning_game/assets/player.png b/two_player_cleaning_game/assets/player.png new file mode 100644 index 0000000..973060b Binary files /dev/null and b/two_player_cleaning_game/assets/player.png differ diff --git a/two_player_cleaning_game/assets/player_001.aseprite b/two_player_cleaning_game/assets/player_001.aseprite deleted file mode 100644 index 80604a7..0000000 Binary files a/two_player_cleaning_game/assets/player_001.aseprite and /dev/null differ diff --git a/two_player_cleaning_game/assets/player_001.png b/two_player_cleaning_game/assets/player_001.png deleted file mode 100644 index fc97a25..0000000 Binary files a/two_player_cleaning_game/assets/player_001.png and /dev/null differ diff --git a/two_player_cleaning_game/assets/player_002.aseprite b/two_player_cleaning_game/assets/player_002.aseprite deleted file mode 100644 index 8fe37d9..0000000 Binary files a/two_player_cleaning_game/assets/player_002.aseprite and /dev/null differ diff --git a/two_player_cleaning_game/assets/player_003.aseprite b/two_player_cleaning_game/assets/player_003.aseprite deleted file mode 100644 index bfc8337..0000000 Binary files a/two_player_cleaning_game/assets/player_003.aseprite and /dev/null differ diff --git a/two_player_cleaning_game/assets/player_01.png b/two_player_cleaning_game/assets/player_01.png deleted file mode 100644 index f33e955..0000000 Binary files a/two_player_cleaning_game/assets/player_01.png and /dev/null differ diff --git a/two_player_cleaning_game/assets/player_02.png b/two_player_cleaning_game/assets/player_02.png deleted file mode 100644 index c449f09..0000000 Binary files a/two_player_cleaning_game/assets/player_02.png and /dev/null differ diff --git a/two_player_cleaning_game/main.fnl b/two_player_cleaning_game/main.fnl index c33f0d6..ff8af16 100644 --- a/two_player_cleaning_game/main.fnl +++ b/two_player_cleaning_game/main.fnl @@ -1,7 +1,6 @@ (local map-util (require "map-util.fnl")) -(var player-01-sprite nil) ; 25x25 pixels -(var player-02-sprite nil) ; 25x25 pixels +(var player-art nil) ; 25x50 pixels each player is 25x25 (var dust-sprite nil) ; 35x35 pixels (local game-state { :player-pos [0 0] @@ -33,10 +32,16 @@ (map-util:load) (love.window.setMode 600 640) - (set player-sprite (love.graphics.newImage "assets/player_001.png")) + + (set player-art { + :player-sprite (love.graphics.newImage "assets/player.png") + :player1-quad (love.graphics.newQuad 0 0 25 25 50 25) + :player2-quad (love.graphics.newQuad 25 0 25 25 50 25) + }) + (set dust-sprite (love.graphics.newImage "assets/dust_001.png")) (start-level) - (print (fennel.view game-state)) + ; (print (fennel.view game-state)) ;; start a thread listening on stdin (: (love.thread.newThread "require('love.event') while 1 do love.event.push('stdin', io.read('*line')) end") :start)) @@ -68,9 +73,9 @@ while 1 do love.event.push('stdin', io.read('*line')) end") :start)) (each [y cells (ipairs (. game-state :world))] (each [x cell (ipairs cells)] (case [(. cell :revealed) (. cell :type)] - [false _] (do - (love.graphics.setColor 1 1 1) ; reset color to white (no tinting) - (love.graphics.draw dust-sprite (+ 45 (* 25 (- x 1))) (+ 45 (* 25 (- y 1))))) + ; [false _] (do + ; (love.graphics.setColor 1 1 1) ; reset color to white (no tinting) + ; (love.graphics.draw dust-sprite (+ 45 (* 25 (- x 1))) (+ 45 (* 25 (- y 1))))) [true :wall] (do (love.graphics.setColor (unpack black)) (love.graphics.rectangle "fill" (+ 50 (* 25 (- x 1))) (+ 50 (* 25 (- y 1))) 25 25)) @@ -103,10 +108,11 @@ while 1 do love.event.push('stdin', io.read('*line')) end") :start)) :e 0 :w 25) ] - (love.graphics.draw player-sprite + (love.graphics.draw + (. player-art :player-sprite) + (. player-art :player1-quad) (+ (* 25 player-x) x-offset 25) - (+ (* 25 player-y) y-offset 25) - rot 1.25 1.25))) + (+ (* 25 player-y) y-offset 25)))) (fn draw-ghost-grid [] (love.graphics.setColor (unpack black-half-tone))