From 536c61ac0da88eb94d1e271a7fcfb633ddbe298d Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Sun, 19 May 2013 21:26:27 +0000
Subject: [PATCH] Split plain into nounicode and nocolor

---
 rhawk      | 25 ++++++++++++++++++-------
 spades.awk |  4 +++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/rhawk b/rhawk
index 80de4ba..a1c210d 100755
--- a/rhawk
+++ b/rhawk
@@ -7,8 +7,9 @@
 
 # Initialization
 BEGIN {
-	json_load("var/login.json", login);
-	json_load("var/plain.json", plain);
+	json_load("var/login.json",     login);
+	json_load("var/nounicode.json", nounicode);
+	json_load("var/nocolor.json",   nocolors);
 
 	OWNER = login["owner"];
 
@@ -75,15 +76,25 @@ CMD == "NICK" && FROM in bots {
 }
 
 
-# Unicode
+# Fancy output
 /[Uu]nicode :-?\(/ {
-	plain[FROM] = 1
-	json_save("var/plain.json", plain);
+	nounicode[FROM] = 1
+	json_save("var/nounicode.json", nounicode);
 }
 
 /[Uu]nicode :-?\)/ {
-	delete plain[FROM]
-	json_save("var/plain.json", plain);
+	delete nounicode[FROM]
+	json_save("var/nounicode.json", nounicode);
+}
+
+/[Cc]olors :-?\(/ {
+	nocolor[FROM] = 1
+	json_save("var/nocolor.json", nocolor);
+}
+
+/[Cc]olors :-?\)/ {
+	delete nocolor[FROM]
+	json_save("var/nocolor.json", nocolor);
 }
 
 # SFV Lug
diff --git a/spades.awk b/spades.awk
index 02e4d03..61b967c 100644
--- a/spades.awk
+++ b/spades.awk
@@ -136,9 +136,11 @@ function sp_load(file,	game)
 
 function sp_pretty(cards, who)
 {
-	if (!plain[who]) {
+	if (!nocolor[who]) {
 		gsub(/[0-9JQKA]*[sc]/, "\0031,00\002&\017", cards) # black
 		gsub(/[0-9JQKA]*[hd]/, "\0034,00\002&\017", cards) # red
+	}
+	if (!nounicode[who]) {
 		gsub(/s/, "\002♠", cards)
 		gsub(/h/, "\002♥", cards)
 		gsub(/d/, "\002♦", cards)
-- 
2.43.2