diff --git a/Kehyeedra3/Commands/Admin.cs b/Kehyeedra3/Commands/Admin.cs index 797ee6d..77c8e2d 100644 --- a/Kehyeedra3/Commands/Admin.cs +++ b/Kehyeedra3/Commands/Admin.cs @@ -612,7 +612,7 @@ namespace Kehyeedra3.Commands } } - var (cardCollection, outFormatEnum, outFormat) = await Helpers.MakeFishCardAsync(fish, 0, 0, 0, "", 0, 0, 0); + var (cardCollection, outFormatEnum, outFormat) = await Helpers.MakeFishCardAsync(fish, 0, 0, 0, "", 0, 0, 0, false, false, false); MemoryStream outputStream = new MemoryStream(); diff --git a/Kehyeedra3/Commands/Economy.cs b/Kehyeedra3/Commands/Economy.cs index 794560c..d0790b5 100644 --- a/Kehyeedra3/Commands/Economy.cs +++ b/Kehyeedra3/Commands/Economy.cs @@ -703,7 +703,8 @@ namespace Kehyeedra3.Commands if (nocard.ToLowerInvariant() != "nocard") { - var (cardCollection, outFormatEnum, outFormat) = await Helpers.MakeFishCardAsync(fish, user.TXp, user.FXp, user.Xp, lvlUp, weight, xp, dcatch); + + var (cardCollection, outFormatEnum, outFormat) = await Helpers.MakeFishCardAsync(fish, user.TXp, user.FXp, user.Xp, lvlUp, weight, xp, dcatch, bRar, bBig, bLet); MemoryStream outputStream = new MemoryStream(); @@ -1194,7 +1195,7 @@ namespace Kehyeedra3.Commands await ReplyAsync($"{Context.User.Mention}\n{message}"); } } - [RequireRolePrecondition(AccessLevel.ServerAdmin)] + [RequireRolePrecondition(AccessLevel.BotOwner)] [Command("tradebuy", RunMode = RunMode.Async), Summary("Unfinished command")] public async Task TradingBuy(int amount, string itemtype, int price, [Remainder] string item) { @@ -1275,7 +1276,7 @@ namespace Kehyeedra3.Commands } } } - [RequireRolePrecondition(AccessLevel.ServerAdmin)] + [RequireRolePrecondition(AccessLevel.BotOwner)] [Command("tradesell"), Summary("Unfinished command")] public async Task TradingSell(int amount, string itemtype, int price, [Remainder] string item) { @@ -1322,7 +1323,7 @@ namespace Kehyeedra3.Commands await Context.Channel.SendMessageAsync($"{Context.User.Mention}\nInvalid trade type. Come back when the error command is fixed lmaoy").ConfigureAwait(false); } } - [RequireRolePrecondition(AccessLevel.ServerAdmin)] + [RequireRolePrecondition(AccessLevel.BotOwner)] [Command("tradeoffers"), Summary("Unfinished command")] public async Task ShowOffers(bool localOffers = true) { diff --git a/Kehyeedra3/Commands/Interactive.cs b/Kehyeedra3/Commands/Interactive.cs index b47c0e6..fc6da3d 100644 --- a/Kehyeedra3/Commands/Interactive.cs +++ b/Kehyeedra3/Commands/Interactive.cs @@ -28,7 +28,7 @@ namespace Kehyeedra3.Commands "", "" }; - + [RequireRolePrecondition(AccessLevel.BotOwner)] [Command("battlefish", RunMode = RunMode.Async),Alias("bf"),Summary("Type **bf help** or **bf h** for help with this command.")] public async Task BattleFish(string option = null, [Remainder]string sec = null) { diff --git a/Kehyeedra3/Helpers.cs b/Kehyeedra3/Helpers.cs index 31955a1..88bce69 100644 --- a/Kehyeedra3/Helpers.cs +++ b/Kehyeedra3/Helpers.cs @@ -12,7 +12,7 @@ namespace Kehyeedra3 { public static class Helpers { - public static async Task<(MagickImageCollection cardCollection, MagickFormat outFormatEnum, string outFormat)> MakeFishCardAsync(Fish fish, ulong currentXp, ulong floorXp, ulong nextLevelXp, string levelUp, int weight, ulong xp, int dcatch) + public static async Task<(MagickImageCollection cardCollection, MagickFormat outFormatEnum, string outFormat)> MakeFishCardAsync(Fish fish, ulong currentXp, ulong floorXp, ulong nextLevelXp, string levelUp, int weight, ulong xp, int dcatch, bool bRar, bool bBig, bool bLet) { string path = Path.Combine(Environment.CurrentDirectory, "btextures"); string fpath = Path.Combine(path, "fish"); @@ -22,6 +22,18 @@ namespace Kehyeedra3 { label = $"You caught {dcatch} {fish.Name}.\n{weight / 100d}kg {fish.Rarity} fish.\n\nYou gain {xp}xp.\n{levelUp.Replace("*", "")}."; } + if (bRar) + { + label = label.Replace($"{fish.Rarity}", $"{fish.Rarity}(+)"); + } + if (bLet) + { + label = label.Replace($"{xp}xp", $"{xp}xp(+10%)"); + } + if (bBig) + { + label = label.Replace($"{weight / 100d}kg", $"{weight / 100d}kg(+)"); + } if (levelUp.Contains("reach")) { label = label.Replace("\nYou gain", "\n\nYou gain"); diff --git a/Kehyeedra3/Services/Models/Farming.cs b/Kehyeedra3/Services/Models/Farming.cs index 854c987..7701ad0 100644 --- a/Kehyeedra3/Services/Models/Farming.cs +++ b/Kehyeedra3/Services/Models/Farming.cs @@ -129,6 +129,15 @@ namespace Kehyeedra3.Services.Models Price = 0 }, new FLand() + { + Id = FarmLand.Bathtub, + Name = "Bathtub", + Type = FarmType.Fish, + Tier = FarmTier.T0, + WorkerMax = 1, + Price = 0, + }, + new FLand() { Id = FarmLand.SPlot, Name = "Small Plot", @@ -142,7 +151,7 @@ namespace Kehyeedra3.Services.Models Id = FarmLand.MPlot, Name = "Medium Plot", Type = FarmType.Plant, - Tier = FarmTier.T3, + Tier = FarmTier.T2, WorkerMax = 4, Price = 1000 }, @@ -151,7 +160,7 @@ namespace Kehyeedra3.Services.Models Id = FarmLand.LPlot, Name = "Large Plot", Type = FarmType.Plant, - Tier = FarmTier.T5, + Tier = FarmTier.T3, WorkerMax = 6, Price = 1400 }, @@ -168,8 +177,10 @@ namespace Kehyeedra3.Services.Models } public enum FarmType { - Plant = 0, - Fish = 1, + Any = 0, + Plant = 1, + Mushroom = 2, + Fish = 3, } public enum FarmCrop { @@ -180,6 +191,8 @@ namespace Kehyeedra3.Services.Models LuckyLeek = 100, Bookweed = 101, + + } public enum FarmTier { diff --git a/Kehyeedra3/Services/Models/User.cs b/Kehyeedra3/Services/Models/User.cs index cb43b1b..80cae6b 100644 --- a/Kehyeedra3/Services/Models/User.cs +++ b/Kehyeedra3/Services/Models/User.cs @@ -62,13 +62,13 @@ namespace Kehyeedra3.Services.Models { Id = Items.Lettuce, Name = "Learning Lettuce", - Price = 25 + Price = 15 }, new Item() { Id = Items.RareBait, Name = "Rare Bait", - Price = 25 + Price = 15 }, new Item() { @@ -80,7 +80,7 @@ namespace Kehyeedra3.Services.Models { Id = Items.SpecialBait, Name = "Master Bait", - Price = 50 + Price = 30 }, new Item() {