public/map.json

@@ -37602,6 +37602,23 @@
           "rotation": [0, 0, 0],
           "scale": [1, 1, 1],
           "children": [
+            {
+              "name": "ebike",
+              "type": "Object3D",
+              "role": "group",
+              "position": [0, 0, 0],
+              "rotation": [0, 0, 0],
+              "scale": [1, 1, 1],
+              "children": [
+                {
+                  "name": "ebike",
+                  "type": "Object3D",
+                  "position": [42.2399, 4.5484, 34.6468],
+                  "rotation": [0, 0, 0],
+                  "scale": [1, 1, 1]
+                }
+              ]
+            },
             {
               "name": "zone1_residence",
               "type": "Object3D",

scripts/transformMap.cjs

@@ -105,6 +105,16 @@ function addRenderable(parent, objectNode, meshNode) {
   getOrCreateModelGroup(parent, renderable.name).children.push(renderable);
 }
 
+function addStandaloneObject(rawData, parent, name) {
+  const node = rawData.find(
+    (rawNode) => rawNode?.type === "Object3D" && rawNode.name === name,
+  );
+
+  if (!node) return;
+
+  getOrCreateModelGroup(parent, name).children.push(cloneNode(node));
+}
+
 function addObjectsByRange(rawData, parent, start, end, allowedNames) {
   let currentObject = null;
 
@@ -279,6 +289,7 @@ function transformMap() {
   agriculture.children.push(champs, ferme);
 
   addObjectsByRange(rawData, direction, 6, 12, DIRECTION_MESH_NAMES);
+  addStandaloneObject(rawData, residence, "ebike");
   createResidenceZones(rawData, residence);
   addObjectsByRange(rawData, energie, 61, 96, new Set(["pyloneelectrique"]));
   addObjectsByRange(rawData, vegetation, 98, 829, VEGETATION_MESH_NAMES);

src/data/gameplay/repairMissionAnchors.ts

@@ -0,0 +1,5 @@
+import type { Vector3Tuple } from "@/types/three/three";
+
+export const EBIKE_REPAIR_POSITION = [
+  42.2399, 4.5484, 34.6468,
+] as const satisfies Vector3Tuple;

src/managers/stores/useGameStore.ts

@@ -124,7 +124,7 @@ function completeIntroState(state: GameState): GameStateUpdate {
     },
     bike: {
       ...state.bike,
-      currentStep: "waiting",
+      currentStep: "locked",
     },
   };
 }

src/world/GameMap.tsx

@@ -19,6 +19,7 @@ import {
   isMapModelVisible,
   useMapPerformanceStore,
 } from "@/managers/stores/useMapPerformanceStore";
+import { useGameStore } from "@/managers/stores/useGameStore";
 import { GameMapCollision } from "@/world/GameMapCollision";
 import { CloudSystem } from "@/world/clouds/CloudSystem";
 import { GeneratedMapNodeInstance } from "@/world/map-generated/GeneratedMapNodeInstance";
@@ -302,8 +303,12 @@ function MapNodeInstance({
   node: MapNode;
   modelUrl: string | null;
   onSettled: () => void;
-}): React.JSX.Element {
+}): React.JSX.Element | null {
   const isGeneratedModel = isGeneratedMapModelName(node.name);
+  const mainState = useGameStore((state) => state.mainState);
+  const bikeStep = useGameStore((state) => state.bike.currentStep);
+  const hideEbikeMapModel =
+    node.name === "ebike" && mainState === "bike" && bikeStep !== "locked";
 
   useEffect(() => {
     if (modelUrl !== null || isGeneratedModel) return;
@@ -311,6 +316,16 @@ function MapNodeInstance({
     onSettled();
   }, [isGeneratedModel, modelUrl, onSettled]);
 
+  useEffect(() => {
+    if (!hideEbikeMapModel) return;
+
+    onSettled();
+  }, [hideEbikeMapModel, onSettled]);
+
+  if (hideEbikeMapModel) {
+    return null;
+  }
+
   if (isGeneratedModel) {
     return (
       <Suspense fallback={<FallbackMapNode node={node} />}>

src/world/GameStageContent.tsx

@@ -1,4 +1,6 @@
+import { InteractableObject } from "@/components/three/interaction/InteractableObject";
 import { RepairGame } from "@/components/three/gameplay/RepairGame";
+import { EBIKE_REPAIR_POSITION } from "@/data/gameplay/repairMissionAnchors";
 import { useGameStore } from "@/managers/stores/useGameStore";
 import type { RepairMissionId } from "@/types/gameplay/repairMission";
 import type { Vector3Tuple } from "@/types/three/three";
@@ -17,7 +19,7 @@ interface GameRepairZone {
 const GAME_REPAIR_ZONES = [
   {
     mission: "bike",
-    position: [8, 0, -6],
+    position: EBIKE_REPAIR_POSITION,
   },
   {
     mission: "pylone",
@@ -48,6 +50,31 @@ function StageAnchor({
   );
 }
 
+function EbikeMissionTrigger(): React.JSX.Element | null {
+  const mainState = useGameStore((state) => state.mainState);
+  const bikeStep = useGameStore((state) => state.bike.currentStep);
+  const setMissionStep = useGameStore((state) => state.setMissionStep);
+
+  if (mainState !== "bike" || bikeStep !== "locked") return null;
+
+  return (
+    <group position={EBIKE_REPAIR_POSITION}>
+      <InteractableObject
+        kind="trigger"
+        label="Réparer l'e-bike"
+        position={EBIKE_REPAIR_POSITION}
+        radius={4}
+        onPress={() => setMissionStep("bike", "waiting")}
+      >
+        <mesh>
+          <sphereGeometry args={[1.3, 16, 16]} />
+          <meshBasicMaterial transparent opacity={0} depthWrite={false} />
+        </mesh>
+      </InteractableObject>
+    </group>
+  );
+}
+
 export function GameStageContent(): React.JSX.Element {
   const mainState = useGameStore((state) => state.mainState);
 
@@ -63,6 +90,7 @@ export function GameStageContent(): React.JSX.Element {
           position={zone.position}
         />
       ))}
+      <EbikeMissionTrigger />
       {mainState === "outro" ? (
         <StageAnchor color="#fb7185" position={[0, 6, 10]} scale={1.25} />
       ) : null}