xray16 1.1.3 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xray16",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "author": "Neloreck",
   "repository": "https://github.com/stalker-xrts/xray-16-types",
   "private": false,
@@ -16,10 +16,10 @@
     "lint": "eslint . --ext .ts,.tsx,.js"
   },
   "peerDependencies": {
-    "typescript-to-lua": "^1.16.3"
+    "typescript-to-lua": "^1.28.1"
   },
   "devDependencies": {
-    "@types/node": "20.3.1",
+    "@types/node": "22.10.2",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.54.0",
     "@typescript-to-lua/language-extensions": "1.0.0",
@@ -29,9 +29,9 @@
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-jsdoc": "^46.8.0",
     "eslint-plugin-sort-keys-fix": "^1.1.2",
-    "prettier": "^3.0.1",
-    "typedoc": "^0.24.8",
-    "typescript": "^5.1.6"
+    "prettier": "^3.4.2",
+    "typedoc": "^0.27.5",
+    "typescript": "^5.7.2"
   },
   "files": [
     "plugins/**/*",

package/plugins/transform_luabind_class/transformation/class_declaration.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformClassLikeDeclaration = exports.transformClassAsExpression = exports.transformLuabindClassDeclaration = void 0;
+exports.transformLuabindClassDeclaration = void 0;
+exports.transformClassAsExpression = transformClassAsExpression;
+exports.transformClassLikeDeclaration = transformClassLikeDeclaration;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const typescript_to_lua_1 = require("typescript-to-lua");
@@ -37,7 +39,6 @@ function transformClassAsExpression(expression, context) {
     context.addPrecedingStatements(statements);
     return name;
 }
-exports.transformClassAsExpression = transformClassAsExpression;
 function transformClassLikeDeclaration(classDeclaration, context, nameOverride) {
     let className;
     if (nameOverride !== undefined) {
@@ -101,7 +102,7 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     for (const member of classDeclaration.members) {
         if (!(0, typescript_1.isAccessor)(member))
             continue;
-        const accessors = context.resolver.getAllAccessorDeclarations(member);
+        const accessors = getAllAccessorDeclarations(classDeclaration);
         if (accessors.firstAccessor !== member)
             continue;
         const accessorsResult = (0, accessors_1.transformAccessorDeclarations)(context, accessors, localClassName);
@@ -144,4 +145,14 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     context.classSuperInfos.pop();
     return { statements: result, name: className };
 }
-exports.transformClassLikeDeclaration = transformClassLikeDeclaration;
+function getAllAccessorDeclarations(classDeclaration) {
+    const getAccessor = classDeclaration.members.find(typescript_1.isGetAccessor);
+    const setAccessor = classDeclaration.members.find(typescript_1.isSetAccessor);
+    // Get the first of the two (that is not undefined)
+    const firstAccessor = getAccessor && (!setAccessor || getAccessor.pos < setAccessor.pos) ? getAccessor : setAccessor;
+    return {
+        firstAccessor,
+        setAccessor,
+        getAccessor,
+    };
+}

package/plugins/transform_luabind_class/transformation/decorators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkLuabindClassDecoratorExpression = void 0;
+exports.checkLuabindClassDecoratorExpression = checkLuabindClassDecoratorExpression;
 const constants_1 = require("./constants");
 const errors_1 = require("./errors");
 /**
@@ -13,4 +13,3 @@ function checkLuabindClassDecoratorExpression(context, decorator) {
         context.diagnostics.push((0, errors_1.unsupportedClassDecorator)(expression));
     }
 }
-exports.checkLuabindClassDecoratorExpression = checkLuabindClassDecoratorExpression;

package/plugins/transform_luabind_class/transformation/members/accessors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformAccessorDeclarations = void 0;
+exports.transformAccessorDeclarations = transformAccessorDeclarations;
 const typescript_to_lua_1 = require("typescript-to-lua");
 const lua = require("typescript-to-lua");
 const lua_ast_1 = require("typescript-to-lua/dist/transformation/utils/lua-ast");
@@ -36,4 +36,3 @@ function transformAccessorDeclarations(context, { firstAccessor, getAccessor, se
     const call = (0, lualib_1.transformLuaLibFunction)(context, feature, undefined, ...parameters);
     return lua.createExpressionStatement(call);
 }
-exports.transformAccessorDeclarations = transformAccessorDeclarations;

package/plugins/transform_luabind_class/transformation/members/constructor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformConstructorDeclaration = exports.createConstructorName = void 0;
+exports.createConstructorName = createConstructorName;
+exports.transformConstructorDeclaration = transformConstructorDeclaration;
 const typescript_1 = require("typescript");
 const lua = require("typescript-to-lua");
 const lua_ast_1 = require("typescript-to-lua/dist/transformation/utils/lua-ast");
@@ -12,7 +13,6 @@ const fields_1 = require("./fields");
 function createConstructorName(className) {
     return lua.createTableIndexExpression(lua.cloneIdentifier(className), lua.createStringLiteral(constants_1.LUABIND_CONSTRUCTOR_METHOD));
 }
-exports.createConstructorName = createConstructorName;
 function transformConstructorDeclaration(context, statement, className, instanceFields, classDeclaration) {
     // Don't transform methods without body (overload declarations)
     if (!statement.body) {
@@ -58,4 +58,3 @@ function transformConstructorDeclaration(context, statement, className, instance
     context.popScope();
     return lua.createAssignmentStatement(createConstructorName(className), lua.createFunctionExpression(block, params, dotsLiteral, lua.NodeFlags.Declaration), constructorWasGenerated ? classDeclaration : statement);
 }
-exports.transformConstructorDeclaration = transformConstructorDeclaration;

package/plugins/transform_luabind_class/transformation/members/fields.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformClassInstanceFields = exports.verifyPropertyDecoratingExpression = void 0;
+exports.verifyPropertyDecoratingExpression = verifyPropertyDecoratingExpression;
+exports.transformClassInstanceFields = transformClassInstanceFields;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const lua_ast_1 = require("typescript-to-lua/dist/transformation/utils/lua-ast");
@@ -20,7 +21,6 @@ function verifyPropertyDecoratingExpression(context, node) {
         context.diagnostics.push((0, errors_1.unsupportedPropertyDecorator)(decorator));
     });
 }
-exports.verifyPropertyDecoratingExpression = verifyPropertyDecoratingExpression;
 function transformClassInstanceFields(context, instanceFields) {
     const statements = [];
     for (const f of instanceFields) {
@@ -38,4 +38,3 @@ function transformClassInstanceFields(context, instanceFields) {
     }
     return statements;
 }
-exports.transformClassInstanceFields = transformClassInstanceFields;

package/plugins/transform_luabind_class/transformation/members/method.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyMethodDecoratingExpression = exports.transformMethodDeclaration = exports.transformMethodName = exports.transformMemberExpressionOwnerName = void 0;
+exports.transformMemberExpressionOwnerName = transformMemberExpressionOwnerName;
+exports.transformMethodName = transformMethodName;
+exports.transformMethodDeclaration = transformMethodDeclaration;
+exports.verifyMethodDecoratingExpression = verifyMethodDecoratingExpression;
 const typescript_1 = require("typescript");
 const lua = require("typescript-to-lua");
 const function_1 = require("typescript-to-lua/dist/transformation/visitors/function");
@@ -10,7 +13,6 @@ const utils_1 = require("../utils");
 function transformMemberExpressionOwnerName(node, className) {
     return lua.cloneIdentifier(className);
 }
-exports.transformMemberExpressionOwnerName = transformMemberExpressionOwnerName;
 function transformMethodName(context, node) {
     const methodName = (0, literal_1.transformPropertyName)(context, node.name);
     if (lua.isStringLiteral(methodName) && methodName.value === "toString") {
@@ -18,7 +20,6 @@ function transformMethodName(context, node) {
     }
     return methodName;
 }
-exports.transformMethodName = transformMethodName;
 function transformMethodDeclaration(context, node, className) {
     // Don't transform methods without body (overload declarations)
     if (!node.body)
@@ -33,7 +34,6 @@ function transformMethodDeclaration(context, node, className) {
     const [functionExpression] = (0, function_1.transformFunctionToExpression)(context, node);
     return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression, node);
 }
-exports.transformMethodDeclaration = transformMethodDeclaration;
 /**
  * Verify that method statement is not using decorators for methods/parameters.
  */
@@ -53,4 +53,3 @@ function verifyMethodDecoratingExpression(context, node) {
         });
     }
 }
-exports.verifyMethodDecoratingExpression = verifyMethodDecoratingExpression;

package/plugins/transform_luabind_class/transformation/new.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformNewCallExpression = void 0;
+exports.transformNewCallExpression = transformNewCallExpression;
 const tstl = require("typescript-to-lua");
 const call_1 = require("typescript-to-lua/dist/transformation/visitors/call");
 /**
@@ -9,4 +9,3 @@ const call_1 = require("typescript-to-lua/dist/transformation/visitors/call");
 function transformNewCallExpression(expression, context) {
     return tstl.createCallExpression(context.transformExpression(expression.expression), (0, call_1.transformArguments)(context, expression.arguments ?? []));
 }
-exports.transformNewCallExpression = transformNewCallExpression;

package/plugins/transform_luabind_class/transformation/setup.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReflectionClassName = exports.createClassSetup = void 0;
+exports.createClassSetup = createClassSetup;
+exports.getReflectionClassName = getReflectionClassName;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const export_1 = require("typescript-to-lua/dist/transformation/utils/export");
@@ -41,7 +42,6 @@ function createClassSetup(context, statement, className, localClassName) {
     result.push(tstl.createAssignmentStatement(tstl.createTableIndexExpression(tstl.cloneIdentifier(localClassName), tstl.createStringLiteral(constants_1.LUABIND_NAME_FIELD)), getReflectionClassName(statement, className), statement));
     return result;
 }
-exports.createClassSetup = createClassSetup;
 function getReflectionClassName(declaration, className) {
     if (declaration.name) {
         return tstl.createStringLiteral(declaration.name.text);
@@ -57,7 +57,6 @@ function getReflectionClassName(declaration, className) {
     }
     return tstl.createStringLiteral("");
 }
-exports.getReflectionClassName = getReflectionClassName;
 /**
  * Creates class("Name")(base) expression for luabind classes.
  */

package/plugins/transform_luabind_class/transformation/super.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformLuabindConstructorSuperCall = exports.isLuabindClassSuperMethodCall = exports.isLuabindClassSuperCall = exports.transformClassSuperMethodExpression = void 0;
+exports.transformClassSuperMethodExpression = transformClassSuperMethodExpression;
+exports.isLuabindClassSuperCall = isLuabindClassSuperCall;
+exports.isLuabindClassSuperMethodCall = isLuabindClassSuperMethodCall;
+exports.transformLuabindConstructorSuperCall = transformLuabindConstructorSuperCall;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const export_1 = require("typescript-to-lua/dist/transformation/utils/export");
@@ -34,7 +37,6 @@ function transformClassSuperMethodExpression(expression, context) {
     }
     return baseClassName;
 }
-exports.transformClassSuperMethodExpression = transformClassSuperMethodExpression;
 /**
  * Check if super() call is in luabind class target.
  */
@@ -50,7 +52,6 @@ function isLuabindClassSuperCall(expression, context) {
         return superInfo?.classDeclaration ? (0, utils_1.isLuabindClassType)(superInfo.classDeclaration, context) : false;
     }
 }
-exports.isLuabindClassSuperCall = isLuabindClassSuperCall;
 /**
  * Check if super.method() call is in luabind class target.
  */
@@ -60,7 +61,6 @@ function isLuabindClassSuperMethodCall(expression, context) {
     // Handle super calls properly for luabind classes.
     return superInfo?.classDeclaration ? (0, utils_1.isLuabindClassType)(superInfo.classDeclaration, context) : false;
 }
-exports.isLuabindClassSuperMethodCall = isLuabindClassSuperMethodCall;
 /**
  * Transform super() call in luabind classes to base_class.__init(self, param).
  */
@@ -69,4 +69,3 @@ function transformLuabindConstructorSuperCall(expression, context) {
     const parameters = (0, call_1.transformArguments)(context, expression.arguments, signature, typescript_1.factory.createThis());
     return tstl.createCallExpression(tstl.createTableIndexExpression(context.transformExpression(typescript_1.factory.createSuper()), tstl.createStringLiteral(constants_1.LUABIND_CONSTRUCTOR_METHOD)), parameters, expression);
 }
-exports.transformLuabindConstructorSuperCall = transformLuabindConstructorSuperCall;

package/plugins/transform_luabind_class/transformation/utils.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLuabindClassType = exports.markTypeAsLuabind = exports.isLuabindDecoratedClass = exports.getExtendedType = exports.getExtendedNode = exports.getExtendsClause = exports.isStaticNode = void 0;
+exports.isStaticNode = isStaticNode;
+exports.getExtendsClause = getExtendsClause;
+exports.getExtendedNode = getExtendedNode;
+exports.getExtendedType = getExtendedType;
+exports.isLuabindDecoratedClass = isLuabindDecoratedClass;
+exports.markTypeAsLuabind = markTypeAsLuabind;
+exports.isLuabindClassType = isLuabindClassType;
 const typescript_1 = require("typescript");
 const constants_1 = require("./constants");
 /**
@@ -9,14 +15,12 @@ const constants_1 = require("./constants");
 function isStaticNode(node) {
     return node.modifiers?.some((m) => m.kind === typescript_1.SyntaxKind.StaticKeyword) === true;
 }
-exports.isStaticNode = isStaticNode;
 /**
  * Get class extends node.
  */
 function getExtendsClause(node) {
     return node.heritageClauses?.find((clause) => clause.token === typescript_1.SyntaxKind.ExtendsKeyword);
 }
-exports.getExtendsClause = getExtendsClause;
 /**
  * Get class extended node.
  */
@@ -26,7 +30,6 @@ function getExtendedNode(node) {
         return;
     return extendsClause.types[0];
 }
-exports.getExtendedNode = getExtendedNode;
 /**
  * Get class extended node.
  */
@@ -34,7 +37,6 @@ function getExtendedType(context, node) {
     const extendedNode = getExtendedNode(node);
     return extendedNode && context.checker.getTypeAtLocation(extendedNode);
 }
-exports.getExtendedType = getExtendedType;
 /**
  * Check if class is decorated with provided decorator name.
  */
@@ -45,7 +47,6 @@ function isLuabindDecoratedClass(declaration) {
     }
     return decorators.some((it) => it.expression.expression?.escapedText === constants_1.LUABIND_DECORATOR);
 }
-exports.isLuabindDecoratedClass = isLuabindDecoratedClass;
 /**
  * Mark provided class as Luabind target.
  */
@@ -54,7 +55,6 @@ function markTypeAsLuabind(declaration, context) {
     const typeSymbol = typeAtLocation.symbol || typeAtLocation.aliasSymbol;
     typeSymbol[constants_1.LUABIND_SYMBOL] = true;
 }
-exports.markTypeAsLuabind = markTypeAsLuabind;
 /**
  * Check if provided class is specified as LuaBind.
  */
@@ -74,4 +74,3 @@ function isLuabindClassType(declaration, context) {
         return false;
     }
 }
-exports.isLuabindClassType = isLuabindClassType;

package/plugins/utils/diagnostics.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createErrorDiagnosticFactory = exports.createDiagnosticFactory = void 0;
+exports.createDiagnosticFactory = createDiagnosticFactory;
+exports.createErrorDiagnosticFactory = createErrorDiagnosticFactory;
 const typescript_1 = require("typescript");
 const utils_1 = require("typescript-to-lua/dist/utils");
 /**
@@ -15,8 +16,6 @@ function createDiagnosticFactory(category, message) {
         category,
     }));
 }
-exports.createDiagnosticFactory = createDiagnosticFactory;
 function createErrorDiagnosticFactory(message) {
     return createDiagnosticFactory(typescript_1.DiagnosticCategory.Error, message);
 }
-exports.createErrorDiagnosticFactory = createErrorDiagnosticFactory;

package/types/xr_ai/xr_alife.d.ts

@@ -16,7 +16,7 @@ declare module "xray16" {
       vector: vector,
       level_vertex_id: u32,
       game_vertex_id: u16,
-      pid: u16,
+      parent_object_id: u16,
       count: i32
     ): cse_abstract;
 
@@ -80,17 +80,31 @@ declare module "xray16" {
 
     public valid_object_id(value: u16): boolean;
 
-    public kill_entity(monster1: cse_alife_monster_abstract, value?: u16, monster2?: cse_alife_monster_abstract): void;
+    public kill_entity(
+      monster: cse_alife_monster_abstract,
+      graph_id?: u16,
+      schedulable?: cse_alife_monster_abstract
+    ): void;
 
-    public object<T extends cse_alife_object = cse_alife_object>(id: number, value2?: boolean): T | null;
+    public object<T extends cse_alife_object = cse_alife_object>(object_id: u16, no_assert?: boolean): T | null;
 
-    public create<T extends cse_alife_object = cse_alife_object>(value: u32): T;
+    public create<T extends cse_alife_object = cse_alife_object>(object_id: u16): T;
+    public create<T extends cse_alife_object = cse_alife_object>(
+      section: string,
+      position: vector,
+      level_vertex_id: u32,
+      game_vertex_id: u32,
+      parent_object_id?: u16
+    ): T;
+    // Alundaio: Allows to call alife():register(se_obj) manually afterward,editing
+    // Alundaio: so that packet can be done safely when spawning object with a parent.
     public create<T extends cse_alife_object = cse_alife_object>(
-      item_section: string,
+      section: string,
       position: vector,
       level_vertex_id: u32,
       game_vertex_id: u32,
-      pid?: i32
+      parent_object_id: u16,
+      reg: boolean
     ): T;
   }
 

package/types/xr_lib/xr_game.d.ts

@@ -1,5 +1,4 @@
 declare module "xray16" {
-
   /**
    * Enumeration with possible game types:
    * - eGameIDNoGame = u32(0),

package/types/xr_lib/xr_render.d.ts

@@ -66,5 +66,4 @@ declare module "xray16" {
    * @returns whether renderer setting can be changed
    */
   export function renderer_allow_override(this: void): boolean;
-
 }

package/types/xr_lib/xr_task.d.ts

@@ -35,8 +35,6 @@ declare module "xray16" {
   export class SGameTaskObjective {
     public constructor(task: CGameTask, id: i32);
 
-    public remove_map_locations(flag: boolean): void;
-
     public set_icon_name(icon_name: string): void;
 
     public get_icon_name<T extends string = string>(): T | null;
@@ -75,7 +73,21 @@ declare module "xray16" {
 
     public set_map_hint(hint: string): void;
 
-    public change_map_location(value: string, value2: u16): void;
+    /**
+     * @returns target map location of task object
+     */
+    public get_map_location(): string;
+
+    /**
+     * @returns target map object ID of task object
+     */
+    public get_map_object_id(): u16;
+
+    public change_map_location(new_map_location: string, new_map_object_id: u16): void;
+
+    public remove_map_locations(notify: boolean): void;
+
+    public create_map_location(on_load: boolean): void;
 
     public set_map_object_id(id: i32): void;
   }

package/types/xr_object/client/xr_level.d.ts

@@ -67,6 +67,10 @@ declare module "xray16" {
 
     public constructor();
 
+    public SetEnterLocked(is_enabled: boolean): void;
+
+    public SetExitLocked(is_enabled: boolean): void;
+
     public CanHit(): boolean;
 
     public CarExplode(): void;
@@ -81,18 +85,31 @@ declare module "xray16" {
 
     public FireDirDiff(): f32;
 
+    /**
+     * @returns amount of fuel in vehicle instance
+     */
     public GetfFuel(): f32;
 
+    /**
+     * @returns fuel consumption rate of vehicle instance
+     */
     public GetfFuelConsumption(): f32;
 
+    /**
+     * @returns fuel tank size (max possible amount of fuel at time)
+     */
     public GetfFuelTank(): f32;
 
+    /**
+     * @returns vehicle health value
+     */
     public GetfHealth(): f32;
 
+    /**
+     * @returns whether vehicle has mounted weapon
+     */
     public HasWeapon(): boolean;
 
-    public IsActiveEngine(): boolean;
-
     public IsObjectVisible(game_object: game_object): boolean;
 
     public PlayDamageParticles(): void;
@@ -107,12 +124,45 @@ declare module "xray16" {
 
     public SetfHealth(health: f32): void;
 
-    public StartEngine(): void;
+    /**
+     * @returns whether vehicle engine is active at the moment
+     */
+    public IsActiveEngine(): boolean;
 
-    public StopDamageParticles(): void;
+    /**
+     * Start vehicle engine.
+     */
+    public StartEngine(): void;
 
+    /**
+     * Stop vehicle engine.
+     */
     public StopEngine(): void;
 
+    /**
+     * Set vehicle hand break in active state.
+     */
+    public HandBreak(): void;
+
+    /**
+     * Deactivate vehicle hand break.
+     */
+    public ReleaseHandBreak(): void;
+
+    /**
+     * @returns current vehicle RPM value (speed)
+     */
+    public GetRPM(): f32;
+
+    /**
+     * Set current vehicle RPM value (speed).
+     *
+     * @param rpm - RPM value to apply
+     */
+    public SetRPM(rpm: f32): void;
+
+    public StopDamageParticles(): void;
+
     public engaged(): boolean;
 
     public Action(value1: u16, value2: u32): void;

package/types/xr_object/client/xr_physic.d.ts

@@ -1,4 +1,3 @@
-
 declare module "xray16" {
   /**
    * @source C++ class physics_element
@@ -194,8 +193,22 @@ declare module "xray16" {
   export class holder {
     public engaged(): boolean;
 
-    public Action(value1: u16, value2: u32): void;
+    public Action(id: u16, flags: u32): void;
+
+    public SetParam(id: i32, value: vector): void;
+
+    /**
+     * Set holder object enter state.
+     *
+     * @param is_enabled - whether holder object can be entered
+     */
+    public SetEnterLocked(is_enabled: boolean): void;
 
-    public SetParam(value: i32, vector: vector): void;
+    /**
+     * Set holder object exist state.
+     *
+     * @param is_enabled - whether holder object can be exited
+     */
+    public SetExitLocked(is_enabled: boolean): void;
   }
 }

package/types/xr_object/script/xr_script_interface.d.ts

@@ -54,11 +54,6 @@ declare module "xray16" {
    * @group xr_script_interface
    */
   export class callback {
-    /**
-     * Placeholder.
-     */
-    public static readonly dummy: -1;
-
     /**
      * Default x-ray 16 callbacks.
      */
@@ -98,28 +93,31 @@ declare module "xray16" {
     public static readonly trader_sound_end: 33;
     public static readonly take_item_from_box: 34;
     public static readonly weapon_no_ammo: 35;
-
-    /**
-     * Custom callbacks from open x-ray:
-     */
-    public static readonly key_press: 36;
-    public static readonly key_release: 37;
-    public static readonly key_hold: 38;
-    public static readonly mouse_move: 39;
-    public static readonly mouse_wheel: 40;
-    public static readonly controller_press: 41;
-    public static readonly controller_release: 42;
-    public static readonly controller_hold: 43;
-    public static readonly item_to_belt: 44;
-    public static readonly item_to_slot: 45;
-    public static readonly item_to_ruck: 46;
-    public static readonly actor_before_death: 47;
-    public static readonly on_attach_vehicle: 48;
-    public static readonly on_detach_vehicle: 49;
-    public static readonly on_use_vehicle: 50;
-    public static readonly weapon_zoom_in: 51;
-    public static readonly weapon_zoom_out: 52;
-    public static readonly weapon_jammed: 53;
+    public static readonly hud_animation_end: 36;
+
+    public static readonly key_press: 37;
+    public static readonly key_release: 38;
+    public static readonly key_hold: 39;
+    public static readonly mouse_move: 40;
+    public static readonly mouse_wheel: 41;
+    public static readonly controller_press: 42;
+    public static readonly controller_release: 43;
+    public static readonly controller_hold: 44;
+    // public static readonly controller_attitude_change: 45;
+
+    public static readonly item_to_belt: 46;
+    public static readonly item_to_slot: 47;
+    public static readonly item_to_ruck: 48;
+
+    public static readonly weapon_zoom_in: 49;
+    public static readonly weapon_zoom_out: 50;
+    public static readonly weapon_jammed: 51;
+    public static readonly weapon_magazine_empty: 52;
+
+    public static readonly actor_before_death: 53;
+    public static readonly on_attach_vehicle: 54;
+    public static readonly on_detach_vehicle: 55;
+    public static readonly on_use_vehicle: 56;
   }
 
   /**
@@ -251,13 +249,13 @@ declare module "xray16" {
       type: TXR_callbacks["hit"],
       cb?:
         | ((
-        this: void,
-        object: game_object,
-        damage: number,
-        direction: vector,
-        who: game_object,
-        bone_id: number
-      ) => void)
+            this: void,
+            object: game_object,
+            damage: number,
+            direction: vector,
+            who: game_object,
+            bone_id: number
+          ) => void)
         | null,
       object?: Maybe<T>
     ): void;
@@ -269,13 +267,13 @@ declare module "xray16" {
       type: TXR_callbacks["sound"],
       cb?:
         | ((
-        this: void,
-        object: game_object,
-        source_id: number,
-        sound_type: TXR_snd_type,
-        position: vector,
-        sound_power: number
-      ) => void)
+            this: void,
+            object: game_object,
+            source_id: number,
+            sound_type: TXR_snd_type,
+            position: vector,
+            sound_power: number
+          ) => void)
         | null,
       object?: Maybe<T>
     ): void;

package/types/xr_object/script/xr_script_object.d.ts

@@ -502,6 +502,8 @@ declare module "xray16" {
 
     public set_character_rank(value: i32): void;
 
+    public set_character_reputation(value: i32): void;
+
     public set_collision_off(value: boolean): void;
 
     public set_default_panic_threshold(): void;
@@ -620,6 +622,8 @@ declare module "xray16" {
 
     public change_goodwill(delta_goodwill: i32, to_object: game_object): void;
 
+    public change_character_rank(value: i32): void;
+
     public character_reputation(): i32;
 
     public community_goodwill(from_community: string): i32;
@@ -1302,24 +1306,85 @@ declare module "xray16" {
     public force_set_position(position: vector, bool: boolean): void;
 
     public get_ammo_count_for_type(type: u8): i32;
+
+    public weapon_in_grenade_mode(): boolean;
+
+    public is_entity_alive(): boolean;
+
+    public is_inventory_item(): boolean;
+
+    public is_inventory_owner(): boolean;
+
+    public is_actor(): boolean;
+
+    public is_custom_monster(): boolean;
+
+    public is_weapon(): boolean;
+
+    public is_outfit(): boolean;
+
+    public is_scope(): boolean;
+
+    public is_silencer(): boolean;
+
+    public is_grenade_launcher(): boolean;
+
+    public is_weapon_magazined(): boolean;
+
+    public is_space_restrictor(): boolean;
+
+    public is_stalker(): boolean;
+
+    public is_anomaly(): boolean;
+
+    public is_monster(): boolean;
+
+    public is_artefact(): boolean;
+
+    public is_ammo(): boolean;
+
+    public is_trader(): boolean;
+
+    public is_hud_item(): boolean;
+
+    public is_weapon_gl(): boolean;
+
+    public is_inventory_box(): boolean;
   }
 
   /*
-  * vector<MemorySpace::CNotYetVisibleObject,xalloc<MemorySpace::CNotYetVisibleObject> > not_yet_visible_objects();
-  * vector<MemorySpace::CSoundObject,xalloc<MemorySpace::CSoundObject>> memory_sound_objects();
-  * enum DetailPathManager::EDetailPathType detail_path_type();
-  * enum ETaskState get_task_state(char const*);
-  * enum MonsterSpace::EBodyState body_state();
-  * enum MonsterSpace::EBodyState target_body_state();
-  * enum MonsterSpace::EMentalState mental_state();
-  * enum MonsterSpace::EMentalState target_mental_state();
-  * enum MonsterSpace::EMovementType movement_type();
-  * enum MovementManager::EPathType path_type();
-  * remove_danger();
-  * remove_memory_sound_object();
-  * remove_memory_visible_object();
-  * remove_memory_hit_object();
-  * void iterate_feel_touch(function<void>);
-  * }
-  */
+   * vector<MemorySpace::CNotYetVisibleObject,xalloc<MemorySpace::CNotYetVisibleObject> > not_yet_visible_objects();
+   * vector<MemorySpace::CSoundObject,xalloc<MemorySpace::CSoundObject>> memory_sound_objects();
+   * enum DetailPathManager::EDetailPathType detail_path_type();
+   * enum ETaskState get_task_state(char const*);
+   * enum MonsterSpace::EBodyState body_state();
+   * enum MonsterSpace::EBodyState target_body_state();
+   * enum MonsterSpace::EMentalState mental_state();
+   * enum MonsterSpace::EMentalState target_mental_state();
+   * enum MonsterSpace::EMovementType movement_type();
+   * enum MovementManager::EPathType path_type();
+   * remove_danger();
+   * remove_memory_sound_object();
+   * remove_memory_visible_object();
+   * remove_memory_hit_object();
+   * void iterate_feel_touch(function<void>);
+   * }
+   *
+   * //.def("is_medkit", &CScriptGameObject::IsMedkit)
+   * //.def("is_eatable_item", &CScriptGameObject::IsEatableItem)
+   * //.def("is_antirad", &CScriptGameObject::IsAntirad)
+   * //.def("is_game_object", &CScriptGameObject::IsGameObject)
+   * //.def("is_car", &CScriptGameObject::IsCar)
+   * //.def("is_helicopter", &CScriptGameObject::IsHeli)
+   * //.def("is_holder", &CScriptGameObject::IsHolderCustom)
+   * //.def("is_explosive", &CScriptGameObject::IsExplosive)
+   * //.def("is_script_zone", &CScriptGameObject::IsScriptZone)
+   * //.def("is_projector", &CScriptGameObject::IsProjector)
+   * //.def("is_food_item", &CScriptGameObject::IsFoodItem)
+   * //.def("is_missile", &CScriptGameObject::IsMissile)
+   * //.def("is_physics_shell_holder", &CScriptGameObject::IsPhysicsShellHolder)
+   * //.def("is_grenade", &CScriptGameObject::IsGrenade)
+   * //.def("is_bottle_item", &CScriptGameObject::IsBottleItem)
+   * //.def("is_torch", &CScriptGameObject::IsTorch)
+   */
 }

package/types/xr_object/server/xr_server_object.d.ts

@@ -75,7 +75,11 @@ declare module "xray16" {
    * @source C++ class cse_alife_inventory_item
    * @group xr_object_server
    */
-  export interface IXR_cse_alife_inventory_item {}
+  export interface IXR_cse_alife_inventory_item {
+    has_upgrade(section: string): boolean;
+
+    add_upgrade(section: string): boolean;
+  }
 
   /**
    * @source C++ class cse_alife_object_breakable : cse_alife_dynamic_object_visual
@@ -343,6 +347,10 @@ declare module "xray16" {
    */
   export class cse_alife_item extends cse_alife_dynamic_object_visual implements IXR_cse_alife_inventory_item {
     public bfUseful(): boolean;
+
+    public has_upgrade(section: string): boolean;
+
+    public add_upgrade(section: string): boolean;
   }
 
   /**
@@ -354,6 +362,12 @@ declare module "xray16" {
    */
   export class cse_alife_item_weapon extends cse_alife_item {
     public clone_addons(cse_alife_item_weapon: cse_alife_item_weapon): void;
+
+    public set_ammo_elapsed(count: u16): void;
+
+    public get_ammo_elapsed(): u16;
+
+    public get_ammo_magsize(): u16;
   }
 
   /**
@@ -432,7 +446,7 @@ declare module "xray16" {
    * @customConstructor cse_alife_monster_rat
    * @group xr_object_server
    */
-  export class cse_alife_monster_rat extends cse_alife_monster_abstract implements IXR_cse_alife_inventory_item {}
+  export class cse_alife_monster_rat extends cse_alife_monster_abstract {}
 
   /**
    * @source C++ class cse_alife_monster_zombie : cse_alife_monster_abstract

package/types/xr_ui/xr_ui_core.d.ts

@@ -11,66 +11,68 @@ declare module "xray16" {
 
     public ParseShTexInfo(path: string): void;
 
-    public Init3tButton(selector: string, window: CUIWindow | null): CUI3tButton;
+    public Init3tButton(selector: string, parent: CUIWindow | null): CUI3tButton;
 
-    public InitAnimStatic(selector: string, window: CUIWindow | null): CUIStatic;
+    public InitAnimStatic(selector: string, parent: CUIWindow | null): CUIStatic;
 
-    public InitCDkey(selector: string, window: CUIWindow | null): CUIEditBox;
+    public InitCDkey(selector: string, parent: CUIWindow | null): CUIEditBox;
 
-    public InitCheck(selector: string, window: CUIWindow | null): CUICheckButton;
+    public InitCheck(selector: string, parent: CUIWindow | null): CUICheckButton;
 
-    public InitComboBox(selector: string, window: CUIWindow | null): CUIComboBox;
+    public InitComboBox(selector: string, parent: CUIWindow | null): CUIComboBox;
 
-    public InitEditBox(selector: string, window: CUIWindow | null): CUIEditBox;
+    public InitEditBox(selector: string, parent: CUIWindow | null): CUIEditBox;
 
-    public InitFrame(selector: string, window: CUIWindow | null): CUIFrameWindow;
+    public InitFrame(selector: string, parent: CUIWindow | null): CUIFrameWindow;
 
-    public InitFrameLine(selector: string, window: CUIWindow | null): CUIFrameLineWnd;
+    public InitFrameLine(selector: string, parent: CUIWindow | null): CUIFrameLineWnd;
 
-    public InitKeyBinding(selector: string, window: CUIWindow | null): CUIWindow;
+    public InitKeyBinding(selector: string, parent: CUIWindow | null): CUIWindow;
 
-    public InitLabel(selector: string, window: CUIWindow | null): CUIStatic;
+    public InitLabel(selector: string, parent: CUIWindow | null): CUIStatic;
 
-    public InitList(selector: string, window: CUIWindow | null): CUIListWnd;
+    public InitList(selector: string, parent: CUIWindow | null): CUIListWnd;
 
     public InitListBox<T extends CUIListBoxItem = CUIListBoxItem>(
       selector: string,
-      window: CUIWindow | null
+      parent: CUIWindow | null
     ): CUIListBox<T>;
 
-    public InitMMShniaga(selector: string, window: CUIWindow | null): CUIMMShniaga;
+    public InitMMShniaga(selector: string, parent: CUIWindow | null): CUIMMShniaga;
 
-    public InitMPPlayerName(selector: string, window: CUIWindow | null): CUIEditBox;
+    public InitMPPlayerName(selector: string, parent: CUIWindow | null): CUIEditBox;
 
-    public InitMapInfo(selector: string, window: CUIWindow | null): CUIMapInfo;
+    public InitMapInfo(selector: string, parent: CUIWindow | null): CUIMapInfo;
 
-    public InitMapList(selector: string, window: CUIWindow | null): CUIMapList;
+    public InitMapList(selector: string, parent: CUIWindow | null): CUIMapList;
 
-    public InitProgressBar(selector: string, window: CUIWindow | null): CUIProgressBar;
+    public InitProgressBar(selector: string, parent: CUIWindow | null): CUIProgressBar;
 
-    public InitScrollView(selector: string, window: CUIWindow | null): CUIScrollView;
+    public InitScrollView(selector: string, parent: CUIWindow | null): CUIScrollView;
 
-    public InitServerList(selector: string, window: CUIWindow | null): CServerList;
+    public InitServerList(selector: string, parent: CUIWindow | null): CServerList;
 
-    public InitSleepStatic(selector: string, window: CUIWindow | null): CUISleepStatic;
+    public InitSleepStatic(selector: string, parent: CUIWindow | null): CUISleepStatic;
 
-    public InitSpinFlt(selector: string, window: CUIWindow | null): CUISpinFlt;
+    public InitSpinFlt(selector: string, parent: CUIWindow | null): CUISpinFlt;
 
-    public InitSpinNum(selector: string, window: CUIWindow | null): CUISpinNum;
+    public InitSpinNum(selector: string, parent: CUIWindow | null): CUISpinNum;
 
-    public InitSpinText(selector: string, window: CUIWindow | null): CUISpinText;
+    public InitSpinText(selector: string, parent: CUIWindow | null): CUISpinText;
 
-    public InitStatic(selector: string, window: CUIWindow | null): CUIStatic;
+    public InitStatic(selector: string, parent: CUIWindow | null): CUIStatic;
 
-    public InitTab(selector: string, window: CUIWindow | null): CUITabControl;
+    public InitTab(selector: string, parent: CUIWindow | null): CUITabControl;
 
-    public InitTextWnd(selector: string, window: CUIWindow | null): CUITextWnd;
+    public InitTextWnd(selector: string, parent: CUIWindow | null): CUITextWnd;
 
-    public InitTrackBar(selector: string, window: CUIWindow | null): CUITrackBar;
+    public InitTrackBar(selector: string, parent: CUIWindow | null): CUITrackBar;
 
-    public InitVerList(selector: string, window: CUIWindow | null): CUIVersionList;
+    public InitVerList(selector: string, parent: CUIWindow | null): CUIVersionList;
 
-    public InitWindow(selector: string, index: i32, window: CUIWindow | null): void;
+    public InitHint(selector: string, parent: CUIWindow | null): UIHint;
+
+    public InitWindow(selector: string, index: i32, parent: CUIWindow | null): void;
   }
 
   /**

package/types/xr_ui/xr_ui_event.d.ts

@@ -378,5 +378,4 @@ declare module "xray16" {
    * @group xr_ui_event
    */
   export function dik_to_bind(this: void, keycode: i32): i32;
-
 }

package/types/xr_ui/xr_ui_interface.d.ts

@@ -1,3 +1,5 @@
+import { vector2 } from "xray16";
+
 declare module "xray16" {
   /**
    * @source C++ class CUIWindow
@@ -152,6 +154,12 @@ declare module "xray16" {
     public SetVertScroll(enabled: boolean): void;
 
     public SetCurrentID(id: i32): void;
+
+    public SetCurrentIdx(index: u32): void;
+
+    public GetCurrentIdx(): u32;
+
+    public SetCurrentValue(): void;
   }
 
   /**
@@ -449,7 +457,7 @@ declare module "xray16" {
 
     public GetRange_min(): f32;
 
-    public SetProgressPos(value: f32): void;
+    public SetProgressPos(position: f32): void;
 
     public GetProgressPos(): f32;
   }
@@ -469,6 +477,10 @@ declare module "xray16" {
     public Show(show: boolean): void;
 
     public Show(int1: i32, int2: i32): void;
+
+    public GetSelectedItem(): CUIListBoxItem;
+
+    public InitPropertiesBox(position: vector2, size: vector2): void;
   }
 
   /**
@@ -551,6 +563,8 @@ declare module "xray16" {
   export class CUIStatic extends CUIWindow {
     public GetColor(): u32;
 
+    public SetColor(color: u32): void;
+
     public TextControl(): CUILines;
 
     public GetTextureRect(): Frect;
@@ -565,6 +579,10 @@ declare module "xray16" {
 
     public SetTextColor(r: i32, g: i32, b: i32, a: i32): void;
 
+    public SetTextureColor(color: u32): void;
+
+    public GetTextureColor(): u32;
+
     public SetHeading(number: f32): void;
 
     public SetTextST(string: string): void;
@@ -587,8 +605,6 @@ declare module "xray16" {
 
     public SetTextureOffset(x: f32, y: f32): void;
 
-    public SetColor(color: u32): void;
-
     public SetElipsis(a: i32, b: i32): void;
 
     public GetHeading(): f32;
@@ -829,6 +845,10 @@ declare module "xray16" {
     public GetActiveSection(): string;
 
     public GetTabControl(): CUITabControl;
+
+    public SetActiveDialog(dialog: CUIWindow | null): void;
+
+    public GetActiveDialog(): CUIWindow | null;
   }
 
   /**
@@ -850,6 +870,10 @@ declare module "xray16" {
     ): void;
 
     public refresh_current_cell_item(): void;
+
+    public ToSlot(object: game_object, force_place: boolean, slot_id: u16): boolean;
+
+    public ToBelt(object: game_object, use_cursor_position: boolean): boolean;
   }
 
   /**