diff --git a/core/assets/sprites/amulet2.png b/core/assets/sprites/amulet2.png deleted file mode 100644 index 06a4df8..0000000 Binary files a/core/assets/sprites/amulet2.png and /dev/null differ diff --git a/core/assets/sprites/fireswordsman.png b/core/assets/sprites/fireswordsman.png index e1a2770..57ad0ce 100644 Binary files a/core/assets/sprites/fireswordsman.png and b/core/assets/sprites/fireswordsman.png differ diff --git a/core/assets/sprites/unlock.png b/core/assets/sprites/unlock.png new file mode 100644 index 0000000..7f9faab Binary files /dev/null and b/core/assets/sprites/unlock.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 33966f8..2a495eb 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -69,7 +69,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ @Override public void create(){ - checkDoor = true; + checkDoor = false; playerSkin = 0; isPaused = false; @@ -404,6 +404,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(Intersector.overlaps(gs.getPlayer().getCollisionSprite(), tempDoor) && !d.getPlayer().checkKey()){ d.getPlayer().setyPos(y); + } } @@ -476,10 +477,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(level < 6){ d.getPlayer().deleteKey(); + gs.startUnlockScreen(); d.getPlayer().updateStats(level + 1); - gs.startLoadingScreen(); level++; diff --git a/core/src/com/dungeoncrawler/model/items/Amulet.java b/core/src/com/dungeoncrawler/model/items/Amulet.java index b2f31c1..9d1fbec 100644 --- a/core/src/com/dungeoncrawler/model/items/Amulet.java +++ b/core/src/com/dungeoncrawler/model/items/Amulet.java @@ -15,7 +15,7 @@ public class Amulet extends Item { public Amulet(int lvl) { super(lvl); - this.dmg = 25 * lvl; + this.dmg = 10 * lvl; this.heal = 0 * lvl; this.id = 2; } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 110dbd0..f8beeac 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -48,8 +48,10 @@ public class GameScreen { Timer animatePlayer; Timer roomChangeTimer; + Timer doorUnlockTimer; int roomChangeAnimationState; boolean roomLoading; + boolean unlockDoor; Texture roomChangeTexture; Sprite roomChangeSprite; TextureRegion[][] roomChangeTextureRegion; @@ -192,9 +194,7 @@ public class GameScreen { roomChangeTimer = new Timer(); roomLoading = false; - roomChangeTexture = new Texture("sprites/RoomChange.png"); - roomChangeSprite = new Sprite(roomChangeTexture); - roomChangeTextureRegion = roomChangeSprite.split(roomChangeTexture, 528, 432); + roomChangeSprite = new Sprite(); roomChangeRow = 0; roomChangeSprite.setPosition(0f, 0f); @@ -210,7 +210,7 @@ public class GameScreen { roomChangeRow++; } } - },0, 0.02f); + },0, 0.03f); } @@ -293,8 +293,8 @@ public class GameScreen { eSprite.getSprites()[0].draw(batch); } - roomChangeSprite.setRegion(roomChangeTextureRegion[0][roomChangeRow]); if(roomLoading == true){ + roomChangeSprite.setRegion(roomChangeTextureRegion[0][roomChangeRow]); roomChangeSprite.draw(batch); } @@ -428,6 +428,16 @@ public class GameScreen { } public void startLoadingScreen(){ + roomChangeSprite = new Sprite(new Texture("sprites/roomChange.png")); + roomChangeSprite.setPosition(0,0); + roomChangeTextureRegion = roomChangeSprite.split(528,432); + roomLoading = true; + roomChangeTimer.start(); + } + public void startUnlockScreen(){ + roomChangeSprite = new Sprite(new Texture("sprites/unlock.png")); + roomChangeSprite.setPosition(400,400); + roomChangeTextureRegion = roomChangeSprite.split(48,64); roomLoading = true; roomChangeTimer.start(); } diff --git a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java index 2281534..6c5d2a3 100644 --- a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java +++ b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java @@ -2,8 +2,7 @@ package com.dungeoncrawler.desktop; import com.badlogic.gdx.Files; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; -import com.badlogic.gdx.backends.lwjgl.LwjglApplicati - onConfiguration; +import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.dungeoncrawler.control.Controller; public class DesktopLauncher {