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-09 04:40:20 +02:00
parent 8e3ceb1724 d419ed09e4
commit fe7899d02f
3 changed files with 122 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,7 +208,7 @@ export default function tuning(globalData: IGlobalData) {
var currentActiveModItem = new Array<VehicleModMenuItem>(); 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, onlyRepair: boolean) => {
mp.events.call("hideTuningInfo", false); mp.events.call("hideTuningInfo", false);
mp.gui.chat.show(false); mp.gui.chat.show(false);
@@ -230,6 +230,7 @@ export default function tuning(globalData: IGlobalData) {
repairItem.BackColor = new Color(94, 94, 94); repairItem.BackColor = new Color(94, 94, 94);
repairItem.HighlightedBackColor = new Color(105, 105, 105); repairItem.HighlightedBackColor = new Color(105, 105, 105);
if (!onlyRepair) {
carModTypes.forEach((modType) => { carModTypes.forEach((modType) => {
var mod: number = null; var mod: number = null;
@@ -351,6 +352,7 @@ export default function tuning(globalData: IGlobalData) {
localVehicle.setMod(modType, currentMod[modType]); localVehicle.setMod(modType, currentMod[modType]);
}); });
}); });
}
mainMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => { mainMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => {
if (item === repairItem) { if (item === repairItem) {

2
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -2272,7 +2272,7 @@ namespace ReallifeGamemode.Server.Commands
} }
else else
{ {
player.TriggerEvent("showTuningMenu", true); player.TriggerEvent("showTuningMenu", true, 0, false);
} }
} }

14
ReallifeGamemode.Server/Managers/TuningManager.cs
View File

@@ -116,7 +116,18 @@ namespace ReallifeGamemode.Server.Managers
{ {
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
player.TriggerEvent("showTuningMenu", false, GetVehicleBasePrice(player.Vehicle)); Vehicle vehicle = player.Vehicle;
bool onlyRepair = false;
ServerVehicle serverVehicle = vehicle.GetServerVehicle();
if (serverVehicle is FactionVehicle factionVehicle && factionVehicle.BuyPrice == 0)
{
player.SendNotification("~r~Dieses Fahrzeug kann aktuell leider nicht getunt werden");
onlyRepair = true;
}
player.TriggerEvent("showTuningMenu", false, GetVehicleBasePrice(player.Vehicle), onlyRepair);
} }
private int GetVehicleBasePrice(Vehicle vehicle) private int GetVehicleBasePrice(Vehicle vehicle)
@@ -170,6 +181,7 @@ namespace ReallifeGamemode.Server.Managers
player.TriggerEvent("SERVER:Tuning_ModSucessfull", slot, index); player.TriggerEvent("SERVER:Tuning_ModSucessfull", slot, index);
Vehicle pV = player.Vehicle; Vehicle pV = player.Vehicle;
if (index == 0) index--; if (index == 0) index--;
if (slot != 18) if (slot != 18)