diff --git a/.idea/misc.xml b/.idea/misc.xml index e208459b8afde5f7980720efd6bbb97f7ae24541..6359b69b9d63c9d581e8a70fe24bfd01ea05b245 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="MavenProjectsManager"> + <option name="originalFiles"> + <list> + <option value="$PROJECT_DIR$/project-1/pom.xml" /> + </list> + </option> + </component> + <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="14" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 9a9e4e9dad6b4ee4a339ad787de878790ab68b33..2c96030aa7e879a9d20b233a6d51450340b5138d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/.idea/SWEN20003_a1.iml" filepath="$PROJECT_DIR$/.idea/SWEN20003_a1.iml" /> + <module fileurl="file://$PROJECT_DIR$/project-1/bagel.iml" filepath="$PROJECT_DIR$/project-1/bagel.iml" /> </modules> </component> </project> \ No newline at end of file diff --git a/README.md b/project-1/README.md similarity index 100% rename from README.md rename to project-1/README.md diff --git a/project-1/src/.DS_Store b/project-1/src/.DS_Store index 2898de1f846184fb61d1d0d9146f6083a5bfdb0b..24957dce42144cc115095b85bb08b4dcbdca5642 100644 Binary files a/project-1/src/.DS_Store and b/project-1/src/.DS_Store differ diff --git a/project-1/src/Entity.java b/project-1/src/Entity.java index a2f018f4d745a05b32e0d472858d079f8bd6a0a5..f2b1cad257fdd28852943200586a8ad39749fdf9 100644 --- a/project-1/src/Entity.java +++ b/project-1/src/Entity.java @@ -3,7 +3,7 @@ import bagel.*; import bagel.util.*; import java.lang.*; -public class Entity { +public abstract class Entity { private Image img; private APoint pos; diff --git a/project-1/src/Player.java b/project-1/src/Player.java index c8e2d370f19486753c0212845f23ab186766f2de..a96820ee026ec054dde8e9283bfe0146ca27a996 100644 --- a/project-1/src/Player.java +++ b/project-1/src/Player.java @@ -2,7 +2,7 @@ import bagel.*; public class Player extends Entity{ private int energy; //displayed at position (20,760) in black font size 20 and font DejaVuSans-Bol(ttf file provided in res zip file) - private static int stepsize = 10; + private final static int stepsize = 10; public Player(String filename, APoint pos, int energy) { super(filename, pos);