@nativewrappers/redm-codegen 0.0.2 → 0.0.3

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()));
+  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(): string | 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);
+  getLocationAndNamehash(): [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());
+  getPosition(): Vector3 {
+    return Vector3.fromArray(inv<number[]>('0x2C9746D0CA15BE1C', this.handle, rav()));
   }
 
   /**
-   * @param toggle 
+   * @returns
    */
-  disableInterior(toggle: boolean): void {
-    inv<void>('0x3C2B92A1A07D4FCE', this.handle, toggle);
+  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);
+  getMinimapHash(): 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/Ped.ts

@@ -27,90 +27,9 @@ export class Ped extends Entity {
     return handle === 0 ? null : new Ped(handle);
   }
 
-  /**
-   * @returns
-   */
-  isOnFoot(): boolean {
-    return inv<boolean>('0x01FEE67DB37F59B2', this.handle, rai());
-  }
-
-  /**
-   * Only used in R* Script nb_stalking_hunter
-   *
-   * @param ped2 
-   */
-  N_0xED1C764997A86D5A(ped2: Ped): void {
-    inv<void>('0xED1C764997A86D5A', this.handle, ped2.handle);
-  }
-
-  /**
-   * @param grappleSequence 
-   */
-  setGrappleSequence(grappleSequence: string | null): void {
-    inv<void>('0x604190F0CF0DF158', this.handle, grappleSequence);
-  }
-
-  /**
-   * @param p1 
-   */
-  N_0xFFA1594703ED27CA(p1: number): void {
-    inv<void>('0xFFA1594703ED27CA', this.handle, p1);
-  }
-
-  /**
-   * @returns
-   */
-  getMeleeTargetForPed(): Ped | null {
-    return createFromHandle<Ped>('Ped', inv<number>('0x18A3E9EE1297FD39', this.handle, rai()));
-  }
-
-  /**
-   * Use to apply metaped player components
-   * Replaces asset, alternatively you can remove assets using REMOVE_TAG_FROM_META_PED
-   *
-   * @param drawable 
-   * @param albedo 
-   * @param normal 
-   * @param material 
-   * @param palette 
-   * @param tint0 
-   * @param tint1 
-   * @param tint2 
-   */
-  setMetaTag(drawable: string | number, albedo: string | number, normal: string | number, material: string | number, palette: string | number, tint0: number, tint1: number, tint2: number): void {
-    inv<void>('0xBC6DF00D7A4A6819', this.handle, _h(drawable), _h(albedo), _h(normal), _h(material), _h(palette), tint0, tint1, tint2);
-  }
-
-  /**
-   * @param p1 
-   * @param p2 
-   */
-  N_0x32CEDA9A0AB4CEF7(p1: string | number, p2: boolean): void {
-    inv<void>('0x32CEDA9A0AB4CEF7', this.handle, _h(p1), p2);
-  }
-
-  /**
-   * @returns
-   */
-  isChild(): any {
-    return inv<number>('0x137772000DAF42C5', this.handle);
-  }
-
-  /**
-   * @param index 
-   * @param p2 
-   * @returns argStruct; argStruct2
-   */
-  getShopItemComponentAtIndex(index: number, p2: boolean): [string | number, number, number] {
-    const result = inv<[number, number, number]>('0x77BA37622E22023B', this.handle, index, p2, pvi(), pvi(), rai());
-    return [result[0] & 0xFFFFFFFF, result[1], result[2]];
-  }
-
-  /**
-   * @param value 
-   */
-  setMaxMoveBlendRatio(value: number): void {
-    inv<void>('0x433083750C5E064A', this.handle, f(value));
+  static fromNetworkId(netId: number): Ped | null {
+    if (!inv<number>('0x38CE16C96BD11F2C', netId, rai())) return null;
+    return Ped.fromHandle(inv<number>('0x5B912C3F653822E6', netId, rai()));
   }
 
   /**
@@ -154,7 +73,7 @@ export class Ped extends Entity {
   /**
    * @returns
    */
-  getMetaOutfitHash(): string | number {
+  getMetaOutfitHash(): number {
     return (inv<number>('0x30569F348D126A5A', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -2500,7 +2419,7 @@ export class Ped extends Entity {
   /**
    * @returns
    */
-  getRelationshipGroupHash(): string | number {
+  getRelationshipGroupHash(): number {
     return (inv<number>('0x7DBDD04862D95F04', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -2817,7 +2736,7 @@ export class Ped extends Entity {
   /**
    * @returns
    */
-  getGrappleStyle(): string | number {
+  getGrappleStyle(): number {
     return (inv<number>('0x753B15AD0FD6F3E3', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -3129,7 +3048,7 @@ export class Ped extends Entity {
   /**
    * @returns
    */
-  getInteractionPersonality(): string | number {
+  getInteractionPersonality(): number {
     return (inv<number>('0xD7AD3C7EBAF88C92', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -3453,7 +3372,7 @@ export class Ped extends Entity {
   /**
    * @returns
    */
-  getRelationshipGroupDefaultHash(): string | number {
+  getRelationshipGroupDefaultHash(): number {
     return (inv<number>('0x42FDD0F017B1E38E', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -3740,7 +3659,7 @@ export class Ped extends Entity {
    * @param index 
    * @returns
    */
-  getComponentCategoryByIndex(index: number): string | number {
+  getComponentCategoryByIndex(index: number): number {
     return (inv<number>('0xCCB97B51893C662F', this.handle, index, rai())) & 0xFFFFFFFF;
   }
 
@@ -4386,7 +4305,7 @@ export class Ped extends Entity {
    *
    * @returns
    */
-  getActiveDynamicScenario2(): string | number {
+  getActiveDynamicScenario2(): number {
     return (inv<number>('0xC22AA08A8ADB87D4', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -5269,7 +5188,7 @@ export class Ped extends Entity {
   /**
    * @returns
    */
-  getBrawlingStyle(): string | number {
+  getBrawlingStyle(): number {
     return (inv<number>('0xEC6B59BE445FEC51', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -5593,7 +5512,7 @@ export class Ped extends Entity {
    *
    * @returns
    */
-  getActiveDynamicScenario(): string | number {
+  getActiveDynamicScenario(): number {
     return (inv<number>('0x569F1E1237508DEB', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -5688,7 +5607,7 @@ export class Ped extends Entity {
    *
    * @returns
    */
-  getCauseOfDeath(): string | number {
+  getCauseOfDeath(): number {
     return (inv<number>('0x16FFE42AB2D2DC59', this.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -6104,7 +6023,7 @@ export class Ped extends Entity {
    * @param variableName 
    * @returns
    */
-  getBlackboardHash(variableName: string | null): string | number {
+  getBlackboardHash(variableName: string | null): number {
     return (inv<number>('0xBF5E791BBBF90A3C', this.handle, variableName, rai())) & 0xFFFFFFFF;
   }
 
@@ -6450,6 +6369,92 @@ export class Ped extends Entity {
     return createFromHandle<Ped>('Ped', inv<number>('0x4B19F171450E0D4F', this.handle, rai()));
   }
 
+  /**
+   * @returns
+   */
+  isOnFoot(): boolean {
+    return inv<boolean>('0x01FEE67DB37F59B2', this.handle, rai());
+  }
+
+  /**
+   * Only used in R* Script nb_stalking_hunter
+   *
+   * @param ped2 
+   */
+  N_0xED1C764997A86D5A(ped2: Ped): void {
+    inv<void>('0xED1C764997A86D5A', this.handle, ped2.handle);
+  }
+
+  /**
+   * @param grappleSequence 
+   */
+  setGrappleSequence(grappleSequence: string | null): void {
+    inv<void>('0x604190F0CF0DF158', this.handle, grappleSequence);
+  }
+
+  /**
+   * @param p1 
+   */
+  N_0xFFA1594703ED27CA(p1: number): void {
+    inv<void>('0xFFA1594703ED27CA', this.handle, p1);
+  }
+
+  /**
+   * @returns
+   */
+  getMeleeTargetForPed(): Ped | null {
+    return createFromHandle<Ped>('Ped', inv<number>('0x18A3E9EE1297FD39', this.handle, rai()));
+  }
+
+  /**
+   * Use to apply metaped player components
+   * Replaces asset, alternatively you can remove assets using REMOVE_TAG_FROM_META_PED
+   *
+   * @param drawable 
+   * @param albedo 
+   * @param normal 
+   * @param material 
+   * @param palette 
+   * @param tint0 
+   * @param tint1 
+   * @param tint2 
+   */
+  setMetaTag(drawable: string | number, albedo: string | number, normal: string | number, material: string | number, palette: string | number, tint0: number, tint1: number, tint2: number): void {
+    inv<void>('0xBC6DF00D7A4A6819', this.handle, _h(drawable), _h(albedo), _h(normal), _h(material), _h(palette), tint0, tint1, tint2);
+  }
+
+  /**
+   * @param p1 
+   * @param p2 
+   */
+  N_0x32CEDA9A0AB4CEF7(p1: string | number, p2: boolean): void {
+    inv<void>('0x32CEDA9A0AB4CEF7', this.handle, _h(p1), p2);
+  }
+
+  /**
+   * @returns
+   */
+  isChild(): any {
+    return inv<number>('0x137772000DAF42C5', this.handle);
+  }
+
+  /**
+   * @param index 
+   * @param p2 
+   * @returns argStruct; argStruct2
+   */
+  getShopItemComponentAtIndex(index: number, p2: boolean): [number, number, number] {
+    const result = inv<[number, number, number]>('0x77BA37622E22023B', this.handle, index, p2, pvi(), pvi(), rai());
+    return [result[0] & 0xFFFFFFFF, result[1], result[2]];
+  }
+
+  /**
+   * @param value 
+   */
+  setMaxMoveBlendRatio(value: number): void {
+    inv<void>('0x433083750C5E064A', this.handle, f(value));
+  }
+
 
   private _task?: PedTask;
   private _weapon?: Weapon;