lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logs now print char-by-char, and have "perfect" wrapping

Browse source 
wraps will happen mid-word, but this is is intentional. hard wrapping doesn't look very good in my opinion

this has deprecated descending message logs for now
This commit is contained in:
Llywelwyn 2023-07-28 22:25:25 +01:00
parent 650afaf821
commit a3ffb7d251
2 changed files with 63 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/gamelog/logstore.rs
View file

@ -19,34 +19,57 @@ pub fn clear_log() {
LOG.lock().unwrap().clear(); LOG.lock().unwrap().clear();
} }
pub fn print_log(console: &mut Box<dyn Console>, pos: Point, descending: bool, len: usize, maximum_len: i32) { pub fn print_log(console: &mut Box<dyn Console>, pos: Point, _descending: bool, len: usize, maximum_len: i32) {
// Start at x, y
let mut y = pos.y; let mut y = pos.y;
let mut x = pos.x; let mut x = pos.x;
// Reverse the log, take the number we want to show, and iterate through them
LOG.lock().unwrap().iter().rev().take(len).for_each(|log| { LOG.lock().unwrap().iter().rev().take(len).for_each(|log| {
let mut len_so_far: i32 = 0; let mut len_so_far: i32 = 0;
let mut entry_len = 0; let mut entry_len = 0;
// Iterate through each message fragment, and get the total length
// in lines, by adding the length of every fragment and dividing it
// by the maximum length we desire.
log.iter().for_each(|frag| { log.iter().for_each(|frag| {
entry_len += frag.text.len() as i32; entry_len += frag.text.len() as i32;
}); });
let lines = entry_len / maximum_len; let lines = entry_len / maximum_len;
// If the fragment is more than one line long, move our y-value up
// by this much.
y -= lines; y -= lines;
// Iterate through each fragment now, for the draw loop
log.iter().for_each(|frag| { log.iter().for_each(|frag| {
if len_so_far + frag.text.len() as i32 > maximum_len { // Split every fragment up into single characters
y += 1; let parts = frag.text.split("");
x = pos.x; // For every character, check if the length will exceed
len_so_far = 0; // the maximum length we're looking for. If it will, go
// down 1 in the y-axis, return us to the start of the line,
// and reset our length counter to 0.
for part in parts {
if len_so_far + part.len() as i32 > maximum_len {
y += 1;
x = pos.x;
len_so_far = 0;
}
// If we're still within our "range" (we haven't gone up
// further in the y-axis than our desired amount), then
// print the next character. Otherwise, just skip it.
// -- this makes sure we don't continue drawing outside of
// the bounds of our message box.
if y > pos.y - len as i32 {
console.print_color(x, y, frag.colour.into(), RGB::named(rltk::BLACK).into(), part);
}
// Move across by 1 in the x-axis, and add the length to our counter.
x += part.len() as i32;
len_so_far += part.len() as i32;
} }
if y > pos.y - len as i32 {
console.print_color(x, y, frag.colour.into(), RGB::named(rltk::BLACK).into(), &frag.text);
}
x += frag.text.len() as i32;
len_so_far += frag.text.len() as i32;
}); });
if descending { // Descending is deprecated for now, so we always ascending upwards.
y += 1; // Take away one from the y-axis, because we want to start each entry
} else { // on a new line, and go up an additional amount depending on how many
y -= 1 + lines; // lines our *previous* entry took.
} y -= 1 + lines;
// Go back to the start of the new line.
x = pos.x; x = pos.x;
}); });
} }

55
src/inventory_system.rs
View file

@ -110,6 +110,8 @@ impl<'a> System<'a> for ItemUseSystem {
let mut used_item = true; let mut used_item = true;
let mut aoe_item = false; let mut aoe_item = false;
let mut logger = gamelog::Logger::new();
let is_cursed = cursed_items.get(wants_to_use.item); let is_cursed = cursed_items.get(wants_to_use.item);
let wand = wands.get_mut(wants_to_use.item); let wand = wands.get_mut(wants_to_use.item);
if let Some(wand) = wand { if let Some(wand) = wand {
@ -120,10 +122,7 @@ impl<'a> System<'a> for ItemUseSystem {
gamelog::Logger::new().append("The wand does nothing.").log(); gamelog::Logger::new().append("The wand does nothing.").log();
break; break;
} }
gamelog::Logger::new() logger = logger.colour(rltk::YELLOW).append("You wrest one last charge from the worn-out wand.");
.colour(rltk::YELLOW)
.append("You wrest one last charge from the worn-out wand.")
.log();
consumables.insert(wants_to_use.item, Consumable {}).expect("Could not insert consumable"); consumables.insert(wants_to_use.item, Consumable {}).expect("Could not insert consumable");
} }
verb = "zap"; verb = "zap";
@ -144,11 +143,8 @@ impl<'a> System<'a> for ItemUseSystem {
verb = "equip" verb = "equip"
} }
gamelog::Logger::new() logger =
.append(format!("You {} the", verb)) logger.append(format!("You {} the", verb)).item_name_n(format!("{}", &item_being_used.name)).period();
.item_name_n(format!("{}", &item_being_used.name))
.period()
.log();
// TARGETING // TARGETING
let mut targets: Vec<Entity> = Vec::new(); let mut targets: Vec<Entity> = Vec::new();
@ -182,7 +178,7 @@ impl<'a> System<'a> for ItemUseSystem {
if let Some(pos) = pos { if let Some(pos) = pos {
target = Point::new(pos.x, pos.y); target = Point::new(pos.x, pos.y);
} }
gamelog::Logger::new() logger = logger
.append("The") .append("The")
.item_name(&item_being_used.name) .item_name(&item_being_used.name)
.colour(rltk::WHITE) .colour(rltk::WHITE)
@ -244,11 +240,7 @@ impl<'a> System<'a> for ItemUseSystem {
equipped.remove(*item); equipped.remove(*item);
backpack.insert(*item, InBackpack { owner: target }).expect("Unable to insert backpack"); backpack.insert(*item, InBackpack { owner: target }).expect("Unable to insert backpack");
if target == *player_entity { if target == *player_entity {
gamelog::Logger::new() logger = logger.append("You remove your").item_name_n(&item_being_used.name).period();
.append("You remove your")
.item_name_n(&item_being_used.name)
.period()
.log();
} }
} }
@ -271,7 +263,7 @@ impl<'a> System<'a> for ItemUseSystem {
stats.hit_points.current = stats.hit_points.current =
i32::min(stats.hit_points.max, stats.hit_points.current + heal.amount); i32::min(stats.hit_points.max, stats.hit_points.current + heal.amount);
if entity == *player_entity { if entity == *player_entity {
gamelog::Logger::new().append("Quaffing, you recover some vigour.").log(); logger = logger.append("You recover some vigour.");
} }
let pos = positions.get(entity); let pos = positions.get(entity);
if let Some(pos) = pos { if let Some(pos) = pos {
@ -282,6 +274,9 @@ impl<'a> System<'a> for ItemUseSystem {
} }
} }
let mut damage_logger = gamelog::Logger::new();
let mut needs_damage_log = false;
// DAMAGING ITEM // DAMAGING ITEM
let item_damages = inflicts_damage.get(wants_to_use.item); let item_damages = inflicts_damage.get(wants_to_use.item);
match item_damages { match item_damages {
@ -305,7 +300,7 @@ impl<'a> System<'a> for ItemUseSystem {
None => { None => {
SufferDamage::new_damage(&mut suffer_damage, *mob, damage.amount); SufferDamage::new_damage(&mut suffer_damage, *mob, damage.amount);
if entity == *player_entity { if entity == *player_entity {
gamelog::Logger::new() damage_logger = damage_logger
.append("The") .append("The")
.npc_name(&entity_name.name) .npc_name(&entity_name.name)
.colour(rltk::WHITE) .colour(rltk::WHITE)
@ -314,17 +309,17 @@ impl<'a> System<'a> for ItemUseSystem {
.colour(rltk::WHITE) .colour(rltk::WHITE)
.append("damage from the") .append("damage from the")
.item_name_n(format!("{}", &item_being_used.name)) .item_name_n(format!("{}", &item_being_used.name))
.period() .period();
.log(); needs_damage_log = true;
} }
} }
Some(_destructible) => { Some(_destructible) => {
gamelog::Logger::new() damage_logger = damage_logger
.append("The") .append("The")
.item_name(&entity_name.name) .item_name(&entity_name.name)
.colour(rltk::WHITE) .colour(rltk::WHITE)
.append("is destroyed!") .append("is destroyed!");
.log(); needs_damage_log = true;
entities.delete(*mob).expect("Delete failed"); entities.delete(*mob).expect("Delete failed");
} }
} }
@ -360,19 +355,14 @@ impl<'a> System<'a> for ItemUseSystem {
used_item = true; used_item = true;
match is_cursed { match is_cursed {
None => { None => {
gamelog::Logger::new() logger = logger
.append("You feel") .append("You feel")
.colour(rltk::GREEN) .colour(rltk::GREEN)
.append("a sense of acuity towards your surroundings.") .append("a sense of acuity towards your surroundings.");
.log();
*runstate = RunState::MagicMapReveal { row: 0, cursed: false }; *runstate = RunState::MagicMapReveal { row: 0, cursed: false };
} }
Some(_) => { Some(_) => {
gamelog::Logger::new() logger = logger.append("You").colour(rltk::RED).append("forget where you last were.");
.append("You")
.colour(rltk::RED)
.append("forget where you last were.")
.log();
*runstate = RunState::MagicMapReveal { row: 0, cursed: true }; *runstate = RunState::MagicMapReveal { row: 0, cursed: true };
} }
} }
@ -410,6 +400,11 @@ impl<'a> System<'a> for ItemUseSystem {
} }
} }
} }
logger.log();
if needs_damage_log {
damage_logger.log();
}
} }
wants_to_use.clear(); wants_to_use.clear();
} }