From a604c96d29b69ca67bb757f2c798cbe466dd4c30 Mon Sep 17 00:00:00 2001
From: Yiya Zhuang <yiyaz@student.unimelb.edu.au>
Date: Sun, 18 Apr 2021 19:18:38 +1000
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E6=83=B3=E8=A6=81=E7=9A=84version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/encodings.xml | 2 +
bagel.iml | 1 +
src/Player.java | 3 +-
src/ShadowTreasure.java | 70 +++++++++++++++++++--------
target/classes/Player.class | Bin 830 -> 849 bytes
target/classes/ShadowTreasure.class | Bin 4952 -> 5571 bytes
target/classes/test1/environment.csv | 3 ++
target/classes/test1/output.csv | 53 ++++++++++++++++++++
target/classes/test2/environment.csv | 3 ++
target/classes/test2/output.csv | 39 +++++++++++++++
test/test1/environment.csv | 2 +-
test/test2/environment.csv | 2 +-
12 files changed, 156 insertions(+), 22 deletions(-)
create mode 100644 target/classes/test1/environment.csv
create mode 100644 target/classes/test1/output.csv
create mode 100644 target/classes/test2/environment.csv
create mode 100644 target/classes/test2/output.csv
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 082896b..8c4dc07 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,7 @@
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/res/IO/environment.csv" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/test/test1/environment.csv" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/test/test2/environment.csv" charset="GBK" />
</component>
</project>
\ No newline at end of file
diff --git a/bagel.iml b/bagel.iml
index bb67b4e..caf8fb7 100644
--- a/bagel.iml
+++ b/bagel.iml
@@ -6,6 +6,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/test" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
diff --git a/src/Player.java b/src/Player.java
index 1161b2e..15f8e88 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -13,10 +13,11 @@ public class Player extends Entity{
}
protected void updateEnergy(int amount) {
- energy.add(amount);
+ this.energy.add(amount);
}
protected void eat(Sandwich sandwich) {
+ this.updateEnergy(+5);
sandwich.eaten();
}
}
diff --git a/src/ShadowTreasure.java b/src/ShadowTreasure.java
index 1f01ca3..814a4bf 100644
--- a/src/ShadowTreasure.java
+++ b/src/ShadowTreasure.java
@@ -1,4 +1,5 @@
import bagel.*;
+import bagel.util.Colour;
import bagel.util.Vector2;
import java.io.*;
@@ -12,11 +13,14 @@ import java.util.Scanner;
* An example Bagel game.
*/
public class ShadowTreasure extends AbstractGame {
- private final Image background;
+ private String filename = "res/IO/environment.csv";
+ private final Image background = new Image("res/images/background.png");
private Player player;
private Zombie zombie;
private Sandwich sandwich;
private final Font energyLevel = new Font("res/font/DejaVuSans-Bold.ttf", 20);
+ private final DrawOptions black = new DrawOptions().setBlendColour(Colour.BLACK);
+ private int frame = 0;
// for rounding double number; use this to print the location of the player
private static DecimalFormat df = new DecimalFormat("0.00");
@@ -26,9 +30,8 @@ public class ShadowTreasure extends AbstractGame {
}
public ShadowTreasure() throws IOException {
- this.loadEnvironment("res/IO/environment.csv");
+ this.loadEnvironment(filename);
// Add code to initialize other attributes as needed
- background = new Image("res/images/background.png");
}
/**
@@ -59,6 +62,7 @@ public class ShadowTreasure extends AbstractGame {
break;
}
}
+ printInfo(player.getX(), player.getY(), player.getEnergy());
}
/**
@@ -67,47 +71,75 @@ public class ShadowTreasure extends AbstractGame {
@Override
public void update(Input input) {
// Logic to update the game, as per specification must go here
- double speed = 10, x, y;
+ if (input.wasPressed(Keys.ESCAPE)) {
+ Window.close();
+
+ } else if (frame<10) {
+ background.draw(Window.getWidth() / 2.0, Window.getHeight() / 2.0);
+ player.draw(player.getX(), player.getY());
+ zombie.draw(zombie.getX(), zombie.getY());
+ if (!sandwich.isEaten()) {
+ sandwich.draw(sandwich.getX(), sandwich.getY());
+ }
+ energyLevel.drawString("energy: " + Integer.toString(player.getEnergy()),
+ 20, 760, black);
+ frame++;
+ return;
+ }
+
+ double speed = 10;
double playerToZombie = player.getPosition().distanceTo(zombie.getPosition());
double playerToSandwich = player.getPosition().distanceTo(sandwich.getPosition());
double distDiff = playerToZombie - playerToSandwich;
int energy = player.getEnergy();
Vector2 direction;
- if (input.wasPressed(Keys.ESCAPE)) {
- Window.close();
-
- } else if (playerToZombie <= 50) {
- player.updateEnergy(-3);
- Window.close(); // terminate game if player meets zombie
-
- } else if (playerToSandwich <= 50 && !sandwich.isEaten()) {
- player.eat(sandwich);
- player.updateEnergy(+5);
-
- } else if (sandwich.isEaten() || (distDiff < 0 && energy >= 3)) {
+ if (sandwich.isEaten() || (distDiff <= 0 && energy >= 3)) {
+// if (sandwich.isEaten() || energy >= 3) {
// player move to zombie
direction = zombie.getPosition().asVector().sub(player.getPosition().asVector());
direction = direction.normalised();
player.setX(player.getX() + speed * direction.x);
player.setY(player.getY() + speed * direction.y);
- } else if (distDiff >= 0 || player.getEnergy() < 3) {
+ playerToZombie = player.getPosition().distanceTo(zombie.getPosition());
+
+ if (playerToZombie <= 50) {
+ player.updateEnergy(-3);
+ Window.close(); // terminate game if player meets zombie
+ }
+// if (playerToSandwich <= 50) {
+// player.eat(sandwich);
+// }
+
+ } else if (distDiff > 0 || player.getEnergy() < 3) {
+// } else if (player.getEnergy() < 3) {
// player move to sandwich
direction = sandwich.getPosition().asVector().sub(player.getPosition().asVector());
direction = direction.normalised();
player.setX(player.getX() + speed * direction.x);
player.setY(player.getY() + speed * direction.y);
+ playerToSandwich = player.getPosition().distanceTo(sandwich.getPosition());
+
+// if (playerToZombie <= 50) {
+// player.updateEnergy(-3);
+// Window.close(); // terminate game if player meets zombie
+ if (playerToSandwich <= 50) {
+ player.eat(sandwich);
+ }
}
+
background.draw(Window.getWidth() / 2.0, Window.getHeight() / 2.0);
- energyLevel.drawString("energy: " + Integer.toString(player.getEnergy()),
- 20, 760);
player.draw(player.getX(), player.getY());
zombie.draw(zombie.getX(), zombie.getY());
if (!sandwich.isEaten()) {
sandwich.draw(sandwich.getX(), sandwich.getY());
}
+ energyLevel.drawString("energy: " + Integer.toString(player.getEnergy()),
+ 20, 760, black);
+ frame = 0;
+ printInfo(player.getX(), player.getY(), player.getEnergy());
}
diff --git a/target/classes/Player.class b/target/classes/Player.class
index f73a38e0a46071064afac16b858a2daf947e5336..3a0c3f5d4eb3b2875a140b8a0a29834fcc91c597 100644
GIT binary patch
delta 389
zcmdnTc9D(i)W2Q(7#J9=7)&Q}tyAG;km6yGX5eOI;3+LgNi0cq%}XsxujFEoWsqZM
zkmq4gU{IWRc-iC%#!OZv21W+u$<G+o>s1&S82A{N85kJY88{d?7(^L38B`e<7)%&g
z85kJE7}OZl89+dcL4!e)fe|dG#h}f=1ZL?lXfv>YSpp2Y3~UT63?dAoAhQ`57>pPg
z!Rk4*wlMH)V-Q-yz`(%70J4t_EY1V6r=Eca%;A7q!~*gG)Br~YCa^V}AOobgF^Fx1
zo4^H@5Mbb75CoaRAO_}hLJeVH;AGHa&}Cp`U}4Z_Fn}881~raLi(?yur1mxjnT-q#
fHc%%)f<T0U6&wI!NQQF34dr4mgnG&t><|+G>p>&J
delta 327
zcmcb}wvUbL)W2Q(7#J9=7>p-!t>czrkY;C);bD+vkehgC881(1K}upts%u_qQF`U%
z2F7ewc?L!Xg~=Zn)x#AT7#R2%m>C!t*cmt&I2c43I2n`}7#K_#SQ!`?#2AzrR2V=&
zj6sz_je!v?rp}<jzyxM#GH5WcfLQ_zS`2IqEDRzHqF}T0m?YIfX0w6y@PN(a0kb)v
zX0kA7GjM~|u49s_2dU)(n<~J-!5|1$F9zmwLe(=ca5CsHXfZG{urTN{=z(-HFfiCM
uFoIRFYHwqZ+{nPdz{G$sN`!%hK@`a-R=82D4EhWP42%qn42EDmj79)t8y=<r
diff --git a/target/classes/ShadowTreasure.class b/target/classes/ShadowTreasure.class
index 9302a6e71f79cb6282827b663cb98188e068aee7..44025b593df3de73b399bf3b39f28aa5ff878a1b 100644
GIT binary patch
delta 3528
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
WqYs$$V+;V-ij0hbjKPed43Yrzs#kCT
delta 2749
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
JD@GdzNdU0RWw-zU
diff --git a/target/classes/test1/environment.csv b/target/classes/test1/environment.csv
new file mode 100644
index 0000000..99f4061
--- /dev/null
+++ b/target/classes/test1/environment.csv
@@ -0,0 +1,3 @@
+Player,650,100,2
+Zombie,300,200
+Sandwich,500,400
\ No newline at end of file
diff --git a/target/classes/test1/output.csv b/target/classes/test1/output.csv
new file mode 100644
index 0000000..331f294
--- /dev/null
+++ b/target/classes/test1/output.csv
@@ -0,0 +1,53 @@
+650.00,100.00,2
+645.53,108.94,2
+641.06,117.89,2
+636.58,126.83,2
+632.11,135.78,2
+627.64,144.72,2
+623.17,153.67,2
+618.70,162.61,2
+614.22,171.55,2
+609.75,180.50,2
+605.28,189.44,2
+600.81,198.39,2
+596.33,207.33,2
+591.86,216.28,2
+587.39,225.22,2
+582.92,234.16,2
+578.45,243.11,2
+573.97,252.05,2
+569.50,261.00,2
+565.03,269.94,2
+560.56,278.89,2
+556.09,287.83,2
+551.61,296.77,2
+547.14,305.72,2
+542.67,314.66,2
+538.20,323.61,2
+533.72,332.55,2
+529.25,341.50,2
+524.78,350.44,2
+520.31,359.38,7
+512.21,353.52,7
+504.10,347.66,7
+496.00,341.80,7
+487.90,335.94,7
+479.80,330.08,7
+471.70,324.21,7
+463.59,318.35,7
+455.49,312.49,7
+447.39,306.63,7
+439.29,300.77,7
+431.19,294.91,7
+423.08,289.05,7
+414.98,283.18,7
+406.88,277.32,7
+398.78,271.46,7
+390.68,265.60,7
+382.57,259.74,7
+374.47,253.88,7
+366.37,248.02,7
+358.27,242.15,7
+350.17,236.29,7
+342.06,230.43,7
+333.96,224.57,4
diff --git a/target/classes/test2/environment.csv b/target/classes/test2/environment.csv
new file mode 100644
index 0000000..1988788
--- /dev/null
+++ b/target/classes/test2/environment.csv
@@ -0,0 +1,3 @@
+Player,650,100,3
+Zombie,500,500
+Sandwich,300,200
\ No newline at end of file
diff --git a/target/classes/test2/output.csv b/target/classes/test2/output.csv
new file mode 100644
index 0000000..85bdc5c
--- /dev/null
+++ b/target/classes/test2/output.csv
@@ -0,0 +1,39 @@
+650.00,100.00,3
+646.49,109.36,3
+642.98,118.73,3
+639.47,128.09,3
+635.96,137.45,3
+632.44,146.82,3
+628.93,156.18,3
+625.42,165.54,3
+621.91,174.91,3
+618.40,184.27,3
+614.89,193.63,3
+611.38,203.00,3
+607.87,212.36,3
+604.35,221.72,3
+600.84,231.09,3
+597.33,240.45,3
+593.82,249.81,3
+590.31,259.18,3
+586.80,268.54,3
+583.29,277.90,3
+579.78,287.27,3
+576.26,296.63,3
+572.75,305.99,3
+569.24,315.36,3
+565.73,324.72,3
+562.22,334.08,3
+558.71,343.45,3
+555.20,352.81,3
+551.69,362.17,3
+548.17,371.54,3
+544.66,380.90,3
+541.15,390.26,3
+537.64,399.63,3
+534.13,408.99,3
+530.62,418.35,3
+527.11,427.72,3
+523.60,437.08,3
+520.08,446.44,3
+516.57,455.81,0
diff --git a/test/test1/environment.csv b/test/test1/environment.csv
index 79fea88..99f4061 100644
--- a/test/test1/environment.csv
+++ b/test/test1/environment.csv
@@ -1,3 +1,3 @@
-Player,650,100,2
+Player,650,100,2
Zombie,300,200
Sandwich,500,400
\ No newline at end of file
diff --git a/test/test2/environment.csv b/test/test2/environment.csv
index 114e4b5..1988788 100644
--- a/test/test2/environment.csv
+++ b/test/test2/environment.csv
@@ -1,3 +1,3 @@
-Player,650,100,3
+Player,650,100,3
Zombie,500,500
Sandwich,300,200
\ No newline at end of file
--
GitLab