GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Spinach: Add ability to reroll categories

This commit is contained in:
Pragmatic Software 2018-02-26 01:32:02 -08:00
parent f8eefbdc09
commit 1413e1263c
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PBot/Plugins/Spinach.pm
View File

@ -618,10 +618,17 @@ sub spinach_cmd {
return "$nick: Choice out of range. Please choose a valid category. $self->{state_data}->{categories_text}"; return "$nick: Choice out of range. Please choose a valid category. $self->{state_data}->{categories_text}";
} }
if ($arguments == @{$self->{state_data}->{category_options}} - 1) { if ($arguments == @{$self->{state_data}->{category_options}} - 2) {
$arguments = (@{$self->{state_data}->{category_options}} - 1) * rand; $arguments = (@{$self->{state_data}->{category_options}} - 2) * rand;
$self->{state_data}->{current_category} = $self->{state_data}->{category_options}->[$arguments]; $self->{state_data}->{current_category} = $self->{state_data}->{category_options}->[$arguments];
return "/msg $self->{channel} $nick has chosen RANDOM! Randomly choosing category: $self->{state_data}->{current_category}!"; return "/msg $self->{channel} $nick has chosen RANDOM CATEGORY! Randomly choosing category: $self->{state_data}->{current_category}!";
} elsif ($arguments == @{$self->{state_data}->{category_options}} - 1) {
if (++$self->{state_data}->{category_rerolls} >= 3) {
return "/msg $self->{channel} $nick has chosen REROLL CATEGORIES! But they have exceeded the number of times they may reroll!";
} else {
$self->{state_data}->{reroll_category} = 1;
return "/msg $self->{channel} $nick has chosen REROLL CATEGORIES! Rerolling categories...";
}
} else { } else {
$self->{state_data}->{current_category} = $self->{state_data}->{category_options}->[$arguments]; $self->{state_data}->{current_category} = $self->{state_data}->{category_options}->[$arguments];
return "/msg $self->{channel} $nick has chosen $self->{state_data}->{current_category}!"; return "/msg $self->{channel} $nick has chosen $self->{state_data}->{current_category}!";
@ -1359,9 +1366,9 @@ sub validate_lie {
sub choosecategory { sub choosecategory {
my ($self, $state) = @_; my ($self, $state) = @_;
if ($state->{init}) { if ($state->{init} or $state->{reroll_category}) {
delete $state->{current_category}; delete $state->{current_category};
$state->{current_player}++; $state->{current_player}++ unless $state->{reroll_category};
if ($state->{current_player} >= @{$state->{players}}) { if ($state->{current_player} >= @{$state->{players}}) {
$state->{current_player} = 0; $state->{current_player} = 0;
@ -1387,10 +1394,11 @@ sub choosecategory {
push @choices, $cat; push @choices, $cat;
} }
last if @choices == 7; last if @choices == 8;
} }
push @choices, 'RANDOM'; push @choices, 'RANDOM CATEGORY';
push @choices, 'REROLL CATEGORIES';
$state->{categories_text} = ''; $state->{categories_text} = '';
my $i = 1; my $i = 1;
@ -1401,8 +1409,14 @@ sub choosecategory {
$comma = "; "; $comma = "; ";
} }
if ($state->{reroll_category}) {
$self->send_message($self->{channel}, "$state->{categories_text}");
}
$state->{category_options} = \@choices; $state->{category_options} = \@choices;
$state->{category_rerolls} = 0 if $state->{init};
delete $state->{init}; delete $state->{init};
delete $state->{reroll_category};
} }
if (exists $state->{current_category} or not @{$state->{players}}) { if (exists $state->{current_category} or not @{$state->{players}}) {