From d95643176504cdf33160b2b21e7eaad16c6b369f Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 24 Mar 2023 17:22:17 +0200 Subject: [PATCH] fix this https://rdrama.net/h/meta/post/157653/i-lost-my-house-vampire-founding --- files/helpers/awards.py | 15 ++++++++------- files/routes/awards.py | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/files/helpers/awards.py b/files/helpers/awards.py index d837d962a..8d69c8bd3 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -68,15 +68,16 @@ def award_timers(v, bot=False): badge = v.has_badge(167) if v.bite and v.bite < now: v.bite = None - + notif_text = "Your vampire status has ended." - if v.old_house: - house = v.old_house.replace(' Founder', '') - notif_text += f" You're now back in House {house}!" + + if "Vampire" not in v.old_house: + notif_text += f" You're now back in House {v.old_house.replace(' Founder', '')}!" + v.house = v.old_house + v.old_house = '' + notify_if_not_bot(notif_text) - - v.house = v.old_house - v.old_house = '' + badge = v.has_badge(168) if badge: g.db.delete(badge) if v.earlylife and v.earlylife < now: diff --git a/files/routes/awards.py b/files/routes/awards.py index 3f59c6aac..777006269 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -406,7 +406,6 @@ def award_thing(v, thing_type, id): if 'Vampire' not in author.house: if not author.old_house: author.old_house = author.house - author.house = 'Vampire' badge_grant(user=author, badge_id=168)