lan/Kehyeedra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor adjustments

Browse Source 
and tiny steps
This commit is contained in:
Lan
2022-10-20 19:20:47 +03:00
parent 130d56b5f6
commit a3e32c077f
6 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Kehyeedra3/Commands/Admin.cs
View File

@@ -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(); MemoryStream outputStream = new MemoryStream();

9
Kehyeedra3/Commands/Economy.cs
View File

@@ -703,7 +703,8 @@ namespace Kehyeedra3.Commands
if (nocard.ToLowerInvariant() != "nocard") 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(); MemoryStream outputStream = new MemoryStream();
@@ -1194,7 +1195,7 @@ namespace Kehyeedra3.Commands
await ReplyAsync($"{Context.User.Mention}\n{message}"); await ReplyAsync($"{Context.User.Mention}\n{message}");
} }
} }
[RequireRolePrecondition(AccessLevel.ServerAdmin)] [RequireRolePrecondition(AccessLevel.BotOwner)]
[Command("tradebuy", RunMode = RunMode.Async), Summary("Unfinished command")] [Command("tradebuy", RunMode = RunMode.Async), Summary("Unfinished command")]
public async Task TradingBuy(int amount, string itemtype, int price, [Remainder] string item) 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")] [Command("tradesell"), Summary("Unfinished command")]
public async Task TradingSell(int amount, string itemtype, int price, [Remainder] string item) 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); 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")] [Command("tradeoffers"), Summary("Unfinished command")]
public async Task ShowOffers(bool localOffers = true) public async Task ShowOffers(bool localOffers = true)
{ {

2
Kehyeedra3/Commands/Interactive.cs
View File

@@ -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.")] [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) public async Task BattleFish(string option = null, [Remainder]string sec = null)
{ {

14
Kehyeedra3/Helpers.cs
View File

@@ -12,7 +12,7 @@ namespace Kehyeedra3
{ {
public static class Helpers 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 path = Path.Combine(Environment.CurrentDirectory, "btextures");
string fpath = Path.Combine(path, "fish"); 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("*", "")}."; 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")) if (levelUp.Contains("reach"))
{ {
label = label.Replace("\nYou gain", "\n\nYou gain"); label = label.Replace("\nYou gain", "\n\nYou gain");

21
Kehyeedra3/Services/Models/Farming.cs
View File

@@ -129,6 +129,15 @@ namespace Kehyeedra3.Services.Models
Price = 0 Price = 0
}, },
new FLand() new FLand()
{
Id = FarmLand.Bathtub,
Name = "Bathtub",
Type = FarmType.Fish,
Tier = FarmTier.T0,
WorkerMax = 1,
Price = 0,
},
new FLand()
{ {
Id = FarmLand.SPlot, Id = FarmLand.SPlot,
Name = "Small Plot", Name = "Small Plot",
@@ -142,7 +151,7 @@ namespace Kehyeedra3.Services.Models
Id = FarmLand.MPlot, Id = FarmLand.MPlot,
Name = "Medium Plot", Name = "Medium Plot",
Type = FarmType.Plant, Type = FarmType.Plant,
Tier = FarmTier.T3, Tier = FarmTier.T2,
WorkerMax = 4, WorkerMax = 4,
Price = 1000 Price = 1000
}, },
@@ -151,7 +160,7 @@ namespace Kehyeedra3.Services.Models
Id = FarmLand.LPlot, Id = FarmLand.LPlot,
Name = "Large Plot", Name = "Large Plot",
Type = FarmType.Plant, Type = FarmType.Plant,
Tier = FarmTier.T5, Tier = FarmTier.T3,
WorkerMax = 6, WorkerMax = 6,
Price = 1400 Price = 1400
}, },
@@ -168,8 +177,10 @@ namespace Kehyeedra3.Services.Models
} }
public enum FarmType public enum FarmType
{ {
Plant = 0, Any = 0,
Fish = 1, Plant = 1,
Mushroom = 2,
Fish = 3,
} }
public enum FarmCrop public enum FarmCrop
{ {
@@ -180,6 +191,8 @@ namespace Kehyeedra3.Services.Models
LuckyLeek = 100, LuckyLeek = 100,
Bookweed = 101, Bookweed = 101,
} }
public enum FarmTier public enum FarmTier
{ {

6
Kehyeedra3/Services/Models/User.cs
View File

@@ -62,13 +62,13 @@ namespace Kehyeedra3.Services.Models
{ {
Id = Items.Lettuce, Id = Items.Lettuce,
Name = "Learning Lettuce", Name = "Learning Lettuce",
Price = 25 Price = 15
}, },
new Item() new Item()
{ {
Id = Items.RareBait, Id = Items.RareBait,
Name = "Rare Bait", Name = "Rare Bait",
Price = 25 Price = 15
}, },
new Item() new Item()
{ {
@@ -80,7 +80,7 @@ namespace Kehyeedra3.Services.Models
{ {
Id = Items.SpecialBait, Id = Items.SpecialBait,
Name = "Master Bait", Name = "Master Bait",
Price = 50 Price = 30
}, },
new Item() new Item()
{ {