@wwawing/engine 3.5.14 → 3.6.0-alpha.3

package/lib/wwa_data.d.ts

@@ -225,6 +225,36 @@ export declare enum MacroType {
     COLOR = 21,
     WAIT = 22,
     SOUND = 23,
+    JUMPGATE = 24,
+    RECPOSITION = 25,
+    JUMPRECPOSITION = 26,
+    CONSOLE_LOG = 27,
+    COPY_HP_TO = 28,
+    SET_HP = 29,
+    COPY_HPMAX_TO = 30,
+    SET_HPMAX = 31,
+    COPY_AT_TO = 32,
+    SET_AT = 33,
+    COPY_DF_TO = 34,
+    SET_DF = 35,
+    COPY_MONEY_TO = 36,
+    SET_MOENEY = 37,
+    COPY_STEP_COUNT_TO = 38,
+    VAR_SET_VAL = 39,
+    VAR_SET = 40,
+    VAR_ADD = 41,
+    VAR_SUB = 42,
+    VAR_MUL = 43,
+    VAR_DIV = 44,
+    VAR_SET_RAND = 45,
+    SHOW_STR = 46,
+    GAME_SPEED = 47,
+    IF = 50,
+    SET_SPEED = 51,
+    COPY_TIME_TO = 52,
+    HIDE_STATUS = 53,
+    VAR_MAP = 54,
+    VAR_MOD = 55,
     GAMEPAD_BUTTON = 100,
     OLDMOVE = 101
 }
@@ -253,6 +283,36 @@ export declare var macrotable: {
     $color: number;
     $wait: number;
     $sound: number;
+    $jumpgate: number;
+    $rec_pos: number;
+    $jump_rec_pos: number;
+    $console_log: number;
+    $copy_hp_to: number;
+    $set_hp: number;
+    $copy_hpmax_to: number;
+    $set_hpmax: number;
+    $copy_at_to: number;
+    $set_at: number;
+    $copy_df_to: number;
+    $set_df: number;
+    $copy_money_to: number;
+    $set_money: number;
+    $copy_step_count_to: number;
+    $var_set_val: number;
+    $var_set: number;
+    $var_add: number;
+    $var_sub: number;
+    $var_mul: number;
+    $var_div: number;
+    $var_set_rand: number;
+    $show_str: number;
+    $game_speed: number;
+    $if: number;
+    $set_speed: number;
+    $copy_time_to: number;
+    $hide_status: number;
+    $var_map: number;
+    $var_mod: number;
     $gamepad_button: number;
     $oldmove: number;
 };
@@ -280,6 +340,8 @@ export declare enum SystemSound {
 }
 export declare var speedList: number[];
 export declare var speedNameList: string[];
+export declare const StatusKind: readonly ["energy", "strength", "defence", "gold"];
+export declare type StatusKind = typeof StatusKind[number];
 export declare class WWAConsts {
     static WWA_HOME: string;
     static ITEMBOX_SIZE: number;
@@ -356,9 +418,9 @@ export declare class WWAConsts {
     static MAP_WINDOW_HEIGHT: number;
     static H_PARTS_NUM_IN_WINDOW: number;
     static V_PARTS_NUM_IN_WINDOW: number;
-    static DEFAULT_SPEED_INDEX: number;
     static MIN_SPEED_INDEX: number;
     static MAX_SPEED_INDEX: number;
+    static QUICK_BATTLE_SPEED_INDECIES: number[];
     static ANIMATION_REP_HALF_FRAME: number;
     static PLAYER_LOOKING_AROUND_START_FRAME: number;
     static RELATIVE_COORD_BIAS: number;
@@ -407,6 +469,9 @@ export declare class WWAConsts {
     static MSG_STR_WIDTH: number;
     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 {
@@ -490,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 } 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";
@@ -80,7 +80,9 @@ export declare class WWA {
     private audioExtension;
     userDevice: UserDevice;
     private soundLoadedCheckTimer;
-    constructor(mapFileName: string, urlgateEnabled: boolean, titleImgName: string, classicModeEnabled: boolean, itemEffectEnabled: boolean, useGoToWWA: boolean, audioDirectory?: string, disallowLoadOldSave?: boolean);
+    private _startTime;
+    private _dumpElement;
+    constructor(mapFileName: string, urlgateEnabled: boolean, titleImgName: string, classicModeEnabled: boolean, itemEffectEnabled: boolean, useGoToWWA: boolean, audioDirectory?: string, disallowLoadOldSave?: boolean, dumpElm?: HTMLElement);
     private _setProgressBar;
     private _setLoadingMessage;
     private _setErrorMessage;
@@ -100,6 +102,7 @@ export declare class WWA {
     onpasssuspendsavecalled(): void;
     onitemmenucalled(): void;
     onchangespeed(type: SpeedChange): void;
+    isbattleSpeeIndexForQuickBattle(battleSpeedIndex: number): boolean;
     private _checkTurnKeyPressed;
     private _main;
     vibration(isStrong: boolean): void;
@@ -145,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;
@@ -227,6 +230,44 @@ export declare class WWA {
     showMonsterWindow(): void;
     isClassicMode(): boolean;
     isConsoleOutputMode(): boolean;
+    forcedJumpGate(jx: number, jy: 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, kind: StatusSolutionKind): void;
+    setUserVarDF(num: number, kind: StatusSolutionKind): void;
+    setUserVarMONEY(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;
+    setUserValAdd(x: number, y: number): void;
+    setUserValSub(x: number, y: number): void;
+    setUserValMul(x: number, y: number): void;
+    setUserValDiv(x: number, y: number): void;
+    setUserValMod(x: number, y: number): void;
+    setUserValRandNum(x: number, num: number): void;
+    private _generateUserValString;
+    speedChangeJudge(speedChangeFlag: boolean): void;
+    userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
+    private compareUserVar;
+    setPlayerSpeedIndex(speedIndex: number): void;
+    setUserVarPlayTime(num: number): void;
+    private setNowPlayTime;
+    hideStatus(no: number, isHide: boolean): void;
+    varMap(triggerPartsPos: Coord, xstr: string, ystr: string, partsID: number, targetPartsType: PartsType): void;
     setItemboxBackgroundPosition(pos: {
         x: number;
         y: number;
@@ -234,4 +275,6 @@ export declare class WWA {
     private _actionGamePadButtonItemMacro;
     setGamePadButtonItemTable(buttonID: number, itemBoxNo: number): void;
     private _checkSaveDataCompatibility;
+    isVisibleStatus(statusKind: StatusKind): boolean;
+    private _changeStatusVisibility;
 }

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;
@@ -22,6 +25,36 @@ export declare class Macro {
     execute(): void;
     private _concatEmptyArgs;
     private _parseInt;
+    private _executeJumpGateMacro;
+    private _executeRecPositionMacro;
+    private _executeJumpRecPositionMacro;
+    private _executeConsoleLogMacro;
+    private _executeCopyHpToMacro;
+    private _executeCopyHpMaxToMacro;
+    private _executeCopyAtToMacro;
+    private _executeCopyDfToMacro;
+    private _parseStatusKind;
+    private _executeCopyMoneyToMacro;
+    private _executeSetHPMacro;
+    private _executeSetHpMaxMacro;
+    private _executeSetAtMacro;
+    private _executeSetDfMacro;
+    private _executeSetMoneyMacro;
+    private _executeSetStepCountMacro;
+    private _executeVarSetValMacro;
+    private _executeVarSetMacro;
+    private _executeVarAddMacro;
+    private _executeVarSubMacro;
+    private _executeVarMulMacro;
+    private _executeVarDivMacro;
+    private _executeVarModMacro;
+    private _executeVarSetRandMacro;
+    private _executeGameSpeedMacro;
+    private _executeIfMacro;
+    private _executeSetSpeedMacro;
+    private _executeCopyTimeToMacro;
+    private _hideStatusMacro;
+    private _varMapMacro;
     private _executeImgPlayerMacro;
     private _executeImgYesNoMacro;
     private _executeHPMaxMacro;
@@ -111,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";
@@ -163,5 +165,5 @@ export declare class Player extends PartsObject {
     getSpeedIndex(): number;
     speedUp(): number;
     speedDown(): number;
-    constructor(wwa: WWA, pos: Position, camera: Camera, status: Status, em: number, moves: number);
+    constructor(wwa: WWA, pos: Position, camera: Camera, status: Status, em: number, moves: number, gameSpeedIndex: number);
 }

package/lib/wwa_save/WWACompress.d.ts

@@ -12,6 +12,7 @@ export default class WWACompress {
     private static _firstRandomMapObjectUtf8Table;
     static compress(wwaData: WWAData): object;
     private static compressObject;
+    private static compressUserVars;
     private static compressMapAllObject;
     private static indexListCompress;
     private static idSort;
@@ -19,6 +20,8 @@ export default class WWACompress {
     private static getDecompressArray;
     static decompress(saveObject: object): WWADataWithWorldNameStatus;
     private static decompressObject;
+    private static decompressUserVars;
+    private static generateEmptyUserVars;
     private static decompressAllMapObject;
     static setRestartData(restartData: WWAData, firstFrameData: WWAData): void;
     private static getChangedUint8Array;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/engine",
-  "version": "3.5.14",
+  "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.5.14",
-    "@wwawing/common-interface": "^3.5.14",
-    "@wwawing/debug-server": "^3.5.14",
-    "@wwawing/event-emitter": "^3.5.14",
-    "@wwawing/loader": "^3.5.14",
-    "@wwawing/page-generator": "^3.5.14",
-    "@wwawing/styles": "^3.5.14",
+    "@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": "e543a8ba65b29eb5a6fb0ec7c639c15019baefd6"
+  "gitHead": "a82aa4ec400e6f1f3b3a89aec5678864bcd4eced"
 }