Merge pull request #82 from shr0x/main

Vehicle, entity & ped updates

Author: shr0x

packages/client/game/entity.d.ts

@@ -351,6 +351,7 @@ declare interface GameEntity extends GameEntityLegacy {
 	setRotation(entity: number, pitch: number, roll: number, yaw: number, rotationOrder: number, p5: boolean): void;
 	setVisible(entity: number, toggle: boolean, unk: boolean): void;
 	setVelocity(entity: number, x: number, y: number, z: number): void;
+	setAngularVelocity(entity:number, x: number, y: number, z: number): void;
 	setHasGravity(entity: number, toggle: boolean): void;
 	setLodDist(entity: number, value: number): void;
 	getLodDist(entity: number): number;

packages/client/game/hud.d.ts

@@ -853,7 +853,18 @@ declare interface GameHud extends GameHudLegacy {
 	getCurrentStreetNameHash(): number;
 	setShowHudComponentsThisFrameBatch(show: boolean, hudComponents: RageEnums.Hud.Component[]): void;
 	applyShowHudComponentsThisFrameBatch(): void;
-
+	getBlipFadeStatus(blip: Handle): number;
+	getBlipRotation(blip: Handle): number;
+	setBlipAsMinimalOnEdge(blip: Handle, p1: boolean): void;
+	setInteriorZoomLevelIncreased(toggle: boolean): void;
+	setInteriorZoomLevelDecreased(toggle: boolean): void;
+	setMainPlayerBlipColour(color: number): void;
+	customMinimapSetActive(lock: boolean): void;
+	customMinimapSetBlipObject(spriteId: number): void;
+	customMinimapCreateBlip(x: number, y: number, z: number): Handle;
+	customMinimapClearBlips(): void;
+	enableDeathbloodSeethrough(p1: number): void;
+	endTextComponent(): void;
 	unk: GameHudUnk;
 }
 

packages/client/game/vehicle.d.ts

@@ -146,14 +146,14 @@ declare interface GameVehicleLegacy {
 	skipToEndAndStopPlaybackRecordedVehicle(vehicle: number): void;
 	startPlaybackRecordedVehicleUsingAi(vehicle: number, recording: number, script: string, speed: number, drivingStyle: number): void;
 	skipTimeInPlaybackRecordedVehicle(vehicle: number, time: number): void;
-	addVehicleStuckCheckWithWarp(p0: number, p1: number, p2: number, p3: boolean, p4: boolean, p5: boolean, p6: number): void;
+	addVehicleStuckCheckWithWarp(vehicle: Handle, minMoveDist: number, checkFreq: number, wrapIfStucked: boolean, wrapIfUpsideDown: boolean, wrapIfInWater: boolean, wrapMethod: number): void;
 	setVehicleModelIsSuppressed(model: number, suppressed: boolean): void;
 	getRandomVehicleInSphere(x: number, y: number, z: number, radius: number, modelHash: number, flags: number): number;
-	getRandomVehicleFrontBumperInSphere(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number): number;
-	getRandomVehicleBackBumperInSphere(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number): number;
+	getRandomVehicleFrontBumperInSphere(x: number, y: number, z: number, radius: number, model: Hash, searchFlag: number, ignoreVehicle: Handle): number;
+	getRandomVehicleBackBumperInSphere(x: number, y: number, z: number, radius: number, model: Hash, searchFlag: number, ignoreVehicle: Handle): number;
 	getClosestVehicle(x: number, y: number, z: number, radius: number, modelHash: number, flags: number): number;
 	isThisModelAnEmergencyBoat(model: number): boolean;
-	getRandomVehicleModelInMemory(p0: boolean): GetRandomVehicleModelInMemoryResult;
+	getRandomVehicleModelInMemory(normalCars: boolean): GetRandomVehicleModelInMemoryResult;
 	setVehicleDamage(vehicle: number, xOffset: number, yOffset: number, zOffset: number, damage: number, radius: number, focusOnModel: boolean): void;
 	getDisplayNameFromVehicleModel(modelHash: number): string;
 	isAnyVehicleNearPoint(x: number, y: number, z: number, radius: number): boolean;
@@ -170,7 +170,7 @@ declare interface GameVehicleLegacy {
 	getVehicleClassMaxBraking(vehicleClass: number): number;
 	setVehicleMod(vehicle: number, modType: number, modIndex: number, customTires: boolean): void;
 	getVehicleMod(vehicle: number, modType: number): number;
-	preloadVehicleMod(p0: number, modType: number, p2: number): void;
+	preloadVehicleMod(vehicle: Handle, modType: number, modIndex: number): void;
 	setVehicleShootAtTarget(driver: number, entity: number, xTarget: number, yTarget: number, zTarget: number): void;
 	setCargobobHookPosition(cargobob: number, length1: number, length2: number, p3: boolean): void;
 	disableVehicleWeapon(disabled: boolean, weaponHash: number, vehicle: number, owner: number): void;
@@ -283,9 +283,9 @@ declare interface GameVehicleUnk {
 	_0xBA91D045575699AD(vehicle: number): boolean;
 	_0x80E3357FDEF45C21(p0: number, p1: number): void;
 	_0xB2E0C0D6922D31F2(vehicle: number, toggle: boolean): void;
-	_0x3DE51E9C80B116CF(p0: number): number;
-	_0x9D30687C57BAA0BB(p0: number): void;
-	_0x41290B40FA63E6DA(p0: number): void;
+	_0x3DE51E9C80B116CF(vehicle: Handle): number;
+	_0x9D30687C57BAA0BB(enable: number): void;
+	_0x41290B40FA63E6DA(toggle: number): void;
 	_0x0419B167EE128F33(p0: number, p1: number): number;
 	_0xF3B0E0AED097A3F5(p0: number, p1: number): number;
 	_0xD3E51C0AB8C26EEE(p0: number, p1: number): number;
@@ -356,7 +356,7 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	setAllGeneratorsActive(): void;
 	setAllLowPriorityGeneratorsActive(active: boolean): void;
 	setOnGroundProperly(vehicle: number, p1: number): boolean;
-	setUseCutsceneWheelCompression(p0: number, p1: boolean, p2: boolean, p3: boolean): number;
+	setUseCutsceneWheelCompression(vehicle: Handle, wheelCompression: boolean, animateWheels: boolean, animateJoints: boolean): number;
 	isStuckOnRoof(vehicle: number): boolean;
 	addUpsidedownCheck(vehicle: number): void;
 	removeUpsidedownCheck(vehicle: number): void;
@@ -418,7 +418,7 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	setBoatMovementResistance(vehicle: number, value: number): void;
 	isBoatAnchoredAndFrozen(vehicle: number): boolean;
 	setBoatSinksWhenWrecked(vehicle: number, toggle: boolean): void;
-	setBoatIsSinking(p0: number): void;
+	setBoatIsSinking(boat: Handle): void;
 	setSiren(vehicle: number, toggle: boolean): void;
 	isSirenOn(vehicle: number): boolean;
 	isSirenAudioOn(vehicle: number): boolean;
@@ -486,7 +486,7 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	isAttachedToTrailer(vehicle: number): boolean;
 	setTrailerInverseMassScale(vehicle: number, p1: number): void;
 	setTrailerLegsRaised(vehicle: number): void;
-	setTrailerLegsLowered(p0: number): void;
+	setTrailerLegsLowered(trailer: Handle): void;
 	setTyreFixed(vehicle: number, tyreIndex: number): void;
 	setNumberPlateText(vehicle: number, plateText: string): void;
 	getNumberPlateText(vehicle: number): string;
@@ -531,11 +531,11 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	setPlaybackToUseAi(vehicle: number, drivingStyle: number): void;
 	setPlaybackToUseAiTryToRevertBackLater(vehicle: number, time: number, drivingStyle: number, p3: boolean): void;
 	explodeInCutscene(vehicle: number, p1: boolean): void;
-	addStuckCheckWithWarp(p0: number, p1: number, p2: number, p3: boolean, p4: boolean, p5: boolean, p6: number): void;
+	addStuckCheckWithWarp(vehicle: Handle, minMoveDist: number, checkFreq: number, wrapIfstuckFlag: boolean, wrapIfUpsideDown: boolean, wrapIfInWater: boolean, wrapMethod: number): void;
 	setModelIsSuppressed(model: number, suppressed: boolean): void;
 	getRandomInSphere(x: number, y: number, z: number, radius: number, modelHash: number, flags: number): number;
-	getRandomFrontBumperInSphere(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number): number;
-	getRandomBackBumperInSphere(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number): number;
+	getRandomFrontBumperInSphere(x: number, y: number, z: number, radius: number, model: Hash, searchFlag: number, ignoreVehicle: Handle): number;
+	getRandomBackBumperInSphere(x: number, y: number, z: number, radius: number, model: Hash, searchFlag: number, ignoreVehicle: Handle): number;
 	getClosest(x: number, y: number, z: number, radius: number, modelHash: number, flags: number): number;
 	getTrainCarriage(train: number, trailerNumber: number): number;
 	deleteMissionTrain(train: number): number;
@@ -579,7 +579,7 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	setXenonLightsColor(vehicle: number, colorIndex: number): void;
 	getXenonLightsColor(vehicle: number): number;
 	setIsConsideredByPlayer(vehicle: number, toggle: boolean): void;
-	getRandomModelInMemory(p0: boolean): GetRandomVehicleModelInMemoryResult;
+	getRandomModelInMemory(normalCars: boolean): GetRandomVehicleModelInMemoryResult;
 	getDoorLockStatus(vehicle: number): number;
 	getDoorDestroyType(vehicle: number, doorIndex: number): number;
 	isDoorDamaged(veh: number, doorID: number): boolean;
@@ -751,8 +751,8 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	getLiveryName(vehicle: number, liveryIndex: number): string;
 	getModModifierValue(vehicle: number, modType: number, modIndex: number): number;
 	getModIdentifierHash(vehicle: number, modType: number, modIndex: number): number;
-	preloadMod(p0: number, modType: number, p2: number): void;
-	hasPreloadModsFinished(p0: number): boolean;
+	preloadMod(vehicle: Handle, modType: number, modIndex: number): void;
+	hasPreloadModsFinished(vehicle: Handle): boolean;
 	releasePreloadMods(vehicle: number): void;
 	setTyreSmokeColor(vehicle: number, r: number, g: number, b: number): void;
 	getTyreSmokeColor(vehicle: number): GetVehicleTyreSmokeColorResult;
@@ -766,8 +766,8 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	isEngineOnFire(vehicle: number): boolean;
 	modifyTopSpeed(vehicle: number, value: number): void;
 	setMaxSpeed(vehicle: number, speed: number): void;
-	addCombatAngledAvoidanceArea(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number): number;
-	removeCombatAvoidanceArea(p0: number): void;
+	addCombatAngledAvoidanceArea(startX: number, startY: number, startZ: number, endX: number, endY: number, endZ: number, width: number): number;
+	removeCombatAvoidanceArea(index: number): void;
 	isAnyPedRappellingFromHeli(vehicle: number): boolean;
 	setCheatPowerIncrease(vehicle: number, value: number): void;
 	setIsWanted(vehicle: number, state: boolean): void;
@@ -801,7 +801,7 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	getCurrentSlipstreamDraft(vehicle: number): number;
 	isSlipstreamLeader(vehicle: number): boolean;
 	setInactiveDuringPlayback(vehicle: number, toggle: boolean): void;
-	setActiveDuringPlayback(p0: number, forceActive: boolean): void;
+	setActiveDuringPlayback(vehicle: Handle, forceActive: boolean): void;
 	isSprayable(vehicle: number): boolean;
 	setEngineCanDegrade(vehicle: number, toggle: boolean): void;
 	setShadowEffect(vehicle: number, p1: number, p2: number): void;
@@ -818,7 +818,7 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	detachEntityFromCargobob(cargobob: number, entity: number): number;
 	isAttachedToCargobob(cargobob: number, vehicleAttached: number): boolean;
 	getAttachedToCargobob(cargobob: number): number;
-	getEntityAttachedToCargobob(p0: number): number;
+	getEntityAttachedToCargobob(cargobob: Handle): number;
 	attachToCargobob(vehicle: number, cargobob: number, p2: number, x: number, y: number, z: number): void;
 	attachEntityToCargobob(cargoHandle: number, vehicleHandle: number, boneIndex: number, x: number, y: number, z: number): void;
 	setCargobobHookCanDetach(cargobob: number, toggle: boolean): void;
@@ -876,18 +876,18 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	getSuspensionHeight(vehicle: number): number;
 	setCarHighSpeedBumpSeverityMultiplier(multiplier: number): void;
 	getNumberOfDoors(vehicle: number): number;
-	setHydraulicRaised(p0: number, p1: number): void;
+	setHydraulicRaised(vehicle: Handle, raised: boolean): void;
 	getBodyHealth2(vehicle: number, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number): number;
 	setKersAllowed(vehicle: number, toggle: boolean): void;
 	getHasKers(vehicle: number): boolean;
 	setHydraulicWheelValue(vehicle: number, wheelId: number, value: number): void;
-	setCamberedWheelsDisabled(p0: number, p1: number): void;
-	setHydraulicWheelState(p0: number, p1: number): void;
+	setCamberedWheelsDisabled(vehicle: Handle, canUse: boolean): void;
+	setHydraulicWheelState(vehicle: Handle, wheelIndex: number): void;
 	setHydraulicWheelStateTransition(vehicle: number, wheelId: number, state: number, value: number, p4: number): void;
 	setDamageModifier(vehicle: number, p1: number): number;
 	setUnkDamageMultiplier(vehicle: number, multiplier: number): void;
 	setControlsInverted(vehicle: number, state: boolean): void;
-	setRampLaunchModifier(p0: number, p1: number): void;
+	setRampLaunchModifier(vehicle: Handle, impulseScale: number): void;
 	getIsDoorValid(vehicle: number, doorIndex: number): boolean;
 	setRocketBoostRefillTime(vehicle: number, seconds: number): void;
 	getHasRocketBoost(vehicle: number): boolean;
@@ -905,9 +905,9 @@ declare interface GameVehicle extends GameVehicleLegacy {
 	getCanActivateParachute(vehicle: number): boolean;
 	setParachuteActive(vehicle: number, active: boolean): void;
 	setReceivesRampDamage(vehicle: number, toggle: boolean): void;
-	setRampSidewaysLaunchMotion(p0: number, p1: number): void;
-	setRampUpwardsLaunchMotion(p0: number, p1: number): void;
-	setWeaponsDisabled(p0: number, p1: number): void;
+	setRampSidewaysLaunchMotion(vehicle: Handle, takeDamage: number): void;
+	setRampUpwardsLaunchMotion(vehicle: Handle, normalise: number): void;
+	setWeaponsDisabled(vehicle: Handle, canTargetObjects: number): void;
 	setParachuteModel(vehicle: number, modelHash: number): void;
 	setParachuteTextureVariatiion(vehicle: number, textureVariation: number): void;
 	getAllS(): GetAllVehiclesResult;

packages/client/index.d.ts

@@ -570,6 +570,7 @@ declare class EntityMp {
 	hasAnimEventFired(actionHash: Hash): boolean;
 	hasAnimFinished(animDict: string, animName: string, p2: number): boolean;
 	hasBeenDamagedBy(entity: Handle, p1: boolean): boolean;
+	hasBeenDamagedByEntity(entity:Handle, p2:boolean): boolean;
 	hasBeenDamagedByAnyObject(): boolean;
 	hasBeenDamagedByAnyPed(): boolean;
 	hasBeenDamagedByAnyVehicle(): boolean;
@@ -1458,6 +1459,10 @@ declare interface CameraMpPool extends EntityMpPool<CameraMp> {
 }
 
 declare interface PedMpBase extends EntityMp {
+	weapon: Hash;
+	weaponAmmo:number;
+
+	haveAllStreamingRequestsCompleted():boolean;
 	applyBlood(boneIndex: number, xRot: number, yRot: number, zRot: number, woundType: string): void;
 	applyBloodByZone(p1: any, p2: number, p3: number, p4: any): void;
 	applyBloodDamageByZone(p1: any, p2: number, p3: number, p4: any): void;
@@ -2281,6 +2286,10 @@ declare interface PedMpBase extends EntityMp {
 }
 
 declare interface PedMp extends PedMpBase {
+	/**
+	 * Returns whether ped is dynamic or not.
+	 */
+	readonly isDynamic: boolean;
 	spawnPosition: Vector3;
 	/**
 	 * Returns the player set as the ped's controller.
@@ -2348,7 +2357,7 @@ declare interface PlayerMp extends PedMpBase {
 	voiceAutoVolume: boolean;
 	voiceVolume: number;
 	voice3d: any;
-	weapon: Hash;
+
 	readonly action: string;
 	readonly aimTarget: boolean;
 	readonly ip: string;