From ec198a21465e578fe2f2a49c4ece32ad78d2d4d5 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Tue, 25 Aug 2020 12:42:20 +0200 Subject: [PATCH] Some raid tweaks --- lib/NDWeb/Controller/Raids.pm | 8 ++++---- root/src/raids/view.tt2 | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm index ae9c7a6..998f329 100644 --- a/lib/NDWeb/Controller/Raids.pm +++ b/lib/NDWeb/Controller/Raids.pm @@ -114,7 +114,7 @@ sub view : Local { $c->stash(message => parseMarkup($raid->{message})); $c->stash(landingtick => $raid->{tick}); my $targetquery = $dbh->prepare(q{SELECT r.id, pid AS planet, size, score, value - , p.x,p.y,p.z, race + , p.pid, p.x,p.y,p.z, race , p.value - p.size*200 - COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 - COALESCE(ds.total ,(SELECT @@ -136,9 +136,9 @@ sub view : Local { my @targets; while (my $target = $targetquery->fetchrow_hashref){ if ($planet && $planet->{x}){ - if ($planet->{x} == $target->{x}){ - $target->{style} = 'incluster'; - } + #if ($planet->{x} == $target->{x}){ + # $target->{style} = 'incluster'; + #} $target->{cap} = min(0.25,0.25 * pow($target->{value}/$planet->{value} , 0.5)); $target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.6); $target->{valuebash} = 'bash' if ($target->{value}/$planet->{value} < 0.4); diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2 index 826ac60..6d8f190 100644 --- a/root/src/raids/view.tt2 +++ b/root/src/raids/view.tt2 @@ -3,7 +3,7 @@
Message

REMEMBER TO PASTE LAUNCH CONFIRMATION IF YOU WANT AN ATTACK POINT

DO NOT JOIN A WAVE UNLESS YOU HAVE PERMISSION FROM THE PERSON WHO CLAIMED IT

-

COORDS ARE NOT SHOWN UNTIL AT LEAST 10 MIN AFTER YOUR CLAIM

+

TARGETS IN YOUR GALAXY ARE NOT SHOWN

Landing tick first wave: [% landingtick %]

[% message %]
@@ -24,7 +24,7 @@