From 49d7b0d03628871b837ee1e8de9a87d3f3cc6d69 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Thu, 4 Jun 2020 00:24:45 +0200 Subject: [PATCH] lol --- android/assets/levelicon.png | Bin 0 -> 2186 bytes android/assets/reseticon.png | Bin 0 -> 4139 bytes android/assets/skipicon.png | Bin 0 -> 3967 bytes core/src/controller/Controller.java | 20 +++++++++ core/src/view/Winscreen.java | 61 ++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 android/assets/levelicon.png create mode 100644 android/assets/reseticon.png create mode 100644 android/assets/skipicon.png create mode 100644 core/src/view/Winscreen.java diff --git a/android/assets/levelicon.png b/android/assets/levelicon.png new file mode 100644 index 0000000000000000000000000000000000000000..10c304257840959e3191b504051b8c5d0dc5ee19 GIT binary patch literal 2186 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 literal 0 HcmV?d00001 diff --git a/android/assets/skipicon.png b/android/assets/skipicon.png new file mode 100644 index 0000000000000000000000000000000000000000..19646842025cddb62d97a74f3f82f0493001ca8b GIT binary patch literal 3967 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 Uf3JQ59G)Q#wk|dgtjU-E53jXYo&W#< literal 0 HcmV?d00001 diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index 0e7ee82..318994d 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -20,6 +20,7 @@ import view.Gamescreen; import view.Levelscreen; import com.badlogic.gdx.utils.Timer; import view.Titlescreen; +import view.Winscreen; /** * @@ -30,6 +31,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ Titlescreen ts; Levelscreen ls; Gamescreen gs; + Winscreen ws; int levelAmount; SpriteBatch batch; Timer stepTimer; @@ -40,6 +42,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ ts = new Titlescreen(); ls = null; gs = null; + ws = null; levelAmount = 10; batch = new SpriteBatch(); Gdx.input.setInputProcessor(this); @@ -50,12 +53,16 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ stepTimer.scheduleTask(new Timer.Task() { @Override public void run() { + if(gs != null){ if(level.getProjectile().getxPos() > Gdx.graphics.getWidth() || level.getProjectile().getxPos() < 0 || level.getProjectile().getyPos() < 0){ level.reset(); + gs = null; + ws = new Winscreen(); } else{ level.step(); } + } } }, 0, 0.01f); stepTimer.stop(); @@ -69,6 +76,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(ts != null) ts.render(batch); else if(ls != null) ls.render(batch); else if(gs != null) gs.render(batch, level); + else if(ws != null) ws.render(batch); batch.end(); } @@ -120,6 +128,18 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ level.projectileReleased(); } } + else if(ws != null){ + if(x < Gdx.graphics.getWidth() * 0.25){ + ls = new Levelscreen(levelAmount); + } + else if(x < Gdx.graphics.getWidth() * 0.75){ + gs = new Gamescreen(level); + } + else{ + gs = new Gamescreen(level); + } + ws = null; + } return true; } diff --git a/core/src/view/Winscreen.java b/core/src/view/Winscreen.java new file mode 100644 index 0000000..2ef28eb --- /dev/null +++ b/core/src/view/Winscreen.java @@ -0,0 +1,61 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package view; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.utils.Timer; + +/** + * + * @author Jan + */ +public class Winscreen{ + + BitmapFont font; + Timer t; + + Sprite reset; + Sprite level; + Sprite next; + + public Winscreen(){ + t = new Timer(); + + int w = Gdx.graphics.getWidth(); + int h = Gdx.graphics.getHeight(); + + next = new Sprite(new Texture("skipicon.png")); + next.setPosition(w * 0.75f - next.getWidth()/2, h/2 - next.getHeight()/4); + + level = new Sprite(new Texture("levelicon.png")); + level.setPosition(w * 0.25f - level.getWidth()/2, h/2 - level.getHeight()/4); + + reset = new Sprite(new Texture("reseticon.png")); + reset.setPosition(w/2 - reset.getWidth()/2, h/2 - reset.getHeight()/2); + + t.scheduleTask(new Timer.Task() { + @Override + public void run() { + + } + },0 , 0.035f); + + + } + + public void render(SpriteBatch batch) { + next.draw(batch); + level.draw(batch); + reset.draw(batch); + } + public void dispose() { + t.clear(); + } +}