Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 06:28:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Area variants now change automatically when bb_map_designate instructions are added, deleted or changed. The 3D view also updates automatically.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-08-10 18:11:27 +02:00
parent 2d551a1951
commit ecbab0637d
24 changed files with 472 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
FEATURES.md
View File

@ -11,16 +11,16 @@ Features that are in ***bold italics*** are planned and not yet implemented.
- Open file button
- Support for .qst (BB, ***GC***, ***PC***, ***DC***)
- ***Notify user when and why quest loading fails***
- ***Deal with missing DAT or BIN file in QST container file***
- ***Deal with missing DAT or BIN file in QST container file***
## Save Quest
- Save as button
- Save as dialog to choose name
- Save as dialog to choose name
- Support for .qst (BB, ***GC***, ***PC***, ***DC***)
- ***Notify user when and why quest saving fails***
- Custom text-based format
- Usable with SCM tools
- Usable with SCM tools
## Undo/Redo
@ -31,29 +31,30 @@ Features that are in ***bold italics*** are planned and not yet implemented.
## Area Selection
- Dropdown menu to switch area
- Add new area
- Change area variant by editing assembly
- Update 3D view automatically
## Simple Quest Properties
- Episode
- Editable ID, name, short and long description
- ***Undo/redo***
- ***Undo/redo***
- NPC counts
## 3D View
- Area geometry
- Collision geometry (c.rel)
- ***Rendering geometry (n.rel)***
- ***Textures***
- Collision geometry (c.rel)
- ***Rendering geometry (n.rel)***
- ***Textures***
- NPC/object geometry
- Textures
- Textures
- ***Transparency***
- ***Order independent transparency***
- ***Order independent transparency***
- ***Minimap***
- ***Top-down view (orthogonal view might suffice?)***
- ***Add "shadow" to entities to more easily see where floating entities are positioned***
- ***MVP: a single line***
- ***MVP: a single line***
- ***Show positions and radii from the relevant script instructions***
## NPC/object manipulation
@ -61,8 +62,8 @@ Features that are in ***bold italics*** are planned and not yet implemented.
- ***Creation***
- ***Deletion***
- Translation
- Via 3D view
- Via entity view
- Via 3D view
- Via entity view
- ***Rotation***
- ***Multi select and translate/rotate/edit***
@ -79,8 +80,8 @@ Features that are in ***bold italics*** are planned and not yet implemented.
- Instructions
- Simplified stack management (push* instructions are inserted transparently)
- Data
- Binary data
- Strings
- Binary data
- Strings
- Labels
- ***Interpret code called from objects as code***
@ -88,28 +89,28 @@ Features that are in ***bold italics*** are planned and not yet implemented.
- Instructions
- Data
- Binary data
- Strings
- Binary data
- Strings
- Labels
- ***Show in outline***
- ***Show in outline***
- Autocompletion
- Segment type (.code, .data)
- Instructions
- Segment type (.code, .data)
- Instructions
- ***Go to label***
- ***Warnings***
- ***Missing 0 label***
- ***Missing floor handlers***
- ***Missing map designations***
- ***Threads (thread, thread_stg) that don't start with a sync***
- ***Unreachable/unused instructions/data***
- ***Instructions after "ret" instruction***
- ***Unused labels***
- ***Missing 0 label***
- ***Missing floor handlers***
- ***Missing map designations***
- ***Threads (thread, thread_stg) that don't start with a sync***
- ***Unreachable/unused instructions/data***
- ***Instructions after "ret" instruction***
- ***Unused labels***
- Errors
- Invalid syntax
- Invalid instruction
- Invalid instruction arguments
- ***Invalid label references***
- ***Mark all duplicate labels (the first one is not marked at the moment)***
- Invalid syntax
- Invalid instruction
- Invalid instruction arguments
- ***Invalid label references***
- ***Mark all duplicate labels (the first one is not marked at the moment)***
- ***Instruction parameter hints***
- ***Show instruction documentation on hover over***
- ***Show reserved register usage on hover over***
@ -129,11 +130,11 @@ Features that are in ***bold italics*** are planned and not yet implemented.
- [Script Object Code](#script-object-code): Correctly deal with stack arguments (e.g. when a function expects a u32, pushing a u8, u16, u32 or register value is ok) (when a function expects a register reference, arg_pushb should be used)
- [3D View](#3d-view): Random Type Box 1 and Fixed Type Box objects aren't rendered correctly
- [3D View](#3d-view): Some objects are only partially loaded (they consist of several seperate models)
- Forest Switch
- Laser Fence
- Forest Laser
- Switch (none door)
- Energy Barrier
- Forest Switch
- Laser Fence
- Forest Laser
- Switch (none door)
- Energy Barrier
- [Script Object Code](#script-object-code): Make sure data segments are referenced by an instruction with an offset before the segment's offset
- [Script Object Code](#script-object-code): Detect code that is both unused and incorrect and reinterpret it as data (this avoids loading and then saving the quest incorrectly)
- [Area Selection](#area-selection): Lost heart breaker/phantasmal world 4 overwrite area 16 to have both towers

83
src/data_formats/parsing/quest/bin.ts
View File

@ -29,7 +29,7 @@ export class BinFile {
readonly short_description: string,
readonly long_description: string,
readonly object_code: Segment[],
readonly shop_items: number[]
readonly shop_items: number[],
) {}
}
@ -41,7 +41,7 @@ SEGMENT_PRIORITY[SegmentType.Data] = 0;
export function parse_bin(
cursor: Cursor,
entry_labels: number[] = [0],
lenient: boolean = false
lenient: boolean = false,
): BinFile {
const object_code_offset = cursor.u32(); // Always 4652
const label_offset_table_offset = cursor.u32(); // Relative offsets
@ -80,7 +80,7 @@ export function parse_bin(
short_description,
long_description,
segments,
shop_items
shop_items,
);
}
@ -179,7 +179,7 @@ class LabelHolder {
}
get_info(
label: number
label: number,
): { offset: number; next?: { label: number; offset: number } } | undefined {
const offset_and_index = this.label_map.get(label);
@ -212,7 +212,7 @@ function parse_object_code(
cursor: Cursor,
label_holder: LabelHolder,
entry_labels: number[],
lenient: boolean
lenient: boolean,
): Segment[] {
const offset_to_segment = new Map<number, Segment>();
@ -221,7 +221,7 @@ function parse_object_code(
label_holder,
entry_labels.reduce((m, l) => m.set(l, SegmentType.Instructions), new Map()),
offset_to_segment,
lenient
lenient,
);
const segments: Segment[] = [];
@ -259,7 +259,7 @@ function parse_object_code(
// Should never happen.
if (end_offset <= offset) {
logger.error(
`Next offset ${end_offset} was smaller than or equal to current offset ${offset}.`
`Next offset ${end_offset} was smaller than or equal to current offset ${offset}.`,
);
break;
}
@ -325,8 +325,8 @@ function find_and_parse_segments(
label_holder: LabelHolder,
labels: Map<number, SegmentType>,
offset_to_segment: Map<number, Segment>,
lenient: boolean
) {
lenient: boolean,
): void {
let start_segment_count: number;
// Iteratively parse segments from label references.
@ -359,7 +359,7 @@ function find_and_parse_segments(
labels,
instruction,
i,
SegmentType.Instructions
SegmentType.Instructions,
);
break;
case Kind.ILabelVar:
@ -377,27 +377,28 @@ function find_and_parse_segments(
get_arg_label_values(cfg, labels, instruction, i, SegmentType.String);
break;
case Kind.RegTupRef:
// Never on the stack.
const arg = instruction.args[i];
{
// Never on the stack.
const arg = instruction.args[i];
for (let j = 0; j < param.type.register_tuples.length; j++) {
const reg_tup = param.type.register_tuples[j];
for (let j = 0; j < param.type.register_tuples.length; j++) {
const reg_tup = param.type.register_tuples[j];
if (reg_tup.type.kind === Kind.ILabel) {
const label_values = register_value(
cfg,
instruction,
arg.value + j
);
if (reg_tup.type.kind === Kind.ILabel) {
const label_values = register_value(
cfg,
instruction,
arg.value + j,
);
if (label_values.size() <= 10) {
for (const label of label_values) {
labels.set(label, SegmentType.Instructions);
if (label_values.size() <= 10) {
for (const label of label_values) {
labels.set(label, SegmentType.Instructions);
}
}
}
}
}
break;
}
}
@ -414,13 +415,13 @@ function get_arg_label_values(
labels: Map<number, SegmentType>,
instruction: Instruction,
param_idx: number,
segment_type: SegmentType
segment_type: SegmentType,
): void {
if (instruction.opcode.stack === StackInteraction.Pop) {
const stack_values = stack_value(
cfg,
instruction,
instruction.opcode.params.length - param_idx - 1
instruction.opcode.params.length - param_idx - 1,
);
if (stack_values.size() <= 10) {
@ -451,8 +452,8 @@ function parse_segment(
cursor: Cursor,
label: number,
type: SegmentType,
lenient: boolean
) {
lenient: boolean,
): void {
try {
const info = label_holder.get_info(label);
@ -492,7 +493,7 @@ function parse_segment(
end_offset,
labels,
info.next && info.next.label,
lenient
lenient,
);
break;
case SegmentType.Data:
@ -506,7 +507,7 @@ function parse_segment(
}
} catch (e) {
if (lenient) {
logger.error("Couldn't fully parse object code.", e);
logger.error("Couldn't fully parse object code segment.", e);
} else {
throw e;
}
@ -520,8 +521,8 @@ function parse_instructions_segment(
end_offset: number,
labels: number[],
next_label: number | undefined,
lenient: boolean
) {
lenient: boolean,
): void {
const instructions: Instruction[] = [];
const segment: InstructionSegment = {
@ -556,7 +557,7 @@ function parse_instructions_segment(
if (lenient) {
logger.error(
`Exception occurred while parsing arguments for instruction ${opcode.mnemonic}.`,
e
e,
);
instructions.push(new Instruction(opcode, []));
} else {
@ -586,7 +587,7 @@ function parse_instructions_segment(
cursor,
next_label,
SegmentType.Instructions,
lenient
lenient,
);
}
}
@ -596,8 +597,8 @@ function parse_data_segment(
offset_to_segment: Map<number, Segment>,
cursor: Cursor,
end_offset: number,
labels: number[]
) {
labels: number[],
): void {
const start_offset = cursor.position;
const segment: DataSegment = {
type: SegmentType.Data,
@ -611,8 +612,8 @@ function parse_string_segment(
offset_to_segment: Map<number, Segment>,
cursor: Cursor,
end_offset: number,
labels: number[]
) {
labels: number[],
): void {
const start_offset = cursor.position;
const segment: StringSegment = {
type: SegmentType.String,
@ -653,7 +654,7 @@ function parse_instruction_arguments(cursor: Cursor, opcode: Opcode): Arg[] {
value: cursor.string_utf16(
Math.min(4096, cursor.bytes_left),
true,
false
false,
),
size: cursor.position - start_pos,
});
@ -686,7 +687,7 @@ function parse_instruction_arguments(cursor: Cursor, opcode: Opcode): Arg[] {
function write_object_code(
cursor: WritableCursor,
segments: Segment[]
segments: Segment[],
): { size: number; label_offsets: number[] } {
const start_pos = cursor.position;
// Keep track of label offsets.
@ -762,7 +763,7 @@ function write_object_code(
default:
// TYPE_ANY, TYPE_VALUE and TYPE_POINTER cannot be serialized.
throw new Error(
`Parameter type ${Kind[param.type.kind]} not implemented.`
`Parameter type ${Kind[param.type.kind]} not implemented.`,
);
}
}

41
src/data_formats/parsing/quest/index.test.ts
View File

@ -3,7 +3,7 @@ import { Endianness } from "../../Endianness";
import { walk_qst_files } from "../../../../test/src/utils";
import { ArrayBufferCursor } from "../../cursor/ArrayBufferCursor";
import { BufferCursor } from "../../cursor/BufferCursor";
import { parse_quest, Quest, write_quest_qst } from "./index";
import { parse_quest, write_quest_qst } from "./index";
import { ObjectType } from "./object_types";
test("parse Towards the Future", () => {
@ -21,18 +21,20 @@ test("parse Towards the Future", () => {
expect(quest.objects[0].type).toBe(ObjectType.MenuActivation);
expect(quest.objects[4].type).toBe(ObjectType.PlayerSet);
expect(quest.npcs.length).toBe(216);
expect(testable_area_variants(quest)).toEqual([
[0, 0],
[2, 0],
[11, 0],
[5, 4],
[12, 0],
[7, 4],
[13, 0],
[8, 4],
[10, 4],
[14, 0],
]);
expect(quest.map_designations).toEqual(
new Map([
[0, 0],
[2, 0],
[11, 0],
[5, 4],
[12, 0],
[7, 4],
[13, 0],
[8, 4],
[10, 4],
[14, 0],
]),
);
});
/**
@ -86,14 +88,7 @@ function round_trip_test(path: string, file_name: string, contents: Buffer): voi
expect(test_npc.type).toBe(orig_npc.type);
}
expect(test_quest.area_variants.length).toBe(orig_quest.area_variants.length);
for (let i = 0; i < orig_quest.area_variants.length; i++) {
const orig_area_variant = orig_quest.area_variants[i];
const test_area_variant = test_quest.area_variants[i];
expect(test_area_variant.id).toBe(orig_area_variant.id);
expect(test_area_variant.area.id).toBe(orig_area_variant.area.id);
}
expect(test_quest.map_designations).toEqual(orig_quest.map_designations);
expect(test_quest.object_code.length).toBe(orig_quest.object_code.length);
@ -102,7 +97,3 @@ function round_trip_test(path: string, file_name: string, contents: Buffer): voi
}
});
}
function testable_area_variants(quest: Quest): any[][] {
return quest.area_variants.map(av => [av.area.id, av.id]);
}

57
src/data_formats/parsing/quest/index.ts
View File

@ -13,7 +13,6 @@ import { Cursor } from "../../cursor/Cursor";
import { ResizableBufferCursor } from "../../cursor/ResizableBufferCursor";
import { Endianness } from "../../Endianness";
import { Vec3 } from "../../vector";
import { AreaVariant, get_area_variant } from "./areas";
import { BinFile, parse_bin, write_bin } from "./bin";
import { DatFile, DatNpc, DatObject, DatUnknown, parse_dat, write_dat } from "./dat";
import { QuestNpc, QuestObject } from "./entities";
@ -39,7 +38,7 @@ export type Quest = {
readonly dat_unknowns: DatUnknown[];
readonly object_code: Segment[];
readonly shop_items: number[];
readonly area_variants: AreaVariant[];
readonly map_designations: Map<number, number>;
};
/**
@ -86,7 +85,7 @@ export function parse_quest(cursor: Cursor, lenient: boolean = false): Quest | u
);
const bin = parse_bin(bin_decompressed, [0], lenient);
let episode = Episode.I;
let area_variants: AreaVariant[] = [];
let map_designations: Map<number, number> = new Map();
if (bin.object_code.length) {
let label_0_segment: InstructionSegment | undefined;
@ -100,12 +99,7 @@ export function parse_quest(cursor: Cursor, lenient: boolean = false): Quest | u
if (label_0_segment) {
episode = get_episode(label_0_segment.instructions);
area_variants = extract_area_variants(
dat,
episode,
label_0_segment.instructions,
lenient,
);
map_designations = extract_map_designations(dat, episode, label_0_segment.instructions);
} else {
logger.warn(`No instruction for label 0 found.`);
}
@ -125,7 +119,7 @@ export function parse_quest(cursor: Cursor, lenient: boolean = false): Quest | u
dat_unknowns: dat.unknowns,
object_code: bin.object_code,
shop_items: bin.shop_items,
area_variants,
map_designations,
};
}
@ -192,49 +186,20 @@ function get_episode(func_0_instructions: Instruction[]): Episode {
}
}
function extract_area_variants(
function extract_map_designations(
dat: DatFile,
episode: Episode,
func_0_instructions: Instruction[],
lenient: boolean,
): AreaVariant[] {
// Add area variants that have npcs or objects even if there are no BB_Map_Designate instructions for them.
const area_variants = new Map<number, number>();
): Map<number, number> {
const map_designations = new Map<number, number>();
for (const npc of dat.npcs) {
area_variants.set(npc.area_id, 0);
}
for (const obj of dat.objs) {
area_variants.set(obj.area_id, 0);
}
const bb_maps = func_0_instructions.filter(
instruction => instruction.opcode === Opcode.BB_MAP_DESIGNATE,
);
for (const bb_map of bb_maps) {
const area_id: number = bb_map.args[0].value;
const variant_id: number = bb_map.args[2].value;
area_variants.set(area_id, variant_id);
}
const area_variants_array: AreaVariant[] = [];
for (const [area_id, variant_id] of area_variants.entries()) {
try {
area_variants_array.push(get_area_variant(episode, area_id, variant_id));
} catch (e) {
if (lenient) {
logger.error(`Unknown area variant.`, e);
} else {
throw e;
}
for (const inst of func_0_instructions) {
if (inst.opcode === Opcode.BB_MAP_DESIGNATE) {
map_designations.set(inst.args[0].value, inst.args[2].value);
}
}
// Sort by area order and then variant id.
return area_variants_array.sort((a, b) => a.area.order - b.area.order || a.id - b.id);
return map_designations;
}
function parse_obj_data(objs: DatObject[]): QuestObject[] {

23
src/domain/ObservableArea.ts Normal file
View File

@ -0,0 +1,23 @@
import { ObservableAreaVariant } from "./ObservableAreaVariant";
export class ObservableArea {
/**
* Matches the PSO ID.
*/
readonly id: number;
readonly name: string;
readonly order: number;
readonly area_variants: ObservableAreaVariant[];
constructor(id: number, name: string, order: number, area_variants: ObservableAreaVariant[]) {
if (!Number.isInteger(id) || id < 0)
throw new Error(`Expected id to be a non-negative integer, got ${id}.`);
if (!name) throw new Error("name is required.");
if (!area_variants) throw new Error("area_variants is required.");
this.id = id;
this.name = name;
this.order = order;
this.area_variants = area_variants;
}
}

17
src/domain/ObservableAreaVariant.ts Normal file
View File

@ -0,0 +1,17 @@
import { ObservableArea } from "./ObservableArea";
import { IObservableArray, observable } from "mobx";
import { Section } from "./index";
export class ObservableAreaVariant {
readonly id: number;
readonly area: ObservableArea;
@observable.shallow readonly sections: IObservableArray<Section> = observable.array();
constructor(id: number, area: ObservableArea) {
if (!Number.isInteger(id) || id < 0)
throw new Error(`Expected id to be a non-negative integer, got ${id}.`);
this.id = id;
this.area = area;
}
}

170
src/domain/ObservableQuest.ts Normal file
View File

@ -0,0 +1,170 @@
import { action, computed, observable } from "mobx";
import { check_episode, Episode } from "../data_formats/parsing/quest/Episode";
import { ObservableAreaVariant } from "./ObservableAreaVariant";
import { area_store } from "../stores/AreaStore";
import { DatUnknown } from "../data_formats/parsing/quest/dat";
import { Segment } from "../scripting/instructions";
import { ObservableQuestNpc, ObservableQuestObject } from "./index";
import Logger from "js-logger";
const logger = Logger.get("domain/ObservableQuest");
export class ObservableQuest {
@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 private _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 objects: ObservableQuestObject[];
@observable readonly npcs: ObservableQuestNpc[];
/**
* Map of area IDs to entity counts.
*/
@computed get entities_per_area(): Map<number, number> {
const map = new Map<number, number>();
for (const npc of this.npcs) {
map.set(npc.area_id, (map.get(npc.area_id) || 0) + 1);
}
for (const obj of this.objects) {
map.set(obj.area_id, (map.get(obj.area_id) || 0) + 1);
}
return map;
}
/**
* Map of area IDs to area variant IDs. One designation per area.
*/
@observable map_designations: Map<number, number>;
/**
* One variant per area.
*/
@computed get area_variants(): ObservableAreaVariant[] {
const variants: ObservableAreaVariant[] = [];
for (const area_id of this.entities_per_area.keys()) {
try {
variants.push(area_store.get_variant(this.episode, area_id, 0));
} catch (e) {
logger.warn(e);
}
}
for (const [area_id, variant_id] of this.map_designations) {
try {
variants.push(area_store.get_variant(this.episode, area_id, variant_id));
} catch (e) {
logger.warn(e);
}
}
return variants;
}
/**
* (Partial) raw DAT data that can't be parsed yet by Phantasmal.
*/
readonly dat_unknowns: DatUnknown[];
readonly object_code: Segment[];
readonly shop_items: number[];
constructor(
id: number,
language: number,
name: string,
short_description: string,
long_description: string,
episode: Episode,
map_designations: Map<number, number>,
objects: ObservableQuestObject[],
npcs: ObservableQuestNpc[],
dat_unknowns: DatUnknown[],
object_code: Segment[],
shop_items: number[],
) {
check_episode(episode);
if (!map_designations) throw new Error("map_designations is required.");
if (!Array.isArray(objects)) throw new Error("objs is required.");
if (!Array.isArray(npcs)) throw new Error("npcs is required.");
if (!dat_unknowns) throw new Error("dat_unknowns is required.");
if (!object_code) throw new Error("object_code is required.");
if (!shop_items) throw new Error("shop_items is required.");
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.map_designations = map_designations;
this.objects = objects;
this.npcs = npcs;
this.dat_unknowns = dat_unknowns;
this.object_code = object_code;
this.shop_items = shop_items;
}
}

204
src/domain/index.ts
View File

@ -1,10 +1,8 @@
import { action, computed, IObservableArray, observable } from "mobx";
import { DatUnknown } from "../data_formats/parsing/quest/dat";
import { action, computed, observable } from "mobx";
import { EntityType } from "../data_formats/parsing/quest/entities";
import { check_episode, Episode } from "../data_formats/parsing/quest/Episode";
import { Episode } from "../data_formats/parsing/quest/Episode";
import { Vec3 } from "../data_formats/vector";
import { enum_values } from "../enums";
import { Segment } from "../scripting/instructions";
import { ItemType } from "./items";
import { ObjectType } from "../data_formats/parsing/quest/object_types";
import { NpcType } from "../data_formats/parsing/quest/npc_types";
@ -65,122 +63,6 @@ export class Section {
}
}
export class ObservableQuest {
@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;
/**
* One variant per area.
*/
@observable readonly area_variants: ObservableAreaVariant[];
@observable readonly objects: ObservableQuestObject[];
@observable readonly npcs: ObservableQuestNpc[];
/**
* (Partial) raw DAT data that can't be parsed yet by Phantasmal.
*/
readonly dat_unknowns: DatUnknown[];
readonly object_code: Segment[];
readonly shop_items: number[];
constructor(
id: number,
language: number,
name: string,
short_description: string,
long_description: string,
episode: Episode,
area_variants: ObservableAreaVariant[],
objects: ObservableQuestObject[],
npcs: ObservableQuestNpc[],
dat_unknowns: DatUnknown[],
object_code: Segment[],
shop_items: number[],
) {
check_episode(episode);
if (!area_variants) throw new Error("area_variants is required.");
if (!Array.isArray(objects)) throw new Error("objs is required.");
if (!Array.isArray(npcs)) throw new Error("npcs is required.");
if (!dat_unknowns) throw new Error("dat_unknowns is required.");
if (!object_code) throw new Error("object_code is required.");
if (!shop_items) throw new Error("shop_items is required.");
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;
this.npcs = npcs;
this.dat_unknowns = dat_unknowns;
this.object_code = object_code;
this.shop_items = shop_items;
}
}
/**
* Abstract class from which ObservableQuestNpc and ObservableQuestObject derive.
*/
@ -198,7 +80,7 @@ export abstract class ObservableQuestEntity<Type extends EntityType = EntityType
@observable.ref section?: Section;
/**
* World position
* Section-relative position
*/
@observable.ref position: Vec3;
@ -207,10 +89,27 @@ export abstract class ObservableQuestEntity<Type extends EntityType = EntityType
@observable.ref scale: Vec3;
/**
* Section-relative position
* World position
*/
@computed get section_position(): Vec3 {
let { x, y, z } = this.position;
@computed get world_position(): Vec3 {
if (this.section) {
let { x: rel_x, y: rel_y, z: rel_z } = this.position;
const sin = -this.section.sin_y_axis_rotation;
const cos = this.section.cos_y_axis_rotation;
const rot_x = cos * rel_x - sin * rel_z;
const rot_z = sin * rel_x + cos * rel_z;
const x = rot_x + this.section.position.x;
const y = rel_y + this.section.position.y;
const z = rot_z + this.section.position.z;
return new Vec3(x, y, z);
} else {
return this.position;
}
}
set world_position(pos: Vec3) {
let { x, y, z } = pos;
if (this.section) {
const rel_x = x - this.section.position.x;
@ -225,22 +124,7 @@ export abstract class ObservableQuestEntity<Type extends EntityType = EntityType
z = rot_z;
}
return new Vec3(x, y, z);
}
set section_position(sec_pos: Vec3) {
let { x: rel_x, y: rel_y, z: rel_z } = sec_pos;
if (this.section) {
const sin = -this.section.sin_y_axis_rotation;
const cos = this.section.cos_y_axis_rotation;
const rot_x = cos * rel_x - sin * rel_z;
const rot_z = sin * rel_x + cos * rel_z;
const x = rot_x + this.section.position.x;
const y = rel_y + this.section.position.y;
const z = rot_z + this.section.position.z;
this.position = new Vec3(x, y, z);
}
this.position = new Vec3(x, y, z);
}
protected constructor(
@ -269,8 +153,8 @@ export abstract class ObservableQuestEntity<Type extends EntityType = EntityType
}
@action
set_position_and_section(position: Vec3, section?: Section): void {
this.position = position;
set_world_position_and_section(world_position: Vec3, section?: Section): void {
this.world_position = world_position;
this.section = section;
}
}
@ -327,42 +211,6 @@ export class ObservableQuestNpc extends ObservableQuestEntity<NpcType> {
}
}
export class ObservableArea {
/**
* Matches the PSO ID.
*/
readonly id: number;
readonly name: string;
readonly order: number;
readonly area_variants: ObservableAreaVariant[];
constructor(id: number, name: string, order: number, area_variants: ObservableAreaVariant[]) {
if (!Number.isInteger(id) || id < 0)
throw new Error(`Expected id to be a non-negative integer, got ${id}.`);
if (!name) throw new Error("name is required.");
if (!area_variants) throw new Error("area_variants is required.");
this.id = id;
this.name = name;
this.order = order;
this.area_variants = area_variants;
}
}
export class ObservableAreaVariant {
readonly id: number;
readonly area: ObservableArea;
@observable.shallow readonly sections: IObservableArray<Section> = observable.array();
constructor(id: number, area: ObservableArea) {
if (!Number.isInteger(id) || id < 0)
throw new Error(`Expected id to be a non-negative integer, got ${id}.`);
this.id = id;
this.area = area;
}
}
type ItemDrop = {
item_type: ItemType;
anything_rate: number;

22
src/rendering/QuestEntityControls.ts
View File

@ -108,13 +108,13 @@ export class QuestEntityControls {
if (this.selected && this.pick) {
if (this.moved_since_last_mouse_down) {
if (e.buttons === 1) {
// User is tranforming selected entity.
// User is transforming selected entity.
// User is dragging selected entity.
if (e.shiftKey) {
// Vertical movement.
this.translate_vertically(this.selected, this.pick, pointer_device_pos);
} else {
// Horizontal movement accross terrain.
// Horizontal movement across terrain.
this.translate_horizontally(this.selected, this.pick, pointer_device_pos);
}
}
@ -219,13 +219,13 @@ export class QuestEntityControls {
if (ray.intersectPlane(plane, intersection_point)) {
const y = intersection_point.y + pick.grab_offset.y;
const y_delta = y - selection.entity.position.y;
const y_delta = y - selection.entity.world_position.y;
pick.drag_y += y_delta;
pick.drag_adjust.y -= y_delta;
selection.entity.position = new Vec3(
selection.entity.position.x,
selection.entity.world_position = new Vec3(
selection.entity.world_position.x,
y,
selection.entity.position.z,
selection.entity.world_position.z,
);
}
}
@ -239,7 +239,7 @@ export class QuestEntityControls {
const { intersection, section } = this.pick_terrain(pointer_position, pick);
if (intersection) {
selection.entity.set_position_and_section(
selection.entity.set_world_position_and_section(
new Vec3(
intersection.point.x,
intersection.point.y + pick.drag_y,
@ -254,14 +254,14 @@ export class QuestEntityControls {
// ray.origin.add(data.dragAdjust);
const plane = new Plane(
new Vector3(0, 1, 0),
-selection.entity.position.y + pick.grab_offset.y,
-selection.entity.world_position.y + pick.grab_offset.y,
);
const intersection_point = new Vector3();
if (ray.intersectPlane(plane, intersection_point)) {
selection.entity.position = new Vec3(
selection.entity.world_position = new Vec3(
intersection_point.x + pick.grab_offset.x,
selection.entity.position.y,
selection.entity.world_position.y,
intersection_point.z + pick.grab_offset.z,
);
}
@ -318,7 +318,7 @@ export class QuestEntityControls {
return {
mesh: intersection.object as Mesh,
entity,
initial_position: entity.position,
initial_position: entity.world_position,
grab_offset,
drag_adjust,
drag_y,

28
src/rendering/QuestModelManager.ts
View File

@ -1,6 +1,6 @@
import Logger from "js-logger";
import { autorun, IReactionDisposer } from "mobx";
import { Mesh, Object3D, Vector3, Raycaster, Intersection } from "three";
import { Intersection, Mesh, Object3D, Raycaster, Vector3 } from "three";
import { load_area_collision_geometry, load_area_render_geometry } from "../loading/areas";
import {
load_npc_geometry,
@ -11,7 +11,10 @@ import {
import { create_npc_mesh, create_object_mesh } from "./conversion/entities";
import { QuestRenderer } from "./QuestRenderer";
import { AreaUserData } from "./conversion/areas";
import { ObservableArea, ObservableQuest, ObservableQuestEntity } from "../domain";
import { ObservableQuestEntity } from "../domain";
import { ObservableQuest } from "../domain/ObservableQuest";
import { ObservableArea } from "../domain/ObservableArea";
import { ObservableAreaVariant } from "../domain/ObservableAreaVariant";
const logger = Logger.get("rendering/QuestModelManager");
@ -22,17 +25,25 @@ const DUMMY_OBJECT = new Object3D();
export class QuestModelManager {
private quest?: ObservableQuest;
private area?: ObservableArea;
private area_variant?: ObservableAreaVariant;
private entity_reaction_disposers: IReactionDisposer[] = [];
constructor(private renderer: QuestRenderer) {}
async load_models(quest?: ObservableQuest, area?: ObservableArea): Promise<void> {
if (this.quest === quest && this.area === area) {
let area_variant: ObservableAreaVariant | undefined;
if (quest && area) {
area_variant = quest.area_variants.find(v => v.area.id === area.id);
}
if (this.quest === quest && this.area_variant === area_variant) {
return;
}
this.quest = quest;
this.area = area;
this.area_variant = area_variant;
this.dispose_entity_reactions();
@ -41,8 +52,7 @@ export class QuestModelManager {
// Load necessary area geometry.
const episode = quest.episode;
const area_id = area.id;
const variant = quest.area_variants.find(v => v.area.id === area_id);
const variant_id = (variant && variant.id) || 0;
const variant_id = area_variant ? area_variant.id : 0;
const collision_geometry = await load_area_collision_geometry(
episode,
@ -58,7 +68,7 @@ export class QuestModelManager {
this.add_sections_to_collision_geometry(collision_geometry, render_geometry);
if (this.quest !== quest || this.area !== area) return;
if (this.quest !== quest || this.area_variant !== area_variant) return;
this.renderer.collision_geometry = collision_geometry;
this.renderer.render_geometry = render_geometry;
@ -73,7 +83,7 @@ export class QuestModelManager {
const npc_geom = await load_npc_geometry(npc.type);
const npc_tex = await load_npc_textures(npc.type);
if (this.quest !== quest || this.area !== area) return;
if (this.quest !== quest || this.area_variant !== area_variant) return;
const model = create_npc_mesh(npc, npc_geom, npc_tex);
this.update_entity_geometry(npc, model);
@ -85,7 +95,7 @@ export class QuestModelManager {
const object_geom = await load_object_geometry(object.type);
const object_tex = await load_object_textures(object.type);
if (this.quest !== quest || this.area !== area) return;
if (this.quest !== quest || this.area_variant !== area_variant) return;
const model = create_object_mesh(object, object_geom, object_tex);
this.update_entity_geometry(object, model);
@ -150,7 +160,7 @@ export class QuestModelManager {
this.entity_reaction_disposers.push(
autorun(() => {
const { x, y, z } = entity.position;
const { x, y, z } = entity.world_position;
model.position.set(x, y, z);
const rot = entity.rotation;
model.rotation.set(rot.x, rot.y, rot.z);

8
src/rendering/conversion/areas.ts
View File

@ -94,8 +94,8 @@ export function area_collision_geometry_to_object_3d(object: CollisionObject): O
indices[2],
new Vector3(normal.x, normal.y, normal.z),
undefined,
color_index
)
color_index,
),
);
}
@ -115,7 +115,7 @@ export function area_collision_geometry_to_object_3d(object: CollisionObject): O
}
export function area_geometry_to_sections_and_object_3d(
object: RenderObject
object: RenderObject,
): [Section[], Object3D] {
const sections: Section[] = [];
const group = new Group();
@ -135,7 +135,7 @@ export function area_geometry_to_sections_and_object_3d(
transparent: true,
opacity: 0.25,
side: DoubleSide,
})
}),
);
group.add(mesh);

2
src/rendering/conversion/entities.ts
View File

@ -76,7 +76,7 @@ function create(
mesh.name = name;
(mesh.userData as EntityUserData).entity = entity;
const { x, y, z } = entity.position;
const { x, y, z } = entity.world_position;
mesh.position.set(x, y, z);
const rot = entity.rotation;
mesh.rotation.set(rot.x, rot.y, rot.z);

27
src/scripting/AssemblyAnalyser.ts
View File

@ -1,24 +1,29 @@
import { observable } from "mobx";
import { editor } from "monaco-editor";
import AssemblyWorker from "worker-loader!./assembly_worker";
import { AssemblyChangeInput, NewAssemblyInput, ScriptWorkerOutput } from "./assembler_messages";
import { AssemblyError } from "./assembly";
import {
AssemblyChangeInput,
AssemblyWorkerOutput,
NewAssemblyInput,
} from "./assembly_worker_messages";
import { AssemblyError, AssemblyWarning } from "./assembly";
import { disassemble } from "./disassembly";
import { Segment } from "./instructions";
import { ObservableQuest } from "../domain/ObservableQuest";
export class AssemblyAnalyser {
@observable warnings: AssemblyWarning[] = [];
@observable errors: AssemblyError[] = [];
private worker = new AssemblyWorker();
private object_code: Segment[] = [];
private quest?: ObservableQuest;
constructor() {
this.worker.onmessage = this.process_worker_message;
}
disassemble(object_code: Segment[]): string[] {
this.object_code = object_code;
const assembly = disassemble(object_code);
disassemble(quest: ObservableQuest): string[] {
this.quest = quest;
const assembly = disassemble(quest.object_code);
const message: NewAssemblyInput = { type: "new_assembly_input", assembly };
this.worker.postMessage(message);
return assembly;
@ -34,10 +39,12 @@ export class AssemblyAnalyser {
}
private process_worker_message = (e: MessageEvent): void => {
const message: ScriptWorkerOutput = e.data;
const message: AssemblyWorkerOutput = e.data;
if (message.type === "new_object_code_output") {
this.object_code.splice(0, this.object_code.length, ...message.object_code);
if (message.type === "new_object_code_output" && this.quest) {
this.quest.object_code.splice(0, this.quest.object_code.length, ...message.object_code);
this.quest.map_designations = message.map_designations;
this.warnings = message.warnings;
this.errors = message.errors;
}
};

10
src/scripting/AssemblyLexer.ts
View File

@ -12,7 +12,7 @@ export enum TokenType {
UnterminatedString,
Ident,
InvalidIdent,
ArgSeperator,
ArgSeparator,
}
export type Token =
@ -29,7 +29,7 @@ export type Token =
| UnterminatedStringToken
| IdentToken
| InvalidIdentToken
| ArgSeperatorToken;
| ArgSeparatorToken;
export type IntToken = {
type: TokenType.Int;
@ -116,8 +116,8 @@ export type InvalidIdentToken = {
len: number;
};
export type ArgSeperatorToken = {
type: TokenType.ArgSeperator;
export type ArgSeparatorToken = {
type: TokenType.ArgSeparator;
col: number;
len: number;
};
@ -159,7 +159,7 @@ export class AssemblyLexer {
} else if (/[-\d]/.test(char)) {
token = this.tokenize_number_or_label();
} else if ("," === char) {
token = { type: TokenType.ArgSeperator, col: this.col, len: 1 };
token = { type: TokenType.ArgSeparator, col: this.col, len: 1 };
this.skip();
} else if ("." === char) {
token = this.tokenize_section();

4
src/scripting/assembly.ts
View File

@ -396,7 +396,7 @@ class Assembler {
let arg_count = 0;
for (const token of this.tokens) {
if (token.type !== TokenType.ArgSeperator) {
if (token.type !== TokenType.ArgSeparator) {
arg_count++;
}
}
@ -510,7 +510,7 @@ class Assembler {
const token = this.tokens[i];
const param = params[param_i];
if (token.type === TokenType.ArgSeperator) {
if (token.type === TokenType.ArgSeparator) {
if (should_be_arg) {
this.add_error({
col: token.col,

40
src/scripting/assembly_worker.ts
View File

@ -1,6 +1,8 @@
import { NewObjectCodeOutput, ScriptWorkerInput } from "./assembler_messages";
import { AssemblyWorkerInput, NewObjectCodeOutput } from "./assembly_worker_messages";
import { assemble } from "./assembly";
import Logger from "js-logger";
import { SegmentType } from "./instructions";
import { Opcode } from "./opcodes";
Logger.useDefaults({
defaultLevel: (Logger as any)[process.env["LOG_LEVEL"] || "OFF"],
@ -9,7 +11,7 @@ Logger.useDefaults({
const ctx: Worker = self as any;
let lines: string[] = [];
const messages: ScriptWorkerInput[] = [];
const messages: AssemblyWorkerInput[] = [];
let timeout: any;
ctx.onmessage = (e: MessageEvent) => {
@ -45,7 +47,7 @@ function process_messages(): void {
endLineNumber,
startColumn,
endColumn,
new_lines[0]
new_lines[0],
);
} else {
// Keep the left part of the first changed line.
@ -55,7 +57,7 @@ function process_messages(): void {
replace_line_part_left(
endLineNumber,
endColumn,
new_lines[new_lines.length - 1]
new_lines[new_lines.length - 1],
);
// Replace all the lines in between.
@ -63,16 +65,34 @@ function process_messages(): void {
replace_lines(
startLineNumber + 1,
endLineNumber - 1,
new_lines.slice(1, new_lines.length - 1)
new_lines.slice(1, new_lines.length - 1),
);
}
}
}
}
const assembler_result = assemble(lines);
const map_designations = new Map<number, number>();
for (const segment of assembler_result.object_code) {
if (segment.labels.includes(0)) {
if (segment.type === SegmentType.Instructions) {
for (const inst of segment.instructions) {
if (inst.opcode === Opcode.BB_MAP_DESIGNATE) {
map_designations.set(inst.args[0].value, inst.args[2].value);
}
}
}
break;
}
}
const response: NewObjectCodeOutput = {
type: "new_object_code_output",
...assemble(lines),
map_designations,
...assembler_result,
};
ctx.postMessage(response);
}
@ -81,7 +101,7 @@ function replace_line_part(
line_no: number,
start_col: number,
end_col: number,
new_line_parts: string[]
new_line_parts: string[],
): void {
const line = lines[line_no - 1];
// We keep the parts of the line that weren't affected by the edit.
@ -96,7 +116,7 @@ function replace_line_part(
1,
line_start + new_line_parts[0],
...new_line_parts.slice(1, new_line_parts.length - 1),
new_line_parts[new_line_parts.length - 1] + line_end
new_line_parts[new_line_parts.length - 1] + line_end,
);
}
}
@ -118,7 +138,7 @@ function replace_lines_and_merge_line_parts(
end_line_no: number,
start_col: number,
end_col: number,
new_line_part: string
new_line_part: string,
): void {
const start_line = lines[start_line_no - 1];
const end_line = lines[end_line_no - 1];
@ -129,6 +149,6 @@ function replace_lines_and_merge_line_parts(
lines.splice(
start_line_no - 1,
end_line_no - start_line_no + 1,
start_line_start + new_line_part + end_line_end
start_line_start + new_line_part + end_line_end,
);
}

8
src/scripting/assembler_messages.ts → src/scripting/assembly_worker_messages.ts
View File

@ -1,8 +1,8 @@
import { editor } from "monaco-editor";
import { AssemblyError } from "./assembly";
import { AssemblyError, AssemblyWarning } from "./assembly";
import { Segment } from "./instructions";
export type ScriptWorkerInput = NewAssemblyInput | AssemblyChangeInput;
export type AssemblyWorkerInput = NewAssemblyInput | AssemblyChangeInput;
export type NewAssemblyInput = {
readonly type: "new_assembly_input";
@ -14,10 +14,12 @@ export type AssemblyChangeInput = {
readonly changes: editor.IModelContentChange[];
};
export type ScriptWorkerOutput = NewObjectCodeOutput;
export type AssemblyWorkerOutput = NewObjectCodeOutput;
export type NewObjectCodeOutput = {
readonly type: "new_object_code_output";
readonly object_code: Segment[];
readonly map_designations: Map<number, number>;
readonly warnings: AssemblyWarning[];
readonly errors: AssemblyError[];
};

4
src/stores/AreaStore.ts
View File

@ -1,7 +1,9 @@
import { ObservableArea, ObservableAreaVariant, Section } from "../domain";
import { Section } from "../domain";
import { load_area_sections } from "../loading/areas";
import { Episode, EPISODES } from "../data_formats/parsing/quest/Episode";
import { get_areas_for_episode } from "../data_formats/parsing/quest/areas";
import { ObservableAreaVariant } from "../domain/ObservableAreaVariant";
import { ObservableArea } from "../domain/ObservableArea";
class AreaStore {
private readonly areas: ObservableArea[][] = [];

37
src/stores/QuestEditorStore.ts
View File

@ -5,20 +5,20 @@ 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 {
ObservableArea,
ObservableQuest,
ObservableQuestEntity,
Section,
ObservableQuestObject,
ObservableQuestNpc,
ObservableQuestObject,
Section,
} from "../domain";
import { read_file } from "../read_file";
import { SimpleUndo, UndoStack, undo_manager } from "../undo";
import { SimpleUndo, undo_manager, UndoStack } from "../undo";
import { application_store } from "./ApplicationStore";
import { area_store } from "./AreaStore";
import { create_new_quest } from "./quest_creation";
import { Episode } from "../data_formats/parsing/quest/Episode";
import { entity_data } from "../data_formats/parsing/quest/entities";
import { ObservableQuest } from "../domain/ObservableQuest";
import { ObservableArea } from "../domain/ObservableArea";
const logger = Logger.get("stores/QuestEditorStore");
@ -71,7 +71,7 @@ class QuestEditorStore {
set_current_area_id = (area_id?: number) => {
this.selected_entity = undefined;
if (area_id == null) {
if (area_id == undefined) {
this.current_area = undefined;
} else if (this.current_quest) {
this.current_area = area_store.get_area(this.current_quest.episode, area_id);
@ -97,9 +97,7 @@ class QuestEditorStore {
quest.short_description,
quest.long_description,
quest.episode,
quest.area_variants.map(variant =>
area_store.get_variant(quest.episode, variant.area.id, variant.id),
),
quest.map_designations,
quest.objects.map(
obj =>
new ObservableQuestObject(
@ -174,7 +172,7 @@ class QuestEditorStore {
type: obj.type,
area_id: obj.area_id,
section_id: obj.section_id,
position: obj.section_position,
position: obj.position,
rotation: obj.rotation,
scale: obj.scale,
unknown: obj.unknown,
@ -183,7 +181,7 @@ class QuestEditorStore {
type: npc.type,
area_id: npc.area_id,
section_id: npc.section_id,
position: npc.section_position,
position: npc.position,
rotation: npc.rotation,
scale: npc.scale,
unknown: npc.unknown,
@ -193,7 +191,7 @@ class QuestEditorStore {
dat_unknowns: quest.dat_unknowns,
object_code: quest.object_code,
shop_items: quest.shop_items,
area_variants: quest.area_variants,
map_designations: quest.map_designations,
},
file_name,
);
@ -223,11 +221,11 @@ class QuestEditorStore {
this.undo.push_action(
`Move ${entity_data(entity.type).name}`,
() => {
entity.position = initial_position;
entity.world_position = initial_position;
quest_editor_store.set_selected_entity(entity);
},
() => {
entity.position = new_position;
entity.world_position = new_position;
quest_editor_store.set_selected_entity(entity);
},
);
@ -286,22 +284,13 @@ class QuestEditorStore {
});
private set_section_on_quest_entity = (entity: ObservableQuestEntity, sections: Section[]) => {
let { x, y, z } = entity.position;
const section = sections.find(s => s.id === entity.section_id);
if (section) {
const { x: sec_x, y: sec_y, z: sec_z } = section.position;
const rot_x = section.cos_y_axis_rotation * x + section.sin_y_axis_rotation * z;
const rot_z = -section.sin_y_axis_rotation * x + section.cos_y_axis_rotation * z;
x = rot_x + sec_x;
y += sec_y;
z = rot_z + sec_z;
entity.section = section;
} else {
logger.warn(`Section ${entity.section_id} not found.`);
}
entity.set_position_and_section(new Vec3(x, y, z), section);
};
}

8
src/stores/quest_creation.ts
View File

@ -1,11 +1,11 @@
import { Vec3 } from "../data_formats/vector";
import { ObservableQuest, ObservableQuestNpc, ObservableQuestObject } from "../domain";
import { area_store } from "./AreaStore";
import { SegmentType, Instruction } from "../scripting/instructions";
import { ObservableQuestNpc, ObservableQuestObject } from "../domain";
import { Instruction, SegmentType } from "../scripting/instructions";
import { Opcode } from "../scripting/opcodes";
import { Episode } from "../data_formats/parsing/quest/Episode";
import { ObjectType } from "../data_formats/parsing/quest/object_types";
import { NpcType } from "../data_formats/parsing/quest/npc_types";
import { ObservableQuest } from "../domain/ObservableQuest";
export function create_new_quest(episode: Episode): ObservableQuest {
if (episode === Episode.II) throw new Error("Episode II not yet supported.");
@ -18,7 +18,7 @@ export function create_new_quest(episode: Episode): ObservableQuest {
"Created with phantasmal.world.",
"Created with phantasmal.world.",
episode,
[area_store.get_variant(episode, 0, 0)],
new Map().set(0, 0),
create_default_objects(),
create_default_npcs(),
[],

8
src/ui/quest_editor/AssemblyEditorComponent.tsx
View File

@ -181,7 +181,7 @@ class MonacoComponent extends Component<MonacoProps> {
this.disposers.push(
this.dispose,
autorun(this.update_model),
autorun(this.update_model_markers)
autorun(this.update_model_markers),
);
}
}
@ -209,7 +209,7 @@ class MonacoComponent extends Component<MonacoProps> {
const quest = quest_editor_store.current_quest;
if (quest && this.editor && this.assembly_analyser) {
const assembly = this.assembly_analyser.disassemble(quest.object_code);
const assembly = this.assembly_analyser.disassemble(quest);
const model = editor.createModel(assembly.join("\n"), "psoasm");
quest_editor_store.script_undo.action = new Action(
@ -223,7 +223,7 @@ class MonacoComponent extends Component<MonacoProps> {
if (this.editor) {
this.editor.trigger("redo stack", "redo", undefined);
}
}
},
);
let initial_version = model.getAlternativeVersionId();
@ -290,7 +290,7 @@ class MonacoComponent extends Component<MonacoProps> {
endLineNumber: error.line_no,
startColumn: error.col,
endColumn: error.col + error.length,
}))
})),
);
};

18
src/ui/quest_editor/EntityInfoComponent.tsx
View File

@ -30,17 +30,17 @@ export class EntityInfoComponent extends Component {
<td>{section_id}</td>
</tr>
<tr>
<th colSpan={2}>World position:</th>
<th colSpan={2}>Section position:</th>
</tr>
<CoordRow entity={entity} position_type="position" coord="x" />
<CoordRow entity={entity} position_type="position" coord="y" />
<CoordRow entity={entity} position_type="position" coord="z" />
<tr>
<th colSpan={2}>Section position:</th>
<th colSpan={2}>World position:</th>
</tr>
<CoordRow entity={entity} position_type="section_position" coord="x" />
<CoordRow entity={entity} position_type="section_position" coord="y" />
<CoordRow entity={entity} position_type="section_position" coord="z" />
<CoordRow entity={entity} position_type="world_position" coord="x" />
<CoordRow entity={entity} position_type="world_position" coord="y" />
<CoordRow entity={entity} position_type="world_position" coord="z" />
</tbody>
</table>
);
@ -58,7 +58,7 @@ export class EntityInfoComponent extends Component {
type CoordProps = {
entity: ObservableQuestEntity;
position_type: "position" | "section_position";
position_type: "position" | "world_position";
coord: "x" | "y" | "z";
};
@ -127,15 +127,15 @@ class CoordInput extends Component<CoordProps, { value: number; initial_position
}
private focus = () => {
this.setState({ initial_position: this.props.entity.position });
this.setState({ initial_position: this.props.entity.world_position });
};
private blur = () => {
if (!this.state.initial_position.equals(this.props.entity.position)) {
if (!this.state.initial_position.equals(this.props.entity.world_position)) {
quest_editor_store.push_entity_move_action(
this.props.entity,
this.state.initial_position,
this.props.entity.position,
this.props.entity.world_position,
);
}
};

2
src/ui/quest_editor/Toolbar.css
View File

@ -4,5 +4,5 @@
}
.main > * {
margin: 0 3px;
margin: 0 3px !important;
}

20
src/ui/quest_editor/Toolbar.tsx
View File

@ -1,7 +1,6 @@
import { Button, Dropdown, Form, Icon, Input, Menu, Modal, Select, Upload } from "antd";
import { ClickParam } from "antd/lib/menu";
import { UploadChangeParam, UploadFile } from "antd/lib/upload/interface";
import { computed } from "mobx";
import { observer } from "mobx-react";
import React, { ChangeEvent, Component, ReactNode } from "react";
import { area_store } from "../../stores/AreaStore";
@ -93,23 +92,6 @@ export class Toolbar extends Component {
@observer
class AreaComponent extends Component {
@computed private get entities_per_area(): Map<number, number> {
const quest = quest_editor_store.current_quest;
const map = new Map<number, number>();
if (quest) {
for (const npc of quest.npcs) {
map.set(npc.area_id, (map.get(npc.area_id) || 0) + 1);
}
for (const obj of quest.objects) {
map.set(obj.area_id, (map.get(obj.area_id) || 0) + 1);
}
}
return map;
}
render(): ReactNode {
const quest = quest_editor_store.current_quest;
const areas = quest ? area_store.get_areas_for_episode(quest.episode) : [];
@ -123,7 +105,7 @@ class AreaComponent extends Component {
disabled={!quest}
>
{areas.map(area => {
const entity_count = quest && this.entities_per_area.get(area.id);
const entity_count = quest && quest.entities_per_area.get(area.id);
return (
<Select.Option key={area.id} value={area.id}>
{area.name}