diff --git a/Cargo.lock b/Cargo.lock index 75e743c..70c50de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,6 +50,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -57,16 +66,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "crossterm" -version = "0.27.0" +name = "compact_str" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "static_assertions", +] + +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.4.1", "crossterm_winapi", - "libc", "mio", "parking_lot", + "rustix", "signal-hook", "signal-hook-mio", "winapi", @@ -104,6 +127,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "fixedbitset" version = "0.4.2" @@ -133,9 +166,15 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "indexmap" @@ -148,20 +187,30 @@ dependencies = [ ] [[package]] -name = "indoc" -version = "2.0.4" +name = "instability" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" +dependencies = [ + "quote", + "syn", +] [[package]] name = "itertools" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + [[package]] name = "js-sys" version = "0.3.66" @@ -173,9 +222,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -204,10 +259,11 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "log", "wasi", @@ -238,9 +294,9 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -251,9 +307,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -315,19 +371,22 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.24.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425" +checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d" dependencies = [ "bitflags 2.4.1", "cassowary", + "compact_str", "crossterm", - "indoc", + "instability", "itertools", "lru", "paste", "strum", + "strum_macros", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] @@ -340,12 +399,40 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + [[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + [[package]] name = "scopeguard" version = "1.2.0" @@ -364,9 +451,9 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", "mio", @@ -389,19 +476,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] -name = "strum" -version = "0.25.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck", "proc-macro2", @@ -434,10 +527,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "unicode-width" -version = "0.1.11" +name = "unicode-truncate" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +dependencies = [ + "itertools", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "version_check" @@ -451,6 +555,12 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" version = "0.2.89" @@ -517,11 +627,12 @@ dependencies = [ [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.5.7", + "wasite", "web-sys", ] @@ -549,11 +660,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -562,13 +673,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -577,42 +704,90 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "zerocopy" version = "0.7.19" diff --git a/Cargo.toml b/Cargo.toml index 0515c19..f091534 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ratatui = "0.24.0" -crossterm = "0.27.0" +ratatui = "0.28.1" +crossterm = "0.28.1" rand = "0.8.5" -petgraph = "0.6.4" -whoami = "1.4.1" \ No newline at end of file +petgraph = "0.6.5" +whoami = "1.5.2" \ No newline at end of file diff --git a/build.rs b/build.rs index 9721023..8cf8544 100644 --- a/build.rs +++ b/build.rs @@ -1,7 +1,10 @@ use std::process::Command; fn main() { - let output = Command::new("git").args(&["rev-parse", "--short", "HEAD"]).output().unwrap(); + let output = Command::new("git") + .args(["rev-parse", "--short", "HEAD"]) + .output() + .unwrap(); let git_hash = String::from_utf8(output.stdout).unwrap(); println!("cargo:rustc-env=GIT_HASH={}", git_hash); } diff --git a/src/artifacts.rs b/src/artifacts.rs index 16b1510..00c17c4 100644 --- a/src/artifacts.rs +++ b/src/artifacts.rs @@ -36,10 +36,15 @@ impl Artifact for Chest { ("C", Color::Blue) } - fn get_immutable_position(&self) -> &Position { &self.position } + fn get_immutable_position(&self) -> &Position { + &self.position + } fn collect(&mut self, player: &mut Player, messages: &mut Vec) { player.retrieve_gold(self.gold); - messages.insert(0, format!("opened chest and collected {} gold.", self.gold).to_string()); + messages.insert( + 0, + format!("opened chest and collected {} gold.", self.gold).to_string(), + ); self.gold = 0; } @@ -67,21 +72,29 @@ impl Artifact for Potion { fn get_representation(&self) -> (&str, Color) { ("P", Color::Green) } - fn get_immutable_position(&self) -> &Position { &self.position } + fn get_immutable_position(&self) -> &Position { + &self.position + } fn collect(&mut self, player: &mut Player, messages: &mut Vec) { // only consume potion of the player can gain at least one health point if !player.is_healthy() { let old = player.get_life(); player.change_life(self.health.try_into().unwrap()); let new = player.get_life(); - messages.insert(0, format!("picked up potion and gained {} hp.", new - old).to_string()); + messages.insert( + 0, + format!("picked up potion and gained {} hp.", new - old).to_string(), + ); self.health = 0; } else { - messages.insert(0, "not using the potion because you're healthy.".to_string()); + messages.insert( + 0, + "not using the potion because you're healthy.".to_string(), + ); } } fn was_collected(&self) -> bool { self.health == 0 } -} \ No newline at end of file +} diff --git a/src/game.rs b/src/game.rs index 87a8ec2..60d5dac 100644 --- a/src/game.rs +++ b/src/game.rs @@ -9,14 +9,13 @@ pub const LEVELS: usize = 10; /// represents a state of a game pub enum GameState { /// the game is ongoing (neither won or lost) - RUNNING, + Running, /// the player died - LOST, + Lost, /// the player reached the Ω - WON, + Won, } - /// the main structure to hold all information about the ongoing game pub struct Game { /// the player @@ -37,11 +36,12 @@ impl Game { levels: v, messages: Vec::with_capacity(10), }; - let start = { - g.get_level(0).start - }; - g.get_mutable_player().get_position().set(0, start.0, start.1); - g.get_mutable_level(0).discover(&Position::new(0, start.0, start.1)); + let start = { g.get_level(0).start }; + g.get_mutable_player() + .get_position() + .set(0, start.0, start.1); + g.get_mutable_level(0) + .discover(&Position::new(0, start.0, start.1)); g } @@ -49,11 +49,8 @@ impl Game { fn player_reached_goal(&mut self) -> bool { match self.next_element(0, 0) { None => {} - Some(a) => { - match a { - StructureElement::End => { return true; } - _ => {} - } + Some(a) => if a == StructureElement::End { + return true } }; false @@ -61,12 +58,12 @@ impl Game { /// returns the state of the game (depending on player's life and position) pub fn get_game_state(&mut self) -> GameState { if self.player.is_dead() { - return GameState::LOST; + return GameState::Lost; } if self.player_reached_goal() { - return GameState::WON; + return GameState::Won; } - GameState::RUNNING + GameState::Running } pub fn get_player(&self) -> &Player { &self.player @@ -74,8 +71,12 @@ impl Game { pub fn get_mutable_player(&mut self) -> &mut Player { &mut self.player } - pub fn get_level(&self, level: usize) -> &Level { &self.levels[level] } - pub fn get_mutable_level(&mut self, level: usize) -> &mut Level { &mut self.levels[level] } + pub fn get_level(&self, level: usize) -> &Level { + &self.levels[level] + } + pub fn get_mutable_level(&mut self, level: usize) -> &mut Level { + &mut self.levels[level] + } /// check if the player can move in the given direction. This only checks for structure element /// limitation as walls. fn can_move(&mut self, dx: i16, dy: i16) -> bool { @@ -120,32 +121,36 @@ impl Game { let structure = self.next_element(dx, dy); // use stairs if walked onto one - match structure { - Some(e) => { - match e { - StructureElement::StairDown => { - (dx, dy) = (0, 0); - let (next_level, x, y) = self.next_start(); - player_level = next_level; - self.messages.insert(0, format!("you climb down to level {}.", next_level)); - self.get_mutable_player().get_position().set(next_level, x, y); - } - StructureElement::StairUp => { - (dx, dy) = (0, 0); - let (next_level, x, y) = self.prev_end(); - player_level = next_level; - self.messages.insert(0, format!("you climb up to level {}.", next_level)); - self.get_mutable_player().get_position().set(next_level, x, y); - } - _ => {} + if let Some(e) = structure { + match e { + StructureElement::StairDown => { + (dx, dy) = (0, 0); + let (next_level, x, y) = self.next_start(); + player_level = next_level; + self.messages + .insert(0, format!("you climb down to level {}.", next_level)); + self.get_mutable_player() + .get_position() + .set(next_level, x, y); } + StructureElement::StairUp => { + (dx, dy) = (0, 0); + let (next_level, x, y) = self.prev_end(); + player_level = next_level; + self.messages + .insert(0, format!("you climb up to level {}.", next_level)); + self.get_mutable_player() + .get_position() + .set(next_level, x, y); + } + _ => {} } - _ => {} - } + }; // update position and discover area on new position let (new_x, new_y) = self.get_mutable_player().get_position().change(dx, dy); - self.get_mutable_level(player_level).discover(&Position::new(player_level, new_x, new_y)); + self.get_mutable_level(player_level) + .discover(&Position::new(player_level, new_x, new_y)); (-dx, -dy) } pub fn player_fights_monster(&mut self) -> bool { @@ -159,8 +164,10 @@ impl Game { // TODO fight the monster self.player.change_life(-1); m.decrease_life(1); - self.messages.insert(0, format!("{} hits you.", m.get_name()).to_string()); - self.messages.insert(0, format!("you hit {}.", m.get_name()).to_string()); + self.messages + .insert(0, format!("{} hits you.", m.get_name()).to_string()); + self.messages + .insert(0, format!("you hit {}.", m.get_name()).to_string()); // monster died, player gains experience if m.is_dead() { self.player.gain_experience(m.get_experience_gain()); diff --git a/src/level.rs b/src/level.rs index 67b2497..82f6b5c 100644 --- a/src/level.rs +++ b/src/level.rs @@ -1,14 +1,14 @@ use std::cmp::{max, min}; -use rand::Rng; use rand::rngs::ThreadRng; +use rand::Rng; -#[cfg(test)] -use crate::artifacts::{Chest, Potion}; use crate::artifacts::Artifact; #[cfg(test)] -use crate::monster::{Orc, Rat}; +use crate::artifacts::{Chest, Potion}; use crate::monster::Monster; +#[cfg(test)] +use crate::monster::{Orc, Rat}; use crate::player::Player; use crate::position::HasPosition; use crate::position::Position; @@ -27,6 +27,9 @@ pub enum StructureElement { Unknown, } +type PossibleArtifact<'a> = Option<&'a mut Box<(dyn Artifact + 'static)>>; +type PossibleMonster<'a> = Option<&'a mut Box<(dyn Monster + 'static)>>; + pub struct Level { pub(crate) level: usize, pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH], @@ -41,7 +44,15 @@ pub struct Level { } impl Level { - pub fn get_element(&mut self, x: i16, y: i16) -> (Option, Option<&mut Box<(dyn Monster + 'static)>>, Option<&mut Box<(dyn Artifact + 'static)>>) { + pub fn get_element( + &mut self, + x: i16, + y: i16, + ) -> ( + Option, + PossibleMonster, + PossibleArtifact + ) { if x < 0 || y < 0 { return (None, None, None); } @@ -129,19 +140,27 @@ impl Level { loop { // calculate the direction the monster will try to walk let (dx, dy) = match self.rng.gen_range(0..5) { - 1 => { (1, 0) } - 2 => { (-1, 0) } - 3 => { (0, 1) } - 4 => { (0, -1) } - _ => { (0, 0) } + 1 => (1, 0), + 2 => (-1, 0), + 3 => (0, 1), + 4 => (0, -1), + _ => (0, 0), }; if self.can_monster_move(self.monsters[index].as_ref(), dx, dy) { let (new_x, new_y) = self.monsters[index].get_position().change(dx, dy); - if player.get_immutable_position().get_x() == new_x && player.get_immutable_position().get_y() == new_y { + if player.get_immutable_position().get_x() == new_x + && player.get_immutable_position().get_y() == new_y + { self.monsters[index].decrease_life(1); player.change_life(-1); - messages.insert(0, format!("{} hits you.", self.monsters[index].get_name()).to_string()); - messages.insert(0, format!("you hit {}.", self.monsters[index].get_name()).to_string()); + messages.insert( + 0, + format!("{} hits you.", self.monsters[index].get_name()).to_string(), + ); + messages.insert( + 0, + format!("you hit {}.", self.monsters[index].get_name()).to_string(), + ); // if the attack did not kill the opponent, back down if !player.is_dead() { self.monsters[index].get_position().change(-dx, -dy); @@ -171,7 +190,9 @@ impl Level { for index in 0..self.monsters.len() { let pos = self.monsters[index].get_immutable_position(); - if pos.get_x() == new_x && pos.get_y() == new_y { return false; } + if pos.get_x() == new_x && pos.get_y() == new_y { + return false; + } } self.structure[new_x][new_y] != StructureElement::Wall } @@ -239,8 +260,16 @@ fn test_get_element() { let mut l = Level::new(0); assert_eq!(l.get_element(-1, -1).0, None); assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Unknown); - assert_eq!(l.get_element(LEVEL_WIDTH as i16 - 1, LEVEL_HEIGHT as i16 - 1).0.unwrap(), StructureElement::Unknown); - assert_eq!(l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16).0, None); + assert_eq!( + l.get_element(LEVEL_WIDTH as i16 - 1, LEVEL_HEIGHT as i16 - 1) + .0 + .unwrap(), + StructureElement::Unknown + ); + assert_eq!( + l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16).0, + None + ); } #[test] diff --git a/src/level_generator.rs b/src/level_generator.rs index a894d89..b26b2cf 100644 --- a/src/level_generator.rs +++ b/src/level_generator.rs @@ -6,8 +6,8 @@ use petgraph::data::*; use petgraph::graph::Graph; use petgraph::graph::UnGraph; use rand::prelude::SliceRandom; -use rand::Rng; use rand::rngs::ThreadRng; +use rand::Rng; use crate::artifacts::{Artifact, Chest, Potion}; use crate::level::{Level, StructureElement}; @@ -93,7 +93,8 @@ impl LevelGenerator { rooms[0][0].kind = RoomType::BasicRoom; while !LevelGenerator::rooms_connectable(&rooms) { - let mut room_types: Vec = Vec::with_capacity(ROOMS_HORIZONTAL * ROOMS_VERTICAL); + let mut room_types: Vec = + Vec::with_capacity(ROOMS_HORIZONTAL * ROOMS_VERTICAL); // level 0 contains a start room, all others contain a stair up if first { room_types.push(RoomType::Start); @@ -112,21 +113,21 @@ impl LevelGenerator { for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL { match rng.gen_range(1..=100) { // TODO tune room type distribution - 1..=33 => { room_types.push(RoomType::EmptyRoom) } - 34..=66 => { room_types.push(RoomType::TreasureRoom) } - 67..=90 => { room_types.push(RoomType::MonsterRoom) } - _ => { room_types.push(RoomType::BasicRoom) } + 1..=33 => room_types.push(RoomType::EmptyRoom), + 34..=66 => room_types.push(RoomType::TreasureRoom), + 67..=90 => room_types.push(RoomType::MonsterRoom), + _ => room_types.push(RoomType::BasicRoom), } } room_types.shuffle(&mut rng); graph.clear(); // place the rooms in the array an add nodes to the graph for every non empty room - for c in 0..ROOMS_VERTICAL { - for r in 0..ROOMS_HORIZONTAL { - rooms[c][r].kind = room_types.pop().unwrap(); - if rooms[c][r].kind != RoomType::EmptyRoom { - rooms[c][r].random(&mut rng); + for (c, rs) in rooms.iter_mut().enumerate().take(ROOMS_VERTICAL) { + for (r, room) in rs.iter_mut().enumerate().take(ROOMS_HORIZONTAL) { + room.kind = room_types.pop().unwrap(); + if room.kind != RoomType::EmptyRoom { + room.random(&mut rng); graph.add_node((c, r)); } } @@ -142,15 +143,21 @@ impl LevelGenerator { let src_index = graph.node_indices().find(|i| graph[*i] == (c, r)).unwrap(); for r_1 in r + 1..ROOMS_HORIZONTAL { if rooms[c][r_1].kind != RoomType::EmptyRoom { - let tgt_index = graph.node_indices().find(|i| graph[*i] == (c, r_1)).unwrap(); + let tgt_index = graph + .node_indices() + .find(|i| graph[*i] == (c, r_1)) + .unwrap(); // todo use random weight for edge graph.add_edge(src_index, tgt_index, 1); break; } } - for c_1 in c + 1..ROOMS_VERTICAL { - if rooms[c_1][r].kind != RoomType::EmptyRoom { - let tgt_index = graph.node_indices().find(|i| graph[*i] == (c_1, r)).unwrap(); + for (c_1, rs) in rooms.iter().enumerate().take(ROOMS_VERTICAL).skip(c + 1) { + if rs[r].kind != RoomType::EmptyRoom { + let tgt_index = graph + .node_indices() + .find(|i| graph[*i] == (c_1, r)) + .unwrap(); // todo use random weight for edge graph.add_edge(src_index, tgt_index, 1); break; @@ -160,7 +167,8 @@ impl LevelGenerator { } // calculate a minimum spanning tree - let mst: Graph<(usize, usize), u16, petgraph::Undirected> = Graph::from_elements(min_spanning_tree(&graph)); + let mst: Graph<(usize, usize), u16, petgraph::Undirected> = + Graph::from_elements(min_spanning_tree(&graph)); for edge in mst.raw_edges() { let src = mst[edge.source()]; let tgt = mst[edge.target()]; @@ -170,24 +178,31 @@ impl LevelGenerator { // cols are the same, either up or down if src.0 == tgt.0 { - let range = LevelGenerator::range_overlap(src_room.get_x_range(), tgt_room.get_x_range()); - let position: usize; - if range.is_empty() { - position = range.start; + let range = + LevelGenerator::range_overlap(src_room.get_x_range(), tgt_room.get_x_range()); + let position: usize = if range.is_empty() { + range.start } else { - position = rng.gen_range(range); - } + rng.gen_range(range) + }; if src.1 < tgt.1 { // src to tgt - rooms[src.0][src.1].connection_down = Some(ConnectionInfo { offset: position, distance: tgt.1 - src.1 }); + rooms[src.0][src.1].connection_down = Some(ConnectionInfo { + offset: position, + distance: tgt.1 - src.1, + }); } else { // tgt to src - tgt_room.connection_down = Some(ConnectionInfo { offset: position, distance: src.1 - tgt.1 }); + tgt_room.connection_down = Some(ConnectionInfo { + offset: position, + distance: src.1 - tgt.1, + }); } } // rows are the same, either left or right if src.1 == tgt.1 { - let range = LevelGenerator::range_overlap(src_room.get_y_range(), tgt_room.get_y_range()); + let range = + LevelGenerator::range_overlap(src_room.get_y_range(), tgt_room.get_y_range()); let mut position: usize; if range.is_empty() { position = range.start; @@ -199,18 +214,21 @@ impl LevelGenerator { } if src.0 < tgt.0 { // src to tgt - rooms[src.0][src.1].connection_right = Some(ConnectionInfo { offset: position, distance: tgt.0 - src.0 }); + rooms[src.0][src.1].connection_right = Some(ConnectionInfo { + offset: position, + distance: tgt.0 - src.0, + }); } else { // tgt to src - tgt_room.connection_right = Some(ConnectionInfo { offset: position, distance: src.1 - tgt.1 }); + tgt_room.connection_right = Some(ConnectionInfo { + offset: position, + distance: src.1 - tgt.1, + }); } } } - LevelGenerator { - rooms, - level, - } + LevelGenerator { rooms, level } } fn range_overlap(r1: Range, r2: Range) -> Range { @@ -224,8 +242,8 @@ impl LevelGenerator { for r in 0..ROOMS_HORIZONTAL { if rooms[c][r].kind != RoomType::EmptyRoom { let mut connected = 0; - for c1 in 0..ROOMS_VERTICAL { - if rooms[c1][r].kind != RoomType::EmptyRoom { + for room in rooms.iter().take(ROOMS_VERTICAL) { + if room[r].kind != RoomType::EmptyRoom { connected += 1; } } @@ -240,11 +258,12 @@ impl LevelGenerator { } } } - return true; + true } pub fn render(&self) -> Level { let mut rng = rand::thread_rng(); - let mut structure = [[StructureElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH]; + let mut structure = [[StructureElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; + 1 + ROOMS_VERTICAL * ROOM_WIDTH]; let mut artifacts: Vec> = Vec::with_capacity(10); let mut enemies: Vec> = Vec::with_capacity(10); let mut start_x: usize = 0; @@ -258,7 +277,8 @@ impl LevelGenerator { let room = self.rooms[c][r]; for x in 0..room.width { for y in 0..room.height { - structure[left + room.offset_x + x][top + room.offset_y + y] = StructureElement::Floor; + structure[left + room.offset_x + x][top + room.offset_y + y] = + StructureElement::Floor; } } if room.kind == RoomType::TreasureRoom { @@ -266,8 +286,14 @@ impl LevelGenerator { let t_y = top + room.offset_y + rng.gen_range(0..room.height); // TODO randomize artifacts match rng.gen_range(1..=100) { - 1..=50 => { artifacts.push(Box::new(Chest::new(Position::new(self.level, t_x, t_y)))); } - _ => { artifacts.push(Box::new(Potion::new(Position::new(self.level, t_x, t_y)))); } + 1..=50 => { + artifacts + .push(Box::new(Chest::new(Position::new(self.level, t_x, t_y)))); + } + _ => { + artifacts + .push(Box::new(Potion::new(Position::new(self.level, t_x, t_y)))); + } }; } if room.kind == RoomType::MonsterRoom { @@ -276,10 +302,14 @@ impl LevelGenerator { // TODO randomize enemies here match rng.gen_range(1..=100) { 1..=50 => { - enemies.push(Box::new(Orc::new_with_position(Position::new(self.level, t_x, t_y)))); + enemies.push(Box::new(Orc::new_with_position(Position::new( + self.level, t_x, t_y, + )))); } _ => { - enemies.push(Box::new(Rat::new_with_position(Position::new(self.level, t_x, t_y)))); + enemies.push(Box::new(Rat::new_with_position(Position::new( + self.level, t_x, t_y, + )))); } }; } @@ -315,7 +345,10 @@ impl LevelGenerator { let tgt_room = self.rooms[c][r + x_conn.distance]; let top = 1 + r * ROOM_HEIGHT + src_room.offset_y; let left = 1 + c * ROOM_WIDTH + x_conn.offset; - let bottom = 1 + (r + x_conn.distance) * ROOM_HEIGHT + tgt_room.offset_y + tgt_room.height; + let bottom = 1 + + (r + x_conn.distance) * ROOM_HEIGHT + + tgt_room.offset_y + + tgt_room.height; for i in top..bottom { if structure[left][i] == StructureElement::Wall { structure[left][i] = StructureElement::Floor; @@ -327,10 +360,11 @@ impl LevelGenerator { let top = 1 + r * ROOM_HEIGHT + src_room.offset_y + y_conn.offset - 1; let left = 1 + c * ROOM_WIDTH + src_room.offset_x; - let right = 1 + (c + y_conn.distance) * ROOM_WIDTH + tgt_room.offset_x + tgt_room.width; - for i in left..right { - if structure[i][top] == StructureElement::Wall { - structure[i][top] = StructureElement::Floor; + let right = + 1 + (c + y_conn.distance) * ROOM_WIDTH + tgt_room.offset_x + tgt_room.width; + for room in structure.iter_mut().take(right).skip(left) { + if room[top] == StructureElement::Wall { + room[top] = StructureElement::Floor; } } } @@ -339,7 +373,8 @@ impl LevelGenerator { Level { level: self.level, structure, - discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH], + discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; + 1 + ROOMS_VERTICAL * ROOM_WIDTH], monsters: enemies, artifacts, start: (start_x, start_y), diff --git a/src/level_widget.rs b/src/level_widget.rs index 5154a71..520a4e3 100644 --- a/src/level_widget.rs +++ b/src/level_widget.rs @@ -13,11 +13,7 @@ pub struct LevelWidget {} impl LevelWidget { fn set_cell(&self, buf: &mut Buffer, x: u16, y: u16, symbol: &str, fg: Color, bg: Color) { - buf. - get_mut(x, y). - set_symbol(symbol). - set_bg(bg). - set_fg(fg); + buf[(x, y)].set_symbol(symbol).set_bg(bg).set_fg(fg); } } diff --git a/src/main.rs b/src/main.rs index 0602000..737731b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,19 +1,19 @@ -use std::io::Result; use std::io::stdout; +use std::io::Result; use std::time::Instant; use crossterm::{ event::{self, KeyCode, KeyEventKind}, - ExecutableCommand, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, + ExecutableCommand, }; +use ratatui::prelude::*; +use ratatui::widgets::block::{Position, Title}; +use ratatui::widgets::{Block, BorderType, Borders, Wrap}; use ratatui::{ prelude::{CrosstermBackend, Terminal}, widgets::Paragraph, }; -use ratatui::prelude::*; -use ratatui::widgets::{Block, Borders, BorderType, Wrap}; -use ratatui::widgets::block::{Position, Title}; use whoami::realname; use crate::game::{Game, GameState}; @@ -21,14 +21,14 @@ use crate::level_widget::LevelWidget; use crate::player::Player; use crate::position::HasPosition; -mod game; -mod player; -mod level; -mod position; -mod level_widget; -mod level_generator; mod artifacts; +mod game; +mod level; +mod level_generator; +mod level_widget; mod monster; +mod player; +mod position; /// length of a game frame in ms pub const FRAME_LENGTH: u64 = 100; @@ -46,8 +46,11 @@ fn main() -> Result<()> { let mut ticks = 0; loop { terminal.draw(|frame| { - let mut area = frame.size(); - frame.render_widget(Block::default().style(Style::default().bg(Color::Green)), area); + let mut area = frame.area(); + frame.render_widget( + Block::default().style(Style::default().bg(Color::Green)), + area, + ); // don't draw stuff except an info box if the terminal is too small (less than 80x25) // to prevent the read drawing code from crashing the game. @@ -90,23 +93,25 @@ fn main() -> Result<()> { }; let block = Block::default() .title( - Title::from( - format!(" {} ", game.get_player().get_name())) + Title::from(format!(" {} ", game.get_player().get_name())) .alignment(Alignment::Center) - .position(Position::Top) + .position(Position::Top), ) .borders(Borders::TOP) .border_style(Style::default().fg(Color::White)) .border_type(BorderType::Rounded) .style(Style::default().bg(Color::Blue)); frame.render_widget( - Paragraph::new(format!("Health: {}/{}\nExp: {}\nGold: {}\nLevel: {}", - game.get_player().get_life(), - game.get_player().get_max_life(), - game.get_player().get_experience(), - game.get_player().get_gold(), - game.get_player().get_immutable_position().get_level())) - .block(block).wrap(Wrap { trim: true }), + Paragraph::new(format!( + "Health: {}/{}\nExp: {}\nGold: {}\nLevel: {}", + game.get_player().get_life(), + game.get_player().get_max_life(), + game.get_player().get_experience(), + game.get_player().get_gold(), + game.get_player().get_immutable_position().get_level() + )) + .block(block) + .wrap(Wrap { trim: true }), stats_area, ); let messages_area = Rect { @@ -117,33 +122,46 @@ fn main() -> Result<()> { }; // Display the latest messages from the game to the user let block = Block::default() - .title(Title::from(" messages ").alignment(Alignment::Center).position(Position::Top)) + .title( + Title::from(" messages ") + .alignment(Alignment::Center) + .position(Position::Top), + ) .borders(Borders::TOP) .border_style(Style::default().fg(Color::White)) .border_type(BorderType::Rounded) .style(Style::default().bg(Color::Blue)); - let paragraph1 = if game.messages.is_empty() { "".to_string() } else { format!("> {}", game.messages.join("\n> ")) }; + let paragraph1 = if game.messages.is_empty() { + "".to_string() + } else { + format!("> {}", game.messages.join("\n> ")) + }; frame.render_widget( - Paragraph::new(paragraph1).block(block).wrap(Wrap { trim: true }), + Paragraph::new(paragraph1) + .block(block) + .wrap(Wrap { trim: true }), messages_area, ); })?; if event::poll(std::time::Duration::from_millis(FRAME_LENGTH))? { if let event::Event::Key(key) = event::read()? { if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('v') { - game.messages.insert(0, format!("You are playing version '{}'.", env!("GIT_HASH")).to_string()); + game.messages.insert( + 0, + format!("You are playing version '{}'.", env!("GIT_HASH")).to_string(), + ); } if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') { break; } if key.kind == KeyEventKind::Press { let new_pos = match key.code { - KeyCode::Left => { game.move_player(-1, 0) } - KeyCode::Right => { game.move_player(1, 0) } - KeyCode::Up => { game.move_player(0, -1) } - KeyCode::Down => { game.move_player(0, 1) } - _ => { (0, 0) } + KeyCode::Left => game.move_player(-1, 0), + KeyCode::Right => game.move_player(1, 0), + KeyCode::Up => game.move_player(0, -1), + KeyCode::Down => game.move_player(0, 1), + _ => (0, 0), }; if !game.player_fights_monster() { // player attacked monster but did not kill it @@ -154,7 +172,7 @@ fn main() -> Result<()> { } } game.update_level(ticks); - if game.get_game_state() != GameState::RUNNING { + if game.get_game_state() != GameState::Running { break; } ticks += 1; @@ -162,7 +180,7 @@ fn main() -> Result<()> { let playtime = start_time.elapsed(); loop { let _ = terminal.draw(|frame| { - let mut area = frame.size(); + let mut area = frame.area(); let w = area.width / 2; let h = area.height / 2; area.x += w - 20; @@ -170,24 +188,33 @@ fn main() -> Result<()> { area.width = 40; area.height = 20; let block = Block::default() - .title(Title::from(" Game ended ").alignment(Alignment::Center).position(Position::Top)) + .title( + Title::from(" Game ended ") + .alignment(Alignment::Center) + .position(Position::Top), + ) .title(Title::from("Press `q` to quit!").position(Position::Bottom)) .borders(Borders::ALL) .border_style(Style::default().fg(Color::White)) .border_type(BorderType::Rounded) .style(Style::default().bg(Color::Black)); let mut text = match game.get_game_state() { - GameState::RUNNING => { + GameState::Running => { "Quitting is for cowards! You'll better try again!".to_string() } - GameState::LOST => { + GameState::Lost => { "Sorry, you died in the dungeon. Better luck next time!".to_string() } - GameState::WON => { - "Congratulation! You mastered your way through the dungeon and won the game.".to_string() + GameState::Won => { + "Congratulation! You mastered your way through the dungeon and won the game." + .to_string() } }; - text += format!("\nYou gained {} experience.", game.get_player().get_experience()).as_str(); + text += format!( + "\nYou gained {} experience.", + game.get_player().get_experience() + ) + .as_str(); text += format!("\nYou collected {} gold.", game.get_player().get_gold()).as_str(); text += format!("\nYou played {} seconds.", playtime.as_secs()).as_str(); let paragraph = Paragraph::new(text).block(block).wrap(Wrap { trim: true }); diff --git a/src/monster.rs b/src/monster.rs index 633a6f4..349490f 100644 --- a/src/monster.rs +++ b/src/monster.rs @@ -91,7 +91,6 @@ impl Orc { default_monster!(Orc); - #[test] fn monsters_can_move() { let mut m = Rat::new_with_position(Position::new(0, 0, 0)); @@ -115,4 +114,4 @@ fn monsters_can_die() { m.decrease_life(2); assert_eq!(m.get_life(), 0); assert_eq!(m.is_dead(), true); -} \ No newline at end of file +} diff --git a/src/player.rs b/src/player.rs index 0801005..b6debe0 100644 --- a/src/player.rs +++ b/src/player.rs @@ -23,7 +23,7 @@ impl Player { } } pub fn get_name(&self) -> String { - return self.name.clone(); + self.name.clone() } pub fn change_life(&mut self, by: i16) { self.life = max(0, min(self.max_life, self.life + by)); @@ -32,22 +32,34 @@ impl Player { self.life } /// returns true if the player is dead (life <= 0) - pub fn is_dead(&self) -> bool { self.life <= 0 } + pub fn is_dead(&self) -> bool { + self.life <= 0 + } /// returns true if the player's life is at maximum - pub fn is_healthy(&self) -> bool { self.life == self.max_life } + pub fn is_healthy(&self) -> bool { + self.life == self.max_life + } pub fn get_max_life(&self) -> i16 { self.max_life } /// add the given amount to the players gold stash - pub fn retrieve_gold(&mut self, amount: usize) { self.gold += amount } + pub fn retrieve_gold(&mut self, amount: usize) { + self.gold += amount + } /// return the size of the players gold stash - pub fn get_gold(&self) -> usize { self.gold } + pub fn get_gold(&self) -> usize { + self.gold + } - pub fn gain_experience(&mut self, amount: usize) { self.experience += amount } + pub fn gain_experience(&mut self, amount: usize) { + self.experience += amount + } - pub fn get_experience(&self) -> usize { self.experience } + pub fn get_experience(&self) -> usize { + self.experience + } } impl HasPosition for Player { diff --git a/src/position.rs b/src/position.rs index 67ea8e1..b9d9ae1 100644 --- a/src/position.rs +++ b/src/position.rs @@ -17,11 +17,7 @@ pub struct Position { impl Position { pub fn new(level: usize, x: usize, y: usize) -> Self { - Self { - level, - x, - y, - } + Self { level, x, y } } pub fn change(&mut self, dx: i16, dy: i16) -> (usize, usize) { self.x = max((self.x as i16) + dx, 0) as usize; @@ -42,7 +38,9 @@ impl Position { self.x } - pub fn get_y(&self) -> usize { self.y } + pub fn get_y(&self) -> usize { + self.y + } } #[test] @@ -73,4 +71,4 @@ fn test_position_set() { assert_eq!(p.get_level(), 1); assert_eq!(p.get_x(), 2); assert_eq!(p.get_y(), 3); -} \ No newline at end of file +}