diff --git a/files/helpers/casino.py b/files/helpers/casino.py index 160f438db..7f40f334c 100644 --- a/files/helpers/casino.py +++ b/files/helpers/casino.py @@ -14,7 +14,7 @@ def get_game_feed(game): def format_game(game): user = g.db.query(User).filter(User.id == game.user_id).one() wonlost = 'lost' if game.winnings < 0 else 'won' - relevant_currency = "dramacoin" if game.currency == "coins" else "marseybux" + relevant_currency = "coin" if game.currency == "coins" else "marseybux" return { "user": user.username, diff --git a/files/routes/casino.py b/files/routes/casino.py index bb367828a..56db1aea7 100644 --- a/files/routes/casino.py +++ b/files/routes/casino.py @@ -78,9 +78,9 @@ def pull_slots(v): try: currency = request.values.get("currency") except: - return {"error": "Invalid currency (expected 'dramacoin' or 'marseybux')."}, 400 + return {"error": "Invalid currency (expected 'coin' or 'marseybux')."}, 400 - if (currency == "dramacoin" and wager > v.coins) or (currency == "marseybux" and wager > v.procoins): + if (currency == "coin" and wager > v.coins) or (currency == "marseybux" and wager > v.procoins): return {"error": f"Not enough {currency} to make that bet."}, 400 success, game_state = casino_slot_pull(v, wager, currency) diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html index 420e891e9..165a32e78 100644 --- a/files/templates/casino/game_screen.html +++ b/files/templates/casino/game_screen.html @@ -380,10 +380,10 @@
+ value="coin" checked /> diff --git a/files/templates/casino/roulette_screen.html b/files/templates/casino/roulette_screen.html index 227d60c44..40d077668 100644 --- a/files/templates/casino/roulette_screen.html +++ b/files/templates/casino/roulette_screen.html @@ -223,7 +223,7 @@ const betArea = document.getElementById("roulette-bets"); const flatBets = formatFlatBets(bets); const normalizedBets = formatNormalizedBets(bets); - const dramacoinImgHtml = ` + const coinImgHtml = ` coin + aria-label="Coin" + data-bs-original-title="Coin" /> `; const marseybuxImgHtml = ` `; - const { participants, dramacoin, marseybux } = flatBets.reduce((prev, next) => { + const { participants, coin, marseybux } = flatBets.reduce((prev, next) => { if (!prev.participants.includes(next.gambler_username)) { prev.participants.push(next.gambler_username); } if (next.wager.currency == 'coins') { - prev.dramacoin += next.wager.amount; + prev.coin += next.wager.amount; } else { prev.marseybux += next.wager.amount; } return prev; - }, { participants: [], dramacoin: 0, marseybux: 0 }); - const dramacoinText = `${dramacoin} ${dramacoinImgHtml}`; + }, { participants: [], coin: 0, marseybux: 0 }); + const coinText = `${coin} ${coinImgHtml}`; const marseybuxText = `${marseybux} ${marseybuxImgHtml}`; const playerText = participants.length > 1 ? `${participants.length} players are` : `1 player is`; - const totalText = dramacoin && marseybux ? `${dramacoinText} and ${marseybuxText}` : dramacoin ? dramacoinText : marseybuxText; + const totalText = coin && marseybux ? `${coinText} and ${marseybuxText}` : coin ? coinText : marseybuxText; const fullTotalText = participants.length === 0 ? "No one has placed a bet" : `${playerText} betting a total of ${totalText}`; let betHtml = ` @@ -276,7 +276,7 @@ // Heading betHtml += `
`; betHtml += buildPokerChip(avatar); - const coinText = wagerTotal.coins > 0 ? `${wagerTotal.coins} ${dramacoinImgHtml}` : ""; + const coinText = wagerTotal.coins > 0 ? `${wagerTotal.coins} ${coinImgHtml}` : ""; const procoinText = wagerTotal.procoins > 0 ? `${wagerTotal.procoins} ${marseybuxImgHtml}` : ""; const bettingText = coinText && procoinText ? `${coinText} and ${procoinText}` : coinText || procoinText; betHtml += `

${name} is betting ${bettingText}:

`; @@ -285,7 +285,7 @@ // Individual bets betHtml += `
diff --git a/schema.sql b/schema.sql index 4a09ecea9..6e6998f45 100644 --- a/schema.sql +++ b/schema.sql @@ -2642,10 +2642,10 @@ COPY public.badge_defs (id, name, description, created_utc) FROM stdin; 22 Renthog Contributed at least $10 \N 23 Landchad Contributed at least $20 \N 24 Terminally online turboautist Contributed at least $50 \N -157 A Minor Setback Lost a 1,000 dramacoin bet. Keep going! \N -158 Just One More Hand Lost a 10,000 dramacoin bet. But it's fine, you're due for a big win! \N -160 Lil Goombler Won a 1,000 dramacoin bet. Nice job! \N -162 King Goombler Won a 100,000 dramacoin bet. Wipe your sweaty palms off and bet it all again, you're on a roll! \N +157 A Minor Setback Lost a 1,000 coin bet. Keep going! \N +158 Just One More Hand Lost a 10,000 coin bet. But it's fine, you're due for a big win! \N +160 Lil Goombler Won a 1,000 coin bet. Nice job! \N +162 King Goombler Won a 100,000 coin bet. Wipe your sweaty palms off and bet it all again, you're on a roll! \N 163 Marsey Jacobs Designed 10 hats! \N 166 Giorgio Armarsey Designed 250 hats 😲 \N 164 Marsey de Givenchy Designed 50 hats, holy cap. \N @@ -2731,8 +2731,8 @@ COPY public.badge_defs (id, name, description, created_utc) FROM stdin; 117 Stone Skeptic This user rejects igneous lies \N 129 Misinformation Superspreader This poster was fact checked by real American patriots \N 130 Columbine Enthusiast (TEMPORAL FLUX EDITION) This user is an acclaimed Reb+VoDKa slash author \N -159 It's Over Lost a 100,000 dramacoin bet. It's fucking over. \N -161 Pro Goombler Won a 10,000 dramacoin bet. Some would say to quit while you're ahead, but they didn't just win 10k - keep at it! \N +159 It's Over Lost a 100,000 coin bet. It's fucking over. \N +161 Pro Goombler Won a 10,000 coin bet. Some would say to quit while you're ahead, but they didn't just win 10k - keep at it! \N 165 Marsey Chanel Designed 100 hats!!! \N 28 Chud Marked as a chud \N 171 Rainbowed This user has super cute text \N @@ -4363,7 +4363,7 @@ marseygrilling2 5526 bbq boomer barbecue barbeque 435 \N \N marseypennyboo 3161 mrpennycoomstokids black nigger kween shaniqua thot whore female woman bleeder birthing person kfc baptist tradwife dress christian foid 44 \N \N marseycolombo 1817 cop detective tv smart colombo classic investigator 18 \N \N marseylongsurfing 6289 surf surfing water ocean long surfboard 22 \N \N -marseycoin 5526 dramacoin money dc spinning rich payment gold dinero animated dollars 639 \N \N +marseycoin 5526 coin money dc spinning rich payment gold dinero animated dollars 639 \N \N marseyglam 8979 rocker pretty glamorous beautiful 120 \N \N marseytrogdor 5244 burninator strongbad internet meme dragon marsdor 38 \N \N marseytom 7813 thatfuckingmarsey fucking marsey tom and jerry tomjerry cartoon hanna barbera vintage smug 272 \N \N