diff --git a/lib/Lacuna/DB/Result/Building/Trade.pm b/lib/Lacuna/DB/Result/Building/Trade.pm index d241cdfd..89f11df1 100644 --- a/lib/Lacuna/DB/Result/Building/Trade.pm +++ b/lib/Lacuna/DB/Result/Building/Trade.pm @@ -278,29 +278,6 @@ sub trade_ships { }); } -sub waste_ships { - my ($self) = @_; - return Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search({ - task => 'Docked', - type => { 'in' => [qw(scow)] }, - body_id => $self->body_id, - }, - { - order_by=> {-desc => ['hold_size']} - }); -} - -sub waste_chains { - my ($self) = @_; - return Lacuna->db->resultset('Lacuna::DB::Result::WasteChain')->search({ - planet_id => $self->body_id, - star_id => $self->body->star_id, - }, - { - order_by => 'waste_hour', - }); -} - sub next_available_trade_ship { my ($self, $ship_id) = @_; if ($ship_id) { diff --git a/lib/Lacuna/DB/Result/WasteChain.pm b/lib/Lacuna/DB/Result/WasteChain.pm index 97c86cfb..803493a1 100644 --- a/lib/Lacuna/DB/Result/WasteChain.pm +++ b/lib/Lacuna/DB/Result/WasteChain.pm @@ -25,6 +25,7 @@ sub get_status { star => { id => $star->id, name => $star->name, + color => $star->color, x => $star->x, y => $star->y, },