diff --git a/android/game.apk b/android/game.apk index 3aae1e6..48cad1a 100644 Binary files a/android/game.apk and b/android/game.apk differ diff --git a/android/game.love b/android/game.love index 7f195f6..c74b242 100644 Binary files a/android/game.love and b/android/game.love differ diff --git a/android/tools/love-android-sdl2/AndroidManifest.xml b/android/tools/love-android-sdl2/AndroidManifest.xml index 33e47a8..78ddee2 100644 --- a/android/tools/love-android-sdl2/AndroidManifest.xml +++ b/android/tools/love-android-sdl2/AndroidManifest.xml @@ -1,5 +1,5 @@ - @@ -12,13 +12,13 @@ diff --git a/android/tools/love-android-sdl2/assets/game.love b/android/tools/love-android-sdl2/assets/game.love index 7f195f6..c74b242 100644 Binary files a/android/tools/love-android-sdl2/assets/game.love and b/android/tools/love-android-sdl2/assets/game.love differ diff --git a/android/tools/love-android-sdl2/bin/AndroidManifest.xml b/android/tools/love-android-sdl2/bin/AndroidManifest.xml index 33e47a8..78ddee2 100644 --- a/android/tools/love-android-sdl2/bin/AndroidManifest.xml +++ b/android/tools/love-android-sdl2/bin/AndroidManifest.xml @@ -1,5 +1,5 @@ - @@ -12,13 +12,13 @@ diff --git a/android/tools/love-android-sdl2/bin/build.prop b/android/tools/love-android-sdl2/bin/build.prop index 729e683..82d2962 100644 --- a/android/tools/love-android-sdl2/bin/build.prop +++ b/android/tools/love-android-sdl2/bin/build.prop @@ -1,5 +1,5 @@ #Last build type -#Thu, 08 Dec 2016 18:55:42 +0100 +#Thu, 08 Dec 2016 20:41:46 +0100 build.last.target=debug diff --git a/android/tools/love-android-sdl2/bin/classes.dex b/android/tools/love-android-sdl2/bin/classes.dex index b4119ba..c896b04 100644 Binary files a/android/tools/love-android-sdl2/bin/classes.dex and b/android/tools/love-android-sdl2/bin/classes.dex differ diff --git a/android/tools/love-android-sdl2/bin/classes.dex.d b/android/tools/love-android-sdl2/bin/classes.dex.d index a87fdcc..e67e708 100644 --- a/android/tools/love-android-sdl2/bin/classes.dex.d +++ b/android/tools/love-android-sdl2/bin/classes.dex.d @@ -1,9 +1,9 @@ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes.dex : \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/BuildConfig.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/LtaActivity.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$attr.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$drawable.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R.class \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/DummyEdit.class \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$1.class \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$2.class \ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$attr.class deleted file mode 100644 index 413a7c3..0000000 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$attr.class and /dev/null differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/BuildConfig.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/BuildConfig.class similarity index 74% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/BuildConfig.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/BuildConfig.class index 30e3151..a5d9d9f 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/BuildConfig.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/BuildConfig.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/LtaActivity.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/LtaActivity.class similarity index 62% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/LtaActivity.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/LtaActivity.class index f98f239..ebdb93f 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/LtaActivity.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/LtaActivity.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$attr.class new file mode 100644 index 0000000..87e83de Binary files /dev/null and b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$attr.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$drawable.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$drawable.class similarity index 56% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$drawable.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$drawable.class index f45ec49..bc29197 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R$drawable.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R$drawable.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R.class similarity index 63% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R.class index c013355..d293e6e 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1208185535/R.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1208204140/R.class differ diff --git a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk index ae5d5bf..d123805 100644 Binary files a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk and b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk differ diff --git a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk index 3aae1e6..48cad1a 100644 Binary files a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk and b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk differ diff --git a/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ b/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ index 438d804..2d00700 100644 Binary files a/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ and b/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ differ diff --git a/android/tools/love-android-sdl2/bin/proguard.txt b/android/tools/love-android-sdl2/bin/proguard.txt index 7f0efcb..fb2b725 100644 --- a/android/tools/love-android-sdl2/bin/proguard.txt +++ b/android/tools/love-android-sdl2/bin/proguard.txt @@ -1,9 +1,9 @@ # view AndroidManifest.xml #generated:45 --keep class love.to.android1208185535.DownloadActivity { (...); } +-keep class love.to.android1208204140.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android1208185535.DownloadService { (...); } +-keep class love.to.android1208204140.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android1208185535.LtaActivity { (...); } +-keep class love.to.android1208204140.LtaActivity { (...); } diff --git a/android/tools/love-android-sdl2/gen/R.java.d b/android/tools/love-android-sdl2/gen/R.java.d index fb8d907..5ce8beb 100644 --- a/android/tools/love-android-sdl2/gen/R.java.d +++ b/android/tools/love-android-sdl2/gen/R.java.d @@ -1,3 +1,3 @@ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android1208185535/R.java \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android1208204140/R.java \ : /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/res/drawable-xxhdpi/ic_launcher.png \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/AndroidManifest.xml \ diff --git a/android/tools/love-android-sdl2/gen/love/to/android1208185535/BuildConfig.java b/android/tools/love-android-sdl2/gen/love/to/android1208204140/BuildConfig.java similarity index 79% rename from android/tools/love-android-sdl2/gen/love/to/android1208185535/BuildConfig.java rename to android/tools/love-android-sdl2/gen/love/to/android1208204140/BuildConfig.java index 1fb0e0a..98b743c 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1208185535/BuildConfig.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1208204140/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android1208185535; +package love.to.android1208204140; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/android/tools/love-android-sdl2/gen/love/to/android1208185535/R.java b/android/tools/love-android-sdl2/gen/love/to/android1208204140/R.java similarity index 91% rename from android/tools/love-android-sdl2/gen/love/to/android1208185535/R.java rename to android/tools/love-android-sdl2/gen/love/to/android1208204140/R.java index 418323b..4d0bacc 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1208185535/R.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1208204140/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android1208185535; +package love.to.android1208204140; public final class R { public static final class attr { diff --git a/android/tools/love-android-sdl2/src/love/to/android1208185535/LtaActivity.java b/android/tools/love-android-sdl2/src/love/to/android1208204140/LtaActivity.java similarity index 69% rename from android/tools/love-android-sdl2/src/love/to/android1208185535/LtaActivity.java rename to android/tools/love-android-sdl2/src/love/to/android1208204140/LtaActivity.java index c59bc13..807e4e8 100644 --- a/android/tools/love-android-sdl2/src/love/to/android1208185535/LtaActivity.java +++ b/android/tools/love-android-sdl2/src/love/to/android1208204140/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android1208185535; +package love.to.android1208204140; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/assets/scripts/game.lua b/assets/scripts/game.lua index 5291952..810784c 100644 --- a/assets/scripts/game.lua +++ b/assets/scripts/game.lua @@ -8,6 +8,7 @@ function game.load() game.canvas = { width = width, height = 2880 } love.window.setMode(game.window.width, game.window.height) game.level = 1 + game.play = true -- Physics local world_meter = 64 local gravity = 2 diff --git a/assets/scripts/spaceship.lua b/assets/scripts/spaceship.lua index 388ab2b..541ab7c 100644 --- a/assets/scripts/spaceship.lua +++ b/assets/scripts/spaceship.lua @@ -31,6 +31,19 @@ function spaceship.load(game) light.height = 66 g = anim8.newGrid(light.width, light.height, light.img:getWidth(), light.img:getHeight()) light.animation = anim8.newAnimation(g('1-' .. light.num_frames, 1), 0.05) + -- Explosion + explosion = { + img = love.graphics.newImage('assets/sprites/spaceship/explosion.png'), + num_frames = 10, + speed = 0.05, + x = -game.canvas.width, + y = -game.canvas.height + } + g = anim8.newGrid(explosion.img:getWidth() / explosion.num_frames, explosion.img:getHeight(), explosion.img:getWidth(), explosion.img:getHeight()) + explosion.animation = anim8.newAnimation(g('1-' .. explosion.num_frames, 1), explosion.speed, 'pauseAtEnd') + explosion.animation:pause() + explosion.claim_x = 45 + explosion.claim_y = 40 -- Collision body.collision = {} body.collision.claim = 79 @@ -64,6 +77,8 @@ function spaceship.update(dt, game) light.animation:update(dt) light.x = body.body:getX() + 43 light.y = body.body:getY() - 15 + -- Explosion + explosion.animation:update(dt) -- Controls if control_up then body.body:applyForce(0, -body.power) @@ -84,7 +99,13 @@ function spaceship.update(dt, game) body.collision.hc:moveTo(body.body:getX() + body.collision.claim, body.body:getY() + body.collision.claim) -- Check for collisions for shape, delta in pairs(HC.collisions(body.collision.hc)) do + game.play = false + explosion.x, explosion.y, explosion.enable = body.body:getX() - explosion.claim_x, body.body:getY() - explosion.claim_y, true + explosion.animation:resume() end + if not game.play then + body.body:setLinearVelocity(0, 0) + end -- Check game limits if body.body:getY() <= 0 then -- Top game x, y = body.body:getLinearVelocity() @@ -100,13 +121,19 @@ function spaceship.update(dt, game) end end -function spaceship.draw() - light.animation:draw(light.img, light.x, light.y) - if press_button then - body.animation_fire:draw(body.img, body.body:getX(), body.body:getY()) - else - body.animation_stop:draw(body.img, body.body:getX(), body.body:getY()) +function spaceship.draw(game) + if game.play then + -- Lignt + light.animation:draw(light.img, light.x, light.y) + -- Spaceship + if press_button then + body.animation_fire:draw(body.img, body.body:getX(), body.body:getY()) + else + body.animation_stop:draw(body.img, body.body:getX(), body.body:getY()) + end end + -- Explosion + explosion.animation:draw(explosion.img, explosion.x, explosion.y) -- Collision if collision_debug then body.collision.hc:draw('fill') diff --git a/main.lua b/main.lua index 5ae036c..332178c 100644 --- a/main.lua +++ b/main.lua @@ -33,7 +33,7 @@ function love.draw() camera.gcam:draw(function(l,t,w,h) background.draw() moon.draw() - spaceship.draw() + spaceship.draw(game) asteroids.draw() end) controls.draw()