JonathanHager
/
dungeoncrawler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cooles inv

Browse Source
master
GammelJAN 6 years ago
parent b41103f0d8
commit 1583e6c1ec
6 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File

BIN
core/assets/sprites/selected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
core/assets/sprites/sword.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
core/assets/tilesets/tileset_floor_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 40 KiB

54
core/src/com/dungeoncrawler/control/Controller.java
Unescape View File

@ -352,51 +352,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
} }
if(keycode == Input.Keys.R){
if(keycode == Input.Keys.G){
if(v != null){}
if(m != null && m.getIsLoading() == false){
Item k = new Potion(1);
//m.addItem(k);
//d.setCurrentItemContainer(m.playerPickUp(d.getCurrentItemContainer(), d.getPlayer()));
}
}
if(keycode == Input.Keys.H){
if(v != null){} if(v != null){}
if(m != null && m.getIsLoading() == false){ if(m != null && m.getIsLoading() == false){
Item k = new Key(1); d.getPlayer().getInv().equipItem();
//m.addItem(k);
//d.setCurrentItemContainer(m.playerPickUp(d.getCurrentItemContainer(), d.getPlayer()));
} }
} }
/*
if(keycode == Input.Keys.NUM_1){
m.moveItem(0);
}
if(keycode == Input.Keys.NUM_2){
m.moveItem(1);
}
if(keycode == Input.Keys.NUM_3){
m.moveItem(2);
}
if(keycode == Input.Keys.NUM_4){
m.moveItem(3);
}
if(keycode == Input.Keys.NUM_5){
m.moveItem(4);
}
if(keycode == Input.Keys.NUM_6){
m.moveItem(5);
}
if(keycode == Input.Keys.NUM_7){
m.moveItem(6);
}
if(keycode == Input.Keys.NUM_8){
m.moveItem(7);
}
*/
if(keycode == Input.Keys.UP){ if(keycode == Input.Keys.UP){
volume += 0.1f; volume += 0.1f;
@ -519,7 +480,16 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
@Override @Override
public boolean scrolled(int i) { public boolean scrolled(int i) {
return false; if(m != null){
if(i == -1 && d.getPlayer().getInv().getSelected() == 0){return true;}
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;
}
}
return true;
} }
} }

61
core/src/com/dungeoncrawler/model/Inventory.java
Unescape View File

@ -3,8 +3,7 @@ package com.dungeoncrawler.model;
public class Inventory { public class Inventory {
Item items[][]; Item items[];
Item equipped[];
int selected; int selected;
int width; int width;
int height; int height;
@ -12,44 +11,63 @@ public class Inventory {
public Inventory(int width, int height){ public Inventory(int width, int height){
this.width = width; this.width = width;
this.height = height; this.height = height;
items = new Item[width][height]; items = new Item[8];
equipped = new Item[2]; selected = 2;
} }
public void addItem(Item i) public void addItem(Item i)
{ {
for(int n = 0; n < items.length; n++){ for(int n = 2; n < items.length; n++){
for(int m = 0; m < items[0].length; m++){ if(items[n] == null){
if(items[n][m] == null){ items[n] = i;
items[n][m] = i;
n = items.length + 1; n = items.length + 1;
break; break;
} }
}
} }
} }
public void equipItem(int x, int y){ public void equipItem(){
if(items[x][y] == null || items[x][y].getId() == 0){} if(selected == 0 || selected == 1){
Item temp0 = items[selected];
items[selected] = null;
addItem(temp0);
}
else{ else{
int slot = items[x][y].getId() - 1; if(items[selected] == null || items[selected].getId() == 0){}
Item temp = equipped[slot]; else{
equipped[slot] = items[x][y]; switch(items[selected].getId()){
items[x][y] = temp; case 0:
break;
case 1:
Item temp1 = items[0];
items[0] = items[selected];
items[selected] = temp1;
break;
case 2:
Item temp2 = items[1];
items[1] = items[selected];
items[selected] = temp2;
break;
}
}
} }
} }
public void dropItem(int x, int y){ public void scroll(int i){
items[x][y] = null; selected += i;
}
public void dropItem(int x){
items[x] = null;
} }
public Item getItem(int x, int y){ public Item getItem(int x){
return items[x][y]; return items[x];
} }
public Item[][] getItem(){ public Item[] getItem(){
return items; return items;
} }
@ -59,5 +77,8 @@ public class Inventory {
public int getHeight(){ public int getHeight(){
return height; return height;
} }
public int getSelected(){
return selected;
}
} }

72
core/src/com/dungeoncrawler/view/HudContainer.java
Unescape View File

@ -22,9 +22,13 @@ public class HudContainer {
Sprite[] InventoryItemSprites; Sprite[] InventoryItemSprites;
float[] invXPos; float[] invXPos;
float[] invYPos; float[] invYPos;
int selected;
Texture selectedTexture;
Sprite selectedSprite;
public HudContainer(){ public HudContainer(){
selectedTexture = new Texture("sprites/selected.png");
selectedSprite = new Sprite(selectedTexture);
HudTexture = new Texture("sprites/hud.png"); HudTexture = new Texture("sprites/hud.png");
HudSprite = new Sprite(HudTexture); HudSprite = new Sprite(HudTexture);
HudSprite.setX(-HudSprite.getWidth()); HudSprite.setX(-HudSprite.getWidth());
@ -40,6 +44,7 @@ public class HudContainer {
invXPos[1] = HudSprite.getX() + 85f; invXPos[1] = HudSprite.getX() + 85f;
invYPos[1] = HudSprite.getY() + 112f; invYPos[1] = HudSprite.getY() + 112f;
invXPos[2] = HudSprite.getX() + 10f; invXPos[2] = HudSprite.getX() + 10f;
invYPos[2] = HudSprite.getY() + 61f; invYPos[2] = HudSprite.getY() + 61f;
invXPos[3] = HudSprite.getX() + 61f; invXPos[3] = HudSprite.getX() + 61f;
@ -53,21 +58,25 @@ public class HudContainer {
invYPos[6] = HudSprite.getY() + 10f; invYPos[6] = HudSprite.getY() + 10f;
invXPos[7] = HudSprite.getX() + 112f; invXPos[7] = HudSprite.getX() + 112f;
invYPos[7] = HudSprite.getY() + 10f; invYPos[7] = HudSprite.getY() + 10f;
selected = 2;
selectedSprite.setX(invXPos[selected] - 2f);
selectedSprite.setY(invYPos[selected] - 2f);
} }
public void updateInventory(SpriteBatch batch, Player p){ public void updateInventory(SpriteBatch batch, Player p){
InventoryItemSprites = new Sprite[8]; InventoryItemSprites = new Sprite[8];
Item[][] items = p.getInv().getItem(); Item[] items = p.getInv().getItem();
for(int x = 0; x < items.length; x++){ for(int x = 0; x < items.length; x++){
for(int y = 0; y < items[0].length; y++){ if(items[x] != null){
if(items[x][y] != null){ addItem(items[x], x);
addItem(items[x][y]);
} }
}
} }
selectedSprite.setX(invXPos[selected] - 2f);
selectedSprite.setY(invYPos[selected] - 2f);
batch.begin(); batch.begin();
HudSprite.draw(batch); HudSprite.draw(batch);
for(int i = 0; i < InventoryItemSprites.length ;i++){ for(int i = 0; i < InventoryItemSprites.length ;i++){
@ -75,48 +84,47 @@ public class HudContainer {
InventoryItemSprites[i].draw(batch); InventoryItemSprites[i].draw(batch);
} }
} }
selectedSprite.draw(batch);
batch.end(); batch.end();
} }
public void addItem(Item item){ public void addItem(Item item, int x){
switch(item.getId()){ switch(item.getId()){
case 0: case 0:
for(int i = 2; i < InventoryItemSprites.length; i++){ if(InventoryItemSprites[x] == null){
if(InventoryItemSprites[i] == null){ //InventoryItemTextures[i] = new Texture("sprites/itemTest.png");
//InventoryItemTextures[i] = new Texture("sprites/itemTest.png"); InventoryItemTextures[x] = new Texture("sprites/key.png");
InventoryItemTextures[i] = new Texture("sprites/key.png"); InventoryItemSprites[x] = new Sprite(InventoryItemTextures[x]);
InventoryItemSprites[i] = new Sprite(InventoryItemTextures[i]); InventoryItemSprites[x].setX(invXPos[x]);
InventoryItemSprites[i].setX(invXPos[i]); InventoryItemSprites[x].setY(invYPos[x]);
InventoryItemSprites[i].setY(invYPos[i]); break;
break;
}
} }
break; break;
case 1: case 1:
for(int i = 2; i < InventoryItemSprites.length; i++){ if(InventoryItemSprites[x] == null){
if(InventoryItemSprites[i] == null){ //InventoryItemTextures[i] = new Texture("sprites/itemTest.png");
//InventoryItemTextures[i] = new Texture("sprites/itemTest.png"); InventoryItemTextures[x] = new Texture("sprites/healingPotion.png");
InventoryItemTextures[i] = new Texture("sprites/healingPotion.png"); InventoryItemSprites[x] = new Sprite(InventoryItemTextures[x]);
InventoryItemSprites[i] = new Sprite(InventoryItemTextures[i]); InventoryItemSprites[x].setX(invXPos[x]);
InventoryItemSprites[i].setX(invXPos[i]); InventoryItemSprites[x].setY(invYPos[x]);
InventoryItemSprites[i].setY(invYPos[i]); break;
break;
}
} }
break; break;
case 2: case 2:
for(int i = 2; i < InventoryItemSprites.length; i++){ if(InventoryItemSprites[x] == null){
if(InventoryItemSprites[i] == null){
//InventoryItemTextures[i] = new Texture("sprites/itemTest.png"); //InventoryItemTextures[i] = new Texture("sprites/itemTest.png");
InventoryItemTextures[i] = new Texture("sprites/sword.png"); InventoryItemTextures[x]= new Texture("sprites/sword.png");
InventoryItemSprites[i] = new Sprite(InventoryItemTextures[i]); InventoryItemSprites[x] = new Sprite(InventoryItemTextures[x]);
InventoryItemSprites[i].setX(invXPos[i]); InventoryItemSprites[x].setX(invXPos[x]);
InventoryItemSprites[i].setY(invYPos[i]); InventoryItemSprites[x].setY(invYPos[x]);
break; break;
} }
}
break; break;
} }
} }
public void setSelected(int i){
selected = i;
}
} }

Write Preview
Loading…
Cancel
Save