From 75b28bbb11fce5cf4307730fbfd7b6ef5a5edef1 Mon Sep 17 00:00:00 2001
From: "Malin.sieckmann" <ma.sieckmann@gmail.com>
Date: Wed, 23 Jun 2021 22:56:38 +0200
Subject: [PATCH] Adding a new Brickwall

- implemented in corridor
- 3D texture
---
 Zoelda/src/main/Tile.java                       |   3 +++
 Zoelda/src/main/World.java                      |   1 +
 Zoelda/src/main/maps/Corridor.java              |   6 +++++-
 Zoelda/src/res/images/tiles/stone_wall.png      | Bin 381 -> 481 bytes
 .../src/res/images/tiles/stone_wall_bottom.png  | Bin 0 -> 342 bytes
 5 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 Zoelda/src/res/images/tiles/stone_wall_bottom.png

diff --git a/Zoelda/src/main/Tile.java b/Zoelda/src/main/Tile.java
index a131e16..2cb98ec 100644
--- a/Zoelda/src/main/Tile.java
+++ b/Zoelda/src/main/Tile.java
@@ -18,6 +18,7 @@ public class Tile extends Knoten {
 	public static final int WALL_TOP = 1;
 	public static final int WALL_BOTTOM = 2;
 	public static final int STONE_WALL = 3;
+	public static final int STONE_WALL_BOTTOM = 4;
 
 	private Bild img; // Bild, das gerendert wird
 	private int id; // Die id dises Tiles
@@ -63,6 +64,8 @@ public class Tile extends Knoten {
 			return "/res/images/tiles/wall_bottom.png";
 		case STONE_WALL:
 			return "/res/images/tiles/stone_wall.png";
+		case STONE_WALL_BOTTOM:
+			return "/res/images/tiles/stone_wall_bottom.png";
 		}
 		return null;
 	}
diff --git a/Zoelda/src/main/World.java b/Zoelda/src/main/World.java
index e321d0a..f1d4903 100644
--- a/Zoelda/src/main/World.java
+++ b/Zoelda/src/main/World.java
@@ -5,6 +5,7 @@ import main.entities.Entity;
 import main.entities.Player;
 import main.entities.Snake;
 import main.entities.Spider;
+import main.maps.Corridor;
 import main.maps.Map;
 import main.maps.TestMap;
 
diff --git a/Zoelda/src/main/maps/Corridor.java b/Zoelda/src/main/maps/Corridor.java
index f1aeb7f..565f749 100644
--- a/Zoelda/src/main/maps/Corridor.java
+++ b/Zoelda/src/main/maps/Corridor.java
@@ -12,7 +12,11 @@ public class Corridor extends Map {
 				if((y == 0 || x == 0 || y == 9 || x == 4) && x != 2 ) {
 					map[x][y] = new Tile(3, x, y);
 					add(map[x][y]);
-				} else {
+				} else if(y == 1 && (x != 0 || x != 4)&& x != 2 ) {
+					map[x][y] = new Tile(4, x, y);
+					add(map[x][y]);
+				}
+				else {
 					map[x][y] = new Tile(0, x, y);
 					add(map[x][y]);
 				}
diff --git a/Zoelda/src/res/images/tiles/stone_wall.png b/Zoelda/src/res/images/tiles/stone_wall.png
index 84155eb8a96f827bb1c4ed5896fba67aed4eab2e..b0842b02ffc23359801b0f0bef05c1b37620c8ab 100644
GIT binary patch
delta 456
zcmV;(0XP2r0^tLYBYy#?Nkl<ZI1ycw$Ew0m5QfjwxObz1pkl#-E%plbvJ-a(L?n=f
zKJ;9^xlD{M4%5s3XX4)PxA0!Cmpq?O)vwp9>~=fVEgqL)7|Q*AmsBbxj=*?4mh<`i
z_2%=rESJm3hfP!R&=-q^BoYa6kH<q!r;`*41r4@ZEveV*(tqi6)FyE-7^uG8Ze=tY
z$#gnZJCn)$Z(!4p$D;<Y)9Lir29|@YR4SV1d7ii+2-L{saw^;Hw#s6$C`_bav)M?g
zR8k$g+wCfha=9$-a=FNUzt^B)M4C<kdVD(@Qms}$5Ws3YP{d;bg$#g)Mx&wr*=(j#
zA@CJQf;{VNiGS7zc{m)R2IjBTYM%|vi3DRZnUsFNuam3+lP8mjK70y+<H3L^BwZm7
zNZ7nyuNUdY7dMj6=f(NHufgGP7$q@zy<V%$RNyh0W;Dh|Z#J9a*nk2fh5%b+vsvXP
zPApB~f*fEfiMQMBYej-QgM<!N23YZGwbC4}RsRJmLP2upaT}de|Mg)<pAmeJVpF+y
yyFwE26SvQ7&9nimq7XzHHrD1I@Wmel#_c~L03=6!g5*vB0000<MNUMnLSTY8{N23(

delta 355
zcmV-p0i6Ef1N{P!BYyx1a7bBm001r{001r{0eGc9b^rhX8G2M$bW~|{Y-Iod2$?G`
z$<IrTFHg+L0RR`01UXESqhkO703Ui(Sad;kbZBpK000P?^G(dj%u@)?Oij+tP0Y&!
z04u@;tL9SQQ2+n{-$_J4R5(wSlido2APk1pMhWHhdH?s&Nq=Se@eU?_YX>$E<zejS
z-Sj!<8bWZjRzAIraN76X#Tec5JnlSC=e_3`2sXkA&i8%u(Kf<K%GNE6a@w|y6VLP9
zN|)Y8IHB+Bx<2<VT2U#bWft)uD0n{=ye%F8dlN@X6ZmRQ%d))GCnBDT-V2L|X_{I9
z^o4*@zVvBvFkBouj-%}W)CYvH$c{H|i%V8QU;Wrb6R_Sa4#t}(!bn+KeT%mW)^&Y}
zm{R%+Dh?Jm7YRb53jMh(&H;4E7$GKsyZ@aQ{{bsfMX1vcb&vo6002ovPDHLkV1oO0
Bm|y?^

diff --git a/Zoelda/src/res/images/tiles/stone_wall_bottom.png b/Zoelda/src/res/images/tiles/stone_wall_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d5f5c18b8846188ac5e3060d5a0932840f2038
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003UNkl<ZI1%lU
zJC1`;3`O5oQcaTrf)E4|Abdjj2nm4#qCgZ`$gFI(=F#zp(e$)aSbjFX=lMR&`~8-_
z?`4`M8OKrPd6us0B+v8Tn%*!B@_N1WJM+w(PA4(jwn@`85{9AXG)*N*60s~x%Cgh|
z*0!xwRi)tT^{TaP+hVx6u4@G_0DugTj1bW6cGEL80D70pMGO}94IIbOAvRzziX#2S
z1zDDf>$=*1JRX`o&-<~kuSbsKSS>)`S4Rv4A-$p~bOUUfWm&X|5C8$$_kF#cGqw<6
z2?#a8j9J%J*W1N-<GlOl3>+a_P(Pnf%|Q@|;n(nBJQCg^|E*b{J`f&{@AL=-e0-ke
oNSGsHv?lnv%aQm8+>bxvH(ay$Jo2#>A^-pY07*qoM6N<$g37y>{r~^~

literal 0
HcmV?d00001