jzitnik/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Fully working chest

Browse Source
This commit is contained in:
Jakub Žitník
2025-12-16 22:00:38 +01:00
parent 1e8e5cff6d
commit 3f0ccc49a8
5 changed files with 122 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cz/jzitnik/events/handlers/PlayerMoveEventHandler.java
View File

@@ -51,6 +51,8 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
Player player = gameState.getPlayer();
RoomCords playerCords = player.getPlayerCords();
int moveStep = 3;
int originalPlayerX = playerCords.getX();
int originalPlayerY = playerCords.getY();
switch (keyStroke.getCharacter()) {
@@ -61,7 +63,7 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
}
return;
}
playerCords.updateCords(player.getPlayerCords().getX(), playerCords.getY() - 5);
playerCords.updateCords(player.getPlayerCords().getX(), playerCords.getY() - moveStep);
}
case 'a' -> {
if (originalPlayerX <= 30) {
@@ -70,7 +72,7 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
}
return;
}
playerCords.updateCords(player.getPlayerCords().getX() - 5, playerCords.getY());
playerCords.updateCords(player.getPlayerCords().getX() - moveStep, playerCords.getY());
}
case 's' -> {
if (originalPlayerY >= 110) {
@@ -79,7 +81,7 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
}
return;
}
playerCords.updateCords(player.getPlayerCords().getX(), playerCords.getY() + 5);
playerCords.updateCords(player.getPlayerCords().getX(), playerCords.getY() + moveStep);
}
case 'd' -> {
if (originalPlayerX >= 155) {
@@ -88,7 +90,7 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
}
return;
}
playerCords.updateCords(player.getPlayerCords().getX() + 5, playerCords.getY());
playerCords.updateCords(player.getPlayerCords().getX() + moveStep, playerCords.getY());
}
}
int newPlayerX = playerCords.getX();

2
src/main/java/cz/jzitnik/game/ResourceManager.java
View File

@@ -32,6 +32,8 @@ public class ResourceManager {
CHEST("chest.png"),
WOODEN_SWORD("tools/wooden_sword.png"),
DOORS("rooms/doors.png");
private final String path;

2
src/main/java/cz/jzitnik/game/items/WoodenSword.java
View File

@@ -8,7 +8,7 @@ public class WoodenSword extends GameItem {
super(
"Wooden sword",
new Sword(5),
resourceManager.getResource(ResourceManager.Resource.PLAYER_RIGHT) // TODO: Change to actual resource
resourceManager.getResource(ResourceManager.Resource.WOODEN_SWORD)
);
}
}

122
src/main/java/cz/jzitnik/game/objects/Chest.java
View File

@@ -16,6 +16,7 @@ import cz.jzitnik.game.utils.RoomCords;
import cz.jzitnik.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState;
import cz.jzitnik.ui.pixels.ColoredPixel;
import cz.jzitnik.ui.pixels.Empty;
import cz.jzitnik.ui.pixels.Pixel;
import cz.jzitnik.utils.DependencyManager;
import cz.jzitnik.utils.RerenderUtils;
@@ -25,6 +26,7 @@ import cz.jzitnik.utils.events.EventManager;
import lombok.extern.slf4j.Slf4j;
import java.awt.image.BufferedImage;
import java.util.HashSet;
import java.util.List;
@Slf4j
@@ -55,12 +57,19 @@ public final class Chest extends GameObject implements Interactable, UIClickHand
this.dependencyManager = dm;
}
private int actualDisplayStartX;
private int actualDisplayStartY;
private int chestUISizeX;
private int chestUISizeY;
@Override
public void interact(DependencyManager dm) {
dm.inject(this);
log.debug("Interacted with chest");
render(false);
}
private void render(boolean clear) {
GameRoom currentRoom = gameState.getCurrentRoom();
Player player = gameState.getPlayer();
BufferedImage playerTexture = RerenderUtils.getPlayer(resourceManager, player);
@@ -77,8 +86,8 @@ public final class Chest extends GameObject implements Interactable, UIClickHand
int chestUIStartX = getCords().getX();
int chestUIStartY = getCords().getY();
int chestUISizeY = 16 + 4;
int chestUISizeX = 8 + itemCount * 16 + (itemCount - 1);
chestUISizeY = 16 + 4;
chestUISizeX = 4 + itemCount * 16 + (itemCount - 1) * 2;
int chestGUIStartY = chestUIStartY - chestUISizeY - 1;
int chestGUIStartX = chestUIStartX + (chest.getWidth() / 2) - (chestUISizeX / 2);
@@ -86,12 +95,44 @@ public final class Chest extends GameObject implements Interactable, UIClickHand
TerminalPosition guiStart = new TerminalPosition(chestGUIStartX / 2, chestGUIStartY);
TerminalPosition guiEnd = new TerminalPosition((chestGUIStartX + chestUISizeX - 1) / 2, ((chestGUIStartY + chestUISizeY - 1) / 2));
for (int y = chestGUIStartY; y < chestGUIStartY + chestUISizeY; y++) {
for (int x = chestGUIStartX; x < chestGUIStartX + chestUISizeX; x++) {
Pixel pixel = new ColoredPixel(TextColor.ANSI.RED);
actualDisplayStartX = chestGUIStartX + start.getX() + 2;
actualDisplayStartY = chestGUIStartY + start.getY() + 2;
buffer[y + start.getY()][x + start.getX()] = pixel;
overrideBuffer[y][x] = pixel;
if (clear) {
int chestUISizeX = 4 + (itemCount + 1) * 16 + (itemCount) * 2;
int chestGUIStartX2 = chestUIStartX + (chest.getWidth() / 2) - (chestUISizeX / 2);
for (int y = chestGUIStartY; y < chestGUIStartY + chestUISizeY; y++) {
for (int x = chestGUIStartX2; x < chestGUIStartX2 + chestUISizeX; x++) {
log.debug("{} {}", x, y);
int intPixel = RerenderUtils.getPixel(currentRoom, room, null, new HashSet<>(), player, playerTexture, x, y).pixel(); // This will never reach doors so no need to load texture
int red = (intPixel >> 16) & 0xff;
int green = (intPixel >> 8) & 0xff;
int blue = intPixel & 0xff;
Pixel pixel = new ColoredPixel(new TextColor.RGB(red, green, blue));
buffer[y + start.getY()][x + start.getX()] = pixel;
overrideBuffer[y][x] = new Empty();
}
}
guiStart = new TerminalPosition(chestGUIStartX2 / 2, chestGUIStartY);
guiEnd = new TerminalPosition((chestGUIStartX2 + chestUISizeX - 1) / 2, ((chestGUIStartY + chestUISizeY - 1) / 2));
}
if (!items.isEmpty()) {
for (int y = chestGUIStartY; y < chestGUIStartY + chestUISizeY; y++) {
for (int x = chestGUIStartX; x < chestGUIStartX + chestUISizeX; x++) {
int objectX = x - chestGUIStartX;
int objectY = y - chestGUIStartY;
Pixel pixel = getPixel(objectX, objectY, chestUISizeX, chestUISizeY);
buffer[y + start.getY()][x + start.getX()] = pixel;
overrideBuffer[y][x] = pixel;
}
}
}
@@ -102,8 +143,71 @@ public final class Chest extends GameObject implements Interactable, UIClickHand
eventManager.emitEvent(RerenderScreen.full(terminalState.getTerminalScreen().getTerminalSize())); // TODO: Make this not rerender full screen
}
// TODO: Add some padding on the item
private Pixel getPixel(int objectX, int objectY, int chestUISizeX, int chestUISizeY) {
if (objectX >= 0 && objectX <= 1 || objectX >= chestUISizeX - 2 && objectX <= chestUISizeX - 1 || objectY >= 0 && objectY <= 1 || objectY >= chestUISizeY - 2 && objectY <= chestUISizeY - 1) {
return new ColoredPixel(new TextColor.RGB(0, 0, 0));
}
int screenX = objectX - 2;
int screenY = objectY - 2;
int part = screenX / 18;
int rest = screenX % 18;
if (rest == 16 || rest == 17) {
return new ColoredPixel(new TextColor.RGB(0, 0, 0));
}
GameItem item = items.get(part);
BufferedImage texture = item.getTexture();
log.debug("{} {}", rest, screenY);
int pixel = texture.getRGB(rest, screenY);
int alpha = (pixel >> 24) & 0xff;
if (alpha == 0) {
return new ColoredPixel(
new TextColor.RGB(255, 255, 255)
);
}
int red = (pixel >> 16) & 0xff;
int green = (pixel >> 8) & 0xff;
int blue = pixel & 0xff;
return new ColoredPixel(
new TextColor.RGB(red, green, blue)
);
}
@Override
public void handleClick(MouseAction mouseAction) {
log.debug("Test");
int mouseX = mouseAction.getPosition().getColumn();
int mouseY = mouseAction.getPosition().getRow();
log.debug("Mouse: x: {}, y: {}", mouseX, mouseY);
int screenX = mouseX - actualDisplayStartX;
int screenY = (mouseY * 2) - actualDisplayStartY;
log.debug("Screen: x: {}, y: {}", screenX, screenY);
int part = screenX / 18;
if (screenX < 0 || screenY < 0 || screenX > chestUISizeX || screenY > chestUISizeY || part >= items.size()) {
return;
}
int rest = screenX % 18;
if (rest == 17 || rest == 16) {
return;
}
GameItem item = items.get(part);
items.remove(part);
// TODO: Add item to inventory
render(true);
}
}

BIN
src/main/resources/textures/tools/wooden_sword.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 471 B