From 3ecb419759772dc2f125e6117ab445d9b5aece62 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sun, 18 Feb 2024 15:45:16 +1100 Subject: [PATCH] refactor(package): move and export VehicleProperties interface --- .../resource/vehicleProperties/index.ts | 93 +------------------ package/shared/index.ts | 91 ++++++++++++++++++ 2 files changed, 93 insertions(+), 91 deletions(-) diff --git a/package/client/resource/vehicleProperties/index.ts b/package/client/resource/vehicleProperties/index.ts index 39df43241..fc9eaca43 100644 --- a/package/client/resource/vehicleProperties/index.ts +++ b/package/client/resource/vehicleProperties/index.ts @@ -1,96 +1,7 @@ -interface VehicleProperties { - model: string; - plate: string; - plateIndex: number; - bodyHealth: number; - engineHealth: number; - tankHealth: number; - fuelLevel: number; - oilLevel: number; - dirtLevel: number; - paintType1: number; - paintType2: number; - color1: number | [number, number, number]; - color2: number | [number, number, number]; - pearlescentColor: number; - interiorColor: number; - dashboardColor: number; - wheelColor: number; - wheelWidth: number; - wheelSize: number; - wheels: number; - windowTint: number; - xenonColor: number; - neonEnabled: boolean[]; - neonColor: [number, number, number]; - extras: Record; - tyreSmokeColor: [number, number, number]; - modSpoilers: number; - modFrontBumper: number; - modRearBumper: number; - modSideSkirt: number; - modExhaust: number; - modFrame: number; - modGrille: number; - modHood: number; - modFender: number; - modRightFender: number; - modRoof: number; - modEngine: number; - modBrakes: number; - modTransmission: number; - modHorns: number; - modSuspension: number; - modArmor: number; - modNitrous: number; - modTurbo: boolean; - modSubwoofer: boolean; - modSmokeEnabled: boolean; - modHydraulics: boolean; - modXenon: boolean; - modFrontWheels: number; - modBackWheels: number; - modCustomTiresF: boolean; - modCustomTiresR: boolean; - modPlateHolder: number; - modVanityPlate: number; - modTrimA: number; - modOrnaments: number; - modDashboard: number; - modDial: number; - modDoorSpeaker: number; - modSeats: number; - modSteeringWheel: number; - modShifterLeavers: number; - modAPlate: number; - modSpeakers: number; - modTrunk: number; - modHydrolic: number; - modEngineBlock: number; - modAirFilter: number; - modStruts: number; - modArchCover: number; - modAerials: number; - modTrimB: number; - modTank: number; - modWindows: number; - modDoorR: number; - modLivery: number; - modRoofLivery: number; - modLightbar: number; - windows: number[]; - doors: number[]; - tyres: Record - leftHeadlight: boolean; - rightHeadlight: boolean; - frontBumper: boolean; - rearBumper: boolean; - bulletProofTyres: boolean; - driftTyres: boolean; -} +import type { VehicleProperties } from '../../' export const getVehicleProperties = (vehicle: number): VehicleProperties => exports.ox_lib.getVehicleProperties(vehicle); export const setVehicleProperties = (vehicle: number, props: Partial, fixVehicle?: boolean): boolean => - exports.ox_lib.setVehicleProperties(vehicle, props); + exports.ox_lib.setVehicleProperties(vehicle, props, fixVehicle); diff --git a/package/shared/index.ts b/package/shared/index.ts index 5e83883e3..a9e319ddd 100644 --- a/package/shared/index.ts +++ b/package/shared/index.ts @@ -11,6 +11,97 @@ export function sleep(ms: number) { return new Promise((resolve) => setTimeout(resolve, ms, null)); } +export interface VehicleProperties { + model: string; + plate: string; + plateIndex: number; + bodyHealth: number; + engineHealth: number; + tankHealth: number; + fuelLevel: number; + oilLevel: number; + dirtLevel: number; + paintType1: number; + paintType2: number; + color1: number | [number, number, number]; + color2: number | [number, number, number]; + pearlescentColor: number; + interiorColor: number; + dashboardColor: number; + wheelColor: number; + wheelWidth: number; + wheelSize: number; + wheels: number; + windowTint: number; + xenonColor: number; + neonEnabled: boolean[]; + neonColor: [number, number, number]; + extras: Record; + tyreSmokeColor: [number, number, number]; + modSpoilers: number; + modFrontBumper: number; + modRearBumper: number; + modSideSkirt: number; + modExhaust: number; + modFrame: number; + modGrille: number; + modHood: number; + modFender: number; + modRightFender: number; + modRoof: number; + modEngine: number; + modBrakes: number; + modTransmission: number; + modHorns: number; + modSuspension: number; + modArmor: number; + modNitrous: number; + modTurbo: boolean; + modSubwoofer: boolean; + modSmokeEnabled: boolean; + modHydraulics: boolean; + modXenon: boolean; + modFrontWheels: number; + modBackWheels: number; + modCustomTiresF: boolean; + modCustomTiresR: boolean; + modPlateHolder: number; + modVanityPlate: number; + modTrimA: number; + modOrnaments: number; + modDashboard: number; + modDial: number; + modDoorSpeaker: number; + modSeats: number; + modSteeringWheel: number; + modShifterLeavers: number; + modAPlate: number; + modSpeakers: number; + modTrunk: number; + modHydrolic: number; + modEngineBlock: number; + modAirFilter: number; + modStruts: number; + modArchCover: number; + modAerials: number; + modTrimB: number; + modTank: number; + modWindows: number; + modDoorR: number; + modLivery: number; + modRoofLivery: number; + modLightbar: number; + windows: number[]; + doors: number[]; + tyres: Record + leftHeadlight: boolean; + rightHeadlight: boolean; + frontBumper: boolean; + rearBumper: boolean; + bulletProofTyres: boolean; + driftTyres: boolean; +} + /** * Creates a promise that will be resolved once any value is returned by the function (including null). * @param {number?} timeout Error out after `~x` ms. Defaults to 1000, unless set to `false`.