From 851093197c66986cd4e7b2832273efe7ea2cd6ed Mon Sep 17 00:00:00 2001 From: Toastie Date: Fri, 23 Aug 2024 19:01:38 +1200 Subject: [PATCH] Fixed some .waifu related strings --- .../Gambling/Waifus/WaifuClaimCommands.cs | 18 +++++++++++++++--- .../strings/responses/responses.en-US.json | 8 ++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/EllieBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs b/src/EllieBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs index d488e72..a25bdd9 100644 --- a/src/EllieBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs +++ b/src/EllieBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs @@ -70,7 +70,11 @@ public partial class Gambling return; } - var msg = GetText(strs.waifu_claimed(Format.Bold(target.ToString()), N(amount))); + var msg = GetText(strs.waifu_claimed( + Format.Bold(ctx.User.ToString()), + Format.Bold(target.ToString()), + N(amount))); + if (w.Affinity?.UserId == ctx.User.Id) msg += "\n" + GetText(strs.waifu_fulfilled(target, N(w.Price))); else @@ -191,13 +195,21 @@ public partial class Gambling } if (user is null) + { await Response().Confirm(strs.waifu_affinity_reset).SendAsync(); + } else if (oldAff is null) - await Response().Confirm(strs.waifu_affinity_set(Format.Bold(user.ToString()))).SendAsync(); + { + await Response() + .Confirm(strs.waifu_affinity_set(Format.Bold(ctx.User.ToString()), Format.Bold(user.ToString()))) + .SendAsync(); + } else { await Response() - .Confirm(strs.waifu_affinity_changed(Format.Bold(oldAff.ToString()), + .Confirm(strs.waifu_affinity_changed( + Format.Bold(ctx.User.ToString()), + Format.Bold(oldAff.ToString()), Format.Bold(user.ToString()))) .SendAsync(); } diff --git a/src/EllieBot/data/strings/responses/responses.en-US.json b/src/EllieBot/data/strings/responses/responses.en-US.json index 31ee64f..3402440 100644 --- a/src/EllieBot/data/strings/responses/responses.en-US.json +++ b/src/EllieBot/data/strings/responses/responses.en-US.json @@ -307,13 +307,13 @@ "waifus_none": "No waifus have been claimed yet.", "waifus_top_waifus": "Top Waifus", "waifu_affinity_already": "your affinity is already set to that waifu or you're trying to remove your affinity while not having one.", - "waifu_affinity_changed": "changed their affinity from {0} to {1}.\n\n*This is morally questionable.*🤔", + "waifu_affinity_changed": "{0} changed their affinity from {1} to {2}.\n\n*This is morally questionable.*🤔", "waifu_affinity_cooldown": "You must wait {0} hours and {1} minutes in order to change your affinity again.", "waifu_affinity_reset": "Your affinity is reset. You no longer have a person you like.", - "waifu_affinity_set": "wants to be {0}'s waifu. Aww <3", - "waifu_claimed": "claimed {0} as their waifu for {1}!", + "waifu_affinity_set": "{0} wants to be {1}'s waifu. Aww <3", + "waifu_claimed": "{0} claimed {1} as their waifu for {2}!", "waifu_divorced_like": "You have divorced a waifu who likes you. You heartless monster.\n{0} received {1} as a compensation.", - "waifu_egomaniac": "you can't set affinity to yourself, you egomaniac.", + "waifu_egomaniac": "You can't set affinity to yourself, you egomaniac.", "waifu_fulfilled": "🎉 Their love is fulfilled! 🎉\n{0}'s new value is {1}!", "waifu_isnt_cheap": "No waifu is that cheap. You must pay at least {0} to get a waifu, even if their actual value is lower.", "waifu_not_enough": "You must pay {0} or more to claim that waifu!",