Skip to content

seems to work #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

seems to work #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fn main() -> std::io::Result<()> {
enable_raw_mode()?;

// init the world
let slowness = 60;
let slowness = 60; // XXX oh, issue #85 was just solved here before...
let mut world = World::new(maxc, maxl);

// show welcoming banner
Expand All @@ -43,5 +43,6 @@ fn main() -> std::io::Result<()> {

sc.clear_all()?.execute(Show)?;
disable_raw_mode()?;
println!(""); // XXX ??? no "%" at the end of the program
Ok(())
}
43 changes: 29 additions & 14 deletions src/world/drawings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,42 @@ impl World {

pub(super) fn draw_on_canvas(&mut self) {
self.canvas.clear_all();
let lines = self.map.len();

// draw the map
for l in 0..self.map.len() {
for l in 0..lines {
let map_c = self.map[l].1;
let maxc = self.maxc;
self.canvas
.draw_styled_line((0, l as u16), " ".repeat(self.map[l].0 as usize), ContentStyle::new().on_green())
.draw_styled_line((self.map[l].0, l as u16), " ".repeat((self.map[l].1-self.map[l].0) as usize), ContentStyle::new().on_blue())
.draw_styled_line((map_c, l as u16), " ".repeat((maxc - map_c) as usize), ContentStyle::new().on_green());
.draw_styled_line((0, l as u16),
" ".repeat(self.map[l].0
as usize),
ContentStyle::new().on_green())
.draw_styled_line((self.map[l].0, l as u16),
" ".repeat((self.map[l].1 - self.map[l].0)
as usize),
ContentStyle::new().on_blue())
.draw_styled_line((map_c, l as u16),
" ".repeat((maxc - map_c)
as usize),
ContentStyle::new().on_green());
}

let status_style = ContentStyle::new().black().on_white();
let gas_present = self.player.gas / 100;
let enemies_count = self.enemies.len();

//// draw status information
// line at the bottom:
// (XXX map lines should be so decremented)
// (XXX initial boat position at least one line higher)
self.canvas
.draw_styled_line(2, format!(" Score: {} ", self.player.score), status_style)
.draw_styled_line((2, 3), format!(" Fuel: {} ", gas_present), status_style)
.draw_styled_line(
(2, 4),
format!(" Enemies: {} ", enemies_count),
status_style,
.draw_styled_line((0, lines as u16 - 1),
format!("[ Score: {} | Fuel: {} | Enemies: {} ]",
self.player.score,
gas_present,
enemies_count),
status_style,
);

// draw fuel
Expand All @@ -68,13 +83,13 @@ impl World {
}

pub(super) fn pause_screen(&mut self) {
let pause_msg1: &str = "╔═══════════╗";
let pause_msg2: &str = "║Game Paused║";
let pause_msg3: &str = "╚═══════════╝";
let pause_msg1: &str = "╔═════════════╗";
let pause_msg2: &str = "║ Game Paused ║";
let pause_msg3: &str = "╚═════════════╝";

self.canvas
.draw_line((self.maxc / 2 - 6, self.maxl / 2 - 1), pause_msg1)
.draw_line((self.maxc / 2 - 6, self.maxl / 2), pause_msg2)
.draw_line((self.maxc / 2 - 6, self.maxl / 2), pause_msg2)
.draw_line((self.maxc / 2 - 6, self.maxl / 2 + 1), pause_msg3);
}

Expand Down