Merge pull request #884 from NithikaVivek/main

Revert Npc.js, initial friendly Npc

Author: jm1021

assets/js/GameEnginev1.1/GameLevelCssePath.js

@@ -1,10 +1,11 @@
 // Imports: Level objects and UI helpers.
 import GamEnvBackground from './essentials/GameEnvBackground.js';
 import Player from './essentials/Player.js';
-import Npc from './essentials/Npc.js';
 import StatusPanel from './essentials/StatusPanel.js';
 import FormPanel from './essentials/FormPanel.js';
 import Picker from './essentials/Picker.js';
+import Npc from './essentials/Npc.js';
+import FriendlyNpc from './essentials/FriendlyNpc.js';
 import DialogueSystem from './essentials/DialogueSystem.js';
 import ProfileManager from '../pages/home-gamified/ProfileManager.js';
 
@@ -163,7 +164,13 @@ class GameLevelCssePath {
       greeting,
       INIT_POSITION: { ...position },
       interactDistance: interactDistance || 120,
-      ...(reaction ? { reaction } : {}),
+      reaction: function () {
+        if (reaction) reaction.call(this);
+        if (level?.showToast) {
+          level.showToast("Press E to interact");
+        }
+      },
+
       ...(interact ? { interact } : {}),
     });
 
@@ -1068,13 +1075,14 @@ class GameLevelCssePath {
      */
 
     // Objects: Build level class list.
+
     this.classes = [
       { class: GamEnvBackground, data: bg_data },
       { class: Player,           data: player_data },
-      { class: Npc,              data: npc_data_startGatekeeper },
-      { class: Npc,              data: npc_data_identityGatekeeper },
-      { class: Npc,              data: npc_data_avatarGatekeeper },
-      { class: Npc,              data: npc_data_worldThemeGatekeeper },
+      { class: FriendlyNpc,      data: npc_data_startGatekeeper },
+      { class: FriendlyNpc,      data: npc_data_identityGatekeeper },
+      { class: FriendlyNpc,      data: npc_data_avatarGatekeeper },
+      { class: FriendlyNpc,      data: npc_data_worldThemeGatekeeper },
     ];
   }
 }

assets/js/GameEnginev1.1/essentials/FriendlyNpc.js

@@ -0,0 +1,44 @@
+import Npc from "./Npc.js";
+
+class FriendlyNpc extends Npc {
+    constructor(data = {}, gameEnv = null) {
+        super(data, gameEnv);
+
+        // NEW properties
+        this.interactDistance = data.interactDistance || 120;
+        this.hasAlerted = false;
+    }
+
+    update() {
+        super.update();
+
+        const player = this.gameEnv.gameObjects.find(obj => obj.constructor.name === "Player");
+        if (!player) return;
+
+        const dx = player.position.x - this.position.x;
+        const dy = player.position.y - this.position.y;
+        const distance = Math.sqrt(dx * dx + dy * dy);
+
+        if (distance < this.interactDistance && !this.hasAlerted) {
+            this.hasAlerted = true;
+
+            if (this.gameEnv?.currentLevel?.showToast) {
+                this.gameEnv.currentLevel.showToast(
+                    this.spriteData?.greeting || "Hey there!"
+                );
+            }
+
+            // OPTIONAL: trigger reaction automatically
+            if (this.reaction) {
+                this.reaction();
+            }
+        }
+
+        // Reset when player walks away
+        if (distance >= this.interactDistance) {
+            this.hasAlerted = false;
+        }
+    }
+}
+
+export default FriendlyNpc;

assets/js/GameEnginev1.1/essentials/Npc.js

@@ -56,53 +56,16 @@ class Npc extends Character {
             this.patrol();
         }
         this.draw();
-
-        const nearPlayer = this.canInteractWithPlayer();
-        if (!nearPlayer && this.isInteracting) {
+        // Check if player is still in collision - add null checks
+        const players = this.gameEnv.gameObjects.filter(
+            obj => obj && obj.state && obj.state.collisionEvents && obj.state.collisionEvents.includes(this.spriteData.id)
+        );
+        // Reset interaction state if player moved away
+        if (players.length === 0 && this.isInteracting) {
             this.isInteracting = false;
         }
     }
 
-    findPlayer() {
-        return this.gameEnv?.gameObjects?.find(obj => obj && obj.constructor && obj.constructor.name === 'Player');
-    }
-
-    canInteractWithPlayer(interactDistance = 96) {
-        const player = this.findPlayer();
-        if (!player) return false;
-        const distance = this.spriteData?.interactDistance || interactDistance;
-        return this.isNear(player, distance);
-    }
-
-    isNearestNpcToPlayer() {
-        const player = this.findPlayer();
-        if (!player) return false;
-
-        const myDist = Math.hypot(
-            (this.position.x + this.width / 2) - (player.position.x + player.width / 2),
-            (this.position.y + this.height / 2) - (player.position.y + player.height / 2)
-        );
-
-        const allNpcs = this.gameEnv.gameObjects.filter(
-            obj => obj instanceof Npc && obj !== this && obj.canInteractWithPlayer()
-        );
-
-        // If no other NPCs are in range, we're automatically nearest
-        if (allNpcs.length === 0) return true;
-
-        return allNpcs.every(other => {
-            const otherDist = Math.hypot(
-                (other.position.x + other.width / 2) - (player.position.x + player.width / 2),
-                (other.position.y + other.height / 2) - (player.position.y + player.height / 2)
-            );
-            return myDist <= otherDist;
-        });
-    }
-
-    handleClick(event) {
-        this.handleKeyInteract();
-    }
-
     /**
      * General patrol movement within defined walking area (bouncing behavior)
      */
@@ -195,13 +158,12 @@ class Npc extends Character {
             obj => obj && obj.state && obj.state.collisionEvents && obj.state.collisionEvents.includes(this.spriteData.id)
         );
         const hasInteract = this.interact !== undefined;
-        const nearPlayer = this.canInteractWithPlayer();
 
         // Only trigger interaction if:
-        // 1. Player is near this NPC (distance-based) or colliding with it
+        // 1. Player is in collision with this NPC
         // 2. NPC has an interact function
         // 3. Not already interacting
-        if ((nearPlayer || players.length > 0) && hasInteract && !this.isInteracting) {
+        if (players.length > 0 && hasInteract && !this.isInteracting) {
             this.isInteracting = true;
 
             // Store a reference to this NPC's interact function