diff --git a/01.workspace/oxydice_lib/examples/roll_3d6.rs b/01.workspace/oxydice_lib/examples/roll_3d6.rs deleted file mode 100644 index 4cf0aa8..0000000 --- a/01.workspace/oxydice_lib/examples/roll_3d6.rs +++ /dev/null @@ -1,6 +0,0 @@ -use oxydice_lib::*; - -fn main() { - let mut dice = dice::Dice::grab(3, 6); - dice.roll(); -} diff --git a/01.workspace/oxydice_lib/src/fun/mod.rs b/01.workspace/oxydice_lib/src/fun/mod.rs index 8b13789..e69de29 100644 --- a/01.workspace/oxydice_lib/src/fun/mod.rs +++ b/01.workspace/oxydice_lib/src/fun/mod.rs @@ -1 +0,0 @@ - diff --git a/01.workspace/oxydice_lib/src/imp/dice_grab.rs b/01.workspace/oxydice_lib/src/imp/dice_grab.rs deleted file mode 100644 index 9c9a037..0000000 --- a/01.workspace/oxydice_lib/src/imp/dice_grab.rs +++ /dev/null @@ -1,20 +0,0 @@ -use crate::*; - -impl Dice { - pub fn grab(dice: u16, sides: u16) -> Self { - let mut handful = Vec::::new(); - for _ in 1..=dice { - handful.push(Die::new(sides)); - } - Self { - handful, - ..Self::default() - } - } - pub fn and_grab(mut self, dice: u16, sides: u16) -> Self { - for _ in 1..=dice { - self.handful.push(Die::new(sides)); - } - self - } -} diff --git a/01.workspace/oxydice_lib/src/imp/dice_roll.rs b/01.workspace/oxydice_lib/src/imp/dice_roll.rs deleted file mode 100644 index 31c6e27..0000000 --- a/01.workspace/oxydice_lib/src/imp/dice_roll.rs +++ /dev/null @@ -1,10 +0,0 @@ -use crate::*; - -impl Dice { - pub fn roll(&mut self) { - self.result.die_results.clear(); - for die in &self.handful { - self.result.die_results.push(die.roll()); - } - } -} diff --git a/01.workspace/oxydice_lib/src/imp/die_new.rs b/01.workspace/oxydice_lib/src/imp/die_new.rs deleted file mode 100644 index 9e4a1ad..0000000 --- a/01.workspace/oxydice_lib/src/imp/die_new.rs +++ /dev/null @@ -1,7 +0,0 @@ -use crate::*; - -impl Die { - pub fn new(sides: u16) -> Die { - Self { sides } - } -} diff --git a/01.workspace/oxydice_lib/src/imp/die_roll.rs b/01.workspace/oxydice_lib/src/imp/die_roll.rs deleted file mode 100644 index ad6888e..0000000 --- a/01.workspace/oxydice_lib/src/imp/die_roll.rs +++ /dev/null @@ -1,8 +0,0 @@ -use crate::*; - -impl Die { - pub fn roll(&self) -> u16 { - let mut rng = rand::rng(); - rng.random_range(0..self.sides) - } -} diff --git a/01.workspace/oxydice_lib/src/imp/mod.rs b/01.workspace/oxydice_lib/src/imp/mod.rs index 86d7d10..e69de29 100644 --- a/01.workspace/oxydice_lib/src/imp/mod.rs +++ b/01.workspace/oxydice_lib/src/imp/mod.rs @@ -1,4 +0,0 @@ -pub mod dice_grab; -pub mod dice_roll; -pub mod die_new; -pub mod die_roll; diff --git a/01.workspace/oxydice_lib/src/lib.rs b/01.workspace/oxydice_lib/src/lib.rs index ab78f4f..8784c5e 100644 --- a/01.workspace/oxydice_lib/src/lib.rs +++ b/01.workspace/oxydice_lib/src/lib.rs @@ -1,18 +1,8 @@ use std::*; -use rand::*; - mod fun; mod imp; mod mcr; mod str; mod trt; mod tst; - -pub(crate) use crate::str::dice::O as Dice; -pub(crate) use crate::str::die::O as Die; -pub(crate) use crate::str::roll_result::O as RollResult; - -pub mod dice { - pub use crate::str::dice::O as Dice; -} diff --git a/01.workspace/oxydice_lib/src/mcr/mod.rs b/01.workspace/oxydice_lib/src/mcr/mod.rs index 8b13789..e69de29 100644 --- a/01.workspace/oxydice_lib/src/mcr/mod.rs +++ b/01.workspace/oxydice_lib/src/mcr/mod.rs @@ -1 +0,0 @@ - diff --git a/01.workspace/oxydice_lib/src/str/dice.rs b/01.workspace/oxydice_lib/src/str/dice.rs deleted file mode 100644 index 174c26b..0000000 --- a/01.workspace/oxydice_lib/src/str/dice.rs +++ /dev/null @@ -1,7 +0,0 @@ -use crate::*; - -#[derive(Debug, Default, PartialEq, Clone)] -pub struct O { - pub(crate) handful: Vec, - pub(crate) result: RollResult, -} diff --git a/01.workspace/oxydice_lib/src/str/die.rs b/01.workspace/oxydice_lib/src/str/die.rs deleted file mode 100644 index 355c121..0000000 --- a/01.workspace/oxydice_lib/src/str/die.rs +++ /dev/null @@ -1,6 +0,0 @@ -use crate::*; - -#[derive(Debug, Default, PartialEq, Clone)] -pub struct O { - pub(crate) sides: u16, -} diff --git a/01.workspace/oxydice_lib/src/str/mod.rs b/01.workspace/oxydice_lib/src/str/mod.rs index 5c62695..e69de29 100644 --- a/01.workspace/oxydice_lib/src/str/mod.rs +++ b/01.workspace/oxydice_lib/src/str/mod.rs @@ -1,3 +0,0 @@ -pub mod dice; -pub mod die; -pub mod roll_result; diff --git a/01.workspace/oxydice_lib/src/str/roll_result.rs b/01.workspace/oxydice_lib/src/str/roll_result.rs deleted file mode 100644 index ea31a6a..0000000 --- a/01.workspace/oxydice_lib/src/str/roll_result.rs +++ /dev/null @@ -1,6 +0,0 @@ -use crate::*; - -#[derive(Debug, Default, PartialEq, Clone)] -pub struct O { - pub(crate) die_results: Vec, -} diff --git a/01.workspace/oxydice_lib/src/trt/mod.rs b/01.workspace/oxydice_lib/src/trt/mod.rs index 8b13789..e69de29 100644 --- a/01.workspace/oxydice_lib/src/trt/mod.rs +++ b/01.workspace/oxydice_lib/src/trt/mod.rs @@ -1 +0,0 @@ - diff --git a/01.workspace/oxydice_lib/src/tst/dice_grab.rs b/01.workspace/oxydice_lib/src/tst/dice_grab.rs deleted file mode 100644 index 1c08004..0000000 --- a/01.workspace/oxydice_lib/src/tst/dice_grab.rs +++ /dev/null @@ -1,23 +0,0 @@ -#[cfg(test)] -mod tests { - use crate::*; - #[test] - fn dice_grab_should_create_a_new_handful_of_dice() { - let dice_handful = Dice::grab(3, 6); - assert_eq!(dice_handful.handful.len(), 3); - for die in dice_handful.handful { - assert_eq!(die.sides, 6); - } - } - #[test] - fn test_dice_and_grab_should_add_more_dice_to_handful() { - let initial_dice = Dice::grab(2, 6); - let initial_count = initial_dice.handful.len(); - let new_dice_handful = initial_dice.and_grab(2, 8); - assert_eq!(new_dice_handful.handful.len(), initial_count + 2); - // Check the sides of the newly added dice - for i in initial_count..new_dice_handful.handful.len() { - assert_eq!(new_dice_handful.handful[i].sides, 8); - } - } -} diff --git a/01.workspace/oxydice_lib/src/tst/dice_roll.rs b/01.workspace/oxydice_lib/src/tst/dice_roll.rs deleted file mode 100644 index d40cd3e..0000000 --- a/01.workspace/oxydice_lib/src/tst/dice_roll.rs +++ /dev/null @@ -1,20 +0,0 @@ -#[cfg(test)] -mod tests { - use crate::*; - #[test] - pub fn dice_roll_should_yield_always_the_proper_number_of_result() { - let mut dice = Dice::grab(3, 6); - for _ in 1..=1000 { - dice.roll(); - assert_eq!(dice.result.die_results.len(), 3); - } - } - #[test] - pub fn dice_roll_should_yield_valid_results() { - let mut dice = Dice::grab(3, 6); - for _ in 1..=10000 { - dice.roll(); - assert!(dice.result.die_results[0] < 6); - } - } -} diff --git a/01.workspace/oxydice_lib/src/tst/mod.rs b/01.workspace/oxydice_lib/src/tst/mod.rs index 10778b4..e69de29 100644 --- a/01.workspace/oxydice_lib/src/tst/mod.rs +++ b/01.workspace/oxydice_lib/src/tst/mod.rs @@ -1,2 +0,0 @@ -pub mod dice_grab; -pub mod dice_roll;