home Inside

Pixel-Paradox · Apr 3, 2024 · cf2c0ec · cf2c0ec
1 parent cb2dee8
commit cf2c0ec
Show file tree

Hide file tree

Showing 14 changed files with 784 additions and 123 deletions.
diff --git a/Json/homeJson.json b/Json/homeJson.json
diff --git a/Site/ImageGame/home.png b/Site/ImageGame/home.png
diff --git a/Site/ImageGame/homeForeground.png b/Site/ImageGame/homeForeground.png
diff --git a/Site/ImageGame/foreground.png → Site/ImageGame/mapForeground.png b/Site/ImageGame/foreground.png → Site/ImageGame/mapForeground.png
diff --git a/Site/ImageGame/ragnerus.png b/Site/ImageGame/ragnerus.png
diff --git a/Site/Js/JsGame/TiledData/collisionsHome.js b/Site/Js/JsGame/TiledData/collisionsHome.js
diff --git a/Site/Js/JsGame/dialogue.js b/Site/Js/JsGame/dialogue.js
@@ -27,6 +27,7 @@ function dialogueFunction(usernames, texts) {
             timeoutVillager = setTimeout(displaySegment, time);
         } else {
             timeoutVillager = setTimeout(function() {
+
                 villagers.forEach(villager => {
                     villager.sprite.movingVillager = false;
                 })
@@ -67,6 +68,6 @@ function keydialogue(villager) {
             dialogueFunction("Ragnerus", "Bonjour, je vois que vous êtes nouveau. Ici, c'est le village d'Amarantis. Le vagabond vous a ramené à l'Hôpital du Village, on ne sait pas où il vous a trouvé. Vous êtes resté endormi pendant plusieurs mois. Le vagabond est bizarre... il ne parle avec personne... on ne le connaît pas tellement... Ce n'est pas un habitant d'Amarantis. Il habite dans la forêt à l'ouest. Le chef du village d'Amarantis attend avec impatience de vous parler. Il se trouve dans sa grande maison au sud du village.");
         }
     } else {
-        dialogueFunction("Maitre du jeu", "Veulliez d'abord parler au vagbond.");
+        dialogueFunction("Maitre du jeu", "Veuillez d'abord parler au vagbond.");
     }
 }
diff --git a/Site/Js/JsGame/play.js b/Site/Js/JsGame/play.js
@@ -271,6 +271,8 @@ function animate() {
             villager.sprite.draw();
         });
 
+        foregroundHome.draw();
+
         player.moving = false;
 
         homeOfCollisions.forEach(homeOfCollision => {

diff --git a/Site/Js/JsGame/sprite.js b/Site/Js/JsGame/sprite.js
@@ -29,13 +29,16 @@ const mapBackground = new Image();
 mapBackground.src = './Site/ImageGame/map.png';
 
 const mapForeground = new Image();
-mapForeground.src = './Site/ImageGame/foreground.png';
+mapForeground.src = './Site/ImageGame/mapForeground.png';
 
 // Houses image 
 
 const homeBackground = new Image();
 homeBackground.src = './Site/ImageGame/home.png';
 
+const homeForeground = new Image();
+homeForeground.src = './Site/ImageGame/homeForeground.png';
+
 // Player creation
 
 const player = new Sprite({
@@ -60,8 +63,8 @@ const player = new Sprite({
 const vagabond = {
     sprite: new Sprite({
         position: {
-            x: canvas.width / 2 + 50,
-            y: canvas.height / 2 + 20
+            x: canvas.width / 2 + 35,
+            y: canvas.height / 2 - 25
         },
         frames: {
             max: 4
@@ -70,33 +73,33 @@ const vagabond = {
     }),
 };
 
-
-
-
-
-const ragnerus = {
+const chef = {
     sprite: new Sprite({
         position: {
-            x: canvas.width / 2 + 200,
-            y: canvas.height / 2 + 200
+            x: canvas.width / 2 + 155,
+            y: canvas.height / 2 + 390
         },
         frames: {
             max: 4
         },
-        image: ragnerusImage
+        image: chefImage
     }),
 };
 
-const chef = {
+
+
+
+
+const ragnerus = {
     sprite: new Sprite({
         position: {
-            x: canvas.width / 2 + 230,
-            y: canvas.height / 2 + 420
+            x: canvas.width / 2 + 195,
+            y: canvas.height / 2 + 195
         },
         frames: {
             max: 4
         },
-        image: chefImage
+        image: ragnerusImage
     }),
 };
 
@@ -214,7 +217,14 @@ const backgroundHome = new Sprite({
     image: homeBackground
 })
 
+const foregroundHome = new Sprite({
+    position: {
+        x: offset.x,
+        y: offset.y
+    },
+    image: homeForeground
+})
 
 const movable = [backgroundMap , foregroundMap, ...mapOfCollisions,
     ...frontOfHomes, ...villagersMovable,
-    backgroundHome, ...homeOfCollisions];
+    backgroundHome, foregroundHome, ...homeOfCollisions];
diff --git a/Tiled/ImageSet/homeInside1.png b/Tiled/ImageSet/homeInside1.png
diff --git a/Tiled/ImageSet/homeInside2.png b/Tiled/ImageSet/homeInside2.png
diff --git a/Tiled/TiledBackground/home.tmx b/Tiled/TiledBackground/home.tmx
diff --git a/Tiled/TiledSet/homeInside1.tsx b/Tiled/TiledSet/homeInside1.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="git" name="homeInside1" tilewidth="16" tileheight="16" tilecount="234" columns="13">
+ <image source="../ImageSet/homeInside1.png" width="208" height="288"/>
+</tileset>
diff --git a/Tiled/TiledSet/homeInside2.tsx b/Tiled/TiledSet/homeInside2.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="git" name="homeInside2" tilewidth="16" tileheight="16" tilecount="234" columns="13">
+ <image source="../ImageSet/homeInside2.png" width="208" height="288"/>
+</tileset>