@nativewrappers/redm-codegen 0.0.4 → 0.0.5

package/src/classes/Interior.ts

@@ -14,100 +14,100 @@ export class Interior implements IHandle {
   }
 
   /**
+   * https://github.com/femga/rdr3_discoveries/tree/master/interiors/interior_sets
+   *
    * @param entitySetName 
-   * @returns
+   * @param p2 
    */
-  isEntitySetActive(entitySetName: string | null): boolean {
-    return inv<boolean>('0x32810CA2125F5842', this.handle, entitySetName, rai());
-  }
-
-  pinInMemory(): void {
-    inv<void>('0xBD3D33EABF680168', this.handle);
+  activateEntitySet(entitySetName: string | null, p2: number): void {
+    inv<void>('0x174D0AAB11CED739', this.handle, entitySetName, p2);
   }
 
   /**
    * @returns
    */
-  getPosition(): Vector3 {
-    return Vector3.fromArray(inv<number[]>('0x2C9746D0CA15BE1C', this.handle, rav()));
+  get IsReady(): boolean {
+    return !!inv<boolean>('0x941560D2D45DBFC8', this.handle, rai());
   }
 
   /**
-   * @returns
+   * @param toggle 
    */
-  isValidInterior(): boolean {
-    return inv<boolean>('0x017C1B3159F79F6C', this.handle, rai());
+  disableInterior(toggle: boolean): void {
+    inv<void>('0x3C2B92A1A07D4FCE', this.handle, toggle);
   }
 
   /**
+   * Actually returns void in IDA but the script header defines a BOOL return type
+   *
    * @returns
    */
-  getMinimapHash(): number {
-    return (inv<number>('0x3039BE60B3749716', this.handle, rai())) & 0xFFFFFFFF;
+  setInUse(): any {
+    return inv<number>('0xB5EF6FEF2DC9EBED', this.handle);
   }
 
   /**
-   * @param entitySetName 
-   * @param p2 
+   * Does something similar to INTERIOR::DISABLE_INTERIOR. You don't fall through the floor but everything is invisible inside and looks the same as when INTERIOR::DISABLE_INTERIOR is used. Peds behaves normally inside.
    */
-  deactivateEntitySet(entitySetName: string | null, p2: boolean): void {
-    inv<void>('0x33B81A2C07A51FFF', this.handle, entitySetName, p2);
+  unpinInterior(): void {
+    inv<void>('0x07FD1A0B814F6055', this.handle);
   }
 
   /**
-   * @param entitySetName 
-   * @returns
+   * @returns position; nameHash
    */
-  isEntitySetValid(entitySetName: string | null): any {
-    return inv<number>('0xD56FF170710FC826', this.handle, entitySetName);
+  get LocationAndNamehash(): [Vector3, number] {
+    const result = inv<[number[], number]>('0x8451E87D3C2B0286', this.handle, pvv(), pvi());
+    return [Vector3.fromArray(result[0]), result[1]];
   }
 
   /**
-   * https://github.com/femga/rdr3_discoveries/tree/master/interiors/interior_sets
-   *
    * @param entitySetName 
-   * @param p2 
+   * @returns
    */
-  activateEntitySet(entitySetName: string | null, p2: number): void {
-    inv<void>('0x174D0AAB11CED739', this.handle, entitySetName, p2);
+  isEntitySetActive(entitySetName: string | null): boolean {
+    return !!inv<boolean>('0x32810CA2125F5842', this.handle, entitySetName, rai());
+  }
+
+  pinInMemory(): void {
+    inv<void>('0xBD3D33EABF680168', this.handle);
   }
 
   /**
    * @returns
    */
-  isReady(): boolean {
-    return inv<boolean>('0x941560D2D45DBFC8', this.handle, rai());
+  get Position(): Vector3 {
+    return Vector3.fromArray(inv<number[]>('0x2C9746D0CA15BE1C', this.handle, rav()));
   }
 
   /**
-   * @param toggle 
+   * @returns
    */
-  disableInterior(toggle: boolean): void {
-    inv<void>('0x3C2B92A1A07D4FCE', this.handle, toggle);
+  get IsValidInterior(): boolean {
+    return !!inv<boolean>('0x017C1B3159F79F6C', this.handle, rai());
   }
 
   /**
-   * Actually returns void in IDA but the script header defines a BOOL return type
-   *
    * @returns
    */
-  setInUse(): any {
-    return inv<number>('0xB5EF6FEF2DC9EBED', this.handle);
+  get MinimapHash(): number {
+    return (inv<number>('0x3039BE60B3749716', this.handle, rai())) & 0xFFFFFFFF;
   }
 
   /**
-   * Does something similar to INTERIOR::DISABLE_INTERIOR. You don't fall through the floor but everything is invisible inside and looks the same as when INTERIOR::DISABLE_INTERIOR is used. Peds behaves normally inside.
+   * @param entitySetName 
+   * @param p2 
    */
-  unpinInterior(): void {
-    inv<void>('0x07FD1A0B814F6055', this.handle);
+  deactivateEntitySet(entitySetName: string | null, p2: boolean): void {
+    inv<void>('0x33B81A2C07A51FFF', this.handle, entitySetName, p2);
   }
 
   /**
-   * @returns position; nameHash
+   * @param entitySetName 
+   * @returns
    */
-  getLocationAndNamehash(): [Vector3, number] {
-    const result = inv<[number[], number]>('0x8451E87D3C2B0286', this.handle, pvv(), pvi());
-    return [Vector3.fromArray(result[0]), result[1]];
+  isEntitySetValid(entitySetName: string | null): any {
+    return inv<number>('0xD56FF170710FC826', this.handle, entitySetName);
   }
 
 }

package/src/classes/ItemSet.ts

@@ -28,14 +28,14 @@ export class ItemSet implements IHandle {
   /**
    * @returns
    */
-  isValid(): boolean {
-    return inv<boolean>('0xD30765D153EF5C76', this.handle, rai());
+  get IsValid(): boolean {
+    return !!inv<boolean>('0xD30765D153EF5C76', this.handle, rai());
   }
 
   /**
    * @returns
    */
-  getSize(): number {
+  get Size(): number {
     return inv<number>('0x55F2E375AC6018A9', this.handle, rai());
   }