From 369052d39f3e51ede59c29f9cd2ba94762fd62aa Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sat, 15 May 2010 13:17:58 -0500 Subject: [PATCH] rewrote freebies --- bin/handle_espionage.pl | 2 +- lib/Lacuna/Building.pm | 13 ++++++--- lib/Lacuna/Building/PlanetaryCommand.pm | 9 ++++-- lib/Lacuna/DB/Result/Building.pm | 18 ++---------- lib/Lacuna/DB/Result/Freebies.pm | 19 ++++++++++++ lib/Lacuna/DB/Result/Map/Body.pm | 1 - lib/Lacuna/DB/Result/Map/Body/Planet.pm | 39 +++++++++++++------------ lib/Lacuna/DB/Result/Ships.pm | 4 +-- lib/Lacuna/Tutorial.pm | 13 ++++----- t/Command.t | 2 +- 10 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 lib/Lacuna/DB/Result/Freebies.pm diff --git a/bin/handle_espionage.pl b/bin/handle_espionage.pl index 0c65d31f..1a8ced20 100644 --- a/bin/handle_espionage.pl +++ b/bin/handle_espionage.pl @@ -869,7 +869,7 @@ sub steal_building { { body_id => $planet->id, level => {'>=' => $level} }, {rows=>1} )->single; return undef unless defined $building; - $thief->from_body->add_freebie($building->class, $level)->update; + $thief->from_body->add_freebie($building->class, $level); $thief->empire->send_predefined_message( tags => ['Alert'], filename => 'building_theft_report.txt', diff --git a/lib/Lacuna/Building.pm b/lib/Lacuna/Building.pm index 37c44a47..69f0a8a1 100644 --- a/lib/Lacuna/Building.pm +++ b/lib/Lacuna/Building.pm @@ -41,8 +41,9 @@ sub upgrade { # spend resources my $body = $building->body; - if ($building->has_free_upgrade) { - $body->spend_freebie($building->class)->update; + my $freebie = $body->get_freebie($building->class, $building->level + 1); + if (defined $freebie) { + $freebie->delete; } else { $body->spend_water($cost->{water}); @@ -141,8 +142,12 @@ sub build { $body = $body->can_build_building($building); # adjust resources - if ($building->has_free_build) { - $body->spend_freebie($building->class)->update; + my $freebie = $body->get_freebie($building->class, 1); + if (defined $freebie) { + if ($freebie->extra_build_level) { + $building->level( $freebie->extra_build_level); + } + $freebie->delete; } else { $body->spend_food($building->food_to_build); diff --git a/lib/Lacuna/Building/PlanetaryCommand.pm b/lib/Lacuna/Building/PlanetaryCommand.pm index c26e59bb..22a4665a 100644 --- a/lib/Lacuna/Building/PlanetaryCommand.pm +++ b/lib/Lacuna/Building/PlanetaryCommand.pm @@ -26,9 +26,12 @@ sub view_freebies { my $building = $empire->get_building($self->model_class, $building_id); my $free_stuff = $building->body->freebies; my %freebies; - foreach my $class (keys %{$free_stuff}) { - next if ($class eq 'upgrades' || $class eq 'builds'); # deal with legacy REMOVE BEFORE LAUNCH - $freebies{$class->name} = $free_stuff->{$class}; + while (my $freebie = $free_stuff->next) { + my $level = $freebie->level; + if ($freebie->extra_build_level) { + $level .= ' ('.$freebie->extra_build_level.')'; + } + $freebies{$freebie->class->name} = $level; } return { freebies => \%freebies, diff --git a/lib/Lacuna/DB/Result/Building.pm b/lib/Lacuna/DB/Result/Building.pm index f0b3787b..a9b1f50a 100644 --- a/lib/Lacuna/DB/Result/Building.pm +++ b/lib/Lacuna/DB/Result/Building.pm @@ -529,7 +529,7 @@ sub check_build_prereqs { confess [1013, "Can't build a building outside of it's Goldilox zone.", [$self->min_orbit, $self->max_orbit]]; } - unless ($self->has_free_build) { + unless ($body->get_freebie($self->class, 1)) { # check university level if ($self->university_prereq > $body->empire->university_level) { confess [1013, "University research too low.",$self->university_prereq]; @@ -612,24 +612,12 @@ sub time_cost_reduction_bonus { return (100 - $extra - $self->body->empire->species->management_affinity) / 100 } -sub has_free_build { - my $self = shift; - return ($self->level == 0 && $self->body->get_freebie($self->class) == 1) ? 1 : 0; -} - -sub has_free_upgrade { - my $self = shift; - return ($self->body->get_freebie($self->class) == $self->level + 1) ? 1 : 0; -} - sub cost_to_upgrade { my ($self) = @_; my $upgrade_cost = $self->upgrade_cost; my $upgrade_cost_reduction = $self->construction_cost_reduction_bonus; - if ($self->has_free_build) { # gets a free building - $upgrade_cost_reduction = 0; - } - elsif ($self->has_free_upgrade) { # gets a free upgrade + my $freebie = $self->body->get_freebie($self->class, $self->level + 1); + if (defined $freebie) { $upgrade_cost_reduction = 0; } return { diff --git a/lib/Lacuna/DB/Result/Freebies.pm b/lib/Lacuna/DB/Result/Freebies.pm new file mode 100644 index 00000000..18aefb11 --- /dev/null +++ b/lib/Lacuna/DB/Result/Freebies.pm @@ -0,0 +1,19 @@ +package Lacuna::DB::Result::Freebies; + +use Moose; +extends 'Lacuna::DB::Result'; +use Lacuna::Util qw(format_date); +use DateTime; + +__PACKAGE__->table('freebies'); +__PACKAGE__->add_columns( + body_id => { data_type => 'int', size => 11, is_nullable => 0 }, + class => { data_type => 'char', size => 255, is_nullable => 0 }, + level => { data_type => 'int', size => 3, is_nullable => 0 }, + extra_build_level => { data_type => 'int', size => 3, default => 0}, +); + +__PACKAGE__->belongs_to('body', 'Lacuna::DB::Result::Map::Body', 'body_id'); + +no Moose; +__PACKAGE__->meta->make_immutable(inline_constructor => 0); diff --git a/lib/Lacuna/DB/Result/Map/Body.pm b/lib/Lacuna/DB/Result/Map/Body.pm index 23fe1cd3..2a2c0a28 100644 --- a/lib/Lacuna/DB/Result/Map/Body.pm +++ b/lib/Lacuna/DB/Result/Map/Body.pm @@ -112,7 +112,6 @@ __PACKAGE__->add_columns( burger_stored => { data_type => 'int', size => 11, default_value => 0 }, shake_stored => { data_type => 'int', size => 11, default_value => 0 }, beetle_stored => { data_type => 'int', size => 11, default_value => 0 }, - freebies => { data_type => 'mediumtext', is_nullable => 1, 'serializer_class' => 'JSON' }, boost_enabled => { data_type => 'int', size => 1, default_value => 0 }, needs_recalc => { data_type => 'int', size => 1, default_value => 0 }, restrict_coverage => { data_type => 'int', size => 1, default_value => 1 }, diff --git a/lib/Lacuna/DB/Result/Map/Body/Planet.pm b/lib/Lacuna/DB/Result/Map/Body/Planet.pm index 71995376..6ebe973e 100644 --- a/lib/Lacuna/DB/Result/Map/Body/Planet.pm +++ b/lib/Lacuna/DB/Result/Map/Body/Planet.pm @@ -8,6 +8,10 @@ use Lacuna::Util qw(to_seconds randint); use DateTime; no warnings 'uninitialized'; + +__PACKAGE__->has_many('ships','Lacuna::DB::Result::Ships','body_id'); +__PACKAGE__->has_many('freebies','Lacuna::DB::Result::Freebies','body_id'); + sub ships_travelling { my ($self, $where, $reverse) = @_; my $order = '-asc'; @@ -25,28 +29,26 @@ sub ships_travelling { # FREEBIES sub get_freebie { - my ($self, $class) = @_; - return $self->freebies->{$class} || 0; + my ($self, $class, $level) = @_; + return $self->freebies->search({class => $class, level => $level},{rows => 1})->single; } sub add_freebie { - my ($self, $class, $level) = @_; + my ($self, $class, $level, $extra_build_level) = @_; my $freebies = $self->freebies; - if (scalar(keys %{$freebies}) >= 10 && ! exists $freebies->{$class}) { - my ($key) = keys %{$freebies}; - delete $freebies->{key}; - } - $freebies->{$class} = $level; - $self->freebies($freebies); - return $self; -} -sub spend_freebie { - my ($self, $class) = @_; - my $freebies = $self->freebies; - delete $freebies->{$class}; - $self->freebies($freebies); - return $self; + # can't have more than 10 + if ($freebies->count >= 10) { + $freebies->next->delete; + } + + # add it + $freebies->new({ + body_id => $self->id, + class => $class, + level => $level, + extra_build_level => $extra_build_level, + })->insert; } sub sanitize { @@ -68,8 +70,9 @@ sub sanitize { cider_stored wheat_stored bread_stored soup_stored chip_stored pie_stored pancake_stored milk_stored meal_stored algae_stored syrup_stored fungus_stored burger_stored shake_stored beetle_stored bean_production_hour bean_stored ); + $self->freebies->delete_all; Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search({foreign_body_id => $self->id})->delete_all; - Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search({body_id => $self->id})->delete_all; + $self->ships->delete_all; foreach my $attribute (@attributes) { $self->$attribute(0); } diff --git a/lib/Lacuna/DB/Result/Ships.pm b/lib/Lacuna/DB/Result/Ships.pm index 04d56790..bee357bf 100644 --- a/lib/Lacuna/DB/Result/Ships.pm +++ b/lib/Lacuna/DB/Result/Ships.pm @@ -141,7 +141,7 @@ sub arrive { if ($self->direction eq 'outgoing') { my $lab = $self->body->get_building_of_class('Lacuna::DB::Result::Building::TerraformingLab'); if (defined $lab) { - $self->foreign_body->add_freebie('Lacuna::DB::Result::Building::Permanent::TerraformingPlatform', $lab->level)->update; + $self->foreign_body->add_freebie('Lacuna::DB::Result::Building::Permanent::TerraformingPlatform', 1, $lab->level); } } else { @@ -153,7 +153,7 @@ sub arrive { if ($self->direction eq 'outgoing') { my $lab = $self->body->get_building_of_class('Lacuna::DB::Result::Building::GasGiantLab'); if (defined $lab) { - $self->foreign_body->add_freebie('Lacuna::DB::Result::Building::Permanent::GasGiantPlatform', $lab->level)->update; + $self->foreign_body->add_freebie('Lacuna::DB::Result::Building::Permanent::GasGiantPlatform', 1, $lab->level); } } else { diff --git a/lib/Lacuna/Tutorial.pm b/lib/Lacuna/Tutorial.pm index 40ec2549..ceee1778 100644 --- a/lib/Lacuna/Tutorial.pm +++ b/lib/Lacuna/Tutorial.pm @@ -48,7 +48,7 @@ sub explore_the_ui { if ($finish) { if ($home->name ne $empire->tutorial_scratch) { $empire->add_medal('pleased_to_meet_you'); - $home->add_freebie('Lacuna::DB::Result::Building::Food::Farm::Malcud', 1)->update; + $home->add_freebie('Lacuna::DB::Result::Building::Food::Farm::Malcud', 1); $self->start('get_food'); return undef; } @@ -165,7 +165,7 @@ sub pawn { if ($finish) { my $building = $home->get_building_of_class('Lacuna::DB::Result::Building::Intelligence'); if (defined $building && $building->level >= 1) { - $home->add_freebie('Lacuna::DB::Result::Building::Intelligence', 2)->update; + $home->add_freebie('Lacuna::DB::Result::Building::Intelligence', 2); $building->train_spy; $self->start('counter_spy'); return undef; @@ -214,7 +214,7 @@ sub explore { my $empire = $self->empire; if ($finish) { if ($empire->count_probed_stars > 1) { - $empire->home_planet->add_freebie('Lacuna::DB::Result::Building::Transporter', 1)->update; + $empire->home_planet->add_freebie('Lacuna::DB::Result::Building::Transporter', 1); $self->start('the_end'); return undef; } @@ -366,7 +366,7 @@ sub fool { my $home = $empire->home_planet; if ($finish) { if ($home->food_hour >= $empire->tutorial_scratch) { - $home->add_freebie('Lacuna::DB::Result::Building::Food::Reserve', 2)->update; + $home->add_freebie('Lacuna::DB::Result::Building::Food::Reserve', 2); $empire->add_essentia(35)->update; $self->start('essentia'); return undef; @@ -404,7 +404,7 @@ sub energy { my $home = $empire->home_planet; if ($finish) { if ($home->energy_hour >= $empire->tutorial_scratch) { - $home->add_freebie('Lacuna::DB::Result::Building::Energy::Reserve', 2)->update; + $home->add_freebie('Lacuna::DB::Result::Building::Energy::Reserve', 2); $self->start('the_300'); return undef; } @@ -427,8 +427,7 @@ sub the_300 { if ($finish) { if ($home->ore_hour >= 50 && $home->water_hour >= 50) { $home->add_freebie('Lacuna::DB::Result::Building::Ore::Storage', 2) - ->add_freebie('Lacuna::DB::Result::Building::Water::Storage', 2) - ->update; + ->add_freebie('Lacuna::DB::Result::Building::Water::Storage', 2); $self->start('news'); return undef; } diff --git a/t/Command.t b/t/Command.t index 260203ba..298feb1c 100644 --- a/t/Command.t +++ b/t/Command.t @@ -24,7 +24,7 @@ foreach my $bid (keys %{$result->{result}{buildings}}) { $result = $tester->post('planetarycommand', 'view', [$session_id, $id]); is($result->{result}{planet}{building_count}, 1, "got building count"); -$tester->empire->home_planet->add_freebie('Lacuna::DB::Result::Building::SpacePort', 5)->update; +$tester->empire->home_planet->add_freebie('Lacuna::DB::Result::Building::SpacePort', 5); sleep 3; $result = $tester->post('planetarycommand', 'view_freebies', [$session_id, $id]); -- knotmirror 0.0.1