@wwawing/engine 3.10.1 → 3.11.0

package/lib/wwa_data.d.ts

@@ -20,12 +20,7 @@ export declare class Status extends EquipmentStatus {
     plus(s: EquipmentStatus): Status;
     minus(s: EquipmentStatus): Status;
     equals(e: Status): boolean;
-    calculateScore(weight: {
-        energy: number;
-        strength: number;
-        defence: number;
-        gold: number;
-    }): number;
+    calculateScore(scoreOption: ScoreOptions): number;
     constructor(e: number, s: number, d: number, g: number);
 }
 export declare class Coord {
@@ -237,7 +232,7 @@ export declare enum MacroType {
     COPY_DF_TO = 34,
     SET_DF = 35,
     COPY_MONEY_TO = 36,
-    SET_MOENEY = 37,
+    SET_MONEY = 37,
     COPY_STEP_COUNT_TO = 38,
     VAR_SET_VAL = 39,
     VAR_SET = 40,
@@ -263,6 +258,8 @@ export declare enum MacroType {
     OLDMOVE = 101,
     LEGACY_IF = 10050
 }
+export declare type ConditionalExecuteMacroType = MacroType.IF | MacroType.ELSE_IF | MacroType.ELSE | MacroType.END_IF;
+export declare type PreprocessMacroType = ConditionalExecuteMacroType | MacroType.SHOW_STR;
 export declare var macrotable: {
     "": number;
     $imgplayer: number;
@@ -568,4 +565,12 @@ export declare enum IDTable {
 }
 export declare type StatusSolutionKind = "all" | "bare" | "equipment";
 export declare type UserVarNameListRequestErrorKind = JsonResponseErrorKind | "notObject" | "noFileSpecified";
-export declare type ConditionalMacroExecStatus = "outside-ifelse" | "can-execute" | "cannot-execute" | "executed";
+export interface ScoreOptions {
+    rates: ScoreRates;
+}
+export interface ScoreRates {
+    energy: number;
+    strength: number;
+    defence: number;
+    gold: number;
+}

package/lib/wwa_expression/eval.d.ts

@@ -1,2 +1,5 @@
+import type { Descriminant, TokenValues, Comparable } from "./typedef";
+export declare function evaluateDescriminant(d: Descriminant, tokenValues: TokenValues): boolean;
+export declare function evaluateValue(comparable: Comparable, tokenValues: TokenValues): number;
 export declare function calc(operator: string, leftValue: number, rightValue: number): number;
 export declare function compare(operator: string, leftValue: number, rightValue: number): boolean;

package/lib/wwa_expression/index.d.ts

@@ -1,5 +1,9 @@
-import { parseValue, parseType, type TokenValues } from "./parsers";
+import type { TokenValues, Descriminant } from "./typedef";
 import { type ValueAssignOperation } from "./value-assign-operation";
-export { TokenValues, ValueAssignOperation, parseType, parseValue };
+export * from "./typedef";
+export * from "./parsers";
+export * from "./eval";
+export * from "./regexp";
+export declare function parseAndEvaluateValue(value: string, tokenValues: TokenValues): number;
 export declare function evaluateSetMacroExpression(expression: string, tokenValues: TokenValues): ValueAssignOperation;
-export declare function evaluateIfMacroExpression(expression: string, tokenValues: TokenValues): boolean;
+export declare function parseDescriminant(expression: string): Descriminant | undefined;

package/lib/wwa_expression/parsers.d.ts

@@ -1,16 +1,3 @@
-import { EquipmentStatus, Status, Coord } from "../wwa_data";
-export interface TokenValues {
-    totalStatus: Status;
-    bareStatus: EquipmentStatus;
-    itemStatus: EquipmentStatus;
-    energyMax: number;
-    moveCount: number;
-    playTime: number;
-    userVars: number[];
-    playerCoord: Coord;
-}
-export declare type SetMacroType = 'VARIABLE' | 'NUMBER' | 'HP' | 'HPMAX' | 'AT' | 'AT_TOTAL' | 'AT_ITEMS' | 'DF' | 'DF_TOTAL' | 'DF_ITEMS' | 'GD' | 'TIME' | 'STEP' | 'PX' | 'PY' | 'RAND';
-export declare function parseType(str: string): SetMacroType | null;
-export declare function parseValue(value: string, tokenValues: TokenValues): number;
-export declare function parseVariable(value: string, tokenValues: TokenValues): number;
-export declare function parseNumber(value: string): number;
+import type { Comparable, CValue } from "./typedef";
+export declare function isCValue(c: Comparable): c is CValue;
+export declare function parseType(str: string): Comparable | null;

package/lib/wwa_expression/regexp.d.ts

@@ -1,8 +1,6 @@
 export declare const regNumber: RegExp;
 export declare const regUserVar: RegExp;
-export declare const regUserVarCapture: RegExp;
 export declare const regRand: RegExp;
-export declare const regRandCapture: RegExp;
 export declare const regAdvance: RegExp;
 export declare const regNormal: RegExp;
 export declare const regIf: RegExp;

package/lib/wwa_expression/typedef.d.ts

@@ -0,0 +1,39 @@
+import type { EquipmentStatus, Status, Coord } from "../wwa_data";
+export declare type SetMacroType = 'VARIABLE' | 'NUMBER' | 'HP' | 'HPMAX' | 'AT' | 'AT_TOTAL' | 'AT_ITEMS' | 'DF' | 'DF_TOTAL' | 'DF_ITEMS' | 'GD' | 'TIME' | 'STEP' | 'PX' | 'PY' | 'RAND';
+export declare type CNumberKind = "NUMBER";
+export declare type CVariableKind = "VARIABLE";
+export declare type CEnvKind = "HP" | "HPMAX" | "AT" | "AT_TOTAL" | "AT_ITEMS" | "DF" | "DF_TOTAL" | "DF_ITEMS" | "GD" | "STEP" | "TIME" | "PX" | "PY";
+export declare type CFunctionKind = "RAND";
+export interface CNumber {
+    type: CNumberKind;
+    rawValue: number;
+}
+export interface CVariable {
+    type: CVariableKind;
+    index: number;
+}
+export interface CEnv {
+    type: CEnvKind;
+}
+export interface CFunction {
+    type: CFunctionKind;
+    argument: CValue;
+}
+export declare type CValue = CNumber | CVariable | CEnv;
+export declare type Comparable = CValue | CFunction;
+export declare type ComparisionOperatorKind = "<" | ">" | "<=" | ">=" | "==" | "!=";
+export declare type Descriminant = boolean | {
+    left: Comparable;
+    right: Comparable;
+    operator: ComparisionOperatorKind;
+};
+export interface TokenValues {
+    totalStatus: Status;
+    bareStatus: EquipmentStatus;
+    itemStatus: EquipmentStatus;
+    energyMax: number;
+    moveCount: number;
+    playTime: number;
+    userVars: number[];
+    playerCoord: Coord;
+}

package/lib/wwa_main.d.ts

@@ -1,9 +1,14 @@
-import { Coord, Position, LoaderProgress, LoadStage, YesNoState, Face, SidebarButton, SpeedChange, PartsType, AppearanceTriggerType, EquipmentStatus, ChangeStyleType, MacroStatusIndex, UserDevice, MacroImgFrameIndex, StatusKind, StatusSolutionKind } from "./wwa_data";
-import { MessageWindow, ParsedMessage } from "./wwa_message";
+import { Coord, Position, LoaderProgress, LoadStage, YesNoState, Face, SidebarButton, SpeedChange, PartsType, AppearanceTriggerType, EquipmentStatus, ChangeStyleType, MacroStatusIndex, UserDevice, MacroImgFrameIndex, StatusKind, StatusSolutionKind, ScoreOptions } from "./wwa_data";
+import { MessageWindow, Page } from "./wwa_message";
 import { ItemMenu } from "./wwa_item_menu";
 import { WWACompress } from "./wwa_save";
 import { IEventEmitter } from "@wwawing/event-emitter";
 export declare function getProgress(current: number, total: number, stage: LoadStage): LoaderProgress;
+interface PartsAppearance {
+    pos: Coord;
+    triggerType: AppearanceTriggerType;
+    triggerPartsId: number;
+}
 export declare class WWA {
     private _cvs;
     private _cvsSub;
@@ -25,7 +30,7 @@ export declare class WWA {
     _messageWindow: MessageWindow;
     private _monsterWindow;
     private _scoreWindow;
-    private _messageQueue;
+    private _pages;
     private _yesNoJudge;
     private _yesNoJudgeInNextFrame;
     private _yesNoChoicePartsCoord;
@@ -49,7 +54,8 @@ export declare class WWA {
     checkOriginalMapString: string;
     private _prevFrameEventExected;
     private _reservedMoveMacroTurn;
-    private _lastMessage;
+    private _lastPage;
+    private _reservedPartsAppearances;
     private _frameCoord;
     private _battleEffectCoord;
     private sounds;
@@ -60,7 +66,7 @@ export declare class WWA {
     private _passwordLoadExecInNextFrame;
     private _passwordSaveExtractData;
     private _faces;
-    private _execMacroListInNextFrame;
+    private _execPageInNextFrame?;
     private _clearFacesInNextFrame;
     private _paintSkipByDoorOpen;
     private _isClassicModeEnable;
@@ -78,8 +84,7 @@ export declare class WWA {
     private _mapIDTable;
     private _mapObjectIDTable;
     wwaCustomEventEmitter: IEventEmitter;
-    private _scoreRates?;
-    private _conditionalMacroExecStatus;
+    private _lastScoreOptions?;
     debug: boolean;
     private hoge;
     private _loadHandler;
@@ -113,6 +118,8 @@ export declare class WWA {
     onchangespeed(type: SpeedChange): void;
     isBattleSpeedIndexForQuickBattle(battleSpeedIndex: number): boolean;
     private _checkTurnKeyPressed;
+    private _executeNode;
+    private _executeNodes;
     private _main;
     vibration(isStrong: boolean): void;
     private _drawAll;
@@ -155,12 +162,18 @@ export declare class WWA {
     private _execObjectLocalGateEvent;
     private _execObjectUrlGateEvent;
     private _execObjectScoreEvent;
-    updateScore(): void;
+    updateScore(scoreOption?: ScoreOptions): void;
     private _execChoiceWindowObjectSellEvent;
     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): ParsedMessage[];
-    appearParts(pos: Coord, triggerType: AppearanceTriggerType, triggerPartsID?: number): void;
+    generatePageAndReserveExecution(message: string, showChoice: boolean, isSystemMessage: boolean, partsID?: number, partsType?: PartsType, partsPosition?: Coord, scoreOption?: ScoreOptions | undefined): void;
+    generatePagesByRawMessage(message: string, partsId: number, partsType: PartsType, partsPosition: Coord, isSystemMessage: boolean, showChoice: boolean, scoreOption: ScoreOptions): Page[];
+    private parseMessageLines;
+    private createNewNode;
+    private processConditionalExecuteMacroLine;
+    private connectOrMergeToPreviousNode;
+    private connectToFinalNode;
+    appearParts({ pos, triggerType, triggerPartsId }: PartsAppearance): void;
+    reserveAppearPartsInNextFrame(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;
     private _replaceRandomObject;
@@ -199,7 +212,7 @@ export declare class WWA {
     hidePasswordWindow(isCancel?: boolean): void;
     private _displayUserVars;
     private _displayHelp;
-    _setNextMessage(displayCenter?: boolean): void;
+    _setNextPage(): void;
     private _hideMessageWindow;
     loadMapPartsObjectID(id: number): number;
     loadMapPartsID(id: number): number;
@@ -218,7 +231,9 @@ export declare class WWA {
     setObjectNotCollapseOnPartsOnPlayer(flag: boolean): boolean;
     setGameOverPosition(pos: Coord): Coord;
     private toValidStatusValue;
-    setPlayerStatus(type: MacroStatusIndex, value: number, isCalledByMacro: boolean): void;
+    setPlayerStatus(type: MacroStatusIndex, value: number, isCalledByMacro: boolean): {
+        isGameOver?: true;
+    };
     setDelPlayer(flag: boolean): boolean;
     setPlayerGetItem(pos: number, id: number): void;
     setStatusIconCoord(type: MacroImgFrameIndex, coord: Coord): Coord;
@@ -258,7 +273,9 @@ export declare class WWA {
     setUserVarAT(num: number, kind: StatusSolutionKind): void;
     setUserVarDF(num: number, kind: StatusSolutionKind): void;
     setUserVarMONEY(num: number): void;
-    setHPUserVar(index: number, isCalledByMacro: boolean): void;
+    setHPUserVar(index: number, isCalledByMacro: boolean): {
+        isGameOver?: true;
+    };
     setHPMAXUserVar(index: number): void;
     setATUserVar(index: number): void;
     setDFUserVar(index: number): void;
@@ -274,10 +291,10 @@ export declare class WWA {
     setUserValRandNum(x: number, num: number, bias: number): void;
     private _generateShowStrString;
     speedChangeJudge(speedChangeFlag: boolean): void;
-    switchConditionalExecutionStatus(descriminant?: string): void;
-    execSetMacro(macroStr?: string): void;
+    execSetMacro(macroStr?: string): {
+        isGameOver?: true;
+    };
     private _generateTokenValues;
-    resetConditionalMacroExecStaus(): void;
     userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
     private compareUserVar;
     setPlayerSpeedIndex(speedIndex: number): void;
@@ -302,3 +319,4 @@ export declare class WWA {
         isCalledByMacro: boolean;
     }): boolean;
 }
+export {};

package/lib/wwa_message.d.ts

@@ -1,19 +1,66 @@
 import { WWA } from "./wwa_main";
-import { Coord, PartsType, MacroType, Position, Direction } from "./wwa_data";
+import { Coord, PartsType, MacroType, Position, Direction, PreprocessMacroType, ScoreOptions as ScoreOptions } from "./wwa_data";
 import { Monster } from "./wwa_monster";
 import { WWAData } from "./wwa_data";
 import { WWASave } from "./wwa_save";
+import { type TokenValues, type Descriminant } from "./wwa_expression";
 export declare type LazyEvaluateValue = () => number;
 export declare type MessageSegments = (string | LazyEvaluateValue)[];
-export declare class ParsedMessage {
-    isSystemMessage: boolean;
-    isEndOfPartsEvent?: boolean;
+export declare class Page {
+    firstNode?: Node;
+    isLastPage?: boolean;
+    showChoice?: boolean;
+    isSystemMessage?: boolean;
+    scoreOptions?: ScoreOptions;
+    constructor(firstNode?: Node, isLastPage?: boolean, showChoice?: boolean, isSystemMessage?: boolean, scoreOptions?: ScoreOptions);
+}
+export declare abstract class Node {
+    constructor();
+}
+export interface Branch {
+    descriminant?: Descriminant;
+    elseBranch?: {
+        type: "real" | "pesudo-else";
+    };
+    next?: Node;
+}
+export declare class Junction extends Node {
+    branches: Branch[];
+    constructor(branches?: Branch[]);
+    appendBranch(branch: Branch): void;
+    getLastUnconnectedBranch(): Branch | undefined;
+    evaluateAndGetNextNode(generateTokenValues: () => TokenValues): Node | undefined;
+    hasElseBranch(): boolean;
+}
+export declare class ParsedMessage extends Node {
     macro?: Macro[];
-    private messageArray;
-    constructor(textOrMessageSegments: string | MessageSegments, isSystemMessage: boolean, isEndOfPartsEvent?: boolean, macro?: Macro[]);
+    next?: Node;
+    private messageSegments;
+    constructor(textOrMessageSegments: string | MessageSegments, macro?: Macro[], next?: Node);
     isEmpty(): boolean;
     generatePrintableMessage(): string;
+    appendMessage(message: string | MessageSegments, withNewLine?: boolean): void;
+    private parseMessage;
 }
+export declare function isEmptyMessageTree(node: Node | undefined): boolean;
+export declare function getLastMessage(node: undefined): undefined;
+export declare function getLastMessage(node: Node): Node;
+export declare function concatMessage(node1: Node | undefined, node2: Node | undefined): Node | undefined;
+export declare type MessageLineType = PreprocessMacroType | "text" | "normalMacro";
+export declare const messagLineIsText: (lineType: MessageLineType) => boolean;
+export declare type MessageLine = ({
+    type: PreprocessMacroType;
+    text: string;
+    macro: Macro;
+} | {
+    type: "normalMacro";
+    text: string;
+    macro: Macro;
+} | {
+    type: "text";
+    text: string;
+    macro?: undefined;
+});
 export declare class Macro {
     private _wwa;
     private _triggerPartsID;
@@ -23,7 +70,9 @@ export declare class Macro {
     macroArgs: string[];
     constructor(_wwa: WWA, _triggerPartsID: number, _triggerPartsType: number, _triggerPartsPosition: Coord, macroType: MacroType, macroArgs: string[]);
     isJunction(): boolean;
-    execute(): void;
+    execute(): {
+        isGameOver?: true;
+    };
     private _concatEmptyArgs;
     private _parseInt;
     private _executeJumpGateMacro;
@@ -51,11 +100,7 @@ export declare class Macro {
     private _executeVarModMacro;
     private _executeVarSetRandMacro;
     private _executeGameSpeedMacro;
-    private _executeIfMacro;
     private _executeLegacyIfMacro;
-    private _executeIfElseMacro;
-    private _executeElseMacro;
-    private _executeEndIfMacro;
     private _executeSetSpeedMacro;
     private _executeCopyTimeToMacro;
     private _executeHideStatusMacro;
@@ -155,7 +200,7 @@ export declare class MessageWindow {
     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;
-    setParsedMessage(message: ParsedMessage): void;
+    setMessage(message: string): void;
     clear(): void;
     setYesNoChoice(isYesNo: boolean): boolean;
     isYesNoChoice(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/engine",
-  "version": "3.10.1",
+  "version": "3.11.0",
   "description": "World Wide Adventure: an RPG Engine.",
   "main": "./lib/wwa.js",
   "files": [
@@ -45,14 +45,14 @@
     "@types/pug": "^2.0.6",
     "@types/terser-webpack-plugin": "^5.2.0",
     "@types/webpack": "^5.28.0",
-    "@wwawing/assets": "^3.10.1",
-    "@wwawing/common-interface": "^3.10.1",
-    "@wwawing/debug-server": "^3.10.1",
-    "@wwawing/event-emitter": "^3.10.1",
-    "@wwawing/loader": "^3.10.1",
-    "@wwawing/page-generator": "^3.10.1",
-    "@wwawing/styles": "^3.10.1",
-    "@wwawing/virtual-pad": "^3.10.1",
+    "@wwawing/assets": "^3.11.0",
+    "@wwawing/common-interface": "^3.11.0",
+    "@wwawing/debug-server": "^3.11.0",
+    "@wwawing/event-emitter": "^3.11.0",
+    "@wwawing/loader": "^3.11.0",
+    "@wwawing/page-generator": "^3.11.0",
+    "@wwawing/styles": "^3.11.0",
+    "@wwawing/virtual-pad": "^3.11.0",
     "crypto-js": "^4.1.1",
     "npm-run-all": "^4.1.5",
     "pug": "^3.0.2",
@@ -72,5 +72,5 @@
     "node": ">=16",
     "npm": ">=8"
   },
-  "gitHead": "2c6cd7009d44316bb7739920dff9b5fd71a18a3d"
+  "gitHead": "6bd6f7f1b128d8b30aba03322c745667c1cc167c"
 }