diff --git a/img/tiles/boxes/finish.png b/img/tiles/boxes/finish.png new file mode 100644 index 0000000..1f7e90b Binary files /dev/null and b/img/tiles/boxes/finish.png differ diff --git a/saves/Level1.txt b/saves/Level1.txt index f75a3e8..24775f3 100644 --- a/saves/Level1.txt +++ b/saves/Level1.txt @@ -6,13 +6,13 @@ sssssssssssssssssd sssssssssssssssssd 1 1 1 1 1 sssssssssssssssssd 1 sssssssssssssssssd -sssssssssssssssssd -sssssssssssssssssd -sssssssssssssssssd qwe qwe -sssssssssssssssssd asd asd +sssssssssssssssssd qe qe +sssssssssssssssssd ad ! ad +sssssssssssssssssd qwe qwe atwwwrd +sssssssssssssssssd asd asd zxxxxxc sssssssssssssssssd 1 zxc zxc sssssssssssssssssd sssssssssssssssssd qwwwwwwwwe sssssssssssssssssd qrsssssssstwe -sssssssssssssssssd qwwrssssssssssstwe !!! qwe +sssssssssssssssssd qwwrssssssssssstwe !!! qwe + ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrsssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrstwwwwww3 \ No newline at end of file diff --git a/src/MapReader.java b/src/MapReader.java index 18b6466..ae0f330 100644 --- a/src/MapReader.java +++ b/src/MapReader.java @@ -44,6 +44,7 @@ public class MapReader { map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/terrain/grassMiddleLeft.png"))); } else if(file.charAt(i)=='s'){ map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/terrain/grassCenter.png"))); + map.get(map.size()-1).collision = false; } else if(file.charAt(i)=='d'){ map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/terrain/grassMiddleRight.png"))); } else if(file.charAt(i)=='z'){ @@ -66,6 +67,9 @@ public class MapReader { } else if(file.charAt(i)=='!'){ enemy.add(new NonPlayer(x, y, GamePanel.slimeSpriteArray, 50, 28)); + } else if(file.charAt(i)=='+') { + map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/boxes/finish.png"))); + map.get(map.size()-1).isFinish = true; } x+=Tile.length; } diff --git a/src/Player.java b/src/Player.java index 750d8d1..fbceffd 100644 --- a/src/Player.java +++ b/src/Player.java @@ -89,6 +89,10 @@ public class Player extends GenericSprite { boolean canUpdate = true; for(int i=0; i