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

Added prettier and unleashed on the code base.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-07-02 18:08:06 +02:00
parent 37690ef1e6
commit 3498a10385
249 changed files with 6214 additions and 4509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.prettierrc.json Normal file
View File

@ -0,0 +1,6 @@
{
"printWidth": 100,
"tabWidth": 4,
"singleQuote": false,
"trailingComma": "es5"
}

5
package.json
View File

@ -33,8 +33,8 @@
"start": "craco start",
"build": "craco build",
"test": "craco test",
"update_generic_data": "ts-node --project=tsconfig-scripts.json static/update_generic_data.ts",
"update_ephinea_data": "ts-node --project=tsconfig-scripts.json static/update_ephinea_data.ts"
"update_generic_data": "ts-node --project=tsconfig-scripts.json static_generation/update_generic_data.ts",
"update_ephinea_data": "ts-node --project=tsconfig-scripts.json static_generation/update_ephinea_data.ts"
},
"eslintConfig": {
"extends": "react-app"
@ -54,6 +54,7 @@
"devDependencies": {
"@types/cheerio": "^0.22.11",
"cheerio": "^1.0.0-rc.3",
"prettier": "1.18.2",
"ts-node": "^8.3.0"
}
}

93
src/data_formats/BufferCursor.test.ts
View File

@ -1,6 +1,6 @@
import { BufferCursor } from './BufferCursor';
import { BufferCursor } from "./BufferCursor";
test('simple properties and invariants', () => {
test("simple properties and invariants", () => {
const cursor = new BufferCursor(10, true);
expect(cursor.size).toBe(cursor.position + cursor.bytes_left);
@ -11,7 +11,11 @@ test('simple properties and invariants', () => {
expect(cursor.bytes_left).toBe(0);
expect(cursor.little_endian).toBe(true);
cursor.write_u8(99).write_u8(99).write_u8(99).write_u8(99);
cursor
.write_u8(99)
.write_u8(99)
.write_u8(99)
.write_u8(99);
cursor.seek(-1);
expect(cursor.size).toBe(cursor.position + cursor.bytes_left);
@ -23,16 +27,20 @@ test('simple properties and invariants', () => {
expect(cursor.little_endian).toBe(true);
});
test('correct byte order handling', () => {
test("correct byte order handling", () => {
const buffer = new Uint8Array([1, 2, 3, 4]).buffer;
expect(new BufferCursor(buffer, false).u32()).toBe(0x01020304);
expect(new BufferCursor(buffer, true).u32()).toBe(0x04030201);
});
test('reallocation of internal buffer when necessary', () => {
test("reallocation of internal buffer when necessary", () => {
const cursor = new BufferCursor(3, true);
cursor.write_u8(99).write_u8(99).write_u8(99).write_u8(99);
cursor
.write_u8(99)
.write_u8(99)
.write_u8(99)
.write_u8(99);
expect(cursor.size).toBe(4);
expect(cursor.capacity).toBeGreaterThanOrEqual(4);
@ -41,7 +49,7 @@ test('reallocation of internal buffer when necessary', () => {
function test_integer_read(method_name: string) {
test(method_name, () => {
const bytes = parseInt(method_name.replace(/^[iu](\d+)$/, '$1'), 10) / 8;
const bytes = parseInt(method_name.replace(/^[iu](\d+)$/, "$1"), 10) / 8;
let test_number_1 = 0;
let test_number_2 = 0;
// The "false" arrays are for big endian tests and the "true" arrays for little endian tests.
@ -51,20 +59,22 @@ function test_integer_read(method_name: string) {
// Generates numbers of the form 0x010203...
test_number_1 <<= 8;
test_number_1 |= i;
test_arrays['false'].push(i);
test_arrays['true'].unshift(i);
test_arrays["false"].push(i);
test_arrays["true"].unshift(i);
}
for (let i = bytes + 1; i <= 2 * bytes; ++i) {
test_number_2 <<= 8;
test_number_2 |= i;
test_arrays['false'].push(i);
test_arrays['true'].splice(bytes, 0, i);
test_arrays["false"].push(i);
test_arrays["true"].splice(bytes, 0, i);
}
for (const little_endian of [false, true]) {
const cursor = new BufferCursor(
new Uint8Array(test_arrays[String(little_endian)]).buffer, little_endian);
new Uint8Array(test_arrays[String(little_endian)]).buffer,
little_endian
);
expect((cursor as any)[method_name]()).toBe(test_number_1);
expect(cursor.position).toBe(bytes);
@ -75,12 +85,12 @@ function test_integer_read(method_name: string) {
});
}
test_integer_read('u8');
test_integer_read('u16');
test_integer_read('u32');
test_integer_read('i32');
test_integer_read("u8");
test_integer_read("u16");
test_integer_read("u32");
test_integer_read("i32");
test('u8_array', () => {
test("u8_array", () => {
const cursor = new BufferCursor(new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]).buffer, true);
expect(cursor.u8_array(3)).toEqual([1, 2, 3]);
@ -105,40 +115,39 @@ function test_string_read(method_name: string, char_size: number) {
if (!little_endian) char_array_copy.push(char);
}
const cursor = new BufferCursor(
new Uint8Array(char_array_copy).buffer, little_endian);
const cursor = new BufferCursor(new Uint8Array(char_array_copy).buffer, little_endian);
cursor.seek_start(char_size);
expect((cursor as any)[method_name](4 * char_size, true, true)).toBe('AB');
expect((cursor as any)[method_name](4 * char_size, true, true)).toBe("AB");
expect(cursor.position).toBe(5 * char_size);
cursor.seek_start(char_size);
expect((cursor as any)[method_name](2 * char_size, true, true)).toBe('AB');
expect((cursor as any)[method_name](2 * char_size, true, true)).toBe("AB");
expect(cursor.position).toBe(3 * char_size);
cursor.seek_start(char_size);
expect((cursor as any)[method_name](4 * char_size, true, false)).toBe('AB');
expect((cursor as any)[method_name](4 * char_size, true, false)).toBe("AB");
expect(cursor.position).toBe(4 * char_size);
cursor.seek_start(char_size);
expect((cursor as any)[method_name](2 * char_size, true, false)).toBe('AB');
expect((cursor as any)[method_name](2 * char_size, true, false)).toBe("AB");
expect(cursor.position).toBe(3 * char_size);
cursor.seek_start(char_size);
expect((cursor as any)[method_name](4 * char_size, false, true)).toBe('AB\0ÿ');
expect((cursor as any)[method_name](4 * char_size, false, true)).toBe("AB\0ÿ");
expect(cursor.position).toBe(5 * char_size);
cursor.seek_start(char_size);
expect((cursor as any)[method_name](4 * char_size, false, false)).toBe('AB\0ÿ');
expect((cursor as any)[method_name](4 * char_size, false, false)).toBe("AB\0ÿ");
expect(cursor.position).toBe(5 * char_size);
}
});
}
test_string_read('string_ascii', 1);
test_string_read('string_utf16', 2);
test_string_read("string_ascii", 1);
test_string_read("string_utf16", 2);
function test_integer_write(method_name: string) {
test(method_name, () => {
const bytes = parseInt(method_name.replace(/^write_[iu](\d+)$/, '$1'), 10) / 8;
const bytes = parseInt(method_name.replace(/^write_[iu](\d+)$/, "$1"), 10) / 8;
let test_number_1 = 0;
let test_number_2 = 0;
// The "false" arrays are for big endian tests and the "true" arrays for little endian tests.
@ -151,10 +160,10 @@ function test_integer_write(method_name: string) {
test_number_1 |= i;
test_number_2 <<= 8;
test_number_2 |= i + bytes;
test_arrays_1['false'].push(i);
test_arrays_1['true'].unshift(i);
test_arrays_2['false'].push(i + bytes);
test_arrays_2['true'].unshift(i + bytes);
test_arrays_1["false"].push(i);
test_arrays_1["true"].unshift(i);
test_arrays_2["false"].push(i + bytes);
test_arrays_2["true"].unshift(i + bytes);
}
for (const little_endian of [false, true]) {
@ -162,24 +171,26 @@ function test_integer_write(method_name: string) {
(cursor as any)[method_name](test_number_1);
expect(cursor.position).toBe(bytes);
expect(cursor.seek_start(0).u8_array(bytes))
.toEqual(test_arrays_1[String(little_endian)]);
expect(cursor.seek_start(0).u8_array(bytes)).toEqual(
test_arrays_1[String(little_endian)]
);
expect(cursor.position).toBe(bytes);
(cursor as any)[method_name](test_number_2);
expect(cursor.position).toBe(2 * bytes);
expect(cursor.seek_start(0).u8_array(2 * bytes))
.toEqual(test_arrays_1[String(little_endian)].concat(test_arrays_2[String(little_endian)]));
expect(cursor.seek_start(0).u8_array(2 * bytes)).toEqual(
test_arrays_1[String(little_endian)].concat(test_arrays_2[String(little_endian)])
);
}
});
}
test_integer_write('write_u8');
test_integer_write('write_u16');
test_integer_write('write_u32');
test_integer_write("write_u8");
test_integer_write("write_u16");
test_integer_write("write_u32");
test('write_f32', () => {
test("write_f32", () => {
for (const little_endian of [false, true]) {
const cursor = new BufferCursor(0, little_endian);
cursor.write_f32(1337.9001);
@ -195,7 +206,7 @@ test('write_f32', () => {
}
});
test('write_u8_array', () => {
test("write_u8_array", () => {
for (const little_endian of [false, true]) {
const bytes = 10;
const cursor = new BufferCursor(2 * bytes, little_endian);

38
src/data_formats/BufferCursor.ts
View File

@ -1,13 +1,13 @@
// TODO: remove dependency on text-encoding because it is no longer maintained.
import { TextDecoder, TextEncoder } from 'text-encoding';
import { TextDecoder, TextEncoder } from "text-encoding";
const ASCII_DECODER = new TextDecoder('ascii');
const UTF_16BE_DECODER = new TextDecoder('utf-16be');
const UTF_16LE_DECODER = new TextDecoder('utf-16le');
const ASCII_DECODER = new TextDecoder("ascii");
const UTF_16BE_DECODER = new TextDecoder("utf-16be");
const UTF_16LE_DECODER = new TextDecoder("utf-16le");
const ASCII_ENCODER = new TextEncoder('ascii');
const UTF_16BE_ENCODER = new TextEncoder('utf-16be');
const UTF_16LE_ENCODER = new TextEncoder('utf-16le');
const ASCII_ENCODER = new TextEncoder("ascii");
const UTF_16BE_ENCODER = new TextEncoder("utf-16be");
const UTF_16LE_ENCODER = new TextEncoder("utf-16le");
/**
* A cursor for reading and writing binary data.
@ -25,7 +25,7 @@ export class BufferCursor {
set size(size: number) {
if (size < 0) {
throw new Error('Size should be non-negative.')
throw new Error("Size should be non-negative.");
}
this.ensure_capacity(size);
@ -77,7 +77,7 @@ export class BufferCursor {
* @param little_endian - Decides in which byte order multi-byte integers and floats will be interpreted
*/
constructor(buffer_or_capacity: ArrayBuffer | Buffer | number, little_endian: boolean = false) {
if (typeof buffer_or_capacity === 'number') {
if (typeof buffer_or_capacity === "number") {
this.buffer = new ArrayBuffer(buffer_or_capacity);
this.size = 0;
} else if (buffer_or_capacity instanceof ArrayBuffer) {
@ -88,7 +88,7 @@ export class BufferCursor {
this.buffer = buffer_or_capacity.buffer;
this.size = buffer_or_capacity.byteLength;
} else {
throw new Error('buffer_or_capacity should be an ArrayBuffer, a Buffer or a number.');
throw new Error("buffer_or_capacity should be an ArrayBuffer, a Buffer or a number.");
}
this.little_endian = little_endian;
@ -98,7 +98,7 @@ export class BufferCursor {
/**
* Seek forward or backward by a number of bytes.
*
*
* @param offset - if positive, seeks forward by offset bytes, otherwise seeks backward by -offset bytes.
*/
seek(offset: number) {
@ -107,7 +107,7 @@ export class BufferCursor {
/**
* Seek forward from the start of the cursor by a number of bytes.
*
*
* @param offset - greater or equal to 0 and smaller than size
*/
seek_start(offset: number) {
@ -121,7 +121,7 @@ export class BufferCursor {
/**
* Seek backward from the end of the cursor by a number of bytes.
*
*
* @param offset - greater or equal to 0 and smaller than size
*/
seek_end(offset: number) {
@ -231,7 +231,7 @@ export class BufferCursor {
/**
* Consumes a variable number of bytes.
*
*
* @param size - the amount bytes to consume.
* @returns a new cursor containing size bytes.
*/
@ -242,7 +242,9 @@ export class BufferCursor {
this.position += size;
return new BufferCursor(
this.buffer.slice(this.position - size, this.position), this.little_endian);
this.buffer.slice(this.position - size, this.position),
this.little_endian
);
}
/**
@ -253,8 +255,7 @@ export class BufferCursor {
? this.index_of_u8(0, max_byte_length) - this.position
: max_byte_length;
const r = ASCII_DECODER.decode(
new DataView(this.buffer, this.position, string_length));
const r = ASCII_DECODER.decode(new DataView(this.buffer, this.position, string_length));
this.position += drop_remaining
? max_byte_length
: Math.min(string_length + 1, max_byte_length);
@ -270,7 +271,8 @@ export class BufferCursor {
: Math.floor(max_byte_length / 2) * 2;
const r = this.utf16_decoder.decode(
new DataView(this.buffer, this.position, string_length));
new DataView(this.buffer, this.position, string_length)
);
this.position += drop_remaining
? max_byte_length
: Math.min(string_length + 2, max_byte_length);

10
src/data_formats/compression/prs/compress.ts
View File

@ -1,4 +1,4 @@
import { BufferCursor } from '../../BufferCursor';
import { BufferCursor } from "../../BufferCursor";
export function compress(src: BufferCursor): BufferCursor {
const ctx = new Context(src);
@ -57,14 +57,14 @@ export function compress(src: BufferCursor): BufferCursor {
ctx.set_bit(0);
ctx.set_bit((mlen - 2) & 0x02);
ctx.set_bit((mlen - 2) & 0x01);
ctx.write_literal(offset & 0xFF);
ctx.write_literal(offset & 0xff);
ctx.add_intermediates(hash_table, mlen);
continue;
} else if (mlen >= 3 && mlen <= 9) {
// Long match, short length.
ctx.set_bit(0);
ctx.set_bit(1);
ctx.write_literal(((offset & 0x1F) << 3) | ((mlen - 2) & 0x07));
ctx.write_literal(((offset & 0x1f) << 3) | ((mlen - 2) & 0x07));
ctx.write_literal(offset >> 5);
ctx.add_intermediates(hash_table, mlen);
continue;
@ -76,7 +76,7 @@ export function compress(src: BufferCursor): BufferCursor {
ctx.set_bit(0);
ctx.set_bit(1);
ctx.write_literal((offset & 0x1F) << 3);
ctx.write_literal((offset & 0x1f) << 3);
ctx.write_literal(offset >> 5);
ctx.write_literal(mlen - 1);
ctx.add_intermediates(hash_table, mlen);
@ -200,7 +200,7 @@ class Context {
return [0, 0];
}
// If we'd go outside the window, truncate the hash chain now.
// If we'd go outside the window, truncate the hash chain now.
if (this.src.position - entry > MAX_WINDOW) {
hash_table.hash_to_offset[hash] = null;

6
src/data_formats/compression/prs/decompress.ts
View File

@ -1,7 +1,7 @@
import { BufferCursor } from '../../BufferCursor';
import Logger from 'js-logger';
import { BufferCursor } from "../../BufferCursor";
import Logger from "js-logger";
const logger = Logger.get('data_formats/compression/prs/decompress');
const logger = Logger.get("data_formats/compression/prs/decompress");
export function decompress(cursor: BufferCursor) {
const ctx = new Context(cursor);

18
src/data_formats/compression/prs/index.test.ts
View File

@ -1,5 +1,5 @@
import { BufferCursor } from '../../BufferCursor';
import { compress, decompress } from '../prs';
import { BufferCursor } from "../../BufferCursor";
import { compress, decompress } from "../prs";
function test_with_bytes(bytes: number[], expected_compressed_size: number) {
const cursor = new BufferCursor(new Uint8Array(bytes).buffer, true);
@ -29,19 +29,19 @@ function test_with_bytes(bytes: number[], expected_compressed_size: number) {
expect(test_cursor.position).toBe(test_cursor.size);
}
test('PRS compression and decompression, best case', () => {
test("PRS compression and decompression, best case", () => {
// Compression factor: 0.018
test_with_bytes(new Array(1000).fill(128), 18);
});
test('PRS compression and decompression, worst case', () => {
test("PRS compression and decompression, worst case", () => {
const prng = new Prng();
// Compression factor: 1.124
test_with_bytes(new Array(1000).fill(0).map(_ => prng.next_integer(0, 255)), 1124);
});
test('PRS compression and decompression, typical case', () => {
test("PRS compression and decompression, typical case", () => {
const prng = new Prng();
const pattern = [0, 0, 2, 0, 3, 0, 5, 0, 0, 0, 7, 9, 11, 13, 0, 0];
const arrays = new Array(100)
@ -53,19 +53,19 @@ test('PRS compression and decompression, typical case', () => {
test_with_bytes(flattened_array, 1335);
});
test('PRS compression and decompression, 0 bytes', () => {
test("PRS compression and decompression, 0 bytes", () => {
test_with_bytes([], 3);
});
test('PRS compression and decompression, 1 byte', () => {
test("PRS compression and decompression, 1 byte", () => {
test_with_bytes([111], 4);
});
test('PRS compression and decompression, 2 bytes', () => {
test("PRS compression and decompression, 2 bytes", () => {
test_with_bytes([111, 224], 5);
});
test('PRS compression and decompression, 3 bytes', () => {
test("PRS compression and decompression, 3 bytes", () => {
test_with_bytes([56, 237, 158], 6);
});

4
src/data_formats/compression/prs/index.ts
View File

@ -1,2 +1,2 @@
export { compress } from './compress';
export { decompress } from './decompress';
export { compress } from "./compress";
export { decompress } from "./decompress";

4
src/data_formats/encryption/prc.ts
View File

@ -54,7 +54,7 @@ class PrcDecryptor {
let idx;
let tmp = 1;
for (let i = 0x15; i <= 0x46E; i += 0x15) {
for (let i = 0x15; i <= 0x46e; i += 0x15) {
idx = i % 55;
key -= tmp;
this.keys[idx] = tmp;
@ -88,6 +88,6 @@ class PrcDecryptor {
this.key_pos = 1;
}
return data ^ this.keys[this.key_pos++];;
return data ^ this.keys[this.key_pos++];
}
}

81
src/data_formats/parsing/geometry.ts
View File

@ -1,9 +1,22 @@
import Logger from 'js-logger';
import { BufferGeometry, DoubleSide, Face3, Float32BufferAttribute, Geometry, Mesh, MeshBasicMaterial, MeshLambertMaterial, Object3D, TriangleStripDrawMode, Uint16BufferAttribute, Vector3 } from 'three';
import { Section } from '../../domain';
import Logger from "js-logger";
import {
BufferGeometry,
DoubleSide,
Face3,
Float32BufferAttribute,
Geometry,
Mesh,
MeshBasicMaterial,
MeshLambertMaterial,
Object3D,
TriangleStripDrawMode,
Uint16BufferAttribute,
Vector3,
} from "three";
import { Section } from "../../domain";
import { Vec3 } from "../Vec3";
const logger = Logger.get('data_formats/parsing/geometry');
const logger = Logger.get("data_formats/parsing/geometry");
export function parse_c_rel(array_buffer: ArrayBuffer): Object3D {
const dv = new DataView(array_buffer);
@ -12,49 +25,49 @@ export function parse_c_rel(array_buffer: ArrayBuffer): Object3D {
const materials = [
// Wall
new MeshBasicMaterial({
color: 0x80C0D0,
color: 0x80c0d0,
transparent: true,
opacity: 0.25
opacity: 0.25,
}),
// Ground
new MeshLambertMaterial({
color: 0x50D0D0,
side: DoubleSide
color: 0x50d0d0,
side: DoubleSide,
}),
// Vegetation
new MeshLambertMaterial({
color: 0x50B070,
side: DoubleSide
color: 0x50b070,
side: DoubleSide,
}),
// Section transition zone
new MeshLambertMaterial({
color: 0x604080,
side: DoubleSide
})
side: DoubleSide,
}),
];
const wireframe_materials = [
// Wall
new MeshBasicMaterial({
color: 0x90D0E0,
color: 0x90d0e0,
wireframe: true,
transparent: true,
opacity: 0.3,
}),
// Ground
new MeshBasicMaterial({
color: 0x60F0F0,
wireframe: true
color: 0x60f0f0,
wireframe: true,
}),
// Vegetation
new MeshBasicMaterial({
color: 0x60C080,
wireframe: true
color: 0x60c080,
wireframe: true,
}),
// Section transition zone
new MeshBasicMaterial({
color: 0x705090,
wireframe: true
})
wireframe: true,
}),
];
const main_block_offset = dv.getUint32(dv.byteLength - 16, true);
@ -96,7 +109,7 @@ export function parse_c_rel(array_buffer: ArrayBuffer): Object3D {
const is_section_transition = flags & 0b1000000;
const is_vegetation = flags & 0b10000;
const is_ground = flags & 0b1;
const color_index = is_section_transition ? 3 : (is_vegetation ? 2 : (is_ground ? 1 : 0));
const color_index = is_section_transition ? 3 : is_vegetation ? 2 : is_ground ? 1 : 0;
block_geometry.faces.push(new Face3(v1, v2, v3, n, undefined, color_index));
}
@ -115,7 +128,7 @@ export function parse_c_rel(array_buffer: ArrayBuffer): Object3D {
export function parse_n_rel(
array_buffer: ArrayBuffer
): { sections: Section[], object_3d: Object3D } {
): { sections: Section[]; object_3d: Object3D } {
const dv = new DataView(array_buffer);
const sections = new Map();
@ -126,16 +139,12 @@ export function parse_n_rel(
const section_table_offset = dv.getUint32(main_block_offset + 16, true);
// const texture_name_offset = dv.getUint32(main_block_offset + 20, true);
for (
let i = section_table_offset;
i < section_table_offset + section_count * 52;
i += 52
) {
for (let i = section_table_offset; i < section_table_offset + section_count * 52; i += 52) {
const section_id = dv.getInt32(i, true);
const section_x = dv.getFloat32(i + 4, true);
const section_y = dv.getFloat32(i + 8, true);
const section_z = dv.getFloat32(i + 12, true);
const section_rotation = dv.getInt32(i + 20, true) / 0xFFFF * 2 * Math.PI;
const section_rotation = (dv.getInt32(i + 20, true) / 0xffff) * 2 * Math.PI;
const section = new Section(
section_id,
new Vec3(section_x, section_y, section_z),
@ -205,7 +214,9 @@ export function parse_n_rel(
// Assume vertexInfoCount == 1. TODO: Does that make sense?
if (vertex_info_count > 1) {
logger.warn(`Vertex info count of ${vertex_info_count} was larger than expected.`);
logger.warn(
`Vertex info count of ${vertex_info_count} was larger than expected.`
);
}
// const vertex_type = dv.getUint32(vertexInfoTableOffset, true);
@ -246,8 +257,10 @@ export function parse_n_rel(
const x = dv.getFloat32(k, true);
const y = dv.getFloat32(k + 4, true);
const z = dv.getFloat32(k + 8, true);
const rotated_x = section.cos_y_axis_rotation * x + section.sin_y_axis_rotation * z;
const rotated_z = -section.sin_y_axis_rotation * x + section.cos_y_axis_rotation * z;
const rotated_x =
section.cos_y_axis_rotation * x + section.sin_y_axis_rotation * z;
const rotated_z =
-section.sin_y_axis_rotation * x + section.cos_y_axis_rotation * z;
geom_positions.push(section_x + rotated_x);
geom_positions.push(section_y + y);
@ -299,8 +312,8 @@ export function parse_n_rel(
// }
const geometry = new BufferGeometry();
geometry.addAttribute('position', new Float32BufferAttribute(positions, 3));
geometry.addAttribute('normal', new Float32BufferAttribute(normals, 3));
geometry.addAttribute("position", new Float32BufferAttribute(positions, 3));
geometry.addAttribute("normal", new Float32BufferAttribute(normals, 3));
geometry.setIndex(new Uint16BufferAttribute(object_indices, 1));
const mesh = new Mesh(
@ -309,7 +322,7 @@ export function parse_n_rel(
color: 0x44aaff,
// transparent: true,
opacity: 0.25,
side: DoubleSide
side: DoubleSide,
})
);
mesh.setDrawMode(TriangleStripDrawMode);
@ -351,6 +364,6 @@ export function parse_n_rel(
return {
sections: [...sections.values()].sort((a, b) => a.id - b.id),
object_3d: object
object_3d: object,
};
}

164
src/data_formats/parsing/itempmt.ts
View File

@ -1,98 +1,98 @@
import { BufferCursor } from "../BufferCursor";
export type ItemPmt = {
stat_boosts: PmtStatBoost[],
armors: PmtArmor[],
shields: PmtShield[],
units: PmtUnit[],
tools: PmtTool[][],
weapons: PmtWeapon[][],
}
stat_boosts: PmtStatBoost[];
armors: PmtArmor[];
shields: PmtShield[];
units: PmtUnit[];
tools: PmtTool[][];
weapons: PmtWeapon[][];
};
export type PmtStatBoost = {
stat_1: number,
stat_2: number,
amount_1: number,
amount_2: number,
}
stat_1: number;
stat_2: number;
amount_1: number;
amount_2: number;
};
export type PmtWeapon = {
id: number,
type: number,
skin: number,
team_points: number,
class: number,
reserved_1: number,
min_atp: number,
max_atp: number,
req_atp: number,
req_mst: number,
req_ata: number,
mst: number,
max_grind: number,
photon: number,
special: number,
ata: number,
stat_boost: number,
projectile: number,
photon_trail_1_x: number,
photon_trail_1_y: number,
photon_trail_2_x: number,
photon_trail_2_y: number,
photon_type: number,
unknown_1: number[],
tech_boost: number,
combo_type: number,
}
id: number;
type: number;
skin: number;
team_points: number;
class: number;
reserved_1: number;
min_atp: number;
max_atp: number;
req_atp: number;
req_mst: number;
req_ata: number;
mst: number;
max_grind: number;
photon: number;
special: number;
ata: number;
stat_boost: number;
projectile: number;
photon_trail_1_x: number;
photon_trail_1_y: number;
photon_trail_2_x: number;
photon_trail_2_y: number;
photon_type: number;
unknown_1: number[];
tech_boost: number;
combo_type: number;
};
export type PmtArmor = {
id: number,
type: number,
skin: number,
team_points: number,
dfp: number,
evp: number,
block_particle: number,
block_effect: number,
class: number,
reserved_1: number,
required_level: number,
efr: number,
eth: number,
eic: number,
edk: number,
elt: number,
dfp_range: number,
evp_range: number,
stat_boost: number,
tech_boost: number,
unknown_1: number,
}
id: number;
type: number;
skin: number;
team_points: number;
dfp: number;
evp: number;
block_particle: number;
block_effect: number;
class: number;
reserved_1: number;
required_level: number;
efr: number;
eth: number;
eic: number;
edk: number;
elt: number;
dfp_range: number;
evp_range: number;
stat_boost: number;
tech_boost: number;
unknown_1: number;
};
export type PmtShield = PmtArmor
export type PmtShield = PmtArmor;
export type PmtUnit = {
id: number,
type: number,
skin: number,
team_points: number,
stat: number,
stat_amount: number,
plus_minus: number,
reserved: number[]
}
id: number;
type: number;
skin: number;
team_points: number;
stat: number;
stat_amount: number;
plus_minus: number;
reserved: number[];
};
export type PmtTool = {
id: number,
type: number,
skin: number,
team_points: number,
amount: number,
tech: number,
cost: number,
item_flag: number,
reserved: number[],
}
id: number;
type: number;
skin: number;
team_points: number;
amount: number;
tech: number;
cost: number;
item_flag: number;
reserved: number[];
};
export function parse_item_pmt(cursor: BufferCursor): ItemPmt {
cursor.seek_end(32);
@ -103,7 +103,7 @@ export function parse_item_pmt(cursor: BufferCursor): ItemPmt {
cursor.seek_start(main_table_offset);
const compact_table_offsets = cursor.u16_array(main_table_size);
const table_offsets: { offset: number, size: number }[] = [];
const table_offsets: { offset: number; size: number }[] = [];
let expanded_offset: number = 0;
for (const compact_offset of compact_table_offsets) {

42
src/data_formats/parsing/ninja/index.ts
View File

@ -1,45 +1,45 @@
import { Vec3 } from "../../Vec3";
import { BufferCursor } from '../../BufferCursor';
import { NjModel, parse_nj_model } from './nj';
import { parse_xj_model, XjModel } from './xj';
import { BufferCursor } from "../../BufferCursor";
import { NjModel, parse_nj_model } from "./nj";
import { parse_xj_model, XjModel } from "./xj";
// TODO:
// - deal with multiple NJCM chunks
// - deal with other types of chunks
const ANGLE_TO_RAD = 2 * Math.PI / 65536;
const ANGLE_TO_RAD = (2 * Math.PI) / 65536;
export type NinjaVertex = {
position: Vec3,
normal?: Vec3,
bone_weight: number,
bone_weight_status: number,
calc_continue: boolean
}
position: Vec3;
normal?: Vec3;
bone_weight: number;
bone_weight_status: number;
calc_continue: boolean;
};
export type NinjaModel = NjModel | XjModel;
export class NinjaObject<M extends NinjaModel> {
export class NinjaObject<M extends NinjaModel> {
private bone_cache = new Map<number, NinjaObject<M> | null>();
private _bone_count = -1;
constructor(
public evaluation_flags: {
no_translate: boolean,
no_rotate: boolean,
no_scale: boolean,
hidden: boolean,
break_child_trace: boolean,
zxy_rotation_order: boolean,
skip: boolean,
shape_skip: boolean,
no_translate: boolean;
no_rotate: boolean;
no_scale: boolean;
hidden: boolean;
break_child_trace: boolean;
zxy_rotation_order: boolean;
skip: boolean;
shape_skip: boolean;
},
public model: M | undefined,
public position: Vec3,
public rotation: Vec3, // Euler angles in radians.
public scale: Vec3,
public children: NinjaObject<M>[]
) { }
) {}
bone_count(): number {
if (this._bone_count === -1) {
@ -106,7 +106,7 @@ function parse_ninja<M extends NinjaModel>(
const iff_type_id = cursor.string_ascii(4, false, false);
const iff_chunk_size = cursor.u32();
if (iff_type_id === 'NJCM') {
if (iff_type_id === "NJCM") {
return parse_sibling_objects(cursor.take(iff_chunk_size), parse_model, context);
} else {
if (iff_chunk_size > cursor.bytes_left) {

74
src/data_formats/parsing/ninja/motion.ts
View File

@ -1,66 +1,72 @@
import { BufferCursor } from '../../BufferCursor';
import { BufferCursor } from "../../BufferCursor";
import { Vec3 } from "../../Vec3";
const ANGLE_TO_RAD = 2 * Math.PI / 0xFFFF;
const ANGLE_TO_RAD = (2 * Math.PI) / 0xffff;
export type NjMotion = {
motion_data: NjMotionData[],
frame_count: number,
type: number,
interpolation: NjInterpolation,
element_count: number,
}
motion_data: NjMotionData[];
frame_count: number;
type: number;
interpolation: NjInterpolation;
element_count: number;
};
export enum NjInterpolation {
Linear, Spline, UserFunction
Linear,
Spline,
UserFunction,
}
export type NjMotionData = {
tracks: NjKeyframeTrack[],
}
tracks: NjKeyframeTrack[];
};
export enum NjKeyframeTrackType {
Position, Rotation, Scale
Position,
Rotation,
Scale,
}
export type NjKeyframeTrack =
NjKeyframeTrackPosition | NjKeyframeTrackRotation | NjKeyframeTrackScale
| NjKeyframeTrackPosition
| NjKeyframeTrackRotation
| NjKeyframeTrackScale;
export type NjKeyframeTrackPosition = {
type: NjKeyframeTrackType.Position,
keyframes: NjKeyframeF[],
}
type: NjKeyframeTrackType.Position;
keyframes: NjKeyframeF[];
};
export type NjKeyframeTrackRotation = {
type: NjKeyframeTrackType.Rotation,
keyframes: NjKeyframeA[],
}
type: NjKeyframeTrackType.Rotation;
keyframes: NjKeyframeA[];
};
export type NjKeyframeTrackScale = {
type: NjKeyframeTrackType.Scale,
keyframes: NjKeyframeF[],
}
type: NjKeyframeTrackType.Scale;
keyframes: NjKeyframeF[];
};
export type NjKeyframe = NjKeyframeF | NjKeyframeA
export type NjKeyframe = NjKeyframeF | NjKeyframeA;
/**
* Used for parallel motion (POS), scale (SCL) and vector (VEC).
*/
export type NjKeyframeF = {
frame: number,
value: Vec3,
}
frame: number;
value: Vec3;
};
/**
* Used for rotation (ANG).
*/
export type NjKeyframeA = {
frame: number,
value: Vec3, // Euler angles in radians.
}
frame: number;
value: Vec3; // Euler angles in radians.
};
export function parse_njm(cursor: BufferCursor, bone_count: number): NjMotion {
if (cursor.string_ascii(4, false, true) === 'NMDM') {
if (cursor.string_ascii(4, false, true) === "NMDM") {
return parse_njm_v2(cursor, bone_count);
} else {
cursor.seek_start(0);
@ -135,7 +141,7 @@ function parse_motion(cursor: BufferCursor, bone_count: number): NjMotion {
if (count) {
motion_data.tracks.push({
type: NjKeyframeTrackType.Position,
keyframes: parse_motion_data_f(cursor, count)
keyframes: parse_motion_data_f(cursor, count),
});
}
}
@ -148,7 +154,7 @@ function parse_motion(cursor: BufferCursor, bone_count: number): NjMotion {
if (count) {
motion_data.tracks.push({
type: NjKeyframeTrackType.Rotation,
keyframes: parse_motion_data_a(cursor, count, frame_count)
keyframes: parse_motion_data_a(cursor, count, frame_count),
});
}
}
@ -161,7 +167,7 @@ function parse_motion(cursor: BufferCursor, bone_count: number): NjMotion {
if (count) {
motion_data.tracks.push({
type: NjKeyframeTrackType.Scale,
keyframes: parse_motion_data_f(cursor, count)
keyframes: parse_motion_data_f(cursor, count),
});
}
}
@ -174,7 +180,7 @@ function parse_motion(cursor: BufferCursor, bone_count: number): NjMotion {
frame_count,
type,
interpolation,
element_count
element_count,
};
}

263
src/data_formats/parsing/ninja/nj.ts
View File

@ -1,9 +1,9 @@
import Logger from 'js-logger';
import { BufferCursor } from '../../BufferCursor';
import Logger from "js-logger";
import { BufferCursor } from "../../BufferCursor";
import { Vec3 } from "../../Vec3";
import { NinjaVertex } from '../ninja';
import { NinjaVertex } from "../ninja";
const logger = Logger.get('data_formats/parsing/ninja/nj');
const logger = Logger.get("data_formats/parsing/ninja/nj");
// TODO:
// - textures
@ -13,109 +13,126 @@ const logger = Logger.get('data_formats/parsing/ninja/nj');
// - deal with vertex information contained in triangle strips
export type NjModel = {
type: 'nj',
type: "nj";
/**
* Sparse array of vertices.
*/
vertices: NinjaVertex[],
meshes: NjTriangleStrip[],
vertices: NinjaVertex[];
meshes: NjTriangleStrip[];
// materials: [],
bounding_sphere_center: Vec3,
bounding_sphere_radius: number,
}
bounding_sphere_center: Vec3;
bounding_sphere_radius: number;
};
enum NjChunkType {
Unknown, Null, Bits, CachePolygonList, DrawPolygonList, Tiny, Material, Vertex, Volume, Strip, End
Unknown,
Null,
Bits,
CachePolygonList,
DrawPolygonList,
Tiny,
Material,
Vertex,
Volume,
Strip,
End,
}
type NjChunk = {
type: NjChunkType,
type_id: number,
} & (NjUnknownChunk | NjNullChunk | NjBitsChunk | NjCachePolygonListChunk | NjDrawPolygonListChunk | NjTinyChunk | NjMaterialChunk | NjVertexChunk | NjVolumeChunk | NjStripChunk | NjEndChunk)
type: NjChunkType;
type_id: number;
} & (
| NjUnknownChunk
| NjNullChunk
| NjBitsChunk
| NjCachePolygonListChunk
| NjDrawPolygonListChunk
| NjTinyChunk
| NjMaterialChunk
| NjVertexChunk
| NjVolumeChunk
| NjStripChunk
| NjEndChunk);
type NjUnknownChunk = {
type: NjChunkType.Unknown,
}
type: NjChunkType.Unknown;
};
type NjNullChunk = {
type: NjChunkType.Null,
}
type: NjChunkType.Null;
};
type NjBitsChunk = {
type: NjChunkType.Bits,
}
type: NjChunkType.Bits;
};
type NjCachePolygonListChunk = {
type: NjChunkType.CachePolygonList,
cache_index: number,
offset: number,
}
type: NjChunkType.CachePolygonList;
cache_index: number;
offset: number;
};
type NjDrawPolygonListChunk = {
type: NjChunkType.DrawPolygonList,
cache_index: number
}
type: NjChunkType.DrawPolygonList;
cache_index: number;
};
type NjTinyChunk = {
type: NjChunkType.Tiny,
}
type: NjChunkType.Tiny;
};
type NjMaterialChunk = {
type: NjChunkType.Material,
}
type: NjChunkType.Material;
};
type NjVertexChunk = {
type: NjChunkType.Vertex,
vertices: NjVertex[]
}
type: NjChunkType.Vertex;
vertices: NjVertex[];
};
type NjVolumeChunk = {
type: NjChunkType.Volume,
}
type: NjChunkType.Volume;
};
type NjStripChunk = {
type: NjChunkType.Strip,
triangle_strips: NjTriangleStrip[]
}
type: NjChunkType.Strip;
triangle_strips: NjTriangleStrip[];
};
type NjEndChunk = {
type: NjChunkType.End,
}
type: NjChunkType.End;
};
type NjVertex = {
index: number,
position: Vec3,
normal?: Vec3,
bone_weight: number,
bone_weight_status: number,
calc_continue: boolean,
}
index: number;
position: Vec3;
normal?: Vec3;
bone_weight: number;
bone_weight_status: number;
calc_continue: boolean;
};
type NjTriangleStrip = {
ignore_light: boolean,
ignore_specular: boolean,
ignore_ambient: boolean,
use_alpha: boolean,
double_side: boolean,
flat_shading: boolean,
environment_mapping: boolean,
clockwise_winding: boolean,
vertices: NjMeshVertex[],
}
ignore_light: boolean;
ignore_specular: boolean;
ignore_ambient: boolean;
use_alpha: boolean;
double_side: boolean;
flat_shading: boolean;
environment_mapping: boolean;
clockwise_winding: boolean;
vertices: NjMeshVertex[];
};
type NjMeshVertex = {
index: number,
normal?: Vec3,
}
index: number;
normal?: Vec3;
};
export function parse_nj_model(cursor: BufferCursor, cached_chunk_offsets: number[]): NjModel {
const vlist_offset = cursor.u32(); // Vertex list
const plist_offset = cursor.u32(); // Triangle strip index list
const bounding_sphere_center = new Vec3(
cursor.f32(),
cursor.f32(),
cursor.f32()
);
const bounding_sphere_center = new Vec3(cursor.f32(), cursor.f32(), cursor.f32());
const bounding_sphere_radius = cursor.f32();
const vertices: NinjaVertex[] = [];
const meshes: NjTriangleStrip[] = [];
@ -131,7 +148,7 @@ export function parse_nj_model(cursor: BufferCursor, cached_chunk_offsets: numbe
normal: vertex.normal,
bone_weight: vertex.bone_weight,
bone_weight_status: vertex.bone_weight_status,
calc_continue: vertex.calc_continue
calc_continue: vertex.calc_continue,
};
}
}
@ -149,11 +166,11 @@ export function parse_nj_model(cursor: BufferCursor, cached_chunk_offsets: numbe
}
return {
type: 'nj',
type: "nj",
vertices,
meshes,
bounding_sphere_center,
bounding_sphere_radius
bounding_sphere_radius,
};
}
@ -175,12 +192,12 @@ function parse_chunks(
if (type_id === 0) {
chunks.push({
type: NjChunkType.Null,
type_id
type_id,
});
} else if (1 <= type_id && type_id <= 3) {
chunks.push({
type: NjChunkType.Bits,
type_id
type_id,
});
} else if (type_id === 4) {
const cache_index = flags;
@ -189,7 +206,7 @@ function parse_chunks(
type: NjChunkType.CachePolygonList,
type_id,
cache_index,
offset
offset,
});
cached_chunk_offsets[cache_index] = offset;
loop = false;
@ -199,60 +216,58 @@ function parse_chunks(
if (cached_offset != null) {
cursor.seek_start(cached_offset);
chunks.push(
...parse_chunks(cursor, cached_chunk_offsets, wide_end_chunks)
);
chunks.push(...parse_chunks(cursor, cached_chunk_offsets, wide_end_chunks));
}
chunks.push({
type: NjChunkType.DrawPolygonList,
type_id,
cache_index
cache_index,
});
} else if (8 <= type_id && type_id <= 9) {
size = 2;
chunks.push({
type: NjChunkType.Tiny,
type_id
type_id,
});
} else if (17 <= type_id && type_id <= 31) {
size = 2 + 2 * cursor.u16();
chunks.push({
type: NjChunkType.Material,
type_id
type_id,
});
} else if (32 <= type_id && type_id <= 50) {
size = 2 + 4 * cursor.u16();
chunks.push({
type: NjChunkType.Vertex,
type_id,
vertices: parse_vertex_chunk(cursor, type_id, flags)
vertices: parse_vertex_chunk(cursor, type_id, flags),
});
} else if (56 <= type_id && type_id <= 58) {
size = 2 + 2 * cursor.u16();
chunks.push({
type: NjChunkType.Volume,
type_id
type_id,
});
} else if (64 <= type_id && type_id <= 75) {
size = 2 + 2 * cursor.u16();
chunks.push({
type: NjChunkType.Strip,
type_id,
triangle_strips: parse_triangle_strip_chunk(cursor, type_id, flags)
triangle_strips: parse_triangle_strip_chunk(cursor, type_id, flags),
});
} else if (type_id === 255) {
size = wide_end_chunks ? 2 : 0;
chunks.push({
type: NjChunkType.End,
type_id
type_id,
});
loop = false;
} else {
size = 2 + 2 * cursor.u16();
chunks.push({
type: NjChunkType.Unknown,
type_id
type_id,
});
logger.warn(`Unknown chunk type ${type_id} at offset ${chunk_start_position}.`);
}
@ -287,11 +302,11 @@ function parse_vertex_chunk(
position: new Vec3(
cursor.f32(), // x
cursor.f32(), // y
cursor.f32(), // z
cursor.f32() // z
),
bone_weight: 1,
bone_weight_status,
calc_continue
calc_continue,
};
if (chunk_type_id === 32) {
@ -303,7 +318,7 @@ function parse_vertex_chunk(
vertex.normal = new Vec3(
cursor.f32(), // x
cursor.f32(), // y
cursor.f32(), // z
cursor.f32() // z
);
cursor.seek(4); // Always 0.0
} else if (35 <= chunk_type_id && chunk_type_id <= 40) {
@ -320,7 +335,7 @@ function parse_vertex_chunk(
vertex.normal = new Vec3(
cursor.f32(), // x
cursor.f32(), // y
cursor.f32(), // z
cursor.f32() // z
);
if (chunk_type_id >= 42) {
@ -338,9 +353,9 @@ function parse_vertex_chunk(
// 32-Bit vertex normal in format: reserved(2)|x(10)|y(10)|z(10)
const normal = cursor.u32();
vertex.normal = new Vec3(
((normal >> 20) & 0x3FF) / 0x3FF,
((normal >> 10) & 0x3FF) / 0x3FF,
(normal & 0x3FF) / 0x3FF
((normal >> 20) & 0x3ff) / 0x3ff,
((normal >> 10) & 0x3ff) / 0x3ff,
(normal & 0x3ff) / 0x3ff
);
if (chunk_type_id >= 49) {
@ -371,31 +386,51 @@ function parse_triangle_strip_chunk(
};
const user_offset_and_strip_count = cursor.u16();
const user_flags_size = user_offset_and_strip_count >>> 14;
const strip_count = user_offset_and_strip_count & 0x3FFF;
const strip_count = user_offset_and_strip_count & 0x3fff;
let options;
switch (chunk_type_id) {
case 64: options = [false, false, false, false]; break;
case 65: options = [true, false, false, false]; break;
case 66: options = [true, false, false, false]; break;
case 67: options = [false, false, true, false]; break;
case 68: options = [true, false, true, false]; break;
case 69: options = [true, false, true, false]; break;
case 70: options = [false, true, false, false]; break;
case 71: options = [true, true, false, false]; break;
case 72: options = [true, true, false, false]; break;
case 73: options = [false, false, false, false]; break;
case 74: options = [true, false, false, true]; break;
case 75: options = [true, false, false, true]; break;
default: throw new Error(`Unexpected chunk type ID: ${chunk_type_id}.`);
case 64:
options = [false, false, false, false];
break;
case 65:
options = [true, false, false, false];
break;
case 66:
options = [true, false, false, false];
break;
case 67:
options = [false, false, true, false];
break;
case 68:
options = [true, false, true, false];
break;
case 69:
options = [true, false, true, false];
break;
case 70:
options = [false, true, false, false];
break;
case 71:
options = [true, true, false, false];
break;
case 72:
options = [true, true, false, false];
break;
case 73:
options = [false, false, false, false];
break;
case 74:
options = [true, false, false, true];
break;
case 75:
options = [true, false, false, true];
break;
default:
throw new Error(`Unexpected chunk type ID: ${chunk_type_id}.`);
}
const [
parse_texture_coords,
parse_color,
parse_normal,
parse_texture_coords_hires
] = options;
const [parse_texture_coords, parse_color, parse_normal, parse_texture_coords_hires] = options;
const strips: NjTriangleStrip[] = [];
@ -408,7 +443,7 @@ function parse_triangle_strip_chunk(
for (let j = 0; j < index_count; ++j) {
const vertex: NjMeshVertex = {
index: cursor.u16()
index: cursor.u16(),
};
vertices.push(vertex);
@ -421,11 +456,7 @@ function parse_triangle_strip_chunk(
}
if (parse_normal) {
vertex.normal = new Vec3(
cursor.u16(),
cursor.u16(),
cursor.u16()
);
vertex.normal = new Vec3(cursor.u16(), cursor.u16(), cursor.u16());
}
if (parse_texture_coords_hires) {

42
src/data_formats/parsing/ninja/xj.ts
View File

@ -1,6 +1,6 @@
import { BufferCursor } from '../../BufferCursor';
import { BufferCursor } from "../../BufferCursor";
import { Vec3 } from "../../Vec3";
import { NinjaVertex } from '../ninja';
import { NinjaVertex } from "../ninja";
// TODO:
// - textures
@ -9,14 +9,14 @@ import { NinjaVertex } from '../ninja';
// - animation
export type XjModel = {
type: 'xj',
vertices: NinjaVertex[],
meshes: XjTriangleStrip[],
}
type: "xj";
vertices: NinjaVertex[];
meshes: XjTriangleStrip[];
};
export type XjTriangleStrip = {
indices: number[],
}
indices: number[];
};
export function parse_xj_model(cursor: BufferCursor): XjModel {
cursor.seek(4); // Flags according to QEdit, seemingly always 0.
@ -29,9 +29,9 @@ export function parse_xj_model(cursor: BufferCursor): XjModel {
cursor.seek(16); // Bounding sphere position and radius in floats.
const model: XjModel = {
type: 'xj',
type: "xj",
vertices: [],
meshes: []
meshes: [],
};
if (vertex_info_list_offset) {
@ -43,22 +43,20 @@ export function parse_xj_model(cursor: BufferCursor): XjModel {
for (let i = 0; i < vertex_count; ++i) {
cursor.seek_start(vertexList_offset + i * vertex_size);
const position = new Vec3(
cursor.f32(),
cursor.f32(),
cursor.f32()
);
const position = new Vec3(cursor.f32(), cursor.f32(), cursor.f32());
let normal: Vec3 | undefined;
if (vertex_size === 28 || vertex_size === 32 || vertex_size === 36) {
normal = new Vec3(
cursor.f32(),
cursor.f32(),
cursor.f32()
);
normal = new Vec3(cursor.f32(), cursor.f32(), cursor.f32());
}
model.vertices.push({ position, normal, bone_weight: 1.0, bone_weight_status: 0, calc_continue: true });
model.vertices.push({
position,
normal,
bone_weight: 1.0,
bone_weight_status: 0,
calc_continue: true,
});
}
}
@ -88,7 +86,7 @@ export function parse_xj_model(cursor: BufferCursor): XjModel {
function parse_triangle_strip_list(
cursor: BufferCursor,
triangle_strip_list_offset: number,
triangle_strip_count: number,
triangle_strip_count: number
): XjTriangleStrip[] {
const strips: XjTriangleStrip[] = [];

4
src/data_formats/parsing/prc.ts
View File

@ -1,9 +1,9 @@
import { BufferCursor } from "../BufferCursor";
import { decrypt } from "../encryption/prc";
import { decompress } from "../compression/prs";
import Logger from 'js-logger';
import Logger from "js-logger";
const logger = Logger.get('data_formats/parsing/prc');
const logger = Logger.get("data_formats/parsing/prc");
/**
* Decrypts and decompresses a .prc file.

12
src/data_formats/parsing/quest/bin.test.ts
View File

@ -1,13 +1,13 @@
import * as fs from 'fs';
import { BufferCursor } from '../../BufferCursor';
import * as prs from '../../compression/prs';
import { parse_bin, write_bin } from './bin';
import * as fs from "fs";
import { BufferCursor } from "../../BufferCursor";
import * as prs from "../../compression/prs";
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').buffer;
test("parse_bin and write_bin", () => {
const orig_buffer = fs.readFileSync("test/resources/quest118_e.bin").buffer;
const orig_bin = prs.decompress(new BufferCursor(orig_buffer, true));
const test_bin = write_bin(parse_bin(orig_bin));
orig_bin.seek_start(0);

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

File diff suppressed because it is too large Load Diff

16
src/data_formats/parsing/quest/dat.test.ts
View File

@ -1,13 +1,13 @@
import * as fs from 'fs';
import { BufferCursor } from '../../BufferCursor';
import * as prs from '../../compression/prs';
import { parse_dat, write_dat } from './dat';
import * as fs from "fs";
import { BufferCursor } from "../../BufferCursor";
import * as prs from "../../compression/prs";
import { parse_dat, write_dat } from "./dat";
/**
* Parse a file, convert the resulting structure to DAT again and check whether the end result is equal to the original.
*/
test('parse_dat and write_dat', () => {
const orig_buffer = fs.readFileSync('test/resources/quest118_e.dat').buffer;
test("parse_dat and write_dat", () => {
const orig_buffer = fs.readFileSync("test/resources/quest118_e.dat").buffer;
const orig_dat = prs.decompress(new BufferCursor(orig_buffer, true));
const test_dat = write_dat(parse_dat(orig_dat));
orig_dat.seek_start(0);
@ -29,8 +29,8 @@ test('parse_dat and write_dat', () => {
/**
* Parse a file, modify the resulting structure, convert it to DAT again and check whether the end result is equal to the original except for the bytes that should be changed.
*/
test('parse, modify and write DAT', () => {
const orig_buffer = fs.readFileSync('./test/resources/quest118_e.dat').buffer;
test("parse, modify and write DAT", () => {
const orig_buffer = fs.readFileSync("./test/resources/quest118_e.dat").buffer;
const orig_dat = prs.decompress(new BufferCursor(orig_buffer, true));
const test_parsed = parse_dat(orig_dat);
orig_dat.seek_start(0);

101
src/data_formats/parsing/quest/dat.ts
View File

@ -1,42 +1,42 @@
import { groupBy } from 'lodash';
import { BufferCursor } from '../../BufferCursor';
import Logger from 'js-logger';
import { Vec3 } from '../../Vec3';
import { groupBy } from "lodash";
import { BufferCursor } from "../../BufferCursor";
import Logger from "js-logger";
import { Vec3 } from "../../Vec3";
const logger = Logger.get('data_formats/parsing/quest/dat');
const logger = Logger.get("data_formats/parsing/quest/dat");
const OBJECT_SIZE = 68;
const NPC_SIZE = 72;
export type DatFile = {
objs: DatObject[],
npcs: DatNpc[],
unknowns: DatUnknown[],
}
objs: DatObject[];
npcs: DatNpc[];
unknowns: DatUnknown[];
};
export type DatEntity = {
type_id: number,
section_id: number,
position: Vec3,
rotation: Vec3,
area_id: number,
unknown: number[][],
}
type_id: number;
section_id: number;
position: Vec3;
rotation: Vec3;
area_id: number;
unknown: number[][];
};
export type DatObject = DatEntity
export type DatObject = DatEntity;
export type DatNpc = DatEntity & {
flags: number,
skin: number,
}
flags: number;
skin: number;
};
export type DatUnknown = {
entity_type: number,
total_size: number,
area_id: number,
entities_size: number,
data: number[],
}
entity_type: number;
total_size: number;
area_id: number;
entities_size: number;
data: number[];
};
export function parse_dat(cursor: BufferCursor): DatFile {
const objs: DatObject[] = [];
@ -53,10 +53,14 @@ export function parse_dat(cursor: BufferCursor): DatFile {
break;
} else {
if (entities_size !== total_size - 16) {
throw Error(`Malformed DAT file. Expected an entities size of ${total_size - 16}, got ${entities_size}.`);
throw Error(
`Malformed DAT file. Expected an entities size of ${total_size -
16}, got ${entities_size}.`
);
}
if (entity_type === 1) { // Objects
if (entity_type === 1) {
// Objects
const object_count = Math.floor(entities_size / OBJECT_SIZE);
const start_position = cursor.position;
@ -68,9 +72,9 @@ export function parse_dat(cursor: BufferCursor): DatFile {
const x = cursor.f32();
const y = cursor.f32();
const z = cursor.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 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);
@ -80,17 +84,20 @@ export function parse_dat(cursor: BufferCursor): DatFile {
position: new Vec3(x, y, z),
rotation: new Vec3(rotation_x, rotation_y, rotation_z),
area_id,
unknown: [unknown1, unknown2, unknown3]
unknown: [unknown1, unknown2, unknown3],
});
}
const bytes_read = cursor.position - start_position;
if (bytes_read !== entities_size) {
logger.warn(`Read ${bytes_read} bytes instead of expected ${entities_size} for entity type ${entity_type} (Object).`);
logger.warn(
`Read ${bytes_read} bytes instead of expected ${entities_size} for entity type ${entity_type} (Object).`
);
cursor.seek(entities_size - bytes_read);
}
} else if (entity_type === 2) { // NPCs
} else if (entity_type === 2) {
// NPCs
const npc_count = Math.floor(entities_size / NPC_SIZE);
const start_position = cursor.position;
@ -102,9 +109,9 @@ export function parse_dat(cursor: BufferCursor): DatFile {
const x = cursor.f32();
const y = cursor.f32();
const z = cursor.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 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);
@ -119,14 +126,16 @@ export function parse_dat(cursor: BufferCursor): DatFile {
skin,
area_id,
flags,
unknown: [unknown1, unknown2, unknown3, unknown4, unknown5]
unknown: [unknown1, unknown2, unknown3, unknown4, unknown5],
});
}
const bytes_read = cursor.position - start_position;
if (bytes_read !== entities_size) {
logger.warn(`Read ${bytes_read} bytes instead of expected ${entities_size} for entity type ${entity_type} (NPC).`);
logger.warn(
`Read ${bytes_read} bytes instead of expected ${entities_size} for entity type ${entity_type} (NPC).`
);
cursor.seek(entities_size - bytes_read);
}
} else {
@ -136,7 +145,7 @@ export function parse_dat(cursor: BufferCursor): DatFile {
total_size,
area_id,
entities_size,
data: cursor.u8_array(entities_size)
data: cursor.u8_array(entities_size),
});
}
}
@ -172,9 +181,9 @@ export function write_dat({ objs, npcs, unknowns }: DatFile): BufferCursor {
cursor.write_f32(obj.position.x);
cursor.write_f32(obj.position.y);
cursor.write_f32(obj.position.z);
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_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_u8_array(obj.unknown[2]);
}
}
@ -200,9 +209,9 @@ export function write_dat({ objs, npcs, unknowns }: DatFile): BufferCursor {
cursor.write_f32(npc.position.x);
cursor.write_f32(npc.position.y);
cursor.write_f32(npc.position.z);
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_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_u8_array(npc.unknown[2]);
cursor.write_f32(npc.flags);
cursor.write_u8_array(npc.unknown[3]);

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

@ -1,23 +1,34 @@
import * as fs from 'fs';
import { BufferCursor } from '../../BufferCursor';
import { parse_quest, write_quest_qst } from '../quest';
import { ObjectType, Quest } from '../../../domain';
import * as fs from "fs";
import { BufferCursor } from "../../BufferCursor";
import { parse_quest, write_quest_qst } from "../quest";
import { ObjectType, Quest } from "../../../domain";
test('parse Towards the Future', () => {
const buffer = fs.readFileSync('test/resources/quest118_e.qst').buffer;
test("parse Towards the Future", () => {
const buffer = fs.readFileSync("test/resources/quest118_e.qst").buffer;
const cursor = new BufferCursor(buffer, true);
const quest = parse_quest(cursor)!;
expect(quest.name).toBe('Towards the Future');
expect(quest.short_description).toBe('Challenge the\nnew simulator.');
expect(quest.long_description).toBe('Client: Principal\nQuest: Wishes to have\nhunters challenge the\nnew simulator\nReward: ??? Meseta');
expect(quest.name).toBe("Towards the Future");
expect(quest.short_description).toBe("Challenge the\nnew simulator.");
expect(quest.long_description).toBe(
"Client: Principal\nQuest: Wishes to have\nhunters challenge the\nnew simulator\nReward: ??? Meseta"
);
expect(quest.episode).toBe(1);
expect(quest.objects.length).toBe(277);
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]
[0, 0],
[2, 0],
[11, 0],
[5, 4],
[12, 0],
[7, 4],
[13, 0],
[8, 4],
[10, 4],
[14, 0],
]);
});
@ -25,22 +36,19 @@ test('parse Towards the Future', () => {
* Parse a QST file, write the resulting Quest object to QST again, then parse that again.
* Then check whether the two Quest objects are equal.
*/
test('parse_quest and write_quest_qst', () => {
const buffer = fs.readFileSync('test/resources/tethealla_v0.143_quests/solo/ep1/02.qst').buffer;
test("parse_quest and write_quest_qst", () => {
const buffer = fs.readFileSync("test/resources/tethealla_v0.143_quests/solo/ep1/02.qst").buffer;
const cursor = new BufferCursor(buffer, true);
const orig_quest = parse_quest(cursor)!;
const test_quest = parse_quest(write_quest_qst(orig_quest, '02.qst'))!;
const test_quest = parse_quest(write_quest_qst(orig_quest, "02.qst"))!;
expect(test_quest.name).toBe(orig_quest.name);
expect(test_quest.short_description).toBe(orig_quest.short_description);
expect(test_quest.long_description).toBe(orig_quest.long_description);
expect(test_quest.episode).toBe(orig_quest.episode);
expect(testable_objects(test_quest))
.toEqual(testable_objects(orig_quest));
expect(testable_npcs(test_quest))
.toEqual(testable_npcs(orig_quest));
expect(testable_area_variants(test_quest))
.toEqual(testable_area_variants(orig_quest));
expect(testable_objects(test_quest)).toEqual(testable_objects(orig_quest));
expect(testable_npcs(test_quest)).toEqual(testable_npcs(orig_quest));
expect(testable_area_variants(test_quest)).toEqual(testable_area_variants(orig_quest));
});
function testable_objects(quest: Quest) {
@ -48,17 +56,12 @@ function testable_objects(quest: Quest) {
object.area_id,
object.section_id,
object.position,
object.type
object.type,
]);
}
function testable_npcs(quest: Quest) {
return quest.npcs.map(npc => [
npc.area_id,
npc.section_id,
npc.position,
npc.type
]);
return quest.npcs.map(npc => [npc.area_id, npc.section_id, npc.position, npc.type]);
}
function testable_area_variants(quest: Quest) {

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

@ -1,18 +1,18 @@
import Logger from 'js-logger';
import { AreaVariant, NpcType, ObjectType, Quest, QuestNpc, QuestObject } from '../../../domain';
import { area_store } from '../../../stores/AreaStore';
import { BufferCursor } from '../../BufferCursor';
import * as prs from '../../compression/prs';
import Logger from "js-logger";
import { AreaVariant, NpcType, ObjectType, Quest, QuestNpc, QuestObject } from "../../../domain";
import { area_store } from "../../../stores/AreaStore";
import { BufferCursor } from "../../BufferCursor";
import * as prs from "../../compression/prs";
import { Vec3 } from "../../Vec3";
import { Instruction, parse_bin, write_bin } from './bin';
import { DatFile, DatNpc, DatObject, parse_dat, write_dat } from './dat';
import { parse_qst, QstContainedFile, write_qst } from './qst';
import { Instruction, parse_bin, write_bin } from "./bin";
import { DatFile, DatNpc, DatObject, parse_dat, write_dat } from "./dat";
import { parse_qst, QstContainedFile, write_qst } from "./qst";
const logger = Logger.get('data_formats/parsing/quest');
const logger = Logger.get("data_formats/parsing/quest");
/**
* High level parsing function that delegates to lower level parsing functions.
*
*
* Always delegates to parseQst at the moment.
*/
export function parse_quest(cursor: BufferCursor, lenient: boolean = false): Quest | undefined {
@ -28,9 +28,9 @@ export function parse_quest(cursor: BufferCursor, lenient: boolean = false): Que
for (const file of qst.files) {
const file_name = file.name.trim().toLowerCase();
if (file_name.endsWith('.dat')) {
if (file_name.endsWith(".dat")) {
dat_file = file;
} else if (file_name.endsWith('.bin')) {
} else if (file_name.endsWith(".bin")) {
bin_file = file;
}
}
@ -38,12 +38,12 @@ export function parse_quest(cursor: BufferCursor, lenient: boolean = false): Que
// TODO: deal with missing/multiple DAT or BIN file.
if (!dat_file) {
logger.error('File contains no DAT file.');
logger.error("File contains no DAT file.");
return;
}
if (!bin_file) {
logger.error('File contains no BIN file.');
logger.error("File contains no BIN file.");
return;
}
@ -62,7 +62,7 @@ export function parse_quest(cursor: BufferCursor, lenient: boolean = false): Que
logger.warn(`Function 0 offset ${bin.function_offsets[0]} is invalid.`);
}
} else {
logger.warn('File contains no functions.');
logger.warn("File contains no functions.");
}
return new Quest(
@ -83,25 +83,25 @@ export function write_quest_qst(quest: Quest, file_name: string): BufferCursor {
const dat = write_dat({
objs: objects_to_dat_data(quest.objects),
npcs: npcsToDatData(quest.npcs),
unknowns: quest.dat_unknowns
unknowns: quest.dat_unknowns,
});
const bin = write_bin({ data: quest.bin_data });
const ext_start = file_name.lastIndexOf('.');
const ext_start = file_name.lastIndexOf(".");
const base_file_name = ext_start === -1 ? file_name : file_name.slice(0, ext_start);
return write_qst({
files: [
{
name: base_file_name + '.dat',
name: base_file_name + ".dat",
id: quest.id,
data: prs.compress(dat)
data: prs.compress(dat),
},
{
name: base_file_name + '.bin',
name: base_file_name + ".bin",
id: quest.id,
data: prs.compress(bin)
}
]
data: prs.compress(bin),
},
],
});
}
@ -109,17 +109,20 @@ export function write_quest_qst(quest: Quest, file_name: string): BufferCursor {
* Defaults to episode I.
*/
function get_episode(func_0_ops: Instruction[]): number {
const set_episode = func_0_ops.find(op => op.mnemonic === 'set_episode');
const set_episode = func_0_ops.find(op => op.mnemonic === "set_episode");
if (set_episode) {
switch (set_episode.args[0]) {
default:
case 0: return 1;
case 1: return 2;
case 2: return 4;
case 0:
return 1;
case 1:
return 2;
case 2:
return 4;
}
} else {
logger.debug('Function 0 has no set_episode instruction.');
logger.debug("Function 0 has no set_episode instruction.");
return 1;
}
}
@ -141,7 +144,7 @@ function get_area_variants(
area_variants.set(obj.area_id, 0);
}
const bb_maps = func_0_ops.filter(op => op.mnemonic === 'BB_Map_Designate');
const bb_maps = func_0_ops.filter(op => op.mnemonic === "BB_Map_Designate");
for (const bb_map of bb_maps) {
const area_id = bb_map.args[0];
@ -153,9 +156,7 @@ function get_area_variants(
for (const [area_id, variant_id] of area_variants.entries()) {
try {
area_variants_array.push(
area_store.get_variant(episode, area_id, variant_id)
);
area_variants_array.push(area_store.get_variant(episode, area_id, variant_id));
} catch (e) {
if (lenient) {
logger.error(`Unknown area variant.`, e);
@ -166,9 +167,7 @@ function get_area_variants(
}
// 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 area_variants_array.sort((a, b) => a.area.order - b.area.order || a.id - b.id);
}
function get_func_operations(
@ -234,154 +233,272 @@ function get_npc_type(episode: number, { type_id, flags, skin, area_id }: DatNpc
const regular = Math.abs(flags - 1) > 0.00001;
switch (`${type_id}, ${skin % 3}, ${episode}`) {
case `${0x044}, 0, 1`: return NpcType.Booma;
case `${0x044}, 1, 1`: return NpcType.Gobooma;
case `${0x044}, 2, 1`: return NpcType.Gigobooma;
case `${0x044}, 0, 1`:
return NpcType.Booma;
case `${0x044}, 1, 1`:
return NpcType.Gobooma;
case `${0x044}, 2, 1`:
return NpcType.Gigobooma;
case `${0x063}, 0, 1`: return NpcType.EvilShark;
case `${0x063}, 1, 1`: return NpcType.PalShark;
case `${0x063}, 2, 1`: return NpcType.GuilShark;
case `${0x063}, 0, 1`:
return NpcType.EvilShark;
case `${0x063}, 1, 1`:
return NpcType.PalShark;
case `${0x063}, 2, 1`:
return NpcType.GuilShark;
case `${0x0A6}, 0, 1`: return NpcType.Dimenian;
case `${0x0A6}, 0, 2`: return NpcType.Dimenian2;
case `${0x0A6}, 1, 1`: return NpcType.LaDimenian;
case `${0x0A6}, 1, 2`: return NpcType.LaDimenian2;
case `${0x0A6}, 2, 1`: return NpcType.SoDimenian;
case `${0x0A6}, 2, 2`: return NpcType.SoDimenian2;
case `${0x0a6}, 0, 1`:
return NpcType.Dimenian;
case `${0x0a6}, 0, 2`:
return NpcType.Dimenian2;
case `${0x0a6}, 1, 1`:
return NpcType.LaDimenian;
case `${0x0a6}, 1, 2`:
return NpcType.LaDimenian2;
case `${0x0a6}, 2, 1`:
return NpcType.SoDimenian;
case `${0x0a6}, 2, 2`:
return NpcType.SoDimenian2;
case `${0x0D6}, 0, 2`: return NpcType.Mericarol;
case `${0x0D6}, 1, 2`: return NpcType.Mericus;
case `${0x0D6}, 2, 2`: return NpcType.Merikle;
case `${0x0d6}, 0, 2`:
return NpcType.Mericarol;
case `${0x0d6}, 1, 2`:
return NpcType.Mericus;
case `${0x0d6}, 2, 2`:
return NpcType.Merikle;
case `${0x115}, 0, 4`: return NpcType.Boota;
case `${0x115}, 1, 4`: return NpcType.ZeBoota;
case `${0x115}, 2, 4`: return NpcType.BaBoota;
case `${0x117}, 0, 4`: return NpcType.Goran;
case `${0x117}, 1, 4`: return NpcType.PyroGoran;
case `${0x117}, 2, 4`: return NpcType.GoranDetonator;
case `${0x115}, 0, 4`:
return NpcType.Boota;
case `${0x115}, 1, 4`:
return NpcType.ZeBoota;
case `${0x115}, 2, 4`:
return NpcType.BaBoota;
case `${0x117}, 0, 4`:
return NpcType.Goran;
case `${0x117}, 1, 4`:
return NpcType.PyroGoran;
case `${0x117}, 2, 4`:
return NpcType.GoranDetonator;
}
switch (`${type_id}, ${skin % 2}, ${episode}`) {
case `${0x040}, 0, 1`: return NpcType.Hildebear;
case `${0x040}, 0, 2`: return NpcType.Hildebear2;
case `${0x040}, 1, 1`: return NpcType.Hildeblue;
case `${0x040}, 1, 2`: return NpcType.Hildeblue2;
case `${0x041}, 0, 1`: return NpcType.RagRappy;
case `${0x041}, 0, 2`: return NpcType.RagRappy2;
case `${0x041}, 0, 4`: return NpcType.SandRappy;
case `${0x041}, 1, 1`: return NpcType.AlRappy;
case `${0x041}, 1, 2`: return NpcType.LoveRappy;
case `${0x041}, 1, 4`: return NpcType.DelRappy;
case `${0x040}, 0, 1`:
return NpcType.Hildebear;
case `${0x040}, 0, 2`:
return NpcType.Hildebear2;
case `${0x040}, 1, 1`:
return NpcType.Hildeblue;
case `${0x040}, 1, 2`:
return NpcType.Hildeblue2;
case `${0x041}, 0, 1`:
return NpcType.RagRappy;
case `${0x041}, 0, 2`:
return NpcType.RagRappy2;
case `${0x041}, 0, 4`:
return NpcType.SandRappy;
case `${0x041}, 1, 1`:
return NpcType.AlRappy;
case `${0x041}, 1, 2`:
return NpcType.LoveRappy;
case `${0x041}, 1, 4`:
return NpcType.DelRappy;
case `${0x080}, 0, 1`: return NpcType.Dubchic;
case `${0x080}, 0, 2`: return NpcType.Dubchic2;
case `${0x080}, 1, 1`: return NpcType.Gilchic;
case `${0x080}, 1, 2`: return NpcType.Gilchic2;
case `${0x080}, 0, 1`:
return NpcType.Dubchic;
case `${0x080}, 0, 2`:
return NpcType.Dubchic2;
case `${0x080}, 1, 1`:
return NpcType.Gilchic;
case `${0x080}, 1, 2`:
return NpcType.Gilchic2;
case `${0x0D4}, 0, 2`: return NpcType.SinowBerill;
case `${0x0D4}, 1, 2`: return NpcType.SinowSpigell;
case `${0x0D5}, 0, 2`: return NpcType.Merillia;
case `${0x0D5}, 1, 2`: return NpcType.Meriltas;
case `${0x0D7}, 0, 2`: return NpcType.UlGibbon;
case `${0x0D7}, 1, 2`: return NpcType.ZolGibbon;
case `${0x0d4}, 0, 2`:
return NpcType.SinowBerill;
case `${0x0d4}, 1, 2`:
return NpcType.SinowSpigell;
case `${0x0d5}, 0, 2`:
return NpcType.Merillia;
case `${0x0d5}, 1, 2`:
return NpcType.Meriltas;
case `${0x0d7}, 0, 2`:
return NpcType.UlGibbon;
case `${0x0d7}, 1, 2`:
return NpcType.ZolGibbon;
case `${0x0DD}, 0, 2`: return NpcType.Dolmolm;
case `${0x0DD}, 1, 2`: return NpcType.Dolmdarl;
case `${0x0E0}, 0, 2`: return area_id > 15 ? NpcType.Epsilon : NpcType.SinowZoa;
case `${0x0E0}, 1, 2`: return area_id > 15 ? NpcType.Epsilon : NpcType.SinowZele;
case `${0x0dd}, 0, 2`:
return NpcType.Dolmolm;
case `${0x0dd}, 1, 2`:
return NpcType.Dolmdarl;
case `${0x0e0}, 0, 2`:
return area_id > 15 ? NpcType.Epsilon : NpcType.SinowZoa;
case `${0x0e0}, 1, 2`:
return area_id > 15 ? NpcType.Epsilon : NpcType.SinowZele;
case `${0x112}, 0, 4`: return NpcType.MerissaA;
case `${0x112}, 1, 4`: return NpcType.MerissaAA;
case `${0x114}, 0, 4`: return NpcType.Zu;
case `${0x114}, 1, 4`: return NpcType.Pazuzu;
case `${0x116}, 0, 4`: return NpcType.Dorphon;
case `${0x116}, 1, 4`: return NpcType.DorphonEclair;
case `${0x119}, 0, 4`: return regular ? NpcType.SaintMilion : NpcType.Kondrieu;
case `${0x119}, 1, 4`: return regular ? NpcType.Shambertin : NpcType.Kondrieu;
case `${0x112}, 0, 4`:
return NpcType.MerissaA;
case `${0x112}, 1, 4`:
return NpcType.MerissaAA;
case `${0x114}, 0, 4`:
return NpcType.Zu;
case `${0x114}, 1, 4`:
return NpcType.Pazuzu;
case `${0x116}, 0, 4`:
return NpcType.Dorphon;
case `${0x116}, 1, 4`:
return NpcType.DorphonEclair;
case `${0x119}, 0, 4`:
return regular ? NpcType.SaintMilion : NpcType.Kondrieu;
case `${0x119}, 1, 4`:
return regular ? NpcType.Shambertin : NpcType.Kondrieu;
}
switch (`${type_id}, ${episode}`) {
case `${0x042}, 1`: return NpcType.Monest;
case `${0x042}, 2`: return NpcType.Monest2;
case `${0x043}, 1`: return regular ? NpcType.SavageWolf : NpcType.BarbarousWolf;
case `${0x043}, 2`: return regular ? NpcType.SavageWolf2 : NpcType.BarbarousWolf2;
case `${0x042}, 1`:
return NpcType.Monest;
case `${0x042}, 2`:
return NpcType.Monest2;
case `${0x043}, 1`:
return regular ? NpcType.SavageWolf : NpcType.BarbarousWolf;
case `${0x043}, 2`:
return regular ? NpcType.SavageWolf2 : NpcType.BarbarousWolf2;
case `${0x060}, 1`: return NpcType.GrassAssassin;
case `${0x060}, 2`: return NpcType.GrassAssassin2;
case `${0x061}, 1`: return area_id > 15 ? NpcType.DelLily : (
regular ? NpcType.PoisonLily : NpcType.NarLily
);
case `${0x061}, 2`: return area_id > 15 ? NpcType.DelLily : (
regular ? NpcType.PoisonLily2 : NpcType.NarLily2
);
case `${0x062}, 1`: return NpcType.NanoDragon;
case `${0x064}, 1`: return regular ? NpcType.PofuillySlime : NpcType.PouillySlime;
case `${0x065}, 1`: return NpcType.PanArms;
case `${0x065}, 2`: return NpcType.PanArms2;
case `${0x060}, 1`:
return NpcType.GrassAssassin;
case `${0x060}, 2`:
return NpcType.GrassAssassin2;
case `${0x061}, 1`:
return area_id > 15 ? NpcType.DelLily : regular ? NpcType.PoisonLily : NpcType.NarLily;
case `${0x061}, 2`:
return area_id > 15
? NpcType.DelLily
: regular
? NpcType.PoisonLily2
: NpcType.NarLily2;
case `${0x062}, 1`:
return NpcType.NanoDragon;
case `${0x064}, 1`:
return regular ? NpcType.PofuillySlime : NpcType.PouillySlime;
case `${0x065}, 1`:
return NpcType.PanArms;
case `${0x065}, 2`:
return NpcType.PanArms2;
case `${0x081}, 1`: return NpcType.Garanz;
case `${0x081}, 2`: return NpcType.Garanz2;
case `${0x082}, 1`: return regular ? NpcType.SinowBeat : NpcType.SinowGold;
case `${0x083}, 1`: return NpcType.Canadine;
case `${0x084}, 1`: return NpcType.Canane;
case `${0x085}, 1`: return NpcType.Dubswitch;
case `${0x085}, 2`: return NpcType.Dubswitch2;
case `${0x081}, 1`:
return NpcType.Garanz;
case `${0x081}, 2`:
return NpcType.Garanz2;
case `${0x082}, 1`:
return regular ? NpcType.SinowBeat : NpcType.SinowGold;
case `${0x083}, 1`:
return NpcType.Canadine;
case `${0x084}, 1`:
return NpcType.Canane;
case `${0x085}, 1`:
return NpcType.Dubswitch;
case `${0x085}, 2`:
return NpcType.Dubswitch2;
case `${0x0A0}, 1`: return NpcType.Delsaber;
case `${0x0A0}, 2`: return NpcType.Delsaber2;
case `${0x0A1}, 1`: return NpcType.ChaosSorcerer;
case `${0x0A1}, 2`: return NpcType.ChaosSorcerer2;
case `${0x0A2}, 1`: return NpcType.DarkGunner;
case `${0x0A4}, 1`: return NpcType.ChaosBringer;
case `${0x0A5}, 1`: return NpcType.DarkBelra;
case `${0x0A5}, 2`: return NpcType.DarkBelra2;
case `${0x0A7}, 1`: return NpcType.Bulclaw;
case `${0x0A8}, 1`: return NpcType.Claw;
case `${0x0a0}, 1`:
return NpcType.Delsaber;
case `${0x0a0}, 2`:
return NpcType.Delsaber2;
case `${0x0a1}, 1`:
return NpcType.ChaosSorcerer;
case `${0x0a1}, 2`:
return NpcType.ChaosSorcerer2;
case `${0x0a2}, 1`:
return NpcType.DarkGunner;
case `${0x0a4}, 1`:
return NpcType.ChaosBringer;
case `${0x0a5}, 1`:
return NpcType.DarkBelra;
case `${0x0a5}, 2`:
return NpcType.DarkBelra2;
case `${0x0a7}, 1`:
return NpcType.Bulclaw;
case `${0x0a8}, 1`:
return NpcType.Claw;
case `${0x0C0}, 1`: return NpcType.Dragon;
case `${0x0C0}, 2`: return NpcType.GalGryphon;
case `${0x0C1}, 1`: return NpcType.DeRolLe;
case `${0x0c0}, 1`:
return NpcType.Dragon;
case `${0x0c0}, 2`:
return NpcType.GalGryphon;
case `${0x0c1}, 1`:
return NpcType.DeRolLe;
// TODO:
// case `${0x0C2}, 1`: return NpcType.VolOptPart1;
case `${0x0C5}, 1`: return NpcType.VolOpt;
case `${0x0C8}, 1`: return NpcType.DarkFalz;
case `${0x0CA}, 2`: return NpcType.OlgaFlow;
case `${0x0CB}, 2`: return NpcType.BarbaRay;
case `${0x0CC}, 2`: return NpcType.GolDragon;
case `${0x0c5}, 1`:
return NpcType.VolOpt;
case `${0x0c8}, 1`:
return NpcType.DarkFalz;
case `${0x0ca}, 2`:
return NpcType.OlgaFlow;
case `${0x0cb}, 2`:
return NpcType.BarbaRay;
case `${0x0cc}, 2`:
return NpcType.GolDragon;
case `${0x0D8}, 2`: return NpcType.Gibbles;
case `${0x0D9}, 2`: return NpcType.Gee;
case `${0x0DA}, 2`: return NpcType.GiGue;
case `${0x0d8}, 2`:
return NpcType.Gibbles;
case `${0x0d9}, 2`:
return NpcType.Gee;
case `${0x0da}, 2`:
return NpcType.GiGue;
case `${0x0DB}, 2`: return NpcType.Deldepth;
case `${0x0DC}, 2`: return NpcType.Delbiter;
case `${0x0DE}, 2`: return NpcType.Morfos;
case `${0x0DF}, 2`: return NpcType.Recobox;
case `${0x0E1}, 2`: return NpcType.IllGill;
case `${0x0db}, 2`:
return NpcType.Deldepth;
case `${0x0dc}, 2`:
return NpcType.Delbiter;
case `${0x0de}, 2`:
return NpcType.Morfos;
case `${0x0df}, 2`:
return NpcType.Recobox;
case `${0x0e1}, 2`:
return NpcType.IllGill;
case `${0x110}, 4`: return NpcType.Astark;
case `${0x111}, 4`: return regular ? NpcType.SatelliteLizard : NpcType.Yowie;
case `${0x113}, 4`: return NpcType.Girtablulu;
case `${0x110}, 4`:
return NpcType.Astark;
case `${0x111}, 4`:
return regular ? NpcType.SatelliteLizard : NpcType.Yowie;
case `${0x113}, 4`:
return NpcType.Girtablulu;
}
switch (type_id) {
case 0x004: return NpcType.FemaleFat;
case 0x005: return NpcType.FemaleMacho;
case 0x007: return NpcType.FemaleTall;
case 0x00A: return NpcType.MaleDwarf;
case 0x00B: return NpcType.MaleFat;
case 0x00C: return NpcType.MaleMacho;
case 0x00D: return NpcType.MaleOld;
case 0x019: return NpcType.BlueSoldier;
case 0x01A: return NpcType.RedSoldier;
case 0x01B: return NpcType.Principal;
case 0x01C: return NpcType.Tekker;
case 0x01D: return NpcType.GuildLady;
case 0x01E: return NpcType.Scientist;
case 0x01F: return NpcType.Nurse;
case 0x020: return NpcType.Irene;
case 0x0F1: return NpcType.ItemShop;
case 0x0FE: return NpcType.Nurse2;
case 0x004:
return NpcType.FemaleFat;
case 0x005:
return NpcType.FemaleMacho;
case 0x007:
return NpcType.FemaleTall;
case 0x00a:
return NpcType.MaleDwarf;
case 0x00b:
return NpcType.MaleFat;
case 0x00c:
return NpcType.MaleMacho;
case 0x00d:
return NpcType.MaleOld;
case 0x019:
return NpcType.BlueSoldier;
case 0x01a:
return NpcType.RedSoldier;
case 0x01b:
return NpcType.Principal;
case 0x01c:
return NpcType.Tekker;
case 0x01d:
return NpcType.GuildLady;
case 0x01e:
return NpcType.Scientist;
case 0x01f:
return NpcType.Nurse;
case 0x020:
return NpcType.Irene;
case 0x0f1:
return NpcType.ItemShop;
case 0x0fe:
return NpcType.Nurse2;
}
return NpcType.Unknown;
@ -394,7 +511,7 @@ function objects_to_dat_data(objects: QuestObject[]): DatObject[] {
position: object.section_position,
rotation: object.rotation,
area_id: object.area_id,
unknown: object.dat.unknown
unknown: object.dat.unknown,
}));
}
@ -416,155 +533,285 @@ function npcsToDatData(npcs: QuestNpc[]): DatNpc[] {
flags,
skin: type_data ? type_data.skin : npc.dat.skin,
area_id: npc.area_id,
unknown: npc.dat.unknown
unknown: npc.dat.unknown,
};
});
}
function npc_type_to_dat_data(
type: NpcType
): { type_id: number, skin: number, regular: boolean } | undefined {
): { type_id: number; skin: number; regular: boolean } | undefined {
switch (type) {
default: throw new Error(`Unexpected type ${type.code}.`);
default:
throw new Error(`Unexpected type ${type.code}.`);
case NpcType.Unknown: return undefined;
case NpcType.Unknown:
return undefined;
case NpcType.FemaleFat: return { type_id: 0x004, skin: 0, regular: true };
case NpcType.FemaleMacho: return { type_id: 0x005, skin: 0, regular: true };
case NpcType.FemaleTall: return { type_id: 0x007, skin: 0, regular: true };
case NpcType.MaleDwarf: return { type_id: 0x00A, skin: 0, regular: true };
case NpcType.MaleFat: return { type_id: 0x00B, skin: 0, regular: true };
case NpcType.MaleMacho: return { type_id: 0x00C, skin: 0, regular: true };
case NpcType.MaleOld: return { type_id: 0x00D, skin: 0, regular: true };
case NpcType.BlueSoldier: return { type_id: 0x019, skin: 0, regular: true };
case NpcType.RedSoldier: return { type_id: 0x01A, skin: 0, regular: true };
case NpcType.Principal: return { type_id: 0x01B, skin: 0, regular: true };
case NpcType.Tekker: return { type_id: 0x01C, skin: 0, regular: true };
case NpcType.GuildLady: return { type_id: 0x01D, skin: 0, regular: true };
case NpcType.Scientist: return { type_id: 0x01E, skin: 0, regular: true };
case NpcType.Nurse: return { type_id: 0x01F, skin: 0, regular: true };
case NpcType.Irene: return { type_id: 0x020, skin: 0, regular: true };
case NpcType.ItemShop: return { type_id: 0x0F1, skin: 0, regular: true };
case NpcType.Nurse2: return { type_id: 0x0FE, skin: 0, regular: true };
case NpcType.FemaleFat:
return { type_id: 0x004, skin: 0, regular: true };
case NpcType.FemaleMacho:
return { type_id: 0x005, skin: 0, regular: true };
case NpcType.FemaleTall:
return { type_id: 0x007, skin: 0, regular: true };
case NpcType.MaleDwarf:
return { type_id: 0x00a, skin: 0, regular: true };
case NpcType.MaleFat:
return { type_id: 0x00b, skin: 0, regular: true };
case NpcType.MaleMacho:
return { type_id: 0x00c, skin: 0, regular: true };
case NpcType.MaleOld:
return { type_id: 0x00d, skin: 0, regular: true };
case NpcType.BlueSoldier:
return { type_id: 0x019, skin: 0, regular: true };
case NpcType.RedSoldier:
return { type_id: 0x01a, skin: 0, regular: true };
case NpcType.Principal:
return { type_id: 0x01b, skin: 0, regular: true };
case NpcType.Tekker:
return { type_id: 0x01c, skin: 0, regular: true };
case NpcType.GuildLady:
return { type_id: 0x01d, skin: 0, regular: true };
case NpcType.Scientist:
return { type_id: 0x01e, skin: 0, regular: true };
case NpcType.Nurse:
return { type_id: 0x01f, skin: 0, regular: true };
case NpcType.Irene:
return { type_id: 0x020, skin: 0, regular: true };
case NpcType.ItemShop:
return { type_id: 0x0f1, skin: 0, regular: true };
case NpcType.Nurse2:
return { type_id: 0x0fe, skin: 0, regular: true };
case NpcType.Hildebear: return { type_id: 0x040, skin: 0, regular: true };
case NpcType.Hildeblue: return { type_id: 0x040, skin: 1, regular: true };
case NpcType.RagRappy: return { type_id: 0x041, skin: 0, regular: true };
case NpcType.AlRappy: return { type_id: 0x041, skin: 1, regular: true };
case NpcType.Monest: return { type_id: 0x042, skin: 0, regular: true };
case NpcType.SavageWolf: return { type_id: 0x043, skin: 0, regular: true };
case NpcType.BarbarousWolf: return { type_id: 0x043, skin: 0, regular: false };
case NpcType.Booma: return { type_id: 0x044, skin: 0, regular: true };
case NpcType.Gobooma: return { type_id: 0x044, skin: 1, regular: true };
case NpcType.Gigobooma: return { type_id: 0x044, skin: 2, regular: true };
case NpcType.Dragon: return { type_id: 0x0C0, skin: 0, regular: true };
case NpcType.Hildebear:
return { type_id: 0x040, skin: 0, regular: true };
case NpcType.Hildeblue:
return { type_id: 0x040, skin: 1, regular: true };
case NpcType.RagRappy:
return { type_id: 0x041, skin: 0, regular: true };
case NpcType.AlRappy:
return { type_id: 0x041, skin: 1, regular: true };
case NpcType.Monest:
return { type_id: 0x042, skin: 0, regular: true };
case NpcType.SavageWolf:
return { type_id: 0x043, skin: 0, regular: true };
case NpcType.BarbarousWolf:
return { type_id: 0x043, skin: 0, regular: false };
case NpcType.Booma:
return { type_id: 0x044, skin: 0, regular: true };
case NpcType.Gobooma:
return { type_id: 0x044, skin: 1, regular: true };
case NpcType.Gigobooma:
return { type_id: 0x044, skin: 2, regular: true };
case NpcType.Dragon:
return { type_id: 0x0c0, skin: 0, regular: true };
case NpcType.GrassAssassin: return { type_id: 0x060, skin: 0, regular: true };
case NpcType.PoisonLily: return { type_id: 0x061, skin: 0, regular: true };
case NpcType.NarLily: return { type_id: 0x061, skin: 1, regular: true };
case NpcType.NanoDragon: return { type_id: 0x062, skin: 0, regular: true };
case NpcType.EvilShark: return { type_id: 0x063, skin: 0, regular: true };
case NpcType.PalShark: return { type_id: 0x063, skin: 1, regular: true };
case NpcType.GuilShark: return { type_id: 0x063, skin: 2, regular: true };
case NpcType.PofuillySlime: return { type_id: 0x064, skin: 0, regular: true };
case NpcType.PouillySlime: return { type_id: 0x064, skin: 0, regular: false };
case NpcType.PanArms: return { type_id: 0x065, skin: 0, regular: true };
case NpcType.DeRolLe: return { type_id: 0x0C1, skin: 0, regular: true };
case NpcType.GrassAssassin:
return { type_id: 0x060, skin: 0, regular: true };
case NpcType.PoisonLily:
return { type_id: 0x061, skin: 0, regular: true };
case NpcType.NarLily:
return { type_id: 0x061, skin: 1, regular: true };
case NpcType.NanoDragon:
return { type_id: 0x062, skin: 0, regular: true };
case NpcType.EvilShark:
return { type_id: 0x063, skin: 0, regular: true };
case NpcType.PalShark:
return { type_id: 0x063, skin: 1, regular: true };
case NpcType.GuilShark:
return { type_id: 0x063, skin: 2, regular: true };
case NpcType.PofuillySlime:
return { type_id: 0x064, skin: 0, regular: true };
case NpcType.PouillySlime:
return { type_id: 0x064, skin: 0, regular: false };
case NpcType.PanArms:
return { type_id: 0x065, skin: 0, regular: true };
case NpcType.DeRolLe:
return { type_id: 0x0c1, skin: 0, regular: true };
case NpcType.Dubchic: return { type_id: 0x080, skin: 0, regular: true };
case NpcType.Gilchic: return { type_id: 0x080, skin: 1, regular: true };
case NpcType.Garanz: return { type_id: 0x081, skin: 0, regular: true };
case NpcType.SinowBeat: return { type_id: 0x082, skin: 0, regular: true };
case NpcType.SinowGold: return { type_id: 0x082, skin: 0, regular: false };
case NpcType.Canadine: return { type_id: 0x083, skin: 0, regular: true };
case NpcType.Canane: return { type_id: 0x084, skin: 0, regular: true };
case NpcType.Dubswitch: return { type_id: 0x085, skin: 0, regular: true };
case NpcType.VolOpt: return { type_id: 0x0C5, skin: 0, regular: true };
case NpcType.Dubchic:
return { type_id: 0x080, skin: 0, regular: true };
case NpcType.Gilchic:
return { type_id: 0x080, skin: 1, regular: true };
case NpcType.Garanz:
return { type_id: 0x081, skin: 0, regular: true };
case NpcType.SinowBeat:
return { type_id: 0x082, skin: 0, regular: true };
case NpcType.SinowGold:
return { type_id: 0x082, skin: 0, regular: false };
case NpcType.Canadine:
return { type_id: 0x083, skin: 0, regular: true };
case NpcType.Canane:
return { type_id: 0x084, skin: 0, regular: true };
case NpcType.Dubswitch:
return { type_id: 0x085, skin: 0, regular: true };
case NpcType.VolOpt:
return { type_id: 0x0c5, skin: 0, regular: true };
case NpcType.Delsaber: return { type_id: 0x0A0, skin: 0, regular: true };
case NpcType.ChaosSorcerer: return { type_id: 0x0A1, skin: 0, regular: true };
case NpcType.DarkGunner: return { type_id: 0x0A2, skin: 0, regular: true };
case NpcType.ChaosBringer: return { type_id: 0x0A4, skin: 0, regular: true };
case NpcType.DarkBelra: return { type_id: 0x0A5, skin: 0, regular: true };
case NpcType.Dimenian: return { type_id: 0x0A6, skin: 0, regular: true };
case NpcType.LaDimenian: return { type_id: 0x0A6, skin: 1, regular: true };
case NpcType.SoDimenian: return { type_id: 0x0A6, skin: 2, regular: true };
case NpcType.Bulclaw: return { type_id: 0x0A7, skin: 0, regular: true };
case NpcType.Claw: return { type_id: 0x0A8, skin: 0, regular: true };
case NpcType.DarkFalz: return { type_id: 0x0C8, skin: 0, regular: true };
case NpcType.Delsaber:
return { type_id: 0x0a0, skin: 0, regular: true };
case NpcType.ChaosSorcerer:
return { type_id: 0x0a1, skin: 0, regular: true };
case NpcType.DarkGunner:
return { type_id: 0x0a2, skin: 0, regular: true };
case NpcType.ChaosBringer:
return { type_id: 0x0a4, skin: 0, regular: true };
case NpcType.DarkBelra:
return { type_id: 0x0a5, skin: 0, regular: true };
case NpcType.Dimenian:
return { type_id: 0x0a6, skin: 0, regular: true };
case NpcType.LaDimenian:
return { type_id: 0x0a6, skin: 1, regular: true };
case NpcType.SoDimenian:
return { type_id: 0x0a6, skin: 2, regular: true };
case NpcType.Bulclaw:
return { type_id: 0x0a7, skin: 0, regular: true };
case NpcType.Claw:
return { type_id: 0x0a8, skin: 0, regular: true };
case NpcType.DarkFalz:
return { type_id: 0x0c8, skin: 0, regular: true };
case NpcType.Hildebear2: return { type_id: 0x040, skin: 0, regular: true };
case NpcType.Hildeblue2: return { type_id: 0x040, skin: 1, regular: true };
case NpcType.RagRappy2: return { type_id: 0x041, skin: 0, regular: true };
case NpcType.LoveRappy: return { type_id: 0x041, skin: 1, regular: true };
case NpcType.Monest2: return { type_id: 0x042, skin: 0, regular: true };
case NpcType.PoisonLily2: return { type_id: 0x061, skin: 0, regular: true };
case NpcType.NarLily2: return { type_id: 0x061, skin: 1, regular: true };
case NpcType.GrassAssassin2: return { type_id: 0x060, skin: 0, regular: true };
case NpcType.Dimenian2: return { type_id: 0x0A6, skin: 0, regular: true };
case NpcType.LaDimenian2: return { type_id: 0x0A6, skin: 1, regular: true };
case NpcType.SoDimenian2: return { type_id: 0x0A6, skin: 2, regular: true };
case NpcType.DarkBelra2: return { type_id: 0x0A5, skin: 0, regular: true };
case NpcType.BarbaRay: return { type_id: 0x0CB, skin: 0, regular: true };
case NpcType.Hildebear2:
return { type_id: 0x040, skin: 0, regular: true };
case NpcType.Hildeblue2:
return { type_id: 0x040, skin: 1, regular: true };
case NpcType.RagRappy2:
return { type_id: 0x041, skin: 0, regular: true };
case NpcType.LoveRappy:
return { type_id: 0x041, skin: 1, regular: true };
case NpcType.Monest2:
return { type_id: 0x042, skin: 0, regular: true };
case NpcType.PoisonLily2:
return { type_id: 0x061, skin: 0, regular: true };
case NpcType.NarLily2:
return { type_id: 0x061, skin: 1, regular: true };
case NpcType.GrassAssassin2:
return { type_id: 0x060, skin: 0, regular: true };
case NpcType.Dimenian2:
return { type_id: 0x0a6, skin: 0, regular: true };
case NpcType.LaDimenian2:
return { type_id: 0x0a6, skin: 1, regular: true };
case NpcType.SoDimenian2:
return { type_id: 0x0a6, skin: 2, regular: true };
case NpcType.DarkBelra2:
return { type_id: 0x0a5, skin: 0, regular: true };
case NpcType.BarbaRay:
return { type_id: 0x0cb, skin: 0, regular: true };
case NpcType.SavageWolf2: return { type_id: 0x043, skin: 0, regular: true };
case NpcType.BarbarousWolf2: return { type_id: 0x043, skin: 0, regular: false };
case NpcType.PanArms2: return { type_id: 0x065, skin: 0, regular: true };
case NpcType.Dubchic2: return { type_id: 0x080, skin: 0, regular: true };
case NpcType.Gilchic2: return { type_id: 0x080, skin: 1, regular: true };
case NpcType.Garanz2: return { type_id: 0x081, skin: 0, regular: true };
case NpcType.Dubswitch2: return { type_id: 0x085, skin: 0, regular: true };
case NpcType.Delsaber2: return { type_id: 0x0A0, skin: 0, regular: true };
case NpcType.ChaosSorcerer2: return { type_id: 0x0A1, skin: 0, regular: true };
case NpcType.GolDragon: return { type_id: 0x0CC, skin: 0, regular: true };
case NpcType.SavageWolf2:
return { type_id: 0x043, skin: 0, regular: true };
case NpcType.BarbarousWolf2:
return { type_id: 0x043, skin: 0, regular: false };
case NpcType.PanArms2:
return { type_id: 0x065, skin: 0, regular: true };
case NpcType.Dubchic2:
return { type_id: 0x080, skin: 0, regular: true };
case NpcType.Gilchic2:
return { type_id: 0x080, skin: 1, regular: true };
case NpcType.Garanz2:
return { type_id: 0x081, skin: 0, regular: true };
case NpcType.Dubswitch2:
return { type_id: 0x085, skin: 0, regular: true };
case NpcType.Delsaber2:
return { type_id: 0x0a0, skin: 0, regular: true };
case NpcType.ChaosSorcerer2:
return { type_id: 0x0a1, skin: 0, regular: true };
case NpcType.GolDragon:
return { type_id: 0x0cc, skin: 0, regular: true };
case NpcType.SinowBerill: return { type_id: 0x0D4, skin: 0, regular: true };
case NpcType.SinowSpigell: return { type_id: 0x0D4, skin: 1, regular: true };
case NpcType.Merillia: return { type_id: 0x0D5, skin: 0, regular: true };
case NpcType.Meriltas: return { type_id: 0x0D5, skin: 1, regular: true };
case NpcType.Mericarol: return { type_id: 0x0D6, skin: 0, regular: true };
case NpcType.Mericus: return { type_id: 0x0D6, skin: 1, regular: true };
case NpcType.Merikle: return { type_id: 0x0D6, skin: 2, regular: true };
case NpcType.UlGibbon: return { type_id: 0x0D7, skin: 0, regular: true };
case NpcType.ZolGibbon: return { type_id: 0x0D7, skin: 1, regular: true };
case NpcType.Gibbles: return { type_id: 0x0D8, skin: 0, regular: true };
case NpcType.Gee: return { type_id: 0x0D9, skin: 0, regular: true };
case NpcType.GiGue: return { type_id: 0x0DA, skin: 0, regular: true };
case NpcType.GalGryphon: return { type_id: 0x0C0, skin: 0, regular: true };
case NpcType.SinowBerill:
return { type_id: 0x0d4, skin: 0, regular: true };
case NpcType.SinowSpigell:
return { type_id: 0x0d4, skin: 1, regular: true };
case NpcType.Merillia:
return { type_id: 0x0d5, skin: 0, regular: true };
case NpcType.Meriltas:
return { type_id: 0x0d5, skin: 1, regular: true };
case NpcType.Mericarol:
return { type_id: 0x0d6, skin: 0, regular: true };
case NpcType.Mericus:
return { type_id: 0x0d6, skin: 1, regular: true };
case NpcType.Merikle:
return { type_id: 0x0d6, skin: 2, regular: true };
case NpcType.UlGibbon:
return { type_id: 0x0d7, skin: 0, regular: true };
case NpcType.ZolGibbon:
return { type_id: 0x0d7, skin: 1, regular: true };
case NpcType.Gibbles:
return { type_id: 0x0d8, skin: 0, regular: true };
case NpcType.Gee:
return { type_id: 0x0d9, skin: 0, regular: true };
case NpcType.GiGue:
return { type_id: 0x0da, skin: 0, regular: true };
case NpcType.GalGryphon:
return { type_id: 0x0c0, skin: 0, regular: true };
case NpcType.Deldepth: return { type_id: 0x0DB, skin: 0, regular: true };
case NpcType.Delbiter: return { type_id: 0x0DC, skin: 0, regular: true };
case NpcType.Dolmolm: return { type_id: 0x0DD, skin: 0, regular: true };
case NpcType.Dolmdarl: return { type_id: 0x0DD, skin: 1, regular: true };
case NpcType.Morfos: return { type_id: 0x0DE, skin: 0, regular: true };
case NpcType.Recobox: return { type_id: 0x0DF, skin: 0, regular: true };
case NpcType.Epsilon: return { type_id: 0x0E0, skin: 0, regular: true };
case NpcType.SinowZoa: return { type_id: 0x0E0, skin: 0, regular: true };
case NpcType.SinowZele: return { type_id: 0x0E0, skin: 1, regular: true };
case NpcType.IllGill: return { type_id: 0x0E1, skin: 0, regular: true };
case NpcType.DelLily: return { type_id: 0x061, skin: 0, regular: true };
case NpcType.OlgaFlow: return { type_id: 0x0CA, skin: 0, regular: true };
case NpcType.Deldepth:
return { type_id: 0x0db, skin: 0, regular: true };
case NpcType.Delbiter:
return { type_id: 0x0dc, skin: 0, regular: true };
case NpcType.Dolmolm:
return { type_id: 0x0dd, skin: 0, regular: true };
case NpcType.Dolmdarl:
return { type_id: 0x0dd, skin: 1, regular: true };
case NpcType.Morfos:
return { type_id: 0x0de, skin: 0, regular: true };
case NpcType.Recobox:
return { type_id: 0x0df, skin: 0, regular: true };
case NpcType.Epsilon:
return { type_id: 0x0e0, skin: 0, regular: true };
case NpcType.SinowZoa:
return { type_id: 0x0e0, skin: 0, regular: true };
case NpcType.SinowZele:
return { type_id: 0x0e0, skin: 1, regular: true };
case NpcType.IllGill:
return { type_id: 0x0e1, skin: 0, regular: true };
case NpcType.DelLily:
return { type_id: 0x061, skin: 0, regular: true };
case NpcType.OlgaFlow:
return { type_id: 0x0ca, skin: 0, regular: true };
case NpcType.SandRappy: return { type_id: 0x041, skin: 0, regular: true };
case NpcType.DelRappy: return { type_id: 0x041, skin: 1, regular: true };
case NpcType.Astark: return { type_id: 0x110, skin: 0, regular: true };
case NpcType.SatelliteLizard: return { type_id: 0x111, skin: 0, regular: true };
case NpcType.Yowie: return { type_id: 0x111, skin: 0, regular: false };
case NpcType.MerissaA: return { type_id: 0x112, skin: 0, regular: true };
case NpcType.MerissaAA: return { type_id: 0x112, skin: 1, regular: true };
case NpcType.Girtablulu: return { type_id: 0x113, skin: 0, regular: true };
case NpcType.Zu: return { type_id: 0x114, skin: 0, regular: true };
case NpcType.Pazuzu: return { type_id: 0x114, skin: 1, regular: true };
case NpcType.Boota: return { type_id: 0x115, skin: 0, regular: true };
case NpcType.ZeBoota: return { type_id: 0x115, skin: 1, regular: true };
case NpcType.BaBoota: return { type_id: 0x115, skin: 2, regular: true };
case NpcType.Dorphon: return { type_id: 0x116, skin: 0, regular: true };
case NpcType.DorphonEclair: return { type_id: 0x116, skin: 1, regular: true };
case NpcType.Goran: return { type_id: 0x117, skin: 0, regular: true };
case NpcType.PyroGoran: return { type_id: 0x117, skin: 1, regular: true };
case NpcType.GoranDetonator: return { type_id: 0x117, skin: 2, regular: true };
case NpcType.SaintMilion: return { type_id: 0x119, skin: 0, regular: true };
case NpcType.Shambertin: return { type_id: 0x119, skin: 1, regular: true };
case NpcType.Kondrieu: return { type_id: 0x119, skin: 0, regular: false };
case NpcType.SandRappy:
return { type_id: 0x041, skin: 0, regular: true };
case NpcType.DelRappy:
return { type_id: 0x041, skin: 1, regular: true };
case NpcType.Astark:
return { type_id: 0x110, skin: 0, regular: true };
case NpcType.SatelliteLizard:
return { type_id: 0x111, skin: 0, regular: true };
case NpcType.Yowie:
return { type_id: 0x111, skin: 0, regular: false };
case NpcType.MerissaA:
return { type_id: 0x112, skin: 0, regular: true };
case NpcType.MerissaAA:
return { type_id: 0x112, skin: 1, regular: true };
case NpcType.Girtablulu:
return { type_id: 0x113, skin: 0, regular: true };
case NpcType.Zu:
return { type_id: 0x114, skin: 0, regular: true };
case NpcType.Pazuzu:
return { type_id: 0x114, skin: 1, regular: true };
case NpcType.Boota:
return { type_id: 0x115, skin: 0, regular: true };
case NpcType.ZeBoota:
return { type_id: 0x115, skin: 1, regular: true };
case NpcType.BaBoota:
return { type_id: 0x115, skin: 2, regular: true };
case NpcType.Dorphon:
return { type_id: 0x116, skin: 0, regular: true };
case NpcType.DorphonEclair:
return { type_id: 0x116, skin: 1, regular: true };
case NpcType.Goran:
return { type_id: 0x117, skin: 0, regular: true };
case NpcType.PyroGoran:
return { type_id: 0x117, skin: 1, regular: true };
case NpcType.GoranDetonator:
return { type_id: 0x117, skin: 2, regular: true };
case NpcType.SaintMilion:
return { type_id: 0x119, skin: 0, regular: true };
case NpcType.Shambertin:
return { type_id: 0x119, skin: 1, regular: true };
case NpcType.Kondrieu:
return { type_id: 0x119, skin: 0, regular: false };
}
}

8
src/data_formats/parsing/quest/qst.test.ts
View File

@ -1,11 +1,11 @@
import { BufferCursor } from '../../BufferCursor';
import { parse_qst, write_qst } from './qst';
import { walk_qst_files } from '../../../../test/src/utils';
import { BufferCursor } from "../../BufferCursor";
import { parse_qst, write_qst } from "./qst";
import { walk_qst_files } from "../../../../test/src/utils";
/**
* Parse a file, convert the resulting structure to QST again and check whether the end result is equal to the original.
*/
test('parse_qst and write_qst', () => {
test("parse_qst and write_qst", () => {
walk_qst_files((_file_path, _file_name, file_content) => {
const orig_qst = new BufferCursor(file_content.buffer, true);
const orig_quest = parse_qst(orig_qst);

122
src/data_formats/parsing/quest/qst.ts
View File

@ -1,21 +1,21 @@
import { BufferCursor } from '../../BufferCursor';
import Logger from 'js-logger';
import { BufferCursor } from "../../BufferCursor";
import Logger from "js-logger";
const logger = Logger.get('data_formats/parsing/quest/qst');
const logger = Logger.get("data_formats/parsing/quest/qst");
export type QstContainedFile = {
id?: number,
name: string,
name_2?: string, // Unsure what this is
expected_size?: number,
data: BufferCursor,
chunk_nos: Set<number>,
}
id?: number;
name: string;
name_2?: string; // Unsure what this is
expected_size?: number;
data: BufferCursor;
chunk_nos: Set<number>;
};
export type ParseQstResult = {
version: string,
files: QstContainedFile[],
}
version: string;
files: QstContainedFile[];
};
/**
* Low level parsing function for .qst files.
@ -23,7 +23,7 @@ export type ParseQstResult = {
*/
export function parse_qst(cursor: BufferCursor): ParseQstResult | undefined {
// A .qst file contains two 88-byte headers that describe the embedded .dat and .bin files.
let version = 'PC';
let version = "PC";
// Detect version.
const version_a = cursor.u8();
@ -31,24 +31,22 @@ export function parse_qst(cursor: BufferCursor): ParseQstResult | undefined {
const version_b = cursor.u8();
if (version_a === 0x44) {
version = 'Dreamcast/GameCube';
version = "Dreamcast/GameCube";
} else if (version_a === 0x58) {
if (version_b === 0x44) {
version = 'Blue Burst';
version = "Blue Burst";
}
} else if (version_a === 0xA6) {
version = 'Dreamcast download';
} else if (version_a === 0xa6) {
version = "Dreamcast download";
}
if (version === 'Blue Burst') {
if (version === "Blue Burst") {
// Read headers and contained files.
cursor.seek_start(0);
const headers = parse_headers(cursor);
const files = parse_files(
cursor, new Map(headers.map(h => [h.file_name, h.size]))
);
const files = parse_files(cursor, new Map(headers.map(h => [h.file_name, h.size])));
for (const file of files) {
const header = headers.find(h => h.file_name === file.name);
@ -61,7 +59,7 @@ export function parse_qst(cursor: BufferCursor): ParseQstResult | undefined {
return {
version,
files
files,
};
} else {
logger.error(`Can't parse ${version} QST files.`);
@ -70,16 +68,16 @@ export function parse_qst(cursor: BufferCursor): ParseQstResult | undefined {
}
export type SimpleQstContainedFile = {
id?: number,
name: string,
name_2?: string,
data: BufferCursor,
}
id?: number;
name: string;
name_2?: string;
data: BufferCursor;
};
export type WriteQstParams = {
version?: string,
files: SimpleQstContainedFile[],
}
version?: string;
files: SimpleQstContainedFile[];
};
/**
* Always uses Blue Burst format.
@ -102,11 +100,11 @@ export function write_qst(params: WriteQstParams): BufferCursor {
}
type QstHeader = {
quest_id: number,
file_name: string,
file_name_2: string,
size: number,
}
quest_id: number;
file_name: string;
file_name_2: string;
size: number;
};
/**
* TODO: Read all headers instead of just the first 2.
@ -127,14 +125,17 @@ function parse_headers(cursor: BufferCursor): QstHeader[] {
quest_id,
file_name,
file_name_2,
size
size,
});
}
return headers;
}
function parse_files(cursor: BufferCursor, expected_sizes: Map<string, number>): QstContainedFile[] {
function parse_files(
cursor: BufferCursor,
expected_sizes: Map<string, number>
): QstContainedFile[] {
// Files are interleaved in 1056 byte chunks.
// Each chunk has a 24 byte header, 1024 byte data segment and an 8 byte trailer.
const files = new Map<string, QstContainedFile>();
@ -150,16 +151,21 @@ function parse_files(cursor: BufferCursor, expected_sizes: Map<string, number>):
if (!file) {
const expected_size = expected_sizes.get(file_name);
files.set(file_name, file = {
name: file_name,
expected_size,
data: new BufferCursor(expected_size || (10 * 1024), true),
chunk_nos: new Set()
});
files.set(
file_name,
(file = {
name: file_name,
expected_size,
data: new BufferCursor(expected_size || 10 * 1024, true),
chunk_nos: new Set(),
})
);
}
if (file.chunk_nos.has(chunk_no)) {
logger.warn(`File chunk number ${chunk_no} of file ${file_name} was already encountered, overwriting previous chunk.`);
logger.warn(
`File chunk number ${chunk_no} of file ${file_name} was already encountered, overwriting previous chunk.`
);
} else {
file.chunk_nos.add(chunk_no);
}
@ -169,7 +175,9 @@ function parse_files(cursor: BufferCursor, expected_sizes: Map<string, number>):
cursor.seek(-1028);
if (size > 1024) {
logger.warn(`Data segment size of ${size} is larger than expected maximum size, reading just 1024 bytes.`);
logger.warn(
`Data segment size of ${size} is larger than expected maximum size, reading just 1024 bytes.`
);
size = 1024;
}
@ -182,7 +190,10 @@ function parse_files(cursor: BufferCursor, expected_sizes: Map<string, number>):
cursor.seek(1032 - data.size);
if (cursor.position !== start_position + 1056) {
throw new Error(`Read ${cursor.position - start_position} file chunk message bytes instead of expected 1056.`);
throw new Error(
`Read ${cursor.position -
start_position} file chunk message bytes instead of expected 1056.`
);
}
}
@ -197,7 +208,9 @@ function parse_files(cursor: BufferCursor, expected_sizes: Map<string, number>):
// Check whether the expected size was correct.
if (file.expected_size != null && file.data.size !== file.expected_size) {
logger.warn(`File ${file.name} has an actual size of ${file.data.size} instead of the expected size ${file.expected_size}.`);
logger.warn(
`File ${file.name} has an actual size of ${file.data.size} instead of the expected size ${file.expected_size}.`
);
}
// Detect missing file chunks.
@ -234,16 +247,19 @@ function write_file_headers(cursor: BufferCursor, files: SimpleQstContainedFile[
if (file.name_2 == null) {
// Not sure this makes sense.
const dot_pos = file.name.lastIndexOf('.');
file_name_2 = dot_pos === -1
? file.name + '_j'
: file.name.slice(0, dot_pos) + '_j' + file.name.slice(dot_pos);
const dot_pos = file.name.lastIndexOf(".");
file_name_2 =
dot_pos === -1
? file.name + "_j"
: file.name.slice(0, dot_pos) + "_j" + file.name.slice(dot_pos);
} else {
file_name_2 = file.name_2;
}
if (file_name_2.length > 24) {
throw Error(`File ${file.name} has a file_name_2 length (${file_name_2}) longer than 24 characters.`);
throw Error(
`File ${file.name} has a file_name_2 length (${file_name_2}) longer than 24 characters.`
);
}
cursor.write_string_ascii(file_name_2, 24);

8
src/data_formats/parsing/rlc.ts
View File

@ -1,13 +1,13 @@
import { BufferCursor } from "../BufferCursor";
import Logger from 'js-logger';
import Logger from "js-logger";
import { parse_prc } from "./prc";
const logger = Logger.get('data_formats/parsing/rlc');
const MARKER = 'RelChunkVer0.20';
const logger = Logger.get("data_formats/parsing/rlc");
const MARKER = "RelChunkVer0.20";
/**
* Container of prc files.
*
*
* @returns the contained files, decrypted and decompressed.
*/
export function parse_rlc(cursor: BufferCursor): BufferCursor[] {

943
src/domain/NpcType.ts
View File

File diff suppressed because it is too large Load Diff

1478
src/domain/ObjectType.ts
View File

File diff suppressed because it is too large Load Diff

102
src/domain/index.ts
View File

@ -1,22 +1,22 @@
import { computed, observable } from 'mobx';
import { Object3D } from 'three';
import { BufferCursor } from '../data_formats/BufferCursor';
import { DatNpc, DatObject, DatUnknown } from '../data_formats/parsing/quest/dat';
import { NpcType } from './NpcType';
import { ObjectType } from './ObjectType';
import { enum_values } from '../enums';
import { ItemType } from './items';
import { Vec3 } from '../data_formats/Vec3';
import { computed, observable } from "mobx";
import { Object3D } from "three";
import { BufferCursor } from "../data_formats/BufferCursor";
import { DatNpc, DatObject, DatUnknown } from "../data_formats/parsing/quest/dat";
import { NpcType } from "./NpcType";
import { ObjectType } from "./ObjectType";
import { enum_values } from "../enums";
import { ItemType } from "./items";
import { Vec3 } from "../data_formats/Vec3";
export * from './items';
export * from './NpcType';
export * from './ObjectType';
export * from "./items";
export * from "./NpcType";
export * from "./ObjectType";
export const RARE_ENEMY_PROB = 1 / 512;
export const KONDRIEU_PROB = 1 / 10;
export enum Server {
Ephinea = 'Ephinea'
Ephinea = "Ephinea",
}
export const Servers: Server[] = enum_values(Server);
@ -24,7 +24,7 @@ export const Servers: Server[] = enum_values(Server);
export enum Episode {
I = 1,
II = 2,
IV = 4
IV = 4,
}
export const Episodes: Episode[] = enum_values(Episode);
@ -51,7 +51,10 @@ export enum SectionId {
export const SectionIds: SectionId[] = enum_values(SectionId);
export enum Difficulty {
Normal, Hard, VHard, Ultimate
Normal,
Hard,
VHard,
Ultimate,
}
export const Difficulties: Difficulty[] = enum_values(Difficulty);
@ -69,15 +72,11 @@ export class Section {
return Math.cos(this.y_axis_rotation);
}
constructor(
id: number,
position: Vec3,
y_axis_rotation: number
) {
constructor(id: number, position: Vec3, y_axis_rotation: number) {
if (!Number.isInteger(id) || id < -1)
throw new Error(`Expected id to be an integer greater than or equal to -1, got ${id}.`);
if (!position) throw new Error('position is required.');
if (typeof y_axis_rotation !== 'number') throw new Error('y_axis_rotation is required.');
if (!position) throw new Error("position is required.");
if (typeof y_axis_rotation !== "number") throw new Error("y_axis_rotation is required.");
this.id = id;
this.position = position;
@ -115,10 +114,11 @@ export class Quest {
dat_unknowns: DatUnknown[],
bin_data: BufferCursor
) {
if (id != null && (!Number.isInteger(id) || id < 0)) throw new Error('id should be undefined or a non-negative integer.');
if (id != null && (!Number.isInteger(id) || id < 0))
throw new Error("id should be undefined or a non-negative integer.");
check_episode(episode);
if (!objects || !(objects instanceof Array)) throw new Error('objs is required.');
if (!npcs || !(npcs instanceof Array)) throw new Error('npcs is required.');
if (!objects || !(objects instanceof Array)) throw new Error("objs is required.");
if (!npcs || !(npcs instanceof Array)) throw new Error("npcs is required.");
this.id = id;
this.name = name;
@ -193,20 +193,15 @@ export class QuestEntity {
object_3d?: Object3D;
constructor(
area_id: number,
section_id: number,
position: Vec3,
rotation: Vec3
) {
constructor(area_id: number, section_id: number, position: Vec3, rotation: Vec3) {
if (Object.getPrototypeOf(this) === Object.getPrototypeOf(QuestEntity))
throw new Error('Abstract class should not be instantiated directly.');
throw new Error("Abstract class should not be instantiated directly.");
if (!Number.isInteger(area_id) || area_id < 0)
throw new Error(`Expected area_id to be a non-negative integer, got ${area_id}.`);
if (!Number.isInteger(section_id) || section_id < 0)
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 (!position) throw new Error("position is required.");
if (!rotation) throw new Error("rotation is required.");
this.area_id = area_id;
this._section_id = section_id;
@ -232,7 +227,7 @@ export class QuestObject extends QuestEntity {
) {
super(area_id, section_id, position, rotation);
if (!type) throw new Error('type is required.');
if (!type) throw new Error("type is required.");
this.type = type;
this.dat = dat;
@ -256,7 +251,7 @@ export class QuestNpc extends QuestEntity {
) {
super(area_id, section_id, position, rotation);
if (!type) throw new Error('type is required.');
if (!type) throw new Error("type is required.");
this.type = type;
this.dat = dat;
@ -272,8 +267,8 @@ export class Area {
constructor(id: number, name: string, order: number, area_variants: AreaVariant[]) {
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.');
if (!name) throw new Error("name is required.");
if (!area_variants) throw new Error("area_variants is required.");
this.id = id;
this.name = name;
@ -292,10 +287,10 @@ export class AreaVariant {
}
type ItemDrop = {
item_type: ItemType,
anything_rate: number,
rare_rate: number
}
item_type: ItemType;
anything_rate: number;
rare_rate: number;
};
export class EnemyDrop implements ItemDrop {
readonly rate: number;
@ -331,16 +326,11 @@ export class HuntMethod {
return this.user_time != null ? this.user_time : this.default_time;
}
constructor(
id: string,
name: string,
quest: SimpleQuest,
default_time: number
) {
if (!id) throw new Error('id is required.');
if (default_time <= 0) throw new Error('default_time must be greater than zero.');
if (!name) throw new Error('name is required.');
if (!quest) throw new Error('quest is required.');
constructor(id: string, name: string, quest: SimpleQuest, default_time: number) {
if (!id) throw new Error("id is required.");
if (default_time <= 0) throw new Error("default_time must be greater than zero.");
if (!name) throw new Error("name is required.");
if (!quest) throw new Error("quest is required.");
this.id = id;
this.name = name;
@ -358,9 +348,9 @@ export class SimpleQuest {
public readonly episode: Episode,
public readonly enemy_counts: Map<NpcType, number>
) {
if (!id) throw new Error('id is required.');
if (!name) throw new Error('name is required.');
if (!enemy_counts) throw new Error('enemyCounts is required.');
if (!id) throw new Error("id is required.");
if (!name) throw new Error("name is required.");
if (!enemy_counts) throw new Error("enemyCounts is required.");
}
}
@ -370,5 +360,5 @@ export class PlayerModel {
public readonly head_style_count: number,
public readonly hair_styles_count: number,
public readonly hair_styles_with_accessory: Set<number>
) { }
) {}
}

50
src/domain/items.ts
View File

@ -7,8 +7,8 @@ import { observable, computed } from "mobx";
//
export interface ItemType {
readonly id: number,
readonly name: string
readonly id: number;
readonly name: string;
}
export class WeaponItemType implements ItemType {
@ -19,8 +19,8 @@ export class WeaponItemType implements ItemType {
readonly max_atp: number,
readonly ata: number,
readonly max_grind: number,
readonly required_atp: number,
) { }
readonly required_atp: number
) {}
}
export class ArmorItemType implements ItemType {
@ -35,8 +35,8 @@ export class ArmorItemType implements ItemType {
readonly max_dfp: number,
readonly mst: number,
readonly hp: number,
readonly lck: number,
) { }
readonly lck: number
) {}
}
export class ShieldItemType implements ItemType {
@ -51,22 +51,16 @@ export class ShieldItemType implements ItemType {
readonly max_dfp: number,
readonly mst: number,
readonly hp: number,
readonly lck: number,
) { }
readonly lck: number
) {}
}
export class UnitItemType implements ItemType {
constructor(
readonly id: number,
readonly name: string,
) { }
constructor(readonly id: number, readonly name: string) {}
}
export class ToolItemType implements ItemType {
constructor(
readonly id: number,
readonly name: string,
) { }
constructor(readonly id: number, readonly name: string) {}
}
//
@ -76,7 +70,7 @@ export class ToolItemType implements ItemType {
//
export interface Item {
readonly type: ItemType,
readonly type: ItemType;
}
export class WeaponItem implements Item {
@ -94,31 +88,21 @@ export class WeaponItem implements Item {
return 2 * this.grind;
}
constructor(
readonly type: WeaponItemType,
) { }
constructor(readonly type: WeaponItemType) {}
}
export class ArmorItem implements Item {
constructor(
readonly type: ArmorItemType,
) { }
constructor(readonly type: ArmorItemType) {}
}
export class ShieldItem implements Item {
constructor(
readonly type: ShieldItemType,
) { }
constructor(readonly type: ShieldItemType) {}
}
export class UnitItem implements Item {
constructor(
readonly type: UnitItemType,
) { }
constructor(readonly type: UnitItemType) {}
}
export class ToolItem implements Item {
constructor(
readonly type: ToolItemType,
) { }
}
constructor(readonly type: ToolItemType) {}
}

131
src/dto.ts
View File

@ -1,84 +1,85 @@
export type ItemTypeDto = WeaponItemTypeDto
export type ItemTypeDto =
| WeaponItemTypeDto
| ArmorItemTypeDto
| ShieldItemTypeDto
| UnitItemTypeDto
| ToolItemTypeDto
| ToolItemTypeDto;
export type WeaponItemTypeDto = {
class: 'weapon',
id: number,
name: string,
minAtp: number,
maxAtp: number,
ata: number,
maxGrind: number,
requiredAtp: number,
}
class: "weapon";
id: number;
name: string;
minAtp: number;
maxAtp: number;
ata: number;
maxGrind: number;
requiredAtp: number;
};
export type ArmorItemTypeDto = {
class: 'armor',
id: number,
name: string,
atp: number,
ata: number,
minEvp: number,
maxEvp: number,
minDfp: number,
maxDfp: number,
mst: number,
hp: number,
lck: number,
}
class: "armor";
id: number;
name: string;
atp: number;
ata: number;
minEvp: number;
maxEvp: number;
minDfp: number;
maxDfp: number;
mst: number;
hp: number;
lck: number;
};
export type ShieldItemTypeDto = {
class: 'shield',
id: number,
name: string,
atp: number,
ata: number,
minEvp: number,
maxEvp: number,
minDfp: number,
maxDfp: number,
mst: number,
hp: number,
lck: number,
}
class: "shield";
id: number;
name: string;
atp: number;
ata: number;
minEvp: number;
maxEvp: number;
minDfp: number;
maxDfp: number;
mst: number;
hp: number;
lck: number;
};
export type UnitItemTypeDto = {
class: 'unit',
id: number,
name: string,
}
class: "unit";
id: number;
name: string;
};
export type ToolItemTypeDto = {
class: 'tool',
id: number,
name: string,
}
class: "tool";
id: number;
name: string;
};
export type EnemyDropDto = {
difficulty: string,
episode: number,
sectionId: string,
enemy: string,
itemTypeId: number,
dropRate: number,
rareRate: number,
}
difficulty: string;
episode: number;
sectionId: string;
enemy: string;
itemTypeId: number;
dropRate: number;
rareRate: number;
};
export type BoxDropDto = {
difficulty: string,
episode: number,
sectionId: string,
areaId: number,
itemTypeId: number,
dropRate: number,
}
difficulty: string;
episode: number;
sectionId: string;
areaId: number;
itemTypeId: number;
dropRate: number;
};
export type QuestDto = {
id: number,
name: string,
episode: 1 | 2 | 4,
enemyCounts: { [npcTypeCode: string]: number },
}
id: number;
name: string;
episode: 1 | 2 | 4;
enemyCounts: { [npcTypeCode: string]: number };
};

8
src/enums.ts
View File

@ -1,16 +1,16 @@
export function enum_values<E>(e: any): E[] {
const values = Object.values(e);
const number_values = values.filter(v => typeof v === 'number');
const number_values = values.filter(v => typeof v === "number");
if (number_values.length) {
return number_values as any as E[];
return (number_values as any) as E[];
} else {
return values as any as E[];
return (values as any) as E[];
}
}
export function enum_names(e: any): string[] {
return Object.keys(e).filter(k => typeof (e as any)[k] === 'string');
return Object.keys(e).filter(k => typeof (e as any)[k] === "string");
}
/**

17
src/index.tsx
View File

@ -1,17 +1,14 @@
import React from 'react';
import ReactDOM from 'react-dom';
import React from "react";
import ReactDOM from "react-dom";
import Logger from "js-logger";
import './index.less';
import { ApplicationComponent } from './ui/ApplicationComponent';
import 'react-virtualized/styles.css';
import "./index.less";
import { ApplicationComponent } from "./ui/ApplicationComponent";
import "react-virtualized/styles.css";
import "react-select/dist/react-select.css";
import "react-virtualized-select/styles.css";
Logger.useDefaults({
defaultLevel: (Logger as any)[process.env['REACT_APP_LOG_LEVEL'] || 'OFF']
defaultLevel: (Logger as any)[process.env["REACT_APP_LOG_LEVEL"] || "OFF"],
});
ReactDOM.render(
<ApplicationComponent />,
document.getElementById('phantasmal-world-root')
);
ReactDOM.render(<ApplicationComponent />, document.getElementById("phantasmal-world-root"));

2
src/javascript-lp-solver.d.ts vendored
View File

@ -1 +1 @@
declare module 'javascript-lp-solver';
declare module "javascript-lp-solver";

130
src/rendering/QuestRenderer.ts
View File

@ -1,9 +1,25 @@
import { Intersection, Mesh, MeshLambertMaterial, Object3D, Plane, Raycaster, Vector2, Vector3 } from "three";
import {
Intersection,
Mesh,
MeshLambertMaterial,
Object3D,
Plane,
Raycaster,
Vector2,
Vector3,
} from "three";
import { Area, Quest, QuestEntity, QuestNpc, QuestObject, Section } from "../domain";
import { Vec3 } from "../data_formats/Vec3";
import { area_store } from "../stores/AreaStore";
import { quest_editor_store } from "../stores/QuestEditorStore";
import { NPC_COLOR, NPC_HOVER_COLOR, NPC_SELECTED_COLOR, OBJECT_COLOR, OBJECT_HOVER_COLOR, OBJECT_SELECTED_COLOR } from "./entities";
import {
NPC_COLOR,
NPC_HOVER_COLOR,
NPC_SELECTED_COLOR,
OBJECT_COLOR,
OBJECT_HOVER_COLOR,
OBJECT_SELECTED_COLOR,
} from "./entities";
import { Renderer } from "./Renderer";
let renderer: QuestRenderer | undefined;
@ -42,18 +58,9 @@ export class QuestRenderer extends Renderer {
constructor() {
super();
this.renderer.domElement.addEventListener(
'mousedown',
this.on_mouse_down
);
this.renderer.domElement.addEventListener(
'mouseup',
this.on_mouse_up
);
this.renderer.domElement.addEventListener(
'mousemove',
this.on_mouse_move
);
this.renderer.domElement.addEventListener("mousedown", this.on_mouse_down);
this.renderer.domElement.addEventListener("mouseup", this.on_mouse_up);
this.renderer.domElement.addEventListener("mousemove", this.on_mouse_move);
this.scene.add(this.obj_geometry);
this.scene.add(this.npc_geometry);
@ -118,7 +125,11 @@ export class QuestRenderer extends Renderer {
const variant = this.quest.area_variants.find(v => v.area.id === area_id);
const variant_id = (variant && variant.id) || 0;
const collision_geometry = await area_store.get_area_collision_geometry(episode, area_id, variant_id);
const collision_geometry = await area_store.get_area_collision_geometry(
episode,
area_id,
variant_id
);
if (this.quest && this.area) {
this.scene.remove(this.collision_geometry);
@ -129,7 +140,11 @@ export class QuestRenderer extends Renderer {
this.scene.add(collision_geometry);
}
const render_geometry = await area_store.get_area_render_geometry(episode, area_id, variant_id);
const render_geometry = await area_store.get_area_render_geometry(
episode,
area_id,
variant_id
);
if (this.quest && this.area) {
this.render_geometry = render_geometry;
@ -167,21 +182,19 @@ export class QuestRenderer extends Renderer {
private on_mouse_down = (e: MouseEvent) => {
const old_selected_data = this.selected_data;
const data = this.pick_entity(
this.pointer_pos_to_device_coords(e)
);
const data = this.pick_entity(this.pointer_pos_to_device_coords(e));
// Did we pick a different object than the previously hovered over 3D object?
if (this.hovered_data && (!data || data.object !== this.hovered_data.object)) {
(this.hovered_data.object.material as MeshLambertMaterial).color.set(
this.get_color(this.hovered_data.entity, 'normal')
this.get_color(this.hovered_data.entity, "normal")
);
}
// Did we pick a different object than the previously selected 3D object?
if (this.selected_data && (!data || data.object !== this.selected_data.object)) {
(this.selected_data.object.material as MeshLambertMaterial).color.set(
this.get_color(this.selected_data.entity, 'normal')
this.get_color(this.selected_data.entity, "normal")
);
this.selected_data.manipulating = false;
}
@ -189,7 +202,7 @@ export class QuestRenderer extends Renderer {
if (data) {
// User selected an entity.
(data.object.material as MeshLambertMaterial).color.set(
this.get_color(data.entity, 'selected')
this.get_color(data.entity, "selected")
);
data.manipulating = true;
this.hovered_data = data;
@ -202,21 +215,22 @@ export class QuestRenderer extends Renderer {
this.controls.enabled = true;
}
const selection_changed = old_selected_data && data
? old_selected_data.object !== data.object
: old_selected_data !== data;
const selection_changed =
old_selected_data && data
? old_selected_data.object !== data.object
: old_selected_data !== data;
if (selection_changed) {
quest_editor_store.set_selected_entity(data && data.entity);
}
}
};
private on_mouse_up = () => {
if (this.selected_data) {
this.selected_data.manipulating = false;
this.controls.enabled = true;
}
}
};
private on_mouse_move = (e: MouseEvent) => {
const pointer_pos = this.pointer_pos_to_device_coords(e);
@ -231,7 +245,9 @@ export class QuestRenderer extends Renderer {
// We intersect with a plane that's oriented toward the camera and that's coplanar with the point where the entity was grabbed.
this.raycaster.setFromCamera(pointer_pos, this.camera);
const ray = this.raycaster.ray;
const negative_world_dir = this.camera.getWorldDirection(new Vector3()).negate();
const negative_world_dir = this.camera
.getWorldDirection(new Vector3())
.negate();
const plane = new Plane().setFromNormalAndCoplanarPoint(
new Vector3(negative_world_dir.x, 0, negative_world_dir.z).normalize(),
data.object.position.sub(data.grab_offset)
@ -268,7 +284,8 @@ export class QuestRenderer extends Renderer {
// ray.origin.add(data.dragAdjust);
const plane = new Plane(
new Vector3(0, 1, 0),
-data.entity.position.y + data.grab_offset.y);
-data.entity.position.y + data.grab_offset.y
);
const intersection_point = new Vector3();
if (ray.intersectPlane(plane, intersection_point)) {
@ -289,7 +306,7 @@ export class QuestRenderer extends Renderer {
if (old_data && (!data || data.object !== old_data.object)) {
if (!this.selected_data || old_data.object !== this.selected_data.object) {
(old_data.object.material as MeshLambertMaterial).color.set(
this.get_color(old_data.entity, 'normal')
this.get_color(old_data.entity, "normal")
);
}
@ -299,20 +316,20 @@ export class QuestRenderer extends Renderer {
if (data && (!old_data || data.object !== old_data.object)) {
if (!this.selected_data || data.object !== this.selected_data.object) {
(data.object.material as MeshLambertMaterial).color.set(
this.get_color(data.entity, 'hover')
this.get_color(data.entity, "hover")
);
}
this.hovered_data = data;
}
}
}
};
private pointer_pos_to_device_coords(e: MouseEvent) {
const coords = new Vector2();
this.renderer.getSize(coords);
coords.width = e.offsetX / coords.width * 2 - 1;
coords.height = e.offsetY / coords.height * -2 + 1;
coords.width = (e.offsetX / coords.width) * 2 - 1;
coords.height = (e.offsetY / coords.height) * -2 + 1;
return coords;
}
@ -322,12 +339,8 @@ export class QuestRenderer extends Renderer {
private pick_entity(pointer_pos: Vector2): PickEntityResult | undefined {
// Find the nearest object and NPC under the pointer.
this.raycaster.setFromCamera(pointer_pos, this.camera);
const [nearest_object] = this.raycaster.intersectObjects(
this.obj_geometry.children
);
const [nearest_npc] = this.raycaster.intersectObjects(
this.npc_geometry.children
);
const [nearest_object] = this.raycaster.intersectObjects(this.obj_geometry.children);
const [nearest_npc] = this.raycaster.intersectObjects(this.npc_geometry.children);
if (!nearest_object && !nearest_npc) {
return;
@ -339,21 +352,15 @@ export class QuestRenderer extends Renderer {
const entity = intersection.object.userData.entity;
// Vector that points from the grabbing point to the model's origin.
const grab_offset = intersection.object.position
.clone()
.sub(intersection.point);
const grab_offset = intersection.object.position.clone().sub(intersection.point);
// Vector that points from the grabbing point to the terrain point directly under the model's origin.
const drag_adjust = grab_offset.clone();
// Distance to terrain.
let drag_y = 0;
// Find vertical distance to terrain.
this.raycaster.set(
intersection.object.position, new Vector3(0, -1, 0)
);
const [terrain] = this.raycaster.intersectObjects(
this.collision_geometry.children, true
);
this.raycaster.set(intersection.object.position, new Vector3(0, -1, 0));
const [terrain] = this.raycaster.intersectObjects(this.collision_geometry.children, true);
if (terrain) {
drag_adjust.sub(new Vector3(0, terrain.distance, 0));
@ -366,7 +373,7 @@ export class QuestRenderer extends Renderer {
grab_offset,
drag_adjust,
drag_y,
manipulating: false
manipulating: false,
};
}
@ -377,13 +384,12 @@ export class QuestRenderer extends Renderer {
pointer_pos: Vector2,
data: PickEntityResult
): {
intersection?: Intersection,
section?: Section
intersection?: Intersection;
section?: Section;
} {
this.raycaster.setFromCamera(pointer_pos, this.camera);
this.raycaster.ray.origin.add(data.drag_adjust);
const terrains = this.raycaster.intersectObjects(
this.collision_geometry.children, true);
const terrains = this.raycaster.intersectObjects(this.collision_geometry.children, true);
// Don't allow entities to be placed on very steep terrain.
// E.g. walls.
@ -391,15 +397,14 @@ export class QuestRenderer extends Renderer {
for (const terrain of terrains) {
if (terrain.face!.normal.y > 0.75) {
// Find section ID.
this.raycaster.set(
terrain.point.clone().setY(1000), new Vector3(0, -1, 0));
this.raycaster.set(terrain.point.clone().setY(1000), new Vector3(0, -1, 0));
const render_terrains = this.raycaster
.intersectObjects(this.render_geometry.children, true)
.filter(rt => rt.object.userData.section.id >= 0);
return {
intersection: terrain,
section: render_terrains[0] && render_terrains[0].object.userData.section
section: render_terrains[0] && render_terrains[0].object.userData.section,
};
}
}
@ -407,14 +412,17 @@ export class QuestRenderer extends Renderer {
return {};
}
private get_color(entity: QuestEntity, type: 'normal' | 'hover' | 'selected') {
private get_color(entity: QuestEntity, type: "normal" | "hover" | "selected") {
const is_npc = entity instanceof QuestNpc;
switch (type) {
default:
case 'normal': return is_npc ? NPC_COLOR : OBJECT_COLOR;
case 'hover': return is_npc ? NPC_HOVER_COLOR : OBJECT_HOVER_COLOR;
case 'selected': return is_npc ? NPC_SELECTED_COLOR : OBJECT_SELECTED_COLOR;
case "normal":
return is_npc ? NPC_COLOR : OBJECT_COLOR;
case "hover":
return is_npc ? NPC_HOVER_COLOR : OBJECT_HOVER_COLOR;
case "selected":
return is_npc ? NPC_SELECTED_COLOR : OBJECT_SELECTED_COLOR;
}
}
}

23
src/rendering/Renderer.ts
View File

@ -1,6 +1,14 @@
import * as THREE from 'three';
import { Color, HemisphereLight, MOUSE, PerspectiveCamera, Scene, Vector3, WebGLRenderer } from 'three';
import OrbitControlsCreator from 'three-orbit-controls';
import * as THREE from "three";
import {
Color,
HemisphereLight,
MOUSE,
PerspectiveCamera,
Scene,
Vector3,
WebGLRenderer,
} from "three";
import OrbitControlsCreator from "three-orbit-controls";
const OrbitControls = OrbitControlsCreator(THREE);
@ -12,14 +20,11 @@ export class Renderer {
constructor() {
this.camera = new PerspectiveCamera(75, 1, 0.1, 5000);
this.controls = new OrbitControls(
this.camera,
this.renderer.domElement
);
this.controls = new OrbitControls(this.camera, this.renderer.domElement);
this.controls.mouseButtons.ORBIT = MOUSE.RIGHT;
this.controls.mouseButtons.PAN = MOUSE.LEFT;
this.scene.background = new Color(0x151C21);
this.scene.background = new Color(0x151c21);
this.scene.add(new HemisphereLight(0xffffff, 0x505050, 1));
requestAnimationFrame(this.render_loop);
@ -49,5 +54,5 @@ export class Renderer {
private render_loop = () => {
this.render();
requestAnimationFrame(this.render_loop);
}
};
}

48
src/rendering/animation.ts
View File

@ -1,6 +1,19 @@
import { AnimationClip, Euler, InterpolateLinear, InterpolateSmooth, KeyframeTrack, Quaternion, QuaternionKeyframeTrack, VectorKeyframeTrack } from "three";
import {
AnimationClip,
Euler,
InterpolateLinear,
InterpolateSmooth,
KeyframeTrack,
Quaternion,
QuaternionKeyframeTrack,
VectorKeyframeTrack,
} from "three";
import { NinjaModel, NinjaObject } from "../data_formats/parsing/ninja";
import { NjInterpolation, NjKeyframeTrackType, NjMotion } from "../data_formats/parsing/ninja/motion";
import {
NjInterpolation,
NjKeyframeTrackType,
NjMotion,
} from "../data_formats/parsing/ninja/motion";
export const PSO_FRAME_RATE = 30;
@ -8,9 +21,8 @@ export function create_animation_clip(
object: NinjaObject<NinjaModel>,
motion: NjMotion
): AnimationClip {
const interpolation = motion.interpolation === NjInterpolation.Spline
? InterpolateSmooth
: InterpolateLinear;
const interpolation =
motion.interpolation === NjInterpolation.Spline ? InterpolateSmooth : InterpolateLinear;
const tracks: KeyframeTrack[] = [];
@ -26,7 +38,7 @@ export function create_animation_clip(
times.push(keyframe.frame / PSO_FRAME_RATE);
if (type === NjKeyframeTrackType.Rotation) {
const order = bone.evaluation_flags.zxy_rotation_order ? 'ZXY' : 'ZYX';
const order = bone.evaluation_flags.zxy_rotation_order ? "ZXY" : "ZYX";
const quat = new Quaternion().setFromEuler(
new Euler(keyframe.value.x, keyframe.value.y, keyframe.value.z, order)
);
@ -38,23 +50,27 @@ export function create_animation_clip(
}
if (type === NjKeyframeTrackType.Rotation) {
tracks.push(new QuaternionKeyframeTrack(
`.bones[${bone_id}].quaternion`, times, values, interpolation
));
tracks.push(
new QuaternionKeyframeTrack(
`.bones[${bone_id}].quaternion`,
times,
values,
interpolation
)
);
} else {
const name = type === NjKeyframeTrackType.Position
? `.bones[${bone_id}].position`
: `.bones[${bone_id}].scale`;
const name =
type === NjKeyframeTrackType.Position
? `.bones[${bone_id}].position`
: `.bones[${bone_id}].scale`;
tracks.push(new VectorKeyframeTrack(
name, times, values, interpolation
));
tracks.push(new VectorKeyframeTrack(name, times, values, interpolation));
}
});
});
return new AnimationClip(
'Animation',
"Animation",
(motion.frame_count - 1) / PSO_FRAME_RATE,
tracks
).optimize();

56
src/rendering/entities.test.ts
View File

@ -1,17 +1,24 @@
import { CylinderBufferGeometry, MeshLambertMaterial, Object3D, Vector3 } from 'three';
import { DatNpc, DatObject } from '../data_formats/parsing/quest/dat';
import { NpcType, ObjectType, QuestNpc, QuestObject } from '../domain';
import { CylinderBufferGeometry, MeshLambertMaterial, Object3D, Vector3 } from "three";
import { DatNpc, DatObject } from "../data_formats/parsing/quest/dat";
import { NpcType, ObjectType, QuestNpc, QuestObject } from "../domain";
import { Vec3 } from "../data_formats/Vec3";
import { create_npc_mesh, create_object_mesh, NPC_COLOR, OBJECT_COLOR } from './entities';
import { create_npc_mesh, create_object_mesh, NPC_COLOR, OBJECT_COLOR } from "./entities";
const cylinder = new CylinderBufferGeometry(3, 3, 20).translate(0, 10, 0);
test('create geometry for quest objects', () => {
const object = new QuestObject(7, 13, new Vec3(17, 19, 23), new Vec3(0, 0, 0), ObjectType.PrincipalWarp, {} as DatObject);
test("create geometry for quest objects", () => {
const object = new QuestObject(
7,
13,
new Vec3(17, 19, 23),
new Vec3(0, 0, 0),
ObjectType.PrincipalWarp,
{} as DatObject
);
const geometry = create_object_mesh(object, cylinder);
expect(geometry).toBeInstanceOf(Object3D);
expect(geometry.name).toBe('Object');
expect(geometry.name).toBe("Object");
expect(geometry.userData.entity).toBe(object);
expect(geometry.position.x).toBe(17);
expect(geometry.position.y).toBe(19);
@ -19,12 +26,19 @@ test('create geometry for quest objects', () => {
expect((geometry.material as MeshLambertMaterial).color.getHex()).toBe(OBJECT_COLOR);
});
test('create geometry for quest NPCs', () => {
const npc = new QuestNpc(7, 13, new Vec3(17, 19, 23), new Vec3(0, 0, 0), NpcType.Booma, {} as DatNpc);
test("create geometry for quest NPCs", () => {
const npc = new QuestNpc(
7,
13,
new Vec3(17, 19, 23),
new Vec3(0, 0, 0),
NpcType.Booma,
{} as DatNpc
);
const geometry = create_npc_mesh(npc, cylinder);
expect(geometry).toBeInstanceOf(Object3D);
expect(geometry.name).toBe('NPC');
expect(geometry.name).toBe("NPC");
expect(geometry.userData.entity).toBe(npc);
expect(geometry.position.x).toBe(17);
expect(geometry.position.y).toBe(19);
@ -32,16 +46,30 @@ test('create geometry for quest NPCs', () => {
expect((geometry.material as MeshLambertMaterial).color.getHex()).toBe(NPC_COLOR);
});
test('geometry position changes when entity position changes element-wise', () => {
const npc = new QuestNpc(7, 13, new Vec3(17, 19, 23), new Vec3(0, 0, 0), NpcType.Booma, {} as DatNpc);
test("geometry position changes when entity position changes element-wise", () => {
const npc = new QuestNpc(
7,
13,
new Vec3(17, 19, 23),
new Vec3(0, 0, 0),
NpcType.Booma,
{} as DatNpc
);
const geometry = create_npc_mesh(npc, cylinder);
npc.position = new Vec3(2, 3, 5).add(npc.position);
expect(geometry.position).toEqual(new Vector3(19, 22, 28));
});
test('geometry position changes when entire entity position changes', () => {
const npc = new QuestNpc(7, 13, new Vec3(17, 19, 23), new Vec3(0, 0, 0), NpcType.Booma, {} as DatNpc);
test("geometry position changes when entire entity position changes", () => {
const npc = new QuestNpc(
7,
13,
new Vec3(17, 19, 23),
new Vec3(0, 0, 0),
NpcType.Booma,
{} as DatNpc
);
const geometry = create_npc_mesh(npc, cylinder);
npc.position = new Vec3(2, 3, 5);

26
src/rendering/entities.ts
View File

@ -1,20 +1,20 @@
import { autorun } from 'mobx';
import { BufferGeometry, DoubleSide, Mesh, MeshLambertMaterial } from 'three';
import { QuestEntity, QuestNpc, QuestObject } from '../domain';
import { autorun } from "mobx";
import { BufferGeometry, DoubleSide, Mesh, MeshLambertMaterial } from "three";
import { QuestEntity, QuestNpc, QuestObject } from "../domain";
export const OBJECT_COLOR = 0xFFFF00;
export const OBJECT_HOVER_COLOR = 0xFFDF3F;
export const OBJECT_SELECTED_COLOR = 0xFFAA00;
export const NPC_COLOR = 0xFF0000;
export const NPC_HOVER_COLOR = 0xFF3F5F;
export const NPC_SELECTED_COLOR = 0xFF0054;
export const OBJECT_COLOR = 0xffff00;
export const OBJECT_HOVER_COLOR = 0xffdf3f;
export const OBJECT_SELECTED_COLOR = 0xffaa00;
export const NPC_COLOR = 0xff0000;
export const NPC_HOVER_COLOR = 0xff3f5f;
export const NPC_SELECTED_COLOR = 0xff0054;
export function create_object_mesh(object: QuestObject, geometry: BufferGeometry): Mesh {
return create_mesh(object, geometry, OBJECT_COLOR, 'Object');
return create_mesh(object, geometry, OBJECT_COLOR, "Object");
}
export function create_npc_mesh(npc: QuestNpc, geometry: BufferGeometry): Mesh {
return create_mesh(npc, geometry, NPC_COLOR, 'NPC');
return create_mesh(npc, geometry, NPC_COLOR, "NPC");
}
function create_mesh(
@ -27,9 +27,9 @@ function create_mesh(
geometry,
new MeshLambertMaterial({
color,
side: DoubleSide
side: DoubleSide,
})
)
);
mesh.name = type;
mesh.userData.entity = entity;

99
src/rendering/models.ts
View File

@ -1,17 +1,32 @@
import { Bone, BufferGeometry, DoubleSide, Euler, Float32BufferAttribute, Material, Matrix3, Matrix4, MeshLambertMaterial, Quaternion, Skeleton, SkinnedMesh, Uint16BufferAttribute, Vector3 } from 'three';
import { vec3_to_threejs } from '.';
import { NinjaModel, NinjaObject } from '../data_formats/parsing/ninja';
import { NjModel } from '../data_formats/parsing/ninja/nj';
import { XjModel } from '../data_formats/parsing/ninja/xj';
import {
Bone,
BufferGeometry,
DoubleSide,
Euler,
Float32BufferAttribute,
Material,
Matrix3,
Matrix4,
MeshLambertMaterial,
Quaternion,
Skeleton,
SkinnedMesh,
Uint16BufferAttribute,
Vector3,
} from "three";
import { vec3_to_threejs } from ".";
import { NinjaModel, NinjaObject } from "../data_formats/parsing/ninja";
import { NjModel } from "../data_formats/parsing/ninja/nj";
import { XjModel } from "../data_formats/parsing/ninja/xj";
const DEFAULT_MATERIAL = new MeshLambertMaterial({
color: 0xFF00FF,
side: DoubleSide
color: 0xff00ff,
side: DoubleSide,
});
const DEFAULT_SKINNED_MATERIAL = new MeshLambertMaterial({
skinning: true,
color: 0xFF00FF,
side: DoubleSide
color: 0xff00ff,
side: DoubleSide,
});
const DEFAULT_NORMAL = new Vector3(0, 1, 0);
const NO_TRANSLATION = new Vector3(0, 0, 0);
@ -33,13 +48,13 @@ export function ninja_object_to_skinned_mesh(
}
type Vertex = {
bone_id: number,
position: Vector3,
normal?: Vector3,
bone_weight: number,
bone_weight_status: number,
calc_continue: boolean,
}
bone_id: number;
position: Vector3;
normal?: Vector3;
bone_weight: number;
bone_weight_status: number;
calc_continue: boolean;
};
class VerticesHolder {
private vertices_stack: Vertex[][] = [];
@ -73,17 +88,15 @@ class Object3DCreator {
private bone_weights: number[] = [];
private bones: Bone[] = [];
constructor(
private material: Material
) { }
constructor(private material: Material) {}
create_buffer_geometry(object: NinjaObject<NinjaModel>): BufferGeometry {
this.object_to_geometry(object, undefined, new Matrix4());
const geom = new BufferGeometry();
geom.addAttribute('position', new Float32BufferAttribute(this.positions, 3));
geom.addAttribute('normal', new Float32BufferAttribute(this.normals, 3));
geom.addAttribute("position", new Float32BufferAttribute(this.positions, 3));
geom.addAttribute("normal", new Float32BufferAttribute(this.normals, 3));
geom.setIndex(new Uint16BufferAttribute(this.indices, 1));
// The bounding spheres from the object seem be too small.
@ -94,8 +107,8 @@ class Object3DCreator {
create_skinned_mesh(object: NinjaObject<NinjaModel>): SkinnedMesh {
const geom = this.create_buffer_geometry(object);
geom.addAttribute('skinIndex', new Uint16BufferAttribute(this.bone_indices, 4));
geom.addAttribute('skinWeight', new Float32BufferAttribute(this.bone_weights, 4));
geom.addAttribute("skinIndex", new Uint16BufferAttribute(this.bone_indices, 4));
geom.addAttribute("skinWeight", new Float32BufferAttribute(this.bone_weights, 4));
const mesh = new SkinnedMesh(geom, this.material);
@ -112,12 +125,21 @@ class Object3DCreator {
parent_matrix: Matrix4
) {
const {
no_translate, no_rotate, no_scale, hidden, break_child_trace, zxy_rotation_order, skip
no_translate,
no_rotate,
no_scale,
hidden,
break_child_trace,
zxy_rotation_order,
skip,
} = object.evaluation_flags;
const { position, rotation, scale } = object;
const euler = new Euler(
rotation.x, rotation.y, rotation.z, zxy_rotation_order ? 'ZXY' : 'ZYX'
rotation.x,
rotation.y,
rotation.z,
zxy_rotation_order ? "ZXY" : "ZYX"
);
const matrix = new Matrix4()
.compose(
@ -158,7 +180,7 @@ class Object3DCreator {
}
private model_to_geometry(model: NinjaModel, matrix: Matrix4) {
if (model.type === 'nj') {
if (model.type === "nj") {
this.nj_model_to_geometry(model, matrix);
} else {
this.xj_model_to_geometry(model, matrix);
@ -181,7 +203,7 @@ class Object3DCreator {
normal,
bone_weight: vertex.bone_weight,
bone_weight_status: vertex.bone_weight_status,
calc_continue: vertex.calc_continue
calc_continue: vertex.calc_continue,
};
});
@ -253,16 +275,31 @@ class Object3DCreator {
const a = index_offset + strip_indices[j - 2];
const b = index_offset + strip_indices[j - 1];
const c = index_offset + strip_indices[j];
const pa = new Vector3(positions[3 * a], positions[3 * a + 1], positions[3 * a + 2]);
const pb = new Vector3(positions[3 * b], positions[3 * b + 1], positions[3 * b + 2]);
const pc = new Vector3(positions[3 * c], positions[3 * c + 1], positions[3 * c + 2]);
const pa = new Vector3(
positions[3 * a],
positions[3 * a + 1],
positions[3 * a + 2]
);
const pb = new Vector3(
positions[3 * b],
positions[3 * b + 1],
positions[3 * b + 2]
);
const pc = new Vector3(
positions[3 * c],
positions[3 * c + 1],
positions[3 * c + 2]
);
const na = new Vector3(normals[3 * a], normals[3 * a + 1], normals[3 * a + 2]);
const nb = new Vector3(normals[3 * a], normals[3 * a + 1], normals[3 * a + 2]);
const nc = new Vector3(normals[3 * a], normals[3 * a + 1], normals[3 * a + 2]);
// Calculate a surface normal and reverse the vertex winding if at least 2 of the vertex normals point in the opposite direction.
// This hack fixes the winding for most models.
const normal = pb.clone().sub(pa).cross(pc.clone().sub(pa));
const normal = pb
.clone()
.sub(pa)
.cross(pc.clone().sub(pa));
if (clockwise) {
normal.negate();

135
src/stores/AreaStore.ts
View File

@ -1,11 +1,13 @@
import { Area, AreaVariant, Section } from '../domain';
import { Object3D } from 'three';
import { parse_c_rel, parse_n_rel } from '../data_formats/parsing/geometry';
import { get_area_render_data, get_area_collision_data } from './binary_assets';
import { Area, AreaVariant, Section } from "../domain";
import { Object3D } from "three";
import { parse_c_rel, parse_n_rel } from "../data_formats/parsing/geometry";
import { get_area_render_data, get_area_collision_data } from "./binary_assets";
function area(id: number, name: string, order: number, variants: number): Area {
const area = new Area(id, name, order, []);
const varis = Array(variants).fill(null).map((_, i) => new AreaVariant(i, area));
const varis = Array(variants)
.fill(null)
.map((_, i) => new AreaVariant(i, area));
area.area_variants.splice(0, 0, ...varis);
return area;
}
@ -22,58 +24,58 @@ class AreaStore {
this.areas = [];
let order = 0;
this.areas[1] = [
area(0, 'Pioneer II', order++, 1),
area(1, 'Forest 1', order++, 1),
area(2, 'Forest 2', order++, 1),
area(11, 'Under the Dome', order++, 1),
area(3, 'Cave 1', order++, 6),
area(4, 'Cave 2', order++, 5),
area(5, 'Cave 3', order++, 6),
area(12, 'Underground Channel', order++, 1),
area(6, 'Mine 1', order++, 6),
area(7, 'Mine 2', order++, 6),
area(13, 'Monitor Room', order++, 1),
area(8, 'Ruins 1', order++, 5),
area(9, 'Ruins 2', order++, 5),
area(10, 'Ruins 3', order++, 5),
area(14, 'Dark Falz', order++, 1),
area(15, 'BA Ruins', order++, 3),
area(16, 'BA Spaceship', order++, 3),
area(17, 'Lobby', order++, 15),
area(0, "Pioneer II", order++, 1),
area(1, "Forest 1", order++, 1),
area(2, "Forest 2", order++, 1),
area(11, "Under the Dome", order++, 1),
area(3, "Cave 1", order++, 6),
area(4, "Cave 2", order++, 5),
area(5, "Cave 3", order++, 6),
area(12, "Underground Channel", order++, 1),
area(6, "Mine 1", order++, 6),
area(7, "Mine 2", order++, 6),
area(13, "Monitor Room", order++, 1),
area(8, "Ruins 1", order++, 5),
area(9, "Ruins 2", order++, 5),
area(10, "Ruins 3", order++, 5),
area(14, "Dark Falz", order++, 1),
area(15, "BA Ruins", order++, 3),
area(16, "BA Spaceship", order++, 3),
area(17, "Lobby", order++, 15),
];
order = 0;
this.areas[2] = [
area(0, 'Lab', order++, 1),
area(1, 'VR Temple Alpha', order++, 3),
area(2, 'VR Temple Beta', order++, 3),
area(14, 'VR Temple Final', order++, 1),
area(3, 'VR Spaceship Alpha', order++, 3),
area(4, 'VR Spaceship Beta', order++, 3),
area(15, 'VR Spaceship Final', order++, 1),
area(5, 'Central Control Area', order++, 1),
area(6, 'Jungle Area East', order++, 1),
area(7, 'Jungle Area North', order++, 1),
area(8, 'Mountain Area', order++, 3),
area(9, 'Seaside Area', order++, 1),
area(12, 'Cliffs of Gal Da Val', order++, 1),
area(10, 'Seabed Upper Levels', order++, 3),
area(11, 'Seabed Lower Levels', order++, 3),
area(13, 'Test Subject Disposal Area', order++, 1),
area(16, 'Seaside Area at Night', order++, 1),
area(17, 'Control Tower', order++, 5)
area(0, "Lab", order++, 1),
area(1, "VR Temple Alpha", order++, 3),
area(2, "VR Temple Beta", order++, 3),
area(14, "VR Temple Final", order++, 1),
area(3, "VR Spaceship Alpha", order++, 3),
area(4, "VR Spaceship Beta", order++, 3),
area(15, "VR Spaceship Final", order++, 1),
area(5, "Central Control Area", order++, 1),
area(6, "Jungle Area East", order++, 1),
area(7, "Jungle Area North", order++, 1),
area(8, "Mountain Area", order++, 3),
area(9, "Seaside Area", order++, 1),
area(12, "Cliffs of Gal Da Val", order++, 1),
area(10, "Seabed Upper Levels", order++, 3),
area(11, "Seabed Lower Levels", order++, 3),
area(13, "Test Subject Disposal Area", order++, 1),
area(16, "Seaside Area at Night", order++, 1),
area(17, "Control Tower", order++, 5),
];
order = 0;
this.areas[4] = [
area(0, 'Pioneer II (Ep. IV)', order++, 1),
area(1, 'Crater Route 1', order++, 1),
area(2, 'Crater Route 2', order++, 1),
area(3, 'Crater Route 3', order++, 1),
area(4, 'Crater Route 4', order++, 1),
area(5, 'Crater Interior', order++, 1),
area(6, 'Subterranean Desert 1', order++, 3),
area(7, 'Subterranean Desert 2', order++, 3),
area(8, 'Subterranean Desert 3', order++, 3),
area(9, 'Meteor Impact Site', order++, 1)
area(0, "Pioneer II (Ep. IV)", order++, 1),
area(1, "Crater Route 1", order++, 1),
area(2, "Crater Route 2", order++, 1),
area(3, "Crater Route 3", order++, 1),
area(4, "Crater Route 4", order++, 1),
area(5, "Crater Interior", order++, 1),
area(6, "Subterranean Desert 1", order++, 3),
area(7, "Subterranean Desert 2", order++, 3),
area(8, "Subterranean Desert 3", order++, 3),
area(9, "Meteor Impact Site", order++, 1),
];
}
@ -82,12 +84,13 @@ class AreaStore {
throw new Error(`Expected episode to be 1, 2 or 4, got ${episode}.`);
const area = this.areas[episode].find(a => a.id === area_id);
if (!area)
throw new Error(`Area id ${area_id} for episode ${episode} is invalid.`);
if (!area) throw new Error(`Area id ${area_id} for episode ${episode} is invalid.`);
const area_variant = area.area_variants[variant_id];
if (!area_variant)
throw new Error(`Area variant id ${variant_id} for area ${area_id} of episode ${episode} is invalid.`);
throw new Error(
`Area variant id ${variant_id} for area ${area_id} of episode ${episode} is invalid.`
);
return area_variant;
}
@ -102,9 +105,9 @@ class AreaStore {
if (sections) {
return sections;
} else {
return this.get_area_sections_and_render_geometry(
episode, area_id, area_variant
).then(({ sections }) => sections);
return this.get_area_sections_and_render_geometry(episode, area_id, area_variant).then(
({ sections }) => sections
);
}
}
@ -118,9 +121,9 @@ class AreaStore {
if (object_3d) {
return object_3d;
} else {
return this.get_area_sections_and_render_geometry(
episode, area_id, area_variant
).then(({ object_3d }) => object_3d);
return this.get_area_sections_and_render_geometry(episode, area_id, area_variant).then(
({ object_3d }) => object_3d
);
}
}
@ -134,9 +137,9 @@ class AreaStore {
if (object_3d) {
return object_3d;
} else {
const object_3d = get_area_collision_data(
episode, area_id, area_variant
).then(parse_c_rel);
const object_3d = get_area_collision_data(episode, area_id, area_variant).then(
parse_c_rel
);
collision_geometry_cache.set(`${area_id}-${area_variant}`, object_3d);
return object_3d;
}
@ -146,10 +149,8 @@ class AreaStore {
episode: number,
area_id: number,
area_variant: number
): Promise<{ sections: Section[], object_3d: Object3D }> {
const promise = get_area_render_data(
episode, area_id, area_variant
).then(parse_n_rel);
): Promise<{ sections: Section[]; object_3d: Object3D }> {
const promise = get_area_render_data(episode, area_id, area_variant).then(parse_n_rel);
const sections = new Promise<Section[]>((resolve, reject) => {
promise.then(({ sections }) => resolve(sections)).catch(reject);

56
src/stores/DpsCalcStore.ts
View File

@ -28,19 +28,23 @@ class Weapon {
}
@computed get final_min_atp(): number {
return this.min_atp
+ this.store.armor_atp
+ this.store.shield_atp
+ this.store.base_atp
+ this.store.base_shifta_atp;
return (
this.min_atp +
this.store.armor_atp +
this.store.shield_atp +
this.store.base_atp +
this.store.base_shifta_atp
);
}
@computed get final_max_atp(): number {
return this.max_atp
+ this.store.armor_atp
+ this.store.shield_atp
+ this.store.base_atp
+ this.store.base_shifta_atp;
return (
this.max_atp +
this.store.armor_atp +
this.store.shield_atp +
this.store.base_atp +
this.store.base_shifta_atp
);
}
@computed get min_normal_damage(): number {
@ -67,30 +71,27 @@ class Weapon {
return (this.min_heavy_damage + this.max_heavy_damage) / 2;
}
constructor(
private store: DpsCalcStore,
item: WeaponItem,
) {
constructor(private store: DpsCalcStore, item: WeaponItem) {
this.item = item;
}
}
class DpsCalcStore {
@computed get weapon_types(): WeaponItemType[] {
return item_type_stores.current.value.item_types.filter(it =>
it instanceof WeaponItemType
return item_type_stores.current.value.item_types.filter(
it => it instanceof WeaponItemType
) as WeaponItemType[];
}
@computed get armor_types(): ArmorItemType[] {
return item_type_stores.current.value.item_types.filter(it =>
it instanceof ArmorItemType
return item_type_stores.current.value.item_types.filter(
it => it instanceof ArmorItemType
) as ArmorItemType[];
}
@computed get shield_types(): ShieldItemType[] {
return item_type_stores.current.value.item_types.filter(it =>
it instanceof ShieldItemType
return item_type_stores.current.value.item_types.filter(
it => it instanceof ShieldItemType
) as ShieldItemType[];
}
@ -100,8 +101,12 @@ class DpsCalcStore {
@observable char_atp: number = 0;
@observable mag_pow: number = 0;
@computed get armor_atp(): number { return this.armor_type ? this.armor_type.atp : 0 }
@computed get shield_atp(): number { return this.shield_type ? this.shield_type.atp : 0 }
@computed get armor_atp(): number {
return this.armor_type ? this.armor_type.atp : 0;
}
@computed get shield_atp(): number {
return this.shield_type ? this.shield_type.atp : 0;
}
@observable shifta_lvl: number = 0;
@computed get base_atp(): number {
@ -119,11 +124,8 @@ class DpsCalcStore {
@observable readonly weapons: IObservableArray<Weapon> = observable.array();
add_weapon = (type: WeaponItemType) => {
this.weapons.push(new Weapon(
this,
new WeaponItem(type)
));
}
this.weapons.push(new Weapon(this, new WeaponItem(type)));
};
@observable armor_type?: ArmorItemType;
@observable shield_type?: ShieldItemType;

6
src/stores/EntityStore.ts
View File

@ -27,7 +27,7 @@ class EntityStore {
} else {
mesh = get_npc_data(npc_type).then(({ url, data }) => {
const cursor = new BufferCursor(data, true);
const nj_objects = url.endsWith('.nj') ? parse_nj(cursor) : parse_xj(cursor);
const nj_objects = url.endsWith(".nj") ? parse_nj(cursor) : parse_xj(cursor);
if (nj_objects.length) {
return ninja_object_to_buffer_geometry(nj_objects[0]);
@ -49,12 +49,12 @@ class EntityStore {
} else {
geometry = get_object_data(object_type).then(({ url, data }) => {
const cursor = new BufferCursor(data, true);
const nj_objects = url.endsWith('.nj') ? parse_nj(cursor) : parse_xj(cursor);
const nj_objects = url.endsWith(".nj") ? parse_nj(cursor) : parse_xj(cursor);
if (nj_objects.length) {
return ninja_object_to_buffer_geometry(nj_objects[0]);
} else {
throw new Error('File could not be parsed into a BufferGeometry.');
throw new Error("File could not be parsed into a BufferGeometry.");
}
});

33
src/stores/HuntMethodStore.ts
View File

@ -1,15 +1,15 @@
import Logger from 'js-logger';
import Logger from "js-logger";
import { autorun, IReactionDisposer, observable } from "mobx";
import { HuntMethod, NpcType, Server, SimpleQuest } from "../domain";
import { QuestDto } from "../dto";
import { Loadable } from "../Loadable";
import { ServerMap } from "./ServerMap";
const logger = Logger.get('stores/HuntMethodStore');
const logger = Logger.get("stores/HuntMethodStore");
class HuntMethodStore {
@observable methods: ServerMap<Loadable<Array<HuntMethod>>> = new ServerMap(server =>
new Loadable([], () => this.load_hunt_methods(server))
@observable methods: ServerMap<Loadable<Array<HuntMethod>>> = new ServerMap(
server => new Loadable([], () => this.load_hunt_methods(server))
);
private storage_disposer?: IReactionDisposer;
@ -18,7 +18,7 @@ class HuntMethodStore {
const response = await fetch(
`${process.env.PUBLIC_URL}/quests.${Server[server].toLowerCase()}.json`
);
const quests = await response.json() as QuestDto[];
const quests = (await response.json()) as QuestDto[];
const methods = new Array<HuntMethod>();
for (const quest of quests) {
@ -40,12 +40,12 @@ class HuntMethodStore {
/* eslint-disable no-fallthrough */
switch (quest.id) {
// The following quests are left out because their enemies don't drop anything.
case 31: // Black Paper's Dangerous Deal
case 34: // Black Paper's Dangerous Deal 2
case 31: // Black Paper's Dangerous Deal
case 34: // Black Paper's Dangerous Deal 2
case 1305: // Maximum Attack S (Ep. 1)
case 1306: // Maximum Attack S (Ep. 2)
case 1307: // Maximum Attack S (Ep. 4)
case 313: // Beyond the Horizon
case 313: // Beyond the Horizon
// MAXIMUM ATTACK 3 Ver2 is filtered out because its actual enemy count depends on the path taken.
// TODO: generate a method per path.
@ -57,13 +57,8 @@ class HuntMethodStore {
new HuntMethod(
`q${quest.id}`,
quest.name,
new SimpleQuest(
quest.id,
quest.name,
quest.episode,
enemy_counts
),
/^\d-\d.*/.test(quest.name) ? 0.75 : (total_count > 400 ? 0.75 : 0.5)
new SimpleQuest(quest.id, quest.name, quest.episode, enemy_counts),
/^\d-\d.*/.test(quest.name) ? 0.75 : total_count > 400 ? 0.75 : 0.5
)
);
}
@ -90,13 +85,11 @@ class HuntMethodStore {
this.storage_disposer();
}
this.storage_disposer = autorun(() =>
this.store_in_local_storage(methods, server)
);
this.storage_disposer = autorun(() => this.store_in_local_storage(methods, server));
} catch (e) {
logger.error(e);
}
}
};
private store_in_local_storage = (methods: HuntMethod[], server: Server) => {
try {
@ -115,7 +108,7 @@ class HuntMethodStore {
} catch (e) {
logger.error(e);
}
}
};
}
type StoredUserTimes = { [method_id: string]: number };

140
src/stores/HuntOptimizerStore.ts
View File

@ -1,13 +1,25 @@
import solver from 'javascript-lp-solver';
import solver from "javascript-lp-solver";
import { autorun, IObservableArray, observable, computed } from "mobx";
import { Difficulties, Difficulty, HuntMethod, ItemType, KONDRIEU_PROB, NpcType, RARE_ENEMY_PROB, SectionId, SectionIds, Server, Episode } from "../domain";
import { application_store } from './ApplicationStore';
import {
Difficulties,
Difficulty,
HuntMethod,
ItemType,
KONDRIEU_PROB,
NpcType,
RARE_ENEMY_PROB,
SectionId,
SectionIds,
Server,
Episode,
} from "../domain";
import { application_store } from "./ApplicationStore";
import { hunt_method_store } from "./HuntMethodStore";
import { item_drop_stores as item_drop_stores } from './ItemDropStore';
import { item_type_stores } from './ItemTypeStore';
import Logger from 'js-logger';
import { item_drop_stores } from "./ItemDropStore";
import { item_type_stores } from "./ItemTypeStore";
import Logger from "js-logger";
const logger = Logger.get('stores/HuntOptimizerStore');
const logger = Logger.get("stores/HuntOptimizerStore");
export class WantedItem {
@observable readonly item_type: ItemType;
@ -23,7 +35,7 @@ export class OptimalResult {
constructor(
readonly wanted_items: Array<ItemType>,
readonly optimal_methods: Array<OptimalMethod>
) { }
) {}
}
export class OptimalMethod {
@ -52,8 +64,8 @@ export class OptimalMethod {
class HuntOptimizerStore {
@computed get huntable_item_types(): Array<ItemType> {
const item_drop_store = item_drop_stores.current.value;
return item_type_stores.current.value.item_types.filter(i =>
item_drop_store.enemy_drops.get_drops_for_item_type(i.id).length
return item_type_stores.current.value.item_types.filter(
i => item_drop_store.enemy_drops.get_drops_for_item_type(i.id).length
);
}
@ -73,7 +85,9 @@ class HuntOptimizerStore {
// Initialize this set before awaiting data, so user changes don't affect this optimization
// run from this point on.
const wanted_items = new Set(this.wanted_items.filter(w => w.amount > 0).map(w => w.item_type));
const wanted_items = new Set(
this.wanted_items.filter(w => w.amount > 0).map(w => w.item_type)
);
const methods = await hunt_method_store.methods.current.promise;
const drop_table = (await item_drop_stores.current.promise).enemy_drops;
@ -91,17 +105,17 @@ class HuntOptimizerStore {
// Each variable has a time property to minimize and a property per item with the number
// of enemies that drop the item multiplied by the corresponding drop rate as its value.
type Variable = {
time: number,
[item_name: string]: number,
}
time: number;
[item_name: string]: number;
};
const variables: { [method_name: string]: Variable } = {};
type VariableDetails = {
method: HuntMethod,
difficulty: Difficulty,
section_id: SectionId,
split_pan_arms: boolean,
}
method: HuntMethod;
difficulty: Difficulty;
section_id: SectionId;
split_pan_arms: boolean;
};
const variable_details: Map<string, VariableDetails> = new Map();
for (const method of methods) {
@ -168,7 +182,7 @@ class HuntOptimizerStore {
// Will contain an entry per wanted item dropped by enemies in this method/
// difficulty/section ID combo.
const variable: Variable = {
time: method.time
time: method.time,
};
// Only add the variable if the method provides at least 1 item we want.
let add_variable = false;
@ -185,14 +199,17 @@ class HuntOptimizerStore {
if (add_variable) {
const name = this.full_method_name(
difficulty, section_id, method, split_pan_arms
difficulty,
section_id,
method,
split_pan_arms
);
variables[name] = variable;
variable_details.set(name, {
method,
difficulty,
section_id,
split_pan_arms
split_pan_arms,
});
}
}
@ -201,18 +218,18 @@ class HuntOptimizerStore {
}
const result: {
feasible: boolean,
bounded: boolean,
result: number,
feasible: boolean;
bounded: boolean;
result: number;
/**
* Value will always be a number if result is indexed with an actual method name.
*/
[method: string]: number | boolean
[method: string]: number | boolean;
} = solver.Solve({
optimize: 'time',
opType: 'min',
optimize: "time",
opType: "min",
constraints,
variables
variables,
});
if (!result.feasible) {
@ -251,9 +268,10 @@ class HuntOptimizerStore {
let match_found = true;
if (sid !== section_id) {
const v = variables[
this.full_method_name(difficulty, sid, method, split_pan_arms)
];
const v =
variables[
this.full_method_name(difficulty, sid, method, split_pan_arms)
];
if (!v) {
match_found = false;
@ -272,23 +290,22 @@ class HuntOptimizerStore {
}
}
optimal_methods.push(new OptimalMethod(
difficulty,
section_ids,
method.name + (split_pan_arms ? ' (Split Pan Arms)' : ''),
method.episode,
method.time,
runs,
items
));
optimal_methods.push(
new OptimalMethod(
difficulty,
section_ids,
method.name + (split_pan_arms ? " (Split Pan Arms)" : ""),
method.episode,
method.time,
runs,
items
)
);
}
}
this.result = new OptimalResult(
[...wanted_items],
optimal_methods
);
}
this.result = new OptimalResult([...wanted_items], optimal_methods);
};
private full_method_name(
difficulty: Difficulty,
@ -297,7 +314,7 @@ class HuntOptimizerStore {
split_pan_arms: boolean
): string {
let name = `${difficulty}\t${section_id}\t${method.id}`;
if (split_pan_arms) name += '\tspa';
if (split_pan_arms) name += "\tspa";
return name;
}
@ -308,7 +325,7 @@ class HuntOptimizerStore {
} catch (e) {
logger.error(e);
}
}
};
private load_from_local_storage = async () => {
const wanted_items_json = localStorage.getItem(
@ -322,9 +339,10 @@ class HuntOptimizerStore {
const wanted_items: WantedItem[] = [];
for (const { itemTypeId, itemKindId, amount } of wi) {
const item = itemTypeId != undefined
? item_store.get_by_id(itemTypeId)
: item_store.get_by_id(itemKindId!);
const item =
itemTypeId != undefined
? item_store.get_by_id(itemTypeId)
: item_store.get_by_id(itemKindId!);
if (item) {
wanted_items.push(new WantedItem(item, amount));
@ -333,29 +351,31 @@ class HuntOptimizerStore {
this.wanted_items.replace(wanted_items);
}
}
};
private store_in_local_storage = () => {
try {
localStorage.setItem(
`HuntOptimizerStore.wantedItems.${Server[application_store.current_server]}`,
JSON.stringify(
this.wanted_items.map(({ item_type: itemType, amount }): StoredWantedItem => ({
itemTypeId: itemType.id,
amount
}))
this.wanted_items.map(
({ item_type: itemType, amount }): StoredWantedItem => ({
itemTypeId: itemType.id,
amount,
})
)
)
);
} catch (e) {
logger.error(e);
}
}
};
}
type StoredWantedItem = {
itemTypeId?: number, // Should only be undefined if the legacy name is still used.
itemKindId?: number, // Legacy name.
amount: number,
itemTypeId?: number; // Should only be undefined if the legacy name is still used.
itemKindId?: number; // Legacy name.
amount: number;
};
export const hunt_optimizer_store = new HuntOptimizerStore();

56
src/stores/ItemDropStore.ts
View File

@ -1,35 +1,48 @@
import { observable } from "mobx";
import { Difficulties, Difficulty, EnemyDrop, NpcType, SectionId, SectionIds, Server } from "../domain";
import {
Difficulties,
Difficulty,
EnemyDrop,
NpcType,
SectionId,
SectionIds,
Server,
} from "../domain";
import { NpcTypes } from "../domain/NpcType";
import { EnemyDropDto } from "../dto";
import { Loadable } from "../Loadable";
import { item_type_stores } from "./ItemTypeStore";
import { ServerMap } from "./ServerMap";
import Logger from 'js-logger';
import Logger from "js-logger";
const logger = Logger.get('stores/ItemDropStore');
const logger = Logger.get("stores/ItemDropStore");
export class EnemyDropTable {
// Mapping of difficulties to section IDs to NpcTypes to EnemyDrops.
private table: EnemyDrop[] =
new Array(Difficulties.length * SectionIds.length * NpcTypes.length);
private table: EnemyDrop[] = new Array(
Difficulties.length * SectionIds.length * NpcTypes.length
);
// Mapping of ItemType ids to EnemyDrops.
private item_type_to_drops: EnemyDrop[][] = [];
get_drop(difficulty: Difficulty, section_id: SectionId, npc_type: NpcType): EnemyDrop | undefined {
get_drop(
difficulty: Difficulty,
section_id: SectionId,
npc_type: NpcType
): EnemyDrop | undefined {
return this.table[
difficulty * SectionIds.length * NpcTypes.length
+ section_id * NpcTypes.length
+ npc_type.id
difficulty * SectionIds.length * NpcTypes.length +
section_id * NpcTypes.length +
npc_type.id
];
}
set_drop(difficulty: Difficulty, section_id: SectionId, npc_type: NpcType, drop: EnemyDrop) {
this.table[
difficulty * SectionIds.length * NpcTypes.length
+ section_id * NpcTypes.length
+ npc_type.id
difficulty * SectionIds.length * NpcTypes.length +
section_id * NpcTypes.length +
npc_type.id
] = drop;
let drops = this.item_type_to_drops[drop.item_type.id];
@ -69,7 +82,9 @@ async function load(store: ItemDropStore, server: Server): Promise<ItemDropStore
const npc_type = NpcType.by_code(drop_dto.enemy);
if (!npc_type) {
logger.warn(`Couldn't determine NpcType of episode ${drop_dto.episode} ${drop_dto.enemy}.`);
logger.warn(
`Couldn't determine NpcType of episode ${drop_dto.episode} ${drop_dto.enemy}.`
);
continue;
}
@ -88,14 +103,19 @@ async function load(store: ItemDropStore, server: Server): Promise<ItemDropStore
continue;
}
drops.set_drop(difficulty, section_id, npc_type, new EnemyDrop(
drops.set_drop(
difficulty,
section_id,
npc_type,
item_type,
drop_dto.dropRate,
drop_dto.rareRate
));
new EnemyDrop(
difficulty,
section_id,
npc_type,
item_type,
drop_dto.dropRate,
drop_dto.rareRate
)
);
}
store.enemy_drops = drops;

38
src/stores/ItemTypeStore.ts
View File

@ -1,5 +1,13 @@
import { observable } from "mobx";
import { ItemType, Server, WeaponItemType, ArmorItemType, ShieldItemType, ToolItemType, UnitItemType } from "../domain";
import {
ItemType,
Server,
WeaponItemType,
ArmorItemType,
ShieldItemType,
ToolItemType,
UnitItemType,
} from "../domain";
import { Loadable } from "../Loadable";
import { ServerMap } from "./ServerMap";
import { ItemTypeDto } from "../dto";
@ -25,7 +33,7 @@ export class ItemTypeStore {
let item_type: ItemType;
switch (item_type_dto.class) {
case 'weapon':
case "weapon":
item_type = new WeaponItemType(
item_type_dto.id,
item_type_dto.name,
@ -33,10 +41,10 @@ export class ItemTypeStore {
item_type_dto.maxAtp,
item_type_dto.ata,
item_type_dto.maxGrind,
item_type_dto.requiredAtp,
item_type_dto.requiredAtp
);
break;
case 'armor':
case "armor":
item_type = new ArmorItemType(
item_type_dto.id,
item_type_dto.name,
@ -48,10 +56,10 @@ export class ItemTypeStore {
item_type_dto.maxDfp,
item_type_dto.mst,
item_type_dto.hp,
item_type_dto.lck,
item_type_dto.lck
);
break;
case 'shield':
case "shield":
item_type = new ShieldItemType(
item_type_dto.id,
item_type_dto.name,
@ -63,20 +71,14 @@ export class ItemTypeStore {
item_type_dto.maxDfp,
item_type_dto.mst,
item_type_dto.hp,
item_type_dto.lck,
item_type_dto.lck
);
break;
case 'unit':
item_type = new UnitItemType(
item_type_dto.id,
item_type_dto.name,
);
case "unit":
item_type = new UnitItemType(item_type_dto.id, item_type_dto.name);
break;
case 'tool':
item_type = new ToolItemType(
item_type_dto.id,
item_type_dto.name,
);
case "tool":
item_type = new ToolItemType(item_type_dto.id, item_type_dto.name);
break;
default:
continue;
@ -89,7 +91,7 @@ export class ItemTypeStore {
this.item_types = item_types;
return this;
}
};
}
export const item_type_stores: ServerMap<Loadable<ItemTypeStore>> = new ServerMap(server => {

100
src/stores/ModelViewerStore.ts
View File

@ -1,31 +1,31 @@
import Logger from 'js-logger';
import Logger from "js-logger";
import { action, observable } from "mobx";
import { AnimationAction, AnimationClip, AnimationMixer, SkinnedMesh } from "three";
import { BufferCursor } from "../data_formats/BufferCursor";
import { NinjaModel, NinjaObject, parse_nj, parse_xj } from "../data_formats/parsing/ninja";
import { parse_njm } from "../data_formats/parsing/ninja/motion";
import { PlayerModel } from '../domain';
import { PlayerModel } from "../domain";
import { create_animation_clip, PSO_FRAME_RATE } from "../rendering/animation";
import { ninja_object_to_skinned_mesh } from "../rendering/models";
import { get_player_data } from './binary_assets';
import { get_player_data } from "./binary_assets";
const logger = Logger.get('stores/ModelViewerStore');
const logger = Logger.get("stores/ModelViewerStore");
const cache: Map<string, Promise<NinjaObject<NinjaModel>>> = new Map();
class ModelViewerStore {
readonly models: PlayerModel[] = [
new PlayerModel('HUmar', 1, 10, new Set([6])),
new PlayerModel('HUnewearl', 1, 10, new Set()),
new PlayerModel('HUcast', 5, 0, new Set()),
new PlayerModel('HUcaseal', 5, 0, new Set()),
new PlayerModel('RAmar', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel('RAmarl', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel('RAcast', 5, 0, new Set()),
new PlayerModel('RAcaseal', 5, 0, new Set()),
new PlayerModel('FOmarl', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel('FOmar', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel('FOnewm', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel('FOnewearl', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel("HUmar", 1, 10, new Set([6])),
new PlayerModel("HUnewearl", 1, 10, new Set()),
new PlayerModel("HUcast", 5, 0, new Set()),
new PlayerModel("HUcaseal", 5, 0, new Set()),
new PlayerModel("RAmar", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel("RAmarl", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel("RAcast", 5, 0, new Set()),
new PlayerModel("RAcaseal", 5, 0, new Set()),
new PlayerModel("FOmarl", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel("FOmar", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel("FOnewm", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
new PlayerModel("FOnewearl", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
];
@observable.ref current_model?: NinjaObject<NinjaModel>;
@ -33,10 +33,10 @@ class ModelViewerStore {
@observable.ref current_obj3d?: SkinnedMesh;
@observable.ref animation?: {
mixer: AnimationMixer,
clip: AnimationClip,
action: AnimationAction,
}
mixer: AnimationMixer;
clip: AnimationClip;
action: AnimationAction;
};
@observable animation_playing: boolean = false;
@observable animation_frame_rate: number = PSO_FRAME_RATE;
@observable animation_frame: number = 0;
@ -44,51 +44,53 @@ class ModelViewerStore {
@observable show_skeleton: boolean = false;
set_animation_frame_rate = action('set_animation_frame_rate', (rate: number) => {
set_animation_frame_rate = action("set_animation_frame_rate", (rate: number) => {
if (this.animation) {
this.animation.mixer.timeScale = rate / PSO_FRAME_RATE;
this.animation_frame_rate = rate;
}
})
});
set_animation_frame = action('set_animation_frame', (frame: number) => {
set_animation_frame = action("set_animation_frame", (frame: number) => {
if (this.animation) {
const frame_count = this.animation_frame_count;
frame = (frame - 1) % frame_count + 1;
frame = ((frame - 1) % frame_count) + 1;
if (frame < 1) frame = frame_count + frame;
this.animation.action.time = (frame - 1) / (frame_count - 1);
this.animation_frame = frame;
}
})
});
load_model = async (model: PlayerModel) => {
const object = await this.get_player_ninja_object(model);
this.set_model(object);
// Ignore the bones from the head parts.
this.current_bone_count = 64;
}
};
load_file = (file: File) => {
const reader = new FileReader();
reader.addEventListener('loadend', () => { this.loadend(file, reader) });
reader.addEventListener("loadend", () => {
this.loadend(file, reader);
});
reader.readAsArrayBuffer(file);
}
};
toggle_animation_playing = action('toggle_animation_playing', () => {
toggle_animation_playing = action("toggle_animation_playing", () => {
if (this.animation) {
this.animation.action.paused = !this.animation.action.paused;
this.animation_playing = !this.animation.action.paused;
}
})
});
update_animation_frame = action('update_animation_frame', () => {
update_animation_frame = action("update_animation_frame", () => {
if (this.animation) {
const frame_count = this.animation_frame_count;
this.animation_frame = Math.floor(this.animation.action.time * (frame_count - 1) + 1);
}
})
});
private set_model = action('set_model', (model: NinjaObject<NinjaModel>) => {
private set_model = action("set_model", (model: NinjaObject<NinjaModel>) => {
if (this.current_obj3d && this.animation) {
this.animation.mixer.stopAllAction();
this.animation.mixer.uncacheRoot(this.current_obj3d);
@ -101,22 +103,22 @@ class ModelViewerStore {
const mesh = ninja_object_to_skinned_mesh(this.current_model);
mesh.translateY(-mesh.geometry.boundingSphere.radius);
this.current_obj3d = mesh;
})
});
// TODO: notify user of problems.
private loadend = async (file: File, reader: FileReader) => {
if (!(reader.result instanceof ArrayBuffer)) {
logger.error('Couldn\'t read file.');
logger.error("Couldn't read file.");
return;
}
if (file.name.endsWith('.nj')) {
if (file.name.endsWith(".nj")) {
const model = parse_nj(new BufferCursor(reader.result, true))[0];
this.set_model(model);
} else if (file.name.endsWith('.xj')) {
} else if (file.name.endsWith(".xj")) {
const model = parse_xj(new BufferCursor(reader.result, true))[0];
this.set_model(model);
} else if (file.name.endsWith('.njm')) {
} else if (file.name.endsWith(".njm")) {
if (this.current_model) {
const njm = parse_njm(
new BufferCursor(reader.result, true),
@ -127,7 +129,7 @@ class ModelViewerStore {
} else {
logger.error(`Unknown file extension in filename "${file.name}".`);
}
}
};
private add_to_bone(
object: NinjaObject<NinjaModel>,
@ -143,7 +145,7 @@ class ModelViewerStore {
}
}
private add_animation = action('add_animation', (clip: AnimationClip) => {
private add_animation = action("add_animation", (clip: AnimationClip) => {
if (!this.current_obj3d) return;
let mixer: AnimationMixer;
@ -152,19 +154,19 @@ class ModelViewerStore {
this.animation.mixer.stopAllAction();
mixer = this.animation.mixer;
} else {
mixer = new AnimationMixer(this.current_obj3d)
mixer = new AnimationMixer(this.current_obj3d);
}
this.animation = {
mixer,
clip,
action: mixer.clipAction(clip)
}
action: mixer.clipAction(clip),
};
this.animation.action.play();
this.animation_playing = true;
this.animation_frame_count = PSO_FRAME_RATE * clip.duration + 1;
})
});
private get_player_ninja_object(model: PlayerModel): Promise<NinjaObject<NinjaModel>> {
let ninja_object = cache.get(model.name);
@ -178,15 +180,15 @@ class ModelViewerStore {
}
}
private async get_all_assets(model: PlayerModel): Promise<NinjaObject<NinjaModel>> {
const body_data = await get_player_data(model.name, 'Body');
private async get_all_assets(model: PlayerModel): Promise<NinjaObject<NinjaModel>> {
const body_data = await get_player_data(model.name, "Body");
const body = parse_nj(new BufferCursor(body_data, true))[0];
if (!body) {
throw new Error(`Couldn't parse body for player class ${model.name}.`);
}
const head_data = await get_player_data(model.name, 'Head', 0);
const head_data = await get_player_data(model.name, "Head", 0);
const head = parse_nj(new BufferCursor(head_data, true))[0];
if (head) {
@ -194,7 +196,7 @@ class ModelViewerStore {
}
if (model.hair_styles_count > 0) {
const hair_data = await get_player_data(model.name, 'Hair', 0);
const hair_data = await get_player_data(model.name, "Hair", 0);
const hair = parse_nj(new BufferCursor(hair_data, true))[0];
if (hair) {
@ -202,7 +204,7 @@ class ModelViewerStore {
}
if (model.hair_styles_with_accessory.has(0)) {
const accessory_data = await get_player_data(model.name, 'Accessory', 0);
const accessory_data = await get_player_data(model.name, "Accessory", 0);
const accessory = parse_nj(new BufferCursor(accessory_data, true))[0];
if (accessory) {

53
src/stores/QuestEditorStore.ts
View File

@ -1,28 +1,31 @@
import Logger from 'js-logger';
import { action, observable } from 'mobx';
import { BufferCursor } from '../data_formats/BufferCursor';
import { parse_quest, write_quest_qst } from '../data_formats/parsing/quest';
import { Area, Quest, QuestEntity, Section } from '../domain';
import Logger from "js-logger";
import { action, observable } from "mobx";
import { BufferCursor } from "../data_formats/BufferCursor";
import { parse_quest, write_quest_qst } from "../data_formats/parsing/quest";
import { Area, Quest, QuestEntity, Section } from "../domain";
import { Vec3 } from "../data_formats/Vec3";
import { create_npc_mesh as create_npc_object_3d, create_object_mesh as create_object_object_3d } from '../rendering/entities';
import { area_store } from './AreaStore';
import { entity_store } from './EntityStore';
import {
create_npc_mesh as create_npc_object_3d,
create_object_mesh as create_object_object_3d,
} from "../rendering/entities";
import { area_store } from "./AreaStore";
import { entity_store } from "./EntityStore";
const logger = Logger.get('stores/QuestEditorStore');
const logger = Logger.get("stores/QuestEditorStore");
class QuestEditorStore {
@observable current_quest?: Quest;
@observable current_area?: Area;
@observable selected_entity?: QuestEntity;
set_quest = action('set_quest', (quest?: Quest) => {
set_quest = action("set_quest", (quest?: Quest) => {
this.reset_quest_state();
this.current_quest = quest;
if (quest && quest.area_variants.length) {
this.current_area = quest.area_variants[0].area;
}
})
});
private reset_quest_state() {
this.current_quest = undefined;
@ -32,9 +35,9 @@ class QuestEditorStore {
set_selected_entity = (entity?: QuestEntity) => {
this.selected_entity = entity;
}
};
set_current_area_id = action('set_current_area_id', (area_id?: number) => {
set_current_area_id = action("set_current_area_id", (area_id?: number) => {
this.selected_entity = undefined;
if (area_id == null) {
@ -45,18 +48,20 @@ class QuestEditorStore {
);
this.current_area = area_variant && area_variant.area;
}
})
});
load_file = (file: File) => {
const reader = new FileReader();
reader.addEventListener('loadend', () => { this.loadend(file, reader) });
reader.addEventListener("loadend", () => {
this.loadend(file, reader);
});
reader.readAsArrayBuffer(file);
}
};
// TODO: notify user of problems.
private loadend = async (file: File, reader: FileReader) => {
if (!(reader.result instanceof ArrayBuffer)) {
logger.error('Couldn\'t read file.');
logger.error("Couldn't read file.");
return;
}
@ -96,9 +101,9 @@ class QuestEditorStore {
}
}
} else {
logger.error('Couldn\'t parse quest file.');
logger.error("Couldn't parse quest file.");
}
}
};
private set_section_on_visible_quest_entity = async (
entity: QuestEntity,
@ -121,17 +126,17 @@ class QuestEditorStore {
}
entity.position = new Vec3(x, y, z);
}
};
save_current_quest_to_file = (file_name: string) => {
if (this.current_quest) {
const cursor = write_quest_qst(this.current_quest, file_name);
if (!file_name.endsWith('.qst')) {
file_name += '.qst';
if (!file_name.endsWith(".qst")) {
file_name += ".qst";
}
const a = document.createElement('a');
const a = document.createElement("a");
a.href = URL.createObjectURL(new Blob([cursor.buffer]));
a.download = file_name;
document.body.appendChild(a);
@ -139,7 +144,7 @@ class QuestEditorStore {
URL.revokeObjectURL(a.href);
document.body.removeChild(a);
}
}
};
}
export const quest_editor_store = new QuestEditorStore();

2
src/stores/ServerMap.ts
View File

@ -8,7 +8,7 @@ import { EnumMap } from "../enums";
*/
export class ServerMap<V> extends EnumMap<Server, V> {
constructor(initial_value: (server: Server) => V) {
super(Server, initial_value)
super(Server, initial_value);
}
/**

186
src/stores/binary_assets.ts
View File

@ -1,11 +1,11 @@
import { NpcType, ObjectType } from '../domain';
import { NpcType, ObjectType } from "../domain";
export function get_area_render_data(
episode: number,
area_id: number,
area_version: number
): Promise<ArrayBuffer> {
return get_area_asset(episode, area_id, area_version, 'render');
return get_area_asset(episode, area_id, area_version, "render");
}
export function get_area_collision_data(
@ -13,16 +13,18 @@ export function get_area_collision_data(
area_id: number,
area_version: number
): Promise<ArrayBuffer> {
return get_area_asset(episode, area_id, area_version, 'collision');
return get_area_asset(episode, area_id, area_version, "collision");
}
export async function get_npc_data(npc_type: NpcType): Promise<{ url: string, data: ArrayBuffer }> {
export async function get_npc_data(npc_type: NpcType): Promise<{ url: string; data: ArrayBuffer }> {
const url = npc_type_to_url(npc_type);
const data = await get_asset(url);
return { url, data };
}
export async function get_object_data(object_type: ObjectType): Promise<{ url: string, data: ArrayBuffer }> {
export async function get_object_data(
object_type: ObjectType
): Promise<{ url: string; data: ArrayBuffer }> {
const url = object_type_to_url(object_type);
const data = await get_asset(url);
return { url, data };
@ -44,64 +46,60 @@ function get_asset(url: string): Promise<ArrayBuffer> {
const area_base_names = [
[
['city00_00', 1],
['forest01', 1],
['forest02', 1],
['cave01_', 6],
['cave02_', 5],
['cave03_', 6],
['machine01_', 6],
['machine02_', 6],
['ancient01_', 5],
['ancient02_', 5],
['ancient03_', 5],
['boss01', 1],
['boss02', 1],
['boss03', 1],
['darkfalz00', 1]
["city00_00", 1],
["forest01", 1],
["forest02", 1],
["cave01_", 6],
["cave02_", 5],
["cave03_", 6],
["machine01_", 6],
["machine02_", 6],
["ancient01_", 5],
["ancient02_", 5],
["ancient03_", 5],
["boss01", 1],
["boss02", 1],
["boss03", 1],
["darkfalz00", 1],
],
[
['labo00_00', 1],
['ruins01_', 3],
['ruins02_', 3],
['space01_', 3],
['space02_', 3],
['jungle01_00', 1],
['jungle02_00', 1],
['jungle03_00', 1],
['jungle04_', 3],
['jungle05_00', 1],
['seabed01_', 3],
['seabed02_', 3],
['boss05', 1],
['boss06', 1],
['boss07', 1],
['boss08', 1],
['jungle06_00', 1],
['jungle07_', 5]
["labo00_00", 1],
["ruins01_", 3],
["ruins02_", 3],
["space01_", 3],
["space02_", 3],
["jungle01_00", 1],
["jungle02_00", 1],
["jungle03_00", 1],
["jungle04_", 3],
["jungle05_00", 1],
["seabed01_", 3],
["seabed02_", 3],
["boss05", 1],
["boss06", 1],
["boss07", 1],
["boss08", 1],
["jungle06_00", 1],
["jungle07_", 5],
],
[
// Don't remove this empty array, see usage of areaBaseNames in areaVersionToBaseUrl.
],
[
['city02_00', 1],
['wilds01_00', 1],
['wilds01_01', 1],
['wilds01_02', 1],
['wilds01_03', 1],
['crater01_00', 1],
['desert01_', 3],
['desert02_', 3],
['desert03_', 3],
['boss09_00', 1]
]
["city02_00", 1],
["wilds01_00", 1],
["wilds01_01", 1],
["wilds01_02", 1],
["wilds01_03", 1],
["crater01_00", 1],
["desert01_", 3],
["desert02_", 3],
["desert03_", 3],
["boss09_00", 1],
],
];
function area_version_to_base_url(
episode: number,
area_id: number,
area_variant: number
): string {
function area_version_to_base_url(episode: number, area_id: number, area_variant: number): string {
const episode_base_names = area_base_names[episode - 1];
if (0 <= area_id && area_id < episode_base_names.length) {
@ -111,22 +109,24 @@ function area_version_to_base_url(
let variant: string;
if (variants === 1) {
variant = '';
variant = "";
} else {
variant = String(area_variant);
while (variant.length < 2) variant = '0' + variant;
while (variant.length < 2) variant = "0" + variant;
}
return `/maps/map_${base_name}${variant}`;
} else {
throw new Error(`Unknown variant ${area_variant} of area ${area_id} in episode ${episode}.`);
throw new Error(
`Unknown variant ${area_variant} of area ${area_id} in episode ${episode}.`
);
}
} else {
throw new Error(`Unknown episode ${episode} area ${area_id}.`);
}
}
type AreaAssetType = 'render' | 'collision';
type AreaAssetType = "render" | "collision";
function get_area_asset(
episode: number,
@ -136,7 +136,7 @@ function get_area_asset(
): Promise<ArrayBuffer> {
try {
const base_url = area_version_to_base_url(episode, area_id, area_variant);
const suffix = type === 'render' ? 'n.rel' : 'c.rel';
const suffix = type === "render" ? "n.rel" : "c.rel";
return get_asset(base_url + suffix);
} catch (e) {
return Promise.reject(e);
@ -146,35 +146,57 @@ function get_area_asset(
function npc_type_to_url(npc_type: NpcType): string {
switch (npc_type) {
// The dubswitch model is in XJ format.
case NpcType.Dubswitch: return `/npcs/${npc_type.code}.xj`;
case NpcType.Dubswitch:
return `/npcs/${npc_type.code}.xj`;
// Episode II VR Temple
case NpcType.Hildebear2: return npc_type_to_url(NpcType.Hildebear);
case NpcType.Hildeblue2: return npc_type_to_url(NpcType.Hildeblue);
case NpcType.RagRappy2: return npc_type_to_url(NpcType.RagRappy);
case NpcType.Monest2: return npc_type_to_url(NpcType.Monest);
case NpcType.PoisonLily2: return npc_type_to_url(NpcType.PoisonLily);
case NpcType.NarLily2: return npc_type_to_url(NpcType.NarLily);
case NpcType.GrassAssassin2: return npc_type_to_url(NpcType.GrassAssassin);
case NpcType.Dimenian2: return npc_type_to_url(NpcType.Dimenian);
case NpcType.LaDimenian2: return npc_type_to_url(NpcType.LaDimenian);
case NpcType.SoDimenian2: return npc_type_to_url(NpcType.SoDimenian);
case NpcType.DarkBelra2: return npc_type_to_url(NpcType.DarkBelra);
case NpcType.Hildebear2:
return npc_type_to_url(NpcType.Hildebear);
case NpcType.Hildeblue2:
return npc_type_to_url(NpcType.Hildeblue);
case NpcType.RagRappy2:
return npc_type_to_url(NpcType.RagRappy);
case NpcType.Monest2:
return npc_type_to_url(NpcType.Monest);
case NpcType.PoisonLily2:
return npc_type_to_url(NpcType.PoisonLily);
case NpcType.NarLily2:
return npc_type_to_url(NpcType.NarLily);
case NpcType.GrassAssassin2:
return npc_type_to_url(NpcType.GrassAssassin);
case NpcType.Dimenian2:
return npc_type_to_url(NpcType.Dimenian);
case NpcType.LaDimenian2:
return npc_type_to_url(NpcType.LaDimenian);
case NpcType.SoDimenian2:
return npc_type_to_url(NpcType.SoDimenian);
case NpcType.DarkBelra2:
return npc_type_to_url(NpcType.DarkBelra);
// Episode II VR Spaceship
case NpcType.SavageWolf2: return npc_type_to_url(NpcType.SavageWolf);
case NpcType.BarbarousWolf2: return npc_type_to_url(NpcType.BarbarousWolf);
case NpcType.PanArms2: return npc_type_to_url(NpcType.PanArms);
case NpcType.Dubchic2: return npc_type_to_url(NpcType.Dubchic);
case NpcType.Gilchic2: return npc_type_to_url(NpcType.Gilchic);
case NpcType.Garanz2: return npc_type_to_url(NpcType.Garanz);
case NpcType.Dubswitch2: return npc_type_to_url(NpcType.Dubswitch);
case NpcType.Delsaber2: return npc_type_to_url(NpcType.Delsaber);
case NpcType.ChaosSorcerer2: return npc_type_to_url(NpcType.ChaosSorcerer);
case NpcType.SavageWolf2:
return npc_type_to_url(NpcType.SavageWolf);
case NpcType.BarbarousWolf2:
return npc_type_to_url(NpcType.BarbarousWolf);
case NpcType.PanArms2:
return npc_type_to_url(NpcType.PanArms);
case NpcType.Dubchic2:
return npc_type_to_url(NpcType.Dubchic);
case NpcType.Gilchic2:
return npc_type_to_url(NpcType.Gilchic);
case NpcType.Garanz2:
return npc_type_to_url(NpcType.Garanz);
case NpcType.Dubswitch2:
return npc_type_to_url(NpcType.Dubswitch);
case NpcType.Delsaber2:
return npc_type_to_url(NpcType.Delsaber);
case NpcType.ChaosSorcerer2:
return npc_type_to_url(NpcType.ChaosSorcerer);
default: return `/npcs/${npc_type.code}.nj`;
default:
return `/npcs/${npc_type.code}.nj`;
}
}
@ -204,5 +226,5 @@ function object_type_to_url(object_type: ObjectType): string {
}
function player_class_to_url(player_class: string, body_part: string, no?: number): string {
return `/player/${player_class}${body_part}${no == null ? '' : no}.nj`;
return `/player/${player_class}${body_part}${no == null ? "" : no}.nj`;
}

2
src/three-orbit-controls.d.ts vendored
View File

@ -1 +1 @@
declare module 'three-orbit-controls';
declare module "three-orbit-controls";

51
src/ui/ApplicationComponent.tsx
View File

@ -1,14 +1,14 @@
import { Menu, Select } from 'antd';
import { ClickParam } from 'antd/lib/menu';
import { observer } from 'mobx-react';
import React from 'react';
import './ApplicationComponent.less';
import { with_error_boundary } from './ErrorBoundary';
import { HuntOptimizerComponent } from './hunt_optimizer/HuntOptimizerComponent';
import { QuestEditorComponent } from './quest_editor/QuestEditorComponent';
import { DpsCalcComponent } from './dps_calc/DpsCalcComponent';
import { Server } from '../domain';
import { ModelViewerComponent } from './model_viewer/ModelViewerComponent';
import { Menu, Select } from "antd";
import { ClickParam } from "antd/lib/menu";
import { observer } from "mobx-react";
import React from "react";
import "./ApplicationComponent.less";
import { with_error_boundary } from "./ErrorBoundary";
import { HuntOptimizerComponent } from "./hunt_optimizer/HuntOptimizerComponent";
import { QuestEditorComponent } from "./quest_editor/QuestEditorComponent";
import { DpsCalcComponent } from "./dps_calc/DpsCalcComponent";
import { Server } from "../domain";
import { ModelViewerComponent } from "./model_viewer/ModelViewerComponent";
const ModelViewer = with_error_boundary(ModelViewerComponent);
const QuestEditor = with_error_boundary(QuestEditorComponent);
@ -17,22 +17,22 @@ const DpsCalc = with_error_boundary(DpsCalcComponent);
@observer
export class ApplicationComponent extends React.Component {
state = { tool: this.init_tool() }
state = { tool: this.init_tool() };
render() {
let tool_component;
switch (this.state.tool) {
case 'model_viewer':
case "model_viewer":
tool_component = <ModelViewer />;
break;
case 'quest_editor':
case "quest_editor":
tool_component = <QuestEditor />;
break;
case 'hunt_optimizer':
case "hunt_optimizer":
tool_component = <HuntOptimizer />;
break;
case 'dps_calc':
case "dps_calc":
tool_component = <DpsCalc />;
break;
}
@ -40,9 +40,7 @@ export class ApplicationComponent extends React.Component {
return (
<div className="ApplicationComponent">
<div className="ApplicationComponent-navbar">
<h1 className="ApplicationComponent-heading">
Phantasmal World
</h1>
<h1 className="ApplicationComponent-heading">Phantasmal World</h1>
<Menu
className="ApplicationComponent-heading-menu"
onClick={this.menu_clicked}
@ -55,9 +53,7 @@ export class ApplicationComponent extends React.Component {
<Menu.Item key="quest_editor">
Quest Editor<sup className="ApplicationComponent-beta">(Beta)</sup>
</Menu.Item>
<Menu.Item key="hunt_optimizer">
Hunt Optimizer
</Menu.Item>
<Menu.Item key="hunt_optimizer">Hunt Optimizer</Menu.Item>
{/* <Menu.Item key="dpsCalc">
DPS Calculator
</Menu.Item> */}
@ -69,9 +65,7 @@ export class ApplicationComponent extends React.Component {
</Select>
</div>
</div>
<div className="ApplicationComponent-main">
{tool_component}
</div>
<div className="ApplicationComponent-main">{tool_component}</div>
</div>
);
}
@ -81,7 +75,10 @@ export class ApplicationComponent extends React.Component {
};
private init_tool(): string {
const param = window.location.search.slice(1).split('&').find(p => p.startsWith('tool='));
return param ? param.slice(5) : 'model_viewer';
const param = window.location.search
.slice(1)
.split("&")
.find(p => p.startsWith("tool="));
return param ? param.slice(5) : "model_viewer";
}
}

24
src/ui/BigSelect.tsx
View File

@ -1,19 +1,29 @@
import React, { PureComponent } from "react";
import { OptionValues, ReactAsyncSelectProps, ReactCreatableSelectProps, ReactSelectProps } from "react-select";
import {
OptionValues,
ReactAsyncSelectProps,
ReactCreatableSelectProps,
ReactSelectProps,
} from "react-select";
import VirtualizedSelect, { AdditionalVirtualizedSelectProps } from "react-virtualized-select";
import "./BigSelect.less";
/**
* Simply wraps {@link VirtualizedSelect} to provide consistent styling.
*/
export class BigSelect<TValue = OptionValues> extends PureComponent<VirtualizedSelectProps<TValue>> {
export class BigSelect<TValue = OptionValues> extends PureComponent<
VirtualizedSelectProps<TValue>
> {
render() {
return (
<VirtualizedSelect className="BigSelect" {...this.props} />
);
return <VirtualizedSelect className="BigSelect" {...this.props} />;
}
}
// Copied from react-virtualized-select.
type VirtualizedSelectProps<TValue = OptionValues> = (ReactCreatableSelectProps<TValue> & ReactAsyncSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue> & { async: true }) |
ReactCreatableSelectProps<TValue> & ReactSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue>;
type VirtualizedSelectProps<TValue = OptionValues> =
| (ReactCreatableSelectProps<TValue> &
ReactAsyncSelectProps<TValue> &
AdditionalVirtualizedSelectProps<TValue> & { async: true })
| ReactCreatableSelectProps<TValue> &
ReactSelectProps<TValue> &
AdditionalVirtualizedSelectProps<TValue>;

108
src/ui/BigTable.tsx
View File

@ -1,23 +1,29 @@
import React, { ReactNode } from "react";
import { GridCellRenderer, Index, MultiGrid, SortDirectionType, SortDirection } from "react-virtualized";
import {
GridCellRenderer,
Index,
MultiGrid,
SortDirectionType,
SortDirection,
} from "react-virtualized";
import "./BigTable.less";
export type Column<T> = {
key?: string,
name: string,
width: number,
cell_renderer: (record: T) => ReactNode,
tooltip?: (record: T) => string,
footer_value?: string,
footer_tooltip?: string,
key?: string;
name: string;
width: number;
cell_renderer: (record: T) => ReactNode;
tooltip?: (record: T) => string;
footer_value?: string;
footer_tooltip?: string;
/**
* "number" and "integrated" have special meaning.
*/
class_name?: string,
sortable?: boolean
}
class_name?: string;
sortable?: boolean;
};
export type ColumnSort<T> = { column: Column<T>, direction: SortDirectionType }
export type ColumnSort<T> = { column: Column<T>; direction: SortDirectionType };
/**
* A table with a fixed header. Optionally has fixed columns and a footer.
@ -25,20 +31,20 @@ export type ColumnSort<T> = { column: Column<T>, direction: SortDirectionType }
* TODO: no-content message.
*/
export class BigTable<T> extends React.Component<{
width: number,
height: number,
row_count: number,
overscan_row_count?: number,
columns: Array<Column<T>>,
fixed_column_count?: number,
overscan_column_count?: number,
record: (index: Index) => T,
footer?: boolean,
width: number;
height: number;
row_count: number;
overscan_row_count?: number;
columns: Array<Column<T>>;
fixed_column_count?: number;
overscan_column_count?: number;
record: (index: Index) => T;
footer?: boolean;
/**
* When this changes, the DataTable will re-render.
*/
update_trigger?: any,
sort?: (sort_columns: Array<ColumnSort<T>>) => void
update_trigger?: any;
sort?: (sort_columns: Array<ColumnSort<T>>) => void;
}> {
private sort_columns = new Array<ColumnSort<T>>();
@ -70,17 +76,17 @@ export class BigTable<T> extends React.Component<{
private column_width = ({ index }: Index): number => {
return this.props.columns[index].width;
}
};
private cell_renderer: GridCellRenderer = ({ columnIndex, rowIndex, style }) => {
const column = this.props.columns[columnIndex];
let cell: ReactNode;
let sort_indicator: ReactNode;
let title: string | undefined;
const classes = ['DataTable-cell'];
const classes = ["DataTable-cell"];
if (columnIndex === this.props.columns.length - 1) {
classes.push('last-in-row');
classes.push("last-in-row");
}
if (rowIndex === 0) {
@ -88,21 +94,31 @@ export class BigTable<T> extends React.Component<{
cell = title = column.name;
if (column.sortable) {
classes.push('sortable');
classes.push("sortable");
const sort = this.sort_columns[0];
if (sort && sort.column === column) {
if (sort.direction === SortDirection.ASC) {
sort_indicator = (
<svg className="DataTable-sort-indictator" width="18" height="18" viewBox="0 0 24 24">
<svg
className="DataTable-sort-indictator"
width="18"
height="18"
viewBox="0 0 24 24"
>
<path d="M7 14l5-5 5 5z"></path>
<path d="M0 0h24v24H0z" fill="none"></path>
</svg>
);
} else {
sort_indicator = (
<svg className="DataTable-sort-indictator" width="18" height="18" viewBox="0 0 24 24">
<svg
className="DataTable-sort-indictator"
width="18"
height="18"
viewBox="0 0 24 24"
>
<path d="M7 10l5 5 5-5z"></path>
<path d="M0 0h24v24H0z" fill="none"></path>
</svg>
@ -118,9 +134,9 @@ export class BigTable<T> extends React.Component<{
if (this.props.footer && rowIndex === 1 + this.props.row_count) {
// Footer row
classes.push('footer-cell');
cell = column.footer_value == null ? '' : column.footer_value;
title = column.footer_tooltip == null ? '' : column.footer_tooltip;
classes.push("footer-cell");
cell = column.footer_value == null ? "" : column.footer_value;
title = column.footer_tooltip == null ? "" : column.footer_tooltip;
} else {
// Record row
const result = this.props.record({ index: rowIndex - 1 });
@ -133,37 +149,39 @@ export class BigTable<T> extends React.Component<{
}
}
if (typeof cell !== 'string') {
classes.push('custom');
if (typeof cell !== "string") {
classes.push("custom");
}
const on_click = rowIndex === 0 && column.sortable
? () => this.header_clicked(column)
: undefined;
const on_click =
rowIndex === 0 && column.sortable ? () => this.header_clicked(column) : undefined;
return (
<div
className={classes.join(' ')}
className={classes.join(" ")}
key={`${columnIndex}, ${rowIndex}`}
style={style}
title={title}
onClick={on_click}
>
{typeof cell === 'string' ? (
{typeof cell === "string" ? (
<span className="DataTable-cell-text">{cell}</span>
) : cell}
) : (
cell
)}
{sort_indicator}
</div>
);
}
};
private header_clicked = (column: Column<T>) => {
const old_index = this.sort_columns.findIndex(sc => sc.column === column);
let old = old_index === -1 ? undefined : this.sort_columns.splice(old_index, 1)[0];
const direction = old_index === 0 && old!.direction === SortDirection.ASC
? SortDirection.DESC
: SortDirection.ASC
const direction =
old_index === 0 && old!.direction === SortDirection.ASC
? SortDirection.DESC
: SortDirection.ASC;
this.sort_columns.unshift({ column, direction });
this.sort_columns.splice(10);
@ -171,5 +189,5 @@ export class BigTable<T> extends React.Component<{
if (this.props.sort) {
this.props.sort(this.sort_columns);
}
}
};
}

14
src/ui/ErrorBoundary.tsx
View File

@ -1,10 +1,10 @@
import { Alert } from 'antd';
import React from 'react';
import './ErrorBoundary.css';
import { Alert } from "antd";
import React from "react";
import "./ErrorBoundary.css";
export class ErrorBoundary extends React.Component {
state = {
has_error: false
has_error: false,
};
render() {
@ -27,5 +27,9 @@ export class ErrorBoundary extends React.Component {
}
export function with_error_boundary(Component: React.ComponentType) {
return () => <ErrorBoundary><Component /></ErrorBoundary>;
return () => (
<ErrorBoundary>
<Component />
</ErrorBoundary>
);
}

14
src/ui/SectionIdIcon.tsx
View File

@ -4,22 +4,22 @@ import { SectionId } from "../domain";
export function SectionIdIcon({
section_id,
size = 28,
title
title,
}: {
section_id: SectionId,
size?: number,
title?: string
section_id: SectionId;
size?: number;
title?: string;
}) {
return (
<div
title={title}
style={{
display: 'inline-block',
display: "inline-block",
width: size,
height: size,
backgroundImage: `url(${process.env.PUBLIC_URL}/images/sectionids/${SectionId[section_id]}.png)`,
backgroundSize: size
backgroundSize: size,
}}
/>
);
}
}

28
src/ui/dps_calc/DpsCalcComponent.tsx
View File

@ -18,7 +18,7 @@ export class DpsCalcComponent extends React.Component {
value={undefined}
options={dps_calc_store.weapon_types.map(wt => ({
label: wt.name,
value: wt.id
value: wt.id,
}))}
onChange={this.add_weapon}
/>
@ -54,7 +54,7 @@ export class DpsCalcComponent extends React.Component {
min={0}
max={weapon.item.type.max_grind}
step={1}
onChange={(value) => weapon.item.grind = value || 0}
onChange={value => (weapon.item.grind = value || 0)}
/>
</td>
<td>{weapon.item.grind_atp}</td>
@ -76,7 +76,7 @@ export class DpsCalcComponent extends React.Component {
value={dps_calc_store.char_atp}
min={0}
step={1}
onChange={(value) => dps_calc_store.char_atp = value || 0}
onChange={value => (dps_calc_store.char_atp = value || 0)}
/>
<div>MAG POW:</div>
<InputNumber
@ -84,7 +84,7 @@ export class DpsCalcComponent extends React.Component {
min={0}
max={200}
step={1}
onChange={(value) => dps_calc_store.mag_pow = value || 0}
onChange={value => (dps_calc_store.mag_pow = value || 0)}
/>
<div>Armor:</div>
<BigSelect
@ -92,7 +92,7 @@ export class DpsCalcComponent extends React.Component {
value={dps_calc_store.armor_type && dps_calc_store.armor_type.id}
options={dps_calc_store.armor_types.map(at => ({
label: at.name,
value: at.id
value: at.id,
}))}
onChange={this.armor_changed}
/>
@ -103,7 +103,7 @@ export class DpsCalcComponent extends React.Component {
value={dps_calc_store.shield_type && dps_calc_store.shield_type.id}
options={dps_calc_store.shield_types.map(st => ({
label: st.name,
value: st.id
value: st.id,
}))}
onChange={this.shield_changed}
/>
@ -114,7 +114,7 @@ export class DpsCalcComponent extends React.Component {
min={0}
max={30}
step={1}
onChange={(value) => dps_calc_store.shifta_lvl = value || 0}
onChange={value => (dps_calc_store.shifta_lvl = value || 0)}
/>
<div>Shifta factor:</div>
<div>{dps_calc_store.shifta_factor.toFixed(3)}</div>
@ -130,23 +130,23 @@ export class DpsCalcComponent extends React.Component {
let type = item_type_stores.current.value.get_by_id(selected.value)!;
dps_calc_store.add_weapon(type as WeaponItemType);
}
}
};
private armor_changed = (selected: any) => {
if (selected) {
let type = item_type_stores.current.value.get_by_id(selected.value)!;
dps_calc_store.armor_type = (type as ArmorItemType);
let item_type = item_type_stores.current.value.get_by_id(selected.value)!;
dps_calc_store.armor_type = item_type as ArmorItemType;
} else {
dps_calc_store.armor_type = undefined;
}
}
};
private shield_changed = (selected: any) => {
if (selected) {
let type = item_type_stores.current.value.get_by_id(selected.value)!;
dps_calc_store.shield_type = (type as ShieldItemType);
let item_type = item_type_stores.current.value.get_by_id(selected.value)!;
dps_calc_store.shield_type = item_type as ShieldItemType;
} else {
dps_calc_store.shield_type = undefined;
}
}
};
}

2
src/ui/hunt_optimizer/HuntOptimizerComponent.tsx
View File

@ -1,6 +1,6 @@
import { Tabs } from "antd";
import React from "react";
import './HuntOptimizerComponent.css';
import "./HuntOptimizerComponent.css";
import { OptimizerComponent } from "./OptimizerComponent";
import { MethodsComponent } from "./MethodsComponent";

38
src/ui/hunt_optimizer/MethodsComponent.tsx
View File

@ -15,25 +15,25 @@ export class MethodsComponent extends React.Component {
// Standard columns.
const columns: Column<HuntMethod>[] = [
{
key: 'name',
name: 'Method',
key: "name",
name: "Method",
width: 250,
cell_renderer: (method) => method.name,
cell_renderer: method => method.name,
sortable: true,
},
{
key: 'episode',
name: 'Ep.',
key: "episode",
name: "Ep.",
width: 34,
cell_renderer: (method) => Episode[method.episode],
cell_renderer: method => Episode[method.episode],
sortable: true,
},
{
key: 'time',
name: 'Time',
key: "time",
name: "Time",
width: 50,
cell_renderer: (method) => <TimeComponent method={method} />,
class_name: 'integrated',
cell_renderer: method => <TimeComponent method={method} />,
class_name: "integrated",
sortable: true,
},
];
@ -44,11 +44,11 @@ export class MethodsComponent extends React.Component {
key: enemy.code,
name: enemy.name,
width: 75,
cell_renderer: (method) => {
cell_renderer: method => {
const count = method.enemy_counts.get(enemy);
return count == null ? '' : count.toString();
return count == null ? "" : count.toString();
},
class_name: 'number',
class_name: "number",
sortable: true,
});
}
@ -81,7 +81,7 @@ export class MethodsComponent extends React.Component {
private record = ({ index }: Index) => {
return hunt_method_store.methods.current.value[index];
}
};
private sort = (sorts: ColumnSort<HuntMethod>[]) => {
const methods = hunt_method_store.methods.current.value.slice();
@ -90,11 +90,11 @@ export class MethodsComponent extends React.Component {
for (const { column, direction } of sorts) {
let cmp = 0;
if (column.key === 'name') {
if (column.key === "name") {
cmp = a.name.localeCompare(b.name);
} else if (column.key === 'episode') {
} else if (column.key === "episode") {
cmp = a.episode - b.episode;
} else if (column.key === 'time') {
} else if (column.key === "time") {
cmp = a.time - b.time;
} else if (column.key) {
const type = NpcType.by_code(column.key);
@ -113,7 +113,7 @@ export class MethodsComponent extends React.Component {
});
hunt_method_store.methods.current.value = methods;
}
};
}
@observer
@ -138,5 +138,5 @@ class TimeComponent extends React.Component<{ method: HuntMethod }> {
private change = (time: Moment) => {
this.props.method.user_time = time.hour() + time.minute() / 60;
}
};
}

66
src/ui/hunt_optimizer/OptimizationResultComponent.tsx
View File

@ -25,57 +25,57 @@ export class OptimizationResultComponent extends React.Component {
const columns: Column<OptimalMethod>[] = [
{
name: 'Difficulty',
name: "Difficulty",
width: 75,
cell_renderer: (result) => Difficulty[result.difficulty],
footer_value: 'Totals:',
cell_renderer: result => Difficulty[result.difficulty],
footer_value: "Totals:",
},
{
name: 'Method',
name: "Method",
width: 200,
cell_renderer: (result) => result.method_name,
tooltip: (result) => result.method_name,
cell_renderer: result => result.method_name,
tooltip: result => result.method_name,
},
{
name: 'Ep.',
name: "Ep.",
width: 34,
cell_renderer: (result) => Episode[result.method_episode],
cell_renderer: result => Episode[result.method_episode],
},
{
name: 'Section ID',
name: "Section ID",
width: 80,
cell_renderer: (result) => (
cell_renderer: result => (
<div className="ho-OptimizationResultComponent-sid-col">
{result.section_ids.map(sid =>
{result.section_ids.map(sid => (
<SectionIdIcon section_id={sid} key={sid} size={20} />
)}
))}
</div>
),
tooltip: (result) => result.section_ids.map(sid => SectionId[sid]).join(', '),
tooltip: result => result.section_ids.map(sid => SectionId[sid]).join(", "),
},
{
name: 'Time/Run',
name: "Time/Run",
width: 80,
cell_renderer: (result) => hours_to_string(result.method_time),
class_name: 'number',
cell_renderer: result => hours_to_string(result.method_time),
class_name: "number",
},
{
name: 'Runs',
name: "Runs",
width: 60,
cell_renderer: (result) => result.runs.toFixed(1),
tooltip: (result) => result.runs.toString(),
cell_renderer: result => result.runs.toFixed(1),
tooltip: result => result.runs.toString(),
footer_value: total_runs.toFixed(1),
footer_tooltip: total_runs.toString(),
class_name: 'number',
class_name: "number",
},
{
name: 'Total Hours',
name: "Total Hours",
width: 90,
cell_renderer: (result) => result.total_time.toFixed(1),
tooltip: (result) => result.total_time.toString(),
cell_renderer: result => result.total_time.toFixed(1),
tooltip: result => result.total_time.toString(),
footer_value: total_time.toFixed(1),
footer_tooltip: total_time.toString(),
class_name: 'number',
class_name: "number",
},
];
@ -91,17 +91,17 @@ export class OptimizationResultComponent extends React.Component {
columns.push({
name: item.name,
width: 80,
cell_renderer: (result) => {
cell_renderer: result => {
const count = result.item_counts.get(item);
return count ? count.toFixed(2) : '';
return count ? count.toFixed(2) : "";
},
tooltip: (result) => {
tooltip: result => {
const count = result.item_counts.get(item);
return count ? count.toString() : '';
return count ? count.toString() : "";
},
class_name: 'number',
class_name: "number",
footer_value: totalCount.toFixed(2),
footer_tooltip: totalCount.toString()
footer_tooltip: totalCount.toString(),
});
}
}
@ -123,7 +123,7 @@ export class OptimizationResultComponent extends React.Component {
<h3>Optimization Result</h3>
<div className="ho-OptimizationResultComponent-table">
<AutoSizer>
{({ width, height }) =>
{({ width, height }) => (
<BigTable
width={width}
height={height}
@ -134,7 +134,7 @@ export class OptimizationResultComponent extends React.Component {
footer={result != null}
update_trigger={this.update_trigger}
/>
}
)}
</AutoSizer>
</div>
</section>
@ -143,5 +143,5 @@ export class OptimizationResultComponent extends React.Component {
private record = ({ index }: Index): OptimalMethod => {
return hunt_optimizer_store.result!.optimal_methods[index];
}
};
}

57
src/ui/hunt_optimizer/WantedItemsComponent.tsx
View File

@ -5,13 +5,13 @@ import { AutoSizer, Column, Table, TableCellRenderer } from "react-virtualized";
import { hunt_optimizer_store, WantedItem } from "../../stores/HuntOptimizerStore";
import { item_type_stores } from "../../stores/ItemTypeStore";
import { BigSelect } from "../BigSelect";
import './WantedItemsComponent.less';
import "./WantedItemsComponent.less";
@observer
export class WantedItemsComponent extends React.Component {
state = {
help_visible: false
}
help_visible: false,
};
render() {
// Make sure render is called on updates.
@ -37,16 +37,13 @@ export class WantedItemsComponent extends React.Component {
style={{ width: 200 }}
options={hunt_optimizer_store.huntable_item_types.map(itemType => ({
label: itemType.name,
value: itemType.id
value: itemType.id,
}))}
onChange={this.add_wanted}
/>
<Button
onClick={hunt_optimizer_store.optimize}
style={{ marginLeft: 10 }}
>
<Button onClick={hunt_optimizer_store.optimize} style={{ marginLeft: 10 }}>
Optimize
</Button>
</Button>
</div>
<div className="ho-WantedItemsComponent-table">
<AutoSizer>
@ -64,9 +61,9 @@ export class WantedItemsComponent extends React.Component {
label="Amount"
dataKey="amount"
width={70}
cellRenderer={({ rowData }) =>
cellRenderer={({ rowData }) => (
<WantedAmountCell wantedItem={rowData} />
}
)}
/>
<Column
label="Item"
@ -92,14 +89,16 @@ export class WantedItemsComponent extends React.Component {
private add_wanted = (selected: any) => {
if (selected) {
let added = hunt_optimizer_store.wanted_items.find(w => w.item_type.id === selected.value);
let added = hunt_optimizer_store.wanted_items.find(
w => w.item_type.id === selected.value
);
if (!added) {
const item_type = item_type_stores.current.value.get_by_id(selected.value)!;
hunt_optimizer_store.wanted_items.push(new WantedItem(item_type, 1));
}
}
}
};
private remove_wanted = (wanted: WantedItem) => () => {
const i = hunt_optimizer_store.wanted_items.findIndex(w => w === wanted);
@ -107,44 +106,48 @@ export class WantedItemsComponent extends React.Component {
if (i !== -1) {
hunt_optimizer_store.wanted_items.splice(i, 1);
}
}
};
private table_remove_cell_renderer: TableCellRenderer = ({ rowData }) => {
return <Button type="link" icon="delete" onClick={this.remove_wanted(rowData)} />;
}
};
private no_rows_renderer = () => {
return (
<div className="ho-WantedItemsComponent-no-rows">
<p>
Add some items with the above drop down and click "Optimize" to see the result on the right.
Add some items with the above drop down and click "Optimize" to see the result
on the right.
</p>
</div>
);
}
};
private on_help_visible_change = (visible: boolean) => {
this.setState({ helpVisible: visible });
}
};
}
function Help() {
return (
<div className="ho-WantedItemsComponent-help">
<p>
Add some items with the drop down and click "Optimize" to see the optimal combination of hunt methods on the right.
Add some items with the drop down and click "Optimize" to see the optimal
combination of hunt methods on the right.
</p>
<p>
At the moment a method is simply a quest run-through. Partial quest run-throughs are coming. View the list of methods on the "Methods" tab. Each method takes a certain amount of time, which affects the optimization result. Make sure the times are correct for you.
At the moment a method is simply a quest run-through. Partial quest run-throughs are
coming. View the list of methods on the "Methods" tab. Each method takes a certain
amount of time, which affects the optimization result. Make sure the times are
correct for you.
</p>
<p>Only enemy drops are considered. Box drops are coming.</p>
<p>
Only enemy drops are considered. Box drops are coming.
</p>
<p>
The optimal result is calculated using linear optimization. The optimizer takes rare enemies and the fact that pan arms can be split in two into account.
The optimal result is calculated using linear optimization. The optimizer takes rare
enemies and the fact that pan arms can be split in two into account.
</p>
</div>
)
);
}
@observer
@ -159,7 +162,7 @@ class WantedAmountCell extends React.Component<{ wantedItem: WantedItem }> {
value={wanted.amount}
onChange={this.wanted_amount_changed}
size="small"
style={{ width: '100%' }}
style={{ width: "100%" }}
/>
);
}
@ -168,5 +171,5 @@ class WantedAmountCell extends React.Component<{ wantedItem: WantedItem }> {
if (value != null && value >= 0) {
this.props.wantedItem.amount = value;
}
}
};
}

4
src/ui/model_viewer/ModelSelectionComponent.tsx
View File

@ -14,11 +14,11 @@ export class ModelSelectionComponent extends Component {
renderItem={model => (
<List.Item onClick={() => model_viewer_store.load_model(model)}>
<List.Item.Meta
title={(
title={
<span className="mv-ModelSelectionComponent-model">
{model.name}
</span>
)}
}
/>
</List.Item>
)}

30
src/ui/model_viewer/ModelViewerComponent.tsx
View File

@ -5,7 +5,7 @@ import { observer } from "mobx-react";
import React from "react";
import { model_viewer_store } from "../../stores/ModelViewerStore";
import { ModelSelectionComponent } from "./ModelSelectionComponent";
import './ModelViewerComponent.less';
import "./ModelViewerComponent.less";
import { RendererComponent } from "./RendererComponent";
@observer
@ -22,9 +22,7 @@ export class ModelViewerComponent extends React.Component {
<Toolbar />
<div className="mv-ModelViewerComponent-main">
<ModelSelectionComponent />
<RendererComponent
model={model_viewer_store.current_obj3d}
/>
<RendererComponent model={model_viewer_store.current_obj3d} />
</div>
</div>
);
@ -34,8 +32,8 @@ export class ModelViewerComponent extends React.Component {
@observer
class Toolbar extends React.Component {
state = {
filename: undefined
}
filename: undefined,
};
render() {
return (
@ -47,21 +45,23 @@ class Toolbar extends React.Component {
// Make sure it doesn't do a POST:
customRequest={() => false}
>
<Button icon="file">{this.state.filename || 'Open file...'}</Button>
<Button icon="file">{this.state.filename || "Open file..."}</Button>
</Upload>
{model_viewer_store.animation && (
<>
<Button
icon={model_viewer_store.animation_playing ? 'pause' : 'caret-right'}
icon={model_viewer_store.animation_playing ? "pause" : "caret-right"}
onClick={model_viewer_store.toggle_animation_playing}
>
{model_viewer_store.animation_playing ? 'Pause animation' : 'Play animation'}
{model_viewer_store.animation_playing
? "Pause animation"
: "Play animation"}
</Button>
<div className="group">
<span>Frame rate:</span>
<InputNumber
value={model_viewer_store.animation_frame_rate}
onChange={(value) =>
onChange={value =>
model_viewer_store.set_animation_frame_rate(value || 0)
}
min={1}
@ -72,14 +72,12 @@ class Toolbar extends React.Component {
<span>Frame:</span>
<InputNumber
value={model_viewer_store.animation_frame}
onChange={(value) =>
onChange={value =>
model_viewer_store.set_animation_frame(value || 0)
}
step={1}
/>
<span>
/ {model_viewer_store.animation_frame_count}
</span>
<span>/ {model_viewer_store.animation_frame_count}</span>
</div>
</>
)}
@ -87,7 +85,7 @@ class Toolbar extends React.Component {
<span>Show skeleton:</span>
<Switch
checked={model_viewer_store.show_skeleton}
onChange={(value) => model_viewer_store.show_skeleton = value}
onChange={value => (model_viewer_store.show_skeleton = value)}
/>
</div>
</div>
@ -99,5 +97,5 @@ class Toolbar extends React.Component {
this.setState({ filename: info.file.name });
model_viewer_store.load_file(info.file.originFileObj);
}
}
};
}

20
src/ui/model_viewer/RendererComponent.tsx
View File

@ -1,24 +1,24 @@
import React from 'react';
import { SkinnedMesh } from 'three';
import { get_model_renderer } from '../../rendering/ModelRenderer';
import React from "react";
import { SkinnedMesh } from "three";
import { get_model_renderer } from "../../rendering/ModelRenderer";
type Props = {
model?: SkinnedMesh
}
model?: SkinnedMesh;
};
export class RendererComponent extends React.Component<Props> {
private renderer = get_model_renderer();
render() {
return <div style={{ overflow: 'hidden' }} ref={this.modifyDom} />;
return <div style={{ overflow: "hidden" }} ref={this.modifyDom} />;
}
componentDidMount() {
window.addEventListener('resize', this.onResize);
window.addEventListener("resize", this.onResize);
}
componentWillUnmount() {
window.removeEventListener('resize', this.onResize);
window.removeEventListener("resize", this.onResize);
}
componentWillReceiveProps({ model }: Props) {
@ -34,10 +34,10 @@ export class RendererComponent extends React.Component<Props> {
this.renderer.set_size(div.clientWidth, div.clientHeight);
div.appendChild(this.renderer.dom_element);
}
}
};
private onResize = () => {
const wrapper_div = this.renderer.dom_element.parentNode as HTMLDivElement;
this.renderer.set_size(wrapper_div.clientWidth, wrapper_div.clientHeight);
}
};
}

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

@ -1,12 +1,12 @@
import { InputNumber } from 'antd';
import { observer } from 'mobx-react';
import React from 'react';
import { QuestNpc, QuestObject, QuestEntity } from '../../domain';
import './EntityInfoComponent.css';
import { InputNumber } from "antd";
import { observer } from "mobx-react";
import React from "react";
import { QuestNpc, QuestObject, QuestEntity } from "../../domain";
import "./EntityInfoComponent.css";
export type Props = {
entity?: QuestEntity,
}
entity?: QuestEntity;
};
@observer
export class EntityInfoComponent extends React.Component<Props> {
@ -20,13 +20,15 @@ export class EntityInfoComponent extends React.Component<Props> {
if (entity instanceof QuestObject) {
name = (
<tr>
<td>Object: </td><td colSpan={2}>{entity.type.name}</td>
<td>Object: </td>
<td colSpan={2}>{entity.type.name}</td>
</tr>
);
} else if (entity instanceof QuestNpc) {
name = (
<tr>
<td>NPC: </td><td>{entity.type.name}</td>
<td>NPC: </td>
<td>{entity.type.name}</td>
</tr>
);
}
@ -37,7 +39,8 @@ export class EntityInfoComponent extends React.Component<Props> {
<tbody>
{name}
<tr>
<td>Section: </td><td>{section_id}</td>
<td>Section: </td>
<td>{section_id}</td>
</tr>
<tr>
<td colSpan={2}>World position: </td>
@ -46,9 +49,21 @@ export class EntityInfoComponent extends React.Component<Props> {
<td colSpan={2}>
<table>
<tbody>
<CoordRow entity={entity} position_type="position" coord="x" />
<CoordRow entity={entity} position_type="position" coord="y" />
<CoordRow entity={entity} position_type="position" coord="z" />
<CoordRow
entity={entity}
position_type="position"
coord="x"
/>
<CoordRow
entity={entity}
position_type="position"
coord="y"
/>
<CoordRow
entity={entity}
position_type="position"
coord="z"
/>
</tbody>
</table>
</td>
@ -60,9 +75,21 @@ export class EntityInfoComponent extends React.Component<Props> {
<td colSpan={2}>
<table>
<tbody>
<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="section_position"
coord="x"
/>
<CoordRow
entity={entity}
position_type="section_position"
coord="y"
/>
<CoordRow
entity={entity}
position_type="section_position"
coord="z"
/>
</tbody>
</table>
</td>
@ -79,9 +106,9 @@ export class EntityInfoComponent extends React.Component<Props> {
@observer
class CoordRow extends React.Component<{
entity: QuestEntity,
position_type: 'position' | 'section_position',
coord: 'x' | 'y' | 'z'
entity: QuestEntity;
position_type: "position" | "section_position";
coord: "x" | "y" | "z";
}> {
render() {
const entity = this.props.entity;
@ -110,5 +137,5 @@ class CoordRow extends React.Component<{
pos[this.props.coord] = value;
entity[pos_type] = pos;
}
}
};
}

79
src/ui/quest_editor/QuestEditorComponent.tsx
View File

@ -5,19 +5,22 @@ import { observer } from "mobx-react";
import React, { ChangeEvent } from "react";
import { quest_editor_store } from "../../stores/QuestEditorStore";
import { EntityInfoComponent } from "./EntityInfoComponent";
import './QuestEditorComponent.css';
import "./QuestEditorComponent.css";
import { QuestInfoComponent } from "./QuestInfoComponent";
import { RendererComponent } from "./RendererComponent";
@observer
export class QuestEditorComponent extends React.Component<{}, {
filename?: string,
save_dialog_open: boolean,
save_dialog_filename: string
}> {
export class QuestEditorComponent extends React.Component<
{},
{
filename?: string;
save_dialog_open: boolean;
save_dialog_filename: string;
}
> {
state = {
save_dialog_open: false,
save_dialog_filename: 'Untitled',
save_dialog_filename: "Untitled",
};
render() {
@ -28,10 +31,7 @@ export class QuestEditorComponent extends React.Component<{}, {
<Toolbar onSaveAsClicked={this.save_as_clicked} />
<div className="qe-QuestEditorComponent-main">
<QuestInfoComponent quest={quest} />
<RendererComponent
quest={quest}
area={quest_editor_store.current_area}
/>
<RendererComponent quest={quest} area={quest_editor_store.current_area} />
<EntityInfoComponent entity={quest_editor_store.selected_entity} />
</div>
<SaveAsForm
@ -47,34 +47,36 @@ export class QuestEditorComponent extends React.Component<{}, {
private save_as_clicked = (filename?: string) => {
const name = filename
? filename.endsWith('.qst') ? filename.slice(0, -4) : filename
? filename.endsWith(".qst")
? filename.slice(0, -4)
: filename
: this.state.save_dialog_filename;
this.setState({
save_dialog_open: true,
save_dialog_filename: name
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 });
}
};
}
@observer
class Toolbar extends React.Component<{ onSaveAsClicked: (filename?: string) => void }> {
state = {
filename: undefined
}
filename: undefined,
};
render() {
const quest = quest_editor_store.current_quest;
@ -91,7 +93,7 @@ class Toolbar extends React.Component<{ onSaveAsClicked: (filename?: string) =>
// Make sure it doesn't do a POST:
customRequest={() => false}
>
<Button icon="file">{this.state.filename || 'Open file...'}</Button>
<Button icon="file">{this.state.filename || "Open file..."}</Button>
</Upload>
{areas && (
<Select
@ -99,16 +101,17 @@ class Toolbar extends React.Component<{ onSaveAsClicked: (filename?: string) =>
value={area_id}
style={{ width: 200 }}
>
{areas.map(area =>
<Select.Option key={area.id} value={area.id}>{area.name}</Select.Option>
)}
{areas.map(area => (
<Select.Option key={area.id} value={area.id}>
{area.name}
</Select.Option>
))}
</Select>
)}
{quest && (
<Button
icon="save"
onClick={this.save_as_clicked}
>Save as...</Button>
<Button icon="save" onClick={this.save_as_clicked}>
Save as...
</Button>
)}
</div>
);
@ -119,24 +122,28 @@ class Toolbar extends React.Component<{ onSaveAsClicked: (filename?: string) =>
this.setState({ filename: info.file.name });
quest_editor_store.load_file(info.file.originFileObj);
}
}
};
private save_as_clicked = () => {
this.props.onSaveAsClicked(this.state.filename);
}
};
}
class SaveAsForm extends React.Component<{
is_open: boolean,
filename: string,
on_filename_change: (name: string) => void,
on_ok: () => void,
on_cancel: () => void
is_open: boolean;
filename: string;
on_filename_change: (name: string) => void;
on_ok: () => void;
on_cancel: () => void;
}> {
render() {
return (
<Modal
title={<><Icon type="save" /> Save as...</>}
title={
<>
<Icon type="save" /> Save as...
</>
}
visible={this.props.is_open}
onOk={this.props.on_ok}
onCancel={this.props.on_cancel}
@ -157,5 +164,5 @@ class SaveAsForm extends React.Component<{
private name_changed = (e: ChangeEvent<HTMLInputElement>) => {
this.props.on_filename_change(e.currentTarget.value);
}
};
}

24
src/ui/quest_editor/QuestInfoComponent.tsx
View File

@ -1,10 +1,10 @@
import React from 'react';
import { NpcType, Quest } from '../../domain';
import './QuestInfoComponent.css';
import React from "react";
import { NpcType, Quest } from "../../domain";
import "./QuestInfoComponent.css";
export function QuestInfoComponent({ quest }: { quest?: Quest }) {
if (quest) {
const episode = quest.episode === 4 ? 'IV' : (quest.episode === 2 ? 'II' : 'I');
const episode = quest.episode === 4 ? "IV" : quest.episode === 2 ? "II" : "I";
const npc_counts = new Map<NpcType, number>();
for (const npc of quest.npcs) {
@ -32,10 +32,12 @@ export function QuestInfoComponent({ quest }: { quest?: Quest }) {
<table>
<tbody>
<tr>
<th>Name:</th><td>{quest.name}</td>
<th>Name:</th>
<td>{quest.name}</td>
</tr>
<tr>
<th>Episode:</th><td>{episode}</td>
<th>Episode:</th>
<td>{episode}</td>
</tr>
<tr>
<td colSpan={2}>
@ -50,13 +52,13 @@ export function QuestInfoComponent({ quest }: { quest?: Quest }) {
</tbody>
</table>
<div className="qe-QuestInfoComponent-npc-counts-container">
<table >
<table>
<thead>
<tr><th colSpan={2}>NPC Counts</th></tr>
<tr>
<th colSpan={2}>NPC Counts</th>
</tr>
</thead>
<tbody>
{npc_count_rows}
</tbody>
<tbody>{npc_count_rows}</tbody>
</table>
</div>
</div>

22
src/ui/quest_editor/RendererComponent.tsx
View File

@ -1,25 +1,25 @@
import React from 'react';
import { Area, Quest } from '../../domain';
import { get_quest_renderer } from '../../rendering/QuestRenderer';
import React from "react";
import { Area, Quest } from "../../domain";
import { get_quest_renderer } from "../../rendering/QuestRenderer";
type Props = {
quest?: Quest,
area?: Area,
}
quest?: Quest;
area?: Area;
};
export class RendererComponent extends React.Component<Props> {
private renderer = get_quest_renderer();
render() {
return <div style={{ overflow: 'hidden' }} ref={this.modifyDom} />;
return <div style={{ overflow: "hidden" }} ref={this.modifyDom} />;
}
componentDidMount() {
window.addEventListener('resize', this.onResize);
window.addEventListener("resize", this.onResize);
}
componentWillUnmount() {
window.removeEventListener('resize', this.onResize);
window.removeEventListener("resize", this.onResize);
}
componentWillReceiveProps({ quest, area }: Props) {
@ -35,10 +35,10 @@ export class RendererComponent extends React.Component<Props> {
this.renderer.set_size(div.clientWidth, div.clientHeight);
div.appendChild(this.renderer.dom_element);
}
}
};
private onResize = () => {
const wrapper_div = this.renderer.dom_element.parentNode as HTMLDivElement;
this.renderer.set_size(wrapper_div.clientWidth, wrapper_div.clientHeight);
}
};
}

2
src/ui/time.ts
View File

@ -5,5 +5,5 @@
export function hours_to_string(hours: number): string {
const h = Math.floor(hours);
const m = Math.round(60 * (hours - h));
return `${h.toString().padStart(2, '0')}:${m.toString().padStart(2, '0')}`;
return `${h.toString().padStart(2, "0")}:${m.toString().padStart(2, "0")}`;
}

160
static/update_drops_ephinea.ts
View File

@ -1,160 +0,0 @@
import cheerio from 'cheerio';
import fs from 'fs';
import 'isomorphic-fetch';
import { Difficulty, NpcType, SectionId, SectionIds } from '../src/domain';
import { BoxDropDto, EnemyDropDto, ItemTypeDto } from '../src/dto';
import Logger from 'js-logger';
const logger = Logger.get('static/update_drops_ephinea');
export async function updateDropsFromWebsite(itemTypes: ItemTypeDto[]) {
logger.info('Updating item drops.');
const normal = await download(itemTypes, Difficulty.Normal);
const hard = await download(itemTypes, Difficulty.Hard);
const vhard = await download(itemTypes, Difficulty.VHard, 'very-hard');
const ultimate = await download(itemTypes, Difficulty.Ultimate);
const enemyJson = JSON.stringify([
...normal.enemyDrops,
...hard.enemyDrops,
...vhard.enemyDrops,
...ultimate.enemyDrops
], null, 4);
await fs.writeFileSync('./public/enemyDrops.ephinea.json', enemyJson);
const boxJson = JSON.stringify([
...normal.boxDrops,
...hard.boxDrops,
...vhard.boxDrops,
...ultimate.boxDrops
], null, 4);
fs.writeFileSync('./public/boxDrops.ephinea.json', boxJson);
logger.info('Done updating item drops.');
}
async function download(
itemTypes: ItemTypeDto[],
difficulty: Difficulty,
difficultyUrl: string = Difficulty[difficulty].toLowerCase()
) {
const response = await fetch(`https://ephinea.pioneer2.net/drop-charts/${difficultyUrl}/`);
const body = await response.text();
const $ = cheerio.load(body);
let episode = 1;
const data: {
enemyDrops: Array<EnemyDropDto>, boxDrops: Array<BoxDropDto>, items: Set<string>
} = {
enemyDrops: [], boxDrops: [], items: new Set()
};
$('table').each((tableI, table) => {
const isBox = tableI >= 3;
$('tr', table).each((_, tr) => {
const enemyOrBoxText = $(tr.firstChild).text();
if (enemyOrBoxText.trim() === '') {
return;
} else if (enemyOrBoxText.startsWith('EPISODE ')) {
episode = parseInt(enemyOrBoxText.slice(-1), 10);
return;
}
try {
let enemyOrBox = enemyOrBoxText.split('/')[
difficulty === Difficulty.Ultimate ? 1 : 0
] || enemyOrBoxText;
if (enemyOrBox === 'Halo Rappy') {
enemyOrBox = 'Hallo Rappy';
} else if (enemyOrBox === 'Dal Ral Lie') {
enemyOrBox = 'Dal Ra Lie';
} else if (enemyOrBox === 'Vol Opt ver. 2') {
enemyOrBox = 'Vol Opt ver.2';
} else if (enemyOrBox === 'Za Boota') {
enemyOrBox = 'Ze Boota';
} else if (enemyOrBox === 'Saint Million') {
enemyOrBox = 'Saint-Milion';
}
$('td', tr).each((tdI, td) => {
if (tdI === 0) {
return;
}
const sectionId = SectionIds[tdI - 1];
if (isBox) {
// TODO:
// $('font font', td).each((_, font) => {
// const item = $('b', font).text();
// const rateNum = parseFloat($('sup', font).text());
// const rateDenom = parseFloat($('sub', font).text());
// data.boxDrops.push({
// difficulty: Difficulty[difficulty],
// episode,
// sectionId: SectionId[sectionId],
// box: enemyOrBox,
// item,
// dropRate: rateNum / rateDenom
// });
// data.items.add(item);
// });
return;
} else {
const item = $('font b', td).text();
if (item.trim() === '') {
return;
}
try {
const itemType = itemTypes.find(i => i.name === item);
if (!itemType) {
throw new Error(`No item type found with name "${item}".`)
}
const npcType = NpcType.byNameAndEpisode(enemyOrBox, episode);
if (!npcType) {
throw new Error(`Couldn't retrieve NpcType.`);
}
const title = $('font abbr', td).attr('title').replace('\r', '');
const [, dropRateNum, dropRateDenom] =
/Drop Rate: (\d+)\/(\d+(\.\d+)?)/g.exec(title)!.map(parseFloat);
const [, rareRateNum, rareRateDenom] =
/Rare Rate: (\d+)\/(\d+(\.\d+)?)/g.exec(title)!.map(parseFloat);
data.enemyDrops.push({
difficulty: Difficulty[difficulty],
episode,
sectionId: SectionId[sectionId],
enemy: npcType.code,
itemTypeId: itemType.id,
dropRate: dropRateNum / dropRateDenom,
rareRate: rareRateNum / rareRateDenom,
});
data.items.add(item);
} catch (e) {
logger.error(`Error while processing item ${item} of ${enemyOrBox} in episode ${episode} ${Difficulty[difficulty]}.`, e);
}
}
});
} catch (e) {
logger.error(`Error while processing ${enemyOrBoxText} in episode ${episode} ${difficulty}.`, e);
}
});
});
return data;
}

1003
static/update_ephinea_data.ts
View File

File diff suppressed because it is too large Load Diff

0
static/resources/ephinea/client/data/unitxt_j.prs → static_generation/resources/ephinea/client/data/unitxt_j.prs
View File

0
static/resources/ephinea/ship-config/param/ItemPMT.bin → static_generation/resources/ephinea/ship-config/param/ItemPMT.bin
View File

0
static/resources/ephinea/ship-config/param/ItemPT.gsl → static_generation/resources/ephinea/ship-config/param/ItemPT.gsl
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/event/Christmas Fiasco.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/event/Christmas Fiasco.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Caves.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Caves.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Forest.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Forest.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Mines.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Mines.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Ruins.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/event/MAE Ruins.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #1.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #1.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #2.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #2.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #3.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #3.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #4.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Endless Nightmare #4.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #1.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #1.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #2.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #2.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #3.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #3.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #4.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Mop Up Operation #4.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Today's Rate.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/extermination/Today's Rate.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/MA4 -1A-.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/MA4 -1A-.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/MA4 -1B-.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/MA4 -1B-.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/MA4 -1C-.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/MA4 -1C-.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/Maximum Attack 1 Ver2.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/Maximum Attack 1 Ver2.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/Maximum Attack S E1.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/Maximum Attack S E1.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/Random Attack Xrd E1.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/maximum_attack/Random Attack Xrd E1.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Dark Research 2.0.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Dark Research 2.0.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Forsaken Friends.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Forsaken Friends.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Fragments of a Memory.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Fragments of a Memory.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Gallon's Treachery.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Gallon's Treachery.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Lost HEAT SWORD.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Lost HEAT SWORD.qst
View File

0
static/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Lost HELL PALLASCH.qst → static_generation/resources/ephinea/ship-config/quest/episode_1/guild/retrieval/Lost HELL PALLASCH.qst
View File

Some files were not shown because too many files have changed in this diff Show More