X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Misc.pm;h=aad40e3c36aa5f9fcfb1c5a448a87ce55d61145f;hb=8a4ea372a6296ecbd4f271c036aa5f2015e64c2a;hp=2b479dd789e2a2ecf84c71a0bf590ffb7f08c237;hpb=9e84f393649d1ecbc24a94476352a28f49afa458;p=NDIRC.git

diff --git a/Misc.pm b/Misc.pm
index 2b479dd..aad40e3 100644
--- a/Misc.pm
+++ b/Misc.pm
@@ -16,34 +16,29 @@
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
-package ND::IRC::Misc;
+package NDIRC::Misc;
 use strict;
 use warnings;
+use feature ':5.10';
+
 require Exporter;
 
+use NDIRC::Context;
+
 our @ISA = qw/Exporter/;
 
 our @EXPORT = qw/valuecolor/;
 
-$ND::defchan = "#def-ndawn";
-$ND::memchan = "#nd";
-$ND::scanchan = "#ndef";
-$ND::bcchan = "#nd-day";
-$ND::intelchan = "#ndintel";
-$ND::officerchan = "#nd-officers";
-$ND::communitychan = "#ndawn";
-$ND::pubchan = "#newdawn";
-$ND::xanchan = "#ViolatorS";
-
 sub valuecolor {
 	my $s = $_;
-	$s = $_[1] if defined $_[1];
+	$s = $_[1] if $#_ >= 1;
 	$s = "" unless defined $s;
-	return chr(3)."5$s".chr(3) if $s eq 'Hostile';
-	return chr(3)."3$s".chr(3) if $s eq 'Friendly';
-	return chr(3)."3$s".chr(3) if $s eq 'Nap' or $s eq 'NAP';
-	return chr(2)."$s".chr(2) if $_[0];
+	return chr(3)."5$s".chr(15) if $s eq 'Hostile';
+	return chr(3)."3$s".chr(15) if $s eq 'Friendly';
+	return chr(3)."3$s".chr(15) if $s eq 'Nap' or $s eq 'NAP';
+	return chr(2)."$s".chr(15) if $_[0];
 	return $s;
 }
 
+
 1;