skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/Aevann1/Drama into snow

Browse source
This commit is contained in:
Aevann1 2021-12-14 23:02:01 +02:00
commit ee681b4ed4
4 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
files/helpers/const.py
View file

@ -512,10 +512,10 @@ AWARDS = {
}, },
"lootbox": { "lootbox": {
"kind": "lootbox", "kind": "lootbox",
"title": "Homoween Lootbox", "title": "Lootstocking",
"description": "???", "description": "???",
"icon": "fas fa-treasure-chest", "icon": "fas fa-stocking",
"color": "text-orange", "color": "text-red",
"price": 1000 "price": 1000
}, },
"shit": { "shit": {
@ -720,6 +720,13 @@ AWARDS2 = {
"description": "???", "description": "???",
"icon": "fas fa-angry", "icon": "fas fa-angry",
"color": "text-green-500", "color": "text-green-500",
},
"lootbox": {
"kind": "lootbox",
"title": "Lootstocking",
"description": "???",
"icon": "fas fa-stocking",
"color": "text-red",
"price": 1000 "price": 1000
}, },
"shit": { "shit": {

35
files/routes/awards.py
View file

@ -99,6 +99,13 @@ def shop(v):
"description": "???", "description": "???",
"icon": "fas fa-angry", "icon": "fas fa-angry",
"color": "text-green-500", "color": "text-green-500",
},
"lootbox": {
"kind": "lootbox",
"title": "Lootstocking",
"description": "???",
"icon": "fas fa-stocking",
"color": "text-red",
"owned": 0, "owned": 0,
"price": 1000 "price": 1000
}, },
@ -300,6 +307,7 @@ def shop(v):
@validate_formkey @validate_formkey
def buy(v, award): def buy(v, award):
AWARDS = { AWARDS = {
<<<<<<< HEAD
"snow": { "snow": {
"kind": "snow", "kind": "snow",
"title": "Snow", "title": "Snow",
@ -346,6 +354,13 @@ def buy(v, award):
"description": "???", "description": "???",
"icon": "fas fa-angry", "icon": "fas fa-angry",
"color": "text-green-500", "color": "text-green-500",
},
"lootbox": {
"kind": "lootbox",
"title": "Lootstocking",
"description": "???",
"icon": "fas fa-stocking",
"color": "text-red",
"price": 1000 "price": 1000
}, },
"shit": { "shit": {
@ -550,13 +565,25 @@ def buy(v, award):
g.db.add(new_badge) g.db.add(new_badge)
g.db.add(v) g.db.add(v)
g.db.add(v) g.db.add(v)
g.db.flush() g.db.flush()
thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).first().id
thing += 1
award = AwardRelationship(id=thing, user_id=v.id, kind=award) if award == "lootbox":
g.db.add(award) send_notification(995, f"@{v.username} bought a lootbox!")
for i in [1,2,3,4,5]:
thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).first().id
thing += 1
award = random.choice(["snow", "gingerbread", "lights", "candycane", "fireplace"])
award = AwardRelationship(id=thing, user_id=v.id, kind=award)
g.db.add(award)
g.db.flush()
else:
thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).first().id
thing += 1
award = AwardRelationship(id=thing, user_id=v.id, kind=award)
g.db.add(award)
g.db.commit() g.db.commit()

2
files/templates/settings2.html
View file

@ -44,7 +44,7 @@
<link rel="stylesheet" href="/assets/css/main-deprecated.css?v=190"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=190"> <link rel="stylesheet" href="/assets/css/main-deprecated.css?v=190"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=190">
{% endif %} {% endif %}
<link href="/assets/css/fa.css?v=190" rel="stylesheet"> <link href="/assets/css/fa.css?v=192" rel="stylesheet">
</head> </head>
<body id="settings2" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}) no-repeat center center fixed !important; background-size: cover!important; background-color: #000!important;{% endif %}"> <body id="settings2" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}) no-repeat center center fixed !important; background-size: cover!important; background-color: #000!important;{% endif %}">