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

Fixed compilation issues and fixed bug in SimpleListProperty (length was not correctly initialized).

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-10-11 00:04:01 +02:00
parent a5dd34cda7
commit 9b1bc675a2
3 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/observable/property/list/SimpleListProperty.ts
View File

@ -39,7 +39,7 @@ export class SimpleListProperty<T> extends AbstractProperty<readonly T[]>
return removed;
}
private readonly _length = property(0);
private readonly _length: WritableProperty<number>;
private readonly values: T[];
private readonly extract_observables?: (element: T) => Observable<any>[];
/**
@ -60,6 +60,7 @@ export class SimpleListProperty<T> extends AbstractProperty<readonly T[]>
constructor(extract_observables?: (element: T) => Observable<any>[], ...values: T[]) {
super();
this._length = property(values.length);
this.length = this._length;
this.values = values;
this.extract_observables = extract_observables;

88
src/quest_editor/stores/model_conversion.ts
View File

@ -6,6 +6,7 @@ import { Euler } from "three";
import { QuestNpcModel } from "../model/QuestNpcModel";
import { QuestEventModel } from "../model/QuestEventModel";
import {
DatEventAction,
DatEventActionTriggerEvent,
DatEventActionType,
} from "../../core/data_formats/parsing/quest/dat";
@ -130,6 +131,56 @@ export function convert_quest_to_model(quest: Quest): QuestModel {
}
export function convert_quest_from_model(quest: QuestModel): Quest {
const events: QuestEvent[] = [];
for (const chain of quest.event_chains.val) {
for (let i = 0; i < chain.events.length.val; i++) {
const event = chain.events.get(i);
const next_event: QuestEventModel | undefined = chain.events.get(i + 1);
const actions: DatEventAction[] = event.actions.map(action => {
if (action instanceof QuestEventActionSpawnNpcsModel) {
return {
type: DatEventActionType.SpawnNpcs,
section_id: action.section_id,
appear_flag: action.appear_flag,
};
} else if (action instanceof QuestEventActionUnlockModel) {
return {
type: DatEventActionType.Unlock,
door_id: action.door_id,
};
} else if (action instanceof QuestEventActionLockModel) {
return {
type: DatEventActionType.Lock,
door_id: action.door_id,
};
} else {
throw new Error(
`Unknown event action type ${Object.getPrototypeOf(action).constructor}`,
);
}
});
if (next_event) {
actions.push({
type: DatEventActionType.TriggerEvent,
event_id: next_event.id,
});
}
events.push({
id: event.id,
section_id: event.section_id,
wave: event.wave,
delay: event.delay,
actions,
area_id: event.area_id,
unknown: event.unknown,
});
}
}
return {
id: quest.id.val,
language: quest.language.val,
@ -161,42 +212,7 @@ export function convert_quest_from_model(quest: QuestModel): Quest {
script_label: npc.script_label,
pso_roaming: npc.pso_roaming,
})),
events: quest.waves.val.map(wave => ({
id: wave.id,
section_id: wave.section_id,
wave: wave.wave,
delay: wave.delay,
actions: wave.actions.map(action => {
if (action instanceof QuestEventActionSpawnNpcsModel) {
return {
type: DatEventActionType.SpawnNpcs,
section_id: action.section_id,
appear_flag: action.appear_flag,
};
} else if (action instanceof QuestEventActionUnlockModel) {
return {
type: DatEventActionType.Unlock,
door_id: action.door_id,
};
} else if (action instanceof QuestEventActionLockModel) {
return {
type: DatEventActionType.Lock,
door_id: action.door_id,
};
} else if (action instanceof QuestEventActionTriggerEventModel) {
return {
type: DatEventActionType.TriggerEvent,
wave_id: action.wave_id,
};
} else {
throw new Error(
`Unknown event action type ${Object.getPrototypeOf(action).constructor}`,
);
}
}),
area_id: wave.area_id,
unknown: wave.unknown,
})),
events,
dat_unknowns: quest.dat_unknowns,
object_code: quest.object_code,
shop_items: quest.shop_items,

6
src/quest_editor/stores/quest_creation.ts
View File

@ -17,7 +17,7 @@ import {
import { QuestObjectModel } from "../model/QuestObjectModel";
import { QuestNpcModel } from "../model/QuestNpcModel";
import { Euler, Vector3 } from "three";
import { QuestEventModel } from "../model/QuestEventModel";
import { QuestEventChainModel } from "../model/QuestEventChainModel";
export function create_new_quest(episode: Episode): QuestModel {
if (episode === Episode.II) throw new Error("Episode II not yet supported.");
@ -33,7 +33,7 @@ export function create_new_quest(episode: Episode): QuestModel {
new Map().set(0, 0),
create_default_objects(),
create_default_npcs(),
create_default_waves(),
create_default_event_chains(),
[],
[
{
@ -807,6 +807,6 @@ function create_default_npcs(): QuestNpcModel[] {
];
}
function create_default_waves(): QuestEventModel[] {
function create_default_event_chains(): QuestEventChainModel[] {
return [];
}