From 3367673cc0e88af1c1d8f5eae9602597203c8501 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Tue, 26 May 2020 19:39:46 +0200 Subject: [PATCH] EHRE ALLA --- .../dungeoncrawler/control/Controller.java | 64 ++++++++++++++++++- .../com/dungeoncrawler/model/Inventory.java | 3 + .../com/dungeoncrawler/view/HudContainer.java | 2 + 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 995882e..d1c64e3 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -772,6 +772,69 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } } } + if(keycode == Input.Keys.NUM_0){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(0); + } + } + if(keycode == Input.Keys.NUM_1){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(0); + } + } + if(keycode == Input.Keys.NUM_2){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(1); + } + } + if(keycode == Input.Keys.NUM_3){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(2); + } + } + if(keycode == Input.Keys.NUM_4){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(3); + } + } + if(keycode == Input.Keys.NUM_5){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(4); + } + } + if(keycode == Input.Keys.NUM_6){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(5); + } + } + if(keycode == Input.Keys.NUM_7){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(6); + } + } + if(keycode == Input.Keys.NUM_8){ + if(mm != null){ + } + if(gs != null && !d.getPlayer().isToDelete()){ + d.getPlayer().getInv().setSelected(7); + } + } return true; } @@ -962,7 +1025,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ else if(i == 1 && d.getPlayer().getInv().getSelected() == 7){return true;} else{ d.getPlayer().getInv().scroll(i); - hc.setSelected(d.getPlayer().getInv().getSelected()); return true; } } diff --git a/core/src/com/dungeoncrawler/model/Inventory.java b/core/src/com/dungeoncrawler/model/Inventory.java index 0c69617..ead61b1 100644 --- a/core/src/com/dungeoncrawler/model/Inventory.java +++ b/core/src/com/dungeoncrawler/model/Inventory.java @@ -118,5 +118,8 @@ public class Inventory { public int getSelected(){ return selected; } + public void setSelected(int selected){ + this.selected = selected; + } } diff --git a/core/src/com/dungeoncrawler/view/HudContainer.java b/core/src/com/dungeoncrawler/view/HudContainer.java index 9e6c6af..7a9ffa2 100644 --- a/core/src/com/dungeoncrawler/view/HudContainer.java +++ b/core/src/com/dungeoncrawler/view/HudContainer.java @@ -105,6 +105,8 @@ public class HudContainer { public void updateHud(SpriteBatch batch, Player p){ InventoryItemSprites = new Sprite[8]; + selected = p.getInv().getSelected(); + Item[] items = p.getInv().getItem(); for(int x = 0; x < items.length; x++){