extends log builder, swaps away from textblocks

line wrapping no longer works, but in return the message log can easily be swapped between ascending/descending, and spaces/no spaces between entries.

realistically nobody wants to read a huge wrapped line anyway so those can just be avoided

src/gamelog/builder.rs

@@ -7,35 +7,80 @@ pub struct Logger {
 }
 
 impl Logger {
+    /// Creates a blank builder for making message log entries.
     pub fn new() -> Self {
         Logger { current_colour: RGB::named(rltk::WHITE), fragments: Vec::new() }
     }
 
+    /// Sets the colour of the current message logger.
     pub fn colour(mut self, colour: (u8, u8, u8)) -> Self {
         self.current_colour = RGB::named(colour);
         return self;
     }
 
+    /// Appends text in the current colour to the current message logger.
     pub fn append<T: ToString>(mut self, text: T) -> Self {
+        let mut text_with_space = text.to_string();
+        text_with_space.push_str(" ");
+        self.fragments.push(LogFragment { colour: self.current_colour, text: text_with_space });
+        return self;
+    }
+
+    /// Appends text in the current colour to the current message logger, with no space.
+    #[allow(dead_code)]
+    pub fn append_n<T: ToString>(mut self, text: T) -> Self {
         self.fragments.push(LogFragment { colour: self.current_colour, text: text.to_string() });
         return self;
     }
 
+    /// Appends a period to the current message logger.
+    pub fn period(mut self) -> Self {
+        self.fragments.push(LogFragment { colour: self.current_colour, text: ".".to_string() });
+        return self;
+    }
+
+    /// Pushes the finished log entry.
     pub fn log(self) {
         return append_entry(self.fragments);
     }
 
+    /// Appends text in YELLOW to the current message logger.
     pub fn npc_name<T: ToString>(mut self, text: T) -> Self {
+        let mut text_with_space = text.to_string();
+        text_with_space.push_str(" ");
+        self.fragments.push(LogFragment { colour: RGB::named(rltk::YELLOW), text: text_with_space });
+        return self;
+    }
+
+    /// Appends text in YELLOW to the current message logger, with no space.
+    pub fn npc_name_n<T: ToString>(mut self, text: T) -> Self {
         self.fragments.push(LogFragment { colour: RGB::named(rltk::YELLOW), text: text.to_string() });
         return self;
     }
 
+    /// Appends text in CYAN to the current message logger.
     pub fn item_name<T: ToString>(mut self, text: T) -> Self {
+        let mut text_with_space = text.to_string();
+        text_with_space.push_str(" ");
+        self.fragments.push(LogFragment { colour: RGB::named(rltk::CYAN), text: text_with_space });
+        return self;
+    }
+
+    /// Appends text in CYAN to the current message logger, with no space.
+    pub fn item_name_n<T: ToString>(mut self, text: T) -> Self {
         self.fragments.push(LogFragment { colour: RGB::named(rltk::CYAN), text: text.to_string() });
         return self;
     }
 
+    /// Appends text in RED to the current message logger.
     pub fn damage(mut self, damage: i32) -> Self {
+        self.fragments.push(LogFragment { colour: RGB::named(rltk::RED), text: format!("{} ", damage).to_string() });
+        return self;
+    }
+
+    /// Appends text in RED to the current message logger, with no space.
+    #[allow(dead_code)]
+    pub fn damage_n(mut self, damage: i32) -> Self {
         self.fragments.push(LogFragment { colour: RGB::named(rltk::RED), text: format!("{}", damage).to_string() });
         return self;
     }

src/gamelog/events.rs

@@ -9,6 +9,7 @@ pub fn clear_events() {
     EVENTS.lock().unwrap().clear();
 }
 
+#[allow(unused_mut)]
 pub fn record_event<T: ToString>(event: T, n: i32) {
     let event_name = event.to_string();
     let mut events_lock = EVENTS.lock();

src/gamelog/logstore.rs

@@ -19,18 +19,22 @@ pub fn clear_log() {
     LOG.lock().unwrap().clear();
 }
 
-pub fn log_display() -> TextBuilder {
-    let mut buf = TextBuilder::empty();
-
-    LOG.lock().unwrap().iter().rev().take(12).for_each(|log| {
+pub fn print_log(console: &mut Box<dyn Console>, pos: Point, descending: bool, len: usize) {
+    let mut y = pos.y;
+    let mut x = pos.x;
+    LOG.lock().unwrap().iter().rev().take(len).for_each(|log| {
         log.iter().for_each(|frag| {
-            buf.fg(frag.colour);
-            buf.line_wrap(&frag.text);
+            console.print_color(x, y, frag.colour.into(), RGB::named(rltk::BLACK).into(), &frag.text);
+            x += frag.text.len() as i32;
+            x += 0;
         });
-        buf.ln();
+        if descending {
+            y += 1;
+        } else {
+            y -= 1;
+        }
+        x = pos.x;
     });
-
-    return buf;
 }
 
 pub fn clone_log() -> Vec<Vec<crate::gamelog::LogFragment>> {

src/gamelog/mod.rs

@@ -4,7 +4,7 @@ mod builder;
 pub use builder::*;
 mod logstore;
 use logstore::*;
-pub use logstore::{clear_log, clone_log, log_display, restore_log};
+pub use logstore::{clear_log, clone_log, print_log, restore_log};
 mod events;
 pub use events::*;