WIP: Add config synchronization via CSync
This commit is contained in:
parent
baaba2be6f
commit
f87da1dfed
|
@ -15,6 +15,8 @@
|
||||||
<PackageReference Include="BepInEx.PluginInfoProps" Version="1.*"/>
|
<PackageReference Include="BepInEx.PluginInfoProps" Version="1.*"/>
|
||||||
<PackageReference Include="UnityEngine.Modules" Version="2022.3.9" IncludeAssets="compile"/>
|
<PackageReference Include="UnityEngine.Modules" Version="2022.3.9" IncludeAssets="compile"/>
|
||||||
<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 -->
|
||||||
|
<PackageReference Include="Sigurd.BepInEx.CSync" Version="5.0.1" Publicize="true" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -5,6 +5,8 @@ using System.Linq;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using BepInEx;
|
using BepInEx;
|
||||||
using BepInEx.Configuration;
|
using BepInEx.Configuration;
|
||||||
|
using CSync.Extensions;
|
||||||
|
using CSync.Lib;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Networking;
|
using UnityEngine.Networking;
|
||||||
|
@ -12,8 +14,11 @@ using UnityEngine.Networking;
|
||||||
namespace MuzikaGromche
|
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")]
|
||||||
public class Plugin : BaseUnityPlugin
|
public class Plugin : BaseUnityPlugin
|
||||||
{
|
{
|
||||||
|
internal new static Config Config { get; private set; } = null!;
|
||||||
|
|
||||||
public static Track[] Tracks = [
|
public static Track[] Tracks = [
|
||||||
new Track
|
new Track
|
||||||
{
|
{
|
||||||
|
@ -66,7 +71,7 @@ namespace MuzikaGromche
|
||||||
var trackId = rwi.GetRandomWeightedIndex(seed);
|
var trackId = rwi.GetRandomWeightedIndex(seed);
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
// Override for testing
|
// Override for testing
|
||||||
trackId = IndexOfTrack("DeployDestroy");
|
// trackId = IndexOfTrack("DeployDestroy");
|
||||||
#endif
|
#endif
|
||||||
var track = Tracks[trackId];
|
var track = Tracks[trackId];
|
||||||
Debug.Log($"Seed is {seed}, chosen track is \"{track.Name}\", #{trackId} of {rwi}");
|
Debug.Log($"Seed is {seed}, chosen track is \"{track.Name}\", #{trackId} of {rwi}");
|
||||||
|
@ -151,13 +156,7 @@ namespace MuzikaGromche
|
||||||
track.LoadedStart = DownloadHandlerAudioClip.GetContent(requests[i * 2]);
|
track.LoadedStart = DownloadHandlerAudioClip.GetContent(requests[i * 2]);
|
||||||
track.LoadedLoop = DownloadHandlerAudioClip.GetContent(requests[i * 2 + 1]);
|
track.LoadedLoop = DownloadHandlerAudioClip.GetContent(requests[i * 2 + 1]);
|
||||||
}
|
}
|
||||||
// Initialize config
|
Config = new Config(base.Config);
|
||||||
var chanceRange = new AcceptableValueRange<int>(0, 100);
|
|
||||||
foreach (var track in Tracks)
|
|
||||||
{
|
|
||||||
string description = $"Random (relative) chance of selecting track {track.Name}. Set to zero to effectively disable the track.";
|
|
||||||
track.Weight = Config.Bind("Tracks", track.Name, 50, new ConfigDescription(description, chanceRange));
|
|
||||||
}
|
|
||||||
new Harmony(PluginInfo.PLUGIN_NAME).PatchAll(typeof(JesterPatch));
|
new Harmony(PluginInfo.PLUGIN_NAME).PatchAll(typeof(JesterPatch));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -187,7 +186,7 @@ namespace MuzikaGromche
|
||||||
public AudioClip LoadedLoop;
|
public AudioClip LoadedLoop;
|
||||||
|
|
||||||
// How often this track should be chosen, relative to the sum of weights of all tracks.
|
// How often this track should be chosen, relative to the sum of weights of all tracks.
|
||||||
public ConfigEntry<int> Weight;
|
public SyncedEntry<int> Weight;
|
||||||
|
|
||||||
public string FileNameStart => $"{Name}Start.{Ext}";
|
public string FileNameStart => $"{Name}Start.{Ext}";
|
||||||
public string FileNameLoop => $"{Name}Loop.{Ext}";
|
public string FileNameLoop => $"{Name}Loop.{Ext}";
|
||||||
|
@ -287,6 +286,55 @@ namespace MuzikaGromche
|
||||||
readonly public int TotalWeights { get; }
|
readonly public int TotalWeights { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
// TODO: Comment out for now
|
||||||
|
DisplayLyrics = configFile.Bind("General", "Display Lyrics", false, "Toggle lyrics display");
|
||||||
|
|
||||||
|
var chanceRange = new AcceptableValueRange<int>(0, 100);
|
||||||
|
|
||||||
|
foreach (var track in Plugin.Tracks)
|
||||||
|
{
|
||||||
|
string description = $"Random (relative) chance of selecting track {track.Name}. Set to zero to effectively disable the track.";
|
||||||
|
track.Weight = configFile.BindSyncedEntry(
|
||||||
|
new ConfigDefinition("Tracks", track.Name),
|
||||||
|
50,
|
||||||
|
new ConfigDescription(description, chanceRange, track));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var track in Plugin.Tracks)
|
||||||
|
{
|
||||||
|
// This is basically what ConfigFile.PopulateEntryContainer does
|
||||||
|
SyncedEntryBase entryBase = track.Weight;
|
||||||
|
EntryContainer.Add(entryBase.BoxedEntry.ToSyncedEntryIdentifier(), entryBase);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Remove debug lines
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[HarmonyPatch(typeof(JesterAI))]
|
[HarmonyPatch(typeof(JesterAI))]
|
||||||
internal class JesterPatch
|
internal class JesterPatch
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
"description": "Glaza zakryvaj",
|
"description": "Glaza zakryvaj",
|
||||||
"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"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue