Skip to content

New Server-Specific Settings #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PaRRoT-tm wants to merge 6 commits into
base: master
Choose a base branch
from
Open

New Server-Specific Settings #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b52d74
Changes that allow considering the range of a Teleport using a custom…
PaRRoT-tm May 28, 2025
20d2196
Added the Chance
PaRRoT-tm May 28, 2025
e3779b3
Implemented AllowedRoles
PaRRoT-tm May 29, 2025
67e5cf5
Merge branch 'Michal78900:master' into master_Server-Specific-Settings
PaRRoT-tm Jun 1, 2025
9151ae4
Added Server Specific Settings that allow selecting the map to load a…
PaRRoT-tm Jun 1, 2025
87319f1
Modified and fixed some functions in ToolGunItem
PaRRoT-tm Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 97 additions & 3 deletions Events/Handlers/Internal/ToolGunEventsHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,24 @@
using LabApi.Events.CustomHandlers;
using LabApi.Features.Wrappers;
using MEC;
using ProjectMER.Features;
using ProjectMER.Features.Extensions;
using ProjectMER.Features.Objects;
using ProjectMER.Features.ToolGun;
using UserSettings.ServerSpecific;

namespace ProjectMER.Events.Handlers.Internal;

public class ToolGunEventsHandler : CustomEventsHandler
{
public override void OnServerRoundStarted()
private string lastLoadedMap = "None";
private bool? lastIndicatorState = null;

public override void OnServerRoundStarted()
{
Timing.RunCoroutine(ToolGunGUI());
}
Timing.RunCoroutine(ToolGunMapController());
}

private static IEnumerator<float> ToolGunGUI()
{
Expand Down Expand Up @@ -42,7 +48,95 @@ private static IEnumerator<float> ToolGunGUI()
}
}

public override void OnPlayerDryFiringWeapon(PlayerDryFiringWeaponEventArgs ev)
private IEnumerator<float> ToolGunMapController()
{
while (true)
{
yield return Timing.WaitForSeconds(0.5f);

foreach (Player player in Player.List)
{
if (!player.CurrentItem.IsToolGun(out ToolGunItem toolGun))
continue;

if (ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 4, out SSTwoButtonsSetting indicatorToggle))
{
bool currentState = indicatorToggle.SyncIsA;

if (lastIndicatorState == null || currentState != lastIndicatorState.Value)
{
if (currentState)
{
IndicatorObject.ClearIndicators();
}
else
{
IndicatorObject.RefreshIndicators();
}

lastIndicatorState = currentState;
}
}

if (!ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 1, out SSDropdownSetting dropdown))
continue;

string selectedMap = dropdown.TryGetSyncSelectionText(out string mapName) ? mapName : "None";

if (ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 2, out SSButton loadButton) && loadButton.SyncLastPress.IsRunning)
{
if (!string.IsNullOrEmpty(selectedMap) && selectedMap != "None")
{
if (lastLoadedMap != "None")
{
try
{
MapUtils.UnloadMap(lastLoadedMap);
}
catch (Exception ex)
{
Logger.Error($"Failed to Unload Map {lastLoadedMap}: {ex}");
lastLoadedMap = "None";
}
}

try
{
MapUtils.LoadMap(selectedMap);
lastLoadedMap = selectedMap;
}
catch (Exception ex)
{
Logger.Error($"Failed to Load Map {selectedMap}: {ex}");
lastLoadedMap = "None";
}
}

loadButton.SyncLastPress.Reset();
}

if (ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 3, out SSButton unloadButton) && unloadButton.SyncLastPress.IsRunning)
{
if (lastLoadedMap != "None")
{
try
{
MapUtils.UnloadMap(lastLoadedMap);
}
catch (Exception ex)
{
Logger.Error($"Failed to Unload Map {lastLoadedMap}: {ex}");
}
lastLoadedMap = "None";
}

unloadButton.SyncLastPress.Reset();
}
}
}
}

public override void OnPlayerDryFiringWeapon(PlayerDryFiringWeaponEventArgs ev)
{
if (!ev.Weapon.IsToolGun(out ToolGunItem toolGun))
return;
Expand Down
3 changes: 2 additions & 1 deletion Features/MapUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,9 @@ public static SchematicObjectDataList GetSchematicDataByName(string schematicNam
}

public static string[] GetAvailableSchematicNames() => Directory.GetFiles(ProjectMER.SchematicsDir, "*.json", SearchOption.AllDirectories).Select(Path.GetFileNameWithoutExtension).Where(x => !x.Contains('-')).ToArray();
public static string[] GetAvailableMapNames() => Directory.GetFiles(ProjectMER.MapsDir, "*.yml", SearchOption.AllDirectories).Select(Path.GetFileNameWithoutExtension).Where(x => !x.Contains('-')).ToArray();

public static string GetColoredMapName(string mapName)
public static string GetColoredMapName(string mapName)
{
if (mapName == UntitledMapName)
return $"<color=grey><b><i>{UntitledMapName}</i></b></color>";
Expand Down
8 changes: 7 additions & 1 deletion Features/Objects/TeleportObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ public void OnTriggerEnter(Collider other)
if (NextTimeUse > DateTime.Now)
return;

TeleportObject? target = GetRandomTarget();
if (UnityEngine.Random.Range(0, 100) >= Base.Chance)
return;

if (!Base.AllowedRoles.Contains(player.Role.ToString()))
return;

TeleportObject? target = GetRandomTarget();
if (target == null)
return;

Expand Down
58 changes: 47 additions & 11 deletions Features/Serializable/SerializableTeleport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,59 @@ public class SerializableTeleport : SerializableObject, IIndicatorDefinition
{
public List<string> Targets { get; set; } = [];

public float Cooldown { get; set; } = 5f;

public override GameObject? SpawnOrUpdateObject(Room? room = null, GameObject? instance = null)
public int Chance { get; set; } = 100;

public List<string> AllowedRoles { get; set; } = new List<string>()
{
"Scp0492",
"Scp049",
"Scp096",
"Scp106",
"Scp173",
"Scp939",
"Scp3114",
"ClassD",
"Scientist",
"FacilityGuard",
"NtfPrivate",
"NtfSergeant",
"NtfSpecialist",
"NtfCaptain",
"ChaosConscript",
"ChaosRifleman",
"ChaosRepressor",
"ChaosMarauder",
"Tutorial",
};

public float Cooldown { get; set; } = 5f;

public override GameObject? SpawnOrUpdateObject(Room? room = null, GameObject? instance = null)
{
GameObject gameObject = instance ?? new GameObject("Teleport");
Vector3 position = room.GetAbsolutePosition(Position);
Quaternion rotation = room.GetAbsoluteRotation(Rotation);
_prevIndex = Index;
gameObject.transform.SetLocalPositionAndRotation(position, rotation);

if (instance == null)
{
gameObject.AddComponent<BoxCollider>().isTrigger = true;
gameObject.AddComponent<TeleportObject>();
}

return gameObject;
BoxCollider collider;

if (instance == null)
{
collider = gameObject.AddComponent<BoxCollider>();
collider.isTrigger = true;
gameObject.AddComponent<TeleportObject>();
}
else
{
collider = gameObject.GetComponent<BoxCollider>();
}

if (collider != null)
{
collider.size = Scale;
}

return gameObject;
}

public GameObject SpawnOrUpdateIndicator(Room room, GameObject? instance = null)
Expand Down
49 changes: 43 additions & 6 deletions Features/ToolGun/ToolGunItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,20 @@ public static bool TryAdd(Player player)
ServerSpecificSettingsSync.SendOnJoinFilter = (_) => false; // Prevent all users from receiving the tools after joining the server.
ServerSpecificSettingsSync.DefinedSettings =
[
new SSGroupHeader("MapEditorReborn"),
new SSDropdownSetting(0, "Schematic Name", MapUtils.GetAvailableSchematicNames())
];
new SSGroupHeader("<scale=1.2>MapEditorReborn</scale>"),

ServerSpecificSettingsSync.SendToPlayersConditionally(x => x.inventory.UserInventory.Items.Values.Any(x => x.IsToolGun(out ToolGunItem _)));
new SSGroupHeader("Schematic Section"),
new SSDropdownSetting(0, "Schematic Name", MapUtils.GetAvailableSchematicNames()),
new SSTwoButtonsSetting(4, "Indicator Object", "Invisible", "Show", defaultIsB: false, hint: "Toggles visibility of Indicator Object."),

new SSGroupHeader("Map Section"),
new SSDropdownSetting(1, "Map Name", new[] { "None" }.Concat(MapUtils.GetAvailableMapNames()).ToArray()),
new SSButton(2, "Load Map", "Load"),
new SSButton(3, "Unload Map", "Unload"),
];

ResetSettings(player);
ServerSpecificSettingsSync.SendToPlayersConditionally(x => x.inventory.UserInventory.Items.Values.Any(x => x.IsToolGun(out ToolGunItem _)));

return true;
}
Expand All @@ -97,14 +106,42 @@ public static bool Remove(Player player)
{
ItemDictionary.Remove(itemBase.ItemSerial);
player.RemoveItem(itemBase);
return true;
ResetSettings(player);
return true;
}
}

return false;
}

public bool CreateMode => Firearm.IsEmittingLight && !AdsModule.AdsTarget;
public static void ResetSettings(Player player)
{
if (ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 1, out SSDropdownSetting dropdown))
{
dropdown.SyncSelectionIndexRaw = 0;
ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, new[] { dropdown });
}

if (ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 2, out SSButton loadButton))
{
loadButton.SyncLastPress.Reset();
ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, new[] { loadButton });
}

if (ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 3, out SSButton unloadButton))
{
unloadButton.SyncLastPress.Reset();
ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, new[] { unloadButton });
}

if (ServerSpecificSettingsSync.TryGetSettingOfUser(player.ReferenceHub, 4, out SSTwoButtonsSetting indicatorsSetting))
{
indicatorsSetting.SyncIsB = false;
ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, new[] { indicatorsSetting });
}
}

public bool CreateMode => Firearm.IsEmittingLight && !AdsModule.AdsTarget;
public bool DeleteMode => !Firearm.IsEmittingLight && !AdsModule.AdsTarget;
public bool SelectMode => Firearm.IsEmittingLight && AdsModule.AdsTarget;

Expand Down