diff --git a/assets/sprites/asteroid_1.png b/assets/sprites/asteroid_1.png old mode 100644 new mode 100755 index c8d4349..643f55b Binary files a/assets/sprites/asteroid_1.png and b/assets/sprites/asteroid_1.png differ diff --git a/assets/sprites/asteroid_2.png b/assets/sprites/asteroid_2.png old mode 100644 new mode 100755 index 63e521d..91be634 Binary files a/assets/sprites/asteroid_2.png and b/assets/sprites/asteroid_2.png differ diff --git a/assets/sprites/asteroid_3.png b/assets/sprites/asteroid_3.png new file mode 100755 index 0000000..17703d8 Binary files /dev/null and b/assets/sprites/asteroid_3.png differ diff --git a/assets/sprites/asteroid_4.png b/assets/sprites/asteroid_4.png new file mode 100755 index 0000000..3c0edbc Binary files /dev/null and b/assets/sprites/asteroid_4.png differ diff --git a/assets/sprites/asteroid_5.png b/assets/sprites/asteroid_5.png new file mode 100755 index 0000000..d0fb911 Binary files /dev/null and b/assets/sprites/asteroid_5.png differ diff --git a/assets/sprites/asteroid_6.png b/assets/sprites/asteroid_6.png new file mode 100755 index 0000000..d6c43d4 Binary files /dev/null and b/assets/sprites/asteroid_6.png differ diff --git a/assets/sprites/asteroid_7.png b/assets/sprites/asteroid_7.png new file mode 100755 index 0000000..316b7d7 Binary files /dev/null and b/assets/sprites/asteroid_7.png differ diff --git a/assets/sprites/asteroid_8.png b/assets/sprites/asteroid_8.png new file mode 100755 index 0000000..08351b4 Binary files /dev/null and b/assets/sprites/asteroid_8.png differ diff --git a/assets/sprites/asteroid_9.png b/assets/sprites/asteroid_9.png new file mode 100755 index 0000000..66ae682 Binary files /dev/null and b/assets/sprites/asteroid_9.png differ diff --git a/assets/sprites/background.jpg b/assets/sprites/background.jpg index 434aedf..cebdb04 100644 Binary files a/assets/sprites/background.jpg and b/assets/sprites/background.jpg differ diff --git a/assets/sprites/spaceship.png b/assets/sprites/spaceship.png index 8e9f1bd..b6919e6 100644 Binary files a/assets/sprites/spaceship.png and b/assets/sprites/spaceship.png differ diff --git a/main.lua b/main.lua index 328853c..207ecb9 100644 --- a/main.lua +++ b/main.lua @@ -19,25 +19,25 @@ function love.load() spaceship.x = game.height / 8 spaceship.num_frames = 4 spaceship.pos_frame = 1 - spaceship.frame_width = spaceship.img:getWidth() / spaceship.num_frames + spaceship.frame_height = spaceship.img:getHeight() / spaceship.num_frames spaceship.y = { - (game.height / 4) - (spaceship.img:getHeight() / 2), - 2 * (game.height / 4) - (spaceship.img:getHeight() / 2), - 3 * (game.height / 4) - (spaceship.img:getHeight() / 2), + (game.height / 4) - (spaceship.img:getHeight() / 8), + 2 * (game.height / 4) - (spaceship.img:getHeight() / 8), + 3 * (game.height / 4) - (spaceship.img:getHeight() / 8), } spaceship.pos = 2 spaceship.frames = { - love.graphics.newQuad(spaceship.frame_width * 0, 0, spaceship.frame_width, spaceship.img:getHeight(), spaceship.img:getWidth(), spaceship.img:getHeight()), - love.graphics.newQuad(spaceship.frame_width * 1, 0, spaceship.frame_width, spaceship.img:getHeight(), spaceship.img:getWidth(), spaceship.img:getHeight()), - love.graphics.newQuad(spaceship.frame_width * 2, 0, spaceship.frame_width, spaceship.img:getHeight(), spaceship.img:getWidth(), spaceship.img:getHeight()), - love.graphics.newQuad(spaceship.frame_width * 3, 0, spaceship.frame_width, spaceship.img:getHeight(), spaceship.img:getWidth(), spaceship.img:getHeight()) + love.graphics.newQuad(0, spaceship.frame_height * 0, spaceship.img:getWidth(), spaceship.frame_height, spaceship.img:getWidth(), spaceship.img:getHeight()), + love.graphics.newQuad(0, spaceship.frame_height * 1, spaceship.img:getWidth(), spaceship.frame_height, spaceship.img:getWidth(), spaceship.img:getHeight()), + love.graphics.newQuad(0, spaceship.frame_height * 2, spaceship.img:getWidth(), spaceship.frame_height, spaceship.img:getWidth(), spaceship.img:getHeight()), + love.graphics.newQuad(0, spaceship.frame_height * 3, spaceship.img:getWidth(), spaceship.frame_height, spaceship.img:getWidth(), spaceship.img:getHeight()) } -- Asteroids num_asteroids = 3 asteroids = {} for i = 1, num_asteroids do asteroid = {} - asteroid.img = love.graphics.newImage('assets/sprites/asteroid_' .. tostring(math.random(1, 2)) .. '.png') + asteroid.img = love.graphics.newImage('assets/sprites/asteroid_' .. tostring(math.random(1, 9)) .. '.png') asteroid.x = game.width asteroid.y = { (game.height / 4) - (asteroid.img:getHeight() / 2), @@ -45,7 +45,7 @@ function love.load() 3 * (game.height / 4) - (asteroid.img:getHeight() / 2), } asteroid.pos = 2 - asteroid.speed = 800 + asteroid.speed = 600 asteroids[i] = asteroid end -- Sounds @@ -84,7 +84,7 @@ function love.update(dt) asteroid.pos = math.random(1, 3) end -- Colision - if checkCollision(spaceship.x + spaceship.img:getWidth() / spaceship.num_frames / 2, spaceship.y[spaceship.pos], spaceship.img:getWidth() / spaceship.num_frames / 2, spaceship.img:getHeight(), asteroid.x, asteroid.y[asteroid.pos], asteroid.img:getWidth(), asteroid.img:getHeight()) then + if checkCollision(spaceship.x, spaceship.y[spaceship.pos], spaceship.img:getWidth(), spaceship.img:getHeight() / spaceship.num_frames / 2, asteroid.x, asteroid.y[asteroid.pos], asteroid.img:getWidth(), asteroid.img:getHeight()) then game.play = false sounds.die:play() end diff --git a/steps/4_spaceship/assets/Player_Ship2c.png b/steps/4_spaceship/assets/Player_Ship2c.png deleted file mode 100644 index dc37770..0000000 Binary files a/steps/4_spaceship/assets/Player_Ship2c.png and /dev/null differ