@wwawing/engine 3.11.6 → 3.12.1

package/lib/wwa_data.d.ts

@@ -1,6 +1,5 @@
 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 };
@@ -72,20 +71,19 @@ export declare enum ControlPanelBottomButton {
     GAME_END = 2
 }
 export declare enum Direction {
-    LEFT = 0,
-    RIGHT = 1,
+    UNUSED = 0,
+    LEFT = 4,
+    RIGHT = 6,
     DOWN = 2,
-    UP = 3,
-    LEFT_DOWN = 4,
-    LEFT_UP = 5,
-    RIGHT_DOWN = 6,
-    RIGHT_UP = 7,
-    NO_DIRECTION = 8
-}
-export declare var vx: number[];
-export declare var vy: number[];
-export declare var dirToPos: number[];
-export declare var dirToKey: KeyCode[];
+    UP = 8,
+    LEFT_DOWN = 1,
+    LEFT_UP = 7,
+    RIGHT_DOWN = 3,
+    RIGHT_UP = 9,
+    NO_DIRECTION = 5
+}
+export declare const vx: number[];
+export declare const vy: number[];
 export declare enum YesNoState {
     YES = 0,
     NO = 1,
@@ -254,12 +252,15 @@ export declare enum MacroType {
     ELSE = 58,
     END_IF = 59,
     SET = 60,
+    MAP2 = 61,
+    SHOW_STR2 = 62,
+    CONSOLE_LOG2 = 63,
     GAMEPAD_BUTTON = 100,
     OLDMOVE = 101,
     LEGACY_IF = 10050
 }
 export declare type ConditionalExecuteMacroType = MacroType.IF | MacroType.ELSE_IF | MacroType.ELSE | MacroType.END_IF;
-export declare type PreprocessMacroType = ConditionalExecuteMacroType | MacroType.SHOW_STR;
+export declare type PreprocessMacroType = ConditionalExecuteMacroType | MacroType.SHOW_STR | MacroType.SHOW_STR2;
 export declare var macrotable: {
     "": number;
     $imgplayer: number;
@@ -320,6 +321,9 @@ export declare var macrotable: {
     $else: number;
     $endif: number;
     $set: number;
+    $map2: number;
+    $show_str2: number;
+    $console_log2: number;
     $gamepad_button: number;
     $oldmove: number;
 };
@@ -574,3 +578,8 @@ export interface ScoreRates {
     defence: number;
     gold: number;
 }
+export interface TriggerParts {
+    id: number;
+    type: PartsType;
+    position: Coord;
+}

package/lib/wwa_expression/eval.d.ts

@@ -1,5 +1,5 @@
 import type { Descriminant, TokenValues, Comparable } from "./typedef";
-export declare function evaluateDescriminant(d: Descriminant, tokenValues: TokenValues): boolean;
-export declare function evaluateValue(comparable: Comparable, tokenValues: TokenValues): number;
+export declare function evaluateDescriminant(d: Descriminant, tokenValues: TokenValues, fallbackValue?: number): boolean;
+export declare function evaluateValue(comparable: Comparable, tokenValues: TokenValues, fallbackValue?: number): number;
 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

@@ -4,6 +4,8 @@ export * from "./typedef";
 export * from "./parsers";
 export * from "./eval";
 export * from "./regexp";
-export declare function parseAndEvaluateValue(value: string, tokenValues: TokenValues): number;
+export declare function parseAndEvaluateValue(value: string, tokenValues: TokenValues, fallbackValue?: number): number;
 export declare function evaluateSetMacroExpression(expression: string, tokenValues: TokenValues): ValueAssignOperation;
+export declare function evaluateMacroArgExpression(expression: string, tokenValues: TokenValues, fallbackValue?: number): number;
+export declare function isValidMacroArgExpression(expression: string): boolean;
 export declare function parseDescriminant(expression: string): Descriminant | undefined;

package/lib/wwa_expression/regexp.d.ts

@@ -1,6 +1,11 @@
 export declare const regNumber: RegExp;
 export declare const regUserVar: RegExp;
+export declare const regMapByCoord: RegExp;
+export declare const regObjectByCoord: RegExp;
+export declare const regItemByBoxId: RegExp;
 export declare const regRand: RegExp;
+export declare const regItemCount: RegExp;
 export declare const regAdvance: RegExp;
 export declare const regNormal: RegExp;
+export declare const regMacroArg: RegExp;
 export declare const regIf: RegExp;

package/lib/wwa_expression/typedef.d.ts

@@ -1,9 +1,11 @@
-import type { EquipmentStatus, Status, Coord } from "../wwa_data";
-export declare type SetMacroType = 'VARIABLE' | 'NUMBER' | 'HP' | 'HPMAX' | 'AT' | 'AT_TOTAL' | 'AT_ITEMS' | 'DF' | 'DF_TOTAL' | 'DF_ITEMS' | 'GD' | 'TIME' | 'STEP' | 'PX' | 'PY' | 'RAND';
+import type { EquipmentStatus, Status, Coord, PartsType, Direction } from "../wwa_data";
+export declare type SetMacroType = 'VARIABLE' | 'MAP' | 'OBJECT' | 'ITEM' | 'NUMBER' | 'HP' | 'HPMAX' | 'AT' | 'AT_TOTAL' | 'AT_ITEMS' | 'DF' | 'DF_TOTAL' | 'DF_ITEMS' | 'GD' | 'TIME' | 'STEP' | 'X' | 'Y' | 'PX' | 'PY' | 'PDIR' | 'ID' | 'TYPE' | 'ITEM_COUNT_ALL' | 'RAND' | 'ITEM_COUNT';
 export declare type CNumberKind = "NUMBER";
 export declare type CVariableKind = "VARIABLE";
-export declare type CEnvKind = "HP" | "HPMAX" | "AT" | "AT_TOTAL" | "AT_ITEMS" | "DF" | "DF_TOTAL" | "DF_ITEMS" | "GD" | "STEP" | "TIME" | "PX" | "PY";
-export declare type CFunctionKind = "RAND";
+export declare type CPartsKind = "MAP" | "OBJECT";
+export declare type CItemKind = "ITEM";
+export declare type CEnvKind = "HP" | "HPMAX" | "AT" | "AT_TOTAL" | "AT_ITEMS" | "DF" | "DF_TOTAL" | "DF_ITEMS" | "GD" | "STEP" | "TIME" | "X" | "Y" | "PX" | "PY" | "PDIR" | "ID" | "TYPE" | "ITEM_COUNT_ALL";
+export declare type CFunctionKind = "RAND" | "ITEM_COUNT";
 export interface CNumber {
     type: CNumberKind;
     rawValue: number;
@@ -12,6 +14,15 @@ export interface CVariable {
     type: CVariableKind;
     index: number;
 }
+export interface CParts {
+    type: CPartsKind;
+    x: number;
+    y: number;
+}
+export interface CItem {
+    type: CItemKind;
+    boxIndex1To12: number;
+}
 export interface CEnv {
     type: CEnvKind;
 }
@@ -19,7 +30,7 @@ export interface CFunction {
     type: CFunctionKind;
     argument: CValue;
 }
-export declare type CValue = CNumber | CVariable | CEnv;
+export declare type CValue = CNumber | CVariable | CParts | CItem | CEnv;
 export declare type Comparable = CValue | CFunction;
 export declare type ComparisionOperatorKind = "<" | ">" | "<=" | ">=" | "==" | "!=";
 export declare type Descriminant = boolean | {
@@ -35,5 +46,12 @@ export interface TokenValues {
     moveCount: number;
     playTime: number;
     userVars: number[];
+    partsPosition: Coord;
     playerCoord: Coord;
+    partsId: number;
+    partsType: PartsType;
+    map: number[][];
+    mapObject: number[][];
+    itemBox: number[];
+    playerDirection: Direction;
 }

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

@@ -1,5 +1,22 @@
-export interface ValueAssignOperation {
-    assignee: "energy" | "energyMax" | "strength" | "defence" | "gold" | "moveCount" | number;
+export interface VariableAssignOperation {
+    assignee: "variable";
+    index: number;
     rawValue: number;
 }
+export interface CoordAssignOperation {
+    assignee: "map" | "mapObject";
+    x: number;
+    y: number;
+    rawValue: number;
+}
+export interface ItemAssignOperation {
+    assignee: "item";
+    boxIndex1to12: number;
+    rawValue: number;
+}
+export interface NoExtraArgumentValueeAssignOperation {
+    assignee: "energy" | "energyMax" | "strength" | "defence" | "gold" | "moveCount" | "playerDirection";
+    rawValue: number;
+}
+export declare type ValueAssignOperation = VariableAssignOperation | CoordAssignOperation | ItemAssignOperation | NoExtraArgumentValueeAssignOperation;
 export declare function generateValueAssignOperation(calcResult: number, assigneeExpression: string): ValueAssignOperation;

package/lib/wwa_main.d.ts

@@ -1,8 +1,9 @@
-import { Coord, Position, LoaderProgress, LoadStage, YesNoState, Face, SidebarButton, SpeedChange, PartsType, AppearanceTriggerType, EquipmentStatus, ChangeStyleType, MacroStatusIndex, UserDevice, MacroImgFrameIndex, StatusKind, StatusSolutionKind, ScoreOptions } from "./wwa_data";
+import { Coord, Position, LoaderProgress, LoadStage, YesNoState, Face, SidebarButton, SpeedChange, PartsType, AppearanceTriggerType, EquipmentStatus, ChangeStyleType, MacroStatusIndex, UserDevice, MacroImgFrameIndex, StatusKind, StatusSolutionKind, ScoreOptions, TriggerParts } from "./wwa_data";
 import { MessageWindow, Page } from "./wwa_message";
 import { ItemMenu } from "./wwa_item_menu";
 import { WWACompress } from "./wwa_save";
 import { IEventEmitter } from "@wwawing/event-emitter";
+import * as ExpressionParser from "./wwa_expression";
 export declare function getProgress(current: number, total: number, stage: LoadStage): LoaderProgress;
 interface PartsAppearance {
     pos: Coord;
@@ -294,10 +295,12 @@ export declare class WWA {
     setUserValRandNum(x: number, num: number, bias: number): void;
     private _generateShowStrString;
     speedChangeJudge(speedChangeFlag: boolean): void;
-    execSetMacro(macroStr?: string): {
+    execSetMacro(macroStr: string, option: {
+        triggerParts: TriggerParts;
+    }): {
         isGameOver?: true;
     };
-    private _generateTokenValues;
+    generateTokenValues(triggerParts: TriggerParts): ExpressionParser.TokenValues;
     userVarUserIf(_triggerPartsPosition: Coord, args: string[]): void;
     private compareUserVar;
     setPlayerSpeedIndex(speedIndex: number): void;

package/lib/wwa_message.d.ts

@@ -81,7 +81,7 @@ export declare class Macro {
         isGameOver?: true;
     };
     private _concatEmptyArgs;
-    private _parseInt;
+    private _evaluateIntValue;
     private _executeJumpGateMacro;
     private _executeRecPositionMacro;
     private _executeJumpRecPositionMacro;

package/package.json

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