irevoire/brust - Change VWIN5J6IR5PXCMQEO5F3Z76VXTQWDIBHHAHHHTW7RUVW54PRVJVAC

improve the roll command

Created by irevoire on February 17, 2021

VWIN5J6IR5PXCMQEO5F3Z76VXTQWDIBHHAHHHTW7RUVW54PRVJVAC

Dependencies

In channels

main

Change contents

Replacement in src/commands/roll.rs at line 25 [3.39]

B:BD[3.1128] → [3.1128:1188]

            Term::Roll(_) => res.push(format!("{}", step)),

[3.1128]

[3.1188]

            Term::Roll(_) => res.push(format!("{:?}", step)),

Replacement in src/commands/roll.rs at line 59 [3.39]

B:BD[3.1937] → [3.1937:1989]

    pub fn roll(&self, rng: &mut impl Rng) -> i64 {

[3.1937]

[3.1989]

    pub fn roll(&self, rng: &mut impl Rng) -> Vec<i64> {

Replacement in src/commands/roll.rs at line 61 [3.39]

B:BD[3.2010] → [3.2010:2052]

B:BD[3.2052] → [2.5205:5292]

∅:D[2.5292] → [3.2139:2194]

B:BD[3.2139] → [3.2139:2194]

            Roll::Dice(rolls, faces) => {
                (0..*rolls).fold(0, |acc, _| acc + rng.gen_range(1..faces + 1) as i64)
            }
            Roll::Const(c) => *c as i64,

[3.2010]

[3.2194]

            Roll::Dice(rolls, faces) => (0..*rolls)
                .map(|_| rng.gen_range(1..faces + 1) as i64)
                .collect(),
            Roll::Const(c) => vec![*c as i64],

Replacement in src/commands/roll.rs at line 153 [3.39]

B:BD[3.4165] → [2.5733:5817]

    pub fn and(&mut self, term: &Term, rng: &mut impl Rng) -> anyhow::Result<i64> {

[3.4165]

[3.4300]

    pub fn and(&mut self, term: &Term, rng: &mut impl Rng) -> anyhow::Result<Vec<i64>> {

Replacement in src/commands/roll.rs at line 163 [3.39]

B:BD[3.4694] → [2.5870:5919]

                self.total.ok_or(anyhow!("Bug"))

[3.4694]

[3.4741]

                Ok(vec![self.total.unwrap()])

Replacement in src/commands/roll.rs at line 174 [3.39]

B:BD[3.5153] → [3.5153:5197]

                    self.total = Some(res);

[3.5153]

[3.5197]

                    self.total = Some(res.iter().sum());

Replacement in src/commands/roll.rs at line 177 [3.39]

B:BD[3.5250] → [3.5250:5347]

                    self.total = Some(self.binop.take().unwrap().run(self.total.unwrap(), res));

[3.5250]

[3.5347]

                    self.total = Some(
                        self.binop
                            .take()
                            .unwrap()
                            .run(self.total.unwrap(), res.iter().sum()),
                    );