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

pawn selection doesnt break when no job

pull/1/head
Valerie 2022-06-01 20:46:05 -04:00
parent a3845ef537
commit fafa88f772
3 changed files with 4 additions and 2 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: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

4
src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Pawn.java
View File

@ -278,9 +278,11 @@ public class Pawn extends WorldObject implements ISelectable, IWorker {
@Override @Override
public String details() { public String details() {
IJob currentJob = jobboard.getJob(this);
String jobString = currentJob == null ? "No Job" : currentJob.getName();
return "" + name + "\n" + return "" + name + "\n" +
"Held | " + getCarriedName() + "\n" + "Held | " + getCarriedName() + "\n" +
"Job | " + jobboard.getJob(this).getName() + "\n" + "Job | " + jobString + "\n" +
""; "";
} }

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

@ -52,7 +52,7 @@ public class Assets {
log = new Sprite(atlas, 48, 96, 16, 16); log = new Sprite(atlas, 48, 96, 16, 16);
lilAxe = new Sprite(atlas, 64, 88, 16, 16); lilAxe = new Sprite(atlas, 64, 88, 16, 16);
haulArrow = new Sprite(atlas, 80, 88, 16, 16); haulArrow = new Sprite(atlas, 80, 88, 16, 16);
stockpile = new Sprite(atlas, 40, 64, 16, 16); stockpile = new Sprite(atlas, 40, 64, 4, 4);
Map<Character, Sprite> charset = new HashMap<Character, Sprite>(); Map<Character, Sprite> charset = new HashMap<Character, Sprite>();