X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Frogue_chat.html;h=37eb27a426c53bdc893d118dff6432aaa3c6a56f;hb=b6547c8d843a9e0d6b341fc17e6fb6eebededd18;hp=a61269385ab41c6ae1cb00f27fe20c8ad068fe5c;hpb=a213ed788c8f305ea9c2192eabfb0d3562c8b2fa;p=plomrogue2-experiments

diff --git a/new2/rogue_chat.html b/new2/rogue_chat.html
index a612693..37eb27a 100644
--- a/new2/rogue_chat.html
+++ b/new2/rogue_chat.html
@@ -26,16 +26,18 @@ let terminal = {
   set_font: function(type='normal') {
     this.ctx.font = type + ' ' + this.charHeight + 'px monospace';
   },
-  write: function(start_y, start_x, msg, foreground_color='black') {
-    this.ctx.fillStyle = foreground_color; 
+  write_cheap: function(start_y, start_x, msg) {
+    this.ctx.fillText(msg, start_x*this.charWidth, start_y*this.charHeight);
+  },
+  set_color: function(color) {
+    this.ctx.fillStyle = color;
+  },
+  write: function(start_y, start_x, msg, foreground_color='white') {
+    this.ctx.fillStyle = 'black';
     this.ctx.fillRect(start_x*this.charWidth, start_y*this.charHeight,
-	    	      this.charWidth*msg.length, this.charHeight);
-    if (foreground_color === 'black') {
-      this.ctx.fillStyle = 'white';
-    } else {
-      this.ctx.fillStyle = 'black';
-    }
-    this.ctx.fillText(msg, start_x*this.charWidth, start_y*this.charHeight); 
+                      this.charWidth*msg.length, this.charHeight);
+    this.ctx.fillStyle = foreground_color;
+    this.ctx.fillText(msg, start_x*this.charWidth, start_y*this.charHeight);
   },
   drawBox: function (start_y, start_x, height, width, color='white') {
     this.ctx.fillStyle = color;
@@ -95,25 +97,32 @@ let tui = {
     for (let line of chat.history) {
       terminal.write(terminal.rows - 2 - i, terminal.cols / 2, line);
       i += 1;
-      // if (i > terminal.rows - 3) {
-      //   break;
-      // }
     }
   },
   draw_map: function() {
-    terminal.drawBox(0, 0, terminal.rows, terminal.cols / 2);
-    let map_line = "";
-    let y = 0;
-    for (let i = 0, x = 0; i < game.map.length; i++, x++) {
+    terminal.drawBox(0, 0, terminal.rows, terminal.cols / 2, 'black');
+    let last_c = '';
+    let color = 'white';
+    for (let i = 0, y = 0, x = 0; i < game.map.length; i++, x++) {
       if (x >= game.map_size[1]) {
-	terminal.write(y, 0, map_line);
-	map_line = "";
         x = 0;
 	y += 1;
       };
-      map_line += game.map[i];
+      let c = game.map[i];
+      if (c != last_c) {
+	last_c = c;
+        color = 'white';
+        if (c == '.') {
+          color = '#ffaa00';
+        } else if (c == '~') {
+          color = '#5555ff';
+        } else if (c == 'X') {
+          color = '#55ff00';
+        }
+        terminal.set_color(color);
+      }
+      terminal.write_cheap(y, x, c);
     }
-    terminal.write(y, 0, map_line);
     for (const t in game.things) {
       terminal.write(game.things[t][0], game.things[t][1], '@');
     }
@@ -138,8 +147,7 @@ let tui = {
       chunk += msg[i];
     }
     chat.history.unshift(' '.repeat(indent) + chunk);
-    if (chat.history.length > terminal.rows - 2) {
-
+    while (chat.history.length > terminal.rows - 2) {
       chat.history.pop();
     };
     this.draw_history();