valerie
/
hadean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into stable

pull/1/head
valyrie97 2022-12-31 16:28:04 -05:00
parent 37abb12e98 b2fc006de2
commit c881329591
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/textures.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

3
src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
View File

@ -27,6 +27,7 @@ public class Tile extends WorldObject implements IWorkable {
// private final int x, y;
private Vector4f color;
private final Sprite sprite = Assets.defaultTerrain[(int)Math.floor(Math.random() * Assets.defaultTerrain.length)];
private final Sprite farmSprite = Assets.farmPlot[(int)Math.floor(Math.random() * Assets.farmPlot.length)];
private List<ITileThing> stuff = new ArrayList<ITileThing>();
// TODO remove remove queue, cause like, we dont iterate over
@ -116,7 +117,7 @@ public class Tile extends WorldObject implements IWorkable {
}
if(tillLevel > 0f) {
Assets.flat.pushColor(Vector4f.opacity(tillLevel));
camera.draw(Layers.TILES, Assets.farmPlot, x, y);
camera.draw(Layers.TILES, farmSprite, x, y);
Assets.flat.popColor();
}
}

10
src/main/java/xyz/valnet/hadean/util/Assets.java
View File

@ -26,6 +26,7 @@ public class Assets {
public static final Sprite[] defaultTerrain;
public static final Sprite[] growingRice;
public static final Sprite[] farmPlot;
public static final Sprite pawn;
public static final Sprite tree;
public static final Sprite rocks;
@ -34,7 +35,6 @@ public class Assets {
public static final Sprite haulArrow;
public static final Sprite checkerBoard;
public static final Sprite riceBag;
public static final Sprite farmPlot;
public static final Sprite whiteBox;
public static final Sprite chicken;
public static final Sprite bed;
@ -66,6 +66,13 @@ public class Assets {
new Sprite(atlas, new Vector4i(56, 64, 8, 16))
};
farmPlot = new Sprite[] {
new Sprite(atlas, 24, 120, 8, 8),
new Sprite(atlas, 32, 120, 8, 8),
new Sprite(atlas, 24, 128, 8, 8),
new Sprite(atlas, 32, 128, 8, 8)
};
pawn = new Sprite(atlas, 48, 88, 8, 8);
tree = new Sprite(atlas, 64, 64, 24, 24);
rocks = new Sprite(atlas, 64, 104, 8, 8);
@ -74,7 +81,6 @@ public class Assets {
haulArrow = new Sprite(atlas, 80, 88, 16, 16);
checkerBoard = new Sprite(atlas, 40, 64, 4, 4);
riceBag = new Sprite(atlas, 48, 112, 16, 16);
farmPlot = new Sprite(atlas, 40, 72, 8, 8);
chicken = new Sprite(atlas, 0, 104, 8, 8);
bed = new Sprite(atlas, 0, 120, 8, 16);
egg = new Sprite(atlas, 8, 104, 8, 8);