From c2d82ef02c11476d73a7a2f38d272a142aa6de29 Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 26 Apr 2024 02:22:13 +0300 Subject: [PATCH] stop chud and queen hats from being much more likely --- files/classes/user.py | 5 +---- files/helpers/config/const.py | 26 ++------------------------ 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 92fa64863..f09c499a1 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -392,10 +392,7 @@ class User(Base): user_forced_hats = [] for k, val in forced_hats.items(): if getattr(self, k) and getattr(self, k) > 1: - if isinstance(val[0], tuple): - user_forced_hats.append(random.choice(val)) - else: - user_forced_hats.append(val) + user_forced_hats.append(val) if user_forced_hats: return random.choice(user_forced_hats) else: return None diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 00584992d..163452732 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -986,30 +986,8 @@ forced_hats = { "earlylife": ("The Merchant", "SHUT IT DOWN, the goys know!"), "marsify": ("Marsified", "I can't pick my own Marseys, help!"), "is_banned": ("Behind Bars", "This user is banned and needs to do better!"), - "chud": ( - ("Egg_irl", "This user is getting in touch with xir identity!"), - ("Trans Flag", "Just in case you forgot, trans lives matter."), - ("Trans Flag II", "Your egg is cracked; wear it with pride!"), - ("Pride Flag", "Never forget that this is a primarily gay community. Dude bussy lmao."), - ("Pride Flag II", "This user is a proud supporter of LGBTQ+ rights."), - ), - "queen": ( - ("Flower Crown I", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown II", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown III", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown IV", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown V", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown VI", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown VII", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown VIII", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown IX", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown X", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown XI", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown XII", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown XIII", "This user is getting in touch with her feminine side 🥰"), - ("Flower Crown XIV", "This user is getting in touch with her feminine side 🥰"), - ("Emoji Crown (hearts and shooting stars)", "This user is getting in touch with her feminine side 🥰") - ), + "chud": ("Egg_irl", "This user is getting in touch with xir identity!"), + "queen": ("Flower Crown I", "This user is getting in touch with her feminine side 🥰"), }