diff --git a/ts-lua/types/2take1.d.ts b/ts-lua/types/2take1.d.ts index 5436ecf..fd97d60 100644 --- a/ts-lua/types/2take1.d.ts +++ b/ts-lua/types/2take1.d.ts @@ -3,15 +3,15 @@ * @public */ -type Player = number; type Entity = number; -type Ped = number; -type Vehicle = number; +type Ped = Entity; +type Player = Ped; +type Vehicle = Entity; type Group = number; type Hash = number; type Pickup = Hash; type Ptfx = number; -type Any = number; + type Thread = number; type Feature = number; diff --git a/ts-lua/types/RAGE/AI.d.ts b/ts-lua/types/RAGE/AI.d.ts index 7f0117b..3badc40 100644 --- a/ts-lua/types/RAGE/AI.d.ts +++ b/ts-lua/types/RAGE/AI.d.ts @@ -446,7 +446,7 @@ declare namespace ai { function task_goto_entity(e: Entity, target: Entity, duration: int, distance: float, speed: float): void; function task_combat_ped(ped: Ped, target: Ped, a3: int, a4: int): boolean; - function task_go_to_coord_by_any_means(ped: Ped, coords: v3, speed: float, p4: Any, p5: boolean, walkStyle: int, a7: float): Any; + function task_go_to_coord_by_any_means(ped: Ped, coords: v3, speed: float, p4: any, p5: boolean, walkStyle: int, a7: float): any; function task_wander_standard(ped: Ped, unk0: float, unk1: boolean): boolean; function task_vehicle_drive_wander(ped: Ped, vehicle: Vehicle, speed: float, driveStyle: int): void; function task_start_scenario_in_place(ped: Ped, name: string, unkDelay: int, playEnterAnim: boolean): void; @@ -474,12 +474,12 @@ declare namespace ai { function task_vehicle_aim_at_coord(ped: Ped, coord: v3): void; function task_vehicle_aim_at_ped(ped: Ped, target: Ped): void; function task_stay_in_cover(ped: Ped): void; - function task_go_to_coord_while_aiming_at_coord(ped: Ped, gotoCoord: v3, aimCoord: v3, moveSpeed: float, a5: boolean, a6: float, a7: float, a8: boolean, flags: Any, a10: boolean, firingPattern: Hash): void; - function task_go_to_coord_while_aiming_at_entity(ped: Ped, gotoCoord: v3, target: Entity, moveSpeed: float, a5: boolean, a6: float, a7: float, a8: boolean, flags: Any, a10: boolean, firingPattern: Hash): void; + function task_go_to_coord_while_aiming_at_coord(ped: Ped, gotoCoord: v3, aimCoord: v3, moveSpeed: float, a5: boolean, a6: float, a7: float, a8: boolean, flags: any, a10: boolean, firingPattern: Hash): void; + function task_go_to_coord_while_aiming_at_entity(ped: Ped, gotoCoord: v3, target: Entity, moveSpeed: float, a5: boolean, a6: float, a7: float, a8: boolean, flags: any, a10: boolean, firingPattern: Hash): void; function task_go_to_entity_while_aming_at_coord(ped: Ped, gotoEntity: Entity, aimCoord: v3, a4: float, shoot: boolean, a6: float, a7: float, a8: boolean, a9: boolean, firingPattern: Hash): void; function task_go_to_entity_while_aiming_at_entity(ped: Ped, gotoEntity: Entity, target: Entity, a4: float, shoot: boolean, a6: float, a7: float, a8: boolean, a9: boolean, firingPattern: Hash): void; function task_open_vehicle_door(ped: Ped, vehicle: Vehicle, timeOut: int, doorIndex: int, speed: float): void; - function task_enter_vehicle(ped: Ped, vehicle: Vehicle, timeout: int, seat: int, speed: float, flag: uint32_t, p6: Any): void; + function task_enter_vehicle(ped: Ped, vehicle: Vehicle, timeout: int, seat: int, speed: float, flag: uint32_t, p6: any): void; function task_leave_vehicle(ped: Ped, vehicle: Vehicle, flag: uint32_t): void; function task_sky_dive(ped: Ped, a2: boolean): void; function task_parachute(ped: Ped, a2: boolean, a3: boolean): void; @@ -494,7 +494,7 @@ declare namespace ai { function task_aim_gun_at_coord(ped: Ped, coord: v3, time: int, a4: boolean, a5: boolean): void; function task_turn_ped_to_face_entity(ped: Ped, entity: Entity, duration: int): void; function task_aim_gun_at_entity(ped: Ped, entity: Entity, duration: int, a4: boolean): void; - function is_task_active(ped: Ped, taskId: Any): boolean; + function is_task_active(ped: Ped, taskId: any): boolean; } diff --git a/ts-lua/types/RAGE/Audio.d.ts b/ts-lua/types/RAGE/Audio.d.ts index 3f92240..07bb296 100644 --- a/ts-lua/types/RAGE/Audio.d.ts +++ b/ts-lua/types/RAGE/Audio.d.ts @@ -5,7 +5,7 @@ */ declare namespace audio { - function play_sound(soundId: int, audioName: string, audioRef: string, p4: boolean, p5: Any, p6: boolean): void; + function play_sound(soundId: int, audioName: string, audioRef: string, p4: boolean, p5: any, p6: boolean): void; function play_sound_frontend(soundId: int, audioName: string, audioRef: string, p4: boolean): void; function play_sound_from_entity(soundId: int, audioName: string, entity: Entity, audioRef: string): void; function play_sound_from_coord(soundId: int, audioName: string, pos: v3, audioRef: string, a5: boolean, range: int, a7: boolean): void; diff --git a/ts-lua/types/RAGE/Graphics.d.ts b/ts-lua/types/RAGE/Graphics.d.ts index 73c8fc7..927538f 100644 --- a/ts-lua/types/RAGE/Graphics.d.ts +++ b/ts-lua/types/RAGE/Graphics.d.ts @@ -32,24 +32,24 @@ declare namespace graphics { function animpostfx_stop(effect: Hash): void; function animpostfx_is_running(effect: Hash): boolean; function animpostfx_stop_all(): void; - function request_scaleform_movie(szName: string): Any; - function begin_scaleform_movie_method(scaleform: Any, szMethod: string): boolean; + function request_scaleform_movie(szName: string): any; + function begin_scaleform_movie_method(scaleform: any, szMethod: string): boolean; function scaleform_movie_method_add_param_texture_name_string(val: string): void; function scaleform_movie_method_add_param_int(val: int32_t): void; function scaleform_movie_method_add_param_float(val: float): void; function scaleform_movie_method_add_param_boolean(val: boolean): void; - function draw_scaleform_movie_fullscreen(scaleform: Any, r: int, g: int, b: int, a: int, a6: int): void; - function draw_scaleform_movie(scaleform: Any, x: float, y: float, w: float, h: float, r: int, g: int, b: int, a: int, a10: int): void; + function draw_scaleform_movie_fullscreen(scaleform: any, r: int, g: int, b: int, a: int, a6: int): void; + function draw_scaleform_movie(scaleform: any, x: float, y: float, w: float, h: float, r: int, g: int, b: int, a: int, a10: int): void; function end_scaleform_movie_method(): void; - function draw_marker(type: Any, pos: v3, dir: v3, rot: v3, scale: v3, red: int, green: int, blue: int, alpha: int, bobUpAndDown: boolean, faceCam: boolean, a12: int, rotate: boolean, textureDict: string|null, textureName: string|null, drawOntEnts: boolean): void; - function create_checkpoint(type: Any, thisPos: v3, nextPos: v3, radius: float, red: int, green: int, blue: int, alpha: int, reserved: int): Any; - function set_checkpoint_icon_height(checkpoint: Any, height: float): void; - function set_checkpoint_cylinder_height(checkpoint: Any, nearHeight: float, farHeight: float, radius: float): void; - function set_checkpoint_rgba(checkpoint: Any, r: int, g: int, b: int, a: int): void; - function set_checkpoint_icon_rgba(checkpoint: Any, r: int, g: int, b: int, a: int): void; - function delete_checkpoint(checkpoint: Any): void; - function has_scaleform_movie_loaded(scaleform: Any): boolean; - function set_scaleform_movie_as_no_longer_needed(scaleform: Any): void; + function draw_marker(type: any, pos: v3, dir: v3, rot: v3, scale: v3, red: int, green: int, blue: int, alpha: int, bobUpAndDown: boolean, faceCam: boolean, a12: int, rotate: boolean, textureDict: string|null, textureName: string|null, drawOntEnts: boolean): void; + function create_checkpoint(type: any, thisPos: v3, nextPos: v3, radius: float, red: int, green: int, blue: int, alpha: int, reserved: int): any; + function set_checkpoint_icon_height(checkpoint: any, height: float): void; + function set_checkpoint_cylinder_height(checkpoint: any, nearHeight: float, farHeight: float, radius: float): void; + function set_checkpoint_rgba(checkpoint: any, r: int, g: int, b: int, a: int): void; + function set_checkpoint_icon_rgba(checkpoint: any, r: int, g: int, b: int, a: int): void; + function delete_checkpoint(checkpoint: any): void; + function has_scaleform_movie_loaded(scaleform: any): boolean; + function set_scaleform_movie_as_no_longer_needed(scaleform: any): void; } diff --git a/ts-lua/types/RAGE/Interior.d.ts b/ts-lua/types/RAGE/Interior.d.ts index 204c205..8b93f69 100644 --- a/ts-lua/types/RAGE/Interior.d.ts +++ b/ts-lua/types/RAGE/Interior.d.ts @@ -5,11 +5,11 @@ */ declare namespace interior { - function get_interior_from_entity(entity: Entity): Any; - function get_interior_at_coords_with_type(coords: v3, interiorType: string): Any; - function enable_interior_prop(id: Any, prop: string): void; - function disable_interior_prop(id: Any, prop: string): void; - function refresh_interior(id: Any): void; + function get_interior_from_entity(entity: Entity): any; + function get_interior_at_coords_with_type(coords: v3, interiorType: string): any; + function enable_interior_prop(id: any, prop: string): void; + function disable_interior_prop(id: any, prop: string): void; + function refresh_interior(id: any): void; } diff --git a/ts-lua/types/RAGE/Vehicle.d.ts b/ts-lua/types/RAGE/Vehicle.d.ts index c962a9a..90c5bc5 100644 --- a/ts-lua/types/RAGE/Vehicle.d.ts +++ b/ts-lua/types/RAGE/Vehicle.d.ts @@ -108,7 +108,13 @@ declare namespace vehicle { function get_livery_name(veh: Vehicle, livery: int32_t): string; function set_vehicle_window_tint(veh: Vehicle, t: int32_t): void; function get_vehicle_window_tint(veh: Vehicle): int32_t; + /** + * gets the model hash of every vehicle type + */ function get_all_vehicle_model_hashes(): vector; + /** + * gets all vehicle objects loaded, like traffic or personal vehicles + */ function get_all_vehicles(): vector; function modify_vehicle_top_speed(veh: Vehicle, f: float): void; function set_vehicle_engine_torque_multiplier_this_frame(veh: Vehicle, f: float): void;