diff --git a/android/game.apk b/android/game.apk index 64a9c56..7361303 100644 Binary files a/android/game.apk and b/android/game.apk differ diff --git a/android/game.love b/android/game.love index 630bfc5..3a0e1c6 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 e197eca..f2dcf2a 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 630bfc5..3a0e1c6 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 e197eca..f2dcf2a 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 416f2b8..5084ca1 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 -#Sun, 27 Nov 2016 12:01:51 +0100 +#Sun, 27 Nov 2016 13:13:05 +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 9f6e1f7..89e12ec 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 a01eae7..fab6d2b 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/android1127120145/BuildConfig.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/LtaActivity.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R$attr.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R$drawable.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/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/android1127120145/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R$attr.class deleted file mode 100644 index ab5bb94..0000000 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R$attr.class and /dev/null differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/BuildConfig.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/BuildConfig.class similarity index 74% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/BuildConfig.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/BuildConfig.class index 1d626ba..fb9fbeb 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/BuildConfig.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/BuildConfig.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/LtaActivity.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/LtaActivity.class similarity index 62% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/LtaActivity.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/LtaActivity.class index 678fbbb..0305de2 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/LtaActivity.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/LtaActivity.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$attr.class new file mode 100644 index 0000000..f1af650 Binary files /dev/null and b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$attr.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R$drawable.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$drawable.class similarity index 56% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R$drawable.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$drawable.class index 596f586..d5fe6ca 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R$drawable.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R$drawable.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R.class similarity index 63% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/R.class index 540486f..7cc2f87 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1127120145/R.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1127131258/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 59aec56..b36497b 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 64a9c56..7361303 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 944e8d9..e94f400 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 7f40359..9e2e9aa 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.android1127120145.DownloadActivity { (...); } +-keep class love.to.android1127131258.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android1127120145.DownloadService { (...); } +-keep class love.to.android1127131258.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android1127120145.LtaActivity { (...); } +-keep class love.to.android1127131258.LtaActivity { (...); } diff --git a/android/tools/love-android-sdl2/gen/R.java.d b/android/tools/love-android-sdl2/gen/R.java.d index 62197ed..85aa85e 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/android1127120145/R.java \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android1127131258/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/android1127120145/BuildConfig.java b/android/tools/love-android-sdl2/gen/love/to/android1127131258/BuildConfig.java similarity index 79% rename from android/tools/love-android-sdl2/gen/love/to/android1127120145/BuildConfig.java rename to android/tools/love-android-sdl2/gen/love/to/android1127131258/BuildConfig.java index b6139aa..b5f0575 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1127120145/BuildConfig.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1127131258/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android1127120145; +package love.to.android1127131258; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/android/tools/love-android-sdl2/gen/love/to/android1127120145/R.java b/android/tools/love-android-sdl2/gen/love/to/android1127131258/R.java similarity index 91% rename from android/tools/love-android-sdl2/gen/love/to/android1127120145/R.java rename to android/tools/love-android-sdl2/gen/love/to/android1127131258/R.java index 6e6df05..91fef16 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1127120145/R.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1127131258/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android1127120145; +package love.to.android1127131258; public final class R { public static final class attr { diff --git a/android/tools/love-android-sdl2/src/love/to/android1127120145/LtaActivity.java b/android/tools/love-android-sdl2/src/love/to/android1127131258/LtaActivity.java similarity index 69% rename from android/tools/love-android-sdl2/src/love/to/android1127120145/LtaActivity.java rename to android/tools/love-android-sdl2/src/love/to/android1127131258/LtaActivity.java index 6d43117..9b0539d 100644 --- a/android/tools/love-android-sdl2/src/love/to/android1127120145/LtaActivity.java +++ b/android/tools/love-android-sdl2/src/love/to/android1127131258/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android1127120145; +package love.to.android1127131258; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/assets/scripts/asteroids.lua b/assets/scripts/asteroids.lua index 26e14ab..e9b422e 100644 --- a/assets/scripts/asteroids.lua +++ b/assets/scripts/asteroids.lua @@ -12,7 +12,7 @@ function asteroids.load(game) } asteroids.num = game.level * 5 asteroids.max_speed = 5 - -- Generate asteroids + -- Make asteroids asteroids.bodys = {} for i = 1, asteroids.num do make_asteroid(i, game, true) diff --git a/assets/scripts/moon.lua b/assets/scripts/moon.lua new file mode 100644 index 0000000..56cf542 --- /dev/null +++ b/assets/scripts/moon.lua @@ -0,0 +1,32 @@ +local tools = require 'assets/scripts/tools' + +moon = {} + +function moon.load(game) + local imgs = { + love.graphics.newImage('assets/sprites/moon/body1.png'), + love.graphics.newImage('assets/sprites/moon/body2.png'), + love.graphics.newImage('assets/sprites/moon/body3.png') + } + moon.img = imgs[math.random(1, tools.table_length(imgs))] + moon.x = 0 + moon.y = game.canvas.height - moon.img:getHeight() + moon.bodys = {} + -- Repeat + if moon.img:getWidth() < game.window.width then + for i = 1, math.ceil(game.window.width / moon.img:getWidth()) do + moon.bodys[i] = (i - 1) * moon.img:getWidth() + end + end +end + +function moon.update() +end + +function moon.draw(game) + for key, tile in pairs(moon.bodys) do + love.graphics.draw(moon.img, tile, moon.y) + end +end + +return moon \ No newline at end of file diff --git a/assets/sprites/moon/body1.png b/assets/sprites/moon/body1.png new file mode 100755 index 0000000..0c46970 Binary files /dev/null and b/assets/sprites/moon/body1.png differ diff --git a/assets/sprites/moon/body2.png b/assets/sprites/moon/body2.png new file mode 100755 index 0000000..3f6911b Binary files /dev/null and b/assets/sprites/moon/body2.png differ diff --git a/assets/sprites/moon/body3.png b/assets/sprites/moon/body3.png new file mode 100755 index 0000000..0770703 Binary files /dev/null and b/assets/sprites/moon/body3.png differ diff --git a/assets/sprites/spaceship/_body.png b/assets/sprites/spaceship/_body.png deleted file mode 100755 index fb2bfdd..0000000 Binary files a/assets/sprites/spaceship/_body.png and /dev/null differ diff --git a/main.lua b/main.lua index 6f62d48..d885b9b 100644 --- a/main.lua +++ b/main.lua @@ -2,6 +2,7 @@ local game = require 'assets/scripts/game' local background = require 'assets/scripts/background' local spaceship = require 'assets/scripts/spaceship' local asteroids = require 'assets/scripts/asteroids' +local moon = require 'assets/scripts/moon' local controls = require 'assets/scripts/controls' local camera = require 'assets/scripts/camera' @@ -11,6 +12,7 @@ function love.load() camera.load(game) background.load(game) asteroids.load(game) + moon.load(game) spaceship.load(game) end @@ -19,6 +21,7 @@ function love.update(dt) game.world:update(dt) background.update(dt) asteroids.update(dt, game) + moon.update() spaceship.update(dt) camera.update(game, spaceship) controls.update(dt) @@ -28,6 +31,7 @@ end function love.draw() camera.gcam:draw(function(l,t,w,h) background.draw() + moon.draw() spaceship.draw() asteroids.draw() end)