diff --git a/Assets/MeatKit/BuildProfile.asset b/Assets/MeatKit/BuildProfile.asset index dbb9a8d..5fbb613 100644 --- a/Assets/MeatKit/BuildProfile.asset +++ b/Assets/MeatKit/BuildProfile.asset @@ -14,9 +14,9 @@ MonoBehaviour: PackageName: TNH_Quality_of_Life_Improvements Author: muskit Version: 1.0.0 - Icon: {fileID: 2800000, guid: f999bddab1821b94691466e97cc6891f, type: 3} + Icon: {fileID: 2800000, guid: 785b7946398f5314b95bf593d2d77d67, type: 3} ReadMe: {fileID: 102900000, guid: ab1d6dea017447a48ac348db588a6f35, type: 3} - WebsiteURL: + WebsiteURL: https://github.com/muskit/TNH-Quality-of-Life-Improvements Description: Quality of life improvements to the Take and Hold experience. AdditionalDependencies: - BepInEx-BepInExPack_H3VR-5.4.1700 diff --git a/Assets/MeatKit/MeatKitPlugin.cs b/Assets/MeatKit/MeatKitPlugin.cs index 0cdd2d1..0f5ff97 100644 --- a/Assets/MeatKit/MeatKitPlugin.cs +++ b/Assets/MeatKit/MeatKitPlugin.cs @@ -2,6 +2,7 @@ using System.IO; using System.Reflection; using BepInEx; +using BepInEx.Bootstrap; using BepInEx.Configuration; using UnityEngine; using UnityEngine.SceneManagement; @@ -32,6 +33,8 @@ public class MeatKitPlugin : BaseUnityPlugin private static readonly string BasePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); #pragma warning restore 414 + private bool lpcKilled = false; + public static AssetBundle bundle; public static ConfigEntry showHPBackground; @@ -85,5 +88,24 @@ public class MeatKitPlugin : BaseUnityPlugin } // DO NOT EDIT. private void LoadAssets() {} + + /// + /// Its only purpose: to kill TNH Leaderboard Player Count + /// + private void Update() + { + if (lpcKilled) + return; + + foreach (var plugin in Chainloader.PluginInfos) + { + if (plugin.Key == "me.muskit.tnhLeaderboardPlayerCount") + { + Logger.LogWarning("TNH Leaderboard Player Count mod detected. Destroying it to avoid interference."); + Destroy(plugin.Value.Instance); + lpcKilled = true; + } + } + } } #endif \ No newline at end of file diff --git a/Assets/README.md b/Assets/README.md index e5230d2..725c274 100644 --- a/Assets/README.md +++ b/Assets/README.md @@ -9,4 +9,6 @@ This mod adds quality of life improvements to the *Take and Hold* experience. Enable/disable these features in your mod manager's *Config editor*. +For any issues/ideas, please create an issue on the GitHub repo (linked on Thunderstore page). + **NOTE: [*TNH Leaderboard Player Count*](https://h3vr.thunderstore.io/package/muskit/TNH_Leaderboard_Player_Count/) has been merged with this mod. If installed, please remove that mod as it lacks features and is no longer supported.** \ No newline at end of file diff --git a/Assets/thumbnail better.png b/Assets/thumbnail better.png new file mode 100644 index 0000000..976757f Binary files /dev/null and b/Assets/thumbnail better.png differ diff --git a/Assets/thumbnail better.png.meta b/Assets/thumbnail better.png.meta new file mode 100644 index 0000000..f9391e4 --- /dev/null +++ b/Assets/thumbnail better.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 785b7946398f5314b95bf593d2d77d67 +timeCreated: 1642976088 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/thumbnail.png b/Assets/thumbnail.png new file mode 100644 index 0000000..092c912 Binary files /dev/null and b/Assets/thumbnail.png differ diff --git a/Assets/thumbnail.png.meta b/Assets/thumbnail.png.meta new file mode 100644 index 0000000..84f4041 --- /dev/null +++ b/Assets/thumbnail.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: d11c6ee1f944fe443aa68a2d863f256d +timeCreated: 1642971887 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/README.md b/README.md index 149f233..6f3341b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,17 @@ # TNH Quality of Life Improvements A *Hot Dogs, Horseshoes, and Hand Grenades* mod that adds quality of life improvements to the *Take and Hold* experience. +Get it on [Thunderstore](https://h3vr.thunderstore.io/package/muskit/TNH_Quality_of_Life_Improvements/). + ## Features -* More visible HP counter -* Token and hold counter on wrist -* Player count for online leaderboards - * Incompatible with [*TakeAndHoldTweaker*](https://github.com/devyndamonster/TakeAndHoldTweaker/) +More visible HP counter
+ + +Token and hold counter on wrist
+ + +Player count for online leaderboards (won't work w/ *TNHTweaker* installed)
+
Features are modifiable via the mod manager's *Config editor*. diff --git a/preview/hp.png b/preview/hp.png new file mode 100644 index 0000000..5f37280 Binary files /dev/null and b/preview/hp.png differ diff --git a/preview/leaderboard.png b/preview/leaderboard.png new file mode 100644 index 0000000..8f5b1b8 Binary files /dev/null and b/preview/leaderboard.png differ diff --git a/preview/stats.png b/preview/stats.png new file mode 100644 index 0000000..496db0a Binary files /dev/null and b/preview/stats.png differ