Fix door npc display

shezard · Jul 7, 2023 · 78ad628 · 78ad628
1 parent f648331
commit 78ad628
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 23 deletions.
diff --git a/src/components/Npc.svelte b/src/components/Npc.svelte
diff --git a/src/components/Script.svelte b/src/components/Script.svelte
@@ -121,8 +121,9 @@
     <Box
         x={script.x}
         y={script.y}
-        wx={Math.abs(Math.cos($player.position.t))}
-        wy={Math.abs(Math.sin($player.position.t))}
+        wx={script.depth ?? 0}
+        wy={1}
+        rz={script.t}
         on:click={handleNpc(script)}
         {texture}
         color={script.color}

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -58,6 +58,7 @@ export type Npc = {
     texture: string[];
     dialogs: string[];
     color?: number;
+    depth?: number;
 } & OrientedPosition;
 
 export type AiMode = 'idle' | 'attack-on-sight';

diff --git a/src/lib/Npc.ts b/src/lib/Npc.ts
@@ -10,6 +10,7 @@ export const makeNpc = function (npcName: string, id: number, x: number, y: numb
         x: x,
         y: y,
         t: 0,
+        depth: 0,
         dialogs: []
     };
 };
diff --git a/src/maps/level-0.json b/src/maps/level-0.json
@@ -262,7 +262,7 @@
         {
             "id": 8,
             "type": "panel",
-            "content": ["Press I to access the inventory"],
+            "content": ["Tips: Press I to access the inventory"],
             "collision": false,
             "texture": ["panel-1", "panel-1", "panel-1", "panel-0", "panel-0", "panel-0"],
             "x": 5,

diff --git a/src/maps/level-2.json b/src/maps/level-2.json
@@ -238,6 +238,7 @@
             "x": 4,
             "y": 3,
             "t": 0,
+            "depth": 1,
             "dialogs": ["locked-door"]
         },
         {

diff --git a/static/textures/npc-2.png b/static/textures/npc-2.png
diff --git a/static/textures/npc-3.png b/static/textures/npc-3.png
diff --git a/static/textures/npc-4.png b/static/textures/npc-4.png
diff --git a/static/textures/npc-5.png b/static/textures/npc-5.png
diff --git a/static/textures/npc-6.png b/static/textures/npc-6.png
-Original file line number
+Diff line change
@@ Expand Up @@
             x: x,
             y: y,
             t: 0,
+            depth: 0,
             dialogs: []
         };
     };