From b243e8d4f062719533fb3ecf0891c23fbfa8295c Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 26 Jan 2023 17:31:22 +0100 Subject: [PATCH] fix: change bankerbot coin give messages, fix merge --- coin.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/coin.rb b/coin.rb index bbb1d36..7c81b92 100644 --- a/coin.rb +++ b/coin.rb @@ -6,14 +6,8 @@ require 'discordrb' MAX_COINS_PER_DAY = 4 COIN_TIMEOUT = 15 SCOREBOARD = './scoreboard.yml' -<<<<<<< HEAD - PASTA='You know what? Im done, i am leaving, we were friendly talking about the subject. This crossed the line of "ok killer of joy" to "no fun allowed"' -======= -DUMBASS = 521596582962003968 -DUMBASS_BOT = 1034966228755820575 COIN_EMOJI = '🪙' ->>>>>>> b24afe7 (give coin with react) coin_state_active = false coins_offered_today = 0 @@ -110,7 +104,7 @@ bot.reaction_add do |event| next unless event.emoji.name == COIN_EMOJI reactor_coins = get_coin_count(event.user.id) if reactor_coins == 0 - event.respond("<@#{event.user.id}>, you're a poor shmuck!") + event.respond("Nice gesture, <@#{event.user.id}>, but you're broke! To get more coins, type the words `GET COIN` whenever I post the coin event message! But be quick, your friends are trying their best to get it before you do!") next end @@ -122,7 +116,7 @@ bot.reaction_add do |event| increment_coin(event.message.author.id) increment_coin(event.user.id, -1) - event.respond "<@#{event.message.author.id}>, you have been given a coin by <@#{event.user.id}>!" + event.respond "How nice! <@#{event.message.author.id}> has received a coin from <@#{event.user.id}>!" end bot.run(true)