From 86192010ece97e4dba0a6ef6b39bdb24dae44c52 Mon Sep 17 00:00:00 2001 From: "Jill \"oatmealine\" Monoids" Date: Wed, 19 Apr 2023 22:15:01 +0300 Subject: [PATCH] oops! 4 --- src/commands/decrease2.ts | 4 ++-- src/lib/counter.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/commands/decrease2.ts b/src/commands/decrease2.ts index a41ac07..5115cc8 100644 --- a/src/commands/decrease2.ts +++ b/src/commands/decrease2.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder } from '@discordjs/builders'; import { CommandInteraction, GuildMember } from 'discord.js'; -import { changeCounterInteraction } from '../lib/counter'; +import { changeCounterInteraction, getCounter } from '../lib/counter'; module.exports = { data: new SlashCommandBuilder() @@ -16,7 +16,7 @@ module.exports = { execute: async (interaction: CommandInteraction, member: GuildMember) => { await interaction.deferReply({ephemeral: true}); - const amount = Math.trunc(interaction.options.getInteger('amount') || 1); + const amount = Math.min(Math.trunc(interaction.options.getInteger('amount') || 1), getCounter(true)); changeCounterInteraction(interaction, member, -amount, true); } }; \ No newline at end of file diff --git a/src/lib/counter.ts b/src/lib/counter.ts index f7460a9..4b9692b 100644 --- a/src/lib/counter.ts +++ b/src/lib/counter.ts @@ -10,7 +10,7 @@ const counterCreamMessageFile = './counterCreamMessageID.txt'; const PISS_CHANNEL = '975802147126018150'; const CREAM_CHANNEL = '1098319707741900910'; export const PISS_EMOJI = '🪣'; -export const CREAM_EMOJI = '<:PoolOfCum:1070350928240181340>'; +export const CREAM_EMOJI = '🥛'; function getCounterFile(cream: boolean) { return cream ? counterFileCream : counterFile; @@ -38,7 +38,7 @@ export async function initializeCounter(cream: boolean) { } } -function getCounter(cream: boolean) { +export function getCounter(cream: boolean) { return cream ? creamCounter : pissCounter; }