Merge branch 'develop' of https://git.fabrik.mathieu-chavanel.fr/math-pixel/La-Fabrik into develop

src/data/gameplay/pylonConfig.ts

@@ -1,20 +1,27 @@
 import type { Vector3Tuple } from "@/types/three/three";
 
-export const PYLON_WORLD_POSITION: Vector3Tuple = [43, 5, 45];
+export const PYLON_WORLD_POSITION: Vector3Tuple = [-31.5, 3.5, 36.04];
 
 export const PYLON_DOWNED_ROTATION: Vector3Tuple = [0, 0, -0.9];
 
 export const PYLON_UPRIGHT_ROTATION: Vector3Tuple = [0, 0, 0];
 
 export const PYLON_FARMER_NPC_POSITION: Vector3Tuple = [
-  PYLON_WORLD_POSITION[0] - 6,
-  PYLON_WORLD_POSITION[1],
-  PYLON_WORLD_POSITION[2] + 4,
+  -16.13,
+  3.2,
+  52.46
 ];
 
 export const PYLON_FARMER_NPC_AFTER_POSITION: Vector3Tuple = [
   PYLON_WORLD_POSITION[0] + 3,
-  PYLON_WORLD_POSITION[1],
+  PYLON_WORLD_POSITION[1] + 0.2,
+  PYLON_WORLD_POSITION[2],
+];
+
+/** Point vers lequel l'électricienne regarde pendant sa marche vers le pylône (ajustable) */
+export const PYLON_FARMER_NPC_WALK_LOOK_AT: Vector3Tuple = [
+  PYLON_WORLD_POSITION[0] + 3,
+  PYLON_WORLD_POSITION[1] + 0.2,
   PYLON_WORLD_POSITION[2],
 ];
 
@@ -29,7 +36,7 @@ export const PYLON_FARMER_NPC_AFTER_POSITION_pylone_straight: Vector3Tuple = [
 export const PYLON_FARMER_NPC_AFTER_ROTATION: Vector3Tuple = [0, 0, 0];
 
 /** Scale uniforme du PNJ une fois arrivé sous le pylône */
-export const PYLON_FARMER_NPC_AFTER_SCALE = 1;
+export const PYLON_FARMER_NPC_AFTER_SCALE = 1.55;
 
 /** Vitesse du lerp de déplacement du PNJ (unités/s) */
 export const PYLON_FARMER_NPC_WALK_SPEED = 2;
@@ -44,5 +51,8 @@ export const PYLON_NARRATIVE_DIALOGUES = {
   brokenPylon: "narrateur_poteaueleccasse",
   demandeAide: "narrateur_demande_aide",
   farmerHelp: "fermier_coupdemain",
+  electricienneWelcome: "electricienne_welcome",
+  electricienneApresMontage: "electricienne_apresMontage",
+  electricienneAurevoir: "electricienne_aurevoir",
   powerRestored: "narrateur_courantrepare",
 } as const;

src/data/gameplay/zones.ts

@@ -1,26 +1,28 @@
 import type { ZoneConfig } from "@/types/gameplay/zone";
 import { PYLON_WORLD_POSITION } from "@/data/gameplay/pylonConfig";
 
+// Zones qui active la coupure de courant
 export const PYLON_APPROACH_ZONE: ZoneConfig = {
   id: "pylon-approach",
   position: [
-    PYLON_WORLD_POSITION[0],
-    PYLON_WORLD_POSITION[1] - 5,
-    PYLON_WORLD_POSITION[2],
+    5, 
+    4,
+    -21.5
   ],
-  radius: 5,
+  radius: 10,
   height: 18,
   oneShot: true,
 };
 
+// Zone qui active la cinématique d'arrivée du pylône
 export const PYLON_ARRIVED_ZONE: ZoneConfig = {
   id: "pylon-arrived",
   position: [
-    PYLON_WORLD_POSITION[0] + 5,
-    PYLON_WORLD_POSITION[1] - 5,
-    PYLON_WORLD_POSITION[2] + 5,
+    PYLON_WORLD_POSITION[0],
+    PYLON_WORLD_POSITION[1],
+    PYLON_WORLD_POSITION[2],
   ],
-  radius: 5,
+  radius: 30,
   height: 15,
   oneShot: true,
 };