From 5bb49a0cd51eb475421708dbf0f9ef2cb1f30c7a Mon Sep 17 00:00:00 2001
From: zlatax <64391879+zlatax@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:57:07 +0900
Subject: [PATCH] final check through code copmpleted

---
 .idea/misc.xml                   |   9 ++++++++-
 .idea/modules.xml                |   1 +
 README.md => project-1/README.md |   0
 project-1/src/.DS_Store          | Bin 6148 -> 6148 bytes
 project-1/src/Entity.java        |   2 +-
 project-1/src/Player.java        |   2 +-
 6 files changed, 11 insertions(+), 3 deletions(-)
 rename README.md => project-1/README.md (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e208459..6359b69 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 9a9e4e9..2c96030 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
GIT binary patch
delta 84
zcmZoMXfc=|#>CJ*u~2NHo}wrt0|Nsi1A_nqLq0<}LkL3=Ln=e!#6opO#>q8|o|}I&
p@~~|dU{Yh;%+A5j!NkzMnUU!`^JIPzLq>+lHayasV?<Uk0{|AD6Bqyh

delta 178
zcmZoMXfc=|#>B`mu~2NHo}wrV0|Nsi1A_nqLn=cNgC0W`Ln1@j#EZ)XK@!{y0Sq||
zi42t>$%$(ulo(qX7#KAEg8>5w@G=B5Br@bNq%f2-WHKZ(WK3Km!N>R+S=GcIPi}68
zD29B7T!tiu%!#X{xmPkUFw6iO@_*w+LAK589Q+(ij2s&;erKM{FJj2S$iTqRz`($;
J*+XOxGXP1DGd=(S

diff --git a/project-1/src/Entity.java b/project-1/src/Entity.java
index a2f018f..f2b1cad 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 c8e2d37..a96820e 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);
-- 
GitLab