diff --git a/src/main/java/dev/dvorakmortonxd/Game.java b/src/main/java/dev/dvorakmortonxd/Game.java index 9872c62..e881525 100644 --- a/src/main/java/dev/dvorakmortonxd/Game.java +++ b/src/main/java/dev/dvorakmortonxd/Game.java @@ -51,6 +51,9 @@ public class Game extends JPanel implements ActionListener { public static BufferedImage playerRight1; public static BufferedImage playerRight2; public static BufferedImage planetZX311Land; + public static BufferedImage closedObservatory; + public static BufferedImage openedObservatory; + // sets the FPS up (its 16 because 1000/60 is around 16.666 but it only accepts integers so its just rounded to 60) public Timer timer = new Timer(16, this); // 60 FPS (actually more so around 62.5 but thats kinda irrelevant) diff --git a/src/main/java/dev/dvorakmortonxd/loadAssets.java b/src/main/java/dev/dvorakmortonxd/loadAssets.java index 946ad59..3f59cdc 100644 --- a/src/main/java/dev/dvorakmortonxd/loadAssets.java +++ b/src/main/java/dev/dvorakmortonxd/loadAssets.java @@ -44,6 +44,8 @@ public class loadAssets { m.playerRight1 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteRightWalk0.png")); m.playerRight2 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteRightWalk1.png")); m.planetZX311Land = ImageIO.read(Game.class.getResource("/assets/planetZX311Land.png")); + m.closedObservatory = ImageIO.read(Game.class.getResource("/assets/observatoryClosed.png")); + m.openedObservatory = ImageIO.read(Game.class.getResource("/assets/observatoryOpened.png")); m.playerCurrentSprite = m.playerForward0; } catch (IOException e) { diff --git a/src/main/java/dev/dvorakmortonxd/update.java b/src/main/java/dev/dvorakmortonxd/update.java index 76489b8..997a9a1 100644 --- a/src/main/java/dev/dvorakmortonxd/update.java +++ b/src/main/java/dev/dvorakmortonxd/update.java @@ -291,6 +291,11 @@ public class update { } else if (m.currentPlayerLocation.equals("observatoryZX311")) { g.setColor(new Color(127, 127, 255)); g.fillRect(0, 0, m.windowWidth, m.windowHeight); + if (m.playerX > 240 && m.playerX < 400) { + g.drawImage(m.openedObservatory, 100, 457 - 449, 235 * 2, 228 * 2, m); + } else { + g.drawImage(m.closedObservatory, 100, 457 - 449, 235 * 2, 228 * 2, m); + } g.drawImage(m.planetZX311Land, 0, 457, m.windowWidth, m.windowWidth/256*31, m); } else if (m.currentPlayerLocation.equals("villageEntranceZX311")) { g.setColor(new Color(127, 127, 255)); diff --git a/src/main/resources/assets/landingPlatform.png-autosave.kra b/src/main/resources/assets/landingPlatform.png-autosave.kra new file mode 100644 index 0000000..928fb15 Binary files /dev/null and b/src/main/resources/assets/landingPlatform.png-autosave.kra differ diff --git a/src/main/resources/assets/observatoryClosed.png b/src/main/resources/assets/observatoryClosed.png new file mode 100644 index 0000000..b38d697 Binary files /dev/null and b/src/main/resources/assets/observatoryClosed.png differ diff --git a/src/main/resources/assets/observatoryOpened.png b/src/main/resources/assets/observatoryOpened.png new file mode 100644 index 0000000..12da1c3 Binary files /dev/null and b/src/main/resources/assets/observatoryOpened.png differ