From 5218bf89ac3a08bc0b8a93af58ddcfa79d398d88 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 7 Sep 2010 11:28:05 -0500 Subject: [PATCH] migrated build_ship --- lib/Lacuna/DB/Result/Building/Shipyard.pm | 28 ++++++++++------------- lib/Lacuna/Tutorial.pm | 2 +- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/Lacuna/DB/Result/Building/Shipyard.pm b/lib/Lacuna/DB/Result/Building/Shipyard.pm index 78a31d0d..94435064 100644 --- a/lib/Lacuna/DB/Result/Building/Shipyard.pm +++ b/lib/Lacuna/DB/Result/Building/Shipyard.pm @@ -92,9 +92,9 @@ sub can_build_ship { sub build_ship { - my ($self, $port, $type, $time) = @_; - my $ship = Lacuna::DB::Result::Ships->new({type => $type}); - + my ($self, $ship, $time) = @_; + $ship->shipyard_id($self->id); + $ship->date_started(DateTime->now); $time ||= $self->get_ship_costs($ship)->{seconds}; my $latest = Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search( { shipyard_id => $self->id, task => 'Building' }, @@ -108,21 +108,17 @@ sub build_ship { $date_completed = DateTime->now; } $date_completed->add(seconds=>$time); - my $name = $type; + $ship->date_available($date_completed); + $ship->task('Building'); + my $name = $ship->type; $name =~ s/(_|^)(\w)(.*?)(?=_|$)/\u$2/sg; $name .= $self->level; - return Lacuna->db->resultset('Lacuna::DB::Result::Ships')->new({ - shipyard_id => $self->id, - spaceport_id => $port->id, - date_started => DateTime->now, - date_available => $date_completed, - task => 'Building', - type => $type, - name => $name, - body_id => $self->body_id, - speed => $self->get_ship_speed($ship), - hold_size => $self->get_ship_hold_size($ship), - })->insert; + $ship->name($name); + $ship->body_id($self->body_id); + $ship->speed($self->get_ship_speed($ship)); + $ship->hold_size($self->get_ship_hold_size($ship)); + $ship->insert; + return $ship; } before delete => sub { diff --git a/lib/Lacuna/Tutorial.pm b/lib/Lacuna/Tutorial.pm index 474f6a40..29776a5d 100644 --- a/lib/Lacuna/Tutorial.pm +++ b/lib/Lacuna/Tutorial.pm @@ -217,7 +217,7 @@ sub observatory { if (defined $building && $building->level >= 1) { my $shipyard = $home->get_building_of_class('Lacuna::DB::Result::Building::Shipyard'); $shipyard->body($home); - $shipyard->build_ship($home->spaceport, 'probe'); + $shipyard->build_ship(Lacuna->db->resultset('Lacuna::DB::Result::Ships')->new({spaceport=>$home->spaceport, type=>'probe'})); $self->start('explore'); return undef; } -- knotmirror 0.0.1