Skip to content

Commit e73bd39

Browse files
authored
Merge pull request #83 from shr0x/main
General updates & fixes
2 parents 9b895d7 + 4c01fc9 commit e73bd39

File tree

2 files changed

+39
-4
lines changed

2 files changed

+39
-4
lines changed

packages/client/game/graphics.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ declare interface GameGraphics extends GameGraphicsLegacy {
12881288
*/
12891289
resetWorldTextureSwaps(): void;
12901290
doesLatestBriefStringExist(type: number): boolean;
1291-
registerTextFontId(fontname: string): void;
1291+
registerTextFontId(fontname: string): number;
12921292
setNumberPlateTexture(txDict: string, txName: string, txDictNormal: string, txNameNorma: string): void;
12931293
setParticleFxBloodScale(scale: number): void;
12941294
}

packages/client/index.d.ts

+38-3
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ declare class EntityMp {
570570
hasAnimEventFired(actionHash: Hash): boolean;
571571
hasAnimFinished(animDict: string, animName: string, p2: number): boolean;
572572
hasBeenDamagedBy(entity: Handle, p1: boolean): boolean;
573-
hasBeenDamagedByEntity(entity:Handle, p2:boolean): boolean;
573+
hasBeenDamagedByEntity(entity: Handle, p2: boolean): boolean;
574574
hasBeenDamagedByAnyObject(): boolean;
575575
hasBeenDamagedByAnyPed(): boolean;
576576
hasBeenDamagedByAnyVehicle(): boolean;
@@ -1165,6 +1165,7 @@ declare interface IClientEvents {
11651165
boneIndex: number,
11661166
damage: number
11671167
) => void;
1168+
meleeActionDamage: (source: PlayerMp, target: PlayerMp, weaponHash: Hash, damage: number, isCritical: boolean) => void;
11681169
// playerStartEnterVehicle: (vehicle: VehicleMp, seat: number) => void;
11691170
playerEnterVehicle: (vehicle: VehicleMp, seat: number) => void;
11701171
playerLeaveVehicle: (vehicle: VehicleMp, seat: number) => void;
@@ -1460,9 +1461,9 @@ declare interface CameraMpPool extends EntityMpPool<CameraMp> {
14601461

14611462
declare interface PedMpBase extends EntityMp {
14621463
weapon: Hash;
1463-
weaponAmmo:number;
1464+
weaponAmmo: number;
14641465

1465-
haveAllStreamingRequestsCompleted():boolean;
1466+
haveAllStreamingRequestsCompleted(): boolean;
14661467
applyBlood(boneIndex: number, xRot: number, yRot: number, zRot: number, woundType: string): void;
14671468
applyBloodByZone(p1: any, p2: number, p3: number, p4: any): void;
14681469
applyBloodDamageByZone(p1: any, p2: number, p3: number, p4: any): void;
@@ -2814,6 +2815,7 @@ declare interface VehicleMp extends EntityMp {
28142815
setDoorsLockedForTeam(team: number, toggle: boolean): void;
28152816
setDoorsShut(closeInstantly: boolean): void;
28162817
setDriftTyresEnabled(toggle: boolean): void;
2818+
getDriftTyresEnabled(): boolean;
28172819
setEngineCanDegrade(toggle: boolean): void;
28182820
setEngineHealth(health: number): void;
28192821
setEngineOn(value: boolean, instantly: boolean, otherwise: boolean): void;
@@ -2831,6 +2833,7 @@ declare interface VehicleMp extends EntityMp {
28312833
setHalt(distance: number, killEngine: number, unknown: boolean): void;
28322834
setHandbrake(toggle: boolean): void;
28332835
setHandling(typeName: string, value: number | string): void;
2836+
resetHandling(): void;
28342837
setHasBeenOwnedByPlayer(owned: boolean): void;
28352838
setHasStrongAxles(toggle: boolean): void;
28362839
setHeliBladesFullSpeed(): void;
@@ -2898,6 +2901,25 @@ declare interface VehicleMp extends EntityMp {
28982901
toggleMod(modType: number, toggle: boolean): void;
28992902
trackVisibility(): void;
29002903
wasCounterActivated(p0: any): boolean;
2904+
getHasKers(): boolean;
2905+
setKersAllowed(enable: boolean): void;
2906+
getNumberOfDoors(): number;
2907+
blipSiren(): void;
2908+
setVehHasRadioOverride(): void;
2909+
isVehicleRadioEnabled(): boolean;
2910+
setVehicleRadioLoud(toggle: boolean): void;
2911+
isVehicleRadioLoud(): boolean;
2912+
setVehicleRadioEnabled(enable: boolean): void;
2913+
overrideVehHorn(override: boolean, hornHash: number): void;
2914+
playStreamFromVehicle(): void;
2915+
setSirenWithNoDriver(enable: boolean): void;
2916+
setSirenKeepOn(enable: boolean): void;
2917+
triggerSiren(): void;
2918+
setVehiclePriority(p1: number): void;
2919+
setPedTargettableDestroy(doorId: number, doorLockStatus: number): void;
2920+
getEntityAttachedToTowTruck(towTruck: Handle): Handle;
2921+
setHornPermanentlyOnTime(time: number): void;
2922+
doesAllowRappel(): boolean;
29012923

29022924
/**
29032925
@@ -2910,6 +2932,10 @@ declare interface VehicleMp extends EntityMp {
29102932
*/
29112933
wheelCount: number;
29122934

2935+
gravity: number;
2936+
nosActive: boolean;
2937+
nosAmount: number;
2938+
29132939
/**
29142940
* @params wheelId
29152941
* @returns number
@@ -3393,6 +3419,15 @@ declare interface VehicleMp extends EntityMp {
33933419
setDoorsLockedForPlayer(player: Handle, toggle: boolean): void;
33943420
setDoorsLockedForTeam(team: number, toggle: boolean): void;
33953421
setDoorsShut(closeInstantly: boolean): void;
3422+
getMaxBraking(): number;
3423+
setInteriorlight(enable: boolean): void;
3424+
setHeliBladesSpeed(speed: number): void;
3425+
isHornActive(): boolean;
3426+
setHornEnabled(enable: boolean): void;
3427+
setHornPermanentlyOn(enable: boolean): void;
3428+
setVehRadioStation(radioStation: string): void;
3429+
isDoorFullyOpen(doorIndex: number): boolean;
3430+
doesHaveStuckCheck(): number;
33963431
setEngineCanDegrade(toggle: boolean): void;
33973432
setEngineHealth(health: number): void;
33983433
setEngineOn(value: boolean, instantly: boolean, otherwise: boolean): void;

0 commit comments

Comments
 (0)