Skip to content

Commit 806c3e9

Browse files
committed
🐛 Caught one before release
1 parent c505a6b commit 806c3e9

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

killua/cogs/actions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ async def do_action(self, ctx: commands.Context, members: List[discord.Member] =
149149
badge = self.save_stat(member, ctx.command.name, True)
150150
if badge:
151151
try:
152-
await member.send(f"You got the {KILLUA_BADGES[badge]} badge for being {ctx.command.name}ed more than 500 times! Check it out with `k!pofile`!")
152+
await member.send(f"Congratulation! You got the {KILLUA_BADGES[badge]} badge for being {ctx.command.name}ed more than 500 times! So many hugs :D. Check your shiny new badge out with `k!pofile`!")
153153
except discord.Forbidden:
154154
pass
155155

156156
badge = self.save_stat(ctx.author, ctx.command.name, False, len(allowed))
157157
if badge:
158158
try:
159-
await ctx.author.send(f"You got the {KILLUA_BADGES[badge]} badge for {ctx.command.name}ing someone more than 500 times! Check it out with `k!pofile`!")
159+
await ctx.author.send(f"Congratulations! You got the {KILLUA_BADGES[badge]} badge for {ctx.command.name}ing someone more than 1000 times! So many hugs :D. Check your shiny new badge out with `k!pofile`!")
160160
except discord.Forbidden:
161161
pass
162162
embed = await self.action_embed(ctx.command.name, ctx.author, members, disabled)

killua/cogs/shop.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ async def card(self, ctx: commands.Context, item: str):
253253

254254
shop_data = DB.const.find_one({"_id": "shop"})
255255
shop_items: list = shop_data["offers"]
256-
print(shop_items)
257256
user = User(ctx.author.id)
258257

259258
try:

killua/utils/classes.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ def __init__(self, user_id: int):
596596
def badges(self) -> List[str]:
597597
badges = self._badges.copy() # We do not want the badges added to _badges every time we call this property else it would add the same badge multiple times
598598

599-
if self.action_stats.get("hug", {}).get("used", 0) >= 500:
599+
if self.action_stats.get("hug", {}).get("used", 0) >= 1000:
600600
badges.append("pro_hugger")
601601

602602
if self.action_stats.get("hug", {}).get("received", 0) >= 500:
@@ -845,13 +845,11 @@ def add_action(self, action: str, was_target: bool = False, amount: int = 1) ->
845845
self._update_val("action_stats", self.action_stats)
846846

847847
# Check if action of a certain type are more than x and if so, add a badge. TODO these are subject to change along with the requirements
848-
if self.action_stats[action]["used"] >= 500 and not "pro_hugger" in self.badges:
849-
if action == "hug":
850-
return "pro_hugger"
848+
if self.action_stats[action]["used"] - amount < 1000 and self.action_stats[action]["used"] >= 1000 and action == "hug":
849+
return "pro_hugger"
851850

852-
if self.action_stats[action]["targeted"] >= 500 and not "pro_hugged" in self.badges:
853-
if action == "hug":
854-
return "pro_hugged"
851+
if self.action_stats[action]["targeted"] == 500:
852+
return "pro_hugged"
855853

856854
def _has_card(self, cards: List[list], card_id: int, fake_allowed: bool, only_allow_fakes: bool) -> bool:
857855
counter = 0

0 commit comments

Comments
 (0)