diff --git a/lib/Lacuna/DB/Result/Map/Body.pm b/lib/Lacuna/DB/Result/Map/Body.pm index baa2d5df..dd1ad102 100644 --- a/lib/Lacuna/DB/Result/Map/Body.pm +++ b/lib/Lacuna/DB/Result/Map/Body.pm @@ -422,11 +422,15 @@ sub add_to_neutral_entry { sub subtract_from_neutral_entry { my ($self, $seconds) = @_; - my $now = DateTime->now; + my $day = DateTime->now->add(hours => 24); + return 1 if ($self->neutral_entry < $day); + my $time_ends = $self->neutral_entry->clone->subtract(seconds => $seconds); - $self->neutral_entry($time_ends); - if ($self->neutral_entry < $now) { - $self->neutral_entry($now); + if ($time_ends > $day) { + $self->neutral_entry($time_ends); + } + else { + $self->neutral_entry($day); } $self->update; return 1; diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm index f23f2d1b..caab77cc 100644 --- a/lib/Lacuna/DB/Result/Spies.pm +++ b/lib/Lacuna/DB/Result/Spies.pm @@ -1861,6 +1861,7 @@ sub steal_planet { )->id; } else { # win + $self->on_body->add_to_neutral_entry(24 * 60 * 60); $self->on_body->empire->send_predefined_message( tags => ['Spies','Alert'], filename => 'lost_planet_to_insurrection.txt', diff --git a/lib/Lacuna/Role/Ship/Arrive/GroupHome.pm b/lib/Lacuna/Role/Ship/Arrive/GroupHome.pm index 3627471b..0a697f9e 100644 --- a/lib/Lacuna/Role/Ship/Arrive/GroupHome.pm +++ b/lib/Lacuna/Role/Ship/Arrive/GroupHome.pm @@ -16,7 +16,7 @@ after handle_arrival_procedures => sub { for my $num (1..$payload->{fleet}->{$key}->{quantity}) { my $ship = Lacuna->db->resultset('Ships')->new({ type => "sweeper", - name => $payload->{fleet}->{$key}->{name}, + name => "Sweeper", shipyard_id => 42, speed => $payload->{fleet}->{$key}->{speed}, combat => $payload->{fleet}->{$key}->{combat},