From 28b9404fe972b379d9a3ac846233211fc452b003 Mon Sep 17 00:00:00 2001
From: Tim <ttersch@outlook.de>
Date: Wed, 30 Jun 2021 13:32:05 +0200
Subject: [PATCH 1/2] added default texture

---
 Zoelda/src/main/SheetLoader.java            | 54 +++++++++++----------
 Zoelda/src/main/entities/LivingEntity.java  | 20 +++++++-
 Zoelda/src/main/entities/Snake.java         |  7 ++-
 Zoelda/src/main/entities/Spider.java        |  7 +--
 Zoelda/src/main/entities/player/Player.java |  5 +-
 Zoelda/src/main/worlds/TestWorld.java       |  6 +--
 6 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/Zoelda/src/main/SheetLoader.java b/Zoelda/src/main/SheetLoader.java
index 17acd13..0dfb025 100644
--- a/Zoelda/src/main/SheetLoader.java
+++ b/Zoelda/src/main/SheetLoader.java
@@ -12,44 +12,46 @@ import ea.internal.gra.PixelFeld;
 public class SheetLoader {
 
 	private Figur[] figures;
+	private BufferedImage sheet;
 
 	/**
 	 * Macht aus einem Spritesheet Figuren.
-	 * @param path - Der pfad zum sheet
-	 * @param width - die Breite von einem Bild
-	 * @param height - die Höhe von einem Bild (nicht das ganze sheet)
+	 * 
+	 * @param path    - Der pfad zum sheet
+	 * @param width   - die Breite von einem Bild
+	 * @param height  - die Höhe von einem Bild (nicht das ganze sheet)
 	 * @param lengths - die Anzahl der Frames der verschiedenen Animationen
 	 */
-	public SheetLoader(String path, int width, int height, int[] frames) {
-		
+	public SheetLoader(String path) {
 		try {
 			// Bild laden
-			BufferedImage sheet = ImageIO.read(Tile.class.getResourceAsStream(path));
-			
-			// Anzahl der Animationen
-			int rows = frames.length;
-			
-			// Sprites anordnen *magie*
-			PixelFeld[][] sprites = new PixelFeld[rows][];
-			for (int i = 0; i < frames.length; i++) {
-				sprites[i] = new PixelFeld[frames[i]];
-			}
-			for (int i = 0; i < sprites.length; i++) {
-				loadSprites(sprites[i], i, width, height, sheet);
-			}
-			Figur fig;
-			figures = new Figur[rows];
-			for (int i = 0; i < figures.length; i++) {
-				fig = new Figur();
-				fig.animationSetzen(sprites[i]);
-				figures[i] = fig;
-			}
-			
+			sheet = ImageIO.read(Tile.class.getResourceAsStream(path));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 	}
 
+	public void generateFigures(int width, int height, int[] frames) {
+		// Anzahl der Animationen
+		int rows = frames.length;
+
+		// Sprites anordnen *magie*
+		PixelFeld[][] sprites = new PixelFeld[rows][];
+		for (int i = 0; i < frames.length; i++) {
+			sprites[i] = new PixelFeld[frames[i]];
+		}
+		for (int i = 0; i < sprites.length; i++) {
+			loadSprites(sprites[i], i, width, height, sheet);
+		}
+		Figur fig;
+		figures = new Figur[rows];
+		for (int i = 0; i < figures.length; i++) {
+			fig = new Figur();
+			fig.animationSetzen(sprites[i]);
+			figures[i] = fig;
+		}
+	}
+
 	public Figur getFigur(int y) {
 		return figures[y];
 	}
diff --git a/Zoelda/src/main/entities/LivingEntity.java b/Zoelda/src/main/entities/LivingEntity.java
index 7e86c60..686a428 100644
--- a/Zoelda/src/main/entities/LivingEntity.java
+++ b/Zoelda/src/main/entities/LivingEntity.java
@@ -1,7 +1,10 @@
 package main.entities;
 
+import java.awt.Color;
+
 import ea.ActionFigur;
 import ea.Figur;
+import ea.internal.gra.PixelFeld;
 import main.worlds.World;
 
 /*
@@ -16,12 +19,25 @@ public abstract class LivingEntity extends Entity {
 	protected float hp = 1f; //hp des Entitys
 	protected boolean mirrored;
 	
+	private static Figur noTexture = new Figur();
+	
+	static {
+		PixelFeld[] img = new PixelFeld[1];
+		img[0] = new PixelFeld(16, 16, 1);
+		for (int x = 0; x < 16; x++) {
+			for (int y = 0; y < 16; y++) {
+				img[0].farbeSetzen(x, y, Color.MAGENTA);
+			}
+		}
+		noTexture.animationSetzen(img);
+	}
+	
 	/**
 	 * @param figur - erstes (standart) Sprite
 	 * @param name  - name des Zustands
 	 */
-	public LivingEntity(Figur figur, String name) {
-		actionFigur = new ActionFigur(figur, name) {
+	public LivingEntity() {
+		actionFigur = new ActionFigur(noTexture, "undefined") {
 			// DEBUG: render boxes
 
 //			@Override
diff --git a/Zoelda/src/main/entities/Snake.java b/Zoelda/src/main/entities/Snake.java
index b6150d7..cb6230d 100644
--- a/Zoelda/src/main/entities/Snake.java
+++ b/Zoelda/src/main/entities/Snake.java
@@ -7,15 +7,13 @@ import main.entities.player.Player;
 
 public class Snake extends LivingEntity {
 
-	private static SheetLoader loader = new SheetLoader("/res/images/snake_spritesheet_calciumtrice.png", 32, 32,
-			new int[] { 10, 10, 10, 10, 13, 8 });
+	private static SheetLoader loader = new SheetLoader("/res/images/snake_spritesheet_calciumtrice.png");
 
 	private float damage = 0.1f;
 	private boolean attackOnce;
 
 	public Snake() {
-		super(loader.getFigur(0), "idle");
-
+		loader.generateFigures(32, 32, new int[] { 10, 10, 10, 10, 13, 8 });
 		posX = 9f;
 		posY = 9f;
 		accelleration = 0.006f;
@@ -24,6 +22,7 @@ public class Snake extends LivingEntity {
 		height = 0.8f;
 		mirrored = true;
 
+		actionFigur.neuerZustand(loader.getFigur(0), "idle");
 		actionFigur.neuerZustand(loader.getFigur(1), "lost_sight");
 		actionFigur.neuerZustand(loader.getFigur(2), "walk");
 		actionFigur.neuerZustand(loader.getFigur(3), "attack");
diff --git a/Zoelda/src/main/entities/Spider.java b/Zoelda/src/main/entities/Spider.java
index 4cd2782..786d644 100644
--- a/Zoelda/src/main/entities/Spider.java
+++ b/Zoelda/src/main/entities/Spider.java
@@ -7,10 +7,10 @@ import main.entities.player.Player;
 
 public class Spider extends LivingEntity {
 
-	private static SheetLoader loader = new SheetLoader("/res/images/spider_sprite_sheet.png", 32, 32, new int[] { 5, 3, 6, 9, 9, 8 });
+	private static SheetLoader loader = new SheetLoader("/res/images/spider_sprite_sheet.png");
 
 	public Spider() {
-		super(loader.getFigur(0), "idle");
+		loader.generateFigures(32, 32, new int[] { 5, 3, 6, 9, 9, 8 });
 
 		width = 0.7f;
 		height = 0.8f;
@@ -19,7 +19,8 @@ public class Spider extends LivingEntity {
 		posX = 4f;
 		posY = 4f;
 		mirrored = true;
-		
+
+		actionFigur.neuerZustand(loader.getFigur(0), "idle");
 		actionFigur.neuerZustand(loader.getFigur(1), "lost_sight");
 		actionFigur.neuerZustand(loader.getFigur(2), "walk");
 		actionFigur.neuerZustand(loader.getFigur(3), "attack");
diff --git a/Zoelda/src/main/entities/player/Player.java b/Zoelda/src/main/entities/player/Player.java
index 5820567..bd4eff1 100644
--- a/Zoelda/src/main/entities/player/Player.java
+++ b/Zoelda/src/main/entities/player/Player.java
@@ -11,13 +11,12 @@ import main.entities.LivingEntity;
 
 public class Player extends LivingEntity {
 
-	private static SheetLoader loader = new SheetLoader("/res/images/player_sprite_sheet.png", 64, 32,
-			new int[] { 5, 8, 7, 6, 2, 5, 4, 7 });
+	private static SheetLoader loader = new SheetLoader("/res/images/player_sprite_sheet.png");
 	private boolean onlyAttackOnceTrigger;
 	private float range = 1.2f; // die reichweite der Attacke
 
 	public Player() {
-		super(loader.getFigur(0), "idle");
+		loader.generateFigures(64, 32, new int[] { 5, 8, 7, 6, 2, 5, 4, 7 });
 
 		// Entity-Eigenschaften werden festgelegt
 		width = 0.7f;
diff --git a/Zoelda/src/main/worlds/TestWorld.java b/Zoelda/src/main/worlds/TestWorld.java
index 41e0542..9b4f459 100644
--- a/Zoelda/src/main/worlds/TestWorld.java
+++ b/Zoelda/src/main/worlds/TestWorld.java
@@ -6,11 +6,11 @@ import main.maps.Map;
 public class TestWorld extends World {
 
 	public TestWorld() {
-		super(5);
+		super(4);
 		
-		Map m2 = maps[7].clone();
+		Map m2 = maps[3].clone();
 		getCurrentMap().connectDoors(getCurrentMap().leftDoor, m2.leftDoor);
-		
+
 		getCurrentMap().addLivingEntity(new Snake());
 	}
 

From ec74176426b799471f428ddcfbdf49cebe449bb4 Mon Sep 17 00:00:00 2001
From: Max <m.l.g.2508@icloud.com>
Date: Wed, 30 Jun 2021 13:32:26 +0200
Subject: [PATCH 2/2] Disco sprite sheet added

---
 Zoelda/src/main/Tile.java                    |   3 +++
 Zoelda/src/res/images/disco_sprite_sheet.png | Bin 0 -> 3268 bytes
 2 files changed, 3 insertions(+)
 create mode 100644 Zoelda/src/res/images/disco_sprite_sheet.png

diff --git a/Zoelda/src/main/Tile.java b/Zoelda/src/main/Tile.java
index 6e1ab05..87f8fe5 100644
--- a/Zoelda/src/main/Tile.java
+++ b/Zoelda/src/main/Tile.java
@@ -25,6 +25,7 @@ public class Tile extends Knoten {
 	public static final int STONE_FLOOR_SHADOW_LEFT = 6;
 	public static final int DOOR_LEFT_BOTTOM = 7;
 	public static final int DOOR_LEFT_TOP = 8;
+	public static final int DISCO = 9;
 	
 	private Bild img; // Bild, das gerendert wird
 	private int id; // Die id dises Tiles//
@@ -98,6 +99,8 @@ public class Tile extends Knoten {
 			return "/res/images/tiles/door_left_bottom.png";
 		case DOOR_LEFT_TOP:
 			return "/res/images/tiles/door_left_top.png";
+		case DISCO:
+			return "/res/images/tiles/disco_sprite_sheet.png";
 		}
 		return null;
 	}
diff --git a/Zoelda/src/res/images/disco_sprite_sheet.png b/Zoelda/src/res/images/disco_sprite_sheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f04b2547b5d1ae1553f6161bc6b1a18a9f1954a
GIT binary patch
literal 3268
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
CO9u-8

literal 0
HcmV?d00001