diff --git a/assets/objects/axe.png b/assets/objects/axe.png new file mode 100644 index 0000000..68fc0a5 Binary files /dev/null and b/assets/objects/axe.png differ diff --git a/assets/objects/blueheart.png b/assets/objects/blueheart.png new file mode 100644 index 0000000..6441848 Binary files /dev/null and b/assets/objects/blueheart.png differ diff --git a/assets/objects/boots.png b/assets/objects/boots.png new file mode 100644 index 0000000..d75f642 Binary files /dev/null and b/assets/objects/boots.png differ diff --git a/assets/objects/chest (OLD).png b/assets/objects/chest (OLD).png new file mode 100644 index 0000000..d257eee Binary files /dev/null and b/assets/objects/chest (OLD).png differ diff --git a/assets/objects/chest.png b/assets/objects/chest.png new file mode 100644 index 0000000..64e06cd Binary files /dev/null and b/assets/objects/chest.png differ diff --git a/assets/objects/chest_opened.png b/assets/objects/chest_opened.png new file mode 100644 index 0000000..a600892 Binary files /dev/null and b/assets/objects/chest_opened.png differ diff --git a/assets/objects/coin_bronze.png b/assets/objects/coin_bronze.png new file mode 100644 index 0000000..938ae36 Binary files /dev/null and b/assets/objects/coin_bronze.png differ diff --git a/assets/objects/door.png b/assets/objects/door.png new file mode 100644 index 0000000..589a559 Binary files /dev/null and b/assets/objects/door.png differ diff --git a/assets/objects/door_iron.png b/assets/objects/door_iron.png new file mode 100644 index 0000000..24e699e Binary files /dev/null and b/assets/objects/door_iron.png differ diff --git a/assets/objects/heart_blank.png b/assets/objects/heart_blank.png new file mode 100644 index 0000000..a26c81b Binary files /dev/null and b/assets/objects/heart_blank.png differ diff --git a/assets/objects/heart_full.png b/assets/objects/heart_full.png new file mode 100644 index 0000000..4097771 Binary files /dev/null and b/assets/objects/heart_full.png differ diff --git a/assets/objects/heart_half.png b/assets/objects/heart_half.png new file mode 100644 index 0000000..42224ad Binary files /dev/null and b/assets/objects/heart_half.png differ diff --git a/assets/objects/key.png b/assets/objects/key.png new file mode 100644 index 0000000..6aabbc6 Binary files /dev/null and b/assets/objects/key.png differ diff --git a/assets/objects/lantern.png b/assets/objects/lantern.png new file mode 100644 index 0000000..6843fcf Binary files /dev/null and b/assets/objects/lantern.png differ diff --git a/assets/objects/manacrystal_blank.png b/assets/objects/manacrystal_blank.png new file mode 100644 index 0000000..057c189 Binary files /dev/null and b/assets/objects/manacrystal_blank.png differ diff --git a/assets/objects/manacrystal_full.png b/assets/objects/manacrystal_full.png new file mode 100644 index 0000000..322ecd4 Binary files /dev/null and b/assets/objects/manacrystal_full.png differ diff --git a/assets/objects/pickaxe.png b/assets/objects/pickaxe.png new file mode 100644 index 0000000..8435424 Binary files /dev/null and b/assets/objects/pickaxe.png differ diff --git a/assets/objects/potion_red.png b/assets/objects/potion_red.png new file mode 100644 index 0000000..eab1816 Binary files /dev/null and b/assets/objects/potion_red.png differ diff --git a/assets/objects/shield_blue.png b/assets/objects/shield_blue.png new file mode 100644 index 0000000..6ef2cac Binary files /dev/null and b/assets/objects/shield_blue.png differ diff --git a/assets/objects/shield_wood.png b/assets/objects/shield_wood.png new file mode 100644 index 0000000..25d2dda Binary files /dev/null and b/assets/objects/shield_wood.png differ diff --git a/assets/objects/sword_normal.png b/assets/objects/sword_normal.png new file mode 100644 index 0000000..666952d Binary files /dev/null and b/assets/objects/sword_normal.png differ diff --git a/assets/objects/tent.png b/assets/objects/tent.png new file mode 100644 index 0000000..bd9ef7b Binary files /dev/null and b/assets/objects/tent.png differ diff --git a/src/de/miaurizius/jgame2d/core/GamePanel.java b/src/de/miaurizius/jgame2d/core/GamePanel.java index 18d5164..51a2e40 100644 --- a/src/de/miaurizius/jgame2d/core/GamePanel.java +++ b/src/de/miaurizius/jgame2d/core/GamePanel.java @@ -1,6 +1,7 @@ package de.miaurizius.jgame2d.core; import de.miaurizius.jgame2d.entity.Player; +import de.miaurizius.jgame2d.object.SuperObject; import de.miaurizius.jgame2d.tile.TileManager; import javax.swing.*; @@ -33,6 +34,7 @@ public class GamePanel extends JPanel implements Runnable { Thread gameThread; public CollisionHandler collisionH = new CollisionHandler(this); public Player player = new Player(this, keyH); + public SuperObject[] obj = new SuperObject[10]; public GamePanel() { this.setPreferredSize(new Dimension(screenWidth, screenHeight)); diff --git a/src/de/miaurizius/jgame2d/entity/Player.java b/src/de/miaurizius/jgame2d/entity/Player.java index 91acf00..cbec2a3 100644 --- a/src/de/miaurizius/jgame2d/entity/Player.java +++ b/src/de/miaurizius/jgame2d/entity/Player.java @@ -25,10 +25,10 @@ public class Player extends Entity { screenY = panel.screenHeight/2 - panel.tileSize/2; solidArea = new Rectangle(); - solidArea.x = 9; - solidArea.y = 18; - solidArea.width = 32; - solidArea.height = 32; + solidArea.x = 12; + solidArea.y = 20; + solidArea.width = 24; + solidArea.height = 24; setDefaultValues(); getPlayerImage(); diff --git a/src/de/miaurizius/jgame2d/object/KeyObj.java b/src/de/miaurizius/jgame2d/object/KeyObj.java new file mode 100644 index 0000000..d2fbc4b --- /dev/null +++ b/src/de/miaurizius/jgame2d/object/KeyObj.java @@ -0,0 +1,19 @@ +package de.miaurizius.jgame2d.object; + +import javax.imageio.ImageIO; +import java.io.FileInputStream; +import java.io.IOException; +import java.security.Key; + +public class KeyObj extends SuperObject { + + public KeyObj() { + name = "key"; + try { + image = ImageIO.read(new FileInputStream("assets/objects/key.png")); + } catch(IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/src/de/miaurizius/jgame2d/object/SuperObject.java b/src/de/miaurizius/jgame2d/object/SuperObject.java new file mode 100644 index 0000000..3de0882 --- /dev/null +++ b/src/de/miaurizius/jgame2d/object/SuperObject.java @@ -0,0 +1,12 @@ +package de.miaurizius.jgame2d.object; + +import java.awt.image.BufferedImage; + +public class SuperObject { + + public BufferedImage image; + public String name; + public boolean collision = false; + public int worldX, worldY; + +}