From 1a0d2a9b047d3859f1698ddc7246e1889a5f642a Mon Sep 17 00:00:00 2001 From: Lan <50151341+Lannnnnnnnn@users.noreply.github.com> Date: Thu, 16 Apr 2020 21:46:02 +0300 Subject: [PATCH] minor edits 2 new fish emotes, combined ratetrap into a single command, renamed fishprofile to statprofile --- Kehyeedra3/Commands/Economy.cs | 2 +- Kehyeedra3/Commands/Stuff.cs | 52 ++++++++++++++------------- Kehyeedra3/Services/Models/Fishing.cs | 4 +-- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Kehyeedra3/Commands/Economy.cs b/Kehyeedra3/Commands/Economy.cs index d62beaa..4f9ca4b 100644 --- a/Kehyeedra3/Commands/Economy.cs +++ b/Kehyeedra3/Commands/Economy.cs @@ -1074,7 +1074,7 @@ namespace Kehyeedra3.Commands } [Command("stats"),Summary("View a user's stats")] - public async Task FishProfile(IUser otherUser = null) + public async Task StatProfile(IUser otherUser = null) { using (var database = new ApplicationDbContextFactory().CreateDbContext()) { diff --git a/Kehyeedra3/Commands/Stuff.cs b/Kehyeedra3/Commands/Stuff.cs index ff37653..bd8e392 100644 --- a/Kehyeedra3/Commands/Stuff.cs +++ b/Kehyeedra3/Commands/Stuff.cs @@ -37,37 +37,41 @@ namespace Kehyeedra3.Commands } [Command("ratetrap"), Summary("Rates your or another person's trap potential as a percentage")] - public async Task RateTrap() + public async Task RateTrap( string name = null) { - Random rando = new Random(); - Random rando1 = new Random(); - int trapRating0 = rando.Next(0, 101); - if (trapRating0 == 100) - { - int trapRating1 = rando1.Next(0, 1001); - await Context.Channel.SendMessageAsync($"I'd say right now you're {trapRating1}% passable"); - } - else - { - await Context.Channel.SendMessageAsync($"I'd say right now you're {trapRating0}% passable"); - } - } - [Command("ratetrap"), Summary("Rates your or another person's trap potential as a percentage")] - public async Task RateOtherTrap([Remainder] string name) - { - Random rando = new Random(); - Random rando1 = new Random(); - int trapRating0 = rando.Next(0, 101); - if (trapRating0 == 100) + if (name == null) { - int trapRating1 = rando1.Next(0, 1001); - await Context.Channel.SendMessageAsync($"I'd say right now {name} is {trapRating1}% passable"); + Random rando = new Random(); + Random rando1 = new Random(); + int trapRating0 = rando.Next(0, 101); + if (trapRating0 == 100) + { + int trapRating1 = rando1.Next(0, 1001); + await Context.Channel.SendMessageAsync($"I'd say right now you're {trapRating1}% passable"); + } + else + { + await Context.Channel.SendMessageAsync($"I'd say right now you're {trapRating0}% passable"); + } } else { - await Context.Channel.SendMessageAsync($"I'd say right now {name} is {trapRating0}% passable"); + Random rando = new Random(); + Random rando1 = new Random(); + int trapRating0 = rando.Next(0, 101); + if (trapRating0 == 100) + { + int trapRating1 = rando1.Next(0, 1001); + await Context.Channel.SendMessageAsync($"I'd say right now {name} is {trapRating1}% passable"); + } + else + { + await Context.Channel.SendMessageAsync($"I'd say right now {name} is {trapRating0}% passable"); + } } + } + [Command("ratertrap"), Summary("ratertrap")] public async Task RaterTrap() { diff --git a/Kehyeedra3/Services/Models/Fishing.cs b/Kehyeedra3/Services/Models/Fishing.cs index aaea4e4..29cbb4f 100644 --- a/Kehyeedra3/Services/Models/Fishing.cs +++ b/Kehyeedra3/Services/Models/Fishing.cs @@ -117,14 +117,14 @@ namespace Kehyeedra3.Services.Models { Id = FishSpecies.Stargazer, Name = "Stargazer", - Emote = "<:missingUnc:682586846857003064>[Stargazer]", + Emote = "<:stargazerleft:700414644774240286><:stargazerright:700413063442202684>", Rarity = FishRarity.Uncommon }, new Fish() { Id = FishSpecies.Isopod, Name = "Isopod", - Emote = "<:missingUnc:682586846857003064>[Isopod]", + Emote = "<:isopodleft:700397032271249428><:isopodright:700397031922991206>", Rarity = FishRarity.Uncommon }, new Fish()