Skip to content

Commit

Permalink
Added warnings to (partially) incompatible 1S Infinity features
Browse files Browse the repository at this point in the history
  • Loading branch information
TomGrobbe committed May 25, 2021
1 parent 3959db3 commit 5ebc4f7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion vMenu/menus/MiscSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ private void CreateMenu()
MenuSliderItem timeCycleIntensity = new MenuSliderItem("Timecycle Modifier Intensity", "Set the timecycle modifier intensity.", 0, 20, LastTimeCycleModifierStrength, true);

MenuCheckboxItem locationBlips = new MenuCheckboxItem("Location Blips", "Shows blips on the map for some common locations.", ShowLocationBlips);
MenuCheckboxItem playerBlips = new MenuCheckboxItem("Show Player Blips", "Shows blips on the map for all players.", ShowPlayerBlips);
MenuCheckboxItem playerBlips = new MenuCheckboxItem("Show Player Blips", "Shows blips on the map for all players. ~y~Note for when the server is using OneSync Infinity: this won't work for players that are too far away.", ShowPlayerBlips);
MenuCheckboxItem playerNames = new MenuCheckboxItem("Show Player Names", "Enables or disables player overhead names.", MiscShowOverheadNames);
MenuCheckboxItem respawnDefaultCharacter = new MenuCheckboxItem("Respawn As Default MP Character", "If you enable this, then you will (re)spawn as your default saved MP character. Note the server owner can globally disable this option. To set your default character, go to one of your saved MP Characters and click the 'Set As Default Character' button.", MiscRespawnDefaultCharacter);
MenuCheckboxItem restorePlayerAppearance = new MenuCheckboxItem("Restore Player Appearance", "Restore your player's skin whenever you respawn after being dead. Re-joining a server will not restore your previous skin.", RestorePlayerAppearance);
Expand Down
6 changes: 2 additions & 4 deletions vMenu/menus/OnlinePlayers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ private void CreateMenu()
MenuItem teleport = new MenuItem("Teleport To Player", "Teleport to this player.");
MenuItem teleportVeh = new MenuItem("Teleport Into Player Vehicle", "Teleport into the vehicle of the player.");
MenuItem summon = new MenuItem("Summon Player", "Teleport the player to you.");
MenuItem toggleGPS = new MenuItem("Toggle GPS", "Enables or disables the GPS route on your radar to this player.");
MenuItem spectate = new MenuItem("Spectate Player", "Spectate this player. Click this button again to stop spectating.");
MenuItem toggleGPS = new MenuItem("Toggle GPS", "Enables or disables the GPS route on your radar to this player. ~y~Note for when the server is using OneSync Infinity: this may not work if the player is too far away.");
MenuItem spectate = new MenuItem("Spectate Player", "Spectate this player. Click this button again to stop spectating. ~y~Note for when the server is using OneSync Infinity: You will be teleported to the player if you're too far away, you might want to go into noclip to become invisible, before using this option!");
MenuItem printIdentifiers = new MenuItem("Print Identifiers", "This will print the player's identifiers to the client console (F8). And also save it to the CitizenFX.log file.");
MenuItem kill = new MenuItem("~r~Kill Player", "Kill this player, note they will receive a notification saying that you killed them. It will also be logged in the Staff Actions log.");
MenuItem kick = new MenuItem("~r~Kick Player", "Kick the player from the server.");
Expand Down Expand Up @@ -124,8 +124,6 @@ private void CreateMenu()
Notify.Error("You can't send a private message if you have private messages disabled yourself. Enable them in the Misc Settings menu and try again.");
}
}
// teleport (in vehicle) button
else if (item == teleport || item == teleportVeh)
Expand Down
13 changes: 7 additions & 6 deletions vMenu/menus/VehicleOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private void CreateMenu()
MenuListItem vehicleLights = new MenuListItem("Vehicle Lights", lights, 0, "Turn vehicle lights on/off.");

List<string> stationNames = new List<string>();

foreach (var radioStationName in Enum.GetNames(typeof(RadioStation)))
{
stationNames.Add(radioStationName);
Expand All @@ -149,7 +149,7 @@ private void CreateMenu()
int index = Array.IndexOf(stations, RadioStation.RadioOff);
radioIndex = index;
}

MenuListItem radioStations = new MenuListItem("Default radio station", stationNames, radioIndex, "Select a defalut radio station to be set when spawning new car");

var tiresList = new List<string>() { "All Tires", "Tire #1", "Tire #2", "Tire #3", "Tire #4", "Tire #5", "Tire #6", "Tire #7", "Tire #8" };
Expand Down Expand Up @@ -386,7 +386,7 @@ private void CreateMenu()
}
// always allowed
menu.AddMenuItem(showHealth); // SHOW VEHICLE HEALTH

// I don't really see why would you want to disable this so I will not add useless permissions
menu.AddMenuItem(radioStations);

Expand Down Expand Up @@ -913,17 +913,18 @@ private void CreateMenu()
{
Notify.Error(CommonErrors.NoVehicle);
}
} else if (item == radioStations)
}
else if (item == radioStations)
{
RadioStation newStation = (RadioStation)Enum.GetValues(typeof(RadioStation)).GetValue(listIndex);
var veh = GetVehicle();
if (veh != null && veh.Exists())
{
veh.RadioStation = newStation;
}
UserDefaults.VehicleDefaultRadio = (int) newStation;
UserDefaults.VehicleDefaultRadio = (int)newStation;
}
};
#endregion
Expand Down

0 comments on commit 5ebc4f7

Please sign in to comment.