Skip to content
This repository has been archived by the owner on Dec 25, 2022. It is now read-only.

Commit

Permalink
Added vehicle remote control
Browse files Browse the repository at this point in the history
  • Loading branch information
@razzie
razzie committed Aug 24, 2019
1 parent 13d217b commit c39f710
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Client/Autopilot.cs
View file
Expand Up @@ -115,7 +115,7 @@ public static bool IsOwnedAutopilot(int driver)
return IsAutopilot(driver) && API.DecorGetInt(driver, PlayerDecor) == API.PlayerId();
}

private static async Task Spawn(int vehicle)
public static async Task Spawn(int vehicle)
{
await Common.RequestModel(Model);
var playerID = API.PlayerId();
Expand Down
3 changes: 3 additions & 0 deletions Client/Main.cs
View file
Expand Up @@ -151,6 +151,9 @@ private static void SetupMenu()

if (Permission.CanDo(Ability.TurboBoost))
_menu.AddMenuListItem("Upgrade", "Turbo Boost (toggle)", UpgradeMenu.ToggleTurboBoost);

if (Permission.CanDo(Ability.RemoteControl))
_menu.AddMenuListItem("Upgrade", "Remote control (toggle)", UpgradeMenu.ToggleRemoteControl);
#endregion

#region Extra
Expand Down
15 changes: 15 additions & 0 deletions Client/Menus/UpgradeMenu.cs
View file
Expand Up @@ -93,6 +93,21 @@ public static void ToggleAntiGravity()

var state = Vehicles.IsFeatureEnabled(vehicle, Vehicles.FeatureFlag.AntiGravity);
Vehicles.SetFeatureEnabled(vehicle, Vehicles.FeatureFlag.AntiGravity, !state);

if (!state)
Common.Notification("Anti-gravity enabled");
}

public static void ToggleRemoteControl()
{
if (!Common.EnsurePlayerIsVehicleDriver(out int player, out int vehicle))
return;

var state = Vehicles.IsFeatureEnabled(vehicle, Vehicles.FeatureFlag.RemoteControl);
Vehicles.SetFeatureEnabled(vehicle, Vehicles.FeatureFlag.RemoteControl, !state);

if (!state)
Common.Notification("Remote control enabled (use arrow keys)");
}
}
}
78 changes: 74 additions & 4 deletions Client/Vehicles.cs
View file
Expand Up @@ -34,7 +34,8 @@ public enum FeatureFlag
{
BackToTheFuture = 1,
TurboBoost = 2,
AntiGravity = 4
AntiGravity = 4,
RemoteControl = 8
}

public enum Light
Expand Down Expand Up @@ -604,6 +605,15 @@ private static async Task UpdateEffects()
}
}

private static bool IsAnyRemoteControlPressed()
{
return
API.IsControlPressed(0, 172) ||
API.IsControlPressed(0, 173) ||
API.IsControlPressed(0, 174) ||
API.IsControlPressed(0, 175);
}

private static Task UpdateControls()
{
var player = API.GetPlayerPed(-1);
Expand All @@ -616,9 +626,6 @@ private static Task UpdateControls()

if (API.IsPedInFlyingVehicle(player) && API.DecorExistOn(vehicle, AircraftHornDecor))
{
if (API.GetPedInVehicleSeat(vehicle, -1) != player || API.IsEntityDead(vehicle) || !API.DecorExistOn(vehicle, AircraftHornDecor))
return Delay(1000);

if (API.IsControlJustPressed(0, 86)) // INPUT_VEH_HORN
{
TriggerServerEvent("PocceMod:ToggleHorn", API.VehToNet(vehicle), true);
Expand Down Expand Up @@ -651,6 +658,69 @@ private static Task UpdateControls()
TriggerServerEvent("PocceMod:ToggleTurboBoost", API.VehToNet(vehicle), false);
}

if (driver != player && IsFeatureEnabled(vehicle, FeatureFlag.RemoteControl) && IsAnyRemoteControlPressed())
{
if (API.IsVehicleSeatFree(vehicle, -1))
return Autopilot.Spawn(vehicle);

var model = (uint)API.GetEntityModel(vehicle);
if (API.IsThisModelAPlane(model) || API.IsThisModelAHeli(model))
{
var force = 1f;
if (API.IsControlPressed(0, 172)) // up
{
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, -force, 0f, 1f, 0f, -1, true, true, true, false, false);
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, force, 0f, -1f, 0f, -1, true, true, true, false, false);
}
else if (API.IsControlPressed(0, 173)) // down
{
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, force, 0f, 1f, 0f, -1, true, true, true, false, false);
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, -force, 0f, -1f, 0f, -1, true, true, true, false, false);
}

if (API.IsControlPressed(0, 174)) // left
{
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, force, 1f, 0f, 0f, -1, true, true, true, false, false);
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, -force, -1f, 0f, 0f, -1, true, true, true, false, false);
}
else if (API.IsControlPressed(0, 175)) // right
{
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, -force, 1f, 0f, 0f, -1, true, true, true, false, false);
API.ApplyForceToEntity(vehicle, 1, 0f, 0f, force, -1f, 0f, 0f, -1, true, true, true, false, false);
}

return Delay(33);
}
else // non-aircraft
{
if (API.IsControlPressed(0, 172)) // up
{
API.TaskVehicleTempAction(driver, vehicle, 9, 1);

if (API.IsControlPressed(0, 174)) // left
API.TaskVehicleTempAction(driver, vehicle, 7, 1);
else if (API.IsControlPressed(0, 175)) // right
API.TaskVehicleTempAction(driver, vehicle, 8, 1);
}
else if (API.IsControlPressed(0, 173)) // down
{
API.TaskVehicleTempAction(driver, vehicle, 22, 1);

if (API.IsControlPressed(0, 174)) // left
API.TaskVehicleTempAction(driver, vehicle, 13, 1);
else if (API.IsControlPressed(0, 175)) // right
API.TaskVehicleTempAction(driver, vehicle, 14, 1);
}
else
{
if (API.IsControlPressed(0, 174)) // left
API.TaskVehicleTempAction(driver, vehicle, 4, 1);
else if (API.IsControlPressed(0, 175)) // right
API.TaskVehicleTempAction(driver, vehicle, 5, 1);
}
}
}

return Task.FromResult(0);
}
}
Expand Down
1 change: 1 addition & 0 deletions Shared/Ability.cs
View file
Expand Up @@ -33,6 +33,7 @@ public enum Ability
CompressVehicle,
AntiGravity,
TurboBoost,
RemoteControl,
Balloons,
FreezePosition,
IdentifySkins,
Expand Down
1 change: 1 addition & 0 deletions config/config.ini
View file
Expand Up @@ -57,6 +57,7 @@ BackToTheFuture=0
CompressVehicle=0
AntiGravity=0
TurboBoost=0
RemoteControl=0
Balloons=0
FreezePosition=0
IdentifySkins=0
Expand Down

0 comments on commit c39f710

Please sign in to comment.