GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-10-30 22:27:24 +01:00
Code Issues Projects Releases Wiki Activity

Plugin/Spinach: Improvements

Browse Source
This commit is contained in:
Pragmatic Software 2024-11-13 21:43:22 -08:00
parent 343dbae57e
commit 5bca8c7d16
No known key found for this signature in database
GPG Key ID: CC916B6E3C84ECCE
3 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lib/PBot/Plugin/Spinach.pm
View File

@ -521,6 +521,9 @@ sub cmd_spinach($self, $context) {
when ('v') {
my ($truth, $lie) = split /;/, $arguments;
if (!defined $truth || !defined $lie) {
return "Usage: spinach v <truth>;<lie>";
}
return $self->validate_lie($self->normalize_text($truth), $self->normalize_text($lie));
}
@ -685,30 +688,31 @@ sub cmd_spinach($self, $context) {
my $validate = $self->validate_lie($self->{state_data}->{current_question}->{answer}, $arguments);
# don't check alternate answers if exact match to first answer is found
unless ($validate == 0) {
# check alternate answers if lie is not already too similar to default answer
if ($validate == 1) {
# check alternative answers
foreach my $alt (@{$self->{state_data}->{current_question}->{alternativeSpellings}}) {
$validate = self->validate_lie($alt, $arguments);
# end loop if exact match to truth
last if $validate == 0;
# end loop if too similar to an alternative
last if $validate != 1;
}
}
if ($validate != 1) {
if (++$player->{lie_count} > 2) {
return "/msg $context->{nick} You cannot change your lie again this round.";
}
if ($validate == 0) {
$self->send_message($self->{channel}, "$color{yellow}$context->{nick} has found the truth!$color{reset}");
return "$context->{nick}: You have found the truth! Submit a different lie.";
} elsif ($validate == -1) {
$self->send_message($self->{channel}, "$color{yellow}$context->{nick} has found part of the truth!$color{reset}");
$self->send_message($self->{channel}, "$color{cyan}$context->{nick} has found part of the truth!$color{reset}");
} else {
$self->send_message($self->{channel}, "$color{yellow}$context->{nick} has misspelled the truth!$color{reset}");
$self->send_message($self->{channel}, "$color{cyan}$context->{nick} has misspelled the truth!$color{reset}");
}
return "$context->{nick}: Your lie is too similar to the truth! Please submit a different lie.";
return "$context->{nick}: Your lie is too similar to the truth! Submit a different lie.";
}
if (++$player->{lie_count} > 2) {
return "/msg $context->{nick} You cannot change your lie again this round.";
}
my $changed = exists $player->{lie};
@ -901,7 +905,9 @@ sub cmd_spinach($self, $context) {
return $self->{metadata}->unset($index, $key);
}
when ('rank') { return $self->{rankcmd}->rank($arguments); }
when ('rank') {
return $self->{rankcmd}->rank($arguments);
}
default { return $usage; }
}
@ -943,9 +949,6 @@ sub player_join($self, $nick, $user, $host) {
push @{$self->{state_data}->{players}}, $player;
# reset tocks to give player time to choose/lie
$self->{state_data}->{tocks} = 0;
return "/msg $self->{channel} $nick has joined the game!";
}
@ -1109,29 +1112,56 @@ sub validate_lie($self, $truth, $lie) {
my $count = 0;
foreach my $word (keys %lie_words) {
if (exists $truth_words{$word}) { $count++; }
if (exists $truth_words{$word}) {
$count++;
}
}
if ($count >= $lie_word_count) {
if ($count == $truth_word_count) {
# lie matches truth exactly
return 0;
} else {
# lie is a proper subset of truth
return -1;
}
}
$count = 0;
foreach my $word (keys %truth_words) {
if (exists $lie_words{$word}) {
$count++;
}
}
if ($count >= $truth_word_count) {
if ($count == $lie_word_count) {
# truth matches lie exactly
return 0;
} else {
# truth is a proper subset of lie
return -1;
}
}
my $stripped_truth = $truth;
$stripped_truth =~ s/(?:\s|\p{PosixPunct})+//g;
my $stripped_lie = $lie;
$stripped_lie =~ s/(?:\s|\p{PosixPunct})+//g;
if ($stripped_truth eq $stripped_lie) { return 0; }
if ($stripped_truth eq $stripped_lie) {
return 0;
}
my $distance = distance($stripped_truth, $stripped_lie);
my $length = (length $stripped_truth > length $stripped_lie) ? length $stripped_truth : length $stripped_lie;
# if difference is 20% or less then they're too similar
if ($distance / $length <= 0.20) { return -2; }
if ($distance / $length <= 0.20) {
return -2;
}
return 1;
}
@ -1175,7 +1205,7 @@ sub run_one_state($self) {
}
}
if (not @{$self->{state_data}->{players}}) {
if ($self->{current_state} ne 'nogame' && not @{$self->{state_data}->{players}}) {
$self->send_message($self->{channel}, "All players have left the game!");
$self->{current_state} = 'nogame';
$self->{pbot}->{event_queue}->update_repeating('spinach loop', 0);
@ -1188,6 +1218,7 @@ sub run_one_state($self) {
if ($self->{previous_state} ne $self->{current_state}) {
$state_data->{newstate} = 1;
$state_data->{ticks} = 1;
$state_data->{tocks} = 0;
if (exists $state_data->{tick_drift}) {
$state_data->{ticks} += $state_data->{tick_drift};
@ -1429,7 +1460,6 @@ sub roundinit($self, $state) {
my $round_scoring = $self->{game}->{round};
if ($round_scoring >= $self->{game}->{rounds} + 1) {
$state->{random_category} = 1;
$state->{bonus_round}++;
$round_scoring = 'bonus';
} elsif ($round_scoring > 3) {
@ -1450,7 +1480,6 @@ sub roundinit($self, $state) {
sub roundstart($self, $state) {
if ($state->{ticks} % 2 == 0 || $state->{reroll_category}) {
$state->{init} = 1;
$state->{tocks} = 0;
$state->{max_tocks} = $self->{choosecategory_max_tocks};
unless ($state->{reroll_category}) {
@ -1486,6 +1515,10 @@ sub choosecategory($self, $state) {
$state->{current_player} = 0;
}
if ($self->{game}->{round} >= $self->{game}->{rounds} + 1) {
$state->{random_category} = 1;
}
my @choices;
my @categories;
@ -1691,7 +1724,6 @@ sub showquestion($self, $state) {
$self->showquestion_helper($state);
$state->{max_tocks} = $self->{picktruth_max_tocks};
$state->{tocks} = 0;
$state->{init} = 1;
$state->{current_lie_player} = 0;
@ -1786,7 +1818,6 @@ sub getlies($self, $state) {
$self->send_message($self->{channel}, "$missed failed to submit a lie in time!");
}
$state->{tocks} = 0;
$state->{init} = 1;
$state->{result} = 'next';
return 1;
@ -2251,7 +2282,6 @@ sub gameover($self, $state) {
# reset some state data
delete $state->{random_category};
$state->{tocks} = 0;
$state->{bonus_round} = 0;
$state->{result} = 'next';
return 1;

17
lib/PBot/Plugin/Spinach/Rank.pm
View File

@ -314,12 +314,19 @@ sub rank($self, $arguments, @rest) {
if ($arguments eq 'expr') {
$self->{expr} = eval { Math::Expression::Evaluator->new($opt_arg) };
if ($@) {
my $error = $@;
$error =~ s/ at .*//ms;
return "Bad expression: $error";
if (my $except = $@) {
$except =~ s/ at .*//ms;
return "Bad expression: $except";
}
eval {
$self->{expr}->optimize;
};
if (my $except = $@) {
$except =~ s/ at .*//ms;
return $except;
}
$self->{expr}->optimize;
}
my $sort_method = $ranks{$arguments}->{sort};

4
lib/PBot/VERSION.pm
View File

@ -25,8 +25,8 @@ use PBot::Imports;
# These are set by the /misc/update_version script
use constant {
BUILD_NAME => "PBot",
BUILD_REVISION => 4850,
BUILD_DATE => "2024-11-10",
BUILD_REVISION => 4851,
BUILD_DATE => "2024-11-13",
};
sub initialize {}