2 files changed, 22 insertions, 85 deletions

diff --git a/ascii_scrap/ascii_stuff b/ascii_scrap/ascii_stuff.js
index 9e44e57..aac452a 100755
--- a/ascii_scrap/ascii_stuff
+++ b/ascii_scrap/ascii_stuff.js
@@ -28,37 +28,36 @@ var term_background =
 'blue':'44',
 'green':'42',
 'red':'41',
-
+'brown':'103',//light yellow
 'purple':'45',
-'yellow':'43',
-'teal':'46',
-'light gray':'47',
-'dark gray':'100',
 'orange':'101',
+'yellow':'43',
 'light green':'102',
-'light yellow':'103',
+'teal':'46',
+'light cyan':'106',
 'light blue':'104',
 'pink':'105',
-'light cyan':'106',
+'gray':'100',
+'light gray':'47',
 }
 var term_foreground = 
 {
+'white':'97',
 'black':'30',
-'red':'31',
-'green':'32',
-'yellow':'33',
 'blue':'34',
+'green':'32',
+'red':'31',
+'brown':'93',//light yellow
 'purple':'35',
-'teal':'36',
-'light gray':'37',
-'dark gray':'90',
 'orange':'91',
+'yellow':'33',
 'light green':'92',
-'light yellow':'93',
+'teal':'36',
+'light cyan':'96',
 'light blue':'94',
 'pink':'95',
-'light cyan':'96',
-'white':'97',
+'gray':'90',
+'light gray':'37',
 }
 
 for(var i = 0; i < parts.length; i++){
@@ -68,21 +67,17 @@ for(var i = 0; i < parts.length; i++){
     var fg = mirc[match_list[1]];
     var bg = mirc[match_list[2]];
     var content = match_list[3];
-    var background_color = term_background[bg];
-    var foreground_color = term_foreground[fg];
-//    var result = _s.sprintf("foreground: %s, background: %s, content: %s\n", fg, bg, content);
-    var result = _s.sprintf("\\033[1;%s;%sm%s\\033[0m", foreground_color, background_color, content);
+    var bg_code = term_background[bg];
+    var fg_code = term_foreground[fg];
+    var result = _s.sprintf("\033[1;%s;%sm%s\033[0m", fg_code, bg_code, content);
     parts[i] = result;
-//    console.log(result)
-//    console.log(background_color);
-   
-    if (typeof(background_color) === 'undefined'){
+    if (typeof(bg_code) === 'undefined' || typeof(fg_code) === 'undefined'){
       console.log(bg); process.exit(1);
     }
   }else{
-    var result = _s.sprintf("content: %s", parts[i]);
-    console.log(result);
+  
   }
 };
 
-console.log(parts.join());
+var result = parts.join("");
+process.stdout.write(result);
diff --git a/ascii_scrap/mirc_translate.js b/ascii_scrap/mirc_translate.js
deleted file mode 100644
index 0080963..0000000
--- a/ascii_scrap/mirc_translate.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var mirc = 
-{
-'white':'0',
-'black':'1',
-'blue':'2',
-'green':'3',
-'red':'4',
-'brown':'5',
-'purple':'6',
-'orange':'7',
-'yellow':'8',
-'light green':'9',
-'teal':'10',
-'light cyan':'11',
-'light blue':'12',
-'pink':'13',
-'gray':'14',
-'light gray':'15',
-}
-var term_background = 
-{
-'white':'107',
-'black':'40',
-'blue':'44',
-'green':'42',
-'red':'41',
-
-'purple':'45',
-'yellow':'43',
-'cyan':'46',
-'light gray':'47',
-'dark gray':'100',
-'light red':'101',
-'light green':'102',
-'light yellow':'103',
-'light blue':'104',
-'pink':'105',
-'light cyan':'106',
-}
-var term_foreground = 
-{
-'black':'30',
-'red':'31',
-'green':'32',
-'yellow':'33',
-'blue':'34',
-'pink':'35',
-'cyan':'36',
-'light gray':'37',
-'dark gray':'90',
-'light red':'91',
-'light green':'92',
-'light yellow':'93',
-'light blue':'94',
-'light magenta':'95',
-'light cyan':'96',
-'white':'97',
-}