From 0ad16b2ff00b5fe830fa7d895bc89af5df62025f Mon Sep 17 00:00:00 2001 From: Snakes Date: Thu, 15 Dec 2022 23:36:52 -0500 Subject: [PATCH] Forced santa hat, lootbox const prep. --- files/events/helpers/const.py | 2 +- files/helpers/config/awards.py | 4 ++-- files/helpers/config/const.py | 2 -- files/routes/awards.py | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/files/events/helpers/const.py b/files/events/helpers/const.py index 26c3a145f..55a3a4e16 100644 --- a/files/events/helpers/const.py +++ b/files/events/helpers/const.py @@ -1,4 +1,4 @@ EVENT_AWARDS = { } -EVENT_FORCED_HAT = None +EVENT_FORCED_HAT = '/i/hats/Santa Hat I.webp?h=7' diff --git a/files/helpers/config/awards.py b/files/helpers/config/awards.py index 98054d890..9c14a94cc 100644 --- a/files/helpers/config/awards.py +++ b/files/helpers/config/awards.py @@ -675,6 +675,8 @@ AWARDS_DISABLED = [ 'candy-corn', 'ectoplasm', 'bones', 'pumpkin', # Homoween '22 (cont'd) ] +LOOTBOX_ITEM_COUNT = 5 +LOOTBOX_CONTENTS = ["firework", "confetti", "ricardo", "wholesome", "shit", "fireflies", "scooter", "train"] HOUSE_AWARDS = { "Furry": { @@ -737,8 +739,6 @@ if SITE_NAME == 'PCM': #AWARDS_DISABLED.extend(['ban','pizzashill','marsey','bird','grass','chud','unblockable']) AWARDS_DISABLED.extend(['unblockable']) AWARDS_DISABLED.remove('ghost') -elif SITE_NAME == 'WPD': - AWARDS_DISABLED.remove('lootbox') if not FEATURES['MARSEYBUX']: AWARDS_DISABLED.append('benefactor') diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 0369332a4..cf33977a2 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -501,8 +501,6 @@ BADGE_BLACKLIST = { # only grantable by AEVANN_ID and SNAKES_ID except on PCM NOTIFIED_USERS = {} -LOOTBOX_ITEM_COUNT = 5 - if SITE == 'rdrama.net': FEATURES['PRONOUNS'] = True FEATURES['HOUSES'] = True diff --git a/files/routes/awards.py b/files/routes/awards.py index 9c42c18af..03b561cee 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -8,7 +8,7 @@ from files.classes.userblock import UserBlock from files.helpers.actions import * from files.helpers.alerts import * from files.helpers.config.const import * -from files.helpers.config.awards import AWARDS_ENABLED, HOUSE_AWARDS +from files.helpers.config.awards import AWARDS_ENABLED, HOUSE_AWARDS, LOOTBOX_ITEM_COUNT, LOOTBOX_CONTENTS from files.helpers.get import * from files.helpers.marsify import marsify from files.helpers.owoify import owoify @@ -94,7 +94,7 @@ def buy(v:User, award): if award == "lootbox": lootbox_items = [] for _ in range(LOOTBOX_ITEM_COUNT): # five items per lootbox - lb_award = random.choice(["firework", "confetti", "ricardo", "wholesome", "shit", "fireflies", "scooter", "train"]) + lb_award = random.choice(LOOTBOX_CONTENTS) lootbox_items.append(AWARDS[lb_award]['title']) lb_award = AwardRelationship(user_id=v.id, kind=lb_award, price_paid=price // LOOTBOX_ITEM_COUNT) g.db.add(lb_award)