Compare commits

..

3 Commits

Author SHA1 Message Date
ivan tkachenko 54e88b08a8 WIP: Add LethalConfig with suitable custom options
Draft because needs testing in multiplayer environment. Apparently,
both isClinet and isHost are true in single player.

FIXME:
If LethalConfig panel opened while orbiting, and then the round has started, it would still
be possible to modify the values at least once. This is presumably a bug in LethalConfig,
because it doesn't check the callback again before actually applying the change.
2025-07-12 04:49:20 +03:00
ivan tkachenko 26fb620173 Add config synchronization via CSync
It only synchronizes from host to clients.
2025-07-12 02:11:32 +03:00
ivan tkachenko aead762721 Add configuration weights for tracks
Range is [0..100] but it's relative to total/sum. The algorithm guards
against "all set to zero" scenario.

This is not usable without synchronization. This commit provides none.
2025-07-12 02:09:47 +03:00
4 changed files with 39 additions and 29 deletions

View File

@ -17,6 +17,7 @@
<PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" /> <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" />
<!-- Publicize internal methods, so we could generate config entries for tracks at runtime instead of generating code at compile time --> <!-- Publicize internal methods, so we could generate config entries for tracks at runtime instead of generating code at compile time -->
<PackageReference Include="Sigurd.BepInEx.CSync" Version="5.0.1" Publicize="true" /> <PackageReference Include="Sigurd.BepInEx.CSync" Version="5.0.1" Publicize="true" />
<PackageReference Include="AinaVT-LethalConfig" Version="1.4.6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -7,6 +7,9 @@ using BepInEx;
using BepInEx.Configuration; using BepInEx.Configuration;
using CSync.Extensions; using CSync.Extensions;
using CSync.Lib; using CSync.Lib;
using LethalConfig;
using LethalConfig.ConfigItems;
using LethalConfig.ConfigItems.Options;
using HarmonyLib; using HarmonyLib;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
@ -15,9 +18,10 @@ namespace MuzikaGromche
{ {
[BepInPlugin(PluginInfo.PLUGIN_GUID, PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)] [BepInPlugin(PluginInfo.PLUGIN_GUID, PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)]
[BepInDependency("com.sigurd.csync", "5.0.1")] [BepInDependency("com.sigurd.csync", "5.0.1")]
[BepInDependency("ainavt.lc.lethalconfig", "1.4.6")]
public class Plugin : BaseUnityPlugin public class Plugin : BaseUnityPlugin
{ {
internal new static Config Config { get; private set; } = null!; internal new static Config Config { get; private set; } = null;
public static Track[] Tracks = [ public static Track[] Tracks = [
new Track new Track
@ -217,12 +221,12 @@ namespace MuzikaGromche
{ {
var buffer = new byte[4 * (1 + Weights.Length)]; var buffer = new byte[4 * (1 + Weights.Length)];
var offset = 0; var offset = 0;
System.Buffer.BlockCopy(BitConverter.GetBytes(seed), 0, buffer, offset, sizeof(int)); Buffer.BlockCopy(BitConverter.GetBytes(seed), 0, buffer, offset, sizeof(int));
// Make sure that tweaking weights even a little drastically changes the outcome // Make sure that tweaking weights even a little drastically changes the outcome
foreach (var weight in Weights) foreach (var weight in Weights)
{ {
offset += 4; offset += 4;
System.Buffer.BlockCopy(BitConverter.GetBytes(weight), 0, buffer, offset, sizeof(int)); Buffer.BlockCopy(BitConverter.GetBytes(weight), 0, buffer, offset, sizeof(int));
} }
var sha = SHA256.Create(); var sha = SHA256.Create();
var hash = sha.ComputeHash(buffer); var hash = sha.ComputeHash(buffer);
@ -249,7 +253,7 @@ namespace MuzikaGromche
return index; return index;
} }
private int GetRawIndex(int rawIndex) private int GetWeightedIndex(int rawIndex)
{ {
if (rawIndex < 0 || rawIndex >= TotalWeights) if (rawIndex < 0 || rawIndex >= TotalWeights)
{ {
@ -274,7 +278,7 @@ namespace MuzikaGromche
{ {
var hash = GetHash(seed); var hash = GetHash(seed);
var index = GetRawIndex(hash); var index = GetRawIndex(hash);
return GetRawIndex(index); return GetWeightedIndex(index);
} }
public override string ToString() public override string ToString()
@ -288,15 +292,8 @@ namespace MuzikaGromche
public class Config : SyncedConfig2<Config> public class Config : SyncedConfig2<Config>
{ {
// TODO: Comment out for now
// Personal preferrence, explicitly not synced
public ConfigEntry<bool> DisplayLyrics { get; private set; }
public Config(ConfigFile configFile) : base(PluginInfo.PLUGIN_GUID) public Config(ConfigFile configFile) : base(PluginInfo.PLUGIN_GUID)
{ {
// TODO: Comment out for now
DisplayLyrics = configFile.Bind("General", "Display Lyrics", false, "Toggle lyrics display");
var chanceRange = new AcceptableValueRange<int>(0, 100); var chanceRange = new AcceptableValueRange<int>(0, 100);
foreach (var track in Plugin.Tracks) foreach (var track in Plugin.Tracks)
@ -306,8 +303,16 @@ namespace MuzikaGromche
new ConfigDefinition("Tracks", track.Name), new ConfigDefinition("Tracks", track.Name),
50, 50,
new ConfigDescription(description, chanceRange, track)); new ConfigDescription(description, chanceRange, track));
var slider = new IntSliderConfigItem(track.Weight.Entry, new IntSliderOptions
{
RequiresRestart = false,
CanModifyCallback = CanModifyCallback,
});
LethalConfigManager.AddConfigItem(slider);
} }
// HACK because CSync doesn't provide an API to register a list of config entries
foreach (var track in Plugin.Tracks) foreach (var track in Plugin.Tracks)
{ {
// This is basically what ConfigFile.PopulateEntryContainer does // This is basically what ConfigFile.PopulateEntryContainer does
@ -315,23 +320,25 @@ namespace MuzikaGromche
EntryContainer.Add(entryBase.BoxedEntry.ToSyncedEntryIdentifier(), entryBase); EntryContainer.Add(entryBase.BoxedEntry.ToSyncedEntryIdentifier(), entryBase);
} }
// TODO: Remove debug lines ConfigManager.Register(this);
this.InitialSyncCompleted += (sender, e) =>
{
var weights = string.Join(',', Plugin.Tracks.Select(track => track.Weight.Value));
Debug.Log($"MuzikaGromche Sync complete! weights={weights}");
};
foreach (var track in Plugin.Tracks)
{
track.Weight.Changed += (sender, e) =>
{
var track = (Track)e.ChangedEntry.Entry.Description.Tags[0];
Debug.Log($"MuzikaGromche Sync changed {track.Name}: {e.OldValue} -> {e.NewValue}");
};
} }
ConfigManager.Register(this); public static CanModifyResult CanModifyCallback()
{
var startOfRound = StartOfRound.Instance;
if (!startOfRound)
{
return CanModifyResult.True(); // Main menu
}
if (!startOfRound.IsHost)
{
return CanModifyResult.False("Only for host");
}
if (!startOfRound.inShipPhase)
{
return CanModifyResult.False("Only while orbiting");
}
return CanModifyResult.True();
} }
} }

View File

@ -2,5 +2,6 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="BepInEx" value="https://nuget.bepinex.dev/v3/index.json" /> <add key="BepInEx" value="https://nuget.bepinex.dev/v3/index.json" />
<add key="AAron Thunderstore" value="https://nuget.windows10ce.com/nuget/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

View File

@ -6,6 +6,7 @@
"website_url": "https://git.vilunov.me/nikita/muzika-gromche", "website_url": "https://git.vilunov.me/nikita/muzika-gromche",
"dependencies": [ "dependencies": [
"BepInEx-BepInExPack-5.4.2100", "BepInEx-BepInExPack-5.4.2100",
"Sigurd-CSync-5.0.1" "Sigurd-CSync-5.0.1",
"ainavt.lc.lethalconfig-1.4.6"
] ]
} }