diff --git a/Commands.cs b/Commands.cs index 216d923..4785559 100644 --- a/Commands.cs +++ b/Commands.cs @@ -163,11 +163,10 @@ public void Breed(ChatCommandContext ctx) var didRemove = InventoryUtilitiesServer.TryRemoveItem(VWorld.Server.EntityManager, invEntity, breedItem, breedAmount); - _log?.LogWarning($"Tried to remove {breedAmount}, removed={didRemove}"); if (!didRemove) { BreedTimerProcess.Instance.StopCooldown(); - throw ctx.Error("You must have at least one special fish in your inventory."); + throw ctx.Error($"You must have at least one {Settings.HORSE_BREED_ITEM_NAME.Value} in your inventory."); } var pos1 = VWorld.Server.EntityManager.GetComponentData(horses[0]).Value; diff --git a/LeadAHorseToWater.csproj b/LeadAHorseToWater.csproj index 9124a29..25a04fc 100644 --- a/LeadAHorseToWater.csproj +++ b/LeadAHorseToWater.csproj @@ -22,4 +22,7 @@ + + + \ No newline at end of file diff --git a/Patches/FeedableInventorySystem_Update_Patch.cs b/Patches/FeedableInventorySystem_Update_Patch.cs index 4c39462..0828c97 100644 --- a/Patches/FeedableInventorySystem_Update_Patch.cs +++ b/Patches/FeedableInventorySystem_Update_Patch.cs @@ -3,9 +3,7 @@ using LeadAHorseToWater.Processes; using ProjectM; using System; -using BepInEx.Core.Logging.Interpolation; using Bloodstone.API; -using LeadAHorseToWater.VCFCompat; using Unity.Collections; using Unity.Entities; using Unity.Transforms; diff --git a/Plugin.cs b/Plugin.cs index 784a509..97dac34 100644 --- a/Plugin.cs +++ b/Plugin.cs @@ -4,7 +4,7 @@ using HarmonyLib; using System.Reflection; using Bloodstone.API; -using Il2CppInterop.Runtime.Injection; + namespace LeadAHorseToWater { [BepInPlugin(MyPluginInfo.PLUGIN_GUID, MyPluginInfo.PLUGIN_NAME, MyPluginInfo.PLUGIN_VERSION)] diff --git a/README.md b/README.md index 2a38412..2379c01 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,11 @@ BreedingCooldown = 600 # Default value: -570287766 BreedingRequiredItem = -570287766 +## This is the name of the required item that will be consumed. +# Setting type: String +# Default value: special fish +BreedingCostItemName = special fish + ## This is the amount of the required item consumed. # Setting type: Int32 # Default value: 1 @@ -143,7 +148,7 @@ EnabledWellPrefabs = Stone, Large https://user-images.githubusercontent.com/62450933/175365529-f6ade327-dbd0-4500-b840-128ac52cefe7.mp4 # Support me! -I have a patreon now so please support me [Here](patreon.com/user?u=97347013) so I can mod as much as I can! +I have a patreon now so please support me [Here](https://patreon.com/user?u=97347013) so I can mod as much as I can! # Developer & credits
diff --git a/Settings.cs b/Settings.cs index a471b6c..e79046f 100644 --- a/Settings.cs +++ b/Settings.cs @@ -27,6 +27,7 @@ public static class Settings public static ConfigEntry ENABLE_HORSE_BREED_COOLDOWN { get; private set; } public static ConfigEntry HORSE_BREED_COOLDOWN { get; private set; } public static ConfigEntry HORSE_BREED_PREFAB { get; private set; } + public static ConfigEntry HORSE_BREED_ITEM_NAME { get; private set; } public static ConfigEntry HORSE_BREED_COST { get; private set; } public static ConfigEntry HORSE_BREED_MUTATION_RANGE { get; private set; } public static ConfigEntry HORSE_BREED_MAX_SPEED { get; private set; } @@ -54,6 +55,7 @@ internal static void Initialize(ConfigFile config) ENABLE_HORSE_BREED_COOLDOWN = config.Bind("Breeding", "EnableBreedingCooldown", true, "Enables the cooldown for breeding horses."); HORSE_BREED_COOLDOWN = config.Bind("Breeding", "BreedingCooldown", 600, "This is the cooldown in seconds for breeding horses."); HORSE_BREED_PREFAB = config.Bind("Breeding", "BreedingRequiredItem", -570287766, "This prefab is consumed as a cost to breed horses."); + HORSE_BREED_ITEM_NAME = config.Bind("Breeding", "BreedingCostItemName", "special fish", "This is the name of the required item that will be consumed."); HORSE_BREED_COST = config.Bind("Breeding", "BreedingCostAmount", 1, "This is the amount of the required item consumed."); HORSE_BREED_MUTATION_RANGE = config.Bind("Breeding", "MutationRange", 0.05f, "This is the half range +/- this value for applied for mutation."); diff --git a/thunderstore.toml b/thunderstore.toml deleted file mode 100644 index 3dfc4b9..0000000 --- a/thunderstore.toml +++ /dev/null @@ -1,29 +0,0 @@ -[config] -schemaVersion = "0.0.1" - -[package] -namespace = "deca" -name = "LeadAHorseToWater" -versionNumber = "0.6.0" -description = "Lets your horses drink water from wells. Adds horse breeding and other commands." -websiteUrl = "https://github.com/decaprime/LeadAHorseToWater" -containsNsfwContent = false - -[package.dependencies] -BepInEx-BepInExPack_V_Rising = "1.0.0" -molenzwiebel-Wetstone = "1.1.0" -deca-VampireCommandFramework = "0.4.12" - -[build] -icon = "./icon.png" -readme = "./README.md" -outdir = "./build" - -[[build.copy]] -source = "./dist" -target = "" - -[publish] -repository = "https://thunderstore.io" -communities = ["v-rising"] -categories = [] \ No newline at end of file