From 747adf4d714b14583cfd609b783e0077a55b867e Mon Sep 17 00:00:00 2001 From: Mark Lemming Date: Thu, 2 Jan 2014 18:07:32 -0700 Subject: [PATCH] Fixing more spy issues. --- lib/Lacuna/DB/Result/Spies.pm | 7 ++++--- var/messages/i_have_escaped.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm index 2e73c35b..1463a5cb 100644 --- a/lib/Lacuna/DB/Result/Spies.pm +++ b/lib/Lacuna/DB/Result/Spies.pm @@ -965,7 +965,8 @@ sub get_defender { ->resultset('Spies') ->search( { on_body_id => $self->on_body_id, - task => 'Counter Espionage', + task => { 'in' => [ 'Counter Espionage', + 'Security Sweep',] }, empire_id => { 'not_in' => \@member_ids } }, { rows => 1, order_by => 'rand()' } )->single; @@ -1086,8 +1087,8 @@ sub thwart_a_spy { sub escape { my ($self) = shift; - $self->available_on(DateTime->now); - $self->task('Idle'); + $self->task('Escaped'); + $self->available_on(DateTime->now->add(seconds => $self->recovery_time(60*60*4))); $self->update; $self->on_body->empire->send_predefined_message( tags => ['Spies','Alert'], diff --git a/var/messages/i_have_escaped.txt b/var/messages/i_have_escaped.txt index ec623c5b..a0c8b94c 100644 --- a/var/messages/i_have_escaped.txt +++ b/var/messages/i_have_escaped.txt @@ -1,5 +1,5 @@ I'm Back! ~~~ -I managed to break out of the {Starmap %s %s %s} prison. I'm ready for duty, put me to work. +I managed to break out of the {Starmap %s %s %s} prison. I'll be ready for duty soon. %s of {Planet %s %s} -- 2.51.2