Skip to content
Snippets Groups Projects
Commit 1b55c470 authored by zlatax's avatar zlatax
Browse files

everything runs without error

parent ee4da0a7
Branches
No related tags found
No related merge requests found
...@@ -12,18 +12,13 @@ public class Entity { ...@@ -12,18 +12,13 @@ public class Entity {
this.pos = pos; this.pos = pos;
} }
public Image getImg() { public Image getImg() { return img; }
return img;
}
public APoint getPos() { public APoint getPos() {
return pos; return pos;
} }
public void setPos(APoint pos) { public void setPos(APoint pos) { this.pos = pos; }
this.pos = pos;
}
// @Override // @Override
// public String toString() { // public String toString() {
// } // }
......
...@@ -100,24 +100,28 @@ public class ShadowTreasure extends AbstractGame { ...@@ -100,24 +100,28 @@ public class ShadowTreasure extends AbstractGame {
bg.drawFromTopLeft(0,0); bg.drawFromTopLeft(0,0);
deja.drawString(String.format("energy: %d",player.getEnergy()),20,760); deja.drawString(String.format("energy: %d",player.getEnergy()),20,760);
if(count>10) { if(count==10) {
APoint playerPos = player.getPos();
APoint zombiePos = zombie.getPos();
// Logic to update the game, as per specification must go here // Logic to update the game, as per specification must go here
if (player.getPos().distanceTo(zombie.getPos()) < 50) { if (playerPos.distanceTo(zombiePos) < 50) {
player.addEnergy(-3); player.addEnergy(-3);
System.exit(0); System.exit(0);
} else if (sandwich != null && player.getPos().distanceTo(sandwich.getPos()) < 50) { } else if (sandwich != null && playerPos.distanceTo(sandwich.getPos()) < 50) {
player.addEnergy(5); player.addEnergy(5);
sandwich = null; sandwich = null;
} // after user reaches sandwich, the object does ot exist therefore we need to rethink ocndiiton } // after user reaches sandwich, the object does ot exist therefore we need to rethink ocndiiton
if (player.getEnergy() >= 3) { if (player.getEnergy() >= 3) {
APoint dir = player.getPos().getDirection(zombie.getPos()); APoint dir = playerPos.getDirection(zombiePos);
player.getPos().setX(player.getPos().getX() + dir.getX() * player.getStepsize()); playerPos.setX(playerPos.getX() + dir.getX() * player.getStepsize());
player.getPos().setY(player.getPos().getY() + dir.getY() * player.getStepsize()); playerPos.setY(playerPos.getY() + dir.getY() * player.getStepsize());
} else { } else {
APoint dir = player.getPos().getDirection(sandwich.getPos()); APoint dir = playerPos.getDirection(sandwich.getPos());
player.getPos().setX(player.getPos().getX() + dir.getX() * player.getStepsize()); playerPos.setX(playerPos.getX() + dir.getX() * player.getStepsize());
player.getPos().setY(player.getPos().getY() + dir.getY() * player.getStepsize()); playerPos.setY(playerPos.getY() + dir.getY() * player.getStepsize());
} }
printInfo(playerPos.getX(),playerPos.getY(),player.getEnergy());
count=0; count=0;
} }
count++; count++;
...@@ -137,6 +141,7 @@ public class ShadowTreasure extends AbstractGame { ...@@ -137,6 +141,7 @@ public class ShadowTreasure extends AbstractGame {
} }
// Removes
private static String removeUTF8BOM(String string) { private static String removeUTF8BOM(String string) {
if (string.startsWith(UTF8_BOM)) { if (string.startsWith(UTF8_BOM)) {
string = string.substring(1); string = string.substring(1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment