@wwawing/engine 3.9.0-alpha.0 → 3.9.0-beta.1

package/lib/wwa_data.d.ts

@@ -567,4 +567,4 @@ export declare enum IDTable {
 }
 export declare type StatusSolutionKind = "all" | "bare" | "equipment";
 export declare type UserVarNameListRequestErrorKind = JsonResponseErrorKind | "notObject" | "noFileSpecified";
-export declare type SetMacroType = 'VARIABLE' | 'NUMBER' | 'HP' | 'HPMAX' | 'AT' | 'DF' | 'GD' | 'TIME' | 'STEP' | 'RAND';
+export declare type ConditionalMacroExecStatus = "outside-ifelse" | "can-execute" | "cannot-execute" | "executed";

package/lib/wwa_inject_html.d.ts

@@ -1 +1,2 @@
+export declare function checkTouchDevice(): boolean;
 export declare function inject(parent: HTMLDivElement, titleImgName: string): void;

package/lib/wwa_main.d.ts

@@ -1,4 +1,4 @@
-import { Coord, Position, LoaderProgress, LoadStage, YesNoState, Face, SidebarButton, SpeedChange, PartsType, AppearanceTriggerType, EquipmentStatus, ChangeStyleType, MacroStatusIndex, UserDevice, MacroImgFrameIndex, StatusKind, StatusSolutionKind, SetMacroType } from "./wwa_data";
+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";
@@ -16,6 +16,8 @@ export declare class WWA {
     private _monster;
     private _keyStore;
     private _mouseStore;
+    private _virtualPadStore;
+    private _virtualPadButtonElements;
     private _gamePadStore;
     private _camera;
     _itemMenu: ItemMenu;
@@ -73,10 +75,12 @@ export declare class WWA {
     private _userVarNameListRequestError;
     private _canDisplayUserVars;
     private _isActive;
+    private _itemboxBackgroundPos;
     private _mapIDTable;
     private _mapObjectIDTable;
     wwaCustomEventEmitter: IEventEmitter;
     private _scoreRates?;
+    private _conditionalMacroExecStatus;
     debug: boolean;
     private hoge;
     private _loadHandler;
@@ -87,7 +91,7 @@ export declare class WWA {
     private soundLoadedCheckTimer;
     private _startTime;
     private _dumpElement;
-    constructor(mapFileName: string, urlgateEnabled: boolean, titleImgName: string, classicModeEnabled: boolean, itemEffectEnabled: boolean, useGoToWWA: boolean, audioDirectory: string, disallowLoadOldSave: boolean, dumpElm: HTMLElement, userVarNamesFile: string | null, canDisplayUserVars: boolean);
+    constructor(mapFileName: string, urlgateEnabled: boolean, titleImgName: string, classicModeEnabled: boolean, itemEffectEnabled: boolean, useGoToWWA: boolean, audioDirectory: string, disallowLoadOldSave: boolean, dumpElm: HTMLElement, userVarNamesFile: string | null, canDisplayUserVars: boolean, enableVirtualPad?: boolean, virtualpadControllerElm?: HTMLElement);
     private convertUserVariableNameListToArray;
     private _setProgressBar;
     private _setLoadingMessage;
@@ -270,12 +274,10 @@ export declare class WWA {
     setUserValRandNum(x: number, num: number, bias: number): void;
     private _generateUserValString;
     speedChangeJudge(speedChangeFlag: boolean): void;
-    execIfMacro(macroStr?: string): void;
+    switchConditionalExecutionStatus(descriminant?: string): void;
     execSetMacro(macroStr?: string): void;
-    parseType(str: string): SetMacroType | null;
-    parseValue(str: string): number;
-    checkCondition(macroStr: any): boolean;
-    ifElseResetStatus(): void;
+    private _generateTokenValues;
+    resetConditionalMacroExecStaus(): void;
     userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
     private compareUserVar;
     setPlayerSpeedIndex(speedIndex: number): void;
@@ -287,6 +289,9 @@ export declare class WWA {
         x: number;
         y: number;
     }): void;
+    private _getVirtualPadButton;
+    private _setVirtualPadTouch;
+    private _setVirtualPadLeave;
     private _actionGamePadButtonItemMacro;
     setGamePadButtonItemTable(buttonID: number, itemBoxNo: number): void;
     private _checkSaveDataCompatibility;

package/lib/wwa_message.d.ts

@@ -22,7 +22,7 @@ export declare class Macro {
     macroType: MacroType;
     macroArgs: string[];
     constructor(_wwa: WWA, _triggerPartsID: number, _triggerPartsType: number, _triggerPartsPosition: Coord, macroType: MacroType, macroArgs: string[]);
-    isIFMacro(): boolean;
+    isJunction(): boolean;
     execute(): void;
     private _concatEmptyArgs;
     private _parseInt;

package/lib/wwa_password_window.d.ts

@@ -7,9 +7,11 @@ export declare class PasswordWindow {
     private _wwa;
     private _parent;
     private _isDisallowLoadOldSave;
+    private readonly COPIED_MESSAGE_DISPLAY_MS;
     private _element;
     private _okButtonElement;
     private _cancelButtonElement;
+    private _copyButtonElement;
     private _descriptionElement;
     private _passwordBoxElement;
     private _buttonWrapperElement;

package/lib/wwa_symbol_parser/index.d.ts

@@ -0,0 +1,5 @@
+import { type TokenValues } from "./parsers";
+import { type ValueAssignOperation } from "./value-assign-operation";
+export { TokenValues, ValueAssignOperation };
+export declare function parseSetMacroExpression(macroStr: string, tokenValues: TokenValues): ValueAssignOperation;
+export declare function checkCondition(descriminant: string, tokenValues: TokenValues): boolean;

package/lib/wwa_symbol_parser/parsers.d.ts

@@ -0,0 +1,14 @@
+import { Status } from "../wwa_data";
+export interface TokenValues {
+    status: Status;
+    energyMax: number;
+    moveCount: number;
+    playTime: number;
+    userVars: number[];
+}
+export declare type SetMacroType = 'VARIABLE' | 'NUMBER' | 'HP' | 'HPMAX' | 'AT' | 'DF' | 'GD' | 'TIME' | 'STEP' | 'RAND';
+export declare function calc(operator: string, leftValue: number, rightValue: number): number;
+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;

package/lib/wwa_symbol_parser/value-assign-operation.d.ts

@@ -0,0 +1,5 @@
+export interface ValueAssignOperation {
+    asignee: "energy" | "energyMax" | "strength" | "defence" | "gold" | number;
+    rawValue: number;
+}
+export declare function generateValueAssignOperation(calcResult: number, assigneeExpression: string): ValueAssignOperation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/engine",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-beta.1",
   "description": "World Wide Adventure: an RPG Engine.",
   "main": "./lib/wwa.js",
   "files": [
@@ -41,28 +41,29 @@
   },
   "homepage": "https://github.com/WWAWing/WWAWing#readme",
   "devDependencies": {
-    "@types/crypto-js": "^4.0.1",
-    "@types/pug": "^2.0.4",
-    "@types/terser-webpack-plugin": "^5.0.3",
+    "@types/crypto-js": "^4.1.1",
+    "@types/pug": "^2.0.6",
+    "@types/terser-webpack-plugin": "^5.2.0",
     "@types/webpack": "^5.28.0",
-    "@wwawing/assets": "^3.9.0-alpha.0",
-    "@wwawing/common-interface": "^3.9.0-alpha.0",
-    "@wwawing/debug-server": "^3.9.0-alpha.0",
-    "@wwawing/event-emitter": "^3.9.0-alpha.0",
-    "@wwawing/loader": "^3.9.0-alpha.0",
-    "@wwawing/page-generator": "^3.9.0-alpha.0",
-    "@wwawing/styles": "^3.9.0-alpha.0",
-    "crypto-js": "4.0.0",
+    "@wwawing/assets": "^3.9.0-beta.1",
+    "@wwawing/common-interface": "^3.9.0-beta.1",
+    "@wwawing/debug-server": "^3.9.0-beta.1",
+    "@wwawing/event-emitter": "^3.9.0-beta.1",
+    "@wwawing/loader": "^3.9.0-beta.1",
+    "@wwawing/page-generator": "^3.9.0-beta.1",
+    "@wwawing/styles": "^3.9.0-beta.1",
+    "@wwawing/virtual-pad": "^3.9.0-beta.1",
+    "crypto-js": "^4.1.1",
     "npm-run-all": "^4.1.5",
     "pug": "^3.0.2",
-    "shelljs": "^0.8.4",
-    "shx": "^0.3.3",
-    "terser-webpack-plugin": "^5.3.0",
-    "ts-loader": "^4.3.0",
+    "shelljs": "^0.8.5",
+    "shx": "^0.3.4",
+    "terser-webpack-plugin": "^5.3.3",
+    "ts-loader": "^9.3.0",
     "ts-node": "^10.8.1",
     "typescript": "^4.7.3",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1"
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.10.0"
   },
   "publishConfig": {
     "access": "public"
@@ -71,5 +72,5 @@
     "node": ">=16",
     "npm": ">=8"
   },
-  "gitHead": "99b7175f1ec57c4a21809a3faf5d82aba0e81f3c"
+  "gitHead": "afa09088a3983d144a072dfae45751d0b6c8aad4"
 }