@wwawing/engine 3.9.0-beta.2 → 3.9.0

package/lib/wwa_expression/eval.d.ts

@@ -0,0 +1,2 @@
+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

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

package/lib/{wwa_symbol_parser → wwa_expression}/parsers.d.ts

@@ -1,13 +1,15 @@
-import { Status } from "../wwa_data";
+import { EquipmentStatus, Status, Coord } from "../wwa_data";
 export interface TokenValues {
-    status: Status;
+    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' | 'DF' | 'GD' | 'TIME' | 'STEP' | 'RAND';
-export declare function calc(operator: string, leftValue: number, rightValue: number): number;
+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;

package/lib/wwa_expression/regexp.d.ts

@@ -0,0 +1,8 @@
+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_symbol_parser → wwa_expression}/value-assign-operation.d.ts

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

package/lib/wwa_inject_html.d.ts

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

package/lib/wwa_main.d.ts

@@ -16,8 +16,6 @@ export declare class WWA {
     private _monster;
     private _keyStore;
     private _mouseStore;
-    private _virtualPadStore;
-    private _virtualPadButtonElements;
     private _gamePadStore;
     private _camera;
     _itemMenu: ItemMenu;
@@ -75,7 +73,6 @@ export declare class WWA {
     private _userVarNameListRequestError;
     private _canDisplayUserVars;
     private _isActive;
-    private _itemboxBackgroundPos;
     private _mapIDTable;
     private _mapObjectIDTable;
     wwaCustomEventEmitter: IEventEmitter;
@@ -91,7 +88,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, enableVirtualPad?: boolean, virtualpadControllerElm?: HTMLElement);
+    constructor(mapFileName: string, urlgateEnabled: boolean, titleImgName: string, classicModeEnabled: boolean, itemEffectEnabled: boolean, useGoToWWA: boolean, audioDirectory: string, disallowLoadOldSave: boolean, dumpElm: HTMLElement, userVarNamesFile: string | null, canDisplayUserVars: boolean);
     private convertUserVariableNameListToArray;
     private _setProgressBar;
     private _setLoadingMessage;
@@ -289,9 +286,6 @@ 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/package.json

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

package/lib/wwa_symbol_parser/index.d.ts

@@ -1,5 +0,0 @@
-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;