Compare commits
14 Commits
next
...
c6018d7199
| Author | SHA1 | Date | |
|---|---|---|---|
| c6018d7199 | |||
| 07a2913c76 | |||
| dcf97956c2 | |||
| 3e5afffb33 | |||
| 95766fb897 | |||
| 430cd675be | |||
| a9f9bcac09 | |||
| f1dfbb0fff | |||
| dd22385aff | |||
| fc97d4ec2c | |||
| 16174254b9 | |||
| 2497447f46 | |||
| 589c25cdcd | |||
| ab757e3080 |
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
01.workspace/target
|
||||
148
01.workspace/Cargo.lock
generated
Normal file
148
01.workspace/Cargo.lock
generated
Normal file
@@ -0,0 +1,148 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"r-efi",
|
||||
"wasip2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.177"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
|
||||
|
||||
[[package]]
|
||||
name = "oxidice_lib"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
|
||||
dependencies = [
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.103"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "r-efi"
|
||||
version = "5.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
|
||||
dependencies = [
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.9.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.110"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
|
||||
|
||||
[[package]]
|
||||
name = "wasip2"
|
||||
version = "1.0.1+wasi-0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
|
||||
dependencies = [
|
||||
"wit-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen"
|
||||
version = "0.46.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.8.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.8.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
3
01.workspace/Cargo.toml
Normal file
3
01.workspace/Cargo.toml
Normal file
@@ -0,0 +1,3 @@
|
||||
[workspace]
|
||||
resolver = "3"
|
||||
members = ["oxidice_lib"]
|
||||
7
01.workspace/oxidice_lib/Cargo.toml
Normal file
7
01.workspace/oxidice_lib/Cargo.toml
Normal file
@@ -0,0 +1,7 @@
|
||||
[package]
|
||||
name = "oxidice_lib"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
rand = "0.9.2"
|
||||
17
01.workspace/oxidice_lib/examples/roll_ose_stats.rs
Normal file
17
01.workspace/oxidice_lib/examples/roll_ose_stats.rs
Normal file
@@ -0,0 +1,17 @@
|
||||
use oxidice_lib::dice::*;
|
||||
|
||||
fn main() -> Result<(), FailedTo>{
|
||||
let str = Dice::grab(3, 6).roll().sum()?;
|
||||
let int = Dice::grab(3, 6).roll().sum()?;
|
||||
let wis = Dice::grab(3, 6).roll().sum()?;
|
||||
let dex = Dice::grab(3, 6).roll().sum()?;
|
||||
let con = Dice::grab(3, 6).roll().sum()?;
|
||||
let cha = Dice::grab(3, 6).roll().sum()?;
|
||||
println!("STR: {str}");
|
||||
println!("INT: {int}");
|
||||
println!("WIS: {wis}");
|
||||
println!("DEX: {dex}");
|
||||
println!("CON: {con}");
|
||||
println!("CHA: {cha}");
|
||||
Ok(())
|
||||
}
|
||||
1
01.workspace/oxidice_lib/src/fun/mod.rs
Normal file
1
01.workspace/oxidice_lib/src/fun/mod.rs
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
20
01.workspace/oxidice_lib/src/imp/dice_grab.rs
Normal file
20
01.workspace/oxidice_lib/src/imp/dice_grab.rs
Normal file
@@ -0,0 +1,20 @@
|
||||
use crate::*;
|
||||
|
||||
impl Dice {
|
||||
pub fn grab(dice: u16, sides: u16) -> Self {
|
||||
let mut handful = Vec::<Die>::new();
|
||||
for _ in 1..=dice {
|
||||
handful.push(Die::new(sides));
|
||||
}
|
||||
Self {
|
||||
handful,
|
||||
roll_results: Vec::<u16>::new(),
|
||||
}
|
||||
}
|
||||
pub fn and_grab(mut self, dice: u16, sides: u16) -> Self {
|
||||
for _ in 1..=dice {
|
||||
self.handful.push(Die::new(sides));
|
||||
}
|
||||
self
|
||||
}
|
||||
}
|
||||
11
01.workspace/oxidice_lib/src/imp/dice_roll.rs
Normal file
11
01.workspace/oxidice_lib/src/imp/dice_roll.rs
Normal file
@@ -0,0 +1,11 @@
|
||||
use crate::*;
|
||||
|
||||
impl Dice {
|
||||
pub fn roll(mut self) -> Self {
|
||||
self.roll_results.clear();
|
||||
for die in &self.handful {
|
||||
self.roll_results.push(die.roll())
|
||||
}
|
||||
self
|
||||
}
|
||||
}
|
||||
16
01.workspace/oxidice_lib/src/imp/dice_sum.rs
Normal file
16
01.workspace/oxidice_lib/src/imp/dice_sum.rs
Normal file
@@ -0,0 +1,16 @@
|
||||
use crate::*;
|
||||
|
||||
impl Dice {
|
||||
pub fn sum(self) -> Result<Sum, FailedTo> {
|
||||
let mut result = Sum::default();
|
||||
for roll_result in self.roll_results {
|
||||
result.roll_results.push(roll_result);
|
||||
result.sum = result
|
||||
.sum
|
||||
.checked_add(roll_result.into())
|
||||
.and_then(|r| r.checked_add(1u64))
|
||||
.ok_or(FailedTo::Sum)?;
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
}
|
||||
11
01.workspace/oxidice_lib/src/imp/die_roll.rs
Normal file
11
01.workspace/oxidice_lib/src/imp/die_roll.rs
Normal file
@@ -0,0 +1,11 @@
|
||||
use crate::*;
|
||||
|
||||
impl Die {
|
||||
pub fn roll(&self) -> u16 {
|
||||
let mut rng = rand::rng();
|
||||
rng.random_range(0..self.sides)
|
||||
}
|
||||
}
|
||||
|
||||
// #[cfg(test)]
|
||||
// mod unit_tests { use super::*; }
|
||||
5
01.workspace/oxidice_lib/src/imp/mod.rs
Normal file
5
01.workspace/oxidice_lib/src/imp/mod.rs
Normal file
@@ -0,0 +1,5 @@
|
||||
pub mod dice_grab;
|
||||
pub mod dice_roll;
|
||||
pub mod dice_sum;
|
||||
pub mod die_roll;
|
||||
pub mod sum_display;
|
||||
17
01.workspace/oxidice_lib/src/imp/sum_display.rs
Normal file
17
01.workspace/oxidice_lib/src/imp/sum_display.rs
Normal file
@@ -0,0 +1,17 @@
|
||||
use crate::*;
|
||||
|
||||
impl fmt::Display for Sum {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
|
||||
let str_results: Vec<String> = self
|
||||
.roll_results
|
||||
.iter()
|
||||
.map(|r| r.checked_add(1))
|
||||
.map(|o| o.unwrap_or(0))
|
||||
.map(|r| r.to_string())
|
||||
.collect();
|
||||
write!(f, "[{}]", str_results.join(", "))?;
|
||||
write!(f, " -> ")?;
|
||||
write!(f, "{}", self.sum)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
21
01.workspace/oxidice_lib/src/lib.rs
Normal file
21
01.workspace/oxidice_lib/src/lib.rs
Normal file
@@ -0,0 +1,21 @@
|
||||
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::failed_to::E as FailedTo;
|
||||
pub(crate) use crate::str::sum::O as Sum;
|
||||
|
||||
pub mod dice {
|
||||
pub use crate::str::dice::O as Dice;
|
||||
pub use crate::str::sum::O as Sum;
|
||||
pub use crate::str::failed_to::E as FailedTo;
|
||||
}
|
||||
1
01.workspace/oxidice_lib/src/mcr/mod.rs
Normal file
1
01.workspace/oxidice_lib/src/mcr/mod.rs
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
18
01.workspace/oxidice_lib/src/str/dice.rs
Normal file
18
01.workspace/oxidice_lib/src/str/dice.rs
Normal file
@@ -0,0 +1,18 @@
|
||||
use crate::*;
|
||||
|
||||
#[derive(Debug, Default, PartialEq, Clone)]
|
||||
pub struct O {
|
||||
pub(crate) handful: Vec<Die>,
|
||||
pub(crate) roll_results: Vec<u16>,
|
||||
}
|
||||
|
||||
// impl std::fmt::Display for O {
|
||||
// fn fmt(&self, _f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
|
||||
// todo!();
|
||||
// }
|
||||
// }
|
||||
|
||||
// #[cfg(test)]
|
||||
// mod unit_tests {
|
||||
// use super::*;
|
||||
// }
|
||||
12
01.workspace/oxidice_lib/src/str/die.rs
Normal file
12
01.workspace/oxidice_lib/src/str/die.rs
Normal file
@@ -0,0 +1,12 @@
|
||||
use crate::*;
|
||||
|
||||
#[derive(Debug, Default, PartialEq, Clone)]
|
||||
pub struct O {
|
||||
pub(crate) sides: u16,
|
||||
}
|
||||
|
||||
impl Die {
|
||||
pub fn new(sides: u16) -> Self {
|
||||
Self { sides }
|
||||
}
|
||||
}
|
||||
51
01.workspace/oxidice_lib/src/str/failed_to.rs
Normal file
51
01.workspace/oxidice_lib/src/str/failed_to.rs
Normal file
@@ -0,0 +1,51 @@
|
||||
// use crate::*;
|
||||
// use std::fmt::Display;
|
||||
// use std::str::FromStr;
|
||||
|
||||
#[derive(Debug, PartialEq, PartialOrd, Eq, Ord, Clone, Copy, Hash)]
|
||||
pub enum E {
|
||||
Sum,
|
||||
}
|
||||
|
||||
// impl Display for E {
|
||||
// fn fmt(&self, f: &mut std::fmt::Formatter) -> std::result::Result<(), std::fmt::Error> {
|
||||
// match self {
|
||||
// Self::NoValue => write!(f, "NoValue"),
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// impl FromStr for E {
|
||||
// type Err = Box<dyn std::error::Error>;
|
||||
// fn from_str(value: &str) -> std::result::Result<Self, Box<dyn std::error::Error>> {
|
||||
// match value {
|
||||
// "NoValue" => Ok(Self::NoValue),
|
||||
// _ => unreachable!(),
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// #[cfg(test)]
|
||||
// mod unit_tests {
|
||||
// use super::*;
|
||||
// #[test]
|
||||
// fn check_001() {
|
||||
// for value in [E::NoValue] {
|
||||
// match value {
|
||||
// E::NoValue => assert_eq!(
|
||||
// E::NoValue,
|
||||
// E::from_str("NoValue").unwrap()
|
||||
// ),
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// #[test]
|
||||
// fn check_002() {
|
||||
// for value in [E::NoValue] {
|
||||
// match value {
|
||||
// E::NoValue => assert_eq!(&E::NoValue.to_string(), "NoValue"),
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
4
01.workspace/oxidice_lib/src/str/mod.rs
Normal file
4
01.workspace/oxidice_lib/src/str/mod.rs
Normal file
@@ -0,0 +1,4 @@
|
||||
pub mod dice;
|
||||
pub mod die;
|
||||
pub mod failed_to;
|
||||
pub mod sum;
|
||||
18
01.workspace/oxidice_lib/src/str/sum.rs
Normal file
18
01.workspace/oxidice_lib/src/str/sum.rs
Normal file
@@ -0,0 +1,18 @@
|
||||
use crate::*;
|
||||
|
||||
#[derive(Debug, Default, PartialEq, Clone)]
|
||||
pub struct O {
|
||||
pub(crate) roll_results: Vec<u16>,
|
||||
pub(crate) sum: u64,
|
||||
}
|
||||
|
||||
// impl std::fmt::Display for O {
|
||||
// fn fmt(&self, _f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
|
||||
// todo!();
|
||||
// }
|
||||
// }
|
||||
|
||||
// #[cfg(test)]
|
||||
// mod unit_tests {
|
||||
// use super::*;
|
||||
// }
|
||||
1
01.workspace/oxidice_lib/src/trt/mod.rs
Normal file
1
01.workspace/oxidice_lib/src/trt/mod.rs
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
28
01.workspace/oxidice_lib/src/tst/dice_grab.rs
Normal file
28
01.workspace/oxidice_lib/src/tst/dice_grab.rs
Normal file
@@ -0,0 +1,28 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::*;
|
||||
#[test]
|
||||
pub fn grab_should_set_correct_number_of_dice() {
|
||||
let dice = Dice::grab(3, 6);
|
||||
assert_eq!(dice.handful.len(), 3);
|
||||
}
|
||||
#[test]
|
||||
pub fn grab_should_set_correct_number_of_sides() {
|
||||
let dice = Dice::grab(3, 6);
|
||||
for idx in 0..=2 {
|
||||
assert_eq!(dice.handful[idx].sides, 6);
|
||||
}
|
||||
}
|
||||
#[test]
|
||||
fn and_grab_should_add_correct_number_of_dice() {
|
||||
let dice = Dice::grab(3, 6).and_grab(2, 8);
|
||||
assert_eq!(dice.handful.len(), 5);
|
||||
}
|
||||
#[test]
|
||||
fn and_grab_should_set_correct_number_of_sides() {
|
||||
let dice = Dice::grab(3, 6).and_grab(2, 8);
|
||||
for idx in 3..4 {
|
||||
assert_eq!(dice.handful[idx].sides, 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
15
01.workspace/oxidice_lib/src/tst/dice_roll.rs
Normal file
15
01.workspace/oxidice_lib/src/tst/dice_roll.rs
Normal file
@@ -0,0 +1,15 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::*;
|
||||
#[test]
|
||||
pub fn roll_should_yield_correct_number_or_results() {
|
||||
let dice = Dice::grab(3, 6);
|
||||
let dice = dice.roll();
|
||||
assert_eq!(dice.roll_results.len(), 3);
|
||||
}
|
||||
#[test]
|
||||
fn reroll_should_yield_correct_number_of_results() {
|
||||
let dice = Dice::grab(3, 6).roll().roll();
|
||||
assert_eq!(dice.roll_results.len(), 3);
|
||||
}
|
||||
}
|
||||
16
01.workspace/oxidice_lib/src/tst/dice_sum.rs
Normal file
16
01.workspace/oxidice_lib/src/tst/dice_sum.rs
Normal file
@@ -0,0 +1,16 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::*;
|
||||
#[test]
|
||||
pub fn dice_sum_should_yield_the_correct_sum() {
|
||||
let result = Dice::grab(6, 1).roll().sum().unwrap();
|
||||
assert_eq!(result.sum, 6);
|
||||
}
|
||||
#[test]
|
||||
fn dice_sum_should_list_the_correct_results() {
|
||||
let result = Dice::grab(6, 1).roll().sum().unwrap();
|
||||
for idx in 1..6 {
|
||||
assert_eq!(result.roll_results[idx], 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
11
01.workspace/oxidice_lib/src/tst/die_roll.rs
Normal file
11
01.workspace/oxidice_lib/src/tst/die_roll.rs
Normal file
@@ -0,0 +1,11 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::*;
|
||||
#[test]
|
||||
pub fn die_roll_should_always_stay_inside_range() {
|
||||
let die = Die::new(6);
|
||||
for _ in 1..=10000 {
|
||||
assert!(die.roll() < 6);
|
||||
}
|
||||
}
|
||||
}
|
||||
5
01.workspace/oxidice_lib/src/tst/mod.rs
Normal file
5
01.workspace/oxidice_lib/src/tst/mod.rs
Normal file
@@ -0,0 +1,5 @@
|
||||
pub mod dice_grab;
|
||||
pub mod dice_roll;
|
||||
pub mod dice_sum;
|
||||
pub mod die_roll;
|
||||
pub mod sum_display;
|
||||
9
01.workspace/oxidice_lib/src/tst/sum_display.rs
Normal file
9
01.workspace/oxidice_lib/src/tst/sum_display.rs
Normal file
@@ -0,0 +1,9 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::*;
|
||||
#[test]
|
||||
pub fn sum_display_format_should_be_correct() {
|
||||
let result = Dice::grab(3, 1).roll().sum().unwrap();
|
||||
assert_eq!(&result.to_string(), "[1, 1, 1] -> 3");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user