From: Michael Andreen <harv@ruin.nu>
Date: Sat, 12 Jan 2008 16:14:39 +0000 (+0100)
Subject: Merge branch 'master' of whale@ruin.nu:git/ND
X-Git-Url: https://ruin.nu/git/?p=ND.git;a=commitdiff_plain;h=193d9ed10fea0563da8da5f54ec42f3068547dd4

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

193d9ed10fea0563da8da5f54ec42f3068547dd4
diff --cc Include.pm
index ba1768e,314283a..e5f1f2f
--- a/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))
  
  }