From bdff9e5ffb94eff156cc36a94187576d13a641ec Mon Sep 17 00:00:00 2001 From: "Malin.sieckmann" Date: Sun, 27 Jun 2021 14:35:24 +0200 Subject: [PATCH] Edit Corridor modified stone floor (lighting), centered corridor --- Zoelda/src/main/Tile.java | 8 ++++---- Zoelda/src/main/maps/Corridor.java | 8 ++++---- Zoelda/src/res/images/tiles/TestTest.png | Bin 0 -> 137 bytes Zoelda/src/res/images/tiles/stone_floor.png | Bin 574 -> 0 bytes Zoelda/src/res/images/tiles/stone_wall.png | Bin 481 -> 0 bytes .../src/res/images/tiles/stone_wall_bottom.png | Bin 540 -> 545 bytes 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Zoelda/src/res/images/tiles/TestTest.png delete mode 100644 Zoelda/src/res/images/tiles/stone_floor.png delete mode 100644 Zoelda/src/res/images/tiles/stone_wall.png diff --git a/Zoelda/src/main/Tile.java b/Zoelda/src/main/Tile.java index 4717e5c..76ea94a 100644 --- a/Zoelda/src/main/Tile.java +++ b/Zoelda/src/main/Tile.java @@ -40,9 +40,9 @@ public class Tile extends Knoten { if (id == GRASS) { buff = buff.getSubimage(16 * (int) (Math.random() * 8), 0, 16, 16); } - if (id == STONE_FLOOR) { - buff = buff.getSubimage(16 * (int) (Math.random() * 10), 0, 16, 16); - } + //if (id == STONE_FLOOR) { + // buff = buff.getSubimage(16 * (int) (Math.random() * 10), 0, 16, 16); + //} // Skalieren BufferedImage scaled = new BufferedImage(World.SCALE, World.SCALE, BufferedImage.TYPE_INT_RGB); scaled.getGraphics().drawImage(buff, 0, 0, World.SCALE, World.SCALE, null); @@ -72,7 +72,7 @@ public class Tile extends Knoten { case STONE_WALL_BOTTOM: return "/res/images/tiles/stone_wall_bottom.png"; case STONE_FLOOR: - return "/res/images/tiles/Stone_floor.png"; + return "/res/images/tiles/TestTest.png"; } return null; } diff --git a/Zoelda/src/main/maps/Corridor.java b/Zoelda/src/main/maps/Corridor.java index b398bdd..072c6fd 100644 --- a/Zoelda/src/main/maps/Corridor.java +++ b/Zoelda/src/main/maps/Corridor.java @@ -7,22 +7,22 @@ import main.entities.Snake; public class Corridor extends Map { public Corridor() { - super(5, 10); + super(15, 11); for (int x = 0; x < map.length; x++) { for (int y = 0; y < map[0].length; y++) { //Wand - if((y == 0 || x == 0 || y == 9 || x == 4) && x != 2 ) { + if((y == 0 || x == 5 || y == 10 || x == 9) && x != 7 && x >= 5 && x <= 9) { map[x][y] = new Tile(3, x, y); add(map[x][y]); } //3D-Wand - else if(y == 1 && (x != 0 || x != 4)&& x != 2 ) { + else if(y == 1 && (x != 0 || x != 4)&& x != 7 && x >= 6 && x <= 8 ) { map[x][y] = new Tile(4, x, y); add(map[x][y]); } //Steinboden - else { + else if (x >= 6 && x <= 8 ) { map[x][y] = new Tile(5, x, y); add(map[x][y]); } diff --git a/Zoelda/src/res/images/tiles/TestTest.png b/Zoelda/src/res/images/tiles/TestTest.png new file mode 100644 index 0000000000000000000000000000000000000000..c4390296c98bc1f1bfe864c283bd54af5b7c52c6 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`0iG_7Ar}70HZ?y!)U(Mv`1ba8 zf@ElDs6p=;_KolF?mm8i!-zqx@w7tBqs43n4orpj_EcIVHwG-=o9?j0f=9zF;lX61 kqj4)%u2i&EY!s4Wu*mdKI;Vst06g+7@&Et; literal 0 HcmV?d00001 diff --git a/Zoelda/src/res/images/tiles/stone_floor.png b/Zoelda/src/res/images/tiles/stone_floor.png deleted file mode 100644 index 70eadc3dad2bb2687751afff84988efb879de43a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->P)000mO1^@s6kp*;E00009a7bBm001r{ z001r{0eGc9b^rhX8hTV%bW~|{Y-Iod2$>5m$AF9HA>!vu@Bk*MMT0019) zR9JLDb#!QNasU7bne$D|$;?v-&P+|t&P~kA0{|<+1*_&#-%$Vn0iQ`kK~!i%?V2%) zgfJ9_Gs~7XqM(J1Sa|>&!P>?Xco(nZ3A}-&2e1+mM6j|E+g)BDuA}Z~qE&o>!C~_L z2l?}nosJvdfT6f%w@f#+Uh zKsk=H>CUoj{w<24`8%8;5x@sSB{KA37)aN3R60!)(RKYT&E9qk&;f+-T=ye@BC{Z| z=F|H=w)(MxgjK<3?bw6!>#P{#k diff --git a/Zoelda/src/res/images/tiles/stone_wall.png b/Zoelda/src/res/images/tiles/stone_wall.png deleted file mode 100644 index b0842b02ffc23359801b0f0bef05c1b37620c8ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmV<70UrK|P)~=fVEgqL)7|Q*AmsBbxj=*?4mh<`i_2%=rESJm3hfP!R&=-q^BoYa6kH6CUGzrsJ`89Wi%SebUIZ#lga#VVAGGsqXw|k>GanImV>NR zDw^kcp12?g)X3#>D%Bbi~lF#SG`M$5g;cyrwF?qdS ztIbs4F_~sG#zt>8o8s7j0wab1TV%6YT5EkBU`k-tIcl?$ZE-!%oB*oJ7C`+@hXw%+#_OFL zE91GT&1N&~_xrm|aG)p(iSxvNpZRXL+rco>k$Qh*B9$!MPtU=ZhZGJEQFtR4pm0Au z>nzKj)x8wghr{8e#Aiu{2UJz`kp5|AyWQSA;lJX10~G6Z%@wI(yO00?002ovPDHLk FV1nKT#hU;C delta 406 zcmV;H0crlB1e^qrkbiecL_t(IPpwniZh}A%Jqx>nN@D6uHSrhP^ap%t`{#a$FFw~u z0D-;GnL#YANfXnKkZdMiGPqa`r-Yg z->8rgx*SWa0a(`!SgfvVil(txEHIx<*}(}(l1Nro9V$sCaL&Q|fQY0Oz0)*7L+)Zy zaL%GAJak!BbSTARpqGDaGE!n=t#H~s$hDmH(vi1$1UPf;vG-vm#eK`dmglOgNn@&Sj#0o(2NW}Uw^cDo%mn++%o z?go!BLhzUR9|F#EZw(mvyYVpg`~6)UjN$qOuHDBLR}W5JH~;_u07*qoM6N<$f*gRh AtN;K2