Skip to content

Commit 2841208

Browse files
HumblemonkHumblemonk
committed
Fix Hero System & add multi roll support
This commit includes two changes. One minor and one major: 1. Resolve some issues with the hero system code that came from the original PR :/ . I shouldve caught this 2. Added support for multi roll logic. This allows for 4 unique dice rolls (limited by discord api) in a single command. Rolls are separated by a forward slash / . This is a "beta feature" and some complicated dice rolls may cause bugs. example syntax: /roll 4d100 / 10d6 e6 k8 +4/ 3d10 k2/ ul 3d100 Resolves #174, Resolves #60
1 parent ca73b3f commit 2841208

File tree

3 files changed

+147
-134
lines changed

3 files changed

+147
-134
lines changed

‎dice_maiden.rb

+125-117
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dice bot for Discord
22
# Author: Humblemonk
3-
# Version: 8.11.1
3+
# Version: 9.0.0
44
# Copyright (c) 2017. All rights reserved.
55
# !/usr/bin/ruby
66
# If you wish to run a single instance of this bot, please follow the "Manual Install" section of the readme!
@@ -23,7 +23,7 @@
2323

2424
# open connection to sqlite db and set timeout to 10s if the database is busy
2525
if @launch_option == 'lite'
26-
# do nothing
26+
puts 'Dice Maiden lite mode detected!'
2727
else
2828
require 'sqlite3'
2929
$db = SQLite3::Database.new 'main.db'
@@ -51,136 +51,144 @@
5151
inc_cmd = lambda do |event|
5252
# Locking the thread to prevent messages going to the wrong server
5353
mutex.lock
54+
response_array = []
5455
begin
55-
@event_roll = event.options.values.join('')
56-
57-
@do_tally_shuffle = false
58-
check_comment
59-
@roll_request = @event_roll.dup
60-
61-
@input = alias_input_pass(@event_roll) # Do alias pass as soon as we get the message
62-
@simple_output = false
63-
@wng = false
64-
@dh = false
65-
@godbound = false
66-
@ed = false
67-
@hsn = false
68-
@hsk = false
69-
@hsh = false
70-
@no_result = false
71-
72-
@private_roll = false
73-
@reroll_check = 0
74-
@reroll_indefinite_check = 0
75-
@reroll_count = 0
76-
@botch = 0
77-
78-
check_roll_modes
79-
next if @ed && !replace_earthdawn(event)
80-
81-
@roll_set = nil
82-
next unless roll_sets_valid(event)
83-
84-
# check for single dice rolls
85-
@input.gsub!(%r{(?<!\d)(^|[+*/-]\s?)d(\d+)}, '\11d\2') if @input.match?(%r{(?<!\d)(^|[+*/-]\s?)d(\d+)})
86-
87-
@roll = @input
88-
@check = @prefix + @roll
89-
@test_status = ''
90-
# check user
91-
check_user_or_nick(event)
92-
# check for empty roll
93-
if @event_roll.empty?
94-
event.respond(content: "#{@user} roll is empty! Please type a complete dice roll message")
95-
next
96-
end
97-
# check for modifiers that should apply to everything
98-
check_universal_modifiers
99-
100-
# Check for dn
101-
dnum = @input.scan(/dn\s?(\d+)/).first.join.to_i if @input.match?(/^(1dn)\d+/i)
102-
103-
# Check for correct input
104-
if @roll.match?(/\dd\d/i)
105-
event.channel.start_typing
106-
next if check_roll(event) == true
107-
108-
# Check for wrath roll
109-
check_wrath
110-
# Grab dice roll, create roll, grab results
111-
if @roll_set.nil?
112-
next if do_roll(event) == true
113-
else
114-
@roll_set_results = ''
115-
@error_check_roll_set = ''
116-
roll_count = 0
117-
@roll_set_total = 0
118-
error_encountered = false
119-
while roll_count < @roll_set.to_i
120-
if do_roll(event) == true
121-
error_encountered = true
122-
break
56+
inc_event_roll = event.options.values.join('')
57+
rolls_array = inc_event_roll.split(%r{\s*/\s*}).take(4)
58+
rolls_array.each do |event_roll|
59+
@do_tally_shuffle = false
60+
check_comment(event_roll)
61+
@roll_request = event_roll.dup
62+
63+
@input = alias_input_pass(event_roll) # Do alias pass as soon as we get the message
64+
@simple_output = false
65+
@wng = false
66+
@dh = false
67+
@godbound = false
68+
@ed = false
69+
@hsn = false
70+
@hsk = false
71+
@hsh = false
72+
@no_result = false
73+
74+
@private_roll = false
75+
@reroll_check = 0
76+
@reroll_indefinite_check = 0
77+
@reroll_count = 0
78+
@botch = 0
79+
80+
check_roll_modes
81+
next if @ed && !replace_earthdawn(event)
82+
83+
@roll_set = nil
84+
next unless roll_sets_valid(event)
85+
86+
# check for single dice rolls
87+
@input.gsub!(%r{(?<!\d)(^|[+*/-]\s?)d(\d+)}, '\11d\2') if @input.match?(%r{(?<!\d)(^|[+*/-]\s?)d(\d+)})
88+
89+
@roll = @input
90+
@check = @prefix + @roll
91+
@test_status = ''
92+
# check user
93+
check_user_or_nick(event)
94+
# check for empty roll
95+
if event_roll.empty?
96+
event.respond(content: "#{@user} roll is empty! Please type a complete dice roll message")
97+
next
98+
end
99+
# check for modifiers that should apply to everything
100+
check_universal_modifiers
101+
102+
# Check for dn
103+
@dnum = @input.scan(/dn\s?(\d+)/).first.join.to_i if @input.match?(/^(1dn)\d+/i)
104+
105+
# Check for correct input
106+
if @roll.match?(/\dd\d/i)
107+
event.channel.start_typing
108+
next if check_roll(event) == true
109+
110+
# Check for wrath roll
111+
check_wrath
112+
# Grab dice roll, create roll, grab results
113+
if @roll_set.nil?
114+
next if do_roll(event) == true
115+
else
116+
@roll_set_results = ''
117+
@error_check_roll_set = ''
118+
roll_count = 0
119+
@roll_set_total = 0
120+
error_encountered = false
121+
while roll_count < @roll_set.to_i
122+
if do_roll(event) == true
123+
error_encountered = true
124+
break
125+
end
126+
@tally = alias_output_pass(@tally)
127+
if @simple_output == true
128+
@roll_set_results << "#{@dice_result}\n"
129+
else
130+
@error_check_roll_set << "#{@dice_result}\n"
131+
@roll_set_results << "`#{@tally}` #{@dice_result}\n"
132+
end
133+
roll_count += 1
123134
end
124-
@tally = alias_output_pass(@tally)
125-
if @simple_output == true
126-
@roll_set_results << "#{@dice_result}\n"
135+
next if error_encountered
136+
137+
log_roll(event) if @launch_option == 'debug'
138+
if @comment.to_s.empty? || @comment.to_s.nil?
139+
event.respond(content: "#{@user} Request: `[#{@roll_request.strip}]` Rolls:\n#{@roll_set_results}Results Total: `#{@roll_set_total}`")
127140
else
128-
@error_check_roll_set << "#{@dice_result}\n"
129-
@roll_set_results << "`#{@tally}` #{@dice_result}\n"
141+
event.respond(content: "#{@user} Rolls:\n#{@roll_set_results}Results Total: `#{@roll_set_total}`\nReason: `#{@comment}`")
130142
end
131-
roll_count += 1
143+
next
132144
end
133-
next if error_encountered
134145

135-
log_roll(event) if @launch_option == 'debug'
136-
if @comment.to_s.empty? || @comment.to_s.nil?
137-
event.respond(content: "#{@user} Request: `[#{@roll_request.strip}]` Rolls:\n#{@roll_set_results}Results Total: `#{@roll_set_total}`")
138-
else
139-
event.respond(content: "#{@user} Rolls:\n#{@roll_set_results}Results Total: `#{@roll_set_total}`\nReason: `#{@comment}`")
140-
end
141-
next
142-
end
146+
# Output aliasing
147+
@tally = alias_output_pass(@tally)
143148

144-
# Output aliasing
145-
@tally = alias_output_pass(@tally)
149+
# Does calculation for Hero System stuff, if necessary
150+
hero_system_math if @hsn || @hsk
146151

147-
# Does calculation for Hero System stuff, if necessary
148-
hero_system_math if @hsn || @hsk
152+
# Grab event user name, server name and timestamp for roll and log it
153+
log_roll(event) if @launch_option == 'debug'
149154

150-
# Grab event user name, server name and timestamp for roll and log it
151-
log_roll(event) if @launch_option == 'debug'
155+
@has_comment = !@comment.to_s.empty? && !@comment.to_s.nil?
152156

153-
# Print dice result to Discord channel
154-
@has_comment = !@comment.to_s.empty? && !@comment.to_s.nil?
155-
if check_wrath == true
156-
respond_wrath(event, dnum)
157-
elsif @private_roll
158-
event.respond(content: build_response, ephemeral: true)
159-
else
160-
event.respond(content: build_response)
161-
check_fury(event)
157+
response_array.push(build_response)
162158
end
163-
end
164-
next if check_donate(event) == true
165-
next if check_help(event) == true
166-
next if check_bot_info(event) == true
167-
next if check_purge(event) == false
168-
rescue StandardError => e ## The worst that should happen is that we catch the error and return its message.
169-
e.message = 'NIL MESSAGE!' if e.message.nil?
170-
# Simplify roll and send it again if we error out due to character limit
171-
if (e.message.include? 'Message over the character limit') || (e.message.include? 'Invalid Form Body')
172-
if @roll_set.nil?
173-
event.respond(content: "#{@user} Roll #{@dice_result} Reason: `Simplified roll due to character limit`")
159+
next if check_donate(event) == true
160+
next if check_help(event) == true
161+
next if check_bot_info(event) == true
162+
next if check_purge(event) == false
163+
rescue StandardError => e ## The worst that should happen is that we catch the error and return its message.
164+
e.message = 'NIL MESSAGE!' if e.message.nil?
165+
# Simplify roll and send it again if we error out due to character limit
166+
if (e.message.include? 'Message over the character limit') || (e.message.include? 'Invalid Form Body')
167+
if @roll_set.nil?
168+
event.respond(content: "#{@user} Roll #{@dice_result} Reason: `Simplified roll due to character limit`")
169+
else
170+
event.respond(content: "#{@user} Rolls:\n#{@error_check_roll_set}Reason: `Simplified roll due to character limit`")
171+
end
172+
elsif (e.message.include? "undefined method `join' for nil:NilClass") || (e.message.include? "The bot doesn't have the required permission to do this!") || (e.message.include? '500: Internal Server Error') || (e.message.include? '500 Internal Server Error')
173+
time = Time.now.getutc
174+
File.open('dice_rolls.log', 'a') { |f| f.puts "#{time} ERROR: #{e.message}" }
174175
else
175-
event.respond(content: "#{@user} Rolls:\n#{@error_check_roll_set}Reason: `Simplified roll due to character limit`")
176+
event.respond(content: ('Unexpected exception thrown! (' + e.message + ")\n\nPlease drop us a message in the #support channel on the dice maiden server, or create an issue on Github."))
176177
end
177-
elsif (e.message.include? "undefined method `join' for nil:NilClass") || (e.message.include? "The bot doesn't have the required permission to do this!") || (e.message.include? '500: Internal Server Error') || (e.message.include? '500 Internal Server Error')
178-
time = Time.now.getutc
179-
File.open('dice_rolls.log', 'a') { |f| f.puts "#{time} ERROR: #{e.message}" }
180-
else
181-
event.respond(content: ('Unexpected exception thrown! (' + e.message + ")\n\nPlease drop us a message in the #support channel on the dice maiden server, or create an issue on Github."))
182178
end
183179
end
180+
# Print dice results to Discord channel
181+
# reduce noisy errors by checking if response array is empty due to responding earlier
182+
if response_array.empty?
183+
# do nothing
184+
elsif check_wrath == true
185+
respond_wrath(event, @dnum)
186+
elsif @private_roll
187+
event.respond(content: response_array.join("\n").to_s, ephemeral: true)
188+
else
189+
event.respond(content: response_array.join("\n").to_s)
190+
check_fury(event)
191+
end
184192
mutex.unlock
185193
end
186194

‎doc/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 9.0.0 -2024-06-23
2+
### Added
3+
- Added support for rolling up to 4 unique dice rolls per command
4+
- Fixed some bugs with Hero system hsk roll
5+
16
## 8.11.1 -2024-06-21
27
### Added
38
- Fixed help rolls

‎src/dice_maiden_logic.rb

+17-17
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ def alias_input_pass(input)
2929
[/\battack\b/i, 'DnD attack roll', /\b(attack)\b/i, '1d20'], # DnD attack roll
3030
[/\bskill\b/i, 'DnD skill check', /\b(skill)\b/i, '1d20'], # DnD skill check
3131
[/\bsave\b/i, 'DnD saving throw', /\b(save)\b/i, '1d20'], # DnD saving throw
32-
[/\b\d+hsn\b/i, 'Hero System Normal', /\b(\d+)hsn\b/i, 'hsn \\1d6 nr'], # Hero System 5e Normal Damage
33-
[/\b\d+hsk\d*\b/i, 'Hero System Killing', /\b(\d+)hsk(\d*)\b/i, 'hsk\\2 \\1d6 nr'], # Hero System 5e Killing Damage
34-
[/\b\d+hsh\b/i, 'Hero System to Hit', /\b(\d+)hsh\b/i, 'hsh 11+\\1 -3d6 nr'] # Hero System 5e to Hit
32+
[/\b\d+hsn\b/i, 'Hero System Normal', /\b(\d+)hsn\b/i, 'hsn nr \\1d6'], # Hero System 5e Normal Damage
33+
[/\b\d+hsk\d*\b/i, 'Hero System Killing', /\b(\d+)hsk(\d*)\b/i, 'nr hsk\\2 \\1d6'], # Hero System 5e Killing Damage
34+
[/\b\d+hsh\b/i, 'Hero System to Hit', /\b(\d+)hsh\b/i, 'hsh nr 11+\\1 -3d6'] # Hero System 5e to Hit
3535
]
3636

3737
@alias_types = []
@@ -84,16 +84,16 @@ def check_user_or_nick(event)
8484
end
8585
end
8686

87-
def check_comment
87+
def check_comment(event_roll)
8888
@comment = ''
89-
if @event_roll.include?('!')
90-
@comment = @event_roll.partition('!').last.lstrip
89+
if event_roll.include?('!')
90+
@comment = event_roll.partition('!').last.lstrip
9191
# remove @ user ids from comments to prevent abuse
9292
@comment.gsub!(/<@!\d+>/, '')
9393
@do_tally_shuffle = true if @comment.include? 'unsort'
94-
@event_roll = @event_roll[/(^.*)!/]
95-
@event_roll.slice! @comment
96-
@event_roll.slice! '!'
94+
event_roll = event_roll[/(^.*)!/]
95+
event_roll.slice! @comment
96+
event_roll.slice! '!'
9797
end
9898
end
9999

@@ -569,11 +569,11 @@ def check_roll_modes
569569
when /\s?(hsn)\s/i
570570
@hsn = true
571571
@input.sub!('hsn', '')
572-
when /\s?(hsk)\s/i
572+
when /\s?(hsk)\s?/i
573573
@hsk = true
574574
if @input.match(/hsk\d+/i)
575-
multiplier_string = @input.scan(/(hsk)\d+/i)
576-
@hsk_multiplier_modifier = multiplier_string.scan(/\d+/).to_i
575+
multiplier_string = @input.scan(/hsk\d+/i).join.to_s
576+
@hsk_multiplier_modifier = multiplier_string.scan(/\d+/).join.to_i
577577
@input.sub!(/hsk\d+/i, '')
578578
else
579579
@hsk_multiplier_modifier = 0
@@ -622,13 +622,13 @@ def hero_system_math
622622
end
623623

624624
if @hsk
625-
@hsk_body = @dice_result.scan(/\d+/).to_i
625+
@hsk_body = @dice_result.scan(/\d+/)
626626
@hsk_stun_roll = DiceBag::Roll.new('1d6').result.total
627627
@hsk_multiplier = @hsk_stun_roll - 1 + @hsk_multiplier_modifier
628628
if @hsk_multiplier.zero?
629629
@hsk_multiplier = 1
630630
end
631-
@hsk_stun = @hsk_body * @hsk_multiplier
631+
@hsk_stun = @hsk_body.join.to_i * @hsk_multiplier
632632
end
633633
end
634634

@@ -651,15 +651,15 @@ def build_response
651651
response += " #{@dice_result}" unless @no_result
652652

653653
if @hsn
654-
response += " Body: #{@hsn_body}, Stun:#{@hsn_stun}"
654+
response += " Body: `#{@hsn_body}`, Stun: `#{@hsn_stun}`"
655655
end
656656

657657
if @hsk
658-
response += " Body: #{@hsk_body}, Stun Multiplier: #{@hsk_multiplier}, Stun: #{@hsk_stun}"
658+
response += " Body: `#{@hsk_body}`, Stun Multiplier: `#{@hsk_multiplier}`, Stun: `#{@hsk_stun}`"
659659
end
660660

661661
if @hsh
662-
response += " Hits DCV #{@dice_result.scan(/\d+/)}"
662+
response += " Hits DCV `#{@dice_result.scan(/\d+/)}`"
663663
end
664664

665665
response += " Reason: `#{@comment}`" if @has_comment

0 commit comments

Comments
 (0)