GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-26 22:09:26 +01:00
Code Issues Projects Releases Wiki Activity

Factoids: add weighted list selection; factadd list a:weight(1) b:weight(2)

Browse Source
This commit is contained in:
Pragmatic Software 2020-06-16 21:26:09 -07:00
parent ed4a36e025
commit 914e844f11
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
PBot/Factoids.pm
View File

@ -578,6 +578,36 @@ sub make_list {
return \@list; return \@list;
} }
sub select_weighted_item_from_list {
my ($self, $list, $index) = @_;
my @weights;
my $weight_sum = 0;
for (my $i = 0; $i <= $#$list; $i++) {
my $weight = 1;
if ($list->[$i] =~ s/:weight\((\d+)\)//) {
$weight = $1;
}
$weights[$i] = [ $weight, $i ];
$weight_sum += $weight;
}
if (defined $index) {
return $list->[$index];
}
my $n = int rand $weight_sum;
$index = 0;
for my $weight (sort { $a->[0] <=> $b->[0] } @weights) {
if ($n < $weight->[0]) {
return $list->[$weight->[1]];
}
$n -= $weight->[0];
}
}
sub select_item { sub select_item {
my ($self, $context, $extracted, $modifier, %opts) = @_; my ($self, $context, $extracted, $modifier, %opts) = @_;
@ -593,7 +623,7 @@ sub select_item {
$index = 0 if $index < 0; $index = 0 if $index < 0;
$index = $#$list if $index > $#$list; $index = $#$list if $index > $#$list;
$item = $list->[$index]; $item = $self->select_weighted_item_from_list($list, $index);
# strip outer quotes # strip outer quotes
if (not $item =~ s/^"(.*)"$/$1/) { $item =~ s/^'(.*)'$/$1/; } if (not $item =~ s/^"(.*)"$/$1/) { $item =~ s/^'(.*)'$/$1/; }
@ -619,8 +649,7 @@ sub select_item {
$max = @$list if $settings{'unique'} and $max > @$list; $max = @$list if $settings{'unique'} and $max > @$list;
$min = $max if $min > $max; $min = $max if $min > $max;
my $index = int rand @$list; my $choice = $self->select_weighted_item_from_list($list);
my $choice = $list->[$index];
push @choices, $choice; push @choices, $choice;
@ -654,7 +683,7 @@ sub select_item {
} else { } else {
my $list = $self->make_list($context, $extracted, \%settings, %opts); my $list = $self->make_list($context, $extracted, \%settings, %opts);
$item = $list->[rand @$list]; $item = $self->select_weighted_item_from_list($list);
# strip outer quotes # strip outer quotes
if (not $item =~ s/^"(.*)"$/$1/) { $item =~ s/^'(.*)'$/$1/; } if (not $item =~ s/^"(.*)"$/$1/) { $item =~ s/^'(.*)'$/$1/; }
@ -861,6 +890,7 @@ sub expand_factoid_vars {
$result = $self->expand_special_vars($from, $nick, $root_keyword, $result); $result = $self->expand_special_vars($from, $nick, $root_keyword, $result);
$result =~ s/\\\$/\$/g; $result =~ s/\\\$/\$/g;
$result =~ s/(?<!\\)\\(.)/$1/g;
return validate_string($result, $self->{pbot}->{registry}->get_value('factoids', 'max_content_length')); return validate_string($result, $self->{pbot}->{registry}->get_value('factoids', 'max_content_length'));
} }