NPCs in the NPC list are now filtered according to the selected area. Objects can now be added via drag and drop from the object list.

src/core/data_formats/parsing/quest/areas.ts

@@ -27,7 +27,7 @@ export function get_area_variant(
     const variant = area.area_variants[variant_id];
     if (!variant) throw new Error(`No area variant with id ${variant_id}.`);
 
-    return variant;
+    return Object.freeze(variant);
 }
 
 const AREAS: { [episode: number]: Area[] } = [];
@@ -39,7 +39,7 @@ function create_area(id: number, name: string, order: number, variants: number):
         area.area_variants.push({ id, area });
     }
 
-    return area;
+    return Object.freeze(area);
 }
 
 // The IDs match the PSO IDs for areas.

src/quest_editor/gui/EntityListView.css

@@ -8,6 +8,7 @@
     grid-column-gap: 6px;
     grid-row-gap: 6px;
     justify-content: center;
+    margin: 6px;
 }
 
 .quest_editor_EntityListView_entity {

src/quest_editor/gui/EntityListView.ts

@@ -2,14 +2,17 @@ import { ResizableWidget } from "../../core/gui/ResizableWidget";
 import { bind_children_to, el } from "../../core/gui/dom";
 import "./EntityListView.css";
 import { entity_data, EntityType } from "../../core/data_formats/parsing/quest/entities";
-import { ListProperty } from "../../core/observable/property/list/ListProperty";
 import { entity_dnd_source } from "./entity_dnd";
 import { render_entity_to_image } from "../rendering/render_entity_to_image";
+import { WritableListProperty } from "../../core/observable/property/list/WritableListProperty";
+import { list_property } from "../../core/observable";
 
 export abstract class EntityListView<T extends EntityType> extends ResizableWidget {
     readonly element: HTMLElement;
 
-    protected constructor(private readonly class_name: string, entities: ListProperty<T>) {
+    protected readonly entities: WritableListProperty<T> = list_property();
+
+    protected constructor(class_name: string) {
         super();
 
         const list_element = el.div({ class: "quest_editor_EntityListView_entity_list" });
@@ -17,7 +20,7 @@ export abstract class EntityListView<T extends EntityType> extends ResizableWidg
         this.element = el.div({ class: `${class_name} quest_editor_EntityListView` }, list_element);
 
         this.disposables(
-            bind_children_to(list_element, entities, this.create_entity_element),
+            bind_children_to(list_element, this.entities, this.create_entity_element),
 
             entity_dnd_source(list_element, target => {
                 let element: HTMLElement | null = target;
@@ -28,7 +31,7 @@ export abstract class EntityListView<T extends EntityType> extends ResizableWidg
                     if (index != undefined) {
                         return [
                             element.querySelector("img")!.cloneNode(true) as HTMLElement,
-                            entities.get(parseInt(index, 10)),
+                            this.entities.get(parseInt(index, 10)),
                         ];
                     }
 

src/quest_editor/gui/NpcListView.ts

@@ -1,11 +1,34 @@
 import { EntityListView } from "./EntityListView";
-import { NPC_TYPES, NpcType } from "../../core/data_formats/parsing/quest/npc_types";
+import { npc_data, NPC_TYPES, NpcType } from "../../core/data_formats/parsing/quest/npc_types";
-import { list_property } from "../../core/observable";
+import { quest_editor_store } from "../stores/QuestEditorStore";
+import { Episode } from "../../core/data_formats/parsing/quest/Episode";
 
 export class NpcListView extends EntityListView<NpcType> {
     constructor() {
-        super("quest_editor_NpcListView", list_property(undefined, ...NPC_TYPES));
+        super("quest_editor_NpcListView");
 
+        this.disposables(
+            quest_editor_store.current_quest.observe(this.filter_npcs),
+            quest_editor_store.current_area.observe(this.filter_npcs),
+        );
+
+        this.filter_npcs();
         this.finalize_construction(NpcListView.prototype);
     }
+
+    private filter_npcs = (): void => {
+        const quest = quest_editor_store.current_quest.val;
+        const area = quest_editor_store.current_area.val;
+
+        const episode = quest ? quest.episode : Episode.I;
+        const area_id = area ? area.id : 0;
+
+        this.entities.val = NPC_TYPES.filter(npc => {
+            const data = npc_data(npc);
+            return (
+                (data.episode == undefined || data.episode === episode) &&
+                data.area_ids.includes(area_id)
+            );
+        });
+    };
 }

src/quest_editor/gui/ObjectListView.ts

@@ -0,0 +1,12 @@
+import { EntityListView } from "./EntityListView";
+import { OBJECT_TYPES, ObjectType } from "../../core/data_formats/parsing/quest/object_types";
+
+export class ObjectListView extends EntityListView<ObjectType> {
+    constructor() {
+        super("quest_editor_ObjectListView");
+
+        this.entities.val = OBJECT_TYPES;
+
+        this.finalize_construction(ObjectListView.prototype);
+    }
+}

src/quest_editor/gui/QuestEditorView.ts

@@ -13,6 +13,7 @@ import { EntityInfoView } from "./EntityInfoView";
 import { gui_store, GuiTool } from "../../core/stores/GuiStore";
 import { quest_editor_store } from "../stores/QuestEditorStore";
 import { NpcListView } from "./NpcListView";
+import { ObjectListView } from "./ObjectListView";
 import Logger = require("js-logger");
 
 const logger = Logger.get("quest_editor/gui/QuestEditorView");
@@ -25,6 +26,7 @@ const VIEW_TO_NAME = new Map<new () => ResizableWidget, string>([
     [AsmEditorView, "asm_editor"],
     [EntityInfoView, "entity_info"],
     [NpcListView, "npc_list_view"],
+    [ObjectListView, "object_list_view"],
 ]);
 
 const DEFAULT_LAYOUT_CONFIG = {
@@ -99,6 +101,12 @@ const DEFAULT_LAYOUT_CONTENT: ItemConfigType[] = [
                         componentName: VIEW_TO_NAME.get(NpcListView),
                         isClosable: false,
                     },
+                    {
+                        title: "Objects",
+                        type: "component",
+                        componentName: VIEW_TO_NAME.get(ObjectListView),
+                        isClosable: false,
+                    },
                 ],
             },
         ],

src/quest_editor/rendering/QuestEntityControls.ts

@@ -17,6 +17,7 @@ import {
     remove_entity_dnd_listener,
 } from "../gui/entity_dnd";
 import { vec3_to_threejs } from "../../core/rendering/conversion";
+import { QuestObjectModel } from "../model/QuestObjectModel";
 
 const UP_VECTOR = Object.freeze(new Vector3(0, 1, 0));
 const DOWN_VECTOR = Object.freeze(new Vector3(0, -1, 0));
@@ -198,18 +199,14 @@ export class QuestEntityControls implements Disposable {
 
         if (!area || !quest) return;
 
+        let entity: QuestEntityModel;
+
         if (is_npc_type(e.entity_type)) {
             const data = npc_data(e.entity_type);
 
             if (data.pso_type_id == undefined || data.pso_roaming == undefined) return;
 
-            e.drag_element.style.display = "none";
+            entity = new QuestNpcModel(
-
-            if (e.event.dataTransfer) {
-                e.event.dataTransfer.dropEffect = "copy";
-            }
-
-            const npc = new QuestNpcModel(
                 e.entity_type,
                 data.pso_type_id,
                 0,
@@ -223,21 +220,42 @@ export class QuestEntityControls implements Disposable {
                 // TODO: do the following values make sense?
                 [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0]],
             );
-            const grab_offset = new Vector3(0, 0, 0);
+        } else {
-            const drag_adjust = new Vector3(0, 0, 0);
+            entity = new QuestObjectModel(
-            this.translate_entity_horizontally(npc, grab_offset, drag_adjust);
+                e.entity_type,
-            quest.add_npc(npc);
+                0,
-
+                0,
-            quest_editor_store.set_selected_entity(npc);
+                area.id,
-
+                0,
-            this.pick = {
+                new Vec3(0, 0, 0),
-                mode: PickMode.Creating,
+                new Vec3(0, 0, 0),
-                initial_section: npc.section.val,
+                // TODO: which default properties?
-                initial_position: npc.world_position.val,
+                new Map(),
-                grab_offset,
+                // TODO: do the following values make sense?
-                drag_adjust,
+                [[0, 0, 0, 0, 0, 0], [0, 0]],
-            };
+            );
         }
+
+        e.drag_element.style.display = "none";
+
+        if (e.event.dataTransfer) {
+            e.event.dataTransfer.dropEffect = "copy";
+        }
+
+        const grab_offset = new Vector3(0, 0, 0);
+        const drag_adjust = new Vector3(0, 0, 0);
+        this.translate_entity_horizontally(entity, grab_offset, drag_adjust);
+        quest.add_entity(entity);
+
+        quest_editor_store.set_selected_entity(entity);
+
+        this.pick = {
+            mode: PickMode.Creating,
+            initial_section: entity.section.val,
+            initial_position: entity.world_position.val,
+            grab_offset,
+            drag_adjust,
+        };
     };
 
     private dragover = (e: EntityDragEvent) => {