From 641c2efb5d394a9d4e62050b7f7350b7f9174088 Mon Sep 17 00:00:00 2001 From: lemming552 Date: Sat, 1 Dec 2012 23:08:40 -0700 Subject: [PATCH 1/3] Credit and more or less news. --- bin/tick_fissures.pl | 12 +++++++++++- lib/Lacuna/RPC/Stats.pm | 6 +++--- lib/Lacuna/Role/Ship/Arrive/SealFissure.pm | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bin/tick_fissures.pl b/bin/tick_fissures.pl index 76679fba..3e494f18 100644 --- a/bin/tick_fissures.pl +++ b/bin/tick_fissures.pl @@ -40,6 +40,7 @@ for my $body_id (sort keys %has_fissures) { # and finally a spare space or a building at random (excluding the PCC). # The level of the second Fissure is the same level as the BHG (if there is one) otherwise it is level 1 # + my $fcnt_30; for my $fissure (@fissures) { out("Level ".$fissure->level." fissure at ".$fissure->x.",".$fissure->y." co-ordinates"); my $damage = randint(2,6); @@ -71,6 +72,15 @@ for my $body_id (sort keys %has_fissures) { out(" set to ".$fissure->efficiency."% containment efficiency"); $fissure->is_working(0); $fissure->update; + $fcnt_30++ if ($fissure->level >= 30); + if ($fcnt_30 == 2) { #If it's more than 2, then we're doomed anyway + if ($body->empire_id) { + $body->add_news(100, sprintf('Scientists have detected a critical mass of Illudium Q-36 on %s.',$body->name)); + } + else { + $body->add_news(100, sprintf('Neighbors of %s, fear the planet will implode soon.',$body->name)); + } + } } if ($body->empire_id) { $body->needs_recalc(1); @@ -158,7 +168,7 @@ for my $body_id (sort keys %has_fissures) { } } - + $body->add_news(100, sprintf('Scientists fear that %s is starting to tear itself apart.',$body->name)); if ($body->empire_id) { $body->needs_recalc(1); $body->tick; diff --git a/lib/Lacuna/RPC/Stats.pm b/lib/Lacuna/RPC/Stats.pm index 70bc8a31..5054c711 100644 --- a/lib/Lacuna/RPC/Stats.pm +++ b/lib/Lacuna/RPC/Stats.pm @@ -11,12 +11,12 @@ sub credits { { 'Game Design' => ['JT Smith','Jamie Vrbsky']}, { 'Web Client' => ['John Rozeske','Graham Knop','Matthew Musgrove']}, { 'iPhone Client' => ['Kevin Runde']}, - { 'Game Server' => ['JT Smith','Graham Knop','Matthew Musgrove','Ian C. Docherty (icydee)', 'Mark Lemming (Norway)']}, + { 'Game Server' => ['JT Smith','Graham Knop','Matthew Musgrove','Ian C. Docherty (icydee)', 'Mark Lemming (Norway)', '(fireartist)', '(Winton-Akagane)', '(Ysthane)']}, { 'Art and Icons' => ['Ryan Knope','JT Smith','Joseph Wain / glyphish.com','Keegan Runde']}, { 'Geology Consultant' => ['Geofuels, LLC / geofuelsllc.com']}, { 'Play Testers' => ['John Oettinger','Jamie Vrbsky','Mike Kastern','Chris Burr','Eric Patterson','Frank Dillon','Kristi McCombs','Ryan McCombs','Mike Helfman','Tavis Parker','Sarah Bownds','Rob Dicke','Gemma Blair','Bev Smith','Mike Vrbsky']}, - { 'Game Support' => ['Plain Black Corporation / plainblack.com','Mary Hoerr']}, - { 'Lost City of Tyleon' => ['Steven Binns','Owen Ferguson','Garloo','Mark Lemming, (Norway)','Saint','Shadow','JT Smith','Noel Sorensen','James T']}, + { 'Game Support' => ['Plain Black Corporation / plainblack.com','Mary Hoerr', 'United Federation']}, + { 'Lost City of Tyleon' => ['Steven Binns','Owen Ferguson','Garloo','Mark Lemming (Norway)','Saint','Shadow','JT Smith','Noel Sorensen','James T']}, { 'AI Design' => ['JT Smith','Ian C. Docherty (icydee)']}, ]; } diff --git a/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm b/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm index e5eeaaa0..50de60f3 100644 --- a/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm +++ b/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm @@ -30,7 +30,7 @@ after handle_arrival_procedures => sub { my ($fissure) = grep {$_->class eq 'Lacuna::DB::Result::Building::Permanent::Fissure'} @{$body_hit->building_cache}; return if not defined $fissure; - $body_hit->add_news(70, sprintf('An attempt to fix the fissure on %s happened today.', $body_hit->name)); + $body_hit->add_news(10, sprintf('An attempt to fix the fissure on %s happened today.', $body_hit->name)); # handle fissure if (defined $fissure) { -- 2.51.2 From 7c2af8fa0db8dc66bfa22680c0002149b45ee2e8 Mon Sep 17 00:00:00 2001 From: lemming552 Date: Mon, 3 Dec 2012 14:05:43 -0700 Subject: [PATCH 2/3] Fixed logic issue when looking at defender capitol int ministry. --- lib/Lacuna/DB/Result/Spies.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm index 21e93553..b2cc13ad 100644 --- a/lib/Lacuna/DB/Result/Spies.pm +++ b/lib/Lacuna/DB/Result/Spies.pm @@ -1565,7 +1565,7 @@ sub steal_planet { ->find($defender_capitol_id); my $def_int_cap = $def_capitol->get_building_of_class('Lacuna::DB::Result::Building::Intelligence'); - my $def_room = defined($def_int_cap) ? 0 : $def_int_cap->max_spies - $def_int_cap->spy_count; + my $def_room = defined($def_int_cap) ? ($def_int_cap->max_spies - $def_int_cap->spy_count) : 0; my $empire_id = $self->on_body->empire->id; my $moved_spies = 0; while (my $spy = $spies->next) { -- 2.51.2 From eb7be286e77c608400f09970ba639b2695d7f86b Mon Sep 17 00:00:00 2001 From: lemming552 Date: Mon, 3 Dec 2012 14:07:33 -0700 Subject: [PATCH 3/3] Change update. --- lib/Lacuna.pm | 2 +- var/www/public/changes.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Lacuna.pm b/lib/Lacuna.pm index 56809c01..8dc4b445 100644 --- a/lib/Lacuna.pm +++ b/lib/Lacuna.pm @@ -7,7 +7,7 @@ use Config::JSON; useall __PACKAGE__; -our $VERSION = 3.0874; +our $VERSION = 3.0875; my $config = Config::JSON->new('/data/Lacuna-Server/etc/lacuna.conf'); my $db = Lacuna::DB->connect($config->get('db/dsn'),$config->get('db/username'),$config->get('db/password'), { mysql_enable_utf8 => 1}); diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt index 27252e31..aae407f3 100644 --- a/var/www/public/changes.txt +++ b/var/www/public/changes.txt @@ -1,3 +1,6 @@ +3.0875: + - Fix: Spy count check on insurrection. + 3.0874: - Mod: Fissures have an interesting effect on gas giants. - Add: Fissure Healer Ship added. -- 2.51.2