diff --git a/README.md b/README.md index 7722ed8..d26f860 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,5 @@ Java 2D graphics tutorial: https://docs.oracle.com/javase/tutorial/2d/ drawing s ## credits for assets Ive used font from [OpenFont Library](https://openfont.org/) (the one called Caveat Brush) -all other assets are made by me, images are made in Krita. \ No newline at end of file +all other assets are made by me, images are made in Krita. +while not a direct copy I took inspiration for the plyer sprites from this: https://tnypixels.itch.io/top-down-rpg-character-sprite-walk-idle-animation \ No newline at end of file diff --git a/assets/button_highlighted.png b/assets/buttonHighlighted.png similarity index 100% rename from assets/button_highlighted.png rename to assets/buttonHighlighted.png diff --git a/assets/landing_platform.png b/assets/landingPlatform.png similarity index 100% rename from assets/landing_platform.png rename to assets/landingPlatform.png diff --git a/assets/planet-ZX311.png b/assets/planetZX311.png similarity index 100% rename from assets/planet-ZX311.png rename to assets/planetZX311.png diff --git a/assets/planet-ZX311_highlighted.png b/assets/planetZX311Highlighted.png similarity index 100% rename from assets/planet-ZX311_highlighted.png rename to assets/planetZX311Highlighted.png diff --git a/assets/playerSpriteForward.png b/assets/playerSpriteForward.png new file mode 100644 index 0000000..2a41b69 Binary files /dev/null and b/assets/playerSpriteForward.png differ diff --git a/assets/rocket_bottom.png b/assets/rocketBottom.png similarity index 100% rename from assets/rocket_bottom.png rename to assets/rocketBottom.png diff --git a/assets/rocket_exhaust.png b/assets/rocketExhaust.png similarity index 100% rename from assets/rocket_exhaust.png rename to assets/rocketExhaust.png diff --git a/assets/rocket_landing0.png b/assets/rocketLanding0.png similarity index 100% rename from assets/rocket_landing0.png rename to assets/rocketLanding0.png diff --git a/assets/rocket_landing1.png b/assets/rocketLanding1.png similarity index 100% rename from assets/rocket_landing1.png rename to assets/rocketLanding1.png diff --git a/assets/rocket_top.png b/assets/rocketTop.png similarity index 100% rename from assets/rocket_top.png rename to assets/rocketTop.png diff --git a/src/main/java/dev/dvorakmortonxd/Game.java b/src/main/java/dev/dvorakmortonxd/Game.java index 3589536..569e396 100644 --- a/src/main/java/dev/dvorakmortonxd/Game.java +++ b/src/main/java/dev/dvorakmortonxd/Game.java @@ -97,18 +97,18 @@ public class Game extends JPanel implements ActionListener, KeyListener { } // loads up the image assets try { - planetZX311 = ImageIO.read(new File("assets/planet-ZX311.png")); - planetZX311H = ImageIO.read(new File("assets/planet-ZX311_highlighted.png")); + planetZX311 = ImageIO.read(new File("assets/planetZX311.png")); + planetZX311H = ImageIO.read(new File("assets/planetZX311Highlighted.png")); button = ImageIO.read(new File("assets/button.png")); - buttonH = ImageIO.read(new File("assets/button_highlighted.png")); + buttonH = ImageIO.read(new File("assets/buttonHighlighted.png")); rocket = ImageIO.read(new File("assets/rocket.png")); - rocketExhaust = ImageIO.read(new File("assets/rocket_exhaust.png")); - rocketTop = ImageIO.read(new File("assets/rocket_top.png")); - rocketBottom = ImageIO.read(new File("assets/rocket_bottom.png")); + rocketExhaust = ImageIO.read(new File("assets/rocketExhaust.png")); + rocketTop = ImageIO.read(new File("assets/rocketTop.png")); + rocketBottom = ImageIO.read(new File("assets/rocketBottom.png")); parachute = ImageIO.read(new File("assets/parachute.png")); - landingPlatform = ImageIO.read(new File("assets/landing_platform.png")); - rocketLanding0 = ImageIO.read(new File("assets/rocket_landing0.png")); - rocketLanding1 = ImageIO.read(new File("assets/rocket_landing1.png")); + landingPlatform = ImageIO.read(new File("assets/landingPlatform.png")); + rocketLanding0 = ImageIO.read(new File("assets/rocketLanding0.png")); + rocketLanding1 = ImageIO.read(new File("assets/rocketLanding1.png")); sun = ImageIO.read(new File("assets/sun.png")); } catch (IOException e) { e.printStackTrace(); @@ -203,7 +203,7 @@ public class Game extends JPanel implements ActionListener, KeyListener { } else if (levelProgress && (windowWidth-fadeAnimation)<=0) { level = 2; } } - if (level == 2) { + else if (level == 2) { if (detachTimer < 260) { g.setColor(Color.GRAY); for (int i = 0; i < 16; i++) { // drawing the stars @@ -291,7 +291,7 @@ public class Game extends JPanel implements ActionListener, KeyListener { fadeAnimation += 20; } } - if (level == 3) { + else if (level == 3) { g.setColor(new Color(127, 127,255)); g.fillRect(0,0,windowWidth,windowHeight); Graphics2D g2 = (Graphics2D) g; @@ -301,6 +301,18 @@ public class Game extends JPanel implements ActionListener, KeyListener { g.drawImage(landingPlatform, 0, 340, windowWidth, windowWidth/128*30, this); g.drawImage(rocketLanding1, windowWidth / 2 - 73, 300, 147, 111, this); } + else { + g.setColor(Color.BLACK); + g.fillRect(0,0,windowWidth,windowHeight); + g.setColor(Color.WHITE); + g.setFont(caveat.deriveFont(Font.BOLD, 56f)); + g.drawString("Sorry, this is as far as I got with", 30, windowHeight/2-160); + g.drawString("this project, It's still a work in", 30, windowHeight/2-160+70); + g.drawString("progress so I'll definitely add more", 30, windowHeight/2-160+140); + g.drawString("content but I just wanted to make sure", 30, windowHeight/2-160+210); + g.drawString("that I could ship it for now so I", 30, windowHeight/2-160+280); + g.drawString("could be safe from ratticus (I'm scared)", 30, windowHeight/2-160+350); + } Toolkit.getDefaultToolkit().sync(); }