adding support for the following types of queries:

roll 2d4 - 4 and 3d6-l
master
loganom 2014-01-02 14:35:56 -06:00
parent 42a81dab94
commit 97e0dfe935
1 changed files with 59 additions and 52 deletions

View File

@ -1,13 +1,14 @@
package DDG::Goodie::Dice;
use DDG::Goodie;
use Text::Trim;
triggers start => "roll", "throw";
zci answer_type => "dice_roll";
primary_example_queries 'throw dice';
secondary_example_queries 'roll 5 dice', 'roll 3d12';
secondary_example_queries 'roll 5 dice', 'roll 3d12', 'roll 3d12 and 2d4';
description 'give the results of a random die throw';
name 'Dice';
code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Dice.pm';
@ -15,6 +16,8 @@ category 'random';
topics 'math';
attribution twitter => 'crazedpsyc',
cpan => 'CRZEDPSYC' ;
attribution twitter => 'loganmccamon',
github => 'loganom' ;
my %utf8_dice = (
1 => "\x{2680}",
@ -26,62 +29,66 @@ my %utf8_dice = (
);
handle remainder_lc => sub {
if ($_ =~ /^(?:a? ?die|(\d{0,2})\s*dic?e)$/) {
my @output;
my $rolls = 1; # If "die" is entered
my $choices = 6; # To be replace with input string in the future
if (defined($1)) { # Not defined if number of "dice" not specified
if ($1 eq "") {
$rolls = 2;
}
else {
$rolls = $1;
}
}
for (1 .. $rolls) {
my $roll = int(rand($choices)) + 1;
push @output, $utf8_dice{$roll};
}
return join(', ', @output) . ' (random)', html => '<span style="font-size:14pt;">' . join(', ', @output) . ' (random)</span>' if @output;
}
elsif ($_ =~ /^(\d{0,4})[d|w](\d+)\s?([+-])?\s?(\d+|[lh])?$/) { # 'w' is the German form
my (@rolls, $output);
my $number_of_dice = $1 || 1;
my $lowest = my $number_of_faces = $2;
my $highest = my $sum = 0;
for (1 .. $number_of_dice) {
my $roll = int(rand($number_of_faces)) + 1;
$lowest = $roll if $roll < $lowest;
$highest = $roll if $roll > $highest;
push @rolls, $roll;
}
if (defined($3) && defined($4)) {
# handle special case of " - L" or " - H"
if ($3 eq '-' && ($4 eq 'l' || $4 eq 'h')) {
if ($4 eq 'l') {
push(@rolls, -$lowest);
} else {
push(@rolls, -$highest);
my @values = split(' and ', $_);
my $result;
foreach my $_ (@values) {
if ($_ =~ /^(?:a? ?die|(\d{0,2})\s*dic?e)$/) {
my @output;
my $rolls = 1; # If "die" is entered
my $choices = 6; # To be replace with input string in the future
if (defined($1)) { # Not defined if number of "dice" not specified
if ($1 eq "") {
$rolls = 2;
}
else {
$rolls = $1;
}
} elsif ($3 eq '+' && ($4 eq 'l' || $4 eq 'h')) {
return;
} else {
push(@rolls, int("$3$4"));
}
for (1 .. $rolls) {
my $roll = int(rand($choices)) + 1;
push @output, $utf8_dice{$roll};
}
return join(', ', @output) . ' (random)', html => '<span style="font-size:14pt;">' . join(', ', @output) . ' (random)</span> ' if @output;
}
for (@rolls) {
$sum += $_;
elsif ($_ =~ /^(\d{0,4})[d|w](\d+)\s?([+-])?\s?(\d+|[lh])?$/) { # 'w' is the German form
my (@rolls, $output);
my $number_of_dice = $1 || 1;
my $lowest = my $number_of_faces = $2;
my $highest = my $sum = 0;
for (1 .. $number_of_dice) {
my $roll = int(rand($number_of_faces)) + 1;
$lowest = $roll if $roll < $lowest;
$highest = $roll if $roll > $highest;
push @rolls, $roll;
}
if (defined($3) && defined($4)) {
# handle special case of " - L" or " - H"
if ($3 eq '-' && ($4 eq 'l' || $4 eq 'h')) {
if ($4 eq 'l') {
push(@rolls, -$lowest);
} else {
push(@rolls, -$highest);
}
} elsif ($3 eq '+' && ($4 eq 'l' || $4 eq 'h')) {
return;
} else {
push(@rolls, int("$3$4"));
}
}
for (@rolls) {
$sum += $_;
}
if (@rolls > 1) {
$output = join(' + ', @rolls);
$output =~ s/\+\s\-/\- /g;
$output .= " = $sum";
} else {
$output = $sum;
}
$result .= '' . $output . ' (random) ' if $output;
}
if (@rolls > 1) {
$output = join(' + ', @rolls);
$output =~ s/\+\s\-/\- /g;
$output .= " = $sum";
} else {
$output = $sum;
}
return '' . $output . ' (random)' if $output;
}
return;
return rtrim($result) if $result;
};
1;