@wwawing/engine 3.6.0-alpha.2 → 3.6.0-alpha.3

package/lib/wwa_main.d.ts

@@ -1,5 +1,5 @@
 import { Coord, Position, LoaderProgress, LoadStage, YesNoState, Face, SidebarButton, SpeedChange, PartsType, AppearanceTriggerType, EquipmentStatus, ChangeStyleType, MacroStatusIndex, UserDevice, MacroImgFrameIndex, StatusKind, StatusSolutionKind } from "./wwa_data";
-import { MessageWindow, MessageInfo } from "./wwa_message";
+import { MessageWindow, ParsedMessage } from "./wwa_message";
 import { ItemMenu } from "./wwa_item_menu";
 import { WWACompress } from "./wwa_save";
 import { IEventEmitter } from "@wwawing/event-emitter";
@@ -148,7 +148,7 @@ export declare class WWA {
     private _execObjectScoreEvent;
     private _execChoiceWindowRunningEvent;
     setMessageQueue(message: string, showChoice: boolean, isSystemMessage: boolean, partsID?: number, partsType?: PartsType, partsPosition?: Coord, messageDisplayed?: boolean): boolean;
-    getMessageQueueByRawMessage(message: string, partsID: number, partsType: PartsType, partsPosition: Coord, isSystemMessage?: boolean): MessageInfo[];
+    getMessageQueueByRawMessage(message: string, partsID: number, partsType: PartsType, partsPosition: Coord, isSystemMessage?: boolean): ParsedMessage[];
     appearParts(pos: Coord, triggerType: AppearanceTriggerType, triggerPartsID?: number): void;
     appearPartsByDirection(distance: number, targetPartsID: number, targetPartsType: PartsType): void;
     appearPartsEval(triggerPartsPos: Coord, xstr: string, ystr: string, targetPartsID: number, targetPartsType: PartsType): void;
@@ -259,7 +259,7 @@ export declare class WWA {
     setUserValDiv(x: number, y: number): void;
     setUserValMod(x: number, y: number): void;
     setUserValRandNum(x: number, num: number): void;
-    generateUserValString(macroArgs: string[]): string;
+    private _generateUserValString;
     speedChangeJudge(speedChangeFlag: boolean): void;
     userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
     private compareUserVar;

package/lib/wwa_message.d.ts

@@ -3,14 +3,17 @@ import { Coord, PartsType, MacroType, Position, Direction } from "./wwa_data";
 import { Monster } from "./wwa_monster";
 import { WWAData } from "./wwa_data";
 import { WWASave } from "./wwa_save";
-export declare class MessageInfo {
-    message: string;
+export declare type LazyEvaluateValue = () => number;
+export declare type MessageSegments = (string | LazyEvaluateValue)[];
+export declare class ParsedMessage {
     isSystemMessage: boolean;
     isEndOfPartsEvent?: boolean;
     macro?: Macro[];
-    constructor(message: string, isSystemMessage: boolean, isEndOfPartsEvent?: boolean, macro?: Macro[]);
+    private messageArray;
+    constructor(textOrMessageSegments: string | MessageSegments, isSystemMessage: boolean, isEndOfPartsEvent?: boolean, macro?: Macro[]);
+    isEmpty(): boolean;
+    generatePrintableMessage(): string;
 }
-export declare function strArrayToMessageInfoArray(strArray: string[], isSystemMessage: boolean): MessageInfo[];
 export declare class Macro {
     private _wwa;
     private _triggerPartsID;
@@ -141,11 +144,11 @@ export declare class MessageWindow {
     private _save_select_id;
     private _save_counter;
     private _save_close;
-    constructor(wwa: WWA, x: number, y: number, width: number, height: number, message: string, cgFileName: string, isVisible: boolean, isYesno: boolean, isItemMenu: boolean, parentElement: HTMLElement);
+    constructor(wwa: WWA, x: number, y: number, width: number, height: number, cgFileName: string, isVisible: boolean, isYesno: boolean, isItemMenu: boolean, parentElement: HTMLElement);
     setPosition(x: number, y: number, width: number, height: number): void;
     setPositionByPlayerPosition(existsFaces: boolean, existsScoreWindow: boolean, displayCenter: boolean, playerPos: Position, cameraPos: Position): void;
     setPositionEasy(pos: Positioning): void;
-    setMessage(message: string): void;
+    setParsedMessage(message: ParsedMessage): void;
     setYesNoChoice(isYesNo: boolean): boolean;
     isYesNoChoice(): boolean;
     isSaveChoice(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/engine",
-  "version": "3.6.0-alpha.2",
+  "version": "3.6.0-alpha.3",
   "description": "World Wide Adventure: an RPG Engine.",
   "main": "./lib/wwa.js",
   "files": [
@@ -45,13 +45,13 @@
     "@types/pug": "^2.0.4",
     "@types/terser-webpack-plugin": "^5.0.3",
     "@types/webpack": "^5.28.0",
-    "@wwawing/assets": "^3.6.0-alpha.2",
-    "@wwawing/common-interface": "^3.6.0-alpha.2",
-    "@wwawing/debug-server": "^3.6.0-alpha.2",
-    "@wwawing/event-emitter": "^3.6.0-alpha.2",
-    "@wwawing/loader": "^3.6.0-alpha.2",
-    "@wwawing/page-generator": "^3.6.0-alpha.2",
-    "@wwawing/styles": "^3.6.0-alpha.2",
+    "@wwawing/assets": "^3.6.0-alpha.3",
+    "@wwawing/common-interface": "^3.6.0-alpha.3",
+    "@wwawing/debug-server": "^3.6.0-alpha.3",
+    "@wwawing/event-emitter": "^3.6.0-alpha.3",
+    "@wwawing/loader": "^3.6.0-alpha.3",
+    "@wwawing/page-generator": "^3.6.0-alpha.3",
+    "@wwawing/styles": "^3.6.0-alpha.3",
     "crypto-js": "4.0.0",
     "npm-run-all": "^4.1.5",
     "pug": "^3.0.2",
@@ -71,5 +71,5 @@
     "node": ">=14",
     "npm": ">=6"
   },
-  "gitHead": "a97e5d91c6bede0971b23f3d6c8fb1a92dae79ef"
+  "gitHead": "a82aa4ec400e6f1f3b3a89aec5678864bcd4eced"
 }