diff --git a/android/assets/badlogic.jpg b/android/assets/badlogic.jpg deleted file mode 100644 index 4390da6..0000000 Binary files a/android/assets/badlogic.jpg and /dev/null differ diff --git a/android/assets/music/gamemusic.mp3 b/android/assets/music/gamemusic.mp3 new file mode 100644 index 0000000..b5bdcee Binary files /dev/null and b/android/assets/music/gamemusic.mp3 differ diff --git a/android/assets/music/mainmenu.mp3 b/android/assets/music/mainmenu.mp3 new file mode 100644 index 0000000..2c24926 Binary files /dev/null and b/android/assets/music/mainmenu.mp3 differ diff --git a/android/assets/sprites/MAINSCREEN.png b/android/assets/sprites/MAINSCREEN.png new file mode 100644 index 0000000..7cf5af8 Binary files /dev/null and b/android/assets/sprites/MAINSCREEN.png differ diff --git a/android/assets/sprites/amulet.png b/android/assets/sprites/amulet.png new file mode 100644 index 0000000..95bd391 Binary files /dev/null and b/android/assets/sprites/amulet.png differ diff --git a/android/assets/sprites/archer/archer_m.png b/android/assets/sprites/archer/archer_m.png new file mode 100644 index 0000000..e840069 Binary files /dev/null and b/android/assets/sprites/archer/archer_m.png differ diff --git a/android/assets/sprites/archer/archer_w.png b/android/assets/sprites/archer/archer_w.png new file mode 100644 index 0000000..3f2e979 Binary files /dev/null and b/android/assets/sprites/archer/archer_w.png differ diff --git a/android/assets/sprites/archer/darkarcher_m.png b/android/assets/sprites/archer/darkarcher_m.png new file mode 100644 index 0000000..98b843c Binary files /dev/null and b/android/assets/sprites/archer/darkarcher_m.png differ diff --git a/android/assets/sprites/archer/darkarcher_w.png b/android/assets/sprites/archer/darkarcher_w.png new file mode 100644 index 0000000..fe0cf83 Binary files /dev/null and b/android/assets/sprites/archer/darkarcher_w.png differ diff --git a/android/assets/sprites/archer/firearcher_m.png b/android/assets/sprites/archer/firearcher_m.png new file mode 100644 index 0000000..093e4f1 Binary files /dev/null and b/android/assets/sprites/archer/firearcher_m.png differ diff --git a/android/assets/sprites/archer/firearcher_w.png b/android/assets/sprites/archer/firearcher_w.png new file mode 100644 index 0000000..2629364 Binary files /dev/null and b/android/assets/sprites/archer/firearcher_w.png differ diff --git a/android/assets/sprites/archer/icearcher_m.png b/android/assets/sprites/archer/icearcher_m.png new file mode 100644 index 0000000..bc48117 Binary files /dev/null and b/android/assets/sprites/archer/icearcher_m.png differ diff --git a/android/assets/sprites/archer/icearcher_w.png b/android/assets/sprites/archer/icearcher_w.png new file mode 100644 index 0000000..8dd6f66 Binary files /dev/null and b/android/assets/sprites/archer/icearcher_w.png differ diff --git a/android/assets/sprites/backButton.png b/android/assets/sprites/backButton.png new file mode 100644 index 0000000..a277684 Binary files /dev/null and b/android/assets/sprites/backButton.png differ diff --git a/android/assets/sprites/controlsButton.png b/android/assets/sprites/controlsButton.png new file mode 100644 index 0000000..2188584 Binary files /dev/null and b/android/assets/sprites/controlsButton.png differ diff --git a/android/assets/sprites/controlsContainer.PNG b/android/assets/sprites/controlsContainer.PNG new file mode 100644 index 0000000..a618593 Binary files /dev/null and b/android/assets/sprites/controlsContainer.PNG differ diff --git a/android/assets/sprites/cursor.png b/android/assets/sprites/cursor.png new file mode 100644 index 0000000..4360bb2 Binary files /dev/null and b/android/assets/sprites/cursor.png differ diff --git a/android/assets/sprites/dmgAmulet.png b/android/assets/sprites/dmgAmulet.png new file mode 100644 index 0000000..f727c11 Binary files /dev/null and b/android/assets/sprites/dmgAmulet.png differ diff --git a/android/assets/sprites/door.png b/android/assets/sprites/door.png new file mode 100644 index 0000000..5adc75b Binary files /dev/null and b/android/assets/sprites/door.png differ diff --git a/android/assets/sprites/doorbottom.png b/android/assets/sprites/doorbottom.png new file mode 100644 index 0000000..8307527 Binary files /dev/null and b/android/assets/sprites/doorbottom.png differ diff --git a/android/assets/sprites/doorleft.png b/android/assets/sprites/doorleft.png new file mode 100644 index 0000000..53a02d5 Binary files /dev/null and b/android/assets/sprites/doorleft.png differ diff --git a/android/assets/sprites/doorright.png b/android/assets/sprites/doorright.png new file mode 100644 index 0000000..d296cff Binary files /dev/null and b/android/assets/sprites/doorright.png differ diff --git a/android/assets/sprites/female.png b/android/assets/sprites/female.png new file mode 100644 index 0000000..75074d8 Binary files /dev/null and b/android/assets/sprites/female.png differ diff --git a/android/assets/sprites/hud.png b/android/assets/sprites/hud.png new file mode 100644 index 0000000..b2e39ff Binary files /dev/null and b/android/assets/sprites/hud.png differ diff --git a/android/assets/sprites/hudInventory.png b/android/assets/sprites/hudInventory.png new file mode 100644 index 0000000..a2ff6ef Binary files /dev/null and b/android/assets/sprites/hudInventory.png differ diff --git a/android/assets/sprites/key.png b/android/assets/sprites/key.png new file mode 100644 index 0000000..88374ac Binary files /dev/null and b/android/assets/sprites/key.png differ diff --git a/android/assets/sprites/left.png b/android/assets/sprites/left.png new file mode 100644 index 0000000..50d83d9 Binary files /dev/null and b/android/assets/sprites/left.png differ diff --git a/android/assets/sprites/logo.png b/android/assets/sprites/logo.png new file mode 100644 index 0000000..c0b960b Binary files /dev/null and b/android/assets/sprites/logo.png differ diff --git a/android/assets/sprites/male.png b/android/assets/sprites/male.png new file mode 100644 index 0000000..9764149 Binary files /dev/null and b/android/assets/sprites/male.png differ diff --git a/android/assets/sprites/player/player_0_m.png b/android/assets/sprites/player/player_0_m.png new file mode 100644 index 0000000..d2eaa07 Binary files /dev/null and b/android/assets/sprites/player/player_0_m.png differ diff --git a/android/assets/sprites/player/player_0_w.png b/android/assets/sprites/player/player_0_w.png new file mode 100644 index 0000000..333ae91 Binary files /dev/null and b/android/assets/sprites/player/player_0_w.png differ diff --git a/android/assets/sprites/player/player_1_m.png b/android/assets/sprites/player/player_1_m.png new file mode 100644 index 0000000..67d9a9a Binary files /dev/null and b/android/assets/sprites/player/player_1_m.png differ diff --git a/android/assets/sprites/player/player_1_w.png b/android/assets/sprites/player/player_1_w.png new file mode 100644 index 0000000..2ef144d Binary files /dev/null and b/android/assets/sprites/player/player_1_w.png differ diff --git a/android/assets/sprites/player/player_2_m.png b/android/assets/sprites/player/player_2_m.png new file mode 100644 index 0000000..747d137 Binary files /dev/null and b/android/assets/sprites/player/player_2_m.png differ diff --git a/android/assets/sprites/player/player_2_w.png b/android/assets/sprites/player/player_2_w.png new file mode 100644 index 0000000..0da4e85 Binary files /dev/null and b/android/assets/sprites/player/player_2_w.png differ diff --git a/android/assets/sprites/player/player_3_m.png b/android/assets/sprites/player/player_3_m.png new file mode 100644 index 0000000..4dfb801 Binary files /dev/null and b/android/assets/sprites/player/player_3_m.png differ diff --git a/android/assets/sprites/player/player_3_w.png b/android/assets/sprites/player/player_3_w.png new file mode 100644 index 0000000..2c2dff9 Binary files /dev/null and b/android/assets/sprites/player/player_3_w.png differ diff --git a/android/assets/sprites/player/player_4_m.png b/android/assets/sprites/player/player_4_m.png new file mode 100644 index 0000000..4b921ac Binary files /dev/null and b/android/assets/sprites/player/player_4_m.png differ diff --git a/android/assets/sprites/player/player_4_w.png b/android/assets/sprites/player/player_4_w.png new file mode 100644 index 0000000..7772d2d Binary files /dev/null and b/android/assets/sprites/player/player_4_w.png differ diff --git a/android/assets/sprites/player/player_5_m.png b/android/assets/sprites/player/player_5_m.png new file mode 100644 index 0000000..9b54576 Binary files /dev/null and b/android/assets/sprites/player/player_5_m.png differ diff --git a/android/assets/sprites/player/player_5_w.png b/android/assets/sprites/player/player_5_w.png new file mode 100644 index 0000000..4d935d5 Binary files /dev/null and b/android/assets/sprites/player/player_5_w.png differ diff --git a/android/assets/sprites/player/player_6_m.png b/android/assets/sprites/player/player_6_m.png new file mode 100644 index 0000000..4ba40c4 Binary files /dev/null and b/android/assets/sprites/player/player_6_m.png differ diff --git a/android/assets/sprites/player/player_6_w.png b/android/assets/sprites/player/player_6_w.png new file mode 100644 index 0000000..6c1b2d7 Binary files /dev/null and b/android/assets/sprites/player/player_6_w.png differ diff --git a/android/assets/sprites/playerHealthBar.png b/android/assets/sprites/playerHealthBar.png new file mode 100644 index 0000000..eef1574 Binary files /dev/null and b/android/assets/sprites/playerHealthBar.png differ diff --git a/android/assets/sprites/playerHealthBarContainer.png b/android/assets/sprites/playerHealthBarContainer.png new file mode 100644 index 0000000..a6dc0fa Binary files /dev/null and b/android/assets/sprites/playerHealthBarContainer.png differ diff --git a/android/assets/sprites/potion.png b/android/assets/sprites/potion.png new file mode 100644 index 0000000..f5a0c27 Binary files /dev/null and b/android/assets/sprites/potion.png differ diff --git a/android/assets/sprites/projectile/arrow.png b/android/assets/sprites/projectile/arrow.png new file mode 100644 index 0000000..7df0703 Binary files /dev/null and b/android/assets/sprites/projectile/arrow.png differ diff --git a/android/assets/sprites/projectile/darkarrow.png b/android/assets/sprites/projectile/darkarrow.png new file mode 100644 index 0000000..46610eb Binary files /dev/null and b/android/assets/sprites/projectile/darkarrow.png differ diff --git a/android/assets/sprites/projectile/firearrow.png b/android/assets/sprites/projectile/firearrow.png new file mode 100644 index 0000000..6fae466 Binary files /dev/null and b/android/assets/sprites/projectile/firearrow.png differ diff --git a/android/assets/sprites/projectile/icearrow.png b/android/assets/sprites/projectile/icearrow.png new file mode 100644 index 0000000..c370296 Binary files /dev/null and b/android/assets/sprites/projectile/icearrow.png differ diff --git a/android/assets/sprites/projectile/laser.png b/android/assets/sprites/projectile/laser.png new file mode 100644 index 0000000..b6730d4 Binary files /dev/null and b/android/assets/sprites/projectile/laser.png differ diff --git a/android/assets/sprites/quitButton.png b/android/assets/sprites/quitButton.png new file mode 100644 index 0000000..ee2b467 Binary files /dev/null and b/android/assets/sprites/quitButton.png differ diff --git a/android/assets/sprites/restartButton.png b/android/assets/sprites/restartButton.png new file mode 100644 index 0000000..763c305 Binary files /dev/null and b/android/assets/sprites/restartButton.png differ diff --git a/android/assets/sprites/right.png b/android/assets/sprites/right.png new file mode 100644 index 0000000..199c983 Binary files /dev/null and b/android/assets/sprites/right.png differ diff --git a/android/assets/sprites/roomChange.png b/android/assets/sprites/roomChange.png new file mode 100644 index 0000000..a3739c5 Binary files /dev/null and b/android/assets/sprites/roomChange.png differ diff --git a/android/assets/sprites/selected.png b/android/assets/sprites/selected.png new file mode 100644 index 0000000..635ae9f Binary files /dev/null and b/android/assets/sprites/selected.png differ diff --git a/android/assets/sprites/settingsButton.png b/android/assets/sprites/settingsButton.png new file mode 100644 index 0000000..207ffb2 Binary files /dev/null and b/android/assets/sprites/settingsButton.png differ diff --git a/android/assets/sprites/skinContainer.png b/android/assets/sprites/skinContainer.png new file mode 100644 index 0000000..db61eaa Binary files /dev/null and b/android/assets/sprites/skinContainer.png differ diff --git a/android/assets/sprites/spell/darkspell.png b/android/assets/sprites/spell/darkspell.png new file mode 100644 index 0000000..5039b53 Binary files /dev/null and b/android/assets/sprites/spell/darkspell.png differ diff --git a/android/assets/sprites/spell/earthspell.png b/android/assets/sprites/spell/earthspell.png new file mode 100644 index 0000000..9a73349 Binary files /dev/null and b/android/assets/sprites/spell/earthspell.png differ diff --git a/android/assets/sprites/spell/firespell.png b/android/assets/sprites/spell/firespell.png new file mode 100644 index 0000000..88fd816 Binary files /dev/null and b/android/assets/sprites/spell/firespell.png differ diff --git a/android/assets/sprites/spell/healspell.png b/android/assets/sprites/spell/healspell.png new file mode 100644 index 0000000..908a757 Binary files /dev/null and b/android/assets/sprites/spell/healspell.png differ diff --git a/android/assets/sprites/spell/icespell.png b/android/assets/sprites/spell/icespell.png new file mode 100644 index 0000000..61c3508 Binary files /dev/null and b/android/assets/sprites/spell/icespell.png differ diff --git a/android/assets/sprites/spell/naturespell.png b/android/assets/sprites/spell/naturespell.png new file mode 100644 index 0000000..67b237f Binary files /dev/null and b/android/assets/sprites/spell/naturespell.png differ diff --git a/android/assets/sprites/spell/spell.png b/android/assets/sprites/spell/spell.png new file mode 100644 index 0000000..8df5006 Binary files /dev/null and b/android/assets/sprites/spell/spell.png differ diff --git a/android/assets/sprites/spell/waterspell.png b/android/assets/sprites/spell/waterspell.png new file mode 100644 index 0000000..9900213 Binary files /dev/null and b/android/assets/sprites/spell/waterspell.png differ diff --git a/android/assets/sprites/startButton.png b/android/assets/sprites/startButton.png new file mode 100644 index 0000000..484a67d Binary files /dev/null and b/android/assets/sprites/startButton.png differ diff --git a/android/assets/sprites/swordsman/darkswordsman_m.png b/android/assets/sprites/swordsman/darkswordsman_m.png new file mode 100644 index 0000000..827f93e Binary files /dev/null and b/android/assets/sprites/swordsman/darkswordsman_m.png differ diff --git a/android/assets/sprites/swordsman/darkswordsman_w.png b/android/assets/sprites/swordsman/darkswordsman_w.png new file mode 100644 index 0000000..da848f4 Binary files /dev/null and b/android/assets/sprites/swordsman/darkswordsman_w.png differ diff --git a/android/assets/sprites/swordsman/fireswordsman_m.png b/android/assets/sprites/swordsman/fireswordsman_m.png new file mode 100644 index 0000000..d18b1c4 Binary files /dev/null and b/android/assets/sprites/swordsman/fireswordsman_m.png differ diff --git a/android/assets/sprites/swordsman/fireswordsman_w.png b/android/assets/sprites/swordsman/fireswordsman_w.png new file mode 100644 index 0000000..962a69f Binary files /dev/null and b/android/assets/sprites/swordsman/fireswordsman_w.png differ diff --git a/android/assets/sprites/swordsman/iceswordsman_m.png b/android/assets/sprites/swordsman/iceswordsman_m.png new file mode 100644 index 0000000..7255e0a Binary files /dev/null and b/android/assets/sprites/swordsman/iceswordsman_m.png differ diff --git a/android/assets/sprites/swordsman/iceswordsman_w.png b/android/assets/sprites/swordsman/iceswordsman_w.png new file mode 100644 index 0000000..27fe1a4 Binary files /dev/null and b/android/assets/sprites/swordsman/iceswordsman_w.png differ diff --git a/android/assets/sprites/swordsman/swordsman_m.png b/android/assets/sprites/swordsman/swordsman_m.png new file mode 100644 index 0000000..327d352 Binary files /dev/null and b/android/assets/sprites/swordsman/swordsman_m.png differ diff --git a/android/assets/sprites/swordsman/swordsman_w.png b/android/assets/sprites/swordsman/swordsman_w.png new file mode 100644 index 0000000..5dddc5d Binary files /dev/null and b/android/assets/sprites/swordsman/swordsman_w.png differ diff --git a/android/assets/sprites/torch.png b/android/assets/sprites/torch.png new file mode 100644 index 0000000..d4d5dfb Binary files /dev/null and b/android/assets/sprites/torch.png differ diff --git a/android/assets/sprites/unlock.png b/android/assets/sprites/unlock.png new file mode 100644 index 0000000..7f9faab Binary files /dev/null and b/android/assets/sprites/unlock.png differ diff --git a/android/assets/sprites/volume.png b/android/assets/sprites/volume.png new file mode 100644 index 0000000..16e19d9 Binary files /dev/null and b/android/assets/sprites/volume.png differ diff --git a/android/assets/sprites/volumeButton.png b/android/assets/sprites/volumeButton.png new file mode 100644 index 0000000..d9ee060 Binary files /dev/null and b/android/assets/sprites/volumeButton.png differ diff --git a/android/assets/sprites/volumeDownButton.png b/android/assets/sprites/volumeDownButton.png new file mode 100644 index 0000000..72560c1 Binary files /dev/null and b/android/assets/sprites/volumeDownButton.png differ diff --git a/android/assets/sprites/volumeUpButton.png b/android/assets/sprites/volumeUpButton.png new file mode 100644 index 0000000..83b98dd Binary files /dev/null and b/android/assets/sprites/volumeUpButton.png differ diff --git a/android/assets/sprites/wizard/darkwizard_m.png b/android/assets/sprites/wizard/darkwizard_m.png new file mode 100644 index 0000000..67c35e3 Binary files /dev/null and b/android/assets/sprites/wizard/darkwizard_m.png differ diff --git a/android/assets/sprites/wizard/darkwizard_w.png b/android/assets/sprites/wizard/darkwizard_w.png new file mode 100644 index 0000000..b1835bf Binary files /dev/null and b/android/assets/sprites/wizard/darkwizard_w.png differ diff --git a/android/assets/sprites/wizard/earthwizard_m.png b/android/assets/sprites/wizard/earthwizard_m.png new file mode 100644 index 0000000..69897f1 Binary files /dev/null and b/android/assets/sprites/wizard/earthwizard_m.png differ diff --git a/android/assets/sprites/wizard/earthwizard_w.png b/android/assets/sprites/wizard/earthwizard_w.png new file mode 100644 index 0000000..2c156d4 Binary files /dev/null and b/android/assets/sprites/wizard/earthwizard_w.png differ diff --git a/android/assets/sprites/wizard/firewizard_m.png b/android/assets/sprites/wizard/firewizard_m.png new file mode 100644 index 0000000..4516f34 Binary files /dev/null and b/android/assets/sprites/wizard/firewizard_m.png differ diff --git a/android/assets/sprites/wizard/firewizard_w.png b/android/assets/sprites/wizard/firewizard_w.png new file mode 100644 index 0000000..1444cca Binary files /dev/null and b/android/assets/sprites/wizard/firewizard_w.png differ diff --git a/android/assets/sprites/wizard/healwizard_m.png b/android/assets/sprites/wizard/healwizard_m.png new file mode 100644 index 0000000..2488b33 Binary files /dev/null and b/android/assets/sprites/wizard/healwizard_m.png differ diff --git a/android/assets/sprites/wizard/healwizard_w.png b/android/assets/sprites/wizard/healwizard_w.png new file mode 100644 index 0000000..5f9152f Binary files /dev/null and b/android/assets/sprites/wizard/healwizard_w.png differ diff --git a/android/assets/sprites/wizard/icewizard_m.png b/android/assets/sprites/wizard/icewizard_m.png new file mode 100644 index 0000000..3b25858 Binary files /dev/null and b/android/assets/sprites/wizard/icewizard_m.png differ diff --git a/android/assets/sprites/wizard/icewizard_w.png b/android/assets/sprites/wizard/icewizard_w.png new file mode 100644 index 0000000..e043ddf Binary files /dev/null and b/android/assets/sprites/wizard/icewizard_w.png differ diff --git a/android/assets/sprites/wizard/naturewizard_m.png b/android/assets/sprites/wizard/naturewizard_m.png new file mode 100644 index 0000000..d34478d Binary files /dev/null and b/android/assets/sprites/wizard/naturewizard_m.png differ diff --git a/android/assets/sprites/wizard/naturewizard_w.png b/android/assets/sprites/wizard/naturewizard_w.png new file mode 100644 index 0000000..2a329e6 Binary files /dev/null and b/android/assets/sprites/wizard/naturewizard_w.png differ diff --git a/android/assets/sprites/wizard/waterwizard_m.png b/android/assets/sprites/wizard/waterwizard_m.png new file mode 100644 index 0000000..8ba639a Binary files /dev/null and b/android/assets/sprites/wizard/waterwizard_m.png differ diff --git a/android/assets/sprites/wizard/waterwizard_w.png b/android/assets/sprites/wizard/waterwizard_w.png new file mode 100644 index 0000000..8036e55 Binary files /dev/null and b/android/assets/sprites/wizard/waterwizard_w.png differ diff --git a/android/assets/sprites/wizard/wizard_m.png b/android/assets/sprites/wizard/wizard_m.png new file mode 100644 index 0000000..dcd1749 Binary files /dev/null and b/android/assets/sprites/wizard/wizard_m.png differ diff --git a/android/assets/sprites/wizard/wizard_w.png b/android/assets/sprites/wizard/wizard_w.png new file mode 100644 index 0000000..9d818bd Binary files /dev/null and b/android/assets/sprites/wizard/wizard_w.png differ diff --git a/android/assets/tilesets/tileset_floor_1.png b/android/assets/tilesets/tileset_floor_1.png new file mode 100644 index 0000000..7dd375f Binary files /dev/null and b/android/assets/tilesets/tileset_floor_1.png differ diff --git a/android/assets/tilesets/tileset_floor_2.png b/android/assets/tilesets/tileset_floor_2.png new file mode 100644 index 0000000..6b2de00 Binary files /dev/null and b/android/assets/tilesets/tileset_floor_2.png differ diff --git a/android/assets/tilesets/tileset_floor_3.png b/android/assets/tilesets/tileset_floor_3.png new file mode 100644 index 0000000..0f9c7c1 Binary files /dev/null and b/android/assets/tilesets/tileset_floor_3.png differ diff --git a/android/assets/tilesets/tileset_floor_4.png b/android/assets/tilesets/tileset_floor_4.png new file mode 100644 index 0000000..8d27e8f Binary files /dev/null and b/android/assets/tilesets/tileset_floor_4.png differ diff --git a/android/assets/tilesets/tileset_floor_5.png b/android/assets/tilesets/tileset_floor_5.png new file mode 100644 index 0000000..0e4a98e Binary files /dev/null and b/android/assets/tilesets/tileset_floor_5.png differ diff --git a/android/assets/tilesets/tileset_floor_6.png b/android/assets/tilesets/tileset_floor_6.png new file mode 100644 index 0000000..a62b1a4 Binary files /dev/null and b/android/assets/tilesets/tileset_floor_6.png differ diff --git a/android/assets/tilesets/tileset_floor_7.png b/android/assets/tilesets/tileset_floor_7.png new file mode 100644 index 0000000..222bb74 Binary files /dev/null and b/android/assets/tilesets/tileset_floor_7.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 0160172..245193b 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -901,7 +901,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ @Override public boolean touchDown(int screenX, int screenY, int pointer, int button) { - if(button == Input.Buttons.LEFT){ + //if(button == Input.Buttons.LEFT){ switch(click(screenX, screenY)){ case -1: // -1: nothing hit -- 0: go ingame -- 1: EXIT game -- 2: goto settings -- 3: goto controls -- 4: goto MainMenuScreen -- 9: volume down -- 10: volume up -- 11: restart game @@ -980,11 +980,16 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } if(gs != null && gs.getIsLoading() == false){ - + if(screenX < 0.5*Gdx.graphics.getWidth()){ + d.getPlayer().setMovementX(-d.getPlayer().getMovementSpeed()); + } + if(screenX > 0.5 * Gdx.graphics.getWidth()){ + d.getPlayer().setMovementX(d.getPlayer().getMovementSpeed()); + } return true; } - } + //} return true; } diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java index 4039d51..16ad6e1 100644 --- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -351,7 +351,7 @@ public class DungeonGenerator { case 11: //temp = new Healwizard(xPos, yPos, lvl); /* wird nicht gespawnt - BUG: HP über 100%, also crash in HUD container lol + BUG: HP ueber 100%, also crash in HUD container lol keine Lust zu beheben --TODO-- */ diff --git a/desktop/src/com/dungeoncrawler/control/desktop/DesktopLauncher.java b/desktop/src/com/dungeoncrawler/control/desktop/DesktopLauncher.java index 478dde4..bb43a77 100644 --- a/desktop/src/com/dungeoncrawler/control/desktop/DesktopLauncher.java +++ b/desktop/src/com/dungeoncrawler/control/desktop/DesktopLauncher.java @@ -7,6 +7,8 @@ import com.dungeoncrawler.control.Controller; public class DesktopLauncher { public static void main (String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); + config.width = 1600; + config.height = 900; new LwjglApplication(new Controller(), config); } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2b..20ce40c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Jun 26 08:36:12 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip