@wwawing/engine 3.6.0-alpha.0 → 3.6.0-alpha.4

package/lib/wwa_data.d.ts

@@ -254,6 +254,7 @@ export declare enum MacroType {
     COPY_TIME_TO = 52,
     HIDE_STATUS = 53,
     VAR_MAP = 54,
+    VAR_MOD = 55,
     GAMEPAD_BUTTON = 100,
     OLDMOVE = 101
 }
@@ -311,6 +312,7 @@ export declare var macrotable: {
     $copy_time_to: number;
     $hide_status: number;
     $var_map: number;
+    $var_mod: number;
     $gamepad_button: number;
     $oldmove: number;
 };
@@ -468,6 +470,8 @@ export declare class WWAConsts {
     static ITEM_EFFECT_SPEED_PIXEL_PER_FRAME: number;
     static ITEMBOX_TOP_Y: number;
     static USER_VAR_NUM: number;
+    static USER_VAR_NUM_MAX_VALUE: number;
+    static USET_VAR_NUM_MIN_VALUE: number;
     static CONTROLL_WAIT_FRAME: number;
 }
 export declare class WWASaveConsts {
@@ -551,3 +555,4 @@ export declare enum IDTable {
     BITSHIFT = 16,
     BITMASK = 65535
 }
+export declare type StatusSolutionKind = "all" | "bare" | "equipment";

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 } from "./wwa_data";
-import { MessageWindow, MessageInfo } from "./wwa_message";
+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 { 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;
@@ -231,21 +231,25 @@ export declare class WWA {
     isClassicMode(): boolean;
     isConsoleOutputMode(): boolean;
     forcedJumpGate(jx: number, jy: number): void;
-    setUserVar(no: number, value: number): void;
+    setUserVar(index: number, value: number): void;
+    private toAssignableValue;
+    private isValidUserVarIndex;
+    private isNotNumberTypeOrNaN;
     getUserVar(no: number): number;
     recUserPosition(x: number, y: number): void;
     jumpRecUserPosition(x: number, y: number): void;
     outputUserVar(num: number): void;
     setUserVarHP(num: number): void;
     setUserVarHPMAX(num: number): void;
-    setUserVarAT(num: number): void;
-    setUserVarDF(num: number): void;
+    setUserVarAT(num: number, kind: StatusSolutionKind): void;
+    setUserVarDF(num: number, kind: StatusSolutionKind): void;
     setUserVarMONEY(num: number): void;
-    setHPUserVar(num: number): void;
-    setHPMAXUserVar(num: number): void;
-    setATUserVar(num: number): void;
-    setDFUserVar(num: number): void;
-    setMONEYUserVar(num: number): void;
+    private toValidStatusValue;
+    setHPUserVar(index: number): void;
+    setHPMAXUserVar(index: number): void;
+    setATUserVar(index: number): void;
+    setDFUserVar(index: number): void;
+    setMONEYUserVar(index: number): void;
     setUserVarStep(num: number): void;
     setUserVarVal(x: number, num: number): void;
     setUserValOtherUserVal(x: number, y: number): void;
@@ -253,10 +257,12 @@ export declare class WWA {
     setUserValSub(x: number, y: number): void;
     setUserValMul(x: number, y: number): void;
     setUserValDiv(x: number, y: number): void;
-    setUserValRandNum(x: number, num: number): void;
-    showUserValString(macroArgs: string[]): void;
+    setUserValMod(x: number, y: number): void;
+    setUserValRandNum(x: number, num: number, bias: number): void;
+    private _generateUserValString;
     speedChangeJudge(speedChangeFlag: boolean): void;
-    userVarUserIf(_triggerPartsPosition: Coord, str: string[]): void;
+    userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
+    private compareUserVar;
     setPlayerSpeedIndex(speedIndex: number): void;
     setUserVarPlayTime(num: number): void;
     private setNowPlayTime;

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;
@@ -30,6 +33,7 @@ export declare class Macro {
     private _executeCopyHpMaxToMacro;
     private _executeCopyAtToMacro;
     private _executeCopyDfToMacro;
+    private _parseStatusKind;
     private _executeCopyMoneyToMacro;
     private _executeSetHPMacro;
     private _executeSetHpMaxMacro;
@@ -43,9 +47,9 @@ export declare class Macro {
     private _executeVarSubMacro;
     private _executeVarMulMacro;
     private _executeVarDivMacro;
+    private _executeVarModMacro;
     private _executeVarSetRandMacro;
     private _executeGameSpeedMacro;
-    private _executeShowStrMacro;
     private _executeIfMacro;
     private _executeSetSpeedMacro;
     private _executeCopyTimeToMacro;
@@ -140,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/lib/wwa_parts_player.d.ts

@@ -22,7 +22,8 @@ export declare enum PlayerState {
     LOCALGATE_JUMPED = 4,
     BATTLE = 5,
     ESTIMATE_WINDOW_WAITING = 6,
-    PASSWORD_WINDOW_WAITING = 7
+    PASSWORD_WINDOW_WAITING = 7,
+    LOCALGATE_JUMPED_WITH_MESSAGE = 8
 }
 export declare class Player extends PartsObject {
     protected _status: Status;
@@ -103,6 +104,7 @@ export declare class Player extends PartsObject {
     setGold(g: number): number;
     getStatus(): Status;
     getStatusWithoutEquipments(): Status;
+    getStatusOfEquipments(): EquipmentStatus;
     updateStatusValueBox(): void;
     readonly itemTransitioningClassName = "item-transitioning";
     readonly overwittenItemClassName = "item-overwritten";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/engine",
-  "version": "3.6.0-alpha.0",
+  "version": "3.6.0-alpha.4",
   "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.0",
-    "@wwawing/common-interface": "^3.6.0-alpha.0",
-    "@wwawing/debug-server": "^3.6.0-alpha.0",
-    "@wwawing/event-emitter": "^3.6.0-alpha.0",
-    "@wwawing/loader": "^3.6.0-alpha.0",
-    "@wwawing/page-generator": "^3.6.0-alpha.0",
-    "@wwawing/styles": "^3.6.0-alpha.0",
+    "@wwawing/assets": "^3.6.0-alpha.4",
+    "@wwawing/common-interface": "^3.6.0-alpha.4",
+    "@wwawing/debug-server": "^3.6.0-alpha.4",
+    "@wwawing/event-emitter": "^3.6.0-alpha.4",
+    "@wwawing/loader": "^3.6.0-alpha.4",
+    "@wwawing/page-generator": "^3.6.0-alpha.4",
+    "@wwawing/styles": "^3.6.0-alpha.4",
     "crypto-js": "4.0.0",
     "npm-run-all": "^4.1.5",
     "pug": "^3.0.2",
@@ -71,5 +71,5 @@
     "node": ">=14",
     "npm": ">=6"
   },
-  "gitHead": "c87799aab79bfe7109a5597df9aa457e7e21f9e8"
+  "gitHead": "2b0de15c24d353c71ef97d133570311d37e7d0d1"
 }