#345 Started work adding a npc created event so people don't have to …

…refresh their page all the time to fetch the latest npcs.

app/Events/NpcAddedEvent.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Events;
+
+class NpcAddedEvent extends ContextEvent
+{
+    public function broadcastAs()
+    {
+        return 'npc-added';
+    }
+
+    public function broadcastWith()
+    {
+        return array_merge(
+            parent::broadcastWith(),
+            [
+                'color' => $this->_user->echo_color
+            ]
+        );
+    }
+}

resources/assets/js/custom/models/enemy.js

@@ -111,13 +111,13 @@ class Enemy extends MapObject {
 
         let self = this;
         let selectNpcs = [];
-        let npcs = this.map.options.npcs;
+        let npcs = getState().getRawNpcs();
         for (let index in npcs) {
             if (npcs.hasOwnProperty(index)) {
                 let npc = npcs[index];
                 selectNpcs.push({
                     id: npc.id,
-                    name: npc.name + ' (' + npc.id + ')'
+                    name: `${npc.name} (${npc.id})`
                 });
             }
         }

resources/assets/js/custom/statemanager.js

@@ -32,6 +32,7 @@ class StateManager extends Signalable {
         this.mapIconTypes = [];
         this.classColors = [];
         this.enemies = [];
+        this.rawNpcs = [];
         this.rawEnemies = [];
         this.mdtEnemies = [];
         this.factions = [];
@@ -179,6 +180,14 @@ class StateManager extends Signalable {
         this.enemies = enemies;
     }
 
+    /**
+     * Sets the raw NPCs for the state.
+     * @param rawNpcs {Object[]}
+     */
+    setRawNpcs(rawNpcs) {
+        this.rawNpcs = rawNpcs;
+    }
+
     /**
      * Sets the raw enemies (not converted to Enemy classes yet; pure objects)
      * @param rawEnemies
@@ -477,6 +486,15 @@ class StateManager extends Signalable {
         return enemy;
     }
 
+    /**
+     * Get all the raw npcs of this dungeon.
+     * @returns {[]}
+     */
+    getRawNpcs() {
+        console.assert(this instanceof StateManager, 'this is not a StateManager', this);
+        return this.rawNpcs;
+    }
+
     /**
      * Get all the raw enemies of this dungeon.
      * @returns {[]}

resources/views/common/general/statemanager.blade.php

@@ -8,6 +8,7 @@
     _stateManager.setDungeonData({!! $dungeonData !!});
     _stateManager.setMapIconTypes({!! $mapIconTypes !!});
     _stateManager.setClassColors({!! $classColors !!});
+    _stateManager.setRawNpcs({!! $npcs !!});
     _stateManager.setRawEnemies({!! $enemies !!});
     _stateManager.setRaidMarkers({!! $raidMarkers !!});
     _stateManager.setFactions({!! $factions !!});

resources/views/common/maps/map.blade.php

@@ -42,16 +42,15 @@
 $floorId = isset($floorId) ? $floorId : $dungeon->floors->first()->id;
 // Show the attribution
 $showAttribution = isset($showAttribution) && !$showAttribution ? false : true;
+// Build options for displayed NPCs
+$npcOptions = new \Illuminate\Support\Collection();
+foreach ($npcs as $npc) {
+    $npcOptions->push(['id' => $npc->id, 'name' => $npc->name, 'dungeon_id' => $npc->dungeon_id]);
+}
 
 // Additional options to pass to the map when we're in an admin environment
 $adminOptions = [];
 if ($isAdmin) {
-    // Build options for displayed NPCs
-    $npcOptions = [];
-    foreach ($npcs as $npc) {
-        $npcOptions[] = ['id' => $npc->id, 'name' => $npc->name, 'dungeon_id' => $npc->dungeon_id];
-    }
-
     $adminOptions = [
         // Display options for changing Teeming status for map objects
         'teemingOptions' => [
@@ -64,9 +63,7 @@
             ['key' => 'any', 'description' => __('Any')],
             ['key' => 'alliance', 'description' => __('Alliance')],
             ['key' => 'horde', 'description' => __('Horde')],
-        ],
-        // Display options for changing the NPC of an enemy
-        'npcs' => $npcOptions
+        ]
     ];
 }
 ?>
@@ -103,6 +100,7 @@
         'dungeonData' => $dungeon,
         'paidTiers' => Auth::check() ? $user->getPaidTiers() : collect(),
         'userData' => $user,
+        'npcs' => $npcOptions,
         'dungeonroute' => [
             'publicKey' => $routePublicKey,
             'faction' => $routeFaction,