diff --git a/.gitignore b/.gitignore index dfcfd56..8dd4607 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files *.rsuser @@ -23,6 +23,7 @@ mono_crash.* [Rr]eleases/ x64/ x86/ +[Ww][Ii][Nn]32/ [Aa][Rr][Mm]/ [Aa][Rr][Mm]64/ bld/ @@ -61,6 +62,9 @@ project.lock.json project.fragment.lock.json artifacts/ +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + # StyleCop StyleCopReport.xml @@ -86,6 +90,7 @@ StyleCopReport.xml *.tmp_proj *_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -137,6 +142,11 @@ _TeamCity* .axoCover/* !.axoCover/settings.json +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + # Visual Studio code coverage results *.coverage *.coveragexml @@ -284,6 +294,17 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -340,6 +361,9 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ +# Visual Studio History (VSHistory) files +.vshistory/ + # BeatPulse healthcheck temp database healthchecksdb @@ -348,3 +372,27 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml \ No newline at end of file diff --git a/ScpsInfoDisplay-NWAPI/EventHandlers.cs b/ScpsInfoDisplay-NWAPI/EventHandlers.cs index 3f6cc03..58d302d 100644 --- a/ScpsInfoDisplay-NWAPI/EventHandlers.cs +++ b/ScpsInfoDisplay-NWAPI/EventHandlers.cs @@ -80,8 +80,7 @@ private string ProcessStringVariables(string raw, Player observer, Player target .Replace("%079experience", tier.RelativeExp.ToString()); break; case Scp106Role scp106: - scp106.SubroutineModule.TryGetSubroutine(out Scp106Vigor vigor); - raw = raw.Replace("%106vigor%", Math.Floor(vigor.VigorAmount * 100).ToString()); + raw = raw.Replace("%106vigor%", Math.Floor(scp106.TargetStats.GetModule().CurValue * 100).ToString()); break; } diff --git a/ScpsInfoDisplay-NWAPI/Properties/AssemblyInfo.cs b/ScpsInfoDisplay-NWAPI/Properties/AssemblyInfo.cs index fe9468b..2f5936d 100644 --- a/ScpsInfoDisplay-NWAPI/Properties/AssemblyInfo.cs +++ b/ScpsInfoDisplay-NWAPI/Properties/AssemblyInfo.cs @@ -1,9 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("ScpsInfoDisplay")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] @@ -12,24 +9,7 @@ [assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("DE55514B-C887-4021-80A4-6572F4EE1894")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] \ No newline at end of file diff --git a/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.cs b/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.cs index 738f1be..94dcf59 100644 --- a/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.cs +++ b/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.cs @@ -10,7 +10,7 @@ internal sealed class ScpsInfoDisplay [PluginConfig] public Config Config; - [PluginEntryPoint("ScpsInfoDisplay", "2.0.1", "A plugin that displays information about SCPs in player's team.", "bladuk.")] + [PluginEntryPoint("ScpsInfoDisplay", "2.0.2", "A plugin that displays information about SCPs in player's team.", "bladuk.")] private void LoadPlugin() { Singleton = this; diff --git a/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.csproj b/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.csproj index 05c3d3a..8eddc99 100644 --- a/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.csproj +++ b/ScpsInfoDisplay-NWAPI/ScpsInfoDisplay.csproj @@ -34,26 +34,32 @@ - ..\Assembly-CSharp_publicized.dll + ..\..\References\Assembly-CSharp-Publicized.dll - ..\Assembly-CSharp-firstpass.dll + ..\..\nwapi_references\Assembly-CSharp-firstpass.dll - ..\Mirror.dll + ..\..\nwapi_references\Mirror.dll - ..\NorthwoodLib.dll + ..\..\nwapi_references\NorthwoodLib.dll - - ..\PluginAPI.dll + + ..\packages\Northwood.PluginAPI.13.1.1\lib\net48\PluginAPI.dll + + + ..\..\References\Pooling.dll - ..\UnityEngine.CoreModule.dll + ..\..\nwapi_references\UnityEngine.CoreModule.dll + + + ..\packages\YamlDotNet.11.0.1\lib\net45\YamlDotNet.dll @@ -63,6 +69,9 @@ + + + "; + [Description("Display debug messages in server console?")] public bool Debug { get; set; } = false; } diff --git a/ScpsInfoDisplay/EventHandlers.cs b/ScpsInfoDisplay/EventHandlers.cs index 416b901..fe1b9e9 100644 --- a/ScpsInfoDisplay/EventHandlers.cs +++ b/ScpsInfoDisplay/EventHandlers.cs @@ -11,7 +11,7 @@ namespace ScpsInfoDisplay { - internal class EventHandlers + internal sealed class EventHandlers { private CoroutineHandle _displayCoroutine; diff --git a/ScpsInfoDisplay/Properties/AssemblyInfo.cs b/ScpsInfoDisplay/Properties/AssemblyInfo.cs index 4a0faf1..fc04c23 100644 --- a/ScpsInfoDisplay/Properties/AssemblyInfo.cs +++ b/ScpsInfoDisplay/Properties/AssemblyInfo.cs @@ -1,9 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("ScpsInfoDisplay")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] @@ -12,24 +9,7 @@ [assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("8daa7834-8141-448e-8694-ebe9f4800c66")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] diff --git a/ScpsInfoDisplay/ScpsInfoDisplay.cs b/ScpsInfoDisplay/ScpsInfoDisplay.cs index b9ab3f4..0508b3f 100644 --- a/ScpsInfoDisplay/ScpsInfoDisplay.cs +++ b/ScpsInfoDisplay/ScpsInfoDisplay.cs @@ -9,8 +9,8 @@ internal class ScpsInfoDisplay : Plugin public override string Prefix => "scpsinfodisplay"; public override string Name => "ScpsInfoDisplay"; public override string Author => "bladuk."; - public override Version Version { get; } = new Version(2, 0, 1); - public override Version RequiredExiledVersion { get; } = new Version(6, 0, 0); + public override Version Version { get; } = new Version(2, 0, 2); + public override Version RequiredExiledVersion { get; } = new Version(8, 2, 1); public static ScpsInfoDisplay Singleton = new ScpsInfoDisplay(); private EventHandlers _eventHandlers; diff --git a/ScpsInfoDisplay/ScpsInfoDisplay.csproj b/ScpsInfoDisplay/ScpsInfoDisplay.csproj index 08833a3..d46061e 100644 --- a/ScpsInfoDisplay/ScpsInfoDisplay.csproj +++ b/ScpsInfoDisplay/ScpsInfoDisplay.csproj @@ -31,26 +31,53 @@ 4 - - ..\..\..\..\Steam\steamapps\common\SCP Secret Laboratory Dedicated Server\SCPSL_Data\Managed\Assembly-CSharp.dll + + ..\packages\EXILED.8.2.1\lib\net48\Assembly-CSharp-Publicized.dll ..\..\Assembly-CSharp-firstpass.dll - - ..\..\Exiled.API.dll + + ..\packages\EXILED.8.2.1\lib\net48\CommandSystem.Core.dll - - ..\..\Exiled.Events.dll + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.API.dll - - ..\..\..\nwapi_plugins\NorthwoodLib.dll + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.CreditTags.dll + + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.CustomItems.dll + + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.CustomRoles.dll + + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.Events.dll + + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.Loader.dll + + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.Permissions.dll + + + ..\packages\EXILED.8.2.1\lib\net48\Exiled.Updater.dll + + + ..\packages\EXILED.8.2.1\lib\net48\NorthwoodLib.dll + + + ..\packages\EXILED.8.2.1\lib\net48\PluginAPI.dll ..\..\UnityEngine.CoreModule.dll + + ..\packages\EXILED.8.2.1\lib\net48\YamlDotNet.dll + @@ -59,5 +86,9 @@ + + + + \ No newline at end of file