GammelJan 6 years ago
parent d21b7d9d76
commit 7a82ca3760

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

@ -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<Integer> clicked = gs.click(screenX,screenY);

@ -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();
*/
*/
}

@ -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);
}

Loading…
Cancel
Save