From be6d4f86a5902b15e5464f6c596a4989017dea0b Mon Sep 17 00:00:00 2001
From: Guillaume Pasquet <guillaume@bitimplosion.com>
Date: Fri, 21 May 2021 13:00:45 +0100
Subject: Add doors. Remove CRLFs
---
src/tiling.rs | 60 +++++++++++++++++++++--------------------------------------
1 file changed, 21 insertions(+), 39 deletions(-)
(limited to 'src/tiling.rs')
diff --git a/src/tiling.rs b/src/tiling.rs
index 06aa037..e21c02a 100644
--- a/src/tiling.rs
+++ b/src/tiling.rs
@@ -1,4 +1,3 @@
-use log::debug;
use std::convert::From;
#[derive(Copy, Clone, Debug)]
@@ -10,6 +9,7 @@ pub enum TileType {
StairsDown,
Character(&'static str),
Player,
+ Door,
}
#[derive(Clone, Debug)]
@@ -18,15 +18,17 @@ pub struct Tile {
visible: bool,
opaque: bool,
lit: bool,
+ open: bool,
}
impl Tile {
- pub fn new(tile_type: TileType, visible: bool, opaque: bool, lit: bool) -> Self {
+ pub fn new(tile_type: TileType, visible: bool, opaque: bool, open: bool, lit: bool) -> Self {
Tile {
tile_type,
visible,
opaque,
lit,
+ open,
}
}
@@ -57,6 +59,18 @@ impl Tile {
pub fn opacity(&mut self, opaque: bool) {
self.opaque = opaque
}
+
+ pub fn is_open(&self) -> bool {
+ self.open
+ }
+
+ pub fn open(&mut self) {
+ self.open = true;
+ }
+
+ pub fn clos(&mut self) {
+ self.open = false;
+ }
}
impl From<TileType> for Tile {
@@ -72,6 +86,7 @@ impl From<TileType> for Tile {
_ => false,
},
lit: false,
+ open: false,
}
}
}
@@ -183,6 +198,10 @@ pub fn tile_to_str(tile: &Tile) -> &str {
TileType::StairsUp => "<",
TileType::Player => "@",
TileType::Character(t) => t,
+ TileType::Door => match tile.is_open() {
+ true => "'",
+ false => "+",
+ },
}
} else {
" "
@@ -193,43 +212,6 @@ pub trait Tileable {
fn tile(&self, grid: &mut TileGrid) -> Result<(), String>;
}
-// fn circle(center: &(usize, usize), radius: usize) -> Vec<(usize, usize)> {
-// let mut x: i32 = radius as i32;
-// let mut y: i32 = 0;
-// let mut err: i32 = 0;
-
-// let signs: [i32; 2] = [-1, 1];
-// let mut points: Vec<(usize, usize)> = vec![];
-
-// while x >= y {
-// for xsign in signs.iter() {
-// for ysign in signs.iter() {
-// points.push((
-// (center.0 as i32 + xsign * x).max(0) as usize,
-// (center.1 as i32 + ysign * y).max(0) as usize,
-// ));
-// points.push((
-// (center.0 as i32 + xsign * y).max(0) as usize,
-// (center.1 as i32 + ysign * x).max(0) as usize,
-// ));
-// }
-// }
-
-// if err <= 0 {
-// y += 1;
-// err += 2 * y + 1;
-// }
-
-// if err > 0 {
-// x -= 1;
-// err -= 2 * x + 1;
-// }
-// }
-// points.sort();
-// points.dedup();
-// points
-// }
-
#[cfg(test)]
mod tests {
use super::*;
--
cgit v1.2.3