From 7e5e34d770ed3563957df33299d65a37f3de997a Mon Sep 17 00:00:00 2001 From: Daan Vanden Bosch Date: Sat, 20 Jul 2019 21:18:09 +0200 Subject: [PATCH] New quests can now be created. The created quests don't have initialization code yet. --- src/data_formats/cursor/ArrayBufferCursor.ts | 5 +- .../cursor/ResizableBufferCursor.ts | 4 +- .../cursor/WritableArrayBufferCursor.ts | 48 +- src/data_formats/cursor/WritableCursor.ts | 16 + .../cursor/WritableResizableBufferCursor.ts | 48 +- src/data_formats/cursor/index.ts | 8 +- src/data_formats/parsing/quest/bin.test.ts | 28 +- src/data_formats/parsing/quest/bin.ts | 66 +- src/data_formats/parsing/quest/dat.ts | 59 +- src/data_formats/parsing/quest/index.test.ts | 3 +- src/data_formats/parsing/quest/index.ts | 89 ++- src/domain/index.ts | 79 ++- src/stores/QuestEditorStore.ts | 125 ++-- src/stores/quest_creation.ts | 643 ++++++++++++++++++ src/ui/quest_editor/QuestEditorComponent.css | 9 - src/ui/quest_editor/QuestEditorComponent.tsx | 176 +---- src/ui/quest_editor/Toolbar.less | 8 + src/ui/quest_editor/Toolbar.tsx | 139 ++++ src/undo.ts | 13 +- test/resources/quest118_e.bin | Bin 17344 -> 17511 bytes 20 files changed, 1201 insertions(+), 365 deletions(-) create mode 100644 src/stores/quest_creation.ts create mode 100644 src/ui/quest_editor/Toolbar.less create mode 100644 src/ui/quest_editor/Toolbar.tsx diff --git a/src/data_formats/cursor/ArrayBufferCursor.ts b/src/data_formats/cursor/ArrayBufferCursor.ts index d75d85de..91b3ad6d 100644 --- a/src/data_formats/cursor/ArrayBufferCursor.ts +++ b/src/data_formats/cursor/ArrayBufferCursor.ts @@ -49,9 +49,8 @@ export class ArrayBufferCursor implements Cursor { protected buffer: ArrayBuffer; protected dv: DataView; - - private utf16_decoder: TextDecoder = UTF_16BE_DECODER; - private utf16_encoder: TextEncoder = UTF_16BE_ENCODER; + protected utf16_decoder!: TextDecoder; + protected utf16_encoder!: TextEncoder; /** * @param buffer The buffer to read from. diff --git a/src/data_formats/cursor/ResizableBufferCursor.ts b/src/data_formats/cursor/ResizableBufferCursor.ts index 8283e2a8..8184c441 100644 --- a/src/data_formats/cursor/ResizableBufferCursor.ts +++ b/src/data_formats/cursor/ResizableBufferCursor.ts @@ -51,8 +51,8 @@ export class ResizableBufferCursor implements Cursor { return this.buffer.view; } - private utf16_decoder: TextDecoder = UTF_16BE_DECODER; - private utf16_encoder: TextEncoder = UTF_16BE_ENCODER; + protected utf16_decoder: TextDecoder = UTF_16BE_DECODER; + protected utf16_encoder: TextEncoder = UTF_16BE_ENCODER; /** * @param buffer The buffer to read from. diff --git a/src/data_formats/cursor/WritableArrayBufferCursor.ts b/src/data_formats/cursor/WritableArrayBufferCursor.ts index 0507a922..a2c10c2b 100644 --- a/src/data_formats/cursor/WritableArrayBufferCursor.ts +++ b/src/data_formats/cursor/WritableArrayBufferCursor.ts @@ -1,7 +1,8 @@ -import { ArrayBufferCursor } from "./ArrayBufferCursor"; -import { WritableCursor } from "./WritableCursor"; import { ASCII_ENCODER } from "."; +import { Vec2, Vec3 } from "../vector"; +import { ArrayBufferCursor } from "./ArrayBufferCursor"; import { Cursor } from "./Cursor"; +import { WritableCursor } from "./WritableCursor"; /** * A cursor for reading and writing from an array buffer or part of an array buffer. @@ -42,6 +43,21 @@ export class WritableArrayBufferCursor extends ArrayBufferCursor implements Writ return this; } + write_vec2_f32(value: Vec2): this { + this.dv.setFloat32(this.position, value.x, this.little_endian); + this.dv.setFloat32(this.position + 4, value.y, this.little_endian); + this._position += 8; + return this; + } + + write_vec3_f32(value: Vec3): this { + this.dv.setFloat32(this.position, value.x, this.little_endian); + this.dv.setFloat32(this.position + 4, value.y, this.little_endian); + this.dv.setFloat32(this.position + 8, value.z, this.little_endian); + this._position += 12; + return this; + } + write_cursor(other: Cursor): this { const size = other.size - other.position; other.copy_to_uint8_array( @@ -53,18 +69,32 @@ export class WritableArrayBufferCursor extends ArrayBufferCursor implements Writ } write_string_ascii(str: string, byte_length: number): this { + const encoded = ASCII_ENCODER.encode(str); + const encoded_length = Math.min(encoded.byteLength, byte_length); let i = 0; - for (const byte of ASCII_ENCODER.encode(str)) { - if (i < byte_length) { - this.write_u8(byte); - ++i; - } + while (i < encoded_length) { + this.write_u8(encoded[i++]); } - while (i < byte_length) { + while (i++ < byte_length) { + this.write_u8(0); + } + + return this; + } + + write_string_utf16(str: string, byte_length: number): this { + const encoded = this.utf16_encoder.encode(str); + const encoded_length = Math.min(encoded.byteLength, byte_length); + let i = 0; + + while (i < encoded_length) { + this.write_u8(encoded[i++]); + } + + while (i++ < byte_length) { this.write_u8(0); - ++i; } return this; diff --git a/src/data_formats/cursor/WritableCursor.ts b/src/data_formats/cursor/WritableCursor.ts index 94598c78..9f84ffd2 100644 --- a/src/data_formats/cursor/WritableCursor.ts +++ b/src/data_formats/cursor/WritableCursor.ts @@ -1,4 +1,5 @@ import { Cursor } from "./Cursor"; +import { Vec2, Vec3 } from "../vector"; /** * A cursor for reading and writing binary data. @@ -36,6 +37,16 @@ export interface WritableCursor extends Cursor { */ write_u8_array(array: number[]): this; + /** + * Writes two 32-bit floating point numbers and increments position by 8. + */ + write_vec2_f32(value: Vec2): this; + + /** + * Writes three 32-bit floating point numbers and increments position by 12. + */ + write_vec3_f32(value: Vec3): this; + /** * Writes the contents of the given cursor from its position to its end. Increments this cursor's and the given cursor's position by the size of the given cursor. */ @@ -45,4 +56,9 @@ export interface WritableCursor extends Cursor { * Writes byte_length characters of str. If str is shorter than byte_length, nul bytes will be inserted until byte_length bytes have been written. */ write_string_ascii(str: string, byte_length: number): this; + + /** + * Writes characters of str without writing more than byte_length bytes. If less than byte_length bytes can be written this way, nul bytes will be inserted until byte_length bytes have been written. + */ + write_string_utf16(str: string, byte_length: number): this; } diff --git a/src/data_formats/cursor/WritableResizableBufferCursor.ts b/src/data_formats/cursor/WritableResizableBufferCursor.ts index 4ede1ad0..ca637f67 100644 --- a/src/data_formats/cursor/WritableResizableBufferCursor.ts +++ b/src/data_formats/cursor/WritableResizableBufferCursor.ts @@ -2,6 +2,7 @@ import { WritableCursor } from "./WritableCursor"; import { ResizableBufferCursor } from "./ResizableBufferCursor"; import { Cursor } from "./Cursor"; import { ASCII_ENCODER } from "."; +import { Vec3, Vec2 } from "../vector"; export class WritableResizableBufferCursor extends ResizableBufferCursor implements WritableCursor { get size(): number { @@ -59,6 +60,23 @@ export class WritableResizableBufferCursor extends ResizableBufferCursor impleme return this; } + write_vec2_f32(value: Vec2): this { + this.ensure_size(8); + this.dv.setFloat32(this.position, value.x, this.little_endian); + this.dv.setFloat32(this.position + 4, value.y, this.little_endian); + this._position += 8; + return this; + } + + write_vec3_f32(value: Vec3): this { + this.ensure_size(12); + this.dv.setFloat32(this.position, value.x, this.little_endian); + this.dv.setFloat32(this.position + 4, value.y, this.little_endian); + this.dv.setFloat32(this.position + 8, value.z, this.little_endian); + this._position += 12; + return this; + } + write_cursor(other: Cursor): this { const size = other.size - other.position; this.ensure_size(size); @@ -75,18 +93,34 @@ export class WritableResizableBufferCursor extends ResizableBufferCursor impleme write_string_ascii(str: string, byte_length: number): this { this.ensure_size(byte_length); + const encoded = ASCII_ENCODER.encode(str); + const encoded_length = Math.min(encoded.byteLength, byte_length); let i = 0; - for (const byte of ASCII_ENCODER.encode(str)) { - if (i < byte_length) { - this.write_u8(byte); - ++i; - } + while (i < encoded_length) { + this.write_u8(encoded[i++]); } - while (i < byte_length) { + while (i++ < byte_length) { + this.write_u8(0); + } + + return this; + } + + write_string_utf16(str: string, byte_length: number): this { + this.ensure_size(byte_length); + + const encoded = this.utf16_encoder.encode(str); + const encoded_length = Math.min(encoded.byteLength, byte_length); + let i = 0; + + while (i < encoded_length) { + this.write_u8(encoded[i++]); + } + + while (i++ < byte_length) { this.write_u8(0); - ++i; } return this; diff --git a/src/data_formats/cursor/index.ts b/src/data_formats/cursor/index.ts index 6d4ec7f5..0b2a682d 100644 --- a/src/data_formats/cursor/index.ts +++ b/src/data_formats/cursor/index.ts @@ -6,5 +6,9 @@ export const UTF_16BE_DECODER = new TextDecoder("utf-16be"); export const UTF_16LE_DECODER = new TextDecoder("utf-16le"); export const ASCII_ENCODER = new TextEncoder("ascii"); -export const UTF_16BE_ENCODER = new TextEncoder("utf-16be"); -export const UTF_16LE_ENCODER = new TextEncoder("utf-16le"); +export const UTF_16BE_ENCODER = new TextEncoder("utf-16be", { + NONSTANDARD_allowLegacyEncoding: true, +}); +export const UTF_16LE_ENCODER = new TextEncoder("utf-16le", { + NONSTANDARD_allowLegacyEncoding: true, +}); diff --git a/src/data_formats/parsing/quest/bin.test.ts b/src/data_formats/parsing/quest/bin.test.ts index 4ae0ee94..440fcd19 100644 --- a/src/data_formats/parsing/quest/bin.test.ts +++ b/src/data_formats/parsing/quest/bin.test.ts @@ -1,29 +1,35 @@ -import * as fs from "fs"; -import * as prs from "../../compression/prs"; -import { parse_bin, write_bin } from "./bin"; +import { readFileSync } from "fs"; import { Endianness } from "../.."; -import { BufferCursor } from "../../cursor/BufferCursor"; +import * as prs from "../../compression/prs"; import { ArrayBufferCursor } from "../../cursor/ArrayBufferCursor"; +import { BufferCursor } from "../../cursor/BufferCursor"; +import { parse_bin, write_bin } from "./bin"; /** * Parse a file, convert the resulting structure to BIN again and check whether the end result is equal to the original. */ test("parse_bin and write_bin", () => { - const orig_buffer = fs.readFileSync("test/resources/quest118_e.bin"); + const orig_buffer = readFileSync("test/resources/quest118_e.bin"); const orig_bin = prs.decompress(new BufferCursor(orig_buffer, Endianness.Little)); const test_bin = new ArrayBufferCursor(write_bin(parse_bin(orig_bin)), Endianness.Little); - orig_bin.seek_start(0); + orig_bin.seek_start(0); expect(test_bin.size).toBe(orig_bin.size); - let match = true; + let matching_bytes = 0; while (orig_bin.bytes_left) { - if (test_bin.u8() !== orig_bin.u8()) { - match = false; - break; + const test_byte = test_bin.u8(); + const orig_byte = orig_bin.u8(); + + if (test_byte !== orig_byte) { + throw new Error( + `Byte ${matching_bytes} didn't match, expected ${orig_byte}, got ${test_byte}.` + ); } + + matching_bytes++; } - expect(match).toBe(true); + expect(matching_bytes).toBe(orig_bin.size); }); diff --git a/src/data_formats/parsing/quest/bin.ts b/src/data_formats/parsing/quest/bin.ts index 7a4eef37..6789fd07 100644 --- a/src/data_formats/parsing/quest/bin.ts +++ b/src/data_formats/parsing/quest/bin.ts @@ -1,9 +1,12 @@ import Logger from "js-logger"; import { Cursor } from "../../cursor/Cursor"; +import { WritableArrayBufferCursor } from "../../cursor/WritableArrayBufferCursor"; +import { Endianness } from "../.."; +import { ArrayBufferCursor } from "../../cursor/ArrayBufferCursor"; const logger = Logger.get("data_formats/parsing/quest/bin"); -export interface BinFile { +export type BinFile = { quest_id: number; language: number; quest_name: string; @@ -11,11 +14,12 @@ export interface BinFile { long_description: string; function_offsets: number[]; instructions: Instruction[]; - data: ArrayBuffer; -} + object_code: ArrayBuffer; + unknown: ArrayBuffer; +}; export function parse_bin(cursor: Cursor, lenient: boolean = false): BinFile { - const object_code_offset = cursor.u32(); + const object_code_offset = cursor.u32(); // Always 4652 const function_offset_table_offset = cursor.u32(); // Relative offsets const size = cursor.u32(); cursor.seek(4); // Always seems to be 0xFFFFFFFF @@ -29,6 +33,14 @@ export function parse_bin(cursor: Cursor, lenient: boolean = false): BinFile { logger.warn(`Value ${size} in bin size field does not match actual size ${cursor.size}.`); } + const unknown = cursor.take(object_code_offset - cursor.position).array_buffer(); + + const object_code = cursor + .seek_start(object_code_offset) + .take(function_offset_table_offset - object_code_offset); + + const instructions = parse_object_code(object_code, lenient); + const function_offset_count = Math.floor((cursor.size - function_offset_table_offset) / 4); cursor.seek_start(function_offset_table_offset); @@ -38,13 +50,6 @@ export function parse_bin(cursor: Cursor, lenient: boolean = false): BinFile { function_offsets.push(cursor.i32()); } - const instructions = parse_object_code( - cursor - .seek_start(object_code_offset) - .take(function_offset_table_offset - object_code_offset), - lenient - ); - return { quest_id, language, @@ -53,20 +58,49 @@ export function parse_bin(cursor: Cursor, lenient: boolean = false): BinFile { long_description, function_offsets, instructions, - data: cursor.seek_start(0).array_buffer(), + object_code: object_code.seek_start(0).array_buffer(), + unknown, }; } -export function write_bin({ data }: { data: ArrayBuffer }): ArrayBuffer { - return data; +export function write_bin(bin: BinFile): ArrayBuffer { + const object_code_offset = 4652; + const buffer = new ArrayBuffer( + object_code_offset + bin.object_code.byteLength + 4 * bin.function_offsets.length + ); + const cursor = new WritableArrayBufferCursor(buffer, Endianness.Little); + + cursor.write_u32(object_code_offset); + cursor.write_u32(object_code_offset + bin.object_code.byteLength); + cursor.write_u32(buffer.byteLength); + cursor.write_u32(0xffffffff); + cursor.write_u32(bin.quest_id); + cursor.write_u32(bin.language); + cursor.write_string_utf16(bin.quest_name, 64); + cursor.write_string_utf16(bin.short_description, 256); + cursor.write_string_utf16(bin.long_description, 576); + + cursor.write_cursor(new ArrayBufferCursor(bin.unknown, Endianness.Little)); + + while (cursor.position < object_code_offset) { + cursor.write_u8(0); + } + + cursor.write_cursor(new ArrayBufferCursor(bin.object_code, Endianness.Little)); + + for (const function_offset of bin.function_offsets) { + cursor.write_i32(function_offset); + } + + return buffer; } -export interface Instruction { +export type Instruction = { opcode: number; mnemonic: string; args: any[]; size: number; -} +}; function parse_object_code(cursor: Cursor, lenient: boolean): Instruction[] { const instructions = []; diff --git a/src/data_formats/parsing/quest/dat.ts b/src/data_formats/parsing/quest/dat.ts index 18f7906e..76f91ba1 100644 --- a/src/data_formats/parsing/quest/dat.ts +++ b/src/data_formats/parsing/quest/dat.ts @@ -22,6 +22,7 @@ export type DatEntity = { section_id: number; position: Vec3; rotation: Vec3; + scale: Vec3; area_id: number; unknown: number[][]; }; @@ -29,7 +30,6 @@ export type DatEntity = { export type DatObject = DatEntity; export type DatNpc = DatEntity & { - flags: number; skin: number; }; @@ -72,20 +72,19 @@ export function parse_dat(cursor: Cursor): DatFile { const unknown1 = cursor.u8_array(10); const section_id = cursor.u16(); const unknown2 = cursor.u8_array(2); - const x = cursor.f32(); - const y = cursor.f32(); - const z = cursor.f32(); + const position = cursor.vec3_f32(); const rotation_x = (cursor.i32() / 0xffff) * 2 * Math.PI; const rotation_y = (cursor.i32() / 0xffff) * 2 * Math.PI; const rotation_z = (cursor.i32() / 0xffff) * 2 * Math.PI; - // The next 3 floats seem to be scale values. - const unknown3 = cursor.u8_array(28); + const scale = cursor.vec3_f32(); + const unknown3 = cursor.u8_array(16); objs.push({ type_id, section_id, - position: new Vec3(x, y, z), + position, rotation: new Vec3(rotation_x, rotation_y, rotation_z), + scale, area_id, unknown: [unknown1, unknown2, unknown3], }); @@ -109,27 +108,24 @@ export function parse_dat(cursor: Cursor): DatFile { const unknown1 = cursor.u8_array(10); const section_id = cursor.u16(); const unknown2 = cursor.u8_array(6); - const x = cursor.f32(); - const y = cursor.f32(); - const z = cursor.f32(); + const position = cursor.vec3_f32(); const rotation_x = (cursor.i32() / 0xffff) * 2 * Math.PI; const rotation_y = (cursor.i32() / 0xffff) * 2 * Math.PI; const rotation_z = (cursor.i32() / 0xffff) * 2 * Math.PI; - const unknown3 = cursor.u8_array(4); - const flags = cursor.f32(); - const unknown4 = cursor.u8_array(12); + const scale = cursor.vec3_f32(); + const unknown3 = cursor.u8_array(8); const skin = cursor.u32(); - const unknown5 = cursor.u8_array(4); + const unknown4 = cursor.u8_array(4); npcs.push({ type_id, section_id, - position: new Vec3(x, y, z), + position, rotation: new Vec3(rotation_x, rotation_y, rotation_z), + scale, skin, area_id, - flags, - unknown: [unknown1, unknown2, unknown3, unknown4, unknown5], + unknown: [unknown1, unknown2, unknown3, unknown4], }); } @@ -179,16 +175,30 @@ export function write_dat({ objs, npcs, unknowns }: DatFile): ResizableBuffer { cursor.write_u32(entities_size); for (const obj of area_objs) { + if (obj.unknown.length !== 3) + throw new Error(`unknown should be of length 3, was ${obj.unknown.length}`); + cursor.write_u16(obj.type_id); + + if (obj.unknown[0].length !== 10) + throw new Error(`unknown[0] should be of length 10, was ${obj.unknown[0].length}`); + cursor.write_u8_array(obj.unknown[0]); cursor.write_u16(obj.section_id); + + if (obj.unknown[1].length !== 2) + throw new Error(`unknown[1] should be of length 2, was ${obj.unknown[1].length}`); + cursor.write_u8_array(obj.unknown[1]); - cursor.write_f32(obj.position.x); - cursor.write_f32(obj.position.y); - cursor.write_f32(obj.position.z); + cursor.write_vec3_f32(obj.position); cursor.write_i32(Math.round((obj.rotation.x / (2 * Math.PI)) * 0xffff)); cursor.write_i32(Math.round((obj.rotation.y / (2 * Math.PI)) * 0xffff)); cursor.write_i32(Math.round((obj.rotation.z / (2 * Math.PI)) * 0xffff)); + cursor.write_vec3_f32(obj.scale); + + if (obj.unknown[2].length !== 16) + throw new Error(`unknown[2] should be of length 16, was ${obj.unknown[2].length}`); + cursor.write_u8_array(obj.unknown[2]); } } @@ -211,17 +221,14 @@ export function write_dat({ objs, npcs, unknowns }: DatFile): ResizableBuffer { cursor.write_u8_array(npc.unknown[0]); cursor.write_u16(npc.section_id); cursor.write_u8_array(npc.unknown[1]); - cursor.write_f32(npc.position.x); - cursor.write_f32(npc.position.y); - cursor.write_f32(npc.position.z); + cursor.write_vec3_f32(npc.position); cursor.write_i32(Math.round((npc.rotation.x / (2 * Math.PI)) * 0xffff)); cursor.write_i32(Math.round((npc.rotation.y / (2 * Math.PI)) * 0xffff)); cursor.write_i32(Math.round((npc.rotation.z / (2 * Math.PI)) * 0xffff)); + cursor.write_vec3_f32(npc.scale); cursor.write_u8_array(npc.unknown[2]); - cursor.write_f32(npc.flags); - cursor.write_u8_array(npc.unknown[3]); cursor.write_u32(npc.skin); - cursor.write_u8_array(npc.unknown[4]); + cursor.write_u8_array(npc.unknown[3]); } } diff --git a/src/data_formats/parsing/quest/index.test.ts b/src/data_formats/parsing/quest/index.test.ts index fba951d1..19f7c1f6 100644 --- a/src/data_formats/parsing/quest/index.test.ts +++ b/src/data_formats/parsing/quest/index.test.ts @@ -41,8 +41,7 @@ test("parse Towards the Future", () => { */ test("parse_quest and write_quest_qst", () => { const buffer = fs.readFileSync("test/resources/tethealla_v0.143_quests/solo/ep1/02.qst"); - const cursor = new BufferCursor(buffer, Endianness.Little); - const orig_quest = parse_quest(cursor)!; + const orig_quest = parse_quest(new BufferCursor(buffer, Endianness.Little))!; const test_quest = parse_quest( new ArrayBufferCursor(write_quest_qst(orig_quest, "02.qst"), Endianness.Little) )!; diff --git a/src/data_formats/parsing/quest/index.ts b/src/data_formats/parsing/quest/index.ts index dda756a5..140d97f0 100644 --- a/src/data_formats/parsing/quest/index.ts +++ b/src/data_formats/parsing/quest/index.ts @@ -72,7 +72,8 @@ export function parse_quest(cursor: Cursor, lenient: boolean = false): Quest | u } return new Quest( - dat_file.id, + bin.quest_id, + bin.language, bin.quest_name, bin.short_description, bin.long_description, @@ -81,19 +82,32 @@ export function parse_quest(cursor: Cursor, lenient: boolean = false): Quest | u parse_obj_data(dat.objs), parse_npc_data(episode, dat.npcs), dat.unknowns, - bin.data + bin.function_offsets, + bin.object_code, + bin.unknown ); } export function write_quest_qst(quest: Quest, file_name: string): ArrayBuffer { const dat = write_dat({ objs: objects_to_dat_data(quest.objects), - npcs: npcsToDatData(quest.npcs), + npcs: npcs_to_dat_data(quest.npcs), unknowns: quest.dat_unknowns, }); - const bin = write_bin({ data: quest.bin_data }); + const bin = write_bin({ + quest_id: quest.id, + language: quest.language, + quest_name: quest.name, + short_description: quest.short_description, + long_description: quest.long_description, + function_offsets: quest.function_offsets, + instructions: [], + object_code: quest.object_code, + unknown: quest.bin_unknown, + }); const ext_start = file_name.lastIndexOf("."); - const base_file_name = ext_start === -1 ? file_name : file_name.slice(0, ext_start); + const base_file_name = + ext_start === -1 ? file_name.slice(0, 12) : file_name.slice(0, Math.min(12, ext_start)); return write_qst({ files: [ @@ -208,37 +222,37 @@ function get_func_operations( function parse_obj_data(objs: DatObject[]): QuestObject[] { return objs.map(obj_data => { - const { x, y, z } = obj_data.position; - const rot = obj_data.rotation; return new QuestObject( + ObjectType.from_pso_id(obj_data.type_id), obj_data.area_id, obj_data.section_id, - new Vec3(x, y, z), - new Vec3(rot.x, rot.y, rot.z), - ObjectType.from_pso_id(obj_data.type_id), - obj_data + obj_data.position.clone(), + obj_data.rotation.clone(), + obj_data.scale.clone(), + obj_data.unknown ); }); } function parse_npc_data(episode: number, npcs: DatNpc[]): QuestNpc[] { return npcs.map(npc_data => { - const { x, y, z } = npc_data.position; - const rot = npc_data.rotation; return new QuestNpc( + get_npc_type(episode, npc_data), + npc_data.type_id, + npc_data.skin, npc_data.area_id, npc_data.section_id, - new Vec3(x, y, z), - new Vec3(rot.x, rot.y, rot.z), - get_npc_type(episode, npc_data), - npc_data + npc_data.position.clone(), + npc_data.rotation.clone(), + npc_data.scale.clone(), + npc_data.unknown ); }); } // TODO: detect Mothmant, St. Rappy, Hallo Rappy, Egg Rappy, Death Gunner, Bulk and Recon. -function get_npc_type(episode: number, { type_id, flags, skin, area_id }: DatNpc): NpcType { - const regular = Math.abs(flags - 1) > 0.00001; +function get_npc_type(episode: number, { type_id, scale, skin, area_id }: DatNpc): NpcType { + const regular = Math.abs(scale.y - 1) > 0.00001; switch (`${type_id}, ${skin % 3}, ${episode}`) { case `${0x044}, 0, 1`: @@ -516,32 +530,37 @@ function objects_to_dat_data(objects: QuestObject[]): DatObject[] { return objects.map(object => ({ type_id: object.type.pso_id!, section_id: object.section_id, - position: object.section_position, - rotation: object.rotation, + position: object.section_position.clone(), + rotation: object.rotation.clone(), + scale: object.scale.clone(), area_id: object.area_id, - unknown: object.dat.unknown, + unknown: object.unknown, })); } -function npcsToDatData(npcs: QuestNpc[]): DatNpc[] { +function npcs_to_dat_data(npcs: QuestNpc[]): DatNpc[] { return npcs.map(npc => { - // If the type is unknown, typeData will be undefined and we use the raw data from the DAT file. - const type_data = npc_type_to_dat_data(npc.type); - let flags = npc.dat.flags; + const type_data = npc_type_to_dat_data(npc.type) || { + type_id: npc.pso_type_id, + skin: npc.pso_skin, + regular: true, + }; - if (type_data) { - flags = (npc.dat.flags & ~0x800000) | (type_data.regular ? 0 : 0x800000); - } + let scale = new Vec3( + npc.scale.x, + (npc.scale.y & ~0x800000) | (type_data.regular ? 0 : 0x800000), + npc.scale.z + ); return { - type_id: type_data ? type_data.type_id : npc.dat.type_id, + type_id: type_data.type_id, section_id: npc.section_id, - position: npc.section_position, - rotation: npc.rotation, - flags, - skin: type_data ? type_data.skin : npc.dat.skin, + position: npc.section_position.clone(), + rotation: npc.rotation.clone(), + scale, + skin: type_data.skin, area_id: npc.area_id, - unknown: npc.dat.unknown, + unknown: npc.unknown, }; }); } diff --git a/src/domain/index.ts b/src/domain/index.ts index 06ba1792..5070dbc6 100644 --- a/src/domain/index.ts +++ b/src/domain/index.ts @@ -79,7 +79,8 @@ export class Section { } export class Quest { - @observable id?: number; + @observable id: number; + @observable language: number; @observable name: string; @observable short_description: string; @observable long_description: string; @@ -91,13 +92,13 @@ export class Quest { * (Partial) raw DAT data that can't be parsed yet by Phantasmal. */ dat_unknowns: DatUnknown[]; - /** - * (Partial) raw BIN data that can't be parsed yet by Phantasmal. - */ - bin_data: ArrayBuffer; + function_offsets: number[]; + object_code: ArrayBuffer; + bin_unknown: ArrayBuffer; constructor( - id: number | undefined, + id: number, + language: number, name: string, short_description: string, long_description: string, @@ -106,15 +107,24 @@ export class Quest { objects: QuestObject[], npcs: QuestNpc[], dat_unknowns: DatUnknown[], - bin_data: ArrayBuffer + function_offsets: number[], + object_code: ArrayBuffer, + bin_unknown: ArrayBuffer ) { - if (id != null && (!Number.isInteger(id) || id < 0)) - throw new Error("id should be undefined or a non-negative integer."); + 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."); if (!npcs || !(npcs instanceof Array)) throw new Error("npcs is required."); + if (!dat_unknowns) throw new Error("dat_unknowns is required."); + if (!function_offsets) throw new Error("function_offsets is required."); + if (!object_code) throw new Error("object_code is required."); + if (!bin_unknown) throw new Error("bin_unknown is required."); this.id = id; + this.language = language; this.name = name; this.short_description = short_description; this.long_description = long_description; @@ -123,7 +133,9 @@ export class Quest { this.objects = objects; this.npcs = npcs; this.dat_unknowns = dat_unknowns; - this.bin_data = bin_data; + this.function_offsets = function_offsets; + this.object_code = object_code; + this.bin_unknown = bin_unknown; } } @@ -156,6 +168,8 @@ export class QuestEntity { @observable.ref rotation: Vec3; + @observable.ref scale: Vec3; + /** * Section-relative position */ @@ -193,7 +207,14 @@ export class QuestEntity { } } - constructor(type: Type, area_id: number, section_id: number, position: Vec3, rotation: Vec3) { + constructor( + type: Type, + area_id: number, + section_id: number, + position: Vec3, + rotation: Vec3, + scale: Vec3 + ) { if (Object.getPrototypeOf(this) === Object.getPrototypeOf(QuestEntity)) throw new Error("Abstract class should not be instantiated directly."); if (!type) throw new Error("type is required."); @@ -203,12 +224,14 @@ export class QuestEntity { throw new Error(`Expected section_id to be a non-negative integer, got ${section_id}.`); if (!position) throw new Error("position is required."); if (!rotation) throw new Error("rotation is required."); + if (!scale) throw new Error("scale is required."); this.type = type; this.area_id = area_id; this._section_id = section_id; this.position = position; this.rotation = rotation; + this.scale = scale; } @action @@ -221,46 +244,52 @@ export class QuestEntity { export class QuestObject extends QuestEntity { @observable type: ObjectType; /** - * The raw data from a DAT file. + * Data of which the purpose hasn't been discovered yet. */ - dat: DatObject; + unknown: number[][]; constructor( + type: ObjectType, area_id: number, section_id: number, position: Vec3, rotation: Vec3, - type: ObjectType, - dat: DatObject + scale: Vec3, + unknown: number[][] ) { - super(type, area_id, section_id, position, rotation); + super(type, area_id, section_id, position, rotation, scale); this.type = type; - this.dat = dat; + this.unknown = unknown; } } export class QuestNpc extends QuestEntity { @observable type: NpcType; + pso_type_id: number; + pso_skin: number; /** - * The raw data from a DAT file. + * Data of which the purpose hasn't been discovered yet. */ - dat: DatNpc; + unknown: number[][]; constructor( + type: NpcType, + pso_type_id: number, + pso_skin: number, area_id: number, section_id: number, position: Vec3, rotation: Vec3, - type: NpcType, - dat: DatNpc + scale: Vec3, + unknown: number[][] ) { - super(type, area_id, section_id, position, rotation); - - if (!type) throw new Error("type is required."); + super(type, area_id, section_id, position, rotation, scale); this.type = type; - this.dat = dat; + this.pso_type_id = pso_type_id; + this.pso_skin = pso_skin; + this.unknown = unknown; } } diff --git a/src/stores/QuestEditorStore.ts b/src/stores/QuestEditorStore.ts index bffa074d..a0db7b39 100644 --- a/src/stores/QuestEditorStore.ts +++ b/src/stores/QuestEditorStore.ts @@ -1,34 +1,27 @@ import Logger from "js-logger"; -import { action, observable, runInAction } from "mobx"; +import { action, flow, observable } from "mobx"; import { Endianness } from "../data_formats"; import { ArrayBufferCursor } from "../data_formats/cursor/ArrayBufferCursor"; import { parse_quest, write_quest_qst } from "../data_formats/parsing/quest"; import { Vec3 } from "../data_formats/vector"; -import { Area, Quest, QuestEntity, Section } from "../domain"; +import { Area, Episode, Quest, QuestEntity, Section } from "../domain"; import { read_file } from "../read_file"; -import { area_store } from "./AreaStore"; import { UndoStack } from "../undo"; +import { area_store } from "./AreaStore"; +import { create_new_quest } from "./quest_creation"; const logger = Logger.get("stores/QuestEditorStore"); class QuestEditorStore { readonly undo_stack = new UndoStack(); + + @observable current_quest_filename?: string; @observable current_quest?: Quest; @observable current_area?: Area; @observable selected_entity?: QuestEntity; - @action - set_quest = (quest?: Quest) => { - this.undo_stack.clear(); - this.selected_entity = undefined; - this.current_quest = quest; - - if (quest && quest.area_variants.length) { - this.current_area = quest.area_variants[0].area; - } else { - this.current_area = undefined; - } - }; + @observable save_dialog_filename?: string; + @observable save_dialog_open: boolean = false; @action set_selected_entity = (entity?: QuestEntity) => { @@ -53,17 +46,81 @@ class QuestEditorStore { } }; + @action + new_quest = (episode: Episode) => { + this.set_quest(create_new_quest(episode)); + }; + // TODO: notify user of problems. - load_file = async (file: File) => { + open_file = flow(function* open_file(this: QuestEditorStore, filename: string, file: File) { try { - const buffer = await read_file(file); + const buffer = yield read_file(file); const quest = parse_quest(new ArrayBufferCursor(buffer, Endianness.Little)); + this.current_quest_filename = filename; this.set_quest(quest); + } catch (e) { + logger.error("Couldn't read file.", e); + } + }); + + @action + open_save_dialog = () => { + this.save_dialog_filename = this.current_quest_filename + ? this.current_quest_filename.endsWith(".qst") + ? this.current_quest_filename.slice(0, -4) + : this.current_quest_filename + : ""; + + this.save_dialog_open = true; + }; + + @action + close_save_dialog = () => { + this.save_dialog_open = false; + }; + + @action + set_save_dialog_filename = (filename: string) => { + this.save_dialog_filename = filename; + }; + + save_current_quest_to_file = (file_name: string) => { + if (this.current_quest) { + const buffer = write_quest_qst(this.current_quest, file_name); + + if (!file_name.endsWith(".qst")) { + file_name += ".qst"; + } + + const a = document.createElement("a"); + a.href = URL.createObjectURL(new Blob([buffer], { type: "application/octet-stream" })); + a.download = file_name; + document.body.appendChild(a); + a.click(); + URL.revokeObjectURL(a.href); + document.body.removeChild(a); + } + + this.save_dialog_open = false; + }; + + @action + private set_quest = flow(function* set_quest(this: QuestEditorStore, quest?: Quest) { + if (quest !== this.current_quest) { + this.undo_stack.clear(); + this.selected_entity = undefined; + this.current_quest = quest; + + if (quest && quest.area_variants.length) { + this.current_area = quest.area_variants[0].area; + } else { + this.current_area = undefined; + } if (quest) { // Load section data. for (const variant of quest.area_variants) { - const sections = await area_store.get_area_sections( + const sections = yield area_store.get_area_sections( quest.episode, variant.area.id, variant.id @@ -89,15 +146,10 @@ class QuestEditorStore { } else { logger.error("Couldn't parse quest file."); } - } catch (e) { - logger.error("Couldn't read file.", e); } - }; + }); - private set_section_on_visible_quest_entity = async ( - entity: QuestEntity, - sections: Section[] - ) => { + private set_section_on_visible_quest_entity = (entity: QuestEntity, sections: Section[]) => { let { x, y, z } = entity.position; const section = sections.find(s => s.id === entity.section_id); @@ -113,28 +165,7 @@ class QuestEditorStore { logger.warn(`Section ${entity.section_id} not found.`); } - runInAction(() => { - entity.section = section; - entity.position = new Vec3(x, y, z); - }); - }; - - save_current_quest_to_file = (file_name: string) => { - if (this.current_quest) { - const buffer = write_quest_qst(this.current_quest, file_name); - - if (!file_name.endsWith(".qst")) { - file_name += ".qst"; - } - - const a = document.createElement("a"); - a.href = URL.createObjectURL(new Blob([buffer], { type: "application/octet-stream" })); - a.download = file_name; - document.body.appendChild(a); - a.click(); - URL.revokeObjectURL(a.href); - document.body.removeChild(a); - } + entity.set_position_and_section(new Vec3(x, y, z), section); }; } diff --git a/src/stores/quest_creation.ts b/src/stores/quest_creation.ts new file mode 100644 index 00000000..8f02a445 --- /dev/null +++ b/src/stores/quest_creation.ts @@ -0,0 +1,643 @@ +import { Quest, ObjectType, QuestObject, Episode, QuestNpc, NpcType } from "../domain"; +import { area_store } from "./AreaStore"; +import { Vec3 } from "../data_formats/vector"; + +export function create_new_quest(episode: Episode): Quest { + if (episode === Episode.II) throw new Error("Episode II not yet supported."); + + return new Quest( + 0, + 0, + "Untitled", + "Created with phantasmal.world.", + "Created with phantasmal.world.", + episode, + [area_store.get_variant(episode, 0, 0)], + create_default_objects(), + create_default_npcs(), + [], + [], + new ArrayBuffer(0), + new ArrayBuffer(0) + ); +} + +function create_default_objects(): QuestObject[] { + return [ + new QuestObject( + ObjectType.MenuActivation, + 0, + 10, + new Vec3(-16.313568115234375, 3, -579.5118408203125), + new Vec3(0.0009587526218325454, 0, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 0, 0, 0, 0, 0, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 75, 251, 140], + ] + ), + new QuestObject( + ObjectType.MenuActivation, + 0, + 10, + new Vec3(-393.07318115234375, 10, -12.964752197265625), + new Vec3(0, 0, 0), + new Vec3(9.183549615799121e-41, 1.0000011920928955, 1), + [ + [2, 0, 1, 0, 0, 0, 1, 64, 0, 0], + [0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 76, 251, 140], + ] + ), + new QuestObject( + ObjectType.MenuActivation, + 0, + 10, + new Vec3(-458.60699462890625, 10, -51.270660400390625), + new Vec3(0, 0, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 2, 0, 0, 0, 2, 64, 0, 0], + [0, 0], + [2, 0, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 192, 76, 251, 140], + ] + ), + new QuestObject( + ObjectType.MenuActivation, + 0, + 10, + new Vec3(-430.19696044921875, 10, -24.490447998046875), + new Vec3(0, 0, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 3, 0, 0, 0, 3, 64, 0, 0], + [0, 0], + [3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 77, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(0.995330810546875, 0, -37.0010986328125), + new Vec3(0, 4.712460886831327, 0), + new Vec3(0, 1, 1), + [ + [2, 0, 4, 0, 0, 0, 4, 64, 0, 0], + [0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(3.0009307861328125, 0, -23.99688720703125), + new Vec3(0, 4.859725289544806, 0), + new Vec3(1.000000238418579, 1, 1), + [ + [2, 0, 5, 0, 0, 0, 5, 64, 0, 0], + [0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, 78, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(2.0015106201171875, 0, -50.00386047363281), + new Vec3(0, 4.565196484117848, 0), + new Vec3(2.000002384185791, 1, 1), + [ + [2, 0, 6, 0, 0, 0, 6, 64, 0, 0], + [0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 79, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(4.9973907470703125, 0, -61.99664306640625), + new Vec3(0, 4.368843947166543, 0), + new Vec3(3.0000007152557373, 1, 1), + [ + [2, 0, 7, 0, 0, 0, 7, 64, 0, 0], + [0, 0], + [0, 0, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 224, 79, 251, 140], + ] + ), + new QuestObject( + ObjectType.MainRagolTeleporter, + 0, + 10, + new Vec3(132.00314331054688, 1.000000238418579, -265.002197265625), + new Vec3(0, 0.49088134237826325, 0), + new Vec3(1.000000238418579, 1, 1), + [ + [0, 0, 87, 7, 0, 0, 88, 71, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 208, 128, 250, 140], + ] + ), + new QuestObject( + ObjectType.PrincipalWarp, + 0, + 10, + new Vec3(-228, 0, -2020.99951171875), + new Vec3(0, 2.9452880542695796, 0), + new Vec3(-10.000004768371582, 0, -30.000030517578125), + [ + [2, 0, 9, 0, 0, 0, 9, 64, 0, 0], + [0, 0], + [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 176, 81, 251, 140], + ] + ), + new QuestObject( + ObjectType.MenuActivation, + 0, + 10, + new Vec3(-41.000030517578125, 0, 42.37322998046875), + new Vec3(0, 0, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 10, 0, 0, 0, 10, 64, 0, 0], + [1, 0], + [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 82, 251, 140], + ] + ), + new QuestObject( + ObjectType.MenuActivation, + 0, + 10, + new Vec3(-479.21673583984375, 8.781256675720215, -322.465576171875), + new Vec3(6.28328118244177, 0.0009587526218325454, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 11, 0, 0, 0, 11, 64, 0, 0], + [0, 0], + [5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 83, 251, 140], + ] + ), + new QuestObject( + ObjectType.PrincipalWarp, + 0, + 10, + new Vec3(-228, 0, -351.0015869140625), + new Vec3(0, 0, 0), + new Vec3(10.000006675720215, 0, -1760.0010986328125), + [ + [2, 0, 12, 0, 0, 0, 12, 64, 0, 0], + [0, 0], + [0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 84, 251, 140], + ] + ), + new QuestObject( + ObjectType.TelepipeLocation, + 0, + 10, + new Vec3(-561.88232421875, 0, -406.8829345703125), + new Vec3(0, 0, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 13, 0, 0, 0, 13, 64, 0, 0], + [0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 85, 251, 140], + ] + ), + new QuestObject( + ObjectType.TelepipeLocation, + 0, + 10, + new Vec3(-547.8557739257812, 0, -444.8822326660156), + new Vec3(0, 0, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 14, 0, 0, 0, 14, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 86, 251, 140], + ] + ), + new QuestObject( + ObjectType.TelepipeLocation, + 0, + 10, + new Vec3(-486.441650390625, 0, -497.4501647949219), + new Vec3(0, 0, 0), + new Vec3(9.183549615799121e-41, 1.0000011920928955, 1), + [ + [2, 0, 15, 0, 0, 0, 15, 64, 0, 0], + [0, 0], + [3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 208, 86, 251, 140], + ] + ), + new QuestObject( + ObjectType.TelepipeLocation, + 0, + 10, + new Vec3(-522.4052734375, 0, -474.1882629394531), + new Vec3(0, 0, 0), + new Vec3(1, 1, 1), + [ + [2, 0, 16, 0, 0, 0, 16, 64, 0, 0], + [0, 0], + [2, 0, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 144, 87, 251, 140], + ] + ), + new QuestObject( + ObjectType.MedicalCenterDoor, + 0, + 10, + new Vec3(-34.49853515625, 0, -384.4951171875), + new Vec3(0, 5.497871034636549, 0), + new Vec3(3.0000007152557373, 1, 1), + [ + [2, 0, 17, 0, 0, 0, 17, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 88, 251, 140], + ] + ), + new QuestObject( + ObjectType.ShopDoor, + 0, + 10, + new Vec3(-393.0031433105469, 0, -143.49981689453125), + new Vec3(0, 3.141640591220885, 0), + new Vec3(3.0000007152557373, 1, 1), + [ + [2, 0, 18, 0, 0, 0, 18, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 89, 251, 140], + ] + ), + new QuestObject( + ObjectType.MenuActivation, + 0, + 10, + new Vec3(-355.17462158203125, 0, -43.15193176269531), + new Vec3(0, 0, 0), + new Vec3(1.000000238418579, 1, 1), + [ + [2, 0, 19, 0, 0, 0, 19, 64, 0, 0], + [0, 0], + [6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 90, 251, 140], + ] + ), + new QuestObject( + ObjectType.HuntersGuildDoor, + 0, + 10, + new Vec3(-43.00239562988281, 0, -118.00120544433594), + new Vec3(0, 3.141640591220885, 0), + new Vec3(3.0000007152557373, 1, 1), + [ + [2, 0, 20, 0, 0, 0, 20, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 90, 251, 140], + ] + ), + new QuestObject( + ObjectType.TeleporterDoor, + 0, + 10, + new Vec3(26.000823974609375, 0, -265.99810791015625), + new Vec3(0, 3.141640591220885, 0), + new Vec3(3.0000007152557373, 1, 1), + [ + [2, 0, 21, 0, 0, 0, 21, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 91, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(57.81005859375, 0, -268.5472412109375), + new Vec3(0, 4.712460886831327, 0), + new Vec3(0, 1, 1), + [ + [2, 0, 22, 0, 0, 0, 22, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 92, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(66.769287109375, 0, -252.3748779296875), + new Vec3(0, 4.712460886831327, 0), + new Vec3(1.000000238418579, 1, 1), + [ + [2, 0, 23, 0, 0, 0, 23, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 93, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(67.36819458007812, 0, -284.9297180175781), + new Vec3(0, 4.712460886831327, 0), + new Vec3(2.000000476837158, 1, 1), + [ + [2, 0, 24, 0, 0, 0, 24, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 94, 251, 140], + ] + ), + new QuestObject( + ObjectType.PlayerSet, + 0, + 10, + new Vec3(77.10488891601562, 0, -269.2830505371094), + new Vec3(0, 4.712460886831327, 0), + new Vec3(3.0000007152557373, 1, 1), + [ + [2, 0, 25, 0, 0, 0, 25, 64, 0, 0], + [0, 0], + [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 208, 94, 251, 140], + ] + ), + ]; +} + +function create_default_npcs(): QuestNpc[] { + return [ + new QuestNpc( + NpcType.GuildLady, + 29, + 0, + 0, + 10, + new Vec3(-49.0010986328125, 0, 50.996429443359375), + new Vec3(0, 2.3562304434156633, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 86, 0, 0, 0, 0, 23, 87], + [0, 0, 0, 0, 0, 0], + [18, 192, 124, 68, 0, 128, 84, 68], + [128, 238, 223, 176], + ] + ), + new QuestNpc( + NpcType.MaleFat, + 11, + 0, + 0, + 10, + new Vec3(-2.9971923828125, 0, 63.999267578125), + new Vec3(0, 2.9452880542695796, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 87, 0, 0, 0, 0, 23, 88], + [0, 0, 0, 0, 0, 0], + [6, 0, 202, 66, 4, 0, 155, 67], + [128, 238, 227, 176], + ] + ), + new QuestNpc( + NpcType.FemaleFat, + 4, + 1, + 0, + 20, + new Vec3(167.99769592285156, 0, 83.99686431884766), + new Vec3(0, 3.927050739026106, 0), + new Vec3(24.000009536743164, 0, 0), + [ + [0, 0, 7, 88, 0, 0, 0, 0, 23, 89], + [0, 0, 0, 0, 0, 0], + [18, 0, 126, 68, 6, 0, 200, 66], + [128, 238, 232, 48], + ] + ), + new QuestNpc( + NpcType.MaleDwarf, + 10, + 1, + 0, + 20, + new Vec3(156.0028839111328, 0, -49.99967575073242), + new Vec3(0, 5.497871034636549, 0), + new Vec3(30.000009536743164, 0, 0), + [ + [0, 0, 7, 89, 0, 0, 0, 0, 23, 90], + [0, 0, 0, 0, 0, 0], + [18, 192, 125, 68, 6, 0, 180, 66], + [128, 238, 236, 176], + ] + ), + new QuestNpc( + NpcType.RedSoldier, + 26, + 0, + 0, + 20, + new Vec3(237.9988250732422, 0, -14.0001220703125), + new Vec3(0, 5.497871034636549, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 90, 0, 0, 0, 0, 23, 91], + [0, 0, 0, 0, 0, 0], + [18, 0, 127, 68, 6, 0, 2, 67], + [128, 238, 241, 48], + ] + ), + new QuestNpc( + NpcType.BlueSoldier, + 25, + 0, + 0, + 20, + new Vec3(238.00379943847656, 0, 63.00413513183594), + new Vec3(0, 3.927050739026106, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 91, 0, 0, 0, 0, 23, 92], + [0, 0, 0, 0, 0, 0], + [18, 192, 126, 68, 11, 0, 240, 66], + [128, 238, 245, 176], + ] + ), + new QuestNpc( + NpcType.FemaleMacho, + 5, + 1, + 0, + 20, + new Vec3(-2.001882553100586, 0, 35.0036506652832), + new Vec3(0, 3.141640591220885, 0), + new Vec3(26.000009536743164, 0, 0), + [ + [0, 0, 7, 92, 0, 0, 0, 0, 23, 93], + [0, 0, 0, 0, 0, 0], + [18, 128, 125, 68, 9, 0, 160, 66], + [128, 238, 250, 48], + ] + ), + new QuestNpc( + NpcType.Scientist, + 30, + 1, + 0, + 20, + new Vec3(-147.0000457763672, 0, -7.996537208557129), + new Vec3(0, 2.577127047485882, 0), + new Vec3(30.000009536743164, 0, 0), + [ + [0, 0, 7, 93, 0, 0, 0, 0, 23, 94], + [0, 0, 0, 0, 0, 0], + [18, 64, 125, 68, 8, 0, 140, 66], + [128, 238, 254, 176], + ] + ), + new QuestNpc( + NpcType.MaleOld, + 13, + 1, + 0, + 20, + new Vec3(-219.99710083007812, 0, -100.0008316040039), + new Vec3(0, 0, 0), + new Vec3(30.000011444091797, 0, 0), + [ + [0, 0, 7, 94, 0, 0, 0, 0, 23, 95], + [0, 0, 0, 0, 0, 0], + [18, 0, 125, 68, 15, 0, 112, 66], + [128, 239, 3, 48], + ] + ), + new QuestNpc( + NpcType.GuildLady, + 29, + 0, + 0, + 20, + new Vec3(-262.5099792480469, 0, -24.53999900817871), + new Vec3(0, 1.963525369513053, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 95, 0, 0, 0, 0, 23, 106], + [0, 0, 0, 0, 0, 0], + [18, 128, 124, 68, 0, 0, 82, 68], + [128, 239, 100, 192], + ] + ), + new QuestNpc( + NpcType.Tekker, + 28, + 0, + 0, + 30, + new Vec3(-43.70983123779297, 2.5999999046325684, -52.78248596191406), + new Vec3(0, 0.7854101478052212, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 97, 0, 0, 0, 0, 23, 98], + [0, 0, 0, 0, 0, 0], + [0, 64, 124, 68, 0, 128, 79, 68], + [128, 239, 16, 176], + ] + ), + new QuestNpc( + NpcType.MaleMacho, + 12, + 0, + 0, + 30, + new Vec3(0.33990478515625, 2.5999999046325684, -84.71995544433594), + new Vec3(0, 0, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 98, 0, 0, 0, 0, 23, 99], + [0, 0, 0, 0, 0, 0], + [0, 128, 123, 68, 0, 0, 72, 68], + [128, 239, 21, 48], + ] + ), + new QuestNpc( + NpcType.FemaleMacho, + 5, + 0, + 0, + 30, + new Vec3(43.87113952636719, 2.5999996662139893, -74.80299377441406), + new Vec3(0, -0.5645135437350027, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 99, 0, 0, 0, 0, 23, 100], + [0, 0, 0, 0, 0, 0], + [0, 0, 124, 68, 0, 0, 77, 68], + [128, 239, 25, 176], + ] + ), + new QuestNpc( + NpcType.MaleFat, + 11, + 0, + 0, + 30, + new Vec3(75.88380432128906, 2.5999996662139893, -42.69328308105469), + new Vec3(0, -1.0308508189943528, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 100, 0, 0, 0, 0, 23, 101], + [0, 0, 0, 0, 0, 0], + [18, 192, 123, 68, 0, 128, 74, 68], + [128, 239, 30, 48], + ] + ), + new QuestNpc( + NpcType.FemaleTall, + 7, + 1, + 0, + 30, + new Vec3(16.003997802734375, 0, 5.995697021484375), + new Vec3(0, -1.1781152217078317, 0), + new Vec3(22.000009536743164, 0, 0), + [ + [0, 0, 7, 101, 0, 0, 0, 0, 23, 102], + [0, 0, 0, 0, 0, 0], + [18, 64, 127, 68, 4, 0, 12, 67], + [128, 239, 34, 176], + ] + ), + new QuestNpc( + NpcType.Nurse, + 31, + 0, + 0, + 40, + new Vec3(0.3097381591796875, 3, -105.3865966796875), + new Vec3(0, 0, 0), + new Vec3(0, 0, 0), + [ + [0, 0, 7, 102, 0, 0, 0, 0, 23, 103], + [0, 0, 0, 0, 0, 0], + [0, 64, 126, 68, 0, 0, 87, 68], + [128, 239, 39, 48], + ] + ), + new QuestNpc( + NpcType.Nurse, + 31, + 1, + 0, + 40, + new Vec3(53.499176025390625, 0, -26.496688842773438), + new Vec3(0, 5.497871034636549, 0), + new Vec3(18.000009536743164, 0, 0), + [ + [0, 0, 7, 103, 0, 0, 0, 0, 23, 104], + [0, 0, 0, 0, 0, 0], + [18, 128, 126, 68, 7, 0, 220, 66], + [128, 239, 43, 176], + ] + ), + ]; +} diff --git a/src/ui/quest_editor/QuestEditorComponent.css b/src/ui/quest_editor/QuestEditorComponent.css index ad920ba1..d98f6895 100644 --- a/src/ui/quest_editor/QuestEditorComponent.css +++ b/src/ui/quest_editor/QuestEditorComponent.css @@ -3,15 +3,6 @@ flex-direction: column; } -.qe-QuestEditorComponent-toolbar { - display: flex; - padding: 10px 5px; -} - -.qe-QuestEditorComponent-toolbar > * { - margin: 0 5px; -} - .qe-QuestEditorComponent-main { flex: 1; display: flex; diff --git a/src/ui/quest_editor/QuestEditorComponent.tsx b/src/ui/quest_editor/QuestEditorComponent.tsx index 0a9cc0ad..a4692408 100644 --- a/src/ui/quest_editor/QuestEditorComponent.tsx +++ b/src/ui/quest_editor/QuestEditorComponent.tsx @@ -1,31 +1,17 @@ -import { Button, Form, Icon, Input, Modal, Select, Upload } from "antd"; -import { UploadChangeParam } from "antd/lib/upload"; -import { UploadFile } from "antd/lib/upload/interface"; import { observer } from "mobx-react"; -import React, { ChangeEvent, ReactNode, Component } from "react"; +import React, { Component, ReactNode } from "react"; +import { get_quest_renderer } from "../../rendering/QuestRenderer"; +import { application_store } from "../../stores/ApplicationStore"; import { quest_editor_store } from "../../stores/QuestEditorStore"; +import { RendererComponent } from "../RendererComponent"; import { EntityInfoComponent } from "./EntityInfoComponent"; import "./QuestEditorComponent.css"; import { QuestInfoComponent } from "./QuestInfoComponent"; -import { RendererComponent } from "../RendererComponent"; -import { get_quest_renderer } from "../../rendering/QuestRenderer"; -import { application_store } from "../../stores/ApplicationStore"; +import { Toolbar } from "./Toolbar"; @observer -export class QuestEditorComponent extends Component< - {}, - { - debug: boolean; - filename?: string; - save_dialog_open: boolean; - save_dialog_filename: string; - } -> { - state = { - debug: false, - save_dialog_open: false, - save_dialog_filename: "Untitled", - }; +export class QuestEditorComponent extends Component<{}, { debug: boolean }> { + state = { debug: false }; componentDidMount(): void { application_store.on_global_keyup("quest_editor", this.keyup); @@ -36,49 +22,16 @@ export class QuestEditorComponent extends Component< return (
- +
-
); } - private save_as_clicked = (filename?: string) => { - const name = filename - ? filename.endsWith(".qst") - ? filename.slice(0, -4) - : filename - : this.state.save_dialog_filename; - - this.setState({ - save_dialog_open: true, - save_dialog_filename: name, - }); - }; - - private save_dialog_filename_changed = (filename: string) => { - this.setState({ save_dialog_filename: filename }); - }; - - private save_dialog_affirmed = () => { - quest_editor_store.save_current_quest_to_file(this.state.save_dialog_filename); - this.setState({ save_dialog_open: false }); - }; - - private save_dialog_cancelled = () => { - this.setState({ save_dialog_open: false }); - }; - private keyup = (e: KeyboardEvent) => { if (e.ctrlKey && e.key === "z" && !e.altKey) { quest_editor_store.undo_stack.undo(); @@ -89,116 +42,3 @@ export class QuestEditorComponent extends Component< } }; } - -@observer -class Toolbar extends Component<{ on_save_as_clicked: (filename?: string) => void }> { - state = { - filename: undefined, - }; - - render(): ReactNode { - const undo = quest_editor_store.undo_stack; - const quest = quest_editor_store.current_quest; - const areas = quest ? Array.from(quest.area_variants).map(a => a.area) : []; - const area = quest_editor_store.current_area; - const area_id = area && area.id; - - return ( -
- false} - > - - - - -
- ); - } - - private set_filename = (info: UploadChangeParam) => { - if (info.file.originFileObj) { - this.setState({ filename: info.file.name }); - quest_editor_store.load_file(info.file.originFileObj as File); - } - }; - - private save_as = () => { - this.props.on_save_as_clicked(this.state.filename); - }; - - private undo = () => { - quest_editor_store.undo_stack.undo(); - }; - - private redo = () => { - quest_editor_store.undo_stack.redo(); - }; -} - -class SaveAsForm extends React.Component<{ - is_open: boolean; - filename: string; - on_filename_change: (name: string) => void; - on_ok: () => void; - on_cancel: () => void; -}> { - render(): ReactNode { - return ( - - Save as... - - } - visible={this.props.is_open} - onOk={this.props.on_ok} - onCancel={this.props.on_cancel} - > -
- - - -
- - ); - } - - private name_changed = (e: ChangeEvent) => { - this.props.on_filename_change(e.currentTarget.value); - }; -} diff --git a/src/ui/quest_editor/Toolbar.less b/src/ui/quest_editor/Toolbar.less new file mode 100644 index 00000000..cc8a6596 --- /dev/null +++ b/src/ui/quest_editor/Toolbar.less @@ -0,0 +1,8 @@ +.qe-Toolbar { + display: flex; + padding: 10px 5px; +} + +.qe-Toolbar > * { + margin: 0 5px; +} diff --git a/src/ui/quest_editor/Toolbar.tsx b/src/ui/quest_editor/Toolbar.tsx new file mode 100644 index 00000000..c91725f7 --- /dev/null +++ b/src/ui/quest_editor/Toolbar.tsx @@ -0,0 +1,139 @@ +import { Button, Dropdown, Form, Icon, Input, Menu, Modal, Select, Upload } from "antd"; +import { UploadChangeParam, UploadFile } from "antd/lib/upload/interface"; +import { observer } from "mobx-react"; +import React, { ChangeEvent, Component, ReactNode } from "react"; +import { Episode } from "../../domain"; +import { quest_editor_store } from "../../stores/QuestEditorStore"; +import "./Toolbar.less"; +import { ClickParam } from "antd/lib/menu"; + +@observer +export class Toolbar extends Component { + render(): ReactNode { + const undo = quest_editor_store.undo_stack; + const quest = quest_editor_store.current_quest; + const areas = quest ? Array.from(quest.area_variants).map(a => a.area) : []; + const area = quest_editor_store.current_area; + const area_id = area && area.id; + + return ( +
+ + Episode I + Episode II + Episode IV + + } + trigger={["click"]} + > + + + false} + > + + + + +
+ ); + } + + private new_quest({ key }: ClickParam): void { + quest_editor_store.new_quest((Episode as any)[key]); + } + + private open_file(info: UploadChangeParam): void { + if (info.file.originFileObj) { + quest_editor_store.open_file(info.file.name, info.file.originFileObj as File); + } + } + + private undo(): void { + quest_editor_store.undo_stack.undo(); + } + + private redo(): void { + quest_editor_store.undo_stack.redo(); + } +} + +@observer +class SaveQuestComponent extends Component { + render(): ReactNode { + return ( + + Save as... + + } + visible={quest_editor_store.save_dialog_open} + onOk={this.ok} + onCancel={this.cancel} + > +
+ + + +
+ + ); + } + + private name_changed(e: ChangeEvent): void { + quest_editor_store.set_save_dialog_filename(e.currentTarget.value); + } + + private ok(): void { + quest_editor_store.save_current_quest_to_file( + quest_editor_store.save_dialog_filename || "untitled" + ); + } + + private cancel(): void { + quest_editor_store.close_save_dialog(); + } +} diff --git a/src/undo.ts b/src/undo.ts index a6f17030..e22fd5d2 100644 --- a/src/undo.ts +++ b/src/undo.ts @@ -1,4 +1,4 @@ -import { computed, observable } from "mobx"; +import { computed, observable, IObservableArray, action } from "mobx"; export class Action { constructor( @@ -9,7 +9,9 @@ export class Action { } export class UndoStack { - @observable.ref private stack: Action[] = []; + @observable private readonly stack: IObservableArray = observable.array([], { + deep: false, + }); /** * The index where new actions are inserted. */ @@ -37,15 +39,18 @@ export class UndoStack { return this.stack[this.index]; } + @action push_action(description: string, undo: () => void, redo: () => void): void { this.push(new Action(description, undo, redo)); } + @action push(action: Action): void { this.stack.splice(this.index, this.stack.length - this.index, action); this.index++; } + @action undo(): boolean { if (this.can_undo) { this.stack[--this.index].undo(); @@ -55,6 +60,7 @@ export class UndoStack { } } + @action redo(): boolean { if (this.can_redo) { this.stack[this.index++].redo(); @@ -64,8 +70,9 @@ export class UndoStack { } } + @action clear(): void { - this.stack = []; + this.stack.clear(); this.index = 0; } } diff --git a/test/resources/quest118_e.bin b/test/resources/quest118_e.bin index 54e78a881c56d4cd2bb7daadfac04bd6205071e8..b259a074ee714dc921feb69b9b66dfad5dec36a3 100644 GIT binary patch literal 17511 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 NIs&Klft4`>0|0Tl%3uHh