feat(shared): Add Vehicle.getNeonActive and Vehicle.setNeonActive

altmp · Mar 29, 2024 · 817bf6b · 817bf6b
1 parent 64f6526
commit 817bf6b
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 9 deletions.
diff --git a/server/src/classes/Vehicle.cpp b/server/src/classes/Vehicle.cpp
@@ -1,5 +1,4 @@
 #include "Class.h"
-#include "cpp-sdk/ICore.h"
 
 static void NeonSetter(js::DynamicPropertySetterContext& ctx)
 {
@@ -23,6 +22,28 @@ static void NeonSetter(js::DynamicPropertySetterContext& ctx)
     vehicle->SetNeonActive(left, right, front, back);
 }
 
+static void SetNeonActive(js::FunctionContext& ctx)
+{
+    if (!ctx.CheckThis()) return;
+    if (!ctx.CheckArgCount(1)) return;
+    if (!ctx.CheckArgType(0, js::Type::OBJECT)) return;
+
+    alt::IVehicle* vehicle = ctx.GetThisObject<alt::IVehicle>();
+
+    js::Object neonActive;
+    if (!ctx.GetArg(0, neonActive)) return;
+
+    bool activeLeft, activeRight, activeFront, activeBack;
+    vehicle->GetNeonActive(&activeLeft, &activeRight, &activeFront, &activeBack);
+
+    bool left = neonActive.Get<bool>("left", activeLeft);
+    bool right = neonActive.Get<bool>("right", activeRight);
+    bool front = neonActive.Get<bool>("front", activeFront);
+    bool back = neonActive.Get<bool>("back", activeBack);
+
+    vehicle->SetNeonActive(left, right, front, back);
+}
+
 static void ModKitGetter(js::PropertyContext& ctx)
 {
     if(!ctx.CheckThis()) return;
@@ -96,6 +117,7 @@ extern js::Class vehicleClass("Vehicle", &sharedVehicleClass, nullptr, [](js::Cl
     tpl.BindToType(alt::IBaseObject::Type::VEHICLE);
 
     tpl.DynamicProperty("neon", nullptr, &NeonSetter, nullptr, nullptr);
+    tpl.Method("setNeonActive", &SetNeonActive);
 
     tpl.Property("modKit", &ModKitGetter, &ModKitSetter);
     tpl.Property<&alt::IVehicle::GetPrimaryColor, &alt::IVehicle::SetPrimaryColor>("primaryColor");

diff --git a/shared/src/classes/SharedVehicle.cpp b/shared/src/classes/SharedVehicle.cpp
@@ -1,5 +1,4 @@
 #include "Class.h"
-#include "cpp-sdk/ICore.h"
 
 static void NeonGetter(js::DynamicPropertyGetterContext& ctx)
 {
@@ -21,6 +20,24 @@ static void NeonGetter(js::DynamicPropertyGetterContext& ctx)
     ctx.Return(val);
 }
 
+static void GetNeonActive(js::FunctionContext& ctx)
+{
+    if (!ctx.CheckThis()) return;
+
+    alt::IVehicle* vehicle = ctx.GetThisObject<alt::IVehicle>();
+
+    bool left, right, front, back;
+    vehicle->GetNeonActive(&left, &right, &front, &back);
+
+    js::Object neonStates;
+    neonStates.Set("left", left);
+    neonStates.Set("right", right);
+    neonStates.Set("front", front);
+    neonStates.Set("back", back);
+
+    ctx.Return(neonStates);
+}
+
 static void NeonEnumerator(js::DynamicPropertyEnumeratorContext& ctx)
 {
     js::Array arr(4);
@@ -36,6 +53,7 @@ extern js::Class entityClass;
 extern js::Class sharedVehicleClass("SharedVehicle", &entityClass, nullptr, [](js::ClassTemplate& tpl)
 {
     tpl.DynamicProperty("neon", &NeonGetter, nullptr, nullptr, &NeonEnumerator);
+    tpl.Method("getNeonActive", &GetNeonActive);
 
     tpl.Property<&alt::IVehicle::GetDriver>("driver");
     tpl.Property<&alt::IVehicle::IsDestroyed>("isDestroyed");

diff --git a/types/client/index.d.ts b/types/client/index.d.ts
@@ -1037,6 +1037,8 @@ declare module "@altv/client" {
         batteryLightState: boolean;
         suspensionHeight: number;
 
+        getNeonActive(): altShared.VehicleNeonState;
+
         getMod(category: number): number;
         getModsCount(category: number): number;
         isExtraOn(extraId: number): boolean;

diff --git a/types/client/package.json b/types/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@altv/client",
-    "version": "0.0.32",
+    "version": "0.0.33",
     "description": "This package contains the type definitions for the alt:V JS module v2 client types",
     "types": "index.d.ts",
     "files": [

diff --git a/types/server/index.d.ts b/types/server/index.d.ts
@@ -684,6 +684,9 @@ declare module "@altv/server" {
         readonly accelerationLevel: number;
         readonly brakeLevel: number;
 
+        setNeonActive(neons: Partial<altShared.VehicleNeonState>): void;
+        getNeonActive(): altShared.VehicleNeonState;
+
         getMod(category: number): number;
         getModsCount(category: number): number;
         isExtraOn(extraId: number): boolean;

diff --git a/types/server/package.json b/types/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@altv/server",
-    "version": "0.0.37",
+    "version": "0.0.38",
     "description": "This package contains the type definitions for the alt:V JS module v2 server types",
     "types": "index.d.ts",
     "files": [

diff --git a/types/shared/index.d.ts b/types/shared/index.d.ts
@@ -379,10 +379,10 @@ declare module "@altv/shared" {
     }
 
     export interface VehicleNeonState {
-        readonly left: boolean;
-        readonly right: boolean;
-        readonly front: boolean;
-        readonly back: boolean;
+        left: boolean;
+        right: boolean;
+        front: boolean;
+        back: boolean;
     }
 
     export interface KeyStateInfo {

diff --git a/types/shared/package.json b/types/shared/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@altv/shared",
-    "version": "0.0.15",
+    "version": "0.0.16",
     "description": "This package contains the type definitions for the alt:V JS module v2 shared types",
     "types": "index.d.ts",
     "files": [