projectmoon
/
tenebrous-dicebot
1
0
Fork 1
Code Issues 12 Pull Requests 1 Projects Releases 10 Wiki Activity

Support complex expressions on CoC advancement rolls. #55

Merged
projectmoon merged 2 commits from cthulhu-advancement-variables into master 2021-03-18 20:54:52 +00:00
Conversation 0 Commits 2 Files Changed 3 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a8e40181e - Show all commits

5
src/commands/cthulhu.rs
View File

@ -11,7 +11,7 @@ pub struct CthRoll(pub DiceRoll);
#[async_trait] #[async_trait]
impl Command for CthRoll { impl Command for CthRoll {
fn name(&self) -> &'static str { fn name(&self) -> &'static str {
"roll percentile pool" "roll percentile dice"
} }
async fn execute(&self, ctx: &Context<'_>) -> ExecutionResult { async fn execute(&self, ctx: &Context<'_>) -> ExecutionResult {
@ -32,11 +32,10 @@ pub struct CthAdvanceRoll(pub AdvancementRoll);
#[async_trait] #[async_trait]
impl Command for CthAdvanceRoll { impl Command for CthAdvanceRoll {
fn name(&self) -> &'static str { fn name(&self) -> &'static str {
"roll percentile pool" "roll skill advancement dice"
} }
async fn execute(&self, ctx: &Context<'_>) -> ExecutionResult { async fn execute(&self, ctx: &Context<'_>) -> ExecutionResult {
//TODO this will be converted to a result when supporting variables.
let roll_with_ctx = AdvancementRollWithContext(&self.0, ctx); let roll_with_ctx = AdvancementRollWithContext(&self.0, ctx);
let executed_roll = advancement_roll(&roll_with_ctx).await?; let executed_roll = advancement_roll(&roll_with_ctx).await?;
let html = format!( let html = format!(