diff --git a/android/game.apk b/android/game.apk index dd4b412..944fae0 100644 Binary files a/android/game.apk and b/android/game.apk differ diff --git a/android/game.love b/android/game.love index e1d353f..3c5e2e2 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 eebcf4e..9ab6176 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 e1d353f..3c5e2e2 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 eebcf4e..9ab6176 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 8ff6b6e..a72f0e1 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 -#Sat, 12 Nov 2016 20:33:20 +0100 +#Sat, 26 Nov 2016 18:22:56 +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 cadab10..8ac5a92 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 0edf381..7a22d76 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/android1112203313/BuildConfig.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/LtaActivity.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R$attr.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R$drawable.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/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/android1112203313/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R$attr.class deleted file mode 100644 index 8b3baff..0000000 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R$attr.class and /dev/null differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/BuildConfig.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/BuildConfig.class similarity index 74% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/BuildConfig.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/BuildConfig.class index 57b60cd..191058e 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/BuildConfig.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/BuildConfig.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/LtaActivity.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class similarity index 62% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/LtaActivity.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class index 91f552e..7f311f5 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/LtaActivity.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$attr.class new file mode 100644 index 0000000..c866d9b Binary files /dev/null and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$attr.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R$drawable.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class similarity index 56% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R$drawable.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class index dd093e2..ce16d71 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R$drawable.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R.class similarity index 63% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R.class index 69f6e77..e8010bc 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1112203313/R.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/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 1eee0a1..a1a2469 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 dd4b412..944fae0 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 4bfe0fe..fea8d81 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 4881f14..c8291b5 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.android1112203313.DownloadActivity { (...); } +-keep class love.to.android1126182250.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android1112203313.DownloadService { (...); } +-keep class love.to.android1126182250.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android1112203313.LtaActivity { (...); } +-keep class love.to.android1126182250.LtaActivity { (...); } diff --git a/android/tools/love-android-sdl2/gen/R.java.d b/android/tools/love-android-sdl2/gen/R.java.d index 7faac3c..5a16e8e 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/android1112203313/R.java \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android1126182250/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/android1112203313/BuildConfig.java b/android/tools/love-android-sdl2/gen/love/to/android1126182250/BuildConfig.java similarity index 79% rename from android/tools/love-android-sdl2/gen/love/to/android1112203313/BuildConfig.java rename to android/tools/love-android-sdl2/gen/love/to/android1126182250/BuildConfig.java index 5a6c677..f6f1a0b 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1112203313/BuildConfig.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1126182250/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android1112203313; +package love.to.android1126182250; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/android/tools/love-android-sdl2/gen/love/to/android1112203313/R.java b/android/tools/love-android-sdl2/gen/love/to/android1126182250/R.java similarity index 91% rename from android/tools/love-android-sdl2/gen/love/to/android1112203313/R.java rename to android/tools/love-android-sdl2/gen/love/to/android1126182250/R.java index 03a2917..d17e95d 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1112203313/R.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1126182250/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android1112203313; +package love.to.android1126182250; public final class R { public static final class attr { diff --git a/android/tools/love-android-sdl2/src/love/to/android1112203313/LtaActivity.java b/android/tools/love-android-sdl2/src/love/to/android1126182250/LtaActivity.java similarity index 69% rename from android/tools/love-android-sdl2/src/love/to/android1112203313/LtaActivity.java rename to android/tools/love-android-sdl2/src/love/to/android1126182250/LtaActivity.java index bb41fc8..4712fc7 100644 --- a/android/tools/love-android-sdl2/src/love/to/android1112203313/LtaActivity.java +++ b/android/tools/love-android-sdl2/src/love/to/android1126182250/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android1112203313; +package love.to.android1126182250; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/assets/scripts/asteroids.lua b/assets/scripts/asteroids.lua index 0d8f748..26e14ab 100644 --- a/assets/scripts/asteroids.lua +++ b/assets/scripts/asteroids.lua @@ -1,50 +1,59 @@ local tools = require 'assets/scripts/tools' local asteroids = {} +local imgs = nil function asteroids.load(game) - local imgs = { - love.graphics.newImage('assets/sprites/asteroids/1.png'), - love.graphics.newImage('assets/sprites/asteroids/2.png'), - love.graphics.newImage('assets/sprites/asteroids/3.png') + imgs = { + love.graphics.newImage('assets/sprites/asteroids/asteroid01.png'), + love.graphics.newImage('assets/sprites/asteroids/asteroid02.png'), + love.graphics.newImage('assets/sprites/asteroids/asteroid03.png'), + love.graphics.newImage('assets/sprites/asteroids/asteroid04.png') } - local num = game.levelaa * 5 - local max_speed = 5 + asteroids.num = game.level * 5 + asteroids.max_speed = 5 -- Generate asteroids asteroids.bodys = {} - for i=1, num do - local temp_img = imgs[math.random(1, tools.table_length(imgs))] - asteroids.bodys[i] = { - x = math.random(0, game.canvas.width - temp_img:getWidth()), - y = math.random(game.window.height / 2, game.canvas.height - temp_img:getHeight()), - speed = math.random(1, max_speed), - img = temp_img, - angle = math.random(0, 90) - } + for i = 1, asteroids.num do + make_asteroid(i, game, true) end end function asteroids.update(dt, game) -- Rotate asteroids for key, asteroid in pairs(asteroids.bodys) do - value.angle = asteroid.angle + (dt * math.pi / 10) - value.x = asteroid.x - asteroid.speed + asteroid.angle = asteroid.angle + (dt * math.pi / 10) + asteroid.x = asteroid.x - asteroid.speed end -- Destroy asteroids for key, asteroid in pairs(asteroids.bodys) do - if value.x + asteroid.img:getWidth() < 0 then - table.remove(asteroid, key) + if asteroid.x + asteroid.img:getWidth() < 0 then + table.remove(asteroids.bodys, key) end end -- Create asteroids if tools.table_length(asteroids.bodys) < asteroids.num then - local temp_img = imgs[math.random(1, table_length(imgs))] - asteroids.bodys[table_length(asteroids.bodys) + 1] = { + make_asteroid(tools.table_length(asteroids.bodys) + 1, game, false) + end +end + +function asteroids.draw() + for key, asteroid in pairs(asteroids.bodys) do + love.graphics.draw(asteroid.img, asteroid.x, asteroid.y, asteroid.angle, 1, 1, asteroid.img:getWidth() / 2, asteroid.img:getHeight() / 2) + end +end + +function make_asteroid(pos, game, x_random) + local temp_img = imgs[math.random(1, tools.table_length(imgs))] + asteroids.bodys[pos] = { x = game.canvas.width + temp_img:getWidth(), - y = math.random(game.window.height, game.canvas.height - temp_img:getHeight()), - speed = math.random(1, max_speed), + y = math.random(game.window.height / 2, game.canvas.height - temp_img:getHeight()), + speed = math.random(1, asteroids.max_speed), img = temp_img, - angle = math.random(0, 90)} + angle = math.random(0, 90) + } + if x_random then + asteroids.bodys[pos].x = math.random(0, game.canvas.width - temp_img:getWidth()) end end diff --git a/assets/sprites/asteroids/1.png b/assets/sprites/asteroids/1.png deleted file mode 100644 index 26c1522..0000000 Binary files a/assets/sprites/asteroids/1.png and /dev/null differ diff --git a/assets/sprites/asteroids/2.png b/assets/sprites/asteroids/2.png deleted file mode 100644 index 6b92d7f..0000000 Binary files a/assets/sprites/asteroids/2.png and /dev/null differ diff --git a/assets/sprites/asteroids/3.png b/assets/sprites/asteroids/3.png deleted file mode 100644 index 259e1b8..0000000 Binary files a/assets/sprites/asteroids/3.png and /dev/null differ diff --git a/assets/sprites/asteroids/asteroid01.png b/assets/sprites/asteroids/asteroid01.png new file mode 100755 index 0000000..a0f2efc Binary files /dev/null and b/assets/sprites/asteroids/asteroid01.png differ diff --git a/assets/sprites/asteroids/asteroid02.png b/assets/sprites/asteroids/asteroid02.png new file mode 100755 index 0000000..6e24bac Binary files /dev/null and b/assets/sprites/asteroids/asteroid02.png differ diff --git a/assets/sprites/asteroids/asteroid03.png b/assets/sprites/asteroids/asteroid03.png new file mode 100755 index 0000000..18bd66d Binary files /dev/null and b/assets/sprites/asteroids/asteroid03.png differ diff --git a/assets/sprites/asteroids/asteroid04.png b/assets/sprites/asteroids/asteroid04.png new file mode 100755 index 0000000..82c7aba Binary files /dev/null and b/assets/sprites/asteroids/asteroid04.png differ diff --git a/main.lua b/main.lua index 550a877..940e148 100644 --- a/main.lua +++ b/main.lua @@ -16,15 +16,16 @@ end function love.update(dt) game.world:update(dt) background.update(dt) - asteroids.load(dt, game) - controls.update(dt) + asteroids.update(dt, game) spaceship.update(dt) + controls.update(dt) end -- DRAW function love.draw() background.draw() spaceship.draw() + asteroids.draw() end -- CONTROLS