From 1b55c47054f6681c0aa76964ce2fcfa60789bff6 Mon Sep 17 00:00:00 2001
From: zlatax <64391879+zlatax@users.noreply.github.com>
Date: Sat, 3 Apr 2021 21:09:02 +0900
Subject: [PATCH] everything runs without error
---
project-1/src/Entity.java | 9 ++-------
project-1/src/ShadowTreasure.java | 23 ++++++++++++++---------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/project-1/src/Entity.java b/project-1/src/Entity.java
index 540f81b..a2f018f 100644
--- a/project-1/src/Entity.java
+++ b/project-1/src/Entity.java
@@ -12,18 +12,13 @@ public class Entity {
this.pos = pos;
}
- public Image getImg() {
- return img;
- }
+ public Image getImg() { return img; }
public APoint getPos() {
return pos;
}
- public void setPos(APoint pos) {
- this.pos = pos;
- }
-
+ public void setPos(APoint pos) { this.pos = pos; }
// @Override
// public String toString() {
// }
diff --git a/project-1/src/ShadowTreasure.java b/project-1/src/ShadowTreasure.java
index c2c9b90..bae67cb 100644
--- a/project-1/src/ShadowTreasure.java
+++ b/project-1/src/ShadowTreasure.java
@@ -100,24 +100,28 @@ public class ShadowTreasure extends AbstractGame {
bg.drawFromTopLeft(0,0);
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
- if (player.getPos().distanceTo(zombie.getPos()) < 50) {
+ if (playerPos.distanceTo(zombiePos) < 50) {
player.addEnergy(-3);
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);
sandwich = null;
} // after user reaches sandwich, the object does ot exist therefore we need to rethink ocndiiton
if (player.getEnergy() >= 3) {
- APoint dir = player.getPos().getDirection(zombie.getPos());
- player.getPos().setX(player.getPos().getX() + dir.getX() * player.getStepsize());
- player.getPos().setY(player.getPos().getY() + dir.getY() * player.getStepsize());
+ APoint dir = playerPos.getDirection(zombiePos);
+ playerPos.setX(playerPos.getX() + dir.getX() * player.getStepsize());
+ playerPos.setY(playerPos.getY() + dir.getY() * player.getStepsize());
} else {
- APoint dir = player.getPos().getDirection(sandwich.getPos());
- player.getPos().setX(player.getPos().getX() + dir.getX() * player.getStepsize());
- player.getPos().setY(player.getPos().getY() + dir.getY() * player.getStepsize());
+ APoint dir = playerPos.getDirection(sandwich.getPos());
+ playerPos.setX(playerPos.getX() + dir.getX() * player.getStepsize());
+ playerPos.setY(playerPos.getY() + dir.getY() * player.getStepsize());
}
+ printInfo(playerPos.getX(),playerPos.getY(),player.getEnergy());
count=0;
}
count++;
@@ -137,6 +141,7 @@ public class ShadowTreasure extends AbstractGame {
}
+ // Removes
private static String removeUTF8BOM(String string) {
if (string.startsWith(UTF8_BOM)) {
string = string.substring(1);
--
GitLab