3
0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-24 11:42:35 +01:00

Plugins/Battleship: use event queue for game loop

This commit is contained in:
Pragmatic Software 2020-03-07 19:27:15 -08:00
parent f258cf6cc6
commit 470d463686

View File

@ -23,8 +23,6 @@ sub initialize {
my ($self, %conf) = @_; my ($self, %conf) = @_;
$self->{pbot}->{commands}->register(sub { $self->battleship_cmd(@_) }, 'battleship', 0); $self->{pbot}->{commands}->register(sub { $self->battleship_cmd(@_) }, 'battleship', 0);
$self->{pbot}->{timer}->register(sub { $self->battleship_timer }, 1, 'battleship timer');
$self->{pbot}->{event_dispatcher}->register_handler('irc.part', sub { $self->on_departure(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('irc.part', sub { $self->on_departure(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.quit', sub { $self->on_departure(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('irc.quit', sub { $self->on_departure(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.kick', sub { $self->on_kick(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('irc.kick', sub { $self->on_kick(@_) });
@ -43,7 +41,7 @@ sub initialize {
sub unload { sub unload {
my $self = shift; my $self = shift;
$self->{pbot}->{commands}->unregister('battleship'); $self->{pbot}->{commands}->unregister('battleship');
$self->{pbot}->{timer}->unregister('battleship timer'); $self->{pbot}->{timer}->dequeue_event('battleship loop');
$self->{pbot}->{event_dispatcher}->remove_handler('irc.part'); $self->{pbot}->{event_dispatcher}->remove_handler('irc.part');
$self->{pbot}->{event_dispatcher}->remove_handler('irc.quit'); $self->{pbot}->{event_dispatcher}->remove_handler('irc.quit');
$self->{pbot}->{event_dispatcher}->remove_handler('irc.kick'); $self->{pbot}->{event_dispatcher}->remove_handler('irc.kick');
@ -133,6 +131,12 @@ sub battleship_cmd {
$player = {id => -1, name => undef, missedinputs => 0}; $player = {id => -1, name => undef, missedinputs => 0};
push @{$self->{state_data}->{players}}, $player; push @{$self->{state_data}->{players}}, $player;
$self->{pbot}->{timer}->enqueue_event(sub {
$self->run_one_state;
}, 1, 'battleship loop', 1
);
return "/msg $self->{channel} $nick has made an open challenge! Use `accept` to accept their challenge."; return "/msg $self->{channel} $nick has made an open challenge! Use `accept` to accept their challenge.";
} }
@ -151,6 +155,11 @@ sub battleship_cmd {
$player = {id => $id, name => $challengee, missedinputs => 0}; $player = {id => $id, name => $challengee, missedinputs => 0};
push @{$self->{state_data}->{players}}, $player; push @{$self->{state_data}->{players}}, $player;
$self->{pbot}->{timer}->enqueue_event(sub {
$self->battleship_loop;
}, 1, 'battleship loop', 1
);
return "/msg $self->{channel} $nick has challenged $challengee to Battleship! Use `accept` to accept their challenge."; return "/msg $self->{channel} $nick has challenged $challengee to Battleship! Use `accept` to accept their challenge.";
} }
@ -343,11 +352,6 @@ sub battleship_cmd {
return $result; return $result;
} }
sub battleship_timer {
my $self = shift;
$self->run_one_state;
}
sub player_left { sub player_left {
my ($self, $nick, $user, $host) = @_; my ($self, $nick, $user, $host) = @_;
@ -958,6 +962,7 @@ sub show_battlefield {
sub nogame { sub nogame {
my ($self, $state) = @_; my ($self, $state) = @_;
$state->{result} = 'nogame'; $state->{result} = 'nogame';
$self->{pbot}->{timer}->update_repeating('battleship loop', 0);
return $state; return $state;
} }