X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=b1ae3619434f9a68039b6e07a99c5362e86aad35;hb=7f37aeb466310930ecb7e57e841c285372ffa8aa;hp=0eb0412d4e36684466de99709c44ae6d981446f9;hpb=3614f618f8ff7f59e885710dd387a61f2b16ff4a;p=NDIRC.git

diff --git a/PA.pm b/PA.pm
index 0eb0412..b1ae361 100644
--- a/PA.pm
+++ b/PA.pm
@@ -141,6 +141,14 @@ sub shipEff {
 			}
 			while (my $t = $st->fetchrow_hashref()){
 				my $number = calcEff($s,$t,$amount,$eff);
+				if ($eff){
+					$number *= 0.60 if $tn eq 't2';
+					$number *= 0.30 if $tn eq 't3';
+				}else{
+					$number /= 0.60 if $tn eq 't2';
+					$number /= 0.30 if $tn eq 't3';
+				}
+				$number = int($number);
 				$value = prettyValue($number*$t->{cost}/100);
 				my $name = shipColor($t->{name},$t->{type});
 				$text .= " $ND::B$number$ND::O $name ($t->{init}:$value),";
@@ -157,12 +165,12 @@ sub calcEff {
 	my $number = 0;
 	if ($eff){
 		$number = $s->{type} eq 'Emp' ?
-			int($amount*$s->{guns}*(100-$t->{eres})/100)
-			: int($amount*$s->{damage}/$t->{armor});
+			($amount*$s->{guns}*(100-$t->{eres})/100)
+			: ($amount*$s->{damage}/$t->{armor});
 	}else{
 		$number = $t->{type} eq 'Emp' ?
-			int($amount*100/(100 - $s->{eres})/$t->{guns})
-			: int($amount*$s->{armor}/$t->{damage});
+			($amount*100/(100 - $s->{eres})/$t->{guns})
+			: ($amount*$s->{armor}/$t->{damage});
 	}
 
 	for my $tn ('t1','t2','t3'){
@@ -261,7 +269,7 @@ sub findCovOpper {
 	}
 	my $attackers = $ND::DBH->prepare(q{
 		SELECT coords(p.x,p.y,p.z), ruler, planet FROM current_planet_stats p JOIN planet_stats ps using (id) WHERE 
-		ps.tick = $1 AND (2000*$2*$3/ps.value)::int = $4 ;
+		ps.tick = $1 AND (2000.0*$2*$3/ps.value)::int = $4 ;
 		});
 	$attackers->execute($tick,$agents,$value,$stolen);
 	if ($attackers->rows == 0){