diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index cbcaeb801c1e170cee00f29a90eefefe8625fc62..162c77b885eb4747dd893530f71fceb8b41e059b 100644 (file)
return y * 16 - getCamY();
}
- private void drawWreck() {
+ private void drawWreck(int bl) {
if (gp.blockDmg > 0) {
spriter.draw(Assets.wreck[
10 * gp.blockDmg /
- Items.blocks.getValueAt(gp.world.getForeMap(gp.curX, gp.curY)).getHp()],
+ GameItems.getBlock(bl).getHp()],
gp.curX * 16 - getCamX(),
gp.curY * 16 - getCamY());
}
if (maxY > gp.world.getHeight()) maxY = gp.world.getHeight();
for (int y = minY; y < maxY; y++) {
for (int x = minX; x < maxX; x++) {
- if ((gp.world.getForeMap(x, y) == 0 || Items.blocks.getValueAt(gp.world.getForeMap(x, y)).tp)
+ if ((gp.world.getForeMap(x, y) == 0 || GameItems.getBlock(gp.world.getForeMap(x, y)).tp)
&& gp.world.getBackMap(x, y) > 0) {
spriter.draw(
- Assets.blockTex[Items.blocks.getValueAt(gp.world.getBackMap(x, y)).getTex()],
+ Assets.blockTex[GameItems.getBlock(gp.world.getBackMap(x, y)).getTex()],
drawX(x), drawY(y));
- if (gp.world.getForeMap(x, y) == 0) drawWreck();
+ if (gp.world.getForeMap(x, y) == 0 && x == gp.curX && y == gp.curY)
+ drawWreck(gp.world.getBackMap(gp.curX, gp.curY));
Assets.shade.setPosition(drawX(x), drawY(y));
Assets.shade.draw(spriter);
}
- if (gp.world.getForeMap(x, y) > 0 && Items.blocks.getValueAt(gp.world.getForeMap(x, y)).bg) {
+ if (gp.world.getForeMap(x, y) > 0 && GameItems.getBlock(gp.world.getForeMap(x, y)).bg) {
spriter.draw(
- Assets.blockTex[Items.blocks.getValueAt(gp.world.getForeMap(x, y)).getTex()],
+ Assets.blockTex[GameItems.getBlock(gp.world.getForeMap(x, y)).getTex()],
drawX(x), drawY(y));
- drawWreck();
+ if (x == gp.curX && y == gp.curY)
+ drawWreck(gp.world.getForeMap(gp.curX, gp.curY));
}
}
}
if (maxY > gp.world.getHeight()) maxY = gp.world.getHeight();
for (int y = minY; y < maxY; y++) {
for (int x = minX; x < maxX; x++) {
- if (gp.world.getForeMap(x, y) > 0 && !Items.blocks.getValueAt(gp.world.getForeMap(x, y)).bg) {
+ if (gp.world.getForeMap(x, y) > 0 && !GameItems.getBlock(gp.world.getForeMap(x, y)).bg) {
spriter.draw(
- Assets.blockTex[Items.blocks.getValueAt(gp.world.getForeMap(x, y)).getTex()],
+ Assets.blockTex[GameItems.getBlock(gp.world.getForeMap(x, y)).getTex()],
drawX(x), drawY(y));
- drawWreck();
+ if (x == gp.curX && y == gp.curY)
+ drawWreck(gp.world.getForeMap(gp.curX, gp.curY));
}
}
}
private void drawMob(Mob mob) {
mob.draw(spriter,
- mob.position.x - getCamX() - gp.world.getWidth() * 16, mob.position.y - getCamY());
+ mob.pos.x - getCamX() - gp.world.getWidth() * 16, mob.pos.y - getCamY());
mob.draw(spriter,
- mob.position.x - getCamX(), mob.position.y - getCamY());
+ mob.pos.x - getCamX(), mob.pos.y - getCamY());
mob.draw(spriter,
- mob.position.x - getCamX() + gp.world.getWidth() * 16, mob.position.y - getCamY());
+ mob.pos.x - getCamX() + gp.world.getWidth() * 16, mob.pos.y - getCamY());
}
private void drawDrop(Drop drop) {
- switch (Items.items.get(drop.getId()).getType()) {
+ switch (GameItems.getItem(drop.getId()).getType()) {
case 0:
- Assets.blockTex[Items.items.get(drop.getId()).getTex()].setPosition(drop.position.x - getCamX() - gp.world.getWidth() * 16, drop.position.y - getCamY());
- Assets.blockTex[Items.items.get(drop.getId()).getTex()].draw(spriter);
- Assets.blockTex[Items.items.get(drop.getId()).getTex()].setPosition(drop.position.x - getCamX(), drop.position.y - getCamY());
- Assets.blockTex[Items.items.get(drop.getId()).getTex()].draw(spriter);
- Assets.blockTex[Items.items.get(drop.getId()).getTex()].setPosition(drop.position.x - getCamX() + gp.world.getWidth() * 16, drop.position.y - getCamY());
- Assets.blockTex[Items.items.get(drop.getId()).getTex()].draw(spriter);
+ Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(
+ drop.pos.x - getCamX() - gp.world.getWidth() * 16,
+ drop.pos.y - getCamY());
+ Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
+ Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(
+ drop.pos.x - getCamX(),
+ drop.pos.y - getCamY());
+ Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
+ Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(
+ drop.pos.x - getCamX() + gp.world.getWidth() * 16,
+ drop.pos.y - getCamY());
+ Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
}
}
//back hand
Assets.plSprite[1][2].setPosition(
- pl.position.x - getCamX() - 6,
- pl.position.y - getCamY());
+ pl.pos.x - getCamX() - 6,
+ pl.pos.y - getCamY());
Assets.plSprite[1][2].draw(spriter);
//back leg
Assets.plSprite[1][3].setPosition(
- pl.position.x - getCamX() - 6,
- pl.position.y - getCamY() + 10);
+ pl.pos.x - getCamX() - 6,
+ pl.pos.y - getCamY() + 10);
Assets.plSprite[1][3].draw(spriter);
//front leg
Assets.plSprite[0][3].setPosition(
- pl.position.x - getCamX() - 6,
- pl.position.y - getCamY() + 10);
+ pl.pos.x - getCamX() - 6,
+ pl.pos.y - getCamY() + 10);
Assets.plSprite[0][3].draw(spriter);
//head
spriter.draw(Assets.plSprite[pl.dir][0],
- pl.position.x - getCamX() - 2,
- pl.position.y - getCamY() - 2);
+ pl.pos.x - getCamX() - 2,
+ pl.pos.y - getCamY() - 2);
//body
spriter.draw(Assets.plSprite[pl.dir][1],
- pl.position.x - getCamX() - 2, pl.position.y - getCamY() + 8);
+ pl.pos.x - getCamX() - 2, pl.pos.y - getCamY() + 8);
//item in hand
- if (pl.inventory[gp.invSlot] > 0)
- switch (Items.items.get(pl.inventory[gp.invSlot]).getType()) {
+ if (pl.inv[gp.slot] > 0) {
+ float handRotation = MathUtils.degRad * Assets.plSprite[0][2].getRotation();
+ switch (GameItems.getItem(pl.inv[gp.slot]).getType()) {
case 0:
- Assets.blockTex[Items.items.get(pl.inventory[gp.invSlot]).getTex()].setPosition(
- pl.position.x - getCamX() - 8 * MathUtils.sin(MathUtils.degRad * Assets.plSprite[0][2].getRotation()),
- pl.position.y - getCamY() + 6 + 8 * MathUtils.cos(MathUtils.degRad * Assets.plSprite[0][2].getRotation()));
- Assets.blockTex[Items.items.get(pl.inventory[gp.invSlot]).getTex()].draw(spriter);
+ Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition(
+ pl.pos.x - getCamX() - 8 * MathUtils.sin(handRotation),
+ pl.pos.y - getCamY() + 6 + 8 * MathUtils.cos(handRotation));
+ Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter);
break;
default:
- Assets.itemTex[Items.items.get(pl.inventory[gp.invSlot]).getTex()].flip((pl.dir == 0), false);
- Assets.itemTex[Items.items.get(pl.inventory[gp.invSlot]).getTex()].setRotation(
+ Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.dir == 0), false);
+ Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setRotation(
-45 + pl.dir * 90 + Assets.plSprite[0][2].getRotation());
- Assets.itemTex[Items.items.get(pl.inventory[gp.invSlot]).getTex()].setPosition(
- pl.position.x - getCamX() - 10 + (12 * pl.dir) - 8 * MathUtils.sin(MathUtils.degRad * Assets.plSprite[0][2].getRotation()),
- pl.position.y - getCamY() + 2 + 8 * MathUtils.cos(MathUtils.degRad * Assets.plSprite[0][2].getRotation()));
- Assets.itemTex[Items.items.get(pl.inventory[gp.invSlot]).getTex()].draw(spriter);
- Assets.itemTex[Items.items.get(pl.inventory[gp.invSlot]).getTex()].flip((pl.dir == 0), false);
+ Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition(
+ pl.pos.x - getCamX() - 10 + (12 * pl.dir) - 8 * MathUtils.sin(handRotation),
+ pl.pos.y - getCamY() + 2 + 8 * MathUtils.cos(handRotation));
+ Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter);
+ Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.dir == 0), false);
break;
}
+ }
//front hand
Assets.plSprite[0][2].setPosition(
- pl.position.x - getCamX() - 6,
- pl.position.y - getCamY());
+ pl.pos.x - getCamX() - 6,
+ pl.pos.y - getCamY());
Assets.plSprite[0][2].draw(spriter);
}
spriter.draw(Assets.creativeScr, x + 156,
y + 18 + (gp.creativeScroll * (72 / gp.maxCreativeScroll)));
for (int i = gp.creativeScroll * 8; i < gp.creativeScroll * 8 + 40; i++) {
- if (i > 0 && i < Items.items.size())
- switch (Items.items.get(i).getType()) {
+ if (i > 0 && i < GameItems.getItemsSize())
+ switch (GameItems.getItem(i).getType()) {
case 0:
- spriter.draw(Assets.blockTex[Items.items.get(i).getTex()],
+ spriter.draw(Assets.blockTex[GameItems.getItem(i).getTex()],
x + 8 + ((i - gp.creativeScroll * 8) % 8) * 18,
y + 18 + ((i - gp.creativeScroll * 8) / 8) * 18);
break;
case 1:
- spriter.draw(Assets.itemTex[Items.items.get(i).getTex()],
+ spriter.draw(Assets.itemTex[GameItems.getItem(i).getTex()],
x + 8 + ((i - gp.creativeScroll * 8) % 8) * 18,
y + 18 + ((i - gp.creativeScroll * 8) / 8) * 18);
break;
}
}
for (int i = 0; i < 9; i++) {
- if (gp.player.inventory[i] > 0)
- switch (Items.items.get(gp.player.inventory[i]).getType()) {
+ if (gp.player.inv[i] > 0)
+ switch (GameItems.getItem(gp.player.inv[i]).getType()) {
case 0:
- spriter.draw(Assets.blockTex[Items.items.get(gp.player.inventory[i]).getTex()],
+ spriter.draw(Assets.blockTex[GameItems.getItem(gp.player.inv[i]).getTex()],
x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
break;
case 1:
- spriter.draw(Assets.itemTex[Items.items.get(gp.player.inventory[i]).getTex()],
+ spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inv[i]).getTex()],
x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
break;
}
spriter.draw(Assets.guiCur,
gp.curX * 16 - getCamX(),
gp.curY * 16 - getCamY());
- spriter.draw(Assets.invBar, getWidth() / 2 - Assets.invBar.getRegionWidth() / 2, 0);
+ spriter.draw(Assets.invBar, getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2, 0);
for (int i = 0; i < 9; i++) {
- if (gp.player.inventory[i] > 0) {
- switch (Items.items.get(gp.player.inventory[i]).getType()) {
+ if (gp.player.inv[i] > 0) {
+ switch (GameItems.getItem(gp.player.inv[i]).getType()) {
case 0:
- spriter.draw(Assets.blockTex[Items.items.get(gp.player.inventory[i]).getTex()],
- getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
+ spriter.draw(Assets.blockTex[GameItems.getItem(gp.player.inv[i]).getTex()],
+ getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
3);
break;
case 1:
- spriter.draw(Assets.itemTex[Items.items.get(gp.player.inventory[i]).getTex()],
- getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
+ spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inv[i]).getTex()],
+ getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
3);
break;
}
}
}
spriter.draw(Assets.invBarCur,
- getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.invSlot,
+ getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.slot,
-1);
}
if (GameScreen.SHOW_DEBUG) {
drawString("FPS: " + GameScreen.FPS, 0, 0);
- drawString("X: " + (int) (gp.player.position.x / 16), 0, 10);
- drawString("Y: " + (int) (gp.player.position.y / 16), 0, 20);
+ drawString("X: " + (int) (gp.player.pos.x / 16), 0, 10);
+ drawString("Y: " + (int) (gp.player.pos.y / 16), 0, 20);
drawString("Mobs: " + gp.mobs.size(), 0, 30);
drawString("Drops: " + gp.drops.size(), 0, 40);
- drawString("Block: " + Items.blocks.getKeyAt(gp.world.getForeMap(gp.curX, gp.curY)), 0, 50);
+ drawString("Block: " + GameItems.getBlockKey(gp.world.getForeMap(gp.curX, gp.curY)), 0, 50);
}
-
spriter.end();
}