Seaside area at night variant 1 can now be used to add a second tower map.

FEATURES.md

@@ -4,7 +4,7 @@ Features that are in ***bold italics*** are planned and not yet implemented.
 
 ## Create New Quest
 
-- *Support for episodes I, II and IV*
+- ***Support for episodes I, II and IV***
 
 ## Load Quest
 
@@ -26,7 +26,7 @@ Features that are in ***bold italics*** are planned and not yet implemented.
 
 - Undo/redo stack
 - Undo/redo buttons
-- Undo/redo keybindings
+- Undo/redo key bindings
 
 ## Area Selection
 
@@ -51,7 +51,7 @@ Features that are in ***bold italics*** are planned and not yet implemented.
     - Textures
 - ***Transparency***
     - ***Order independent transparency***
-- ***Minimap***
+- ***Mini-map***
 - ***Top-down view (orthogonal view might suffice?)***
 - ***Add "shadow" to entities to more easily see where floating entities are positioned***
     - ***MVP: a single line***
@@ -93,7 +93,7 @@ Features that are in ***bold italics*** are planned and not yet implemented.
     - Strings
 - Labels
     - ***Show in outline***
-- Autocompletion
+- Auto-completion
     - Segment type (.code, .data)
     - Instructions
 - ***Go to label***
@@ -123,21 +123,16 @@ Features that are in ***bold italics*** are planned and not yet implemented.
 
 ## Non-BlueBurst Support
 
-- Support different sets of instructions (older versions had no stack)
+- ***Support different sets of instructions (older versions had no stack)***
 
 ## Bugs
 
-- [Script Object Code](#script-object-code): Correctly deal with stack arguments (e.g. when a function expects a u32, pushing a u8, u16, u32 or register value is ok) (when a function expects a register reference, arg_pushb should be used)
 - [3D View](#3d-view): Random Type Box 1 and Fixed Type Box objects aren't rendered correctly
-- [3D View](#3d-view): Some objects are only partially loaded (they consist of several seperate models)
+- [3D View](#3d-view): Some objects are only partially loaded (they consist of several separate models)
     - Forest Switch
     - Laser Fence
     - Forest Laser
     - Switch (none door)
     - Energy Barrier
-- [Script Object Code](#script-object-code): Make sure data segments are referenced by an instruction with an offset before the segment's offset
-- [Script Object Code](#script-object-code): Detect code that is both unused and incorrect and reinterpret it as data (this avoids loading and then saving the quest incorrectly)
-- [Area Selection](#area-selection): Lost heart breaker/phantasmal world 4 overwrite area 16 to have both towers
-- [Area Selection](#area-selection): Show areas that are referenced from .dat but not from script (test with Point of Disaster (709))
 - [Load Quest](#load-quest): Can't parse quest 4
 - [Load Quest](#load-quest): Can't parse quest 125 White Day

src/core/data_formats/parsing/quest/areas.ts

@@ -82,7 +82,7 @@ AREAS[Episode.II] = [
     create_area(10, "Seabed Upper Levels", order++, 3),
     create_area(11, "Seabed Lower Levels", order++, 3),
     create_area(13, "Test Subject Disposal Area", order++, 1),
-    create_area(16, "Seaside Area at Night", order++, 1),
+    create_area(16, "Seaside Area at Night", order++, 2),
     create_area(17, "Control Tower", order++, 5),
 ];
 order = 0;

src/quest_editor/loading/areas.ts

@@ -10,6 +10,7 @@ import {
 import { load_array_buffer } from "../../core/loading";
 import { LoadingCache } from "./LoadingCache";
 import { Section } from "../domain/Section";
+import { Episode } from "../../core/data_formats/parsing/quest/Episode";
 
 const render_geometry_cache = new LoadingCache<
     string,
@@ -18,7 +19,7 @@ const render_geometry_cache = new LoadingCache<
 const collision_geometry_cache = new LoadingCache<string, Promise<Object3D>>();
 
 export async function load_area_sections(
-    episode: number,
+    episode: Episode,
     area_id: number,
     area_variant: number,
 ): Promise<Section[]> {
@@ -28,7 +29,7 @@ export async function load_area_sections(
 }
 
 export async function load_area_render_geometry(
-    episode: number,
+    episode: Episode,
     area_id: number,
     area_variant: number,
 ): Promise<Object3D> {
@@ -38,7 +39,7 @@ export async function load_area_render_geometry(
 }
 
 export async function load_area_collision_geometry(
-    episode: number,
+    episode: Episode,
     area_id: number,
     area_variant: number,
 ): Promise<Object3D> {
@@ -52,7 +53,7 @@ export async function load_area_collision_geometry(
 }
 
 function load_area_sections_and_render_geometry(
-    episode: number,
+    episode: Episode,
     area_id: number,
     area_variant: number,
 ): { geometry: Promise<Object3D>; sections: Promise<Section[]> } {
@@ -124,7 +125,7 @@ const area_base_names = [
 ];
 
 async function get_area_asset(
-    episode: number,
+    episode: Episode,
     area_id: number,
     area_variant: number,
     type: "render" | "collision",
@@ -134,7 +135,14 @@ async function get_area_asset(
     return load_array_buffer(base_url + suffix);
 }
 
-function area_version_to_base_url(episode: number, area_id: number, area_variant: number): string {
+function area_version_to_base_url(episode: Episode, area_id: number, area_variant: number): string {
+    // Exception for Seaside area at night variant 1.
+    // Phantasmal World 4 and Lost heart breaker use this to have two tower maps.
+    if (area_id === 16 && area_variant === 1) {
+        area_id = 17;
+        area_variant = 1;
+    }
+
     const episode_base_names = area_base_names[episode - 1];
 
     if (0 <= area_id && area_id < episode_base_names.length) {