aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://development.life-of-german.org/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
Luke
2021-05-08 19:40:27 +02:00
parent 23d2a64cc5 747e7a3916
commit de4a63ec50
2 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/Tuning/main.ts
View File

@@ -205,7 +205,7 @@ export default function tuning(globalData: IGlobalData) {
}); });
var currentMod = new Array<number>(); var currentMod = new Array<number>();
var currentActiveModItem = new Array<NativeUI.UIMenuItem>(); var currentActiveModItem = new Array<VehicleModMenuItem>();
var currentSelectedItem: VehicleModMenuItem = null; var currentSelectedItem: VehicleModMenuItem = null;
mp.events.add("showTuningMenu", (noMoney, basePrice) => { mp.events.add("showTuningMenu", (noMoney, basePrice) => {
@@ -373,7 +373,7 @@ export default function tuning(globalData: IGlobalData) {
mp.events.add("SERVER:Tuning_ModSucessfull", (modType: number, index: number) => { mp.events.add("SERVER:Tuning_ModSucessfull", (modType: number, index: number) => {
currentMod[modType] = index - 1; currentMod[modType] = index - 1;
currentActiveModItem[modType].SetRightLabel("$" + moneyformat(currentSelectedItem.price)); currentActiveModItem[modType].SetRightLabel("$" + moneyformat(currentActiveModItem[modType].price));
currentActiveModItem[modType].SetRightBadge(NativeUI.BadgeStyle.None); currentActiveModItem[modType].SetRightBadge(NativeUI.BadgeStyle.None);
currentSelectedItem.SetRightBadge(BadgeStyle.Car); currentSelectedItem.SetRightBadge(BadgeStyle.Car);
currentSelectedItem.SetRightLabel(""); currentSelectedItem.SetRightLabel("");

71
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -355,41 +355,6 @@ namespace ReallifeGamemode.Server.Events
user.SetBlipAndNametagColor(); user.SetBlipAndNametagColor();
} }
//Rentcar Points
if (nearestRentcarPoint != null)
{
if (player.IsInVehicle)
{
return;
}
//Noobspawn
if (player.Position.DistanceTo(PositionManager.rentcarPoints[0].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.noobspawnVehicleProperties), "noobspawn");
}
//Stadthalle
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[1].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.stadthalleVehicleProperties), "lamesa");
}
//Knast
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[2].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.knastVehicleProperties), "stadthalle");
}
//Paleto
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[3].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "knast");
}
//Lamesa
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[4].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "paleto");
}
}
if (nearestWeapon != null) // Weapon Point if (nearestWeapon != null) // Weapon Point
{ {
List<string> primarys = new List<string>(); List<string> primarys = new List<string>();
@@ -528,6 +493,42 @@ namespace ReallifeGamemode.Server.Events
player.CuffPlayer(nearestCuffPlayer); player.CuffPlayer(nearestCuffPlayer);
} }
} }
//Rentcar Points
if (nearestRentcarPoint != null)
{
if (player.IsInVehicle)
{
return;
}
//Noobspawn
if (player.Position.DistanceTo(PositionManager.rentcarPoints[0].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.noobspawnVehicleProperties), "noobspawn");
}
//Stadthalle
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[1].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.stadthalleVehicleProperties), "lamesa");
}
//Knast
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[2].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.knastVehicleProperties), "stadthalle");
}
//Paleto
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[3].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "knast");
}
//Lamesa
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[4].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "paleto");
}
}
if (nearestElevatorPoint != null) if (nearestElevatorPoint != null)
{ {
List<string> stages = new List<string>(); List<string> stages = new List<string>();