From f86a89590023c281602ea33dacf81ed59a293fd8 Mon Sep 17 00:00:00 2001 From: Daan Vanden Bosch Date: Thu, 25 Jul 2019 22:43:27 +0200 Subject: [PATCH] Made most simple quest properties editable. --- src/data_formats/parsing/quest/index.test.ts | 14 +-- src/domain/index.ts | 92 +++++++++++++++---- src/scripting/assembler_messages.ts | 4 +- src/ui/quest_editor/EntityInfoComponent.less | 2 +- src/ui/quest_editor/EntityInfoComponent.tsx | 2 +- ...oComponent.css => QuestInfoComponent.less} | 14 +-- src/ui/quest_editor/QuestInfoComponent.tsx | 91 +++++++++++++++--- 7 files changed, 170 insertions(+), 49 deletions(-) rename src/ui/quest_editor/{QuestInfoComponent.css => QuestInfoComponent.less} (59%) diff --git a/src/data_formats/parsing/quest/index.test.ts b/src/data_formats/parsing/quest/index.test.ts index 3f26c41b..c221a84a 100644 --- a/src/data_formats/parsing/quest/index.test.ts +++ b/src/data_formats/parsing/quest/index.test.ts @@ -1,10 +1,10 @@ -import { ObjectType, Quest } from "../../../domain"; -import { parse_quest, write_quest_qst } from "../quest"; -import { Endianness } from "../.."; -import { BufferCursor } from "../../cursor/BufferCursor"; -import { ArrayBufferCursor } from "../../cursor/ArrayBufferCursor"; -import { walk_qst_files } from "../../../../test/src/utils"; import { readFileSync } from "fs"; +import { Endianness } from "../.."; +import { walk_qst_files } from "../../../../test/src/utils"; +import { ObjectType, Quest } from "../../../domain"; +import { ArrayBufferCursor } from "../../cursor/ArrayBufferCursor"; +import { BufferCursor } from "../../cursor/BufferCursor"; +import { parse_quest, write_quest_qst } from "../quest"; test("parse Towards the Future", () => { const buffer = readFileSync("test/resources/quest118_e.qst"); @@ -49,7 +49,7 @@ if (process.env["RUN_ALL_TESTS"] === "true") { roundtrip_test(path, file_name, buffer); } -function roundtrip_test(path: string, file_name: string, contents: Buffer) { +function roundtrip_test(path: string, file_name: string, contents: Buffer): void { test(`parse_quest and write_quest_qst ${path}`, () => { const orig_quest = parse_quest(new BufferCursor(contents, Endianness.Little))!; const test_bin = write_quest_qst(orig_quest, file_name); diff --git a/src/domain/index.ts b/src/domain/index.ts index 52cb5251..42d0a8cf 100644 --- a/src/domain/index.ts +++ b/src/domain/index.ts @@ -29,7 +29,7 @@ export enum Episode { export const Episodes: Episode[] = enum_values(Episode); export function check_episode(episode: Episode): void { - if (!Episode[episode]) { + if (Episode[episode] == undefined) { throw new Error(`Invalid episode ${episode}.`); } } @@ -80,15 +80,74 @@ export class Section { } export class Quest { - @observable id: number; - @observable language: number; - @observable name: string; - @observable short_description: string; - @observable long_description: string; - @observable episode: Episode; - @observable area_variants: AreaVariant[]; - @observable objects: QuestObject[]; - @observable npcs: QuestNpc[]; + @observable private _id!: number; + + get id(): number { + return this._id; + } + + @action + set_id(id: number): void { + if (!Number.isInteger(id) || id < 0 || id > 4294967295) + throw new Error("id must be an integer greater than 0 and less than 4294967295."); + this._id = id; + } + + @observable private _language!: number; + + get language(): number { + return this._language; + } + + @action + set_language(language: number): void { + if (!Number.isInteger(language)) throw new Error("language must be an integer."); + this._language = language; + } + + @observable private _name!: string; + + get name(): string { + return this._name; + } + + @action + set_name(name: string): void { + if (name.length > 32) throw new Error("name can't be longer than 32 characters."); + this._name = name; + } + + @observable private _short_description!: string; + + get short_description(): string { + return this._short_description; + } + + @action + set_short_description(short_description: string): void { + if (short_description.length > 128) + throw new Error("short_description can't be longer than 128 characters."); + this._short_description = short_description; + } + + @observable _long_description!: string; + + get long_description(): string { + return this._long_description; + } + + @action + set_long_description(long_description: string): void { + if (long_description.length > 288) + throw new Error("long_description can't be longer than 288 characters."); + this._long_description = long_description; + } + + readonly episode: Episode; + + @observable readonly area_variants: AreaVariant[]; + @observable readonly objects: QuestObject[]; + @observable readonly npcs: QuestNpc[]; /** * (Partial) raw DAT data that can't be parsed yet by Phantasmal. */ @@ -112,9 +171,6 @@ export class Quest { instructions: Instruction[], shop_items: number[] ) { - if (!Number.isInteger(id) || id < 0) - throw new Error("id should be a non-negative integer."); - if (!Number.isInteger(language)) throw new Error("language should be an integer."); check_episode(episode); if (!area_variants) throw new Error("area_variants is required."); if (!objects || !(objects instanceof Array)) throw new Error("objs is required."); @@ -124,11 +180,11 @@ export class Quest { if (!instructions) throw new Error("instructions is required."); if (!shop_items) throw new Error("shop_items is required."); - this.id = id; - this.language = language; - this.name = name; - this.short_description = short_description; - this.long_description = long_description; + this.set_id(id); + this.set_language(language); + this.set_name(name); + this.set_short_description(short_description); + this.set_long_description(long_description); this.episode = episode; this.area_variants = area_variants; this.objects = objects; diff --git a/src/scripting/assembler_messages.ts b/src/scripting/assembler_messages.ts index 713833e4..6f103737 100644 --- a/src/scripting/assembler_messages.ts +++ b/src/scripting/assembler_messages.ts @@ -1,6 +1,6 @@ import { editor } from "monaco-editor"; -import { AssemblyError } from "./assembly"; import { Instruction } from "../data_formats/parsing/quest/bin"; +import { AssemblyError } from "./assembly"; export type ScriptWorkerInput = NewAssemblyInput | AssemblyChangeInput; @@ -19,6 +19,6 @@ export type ScriptWorkerOutput = NewErrorsOutput; export type NewErrorsOutput = { readonly type: "new_errors_output"; readonly instructions: Instruction[]; - readonly labels: Map; + readonly labels: Map; readonly errors: AssemblyError[]; }; diff --git a/src/ui/quest_editor/EntityInfoComponent.less b/src/ui/quest_editor/EntityInfoComponent.less index 7aed540d..d50caa73 100644 --- a/src/ui/quest_editor/EntityInfoComponent.less +++ b/src/ui/quest_editor/EntityInfoComponent.less @@ -1,4 +1,4 @@ -.qe-EntityInfoComponent-container { +.qe-EntityInfoComponent { width: 100%; height: 100%; padding: 2px 10px 10px 10px; diff --git a/src/ui/quest_editor/EntityInfoComponent.tsx b/src/ui/quest_editor/EntityInfoComponent.tsx index c2f7c9b3..34afdef2 100644 --- a/src/ui/quest_editor/EntityInfoComponent.tsx +++ b/src/ui/quest_editor/EntityInfoComponent.tsx @@ -48,7 +48,7 @@ export class EntityInfoComponent extends Component { } return ( -
+
{body}
); diff --git a/src/ui/quest_editor/QuestInfoComponent.css b/src/ui/quest_editor/QuestInfoComponent.less similarity index 59% rename from src/ui/quest_editor/QuestInfoComponent.css rename to src/ui/quest_editor/QuestInfoComponent.less index c96931d9..aacf4bcc 100644 --- a/src/ui/quest_editor/QuestInfoComponent.css +++ b/src/ui/quest_editor/QuestInfoComponent.less @@ -4,6 +4,7 @@ padding: 2px 10px 10px 10px; display: flex; flex-direction: column; + overflow: auto; } .qe-QuestInfoComponent table { @@ -11,17 +12,12 @@ width: 100%; } -.qe-QuestInfoComponent table tbody th { - text-align: right; - padding-right: 5px; -} - -.qe-QuestInfoComponent pre { - padding: 8px; - border: solid 1px hsl(200, 10%, 30%); - margin: 4px 0; +.qe-QuestInfoComponent textarea { + font-family: 'Courier New', Courier, monospace } .qe-QuestInfoComponent-npc-counts-container { overflow: auto; + min-height: 50px; + margin-top: 5px; } \ No newline at end of file diff --git a/src/ui/quest_editor/QuestInfoComponent.tsx b/src/ui/quest_editor/QuestInfoComponent.tsx index 62b70246..522afdc3 100644 --- a/src/ui/quest_editor/QuestInfoComponent.tsx +++ b/src/ui/quest_editor/QuestInfoComponent.tsx @@ -1,9 +1,10 @@ +import { Input, InputNumber } from "antd"; import { observer } from "mobx-react"; -import React, { Component, ReactNode } from "react"; -import { NpcType } from "../../domain"; +import React, { ChangeEvent, Component, ReactNode } from "react"; +import { Episode, NpcType } from "../../domain"; import { quest_editor_store } from "../../stores/QuestEditorStore"; -import "./QuestInfoComponent.css"; import { DisabledTextComponent } from "../DisabledTextComponent"; +import "./QuestInfoComponent.less"; @observer export class QuestInfoComponent extends Component { @@ -12,7 +13,8 @@ export class QuestInfoComponent extends Component { let body: ReactNode; if (quest) { - const episode = quest.episode === 4 ? "IV" : quest.episode === 2 ? "II" : "I"; + const episode = + quest.episode === Episode.IV ? "IV" : quest.episode === Episode.II ? "II" : "I"; const npc_counts = new Map(); for (const npc of quest.npcs) { @@ -39,22 +41,57 @@ export class QuestInfoComponent extends Component { <> - - - - - + + + + + + + + + + + + + + @@ -81,4 +118,36 @@ export class QuestInfoComponent extends Component { ); } + + private id_changed(value?: number): void { + const quest = quest_editor_store.current_quest; + + if (quest && value != undefined) { + quest.set_id(value); + } + } + + private name_changed(e: ChangeEvent): void { + const quest = quest_editor_store.current_quest; + + if (quest) { + quest.set_name(e.target.value); + } + } + + private short_description_changed(e: ChangeEvent): void { + const quest = quest_editor_store.current_quest; + + if (quest) { + quest.set_short_description(e.target.value); + } + } + + private long_description_changed(e: ChangeEvent): void { + const quest = quest_editor_store.current_quest; + + if (quest) { + quest.set_long_description(e.target.value); + } + } }
Name:{quest.name}
Episode: {episode}
- 
{quest.short_description}
+ 		ID: +
Name: + +
Short description:
- 
{quest.long_description}
+ +
Long description:
+