forked from MarseyWorld/MarseyWorld
Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost
commit
b111852d44
Binary file not shown.
After Width: | Height: | Size: 59 KiB |
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 11 KiB |
|
@ -295,6 +295,9 @@ elif SITE == 'watchpeopledie.co':
|
||||||
|
|
||||||
PERMS['HOLE_CREATE'] = 2
|
PERMS['HOLE_CREATE'] = 2
|
||||||
|
|
||||||
|
SIDEBAR_THREAD = 5403
|
||||||
|
BANNER_THREAD = 9869
|
||||||
|
|
||||||
HOLE_NAME = 'flair'
|
HOLE_NAME = 'flair'
|
||||||
HOLE_STYLE_FLAIR = True
|
HOLE_STYLE_FLAIR = True
|
||||||
HOLE_REQUIRED = True
|
HOLE_REQUIRED = True
|
||||||
|
@ -310,7 +313,6 @@ elif SITE == 'watchpeopledie.co':
|
||||||
|
|
||||||
GIFT_NOTIF_ID = CARP_ID
|
GIFT_NOTIF_ID = CARP_ID
|
||||||
|
|
||||||
SIDEBAR_THREAD = 5403
|
|
||||||
else: # localhost or testing environment implied
|
else: # localhost or testing environment implied
|
||||||
FEATURES['PRONOUNS'] = True
|
FEATURES['PRONOUNS'] = True
|
||||||
FEATURES['HOUSES'] = True
|
FEATURES['HOUSES'] = True
|
||||||
|
|
|
@ -202,6 +202,9 @@ def spin_roulette_wheel():
|
||||||
game.active = False
|
game.active = False
|
||||||
g.db.add(game)
|
g.db.add(game)
|
||||||
|
|
||||||
|
# Commit early when dirty because of long-running tasks after roulette
|
||||||
|
g.db.commit()
|
||||||
|
|
||||||
|
|
||||||
def determine_roulette_winners(number, bets):
|
def determine_roulette_winners(number, bets):
|
||||||
winners = []
|
winners = []
|
||||||
|
|
|
@ -279,14 +279,16 @@
|
||||||
<img alt="site banner" src="{% if v %}{{image}}{% else %}{{'cached.webp' | asset_siteimg}}{% endif %}" width="100%">
|
<img alt="site banner" src="{% if v %}{{image}}{% else %}{{'cached.webp' | asset_siteimg}}{% endif %}" width="100%">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</a>
|
</a>
|
||||||
|
{% elif SITE_NAME == 'WPD' %}
|
||||||
|
{% if v %}
|
||||||
|
{% set path = "assets/images/" + SITE_NAME + "/banners" %}
|
||||||
|
{% set banner = "/" + path + "/" + listdir('files/' + path)|random() + '?v=1' %}
|
||||||
|
{% else %}
|
||||||
|
{% set banner = 'cached.webp' | asset_siteimg %}
|
||||||
|
{% endif %}
|
||||||
|
<img alt="site banner" src="{{banner}}" width="100%">
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if SITE_NAME == 'WPD' %}
|
{% if SITE_NAME == 'PCM' %}
|
||||||
{% if v %}
|
|
||||||
{% set banner = 'banner.webp' | asset_siteimg %}
|
|
||||||
{% else %}
|
|
||||||
{% set banner = 'cached.webp' | asset_siteimg %}
|
|
||||||
{% endif %}
|
|
||||||
{% elif SITE_NAME == 'PCM' %}
|
|
||||||
{% set banner = 'banners/great-value-v2.webp' | asset_siteimg %}
|
{% set banner = 'banners/great-value-v2.webp' | asset_siteimg %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set banner = 'banner.webp' | asset_siteimg %}
|
{% set banner = 'banner.webp' | asset_siteimg %}
|
||||||
|
|
Loading…
Reference in New Issue