diff --git a/.classpath b/.classpath
deleted file mode 100644
index 74f62e7d30042151cf9384b63c45f203b3a0288c..0000000000000000000000000000000000000000
--- a/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="res"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index 86872b1b40a5e0ecd3e890ca4c34422d4dfffd77..0000000000000000000000000000000000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>MazeGame</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/BuiltArtifacts/MazeGame.jar b/Built Jars/MazeGame.jar
similarity index 94%
rename from BuiltArtifacts/MazeGame.jar
rename to Built Jars/MazeGame.jar
index e8db1da81174e44eb1c25bed670e6bed81dd0281..152cef8544c046dbe306d23055e2ab1f066e229d 100644
Binary files a/BuiltArtifacts/MazeGame.jar and b/Built Jars/MazeGame.jar differ
diff --git a/bin/GameFrame.class b/bin/GameFrame.class
deleted file mode 100644
index 7ddad53284790d0e768677b4b4d4c385702466ec..0000000000000000000000000000000000000000
Binary files a/bin/GameFrame.class and /dev/null differ
diff --git a/bin/GamePanel.class b/bin/GamePanel.class
deleted file mode 100644
index f97b802e1acc2a824a8fe6aa934476c6883e1644..0000000000000000000000000000000000000000
Binary files a/bin/GamePanel.class and /dev/null differ
diff --git a/bin/Main.class b/bin/Main.class
deleted file mode 100644
index fe4dcc691dedccd7463f01b4e0ba6bd0eb82d839..0000000000000000000000000000000000000000
Binary files a/bin/Main.class and /dev/null differ
diff --git a/bin/ReadFile.class b/bin/ReadFile.class
deleted file mode 100644
index e7ab8f9608e4e81c3c5c16f156bc9309c428c037..0000000000000000000000000000000000000000
Binary files a/bin/ReadFile.class and /dev/null differ
diff --git a/bin/Walls.class b/bin/Walls.class
deleted file mode 100644
index 2fc35d2197f20890fe5155e7b6f4c008e56a08c5..0000000000000000000000000000000000000000
Binary files a/bin/Walls.class and /dev/null differ
diff --git a/bin/walls1.txt b/bin/walls1.txt
deleted file mode 100644
index 5070330f64ae6a2ec07100a7b82d75f549e22f65..0000000000000000000000000000000000000000
--- a/bin/walls1.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-gwwwwwwwwwwwwwww
-gggggggggggggggw
-gggggggggggggggw
-gggggggggggggggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwwggw
-wwwwwwwwwwwwwwgw
-wwwwwwwwwwwwwwgw
\ No newline at end of file
diff --git a/bin/walls2.txt b/bin/walls2.txt
deleted file mode 100644
index 24c9985441ad766fd6f0f4a356b701c6875d968e..0000000000000000000000000000000000000000
--- a/bin/walls2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-gwwwwwwwwwwwwwww
-ggwwwwwwwwwwwwww
-wgggggwwwwwwwwww
-wwwwwgwwwwwwwwww
-wwwwwgggwwwwwwww
-wwwwwwwgwwwwwwww
-wwwwwwwgwwwwwwww
-wwwwwwwgwwwwwwww
-wwwwwwwgwwgggwww
-wwwwwwwgwwgwgwww
-wwwwwwwggggwgwww
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwwwgw
-wwwwwwwwwwwwwwgw
-wwwwwwwwwwwwwwgw
-wwwwwwwwwwwwwwgw
\ No newline at end of file
diff --git a/bin/walls3.txt b/bin/walls3.txt
deleted file mode 100644
index d1ab37d340ac87412b383cbcb1f6f558f3789e98..0000000000000000000000000000000000000000
--- a/bin/walls3.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-gwwwwwwwwwwwwwww
-ggwggggwwwgggwww
-wgggwwgggwgwgggw
-wwwwwwwwgggwwwgw
-wwwwwwwwwwwwgggw
-wwwwwwwggggwgwww
-wwwwwwwgwwgggwww
-wwggggggwwwwwwww
-wwgwgwwwwwwwwwww
-wwgggwwwwwwwwwww
-wwwgwwwggggwwwww
-wgggwwwgwwgwgggw
-wgwwwwwgwwgwgwgw
-wgggwwggwwgwgwgw
-wwwggggwwwgggwgw
-wwwwwwwwwwwwwwgg
\ No newline at end of file
diff --git a/bin/walls4.txt b/bin/walls4.txt
deleted file mode 100644
index e590dddf7acfcb3dd2ed6cbe95099a46f64250fe..0000000000000000000000000000000000000000
--- a/bin/walls4.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-gwwwwwwwwwwwwwww
-ggggwwwwwwwwwwww
-wwwgwwgggwwwwwww
-wwwgwwgwggwwwwww
-wwwgwwgwwgwwwwww
-wwwggggwwgwwwwww
-wwwwwwwwwgwwwwww
-wwwwwwwwwgwwwwww
-wwwwwwggggwwwwww
-wwwwwwgwwwwwwwww
-wwwwwwgggwwwwwww
-wwwwwwwwgwwwwwww
-wwwwwwwwgwwwwwww
-wwwwwwwwgggggggw
-wwwwwwwwwwwwwwgw
-wwwwwwwwwwwwwwgw
\ No newline at end of file
diff --git a/bin/walls5.txt b/bin/walls5.txt
deleted file mode 100644
index 65ab082ca0fd2685e8d4410a2032167efa24d37b..0000000000000000000000000000000000000000
--- a/bin/walls5.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-gwwwwwwwwwwwwwww
-ggggwgggwgggwwww
-wwwgwgwgwgwgwwww
-wwwgwgwgwgwgwwww
-wgggwgwgwgwgwwww
-wgwwwgwgwgwgwwww
-wgggggwgwgwgwwww
-wwwwwwwgwgwgwwww
-wgggggggwgwgwwww
-wgwwwwwwwgwgwwww
-wgggggggggwgwwww
-wwwwwwwwwwwgwwww
-wgggggggggggwwww
-wgwwwwwwwwwwwwww
-wggggggggggggggw
-wwwwwwwwwwwwwwgw
\ No newline at end of file
diff --git a/bin/walls6.txt b/bin/walls6.txt
deleted file mode 100644
index cb32e5ee8d94c804b64abbb59005437d6209846a..0000000000000000000000000000000000000000
--- a/bin/walls6.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-gwwwwwwwwwwwwwww
-ggwwwgggggggggww
-wgwwggwwwwwwwgww
-wgwggwwgggwgggww
-wgwgwwggwgggwwww
-ggwggwgwwwwwwwww
-gwwwgwggggggggww
-gwwggwwwwwwwwggw
-ggwgwwwwwwwwwwgw
-wgwggwgggggggggw
-ggwwgwgwwwwwwwww
-gwwggwgggggggggw
-ggwgwwwwwwwwwwgw
-wgwgwwgggggggggw
-wgggwwgwwwwwwwww
-wwwwwwgggggggggw
diff --git a/res/walls1.txt b/res/walls1.txt
index 5070330f64ae6a2ec07100a7b82d75f549e22f65..819645ac7b4a8fc45ba638b85e901636eefc69fc 100644
--- a/res/walls1.txt
+++ b/res/walls1.txt
@@ -1,16 +1,16 @@
gwwwwwwwwwwwwwww
gggggggggggggggw
gggggggggggggggw
-gggggggggggggggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
-wwwwwwwwwwwwgggw
wwwwwwwwwwwwwggw
+wwwwwwwwwwwwwggw
+wwwwwwwwwwwwwggw
+wwwwwwwwwwwwwgww
+wwwwwwwwwwwwwgww
+wwwwwwwwwwwwwgww
+wwwwwwwwwwwwwggw
+wwwwwwwwwwwwwwgw
+wwwwwwwwwwwwwwgw
+wwwwwwwwwwwwwwgw
+wwwwwwwwwwwwwwgw
wwwwwwwwwwwwwwgw
wwwwwwwwwwwwwwgw
\ No newline at end of file
diff --git a/res/walls3.txt b/res/walls3.txt
index d1ab37d340ac87412b383cbcb1f6f558f3789e98..e590dddf7acfcb3dd2ed6cbe95099a46f64250fe 100644
--- a/res/walls3.txt
+++ b/res/walls3.txt
@@ -1,16 +1,16 @@
gwwwwwwwwwwwwwww
-ggwggggwwwgggwww
-wgggwwgggwgwgggw
-wwwwwwwwgggwwwgw
-wwwwwwwwwwwwgggw
-wwwwwwwggggwgwww
-wwwwwwwgwwgggwww
-wwggggggwwwwwwww
-wwgwgwwwwwwwwwww
-wwgggwwwwwwwwwww
-wwwgwwwggggwwwww
-wgggwwwgwwgwgggw
-wgwwwwwgwwgwgwgw
-wgggwwggwwgwgwgw
-wwwggggwwwgggwgw
-wwwwwwwwwwwwwwgg
\ No newline at end of file
+ggggwwwwwwwwwwww
+wwwgwwgggwwwwwww
+wwwgwwgwggwwwwww
+wwwgwwgwwgwwwwww
+wwwggggwwgwwwwww
+wwwwwwwwwgwwwwww
+wwwwwwwwwgwwwwww
+wwwwwwggggwwwwww
+wwwwwwgwwwwwwwww
+wwwwwwgggwwwwwww
+wwwwwwwwgwwwwwww
+wwwwwwwwgwwwwwww
+wwwwwwwwgggggggw
+wwwwwwwwwwwwwwgw
+wwwwwwwwwwwwwwgw
\ No newline at end of file
diff --git a/res/walls4.txt b/res/walls4.txt
index e590dddf7acfcb3dd2ed6cbe95099a46f64250fe..65ab082ca0fd2685e8d4410a2032167efa24d37b 100644
--- a/res/walls4.txt
+++ b/res/walls4.txt
@@ -1,16 +1,16 @@
gwwwwwwwwwwwwwww
-ggggwwwwwwwwwwww
-wwwgwwgggwwwwwww
-wwwgwwgwggwwwwww
-wwwgwwgwwgwwwwww
-wwwggggwwgwwwwww
-wwwwwwwwwgwwwwww
-wwwwwwwwwgwwwwww
-wwwwwwggggwwwwww
-wwwwwwgwwwwwwwww
-wwwwwwgggwwwwwww
-wwwwwwwwgwwwwwww
-wwwwwwwwgwwwwwww
-wwwwwwwwgggggggw
-wwwwwwwwwwwwwwgw
+ggggwgggwgggwwww
+wwwgwgwgwgwgwwww
+wwwgwgwgwgwgwwww
+wgggwgwgwgwgwwww
+wgwwwgwgwgwgwwww
+wgggggwgwgwgwwww
+wwwwwwwgwgwgwwww
+wgggggggwgwgwwww
+wgwwwwwwwgwgwwww
+wgggggggggwgwwww
+wwwwwwwwwwwgwwww
+wgggggggggggwwww
+wgwwwwwwwwwwwwww
+wggggggggggggggw
wwwwwwwwwwwwwwgw
\ No newline at end of file
diff --git a/res/walls5.txt b/res/walls5.txt
index 65ab082ca0fd2685e8d4410a2032167efa24d37b..d1ab37d340ac87412b383cbcb1f6f558f3789e98 100644
--- a/res/walls5.txt
+++ b/res/walls5.txt
@@ -1,16 +1,16 @@
gwwwwwwwwwwwwwww
-ggggwgggwgggwwww
-wwwgwgwgwgwgwwww
-wwwgwgwgwgwgwwww
-wgggwgwgwgwgwwww
-wgwwwgwgwgwgwwww
-wgggggwgwgwgwwww
-wwwwwwwgwgwgwwww
-wgggggggwgwgwwww
-wgwwwwwwwgwgwwww
-wgggggggggwgwwww
-wwwwwwwwwwwgwwww
-wgggggggggggwwww
-wgwwwwwwwwwwwwww
-wggggggggggggggw
-wwwwwwwwwwwwwwgw
\ No newline at end of file
+ggwggggwwwgggwww
+wgggwwgggwgwgggw
+wwwwwwwwgggwwwgw
+wwwwwwwwwwwwgggw
+wwwwwwwggggwgwww
+wwwwwwwgwwgggwww
+wwggggggwwwwwwww
+wwgwgwwwwwwwwwww
+wwgggwwwwwwwwwww
+wwwgwwwggggwwwww
+wgggwwwgwwgwgggw
+wgwwwwwgwwgwgwgw
+wgggwwggwwgwgwgw
+wwwggggwwwgggwgw
+wwwwwwwwwwwwwwgg
\ No newline at end of file
diff --git a/res/walls6.txt b/res/walls6.txt
index 773c783e653f6fe54da66d28d0fb8d30a5d6c028..cb32e5ee8d94c804b64abbb59005437d6209846a 100644
--- a/res/walls6.txt
+++ b/res/walls6.txt
@@ -13,4 +13,4 @@ gwwggwgggggggggw
ggwgwwwwwwwwwwgw
wgwgwwgggggggggw
wgggwwgwwwwwwwww
-wwwwwwgggggggggw
\ No newline at end of file
+wwwwwwgggggggggw
diff --git a/src/GameFrame.java b/src/GameFrame.java
index cf333e9f99fbb9f1da2eebc04055c2af5f505148..2005ed1115c0539715271981b7b0cf2d916afc41 100644
--- a/src/GameFrame.java
+++ b/src/GameFrame.java
@@ -49,13 +49,13 @@ public class GameFrame extends JFrame implements ActionListener {
score.add(previousMap);
score.add(resetButton);
score.add(nextMap);
- score.setFocusable(true);
+ score.setFocusable(false);
start = new JPanel();
start.setBackground(Color.black);
- start.setSize(getWidth(), getHeight());
+ start.setSize(width, height);
start.setLocation(0, 0);
- start.add(startGame, BorderLayout.CENTER);
+ start.add(startGame);
this.add(start);
this.setVisible(true);
@@ -91,7 +91,7 @@ public class GameFrame extends JFrame implements ActionListener {
}
if (e.getSource() == previousMap) {
- if (mapN >= 1) {
+ if (mapN > 1) {
this.remove(game);
mapN--;
game = new GamePanel(mapN);
diff --git a/src/GamePanel.java b/src/GamePanel.java
index c37e734eb027c48fe201e6e12b6d62310c9904c2..7b5ca79bb582d3c5c2f9039dd5284f9db29834e8 100644
--- a/src/GamePanel.java
+++ b/src/GamePanel.java
@@ -20,7 +20,7 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener {
private Walls walls;
private boolean running;
- private boolean nextMap = false;
+ public boolean nextMap = false;
public GamePanel(int mapN) {
timer.start();
@@ -58,13 +58,6 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener {
if (walls.finishWallsCollision(x, y, playerSize, playerSize)) {
running = false;
}
- if (!running) {
- RoundFinishe(g);
- }
-
- }
-
- public void RoundFinishe(Graphics g) {
if (!running) {
g.setColor(Color.black);
g.fillRect(0, 0, getWidth(), getHeight());
@@ -73,8 +66,8 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener {
nextMap = true;
}
- }
+ }
@Override
public void keyPressed(KeyEvent e) {
int c = e.getKeyCode();
@@ -126,6 +119,7 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener {
velY = 0;
y = getHeight() - playerSize;
}
+
x += velX + veldX;
y += velY + veldY;
diff --git a/src/ReadFile.java b/src/ReadFile.java
index 4b57897819037cecac3badb92e24eff469e4f8f1..686e64ce3bfab3d410658505ebefc1b1202e4608 100644
--- a/src/ReadFile.java
+++ b/src/ReadFile.java
@@ -7,46 +7,49 @@ public class ReadFile {
String[] map = new String[16];
public void openFile(int mapN) {
- if (mapN == 1) {
+
+ switch(mapN) {
+ case 1:
try {
scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls1.txt"));
} catch (Exception e) {
- System.out.println("could not find File");
- }
- } else if (mapN == 2) {
+ System.out.println("could not find File");}
+ break;
+ case 2:
try {
scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls2.txt"));
} catch (Exception e) {
- System.out.println("could not find File");
- }
- } else if (mapN == 3) {
+ System.out.println("could not find File");}
+ break;
+ case 3:
try {
scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls3.txt"));
} catch (Exception e) {
- System.out.println("could not find File");
- }
- } else if (mapN == 4) {
+ System.out.println("could not find File");}
+ break;
+ case 4:
try {
scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls4.txt"));
} catch (Exception e) {
- System.out.println("could not find File");
- }
- } else if (mapN == 5) {
+ System.out.println("could not find File");}
+ break;
+ case 5:
try {
scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls5.txt"));
} catch (Exception e) {
- System.out.println("could not find File");
- }
- } else if (mapN == 6) {
+ System.out.println("could not find File");}
+ break;
+ case 6:
try {
scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls6.txt"));
} catch (Exception e) {
- System.out.println("could not find File");
- }
+ System.out.println("could not find File");}
+ break;
+
}
}
- public String getTile(int x, int y) {
+ public String getBlock(int x, int y) {
String index = map[y].substring(x, x + 1);
return index;
}
@@ -62,4 +65,4 @@ public class ReadFile {
public void closeFile() {
scanner.close();
}
-}
\ No newline at end of file
+}
diff --git a/src/Walls.java b/src/Walls.java
index 5ede959961b8423e3e87e9e37f6a986bd08383fa..4593e88271921ebc44e17da6230abd293c6d49e7 100644
--- a/src/Walls.java
+++ b/src/Walls.java
@@ -17,10 +17,10 @@ public class Walls {
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (r.getTile(x, y).equals("w")) {
+ if (r.getBlock(x, y).equals("w")) {
walls[y][x] = 1;
}
- if (r.getTile(x, y).equals("g")) {
+ if (r.getBlock(x, y).equals("g")) {
walls[y][x] = 0;
}