From e15574ed03b947ee5828fedd1a84fcf4ec982dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.le-bihan@epitech.eu>
Date: Sat, 2 May 2020 15:16:15 +0200
Subject: [PATCH 1/3] adding the texture for npc interact tiles

---
 assets/tiles/interaction_tile.png | Bin 0 -> 611 bytes
 prefabs/game.gcprefab             |   2 ++
 prefabs/tilemap.gcmap             |  44 +++++++++++++++---------------
 3 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 assets/tiles/interaction_tile.png

diff --git a/assets/tiles/interaction_tile.png b/assets/tiles/interaction_tile.png
new file mode 100644
index 0000000000000000000000000000000000000000..e865fb0451a1c55075e3f03cda8c12fe929c3371
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004RX+uL$X=7sm
z04R}lkvmHRK@^3*BnCwz7FviXY@uQiAu5Qa#v)CS5EXni$tIf!n|0YukYFp=SOhFY
z8()S0KwH69K@b!{#KK?TtC6tYF+xOimf8DpX3k~i4EW=wUT_;CP_T+lG8Wb5<`=Za
zCxZA1F+@*FckPKpBF?|#{RW?^*Mq9p|NH(NEt#yVgRe<=RJWa?@VIb%wP-8e6z<UT
zsf_TxaM+Op3STHaUE@c^xf;JJc4m^3;8#7h+z(FwU_I{?ga?Fs3ua0GK99OdC~M75
zOYM@`jZ2akQ8dz&SjMEtpj1mT``Z`!@=dWK9$o%6WgKzj$cr~DYDv0gr5d7V<ufU(
z+<)ik8Y9EC?x83IA3X1+4;r_iTJgM(1JA1-Lf{_Gth#?iavFORy;9eD_n>VZPR{FE
zdK*qRp!3d7IjJuxAk%Lc@O%ud^U!_;&5O0HzSlXrg_$*ZqD$D>g?`!Jw)6?wxM%qi
zZcoPm000SaNLh0L01FZT01FZU(%pXi0001*Nkl<ZI8UXMQ3`+{42D&LE>P#}LFf>H
z51q5_U`(2fsoNr76x#p!|I7L8=Iq{e#|@9-zNE8$_W<C+H68AXy9xtP;8h@og}X)x
z^meO=My?KeVhgYUq(Ti+0G5W0dQl?)WCW62G=Jf%n+AZ9IB4Xe3&6ZmEUcNdheDf7
xU7$nJfdwAuU|0mS2DGLKv?u(MGL3)6`2jn8I0b{Qvy=b;002ovPDHLkV1i{75bXc}

literal 0
HcmV?d00001

diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index 23c4556..f99eb42 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -120,6 +120,8 @@
         <sprite name="item_rock_1" src="assets/sprites/items/generic-rpg-rock04.png" />
         <sprite name="item_rock_2" src="assets/sprites/items/generic-rpg-rock05.png" />
 
+        <sprite name="npc_interact" src="assets/tiles/interaction_tile.png" />
+
 
         <sprite name="empty_slot" src="assets/sprites/inventory/empty_48x48.png" />
         <sprite name="slot_1" src="assets/sprites/inventory/fireball_upgrade.png" />
diff --git a/prefabs/tilemap.gcmap b/prefabs/tilemap.gcmap
index 108d996..8c2a599 100644
--- a/prefabs/tilemap.gcmap
+++ b/prefabs/tilemap.gcmap
@@ -946,8 +946,8 @@
 			<row height="0" />
 			<row height="0" />
 			<row height="0" />
-			<row height="10" />
-			<row height="10" />
+			<row height="20" />
+			<row height="20" />
 			<row height="0" />
 			<row height="0" />
 			<row height="0" />
@@ -1018,8 +1018,8 @@
 			<row height="0" />
 			<row height="0" />
 			<row height="0" />
-			<row height="0" />
 			<row height="10" />
+			<row height="20" />
 			<row height="10" />
 			<row height="0" />
 			<row height="0" />
@@ -6263,8 +6263,8 @@
 		<tile x="17" y="45" texture="water_top_right" rotation="2" solid="true"/>
 		<tile x="17" y="46" texture="water" rotation="0" solid="true"/>
 		<tile x="17" y="47" texture="water" rotation="0" solid="true"/>
-		<tile x="17" y="48" texture="dirt" rotation="0" />
-		<tile x="17" y="49" texture="dirt" rotation="0" />
+		<tile x="17" y="48" texture="npc_interact" rotation="0" />
+		<tile x="17" y="49" texture="dirt" rotation="0" solid="true"/>
 		<tile x="17" y="50" texture="water" rotation="0" solid="true"/>
 		<tile x="17" y="51" texture="water" rotation="0" solid="true"/>
 		<tile x="17" y="52" texture="water" rotation="0" solid="true"/>
@@ -6665,8 +6665,8 @@
 		<tile x="23" y="33" texture="dirt_inner_top_left" rotation="3" />
 		<tile x="23" y="34" texture="dirt_top_0" rotation="0" />
 		<tile x="23" y="35" texture="dirt_top_1" rotation="0" />
-		<tile x="23" y="36" texture="dirt_inner_top_left" rotation="0" />
-		<tile x="23" y="37" texture="dirt_inner_top_left" rotation="2" />
+		<tile x="23" y="36" texture="npc_interact" rotation="2" />
+		<tile x="23" y="37" texture="dirt_inner_top_left" rotation="2" solid="true"/>
 		<tile x="23" y="38" texture="dirt_top_2" rotation="2" />
 		<tile x="23" y="39" texture="dirt_top_2" rotation="2" />
 		<tile x="23" y="40" texture="dirt_top_2" rotation="2" />
@@ -7002,8 +7002,8 @@
 		<tile x="28" y="25" texture="dirt_inner_top_left" rotation="3" />
 		<tile x="28" y="26" texture="dirt_top_2" rotation="0" />
 		<tile x="28" y="27" texture="dirt_inner_top_left" rotation="0" />
-		<tile x="28" y="28" texture="dirt" rotation="0" />
-		<tile x="28" y="29" texture="dirt_top_2" rotation="3" />
+		<tile x="28" y="28" texture="npc_interact" rotation="2" />
+		<tile x="28" y="29" texture="dirt_top_2" rotation="3" solid="true"/>
 		<tile x="28" y="30" texture="grass_top" rotation="0" />
 		<tile x="28" y="31" texture="grass_top" rotation="0" />
 		<tile x="28" y="32" texture="grass_top" rotation="0" />
@@ -7895,13 +7895,13 @@
 		<tile x="41" y="21" texture="dirt" rotation="0" />
 		<tile x="41" y="22" texture="dirt" rotation="0" />
 		<tile x="41" y="23" texture="dirt" rotation="0" />
-		<tile x="41" y="24" texture="dirt_top_2" rotation="3" />
-		<tile x="41" y="25" texture="grass_top" rotation="0" />
+		<tile x="41" y="24" texture="npc_interact" rotation="2" />
+		<tile x="41" y="25" texture="grass_top" rotation="0" solid="true"/>
 		<tile x="41" y="26" texture="dirt_top_right_0" rotation="1" />
 		<tile x="41" y="27" texture="dirt_inner_top_left" rotation="1" />
 		<tile x="41" y="28" texture="dirt" rotation="0" />
-		<tile x="41" y="29" texture="dirt" rotation="0" />
-		<tile x="41" y="30" texture="dirt_inner_top_left" rotation="2" />
+		<tile x="41" y="29" texture="npc_interact" rotation="2" />
+		<tile x="41" y="30" texture="dirt_inner_top_left" rotation="2" solid="true"/>
 		<tile x="41" y="31" texture="dirt_top_right_0" rotation="2" solid="true"/>
 		<tile x="41" y="32" texture="grass_top" rotation="0" />
 		<tile x="41" y="33" texture="grass_top" rotation="0" />
@@ -7964,7 +7964,7 @@
 		<tile x="42" y="21" texture="dirt" rotation="0" />
 		<tile x="42" y="22" texture="dirt" rotation="0" />
 		<tile x="42" y="23" texture="dirt" rotation="0" />
-		<tile x="42" y="24" texture="dirt_top_2" rotation="3" />
+		<tile x="42" y="24" texture="dirt_top_2" rotation="3" solid="true"/>
 		<tile x="42" y="25" texture="grass_top" rotation="0" solid="true"/>
 		<tile x="42" y="26" texture="grass_top" rotation="0" />
 		<tile x="42" y="27" texture="dirt_top_2" rotation="1" />
@@ -7988,7 +7988,7 @@
 		<tile x="42" y="45" texture="dirt_inner_top_left" rotation="2" />
 		<tile x="42" y="46" texture="dirt_top_0" rotation="2" solid="true"/>
 		<tile x="42" y="47" texture="dirt_top_1" rotation="2" />
-		<tile x="42" y="48" texture="dirt_top_0" rotation="2" />
+		<tile x="42" y="48" texture="npc_interact" rotation="2" />
 		<tile x="42" y="49" texture="dirt_top_1" rotation="2" />
 		<tile x="42" y="50" texture="dirt_left_4" rotation="1" />
 		<tile x="42" y="51" texture="dirt_inner_top_left" rotation="1" />
@@ -8057,7 +8057,7 @@
 		<tile x="43" y="45" texture="dirt_top_5" rotation="2" solid="true"/>
 		<tile x="43" y="46" texture="" rotation="0" solid="true"/>
 		<tile x="43" y="47" texture="grass_top" rotation="0" solid="true"/>
-		<tile x="43" y="48" texture="grass_top" rotation="0" />
+		<tile x="43" y="48" texture="grass_top" rotation="0" solid="true"/>
 		<tile x="43" y="49" texture="grass_top" rotation="0" />
 		<tile x="43" y="50" texture="grass_top" rotation="0" solid="true"/>
 		<tile x="43" y="51" texture="dirt_left_4" rotation="0" />
@@ -8257,8 +8257,8 @@
 		<tile x="46" y="38" texture="dirt_inner_top_left" rotation="0" />
 		<tile x="46" y="39" texture="dirt_inner_top_left" rotation="2" />
 		<tile x="46" y="40" texture="dirt_top_5" rotation="2" />
-		<tile x="46" y="41" texture="dirt_top_2" rotation="2" />
-		<tile x="46" y="42" texture="dirt" rotation="0" />
+		<tile x="46" y="41" texture="npc_interact" rotation="2" />
+		<tile x="46" y="42" texture="dirt" rotation="0" solid="true"/>
 		<tile x="46" y="43" texture="dirt" rotation="0" solid="true"/>
 		<tile x="46" y="44" texture="dirt_top_right_0" rotation="3" />
 		<tile x="46" y="45" texture="grass_top" rotation="0" solid="true"/>
@@ -8940,8 +8940,8 @@
 		<tile x="56" y="31" texture="grass_top" rotation="0" />
 		<tile x="56" y="32" texture="grass_top" rotation="0" />
 		<tile x="56" y="33" texture="grass_top" rotation="0" />
-		<tile x="56" y="34" texture="dirt_top_1" rotation="1" />
-		<tile x="56" y="35" texture="dirt_top_5" rotation="3" />
+		<tile x="56" y="34" texture="npc_interact" rotation="2" />
+		<tile x="56" y="35" texture="dirt_top_5" rotation="3" solid="true"/>
 		<tile x="56" y="36" texture="grass_top" rotation="0" />
 		<tile x="56" y="37" texture="grass_top" rotation="0" />
 		<tile x="56" y="38" texture="grass_top" rotation="0" solid="true"/>
@@ -9201,8 +9201,8 @@
 		<tile x="60" y="16" texture="grass_top" rotation="0" solid="true"/>
 		<tile x="60" y="17" texture="grass_top" rotation="0" />
 		<tile x="60" y="18" texture="dirt_top_5" rotation="1" />
-		<tile x="60" y="19" texture="dirt_top_5" rotation="3" />
-		<tile x="60" y="20" texture="grass_top" rotation="0" />
+		<tile x="60" y="19" texture="npc_interact" rotation="2" />
+		<tile x="60" y="20" texture="grass_top" rotation="0" solid="true"/>
 		<tile x="60" y="21" texture="grass_top" rotation="0" />
 		<tile x="60" y="22" texture="grass_top" rotation="0" />
 		<tile x="60" y="23" texture="grass_top" rotation="0" />

From 9bd8ac42bea221640b19385f9d74d50cbef1dc72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.le-bihan@epitech.eu>
Date: Sat, 2 May 2020 15:23:47 +0200
Subject: [PATCH 2/3] setting the right roation for interact tiles with chests

---
 prefabs/tilemap.gcmap | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/prefabs/tilemap.gcmap b/prefabs/tilemap.gcmap
index 8c2a599..bda45af 100644
--- a/prefabs/tilemap.gcmap
+++ b/prefabs/tilemap.gcmap
@@ -372,8 +372,8 @@
 			<row height="0" />
 			<row height="0" />
 			<row height="0" />
-			<row height="0" />
-			<row height="0" />
+			<row height="10" />
+			<row height="10" />
 			<row height="0" />
 			<row height="0" />
 			<row height="10" />
@@ -444,8 +444,8 @@
 			<row height="0" />
 			<row height="0" />
 			<row height="20" />
-			<row height="30" />
-			<row height="10" />
+			<row height="40" />
+			<row height="20" />
 			<row height="0" />
 			<row height="0" />
 			<row height="10" />
@@ -948,8 +948,8 @@
 			<row height="0" />
 			<row height="20" />
 			<row height="20" />
-			<row height="0" />
-			<row height="0" />
+			<row height="10" />
+			<row height="10" />
 			<row height="0" />
 			<row height="0" />
 			<row height="0" />
@@ -1020,6 +1020,7 @@
 			<row height="0" />
 			<row height="10" />
 			<row height="20" />
+			<row height="20" />
 			<row height="10" />
 			<row height="0" />
 			<row height="0" />
@@ -1030,7 +1031,6 @@
 			<row height="0" />
 			<row height="0" />
 			<row height="0" />
-			<row height="0" />
 			<row height="20" />
 			<row height="30" />
 			<row height="70" />
@@ -8410,7 +8410,7 @@
 		<tile x="48" y="53" texture="dirt_top_5" rotation="3" />
 		<tile x="48" y="54" texture="grass_top" rotation="0" />
 		<tile x="48" y="55" texture="grass_top" rotation="0" />
-		<tile x="48" y="56" texture="grass_top" rotation="0" />
+		<tile x="48" y="56" texture="npc_interact" rotation="2" />
 		<tile x="48" y="57" texture="water_grass_right_1" rotation="2" solid="true"/>
 		<tile x="48" y="58" texture="water_grass_right_0" rotation="0" solid="true"/>
 		<tile x="48" y="59" texture="grass_top" rotation="0" />
@@ -8479,7 +8479,7 @@
 		<tile x="49" y="53" texture="dirt_top_right_1" rotation="3" />
 		<tile x="49" y="54" texture="grass_top" rotation="0" />
 		<tile x="49" y="55" texture="grass_top" rotation="0" />
-		<tile x="49" y="56" texture="grass_top" rotation="0" />
+		<tile x="49" y="56" texture="grass_top" rotation="0" solid="true"/>
 		<tile x="49" y="57" texture="water_grass_right_1" rotation="2" solid="true"/>
 		<tile x="49" y="58" texture="water_grass_right_1" rotation="0" solid="true"/>
 		<tile x="49" y="59" texture="grass_top" rotation="0" solid="true"/>
@@ -9360,7 +9360,7 @@
 		<tile x="62" y="37" texture="grass_top" rotation="0" />
 		<tile x="62" y="38" texture="grass_top" rotation="0" />
 		<tile x="62" y="39" texture="grass_top" rotation="0" />
-		<tile x="62" y="40" texture="grass_top" rotation="0" />
+		<tile x="62" y="40" texture="npc_interact" rotation="2" />
 		<tile x="62" y="41" texture="grass_top" rotation="0" />
 		<tile x="62" y="42" texture="stone" rotation="0" />
 		<tile x="62" y="43" texture="stone" rotation="0" />

From c3d888d714bb0054ba8249a924bde8774e8764ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.le-bihan@epitech.eu>
Date: Sat, 2 May 2020 15:29:46 +0200
Subject: [PATCH 3/3] fixing a typo in a dialog

---
 prefabs/game.gcprefab | 2 +-
 prefabs/tilemap.gcmap | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index c8e0891..cc768ee 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -306,7 +306,7 @@
                 <Sage line="This weapon makes your \nUppercut attack stronger" />
 
                 <Sage line="The fourth and final item \nis the HERO shield" />
-                <Sage line="he's the twin shield of \nthe well konwn hylian shield" />
+                <Sage line="he's the twin shield of \nthe well known hylian shield" />
                 <Sage line="This weapon makes your \nShield defence stronger" />
            </dialog_holder>
         </gc_entity>
diff --git a/prefabs/tilemap.gcmap b/prefabs/tilemap.gcmap
index bda45af..4ecdfb1 100644
--- a/prefabs/tilemap.gcmap
+++ b/prefabs/tilemap.gcmap
@@ -8479,7 +8479,7 @@
 		<tile x="49" y="53" texture="dirt_top_right_1" rotation="3" />
 		<tile x="49" y="54" texture="grass_top" rotation="0" />
 		<tile x="49" y="55" texture="grass_top" rotation="0" />
-		<tile x="49" y="56" texture="grass_top" rotation="0" solid="true"/>
+		<tile x="49" y="56" texture="grass_top" rotation="0"/>
 		<tile x="49" y="57" texture="water_grass_right_1" rotation="2" solid="true"/>
 		<tile x="49" y="58" texture="water_grass_right_1" rotation="0" solid="true"/>
 		<tile x="49" y="59" texture="grass_top" rotation="0" solid="true"/>