@wwawing/engine 3.9.0-beta.0 → 3.9.0

package/lib/wwa_data.d.ts

@@ -2,6 +2,7 @@ import { WWA } from "./wwa_main";
 import { Camera } from "./wwa_camera";
 import { KeyCode } from "./wwa_input";
 import { WWAData } from "@wwawing/common-interface";
+import type { JsonResponseErrorKind } from "./json_api_client";
 export { WWAData };
 export declare class EquipmentStatus {
     strength: number;
@@ -142,8 +143,6 @@ export declare enum BROWSER_TYPE {
     CHROME = 1,
     FIREFOX = 2,
     SAFARI = 3,
-    EDGE = 4,
-    INTERNET_EXPLORER = 5,
     OTHERS = 9999
 }
 export declare enum ChoiceCallInfo {
@@ -256,6 +255,10 @@ export declare enum MacroType {
     VAR_MAP = 54,
     VAR_MOD = 55,
     NO_GAMEOVER = 56,
+    ELSE_IF = 57,
+    ELSE = 58,
+    END_IF = 59,
+    SET = 60,
     GAMEPAD_BUTTON = 100,
     OLDMOVE = 101
 }
@@ -315,6 +318,10 @@ export declare var macrotable: {
     $var_map: number;
     $var_mod: number;
     $no_gameover: number;
+    $else_if: number;
+    $else: number;
+    $endif: number;
+    $set: number;
     $gamepad_button: number;
     $oldmove: number;
 };
@@ -559,9 +566,5 @@ export declare enum IDTable {
     BITMASK = 65535
 }
 export declare type StatusSolutionKind = "all" | "bare" | "equipment";
-export declare type JsonRequestErrorKind = "brokenJson" | "httpError";
-export declare type UserVarNameListRequestErrorKind = JsonRequestErrorKind | "notObject" | "noFileSpecified";
-export declare type JsonRequestError<ErrorKind = JsonRequestErrorKind> = {
-    kind: ErrorKind;
-    detail: string;
-};
+export declare type UserVarNameListRequestErrorKind = JsonResponseErrorKind | "notObject" | "noFileSpecified";
+export declare type ConditionalMacroExecStatus = "outside-ifelse" | "can-execute" | "cannot-execute" | "executed";

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_expression/parsers.d.ts

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

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_expression/value-assign-operation.d.ts

@@ -0,0 +1,5 @@
+export interface ValueAssignOperation {
+    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): 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, JsonRequestError } 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,8 +16,6 @@ export declare class WWA {
     private _monster;
     private _keyStore;
     private _mouseStore;
-    private _virtualPadStore;
-    private _virtualPadButtonElements;
     private _gamePadStore;
     private _camera;
     _itemMenu: ItemMenu;
@@ -52,7 +50,7 @@ export declare class WWA {
     private _lastMessage;
     private _frameCoord;
     private _battleEffectCoord;
-    private _audioInstances;
+    private sounds;
     private _temporaryInputDisable;
     private _isLoadedSound;
     private _isSkippedSoundMessage;
@@ -75,11 +73,11 @@ 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;
@@ -95,7 +93,7 @@ export declare class WWA {
     private _setProgressBar;
     private _setLoadingMessage;
     private _setErrorMessage;
-    createWWAAudioInstance(idx: number): void;
+    createSoundInstance(soundId: number): void;
     loadSound(): void;
     checkAllSoundLoaded(): void;
     private _setSoundLoadedCheckTimer;
@@ -273,6 +271,10 @@ export declare class WWA {
     setUserValRandNum(x: number, num: number, bias: number): void;
     private _generateUserValString;
     speedChangeJudge(speedChangeFlag: boolean): void;
+    switchConditionalExecutionStatus(descriminant?: string): void;
+    execSetMacro(macroStr?: string): void;
+    private _generateTokenValues;
+    resetConditionalMacroExecStaus(): void;
     userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
     private compareUserVar;
     setPlayerSpeedIndex(speedIndex: number): void;
@@ -284,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;
@@ -297,4 +296,3 @@ export declare class WWA {
         isCalledByMacro: boolean;
     }): boolean;
 }
-export declare const getJSONFile: (fileName: string, callback: (error: JsonRequestError, result: unknown) => void) => void;

package/lib/wwa_message.d.ts

@@ -22,6 +22,7 @@ export declare class Macro {
     macroType: MacroType;
     macroArgs: string[];
     constructor(_wwa: WWA, _triggerPartsID: number, _triggerPartsType: number, _triggerPartsPosition: Coord, macroType: MacroType, macroArgs: string[]);
+    isJunction(): boolean;
     execute(): void;
     private _concatEmptyArgs;
     private _parseInt;
@@ -51,6 +52,9 @@ export declare class Macro {
     private _executeVarSetRandMacro;
     private _executeGameSpeedMacro;
     private _executeIfMacro;
+    private _executeIfElseMacro;
+    private _executeElseMacro;
+    private _executeEndIfMacro;
     private _executeSetSpeedMacro;
     private _executeCopyTimeToMacro;
     private _executeHideStatusMacro;
@@ -81,6 +85,7 @@ export declare class Macro {
     private _executeGamePadButtonMacro;
     private _executeOldMoveMacro;
     private _executeNoGameOverMacro;
+    private _executeSetMacro;
 }
 export declare function parseMacro(wwa: WWA, partsID: number, partsType: PartsType, position: Coord, macroStr: string): Macro;
 export declare class TextWindow {

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_save/WWASaveDataDBList.d.ts

@@ -13,15 +13,12 @@ declare type WWASaveDataItem = {
 };
 export default class WWASaveDataDBList extends WWASaveDataList {
     private selectDatas;
-    private selectLoad;
-    private indexedDB;
     private IDBTransaction;
     private onCheckLoadingSaveData;
     private onCompleteLoadingSaveData;
     private static doNotAnything;
     protected keyPath: string | string[];
     constructor(onCheckLoadingSaveData: OnCheckLoadingSaveDataFunction, onCompleteLoadingSaveData: OnCompleteLoadingSaveDataFunction, prototype?: WWASaveDataDBList);
-    private getAlEmulate;
     private indexDBOpen;
     private createDataBase;
     private getObjectStore;

package/lib/wwa_sound.d.ts

@@ -0,0 +1,24 @@
+export declare class Sound {
+    private id;
+    private fileName;
+    private audioContext;
+    private audioGain;
+    private audioBuffer;
+    private bufferSources;
+    private isLoaded;
+    private isExceededMaxRetryCount?;
+    constructor(id: number, fileName: string, audioContext: AudioContext, audioGain: GainNode);
+    private fetchSoundFile;
+    private getArrayBuffer;
+    private load;
+    private retry;
+    private setData;
+    private cancelLoad;
+    play(): void;
+    pause(): void;
+    isBgm(): boolean;
+    hasData(): boolean;
+    isLoading(): boolean;
+    isError(): boolean;
+    private disposeBufferSource;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/engine",
-  "version": "3.9.0-beta.0",
+  "version": "3.9.0",
   "description": "World Wide Adventure: an RPG Engine.",
   "main": "./lib/wwa.js",
   "files": [
@@ -41,29 +41,28 @@
   },
   "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-beta.0",
-    "@wwawing/common-interface": "^3.9.0-beta.0",
-    "@wwawing/debug-server": "^3.9.0-beta.0",
-    "@wwawing/event-emitter": "^3.9.0-beta.0",
-    "@wwawing/loader": "^3.9.0-beta.0",
-    "@wwawing/page-generator": "^3.9.0-beta.0",
-    "@wwawing/styles": "^3.9.0-beta.0",
-    "@wwawing/virtual-pad": "^3.9.0-beta.0",
-    "crypto-js": "4.0.0",
+    "@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",
-    "shelljs": "^0.8.4",
-    "shx": "^0.3.3",
-    "terser-webpack-plugin": "^5.3.0",
-    "ts-loader": "^4.3.0",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.4",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1"
+    "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.73.0",
+    "webpack-cli": "^4.10.0"
   },
   "publishConfig": {
     "access": "public"
@@ -72,5 +71,5 @@
     "node": ">=16",
     "npm": ">=8"
   },
-  "gitHead": "31f57918222d901ab542e8382dcd2c2b79023af4"
+  "gitHead": "32c2e708c4d92bceb1847063e35a9ade661f4e93"
 }

package/lib/wwa_audio/WWAAudio.d.ts

@@ -1,9 +0,0 @@
-export default abstract class WWAAudio {
-    protected idx: number;
-    constructor(idx: number);
-    play(): void;
-    pause(): void;
-    isBgm(): boolean;
-    hasData(): boolean;
-    isError(): boolean;
-}

package/lib/wwa_audio/WWAAudioElement.d.ts

@@ -1,13 +0,0 @@
-import WWAAudio from './WWAAudio';
-export default class WWAAudioElement extends WWAAudio {
-    private _mainElement;
-    private _subElement;
-    private _currentElement;
-    private _nextIsSub;
-    constructor(idx: number, file: string, parentNode: Node);
-    private _createElement;
-    play(): void;
-    pause(): void;
-    hasData(): boolean;
-    isError(): boolean;
-}

package/lib/wwa_audio/WWAWebAudio.d.ts

@@ -1,18 +0,0 @@
-import WWAAudio from './WWAAudio';
-export default class WWAWebAudio extends WWAAudio {
-    private audioContext;
-    private audioGain;
-    private audioBuffer;
-    private bufferSources;
-    private isLoaded;
-    private pos;
-    constructor(idx: number, file: string, audioContext: AudioContext, audioGain: GainNode);
-    private _load;
-    private _setData;
-    private _cancelLoad;
-    play(): void;
-    pause(): void;
-    hasData(): boolean;
-    isLoading(): boolean;
-    isError(): boolean;
-}

package/lib/wwa_audio/index.d.ts

@@ -1,4 +0,0 @@
-import WWAAudio from './WWAAudio';
-import WWAAudioElement from './WWAAudioElement';
-import WWAWebAudio from './WWAWebAudio';
-export { WWAAudio, WWAAudioElement, WWAWebAudio };

package/lib/wwa_save/WWASaveDataDBListForIE.d.ts

@@ -1,20 +0,0 @@
-import WWASaveDataDBList from "./WWASaveDataDBList";
-import { OnCompleteLoadingSaveDataFunction, OnCheckLoadingSaveDataFunction } from ".";
-declare type WWASaveDataItem = {
-    url?: string;
-    id: number;
-    hash: string;
-    image: string;
-    data: object;
-    date: Date;
-    worldName: string;
-    urlWithId: string;
-    mapDataRevisionKey: string;
-};
-export default class WWASaveDataDBListForIE extends WWASaveDataDBList {
-    constructor(onCheckLoadingSaveData: OnCheckLoadingSaveDataFunction, onCompleteLoadingSaveData: OnCompleteLoadingSaveDataFunction);
-    protected keyPath: string;
-    protected makeSaveDataItem(saveID: number, gameCvs: HTMLCanvasElement, compressedData: object, date: Date): WWASaveDataItem;
-    protected getSaveDataResult(store: IDBObjectStore, onsuccess: (result: WWASaveDataItem[]) => void): void;
-}
-export {};