@wwawing/engine 3.8.0 → 3.9.0-alpha.0

package/lib/wwa_data.d.ts

@@ -255,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
 }
@@ -314,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,3 +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';

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 } from "./wwa_data";
+import { Coord, Position, LoaderProgress, LoadStage, YesNoState, Face, SidebarButton, SpeedChange, PartsType, AppearanceTriggerType, EquipmentStatus, ChangeStyleType, MacroStatusIndex, UserDevice, MacroImgFrameIndex, StatusKind, StatusSolutionKind, SetMacroType } from "./wwa_data";
 import { MessageWindow, ParsedMessage } from "./wwa_message";
 import { ItemMenu } from "./wwa_item_menu";
 import { WWACompress } from "./wwa_save";
@@ -270,6 +270,12 @@ export declare class WWA {
     setUserValRandNum(x: number, num: number, bias: number): void;
     private _generateUserValString;
     speedChangeJudge(speedChangeFlag: boolean): void;
+    execIfMacro(macroStr?: string): void;
+    execSetMacro(macroStr?: string): void;
+    parseType(str: string): SetMacroType | null;
+    parseValue(str: string): number;
+    checkCondition(macroStr: any): boolean;
+    ifElseResetStatus(): void;
     userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
     private compareUserVar;
     setPlayerSpeedIndex(speedIndex: number): 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[]);
+    isIFMacro(): 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/engine",
-  "version": "3.8.0",
+  "version": "3.9.0-alpha.0",
   "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.8.0",
-    "@wwawing/common-interface": "^3.8.0",
-    "@wwawing/debug-server": "^3.8.0",
-    "@wwawing/event-emitter": "^3.8.0",
-    "@wwawing/loader": "^3.8.0",
-    "@wwawing/page-generator": "^3.8.0",
-    "@wwawing/styles": "^3.8.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",
     "npm-run-all": "^4.1.5",
     "pug": "^3.0.2",
@@ -71,5 +71,5 @@
     "node": ">=16",
     "npm": ">=8"
   },
-  "gitHead": "c652b5022ed532432f87b6b9011fcac0170e0999"
+  "gitHead": "99b7175f1ec57c4a21809a3faf5d82aba0e81f3c"
 }