Merge branch 'master' of whale@ruin.nu:git/ND

diff --cc Include.pm
index ba1768ee3447c27c4c1747389f0748bd0d6dad9f,314283aae8bbcab31c52f8766ef5b9f9b19f0245..e5f1f2fc47ec41480b3ab9f97149f8b8000b7703
--- 1/Include.pm
--- 2/Include.pm
+++ b/Include.pm
@@@ -82,16 -82,9 +82,16 @@@ sub intel_log 
        $log->execute($uid,$message,$planet) or $ND::ERROR .= p($ND::DBH->errstr);
  }
  
 +sub def_log {
 +      my ($uid,$call, $message) = @_;
 +      my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
 +              (SELECT ftid FROM calls WHERE id = $3),$1,$2)});
 +      $log->execute($uid,$message,$call) or $ND::ERROR .= p($ND::DBH->errstr);
 +}
 +
  sub pa_xp {
        my ($roids,$ascore,$avalue,$tscore,$tvalue) = @_;
-       my $bravery = (max(0,min(2,$tscore/$ascore)-0.6)) * (min(2,$tvalue/$avalue)-0.4);
+       my $bravery = (max(0,min(2,$tscore/$ascore)-0.2)) * (min(2,$tvalue/$avalue)-0.1);
        return int(max($roids * 10 * $bravery,0))
  
  }