diff --git a/android/assets/sprites/controls/inventorySlot.png b/android/assets/sprites/controls/inventorySlot.png new file mode 100644 index 0000000..04ac936 Binary files /dev/null and b/android/assets/sprites/controls/inventorySlot.png differ diff --git a/android/assets/sprites/hud.png b/android/assets/sprites/hud.png index a2c2c9a..4042b33 100644 Binary files a/android/assets/sprites/hud.png and b/android/assets/sprites/hud.png differ diff --git a/android/assets/sprites/textbox.png b/android/assets/sprites/textbox.png new file mode 100644 index 0000000..908efe6 Binary files /dev/null and b/android/assets/sprites/textbox.png differ diff --git a/android/release/android-release.apk b/android/release/android-release.apk index 0a39c5d..eaa0a8a 100644 Binary files a/android/release/android-release.apk and b/android/release/android-release.apk differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 237c22f..a86c0ff 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -1021,6 +1021,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ case 11: create(); break; + } } @@ -1141,6 +1142,46 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ d.getPlayer().useItem(d.getPlayer().getInv().getSelected()); } break; + case 20: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(0); + } + break; + case 21: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(1); + } + break; + case 22: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(2); + } + break; + case 23: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(3); + } + break; + case 24: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(4); + } + break; + case 25: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(5); + } + break; + case 26: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(6); + } + break; + case 27: + if(!d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(7); + } + break; } } } @@ -1184,8 +1225,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(gs != null){ if(!d.getPlayer().isToDelete()) { - if(gs.click(screenX,screenY).contains(0) || gs.click(screenX,screenY).contains(1)|| gs.click(screenX,screenY).contains(2)|| gs.click(screenX,screenY).contains(3)){ + + if(!gs.click(screenX,screenY).contains(0) && !gs.click(screenX,screenY).contains(2)){ d.getPlayer().setMovementX(0); + } + + if(!gs.click(screenX,screenY).contains(1) &&!gs.click(screenX,screenY).contains(3)){ d.getPlayer().setMovementY(0); } ArrayList clicked = gs.click(screenX,screenY); diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index f7fd2f5..7087351 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -200,6 +200,15 @@ public class GameScreen { controls.add(new Button("sprites/controls/drop.png", 160+110, 30, 10)); controls.add(new Button("sprites/controls/equip2.png", 160+110, 120, 11)); controls.add(new Button("sprites/controls/use.png", 600-170, 200, 12)); + // INVENTORY + controls.add(new Button("sprites/controls/inventorySlot.png", -118, 334, 20)); //0 + controls.add(new Button("sprites/controls/inventorySlot.png", -69, 334, 21)); //1 + controls.add(new Button("sprites/controls/inventorySlot.png", -144, 282, 22)); //2 + controls.add(new Button("sprites/controls/inventorySlot.png", -92, 282, 23)); //3 + controls.add(new Button("sprites/controls/inventorySlot.png", -42, 282, 24)); //4 + controls.add(new Button("sprites/controls/inventorySlot.png", -144, 231, 25)); //5 + controls.add(new Button("sprites/controls/inventorySlot.png", -92, 231, 26)); //6 + controls.add(new Button("sprites/controls/inventorySlot.png", -42, 231, 27)); //7 } @@ -304,8 +313,8 @@ public class GameScreen { } lol.circle(mouseX,mouseY,15); lol.end(); +*/ - */ } diff --git a/core/src/com/dungeoncrawler/view/HudContainer.java b/core/src/com/dungeoncrawler/view/HudContainer.java index cd91508..6ba6cdf 100644 --- a/core/src/com/dungeoncrawler/view/HudContainer.java +++ b/core/src/com/dungeoncrawler/view/HudContainer.java @@ -28,6 +28,8 @@ public class HudContainer { Sprite playerHealthSprite; float playerHealthX; float playerHealthY; + + Sprite textboxSprite; BitmapFont font; float HudPosX; @@ -51,6 +53,8 @@ public class HudContainer { InventoryItemSprites = new Sprite[8]; invXPos = new float[8]; invYPos = new float[8]; + textboxSprite = new Sprite(new Texture("sprites/textbox.png")); + textboxSprite.setPosition(HudSprite.getX() + 21, HudSprite.getY() + 148); Texture inv = new Texture("sprites/hudInventory.png"); Inventory = new Sprite(inv); @@ -64,10 +68,10 @@ public class HudContainer { HudPosY = HudSprite.getY(); playerHealthX = HudPosX+36f; - playerHealthY = HudPosY+347f; + playerHealthY = HudPosY+357f; - healthBarContainer.setPosition(HudPosX + 8,HudPosY + 339); - Inventory.setPosition(HudPosX + 7,HudPosY + 170); + healthBarContainer.setPosition(HudPosX + 8,HudPosY + 349); + Inventory.setPosition(HudPosX + 7,HudPosY + 190); // 140 215 float InvX = Inventory.getX(); float InvY = Inventory.getY(); @@ -150,6 +154,7 @@ public class HudContainer { } selectedSprite.draw(batch); playerHealthSprite.draw(batch); + textboxSprite.draw(batch); font.draw(batch, p.getHp() + " / " + p.getMaxhp(), playerHealthSprite.getX()+18, playerHealthSprite.getY()+14); if(items[selected] != null){ @@ -179,8 +184,9 @@ public class HudContainer { break; } - font.draw(batch, selectedName + lvl, HudPosX + 40, HudPosY + 210); - font.draw(batch, perk + selectedPerkValue, HudPosX + 40, HudPosY + 190); + + font.draw(batch, selectedName + lvl, HudPosX + 40, HudPosY + 184); + font.draw(batch, perk + selectedPerkValue, HudPosX + 40, HudPosY + 164); }