diff --git a/files/classes/user.py b/files/classes/user.py index dc06f5cd5..565e3a377 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -503,12 +503,14 @@ class User(Base): elif self.patron == 8: after_discount = 0.60 else: after_discount = 1 + after_discount -= 0.02 * self.admin_level + owned_badges = [x.badge_id for x in self.badges] for badge in discounts: if badge in owned_badges: after_discount -= discounts[badge] - return after_discount + return max(after_discount, 0.55) @property @lazy diff --git a/files/helpers/config/awards.py b/files/helpers/config/awards.py index a0d3c32fc..da64de188 100644 --- a/files/helpers/config/awards.py +++ b/files/helpers/config/awards.py @@ -700,7 +700,7 @@ AWARDS = { "benefactor": { "kind": "benefactor", "title": "Benefactor", - "description": f"Grants one month of {patron} status and 2500 marseybux to the recipient. Cannot be used on yourself.", + "description": f"Grants one month of {patron} status and 2000 marseybux to the recipient. Cannot be used on yourself.", "icon": "fas fa-gift", "color": "text-blue", "price": 4000, diff --git a/files/routes/awards.py b/files/routes/awards.py index 5ba73ee01..9ff7694dd 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -461,7 +461,7 @@ def award_thing(v, thing_type, id): author.patron = 1 if author.patron_utc: author.patron_utc += 2629746 else: author.patron_utc = int(time.time()) + 2629746 - author.pay_account('marseybux', 2500) + author.pay_account('marseybux', 2000) badge_grant(user=v, badge_id=103) elif kind == "rehab": if author.rehab: author.rehab += 86400