Compare commits

...

7 Commits

Author SHA1 Message Date
SneedBot 7d4f74205a sneed 2022-11-01 04:00:36 +00:00
Snakes 8f324c923e
Formalize unpurchasable hats. 2022-10-31 23:39:23 -04:00
SneedBot 18b6bd6b2d sneed 2022-11-01 02:42:58 +00:00
justcool393 1873dd155a Merge branch 'spooky-22' of https://github.com/Aevann1/rDrama into spooky-22 2022-10-31 19:35:44 -05:00
justcool393 99f049ebd3 set banners to banner 10 2022-10-31 19:35:29 -05:00
Aevann1 bb87dceea6 fix un-deflectable awards getting vaporized 2022-11-01 02:10:39 +02:00
SneedBot 6e003789d0 sneed 2022-11-01 00:00:07 +00:00
15 changed files with 24 additions and 24 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -36,6 +36,12 @@ class HatDef(Base):
def censored_description(self, v):
return censor_slurs(self.description, v)
@property
@lazy
def is_purchasable(self):
return self.price > 0
class Hat(Base):
__tablename__ = "hats"

View File

@ -213,7 +213,7 @@ def award_thing(v, thing_type, id):
if v.id != author.id:
safe_username = "👻" if thing.ghost else f"@{author.username}"
if author.deflector and v.deflector:
if author.deflector and v.deflector and AWARDS[kind]['deflectable']:
msg = f"@{v.username} has tried to give your [{thing_type}]({thing.shortlink}) the {AWARDS[kind]['title']} Award but it was deflected on them, they also had a deflector up, so it bounced back and forth until it vaporized!"
send_repeatable_notification(author.id, msg)

View File

@ -45,8 +45,8 @@ def buy_hat(v, hat_id):
existing = g.db.query(Hat).filter_by(user_id=v.id, hat_id=hat.id).one_or_none()
if existing: abort(400, "You already own this hat!")
if hat.price == 0 and v.id != CARP_ID: #### TEMP HOMOWEEN
abort(403, "Only Carp can buy that hat!")
if not hat.is_purchasable:
abort(403, "This hat is not for sale.")
if request.values.get("mb"):
charged = v.charge_account('procoins', hat.price)

View File

@ -1,8 +1,5 @@
<a rel="nofollow noopener noreferrer" href="https://youtu.be/3l7X94GLqSQ?t=16" style="text-decoration: none !important">
{% set banner_day = time.gmtime()[2]-21 %}
{% if banner_day < 1 %}
{% set banner_day = 1 %}
{% endif %}
{% set banner_day = 10 %}
<link rel="stylesheet" href="{{'css/halloween/banner.css' | asset}}">
{% if '/post/' not in request.path %}
<script defer src="{{'js/halloween/banner.js' | asset}}"></script>

View File

@ -1,8 +1,5 @@
<a rel="nofollow noopener noreferrer" href="https://youtu.be/3l7X94GLqSQ?t=16" style="text-decoration: none !important">
{% set banner_day = time.gmtime()[2]-21 %}
{% if banner_day < 1 %}
{% set banner_day = 1 %}
{% endif %}
{% set banner_day = 10 %}
<link rel="stylesheet" href="{{'css/halloween/banner.css' | asset}}">
{% if '/post/' not in request.path %}
<script defer src="{{'js/halloween/banner.js' | asset}}"></script>

View File

@ -1,8 +1,5 @@
<a rel="nofollow noopener noreferrer" href="https://youtu.be/3l7X94GLqSQ?t=16" style="text-decoration: none !important">
{% set banner_day = time.gmtime()[2]-21 %}
{% if banner_day < 1 %}
{% set banner_day = 1 %}
{% endif %}
{% set banner_day = 10 %}
<link rel="stylesheet" href="{{'css/halloween/banner.css' | asset}}">
{% if '/post/' not in request.path %}
<script defer src="{{'js/halloween/banner.js' | asset}}"></script>

View File

@ -1,8 +1,5 @@
<a rel="nofollow noopener noreferrer" href="https://youtu.be/3l7X94GLqSQ?t=16" style="text-decoration: none !important">
{% set banner_day = time.gmtime()[2]-21 %}
{% if banner_day < 1 %}
{% set banner_day = 1 %}
{% endif %}
{% set banner_day = 10 %}
<link rel="stylesheet" href="{{'css/halloween/banner.css' | asset}}">
{% if '/post/' not in request.path %}
<script defer src="{{'js/halloween/banner.js' | asset}}"></script>

View File

@ -122,7 +122,7 @@
<td><a href="/hat_owners/{{hat.id}}">{{hat.number_sold}}</a></td>
<td>{{hat.price}}</td>
<td class="shop-table-actions" style="width:unset">
{% if hat.id not in owned_hat_ids %}
{% if hat.id not in owned_hat_ids and hat.is_purchasable %}
<div id="if-not-owned-{{hat.id}}">
<a id="buy1-{{hat.id}}" class="btn btn-success {% if v.coins < hat.price %}disabled{% endif %}" role="button" data-click="post_toast(this, '/buy_hat/{{hat.id}}', 'if-not-owned-{{hat.id}}', 'if-owned-{{hat.id}}', 'd-none', (xhr)=>{if(xhr.status == 200)document.getElementById('user-coins-amount').innerHTML-={{hat.price}}})" onclick="areyousure(this)"><span class="m-auto">Buy</span></a>

View File

@ -40,6 +40,9 @@ SET row_security = off;
-- Data for Name: badge_defs; Type: TABLE DATA; Schema: public; Owner: -
--
INSERT INTO public.badge_defs VALUES (186, 'Gigavaxxer', 'Vaccinated 10 people during Homoween 2022.', 1667275065);
INSERT INTO public.badge_defs VALUES (187, 'CDC Goon', 'Vaccinated 100 people during Homoween 2022.', 1667275076);
INSERT INTO public.badge_defs VALUES (188, 'Zombiechad', 'Zombified 10 people during Homoween 2022.', 1667275093);
INSERT INTO public.badge_defs VALUES (136, 'TRAIN 2022', 'Beware: Found to be one of the most transmisic commenters on the site!', NULL);
INSERT INTO public.badge_defs VALUES (137, 'Lottershe Winner', 'This user won the Lottershe grand prize.', NULL);
INSERT INTO public.badge_defs VALUES (140, 'Y''all Seein'' Eye', 'Gets notified when other sites talk about us', NULL);
@ -115,6 +118,7 @@ INSERT INTO public.badge_defs VALUES (71, 'Big Big Spender', 'Dropped 250,000 co
INSERT INTO public.badge_defs VALUES (72, 'Big Big Big Spender', 'Dropped 500,000 coins at the shop', NULL);
INSERT INTO public.badge_defs VALUES (73, 'Le Rich Gentlesir', 'Spent a fucking million coins at the shop', NULL);
INSERT INTO public.badge_defs VALUES (74, 'Grass Toucher', 'Awarded for molesting plant life', NULL);
INSERT INTO public.badge_defs VALUES (189, 'Super Spreader', 'Zombified 100 people during Homoween 2022.', 1667275100);
INSERT INTO public.badge_defs VALUES (76, 'Low Roller', 'Bought 10 lootboxes', NULL);
INSERT INTO public.badge_defs VALUES (77, 'Middle Roller', 'Bought 50 lootboxes', NULL);
INSERT INTO public.badge_defs VALUES (78, 'High Roller', 'Bought 150 lootboxes', NULL);
@ -190,7 +194,7 @@ INSERT INTO public.badge_defs VALUES (134, '1 Year Old 🥰', 'This user has was
-- Name: badge_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
--
SELECT pg_catalog.setval('public.badge_defs_id_seq', 185, true);
SELECT pg_catalog.setval('public.badge_defs_id_seq', 189, true);
--
@ -301,6 +305,7 @@ INSERT INTO public.hat_defs VALUES (753, 'Doom Guy', 'RIP AND TEAR', 2, 500, NUL
INSERT INTO public.hat_defs VALUES (991, 'Clocked', 'No hun don''t worry you totally pass', 2, 1000, NULL, 1666508772);
INSERT INTO public.hat_defs VALUES (974, 'Kitsune Mask I', 'Some weeb furry shit idfk', 2, 500, NULL, 1666459502);
INSERT INTO public.hat_defs VALUES (807, 'The Capy', 'You''re the chosen one! No one can hurt you!', 2, 500, NULL, 1665104052);
INSERT INTO public.hat_defs VALUES (1007, 'Red Halloween Mask', 'Worth a months rent, or just being a Top 10 Gigavaxxer or Zigger during Homoween 2022.', 2, 0, NULL, 1667274742);
INSERT INTO public.hat_defs VALUES (965, 'FDJ', '"Jetzt bin ich ein Freier Deutsche Jugendfunktionär"', 2, 500, NULL, 1665686729);
INSERT INTO public.hat_defs VALUES (969, 'Elite Pedo Sniper', 'The shemagh gives you +10 accuracy', 2, 500, NULL, 1665817338);
INSERT INTO public.hat_defs VALUES (933, 'Rascal', 'See this person 3 times and they have to give you something-Minecraft MV22', 2, 500, NULL, 1665434625);
@ -1092,7 +1097,7 @@ INSERT INTO public.hat_defs VALUES (911, 'Racecar Hat', 'I sleep in a hat with m
-- Name: hat_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
--
SELECT pg_catalog.setval('public.hat_defs_id_seq', 1006, true);
SELECT pg_catalog.setval('public.hat_defs_id_seq', 1007, true);
--
@ -2482,7 +2487,6 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
('marseysachiko',2,'idolmaster anime animegirl niggy',1667212045),
('marseysad',2,'concerned worried waiting prepared reaction',NULL),
('marseysad2',2,'reaction disappointed disappointment upset',NULL),
('marseysadbox',2,'marsey sad sadge cry crying frown juicebox juice box ball',1666587468),
('marseysadcat',2,'upset disappointing disappointment reaction disappointed sad crying',NULL),
('marseysadge',2,'frog pepe',NULL),
('marseysadgun',2,'pepe mellokind crying tears suicidal suicide kms frog',NULL),

View File

@ -3189,4 +3189,6 @@ Goodbye.
⣿⣿⠟⡉⠄⠡⠈⡀⠂⡐⠐⠈⠄⠂⠄⠄⠁⠠⠈⠄⠄⠄⠈⠄⠄⠄⠐⠈⠄⠄⠄⠂⠁⠈⠄⠄⠄⠄⠂⠌⢔⢢⢣⢃⠈⡉⢉⠙⡻⣿
⣿⠏⢀⠄⡐⠈⠄⡀⠂⠠⠈⠄⢁⠈⠠⠐⠄⠄⠐⠄⠄⠂⠄⠠⠄⠂⠄⠠⠄⢀⠄⠄⠄⠠⠐⠄⠐⠨⡈⡊⡢⡱⡸⢰⠄⠄⠄⠂⠠⢉
⠃⠨⠄⡂⢂⠈⠄⠠⠐⢀⠂⠈⠄⠄⠁⠠⠄⠠⠄⠐⠄⠄⠐⠄⠄⠄⠄⠄⢀⠄⢀⠈⠄⠄⠄⠂⠁⡁⢂⢅⢪⢰⢸⢨⠄⠠⠄⠐⠄⠄
```
```
{[para]}
KILL ALL MAYOS