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

Added some unknown vehicles to vehicle list, removed debug message from tuning manager

Browse Source
This commit is contained in:
hydrant
2018-12-16 00:34:21 +01:00
parent db9dfb1002
commit 5fab926d28
4 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Client/Tuning/main.js
View File

@@ -37,6 +37,8 @@ var carModSlotName = [
{ Slot: 34, Name: "Schalthebel" },
{ Slot: 35, Name: "Schild" },
{ Slot: 38, Name: "Hydraulik" },
{ Slot: 39, Name: "Motorabdeckung" },
{ Slot: 40, Name: "Luftfilter" },
{ Slot: 46, Name: "Fenster" },
{ Slot: 48, Name: "Design" }
];
@@ -161,7 +163,7 @@ mp.events.add("showTuningMenu", () => {
var localPlayer = mp.players.local;
var localVehicle = localPlayer.vehicle;
localVehicle.setLights(1);
localVehicle.setHalt(1.0, 1, false);
if (typeof mainMenu !== "undefined" && mainMenu.Visible) {
return;
@@ -173,6 +175,8 @@ mp.events.add("showTuningMenu", () => {
globalData.InTuning = true;
localVehicle.setLights(1);
var carName = mp.game.ui.getLabelText(mp.game.vehicle.getDisplayNameFromVehicleModel(localVehicle.model));
mainMenu = new Menu("Fahrzeugwerkstatt", carName, new Point(50, 50));
@@ -232,6 +236,8 @@ mp.events.add("showTuningMenu", () => {
if (modSlot === 38) {
localVehicle.setDoorOpen(5, false, false);
} else if (modSlot === 39 || modSlot === 40 || modSlot === 41) {
localVehicle.setDoorOpen(4, false, false);
}
var door = getDoor(localVehicle.model, modSlot);
@@ -319,6 +325,8 @@ mp.events.add("showTuningMenu", () => {
modMenu.MenuClose.on(() => {
if (modSlot === 38) {
localVehicle.setDoorShut(5, false);
} else if (modSlot === 39 || modSlot === 40 || modSlot === 41) {
localVehicle.setDoorShut(4, false);
}
if (door !== undefined) {

55
Server/Commands/Admin.cs
View File

@@ -61,7 +61,6 @@ namespace reallife_gamemode.Server.Commands
usableItemObj.Use(eatItem, player);
}
}
#region Support
[Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)]
@@ -97,7 +96,7 @@ namespace reallife_gamemode.Server.Commands
}
}
[Command("dimension")]
[Command("dimension", "~m~Benutzung: ~s~/dimension")]
public void CmdAdminDimension(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
@@ -129,7 +128,7 @@ namespace reallife_gamemode.Server.Commands
else player.Position = target.Position;
}
[Command("position")]
[Command("position", "~m~Benutzung: ~s~/position")]
public void CmdAdminShowPos(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
@@ -284,7 +283,7 @@ namespace reallife_gamemode.Server.Commands
target.Freeze(false);
}
[Command("gotolist")] //TODO Als Browser anzeigeN??
[Command("gotolist", "~m~Benutzung: ~s~/gotolist")] //TODO Als Browser anzeigeN??
public void CmdAdminGotoList(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -306,7 +305,7 @@ namespace reallife_gamemode.Server.Commands
player.SendChatMessage(gotoString);
}
[Command("mark")]
[Command("mark", "~m~Benutzung: ~s~/mark")]
public void CmdAdminMark(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -318,7 +317,7 @@ namespace reallife_gamemode.Server.Commands
player.SendNotification("~y~Mark ~s~gespeichert", true);
}
[Command("gotomark")]
[Command("gotomark", "~m~Benutzung: ~s~/gotomark")]
public void CmdAdminGotoMark(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -815,13 +814,6 @@ namespace reallife_gamemode.Server.Commands
#region ALevel3
Vehicle testV;
[Command]
public void Testveh(Client player)
{
player.SendChatMessage(VehicleStreaming.GetEngineState(player.Vehicle).ToString());
}
[Command("veh", "~m~Benutzung: ~s~/veh [Fahrzeug] (Farbe 1) (Farbe 2)")]
public void CmdAdminVeh(Client player, string hash, int color1 = 111, int color2 = 111)
@@ -848,13 +840,13 @@ namespace reallife_gamemode.Server.Commands
return;
}
Vehicle v = testV = NAPI.Vehicle.CreateVehicle(uHash, player.Position, player.Rotation.Z, color1, color2, engine: false);
Vehicle v = NAPI.Vehicle.CreateVehicle(uHash, player.Position, player.Rotation.Z, color1, color2, engine: false);
VehicleStreaming.SetEngineState(v, true);
VehicleStreaming.SetLockStatus(v, false);
player.SetIntoVehicle(v.Handle, -1);
}
[Command("fv")]
[Command("fv", "~m~Benutzung: ~s~/fv")]
public void CmdAdminFixveh(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true)
@@ -1078,8 +1070,8 @@ namespace reallife_gamemode.Server.Commands
InventoryManager.GetUserItemsAsAdmin(player, user);
}
[Command("editmode")]
[Command("editmode", "~m~Benutzung: ~s~/editmode")]
public void CmdAdminToggleEditMode(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
@@ -1852,6 +1844,7 @@ namespace reallife_gamemode.Server.Commands
player.TriggerEvent("manageFactionRanks", json);
}
}
[Command("setweather", "~m~Benutzung: ~s~/setweather [Wetter]")]
public void CmdAdminSetweather(Client player, string weather)
{
@@ -2156,7 +2149,6 @@ namespace reallife_gamemode.Server.Commands
}
#endregion
@@ -2225,7 +2217,6 @@ namespace reallife_gamemode.Server.Commands
}
}
//TODO
[Command("fpay")]
public void FPay(Client player, string receiver, int amount)
@@ -2258,6 +2249,7 @@ namespace reallife_gamemode.Server.Commands
ChatService.NotAuthorized(player);
return;
}
if (player.IsInVehicle)
{
if (player.Vehicle.HasData("shopVehicleId"))
@@ -2279,31 +2271,6 @@ namespace reallife_gamemode.Server.Commands
}
}
[Command("getincar", "~m~Benutzung: ~s~/getincar [Name]")]
public void CmdAdminGetincar(Client player, string name)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
Client target = ClientService.GetClientByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
}
if(!target.IsInVehicle)
{
player.SendChatMessage("~r~[FEHLER]~s~ Der Spieler ist nicht in einem Fahrzeug.");
return;
}
player.SetIntoVehicle(target.Vehicle, -2);
}
[Command("saveall")]
public void SaveAll(Client player)
{

1
Server/Managers/TuningManager.cs
View File

@@ -106,7 +106,6 @@ namespace reallife_gamemode.Server.Managers
else
{
bool newVal = index == -1 ? false : true;
NAPI.Util.ConsoleOutput("Setting turbo to: " + newVal.ToString());
pV.SetSharedData("mod" + slot, newVal);
NAPI.ClientEvent.TriggerClientEventForAll("vehicleToggleMod", pV, slot, newVal);
}

5
Server/Managers/VehicleManager.cs
View File

@@ -57,7 +57,10 @@ namespace reallife_gamemode.Server.Managers
"impaler",
"zr380",
"zr3802",
"zr3803"
"zr3803",
"flashgt",
"gb200",
"dominator3"
};
private static Dictionary<int, NetHandle> _serverVehicles = new Dictionary<int, NetHandle>();