Need to pick channel before sending

[ndwebbie.git] / lib / NDWeb / Controller / Raids.pm

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 944b6914d2a1f3371ab7799b4bc9e3f90af9a29c..6b4f16c3081a96527a4c89284af2035ed2ea5f16 100644 (file)
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -3,8 +3,10 @@ package NDWeb::Controller::Raids;
 use strict;
 use warnings;
 use parent 'Catalyst::Controller';
+use feature ':5.10';
 
 use POSIX qw/floor pow/;
+use List::Util qw/min/;
 use NDWeb::Include;
 use ND::Include;
 
@@ -105,8 +107,6 @@ sub view : Local {
        $c->forward('findRaid');
        $raid = $c->stash->{raid};
 
-       $c->stash(comma => \&comma_value);
-
        $c->stash(raid => $raid->{id});
        my $planet;
        if ($c->user->planet){
@@ -141,10 +141,11 @@ sub view : Local {
                        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);
-                       #next if ($target->{score}/$planet->{score} < 0.4) && ($target->{value}/$planet->{value} < 0.4);
                }
+               $target->{cap} //= 0.25;
 
                my $unitscans = $dbh->prepare(q{
 SELECT DISTINCT ON (name) fid, name, tick, amount
@@ -175,8 +176,8 @@ ORDER BY name,tick DESC
                my @claims;
                my $size = $target->{size};
                for (my $i = 1; $i <= $raid->{waves}; $i++){
-                       my $roids = floor(0.25*$size);
-                       $size -= $roids;
+                       my $roids = floor($target->{cap}*$size);
+                       $size -= floor(0.25*$size);
                        my $xp = 0;
                        if ($planet && $planet->{score}){
                                $xp = pa_xp($roids,$planet->{score},$planet->{value},$target->{score},$target->{value});
@@ -545,7 +546,6 @@ sub targetlist : Local {
        my ($self, $c, $alliances, $order) = @_;
        my $dbh = $c->model;
 
-       $c->stash(comma => \&comma_value);
        $c->stash(allies => $alliances);
        $alliances ||= '';
        my @alliances = split /,/, $alliances;
@@ -593,7 +593,7 @@ sub targetcalc : Local {
        my ($self, $c, $target) = @_;
        my $dbh = $c->model;
 
-       my $target = $dbh->selectrow_hashref(q{
+       $target = $dbh->selectrow_hashref(q{
 SELECT p.id,p.value,p.score,metal_roids, crystal_roids, eonium_roids, ds.total, race
 FROM raids r
        JOIN raid_targets rt ON r.id = rt.raid