From 1550c73ce16028906e9e43f19b74ef41e77e07d8 Mon Sep 17 00:00:00 2001 From: lemming552 Date: Mon, 12 Nov 2012 19:50:36 -0700 Subject: [PATCH 1/2] Newline litter. --- bin/tick_fissures.pl | 2 +- lib/Lacuna/DB/Result/Building/Archaeology.pm | 1 + lib/Lacuna/RPC/Building/BlackHoleGenerator.pm | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/tick_fissures.pl b/bin/tick_fissures.pl index f51d8b62..cec37a34 100644 --- a/bin/tick_fissures.pl +++ b/bin/tick_fissures.pl @@ -39,7 +39,7 @@ for my $body_id (sort keys %has_fissures) { # The level of the second Fissure is the same level as the BHG (if there is one) otherwise it is level 1 # for my $fissure (@fissures) { - out("Fissure at ".$fissure->x.",".$fissure->y." co-ordinates"); + out("Level ".$fissure->level." fissure at ".$fissure->x.",".$fissure->y." co-ordinates"); my $damage = randint(2,6); if ($fissure->efficiency > 0) { $fissure->efficiency($fissure->efficiency - $damage); diff --git a/lib/Lacuna/DB/Result/Building/Archaeology.pm b/lib/Lacuna/DB/Result/Building/Archaeology.pm index fe5fd77d..af05ea9e 100644 --- a/lib/Lacuna/DB/Result/Building/Archaeology.pm +++ b/lib/Lacuna/DB/Result/Building/Archaeology.pm @@ -278,6 +278,7 @@ sub dig_it { 'It\'s full of stars.', 'Looks like I picked the wrong week to stop drinking coffee.', 'Klaatu Barada Ni*cough*', + 'No, Mr. Excav, I expect you to die.', 'Oh no, not again.', 'Oops? What oops? No oops!', 'Ph\'nglui Mglw\'nafh Cthulhu R\'lyeh wgah\'nagl fhtagn.', diff --git a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm index de7c683b..a57aca0e 100644 --- a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm +++ b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm @@ -404,7 +404,7 @@ sub generate_singularity { unless ( ($body->empire->id == $tempire->id) or ( $body->empire->alliance_id && ($body->empire->alliance_id == $tempire->alliance_id))) { - confess [1009, "You can not change type of a body if it is occupied by another alliance!\n"]; + confess [1009, "You can not change type of a body if it is occupied by another alliance!"]; } } elsif ( $task->{name} eq "Swap Places" ) { @@ -453,11 +453,11 @@ sub generate_singularity { } elsif ( $task->{name} eq 'Move System' ) { unless ($target->isa('Lacuna::DB::Result::Map::Star')) { - confess [1009, "You can not attempt that action on non-stars!\n"]; + confess [1009, "You can not attempt that action on non-stars!"]; } if ($target->station_id) { unless ($body->empire->alliance_id && $target->station->alliance_id == $body->empire->alliance_id) { - confess [1009, 'That star system is claimed by '.$tstar->station->alliance->name.'.\n']; + confess [1009, 'That star system is claimed by '.$tstar->station->alliance->name.'.']; } } # Let's check all planets in our system and target system -- 2.51.2 From baac1338b7a5c4098a9d314df3cfed3e28194032 Mon Sep 17 00:00:00 2001 From: lemming552 Date: Mon, 12 Nov 2012 19:51:48 -0700 Subject: [PATCH 2/2] Can build all sslab pieces at once. --- lib/Lacuna/DB/Result/Building/SSLb.pm | 2 +- lib/Lacuna/DB/Result/Building/SSLc.pm | 2 +- lib/Lacuna/DB/Result/Building/SSLd.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Lacuna/DB/Result/Building/SSLb.pm b/lib/Lacuna/DB/Result/Building/SSLb.pm index e97bc0c0..489be83c 100644 --- a/lib/Lacuna/DB/Result/Building/SSLb.pm +++ b/lib/Lacuna/DB/Result/Building/SSLb.pm @@ -10,7 +10,7 @@ around 'build_tags' => sub { return ($orig->($class), qw(Construction Ships)); }; -use constant building_prereq => {'Lacuna::DB::Result::Building::SSLa'=>1}; +# use constant building_prereq => {'Lacuna::DB::Result::Building::SSLa'=>1}; use constant max_instances_per_planet => 1; use constant controller_class => 'Lacuna::RPC::Building::SSLb'; diff --git a/lib/Lacuna/DB/Result/Building/SSLc.pm b/lib/Lacuna/DB/Result/Building/SSLc.pm index 3a30c2f8..efd55208 100644 --- a/lib/Lacuna/DB/Result/Building/SSLc.pm +++ b/lib/Lacuna/DB/Result/Building/SSLc.pm @@ -10,7 +10,7 @@ around 'build_tags' => sub { return ($orig->($class), qw(Construction Ships)); }; -use constant building_prereq => {'Lacuna::DB::Result::Building::SSLb'=>1}; +# use constant building_prereq => {'Lacuna::DB::Result::Building::SSLb'=>1}; use constant max_instances_per_planet => 1; use constant controller_class => 'Lacuna::RPC::Building::SSLc'; diff --git a/lib/Lacuna/DB/Result/Building/SSLd.pm b/lib/Lacuna/DB/Result/Building/SSLd.pm index 662dee78..e4c37b85 100644 --- a/lib/Lacuna/DB/Result/Building/SSLd.pm +++ b/lib/Lacuna/DB/Result/Building/SSLd.pm @@ -10,7 +10,7 @@ around 'build_tags' => sub { return ($orig->($class), qw(Construction Ships)); }; -use constant building_prereq => {'Lacuna::DB::Result::Building::SSLc'=>1}; +# use constant building_prereq => {'Lacuna::DB::Result::Building::SSLc'=>1}; use constant max_instances_per_planet => 1; use constant controller_class => 'Lacuna::RPC::Building::SSLd'; -- 2.51.2