Chewing_Bever
/
didier
mirror of https://github.com/stijndcl/didier
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement rob and jail

feature/currency-improvements
stijndcl 2024-02-20 18:20:41 +01:00
parent a21eb51e6d
commit a1345f9138
3 changed files with 102 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
database/crud/currency.py
View File

@ -1,5 +1,5 @@
from datetime import date
from typing import Union
from typing import Optional, Union
from sqlalchemy.ext.asyncio import AsyncSession
@ -15,6 +15,7 @@ from database.utils.math.currency import (
__all__ = [
"add_dinks",
"claim_nightly",
"deduct_dinks",
"gamble_dinks",
"get_bank",
"get_nightly_data",
@ -41,9 +42,9 @@ async def get_nightly_data(session: AsyncSession, user_id: int) -> NightlyData:
return user.nightly_data
async def invest(session: AsyncSession, user_id: int, amount: Union[str, int]) -> int:
async def invest(session: AsyncSession, user_id: int, amount: Union[str, int], *, bank: Optional[Bank] = None) -> int:
"""Invest some of your Dinks"""
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
if amount == "all":
amount = bank.dinks
@ -62,9 +63,9 @@ async def invest(session: AsyncSession, user_id: int, amount: Union[str, int]) -
return amount
async def withdraw(session: AsyncSession, user_id: int, amount: Union[str, int]) -> int:
async def withdraw(session: AsyncSession, user_id: int, amount: Union[str, int], *, bank: Optional[Bank] = None) -> int:
"""Withdraw your invested Dinks"""
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
if amount == "all":
amount = bank.invested
@ -74,19 +75,33 @@ async def withdraw(session: AsyncSession, user_id: int, amount: Union[str, int])
bank.dinks += amount
bank.invested -= amount
session.add(bank)
await session.commit()
return amount
async def add_dinks(session: AsyncSession, user_id: int, amount: int):
async def add_dinks(session: AsyncSession, user_id: int, amount: int, *, bank: Optional[Bank] = None):
"""Increase the Dinks counter for a user"""
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
bank.dinks += amount
session.add(bank)
await session.commit()
async def claim_nightly(session: AsyncSession, user_id: int):
async def deduct_dinks(session: AsyncSession, user_id: int, amount: int, *, bank: Optional[Bank] = None) -> int:
"""Decrease the Dinks counter for a user"""
bank = bank or await get_bank(session, user_id)
deducted_amount = min(amount, bank.dinks)
bank.dinks -= deducted_amount
session.add(bank)
await session.commit()
return deducted_amount
async def claim_nightly(session: AsyncSession, user_id: int, *, bank: Optional[Bank] = None):
"""Claim daily Dinks"""
nightly_data = await get_nightly_data(session, user_id)
@ -95,7 +110,7 @@ async def claim_nightly(session: AsyncSession, user_id: int):
if nightly_data.last_nightly is not None and nightly_data.last_nightly == now:
raise exceptions.DoubleNightly
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
bank.dinks += NIGHTLY_AMOUNT
nightly_data.last_nightly = now
@ -104,9 +119,9 @@ async def claim_nightly(session: AsyncSession, user_id: int):
await session.commit()
async def upgrade_capacity(session: AsyncSession, user_id: int) -> int:
async def upgrade_capacity(session: AsyncSession, user_id: int, *, bank: Optional[Bank] = None) -> int:
"""Upgrade capacity level"""
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
upgrade_price = capacity_upgrade_price(bank.capacity_level)
# Can't afford this upgrade
@ -122,9 +137,9 @@ async def upgrade_capacity(session: AsyncSession, user_id: int) -> int:
return bank.capacity_level
async def upgrade_interest(session: AsyncSession, user_id: int) -> int:
async def upgrade_interest(session: AsyncSession, user_id: int, *, bank: Optional[Bank] = None) -> int:
"""Upgrade interest level"""
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
upgrade_price = interest_upgrade_price(bank.interest_level)
# Can't afford this upgrade
@ -140,9 +155,9 @@ async def upgrade_interest(session: AsyncSession, user_id: int) -> int:
return bank.interest_level
async def upgrade_rob(session: AsyncSession, user_id: int) -> int:
async def upgrade_rob(session: AsyncSession, user_id: int, *, bank: Optional[Bank] = None) -> int:
"""Upgrade rob level"""
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
upgrade_price = rob_upgrade_price(bank.rob_level)
# Can't afford this upgrade
@ -159,10 +174,16 @@ async def upgrade_rob(session: AsyncSession, user_id: int) -> int:
async def gamble_dinks(
session: AsyncSession, user_id: int, amount: Union[str, int], payout_factor: int, won: bool
session: AsyncSession,
user_id: int,
amount: Union[str, int],
payout_factor: int,
won: bool,
*,
bank: Optional[Bank] = None
) -> int:
"""Gamble some of your Didier Dinks"""
bank = await get_bank(session, user_id)
bank = bank or await get_bank(session, user_id)
if amount == "all":
amount = bank.dinks
@ -173,15 +194,23 @@ async def gamble_dinks(
sign = 1 if won else -1
factor = (payout_factor - 1) if won else 1
await add_dinks(session, user_id, sign * amount * factor)
await add_dinks(session, user_id, sign * amount * factor, bank=bank)
return amount * factor
async def rob(session: AsyncSession, amount: int, robber_id: int, robbed_id: int):
async def rob(
session: AsyncSession,
amount: int,
robber_id: int,
robbed_id: int,
*,
robber_bank: Optional[Bank] = None,
robbed_bank: Optional[Bank] = None
):
"""Rob another user's Didier Dinks"""
robber = await get_bank(session, robber_id)
robbed = await get_bank(session, robbed_id)
robber = robber_bank or await get_bank(session, robber_id)
robbed = robbed_bank or await get_bank(session, robbed_id)
robber.dinks += amount
robbed.dinks -= amount

2
database/utils/math/currency.py
View File

@ -40,7 +40,7 @@ def jail_chance(level: int) -> float:
base_chance = 0.35
growth_rate = 1.15
return max(0.0, base_chance - (growth_rate**level))
return min(0.1, max(0.0, base_chance - (growth_rate**level)))
def jail_time(level: int) -> int:

71
didier/cogs/currency.py
View File

@ -3,17 +3,20 @@ import asyncio
import math
import random
import typing
from datetime import timedelta
import discord
from discord.ext import commands
import settings
from database.crud import currency as crud
from database.crud.jail import get_user_jail
from database.crud.jail import get_user_jail, imprison
from database.exceptions.currency import DoubleNightly, NotEnoughDinks
from database.utils.math.currency import (
capacity_upgrade_price,
interest_upgrade_price,
jail_chance,
jail_time,
rob_amount,
rob_chance,
rob_upgrade_price,
@ -22,6 +25,7 @@ from didier import Didier
from didier.utils.discord import colours
from didier.utils.discord.checks import is_owner
from didier.utils.discord.converters import abbreviated_number
from didier.utils.types.datetime import tz_aware_now
from didier.utils.types.string import pluralize
@ -129,7 +133,7 @@ class Currency(commands.Cog):
@commands.hybrid_command(name="dinks") # type: ignore[arg-type]
async def dinks(self, ctx: commands.Context):
"""Check your Didier Dinks."""
async with self.client.postgres_session as session:
async with ctx.typing(), self.client.postgres_session as session:
bank = await crud.get_bank(session, ctx.author.id)
plural = pluralize("Didier Dink", bank.dinks)
await ctx.reply(f"You have **{bank.dinks}** {plural}.", mention_author=False)
@ -181,7 +185,7 @@ class Currency(commands.Cog):
@commands.hybrid_command(name="nightly") # type: ignore[arg-type]
async def nightly(self, ctx: commands.Context):
"""Claim nightly Didier Dinks."""
async with self.client.postgres_session as session:
async with ctx.typing(), self.client.postgres_session as session:
try:
await crud.claim_nightly(session, ctx.author.id)
await ctx.reply(
@ -207,7 +211,8 @@ class Currency(commands.Cog):
return await ctx.reply("You can't rob bots.", mention_author=False, ephemeral=True)
# Use a Lock for robbing to avoid race conditions when robbing the same person twice
# This would cause undefined behaviour
# This would lead to undefined behaviour
# Typing() must come first for slash commands
async with ctx.typing(), self._rob_lock, self.client.postgres_session as session:
robber = await crud.get_bank(session, ctx.author.id)
robbed = await crud.get_bank(session, member.id)
@ -222,39 +227,65 @@ class Currency(commands.Cog):
f"{member.display_name} doesn't have any dinks to rob.", mention_author=False, ephemeral=True
)
jail = await get_user_jail(session, ctx.author.id)
if jail is not None:
return await ctx.reply("You can't rob when in jail.", mention_author=False, ephemeral=True)
# Here be RNG
rob_roll = random.random()
success_chance = rob_chance(robber.rob_level)
success = rob_roll <= success_chance
max_rob_amount = math.floor(random.uniform(0.20, 1.0) * rob_amount(robber.rob_level))
robbed_amount = min(robbed.dinks, max_rob_amount)
if success:
max_rob_amount = random.uniform(0.15, 1.0) * rob_amount(robber.rob_level)
robbed_amount = min(robbed.dinks, math.floor(max_rob_amount))
await crud.rob(session, robbed_amount, ctx.author.id, member.id)
await crud.rob(session, robbed_amount, ctx.author.id, member.id, robber_bank=robber, robbed_bank=robbed)
return await ctx.reply(
f"{ctx.author.display_name} has robbed **{robbed_amount}** Didier Dinks from {member.display_name}!",
mention_author=False,
)
# Remove the amount of Dinks you would've stolen
# Increase the sentence if you can't afford it
lost_dinks = await crud.deduct_dinks(session, ctx.author.id, max_rob_amount, bank=robber)
couldnt_afford = lost_dinks < robbed_amount
punishment_factor = (float(max_rob_amount) / float(lost_dinks)) if couldnt_afford else 1.0
punishment_factor = min(punishment_factor, 2)
to_jail = couldnt_afford or random.random() <= jail_chance(robber.rob_level)
if to_jail:
jail_t = jail_time(robber.rob_level) * punishment_factor
until = tz_aware_now() + timedelta(hours=jail_t)
await imprison(session, ctx.author.id, until)
return await ctx.reply(
f"Robbery attempt failed! You've lost {lost_dinks} Didier Dinks, "
f"and have been sent to Didier Jail until <t:{until.timestamp()}:f>"
)
return await ctx.reply(f"Robbery attempt failed! You've lost {lost_dinks} Didier Dinks.")
@commands.hybrid_command(name="jail")
async def jail(self, ctx: commands.Context):
"""Check how long you're still in jail for"""
async with self.client.postgres_session as session:
entry = await get_user_jail(session, ctx.author.id)
async with ctx.typing():
async with self.client.postgres_session as session:
entry = await get_user_jail(session, ctx.author.id)
if entry is None:
embed = discord.Embed(
title="Didier Jail", colour=colours.error_red(), description="You're not currently in jail."
)
return await ctx.reply(embed=embed, mention_author=False, ephemeral=True)
if entry is None:
embed = discord.Embed(
title="Didier Jail", colour=colours.error_red(), description="You're not currently in jail."
title="Didier Jail",
colour=colours.jail_gray(),
description=f"You will be released <t:{entry.until.timestamp()}:R>.",
)
return await ctx.reply(embed=embed, mention_author=False, ephemeral=True)
embed = discord.Embed(
title="Didier Jail",
colour=colours.jail_gray(),
description=f"You will be released <t:{entry.until.timestamp()}:R>.",
)
return await ctx.reply(embed=embed, mention_author=False)
return await ctx.reply(embed=embed, mention_author=False)
async def setup(client: Didier):