forgot to push some module changes. They seem to be working though, so may as well do it now.
This commit is contained in:
parent
e56f7fcf79
commit
166948749c
@ -6,14 +6,32 @@ roll_dice() {
|
|||||||
local i
|
local i
|
||||||
local total=0
|
local total=0
|
||||||
for i in $(seq $count) ; do
|
for i in $(seq $count) ; do
|
||||||
total=$((total + $RANDOM % $sides + 1))
|
local die=$(($RANDOM % $sides + 1))
|
||||||
|
total=$((total + $die))
|
||||||
|
if [[ $i -le 10 ]]; then
|
||||||
|
if [[ $i -lt $count ]]; then
|
||||||
|
echo -n "${die}, "
|
||||||
|
else
|
||||||
|
if [[ $count -gt 1 ]]; then
|
||||||
|
echo -n "and ${die} "
|
||||||
|
else
|
||||||
|
echo -n "${die} "
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
echo $total
|
if [[ $((count - 10)) -gt 1 ]]; then
|
||||||
|
echo -n "and $((count - 10)) more dice "
|
||||||
|
fi
|
||||||
|
if [[ $((count - 10)) -eq 1 ]]; then
|
||||||
|
echo -n "and 1 more die "
|
||||||
|
fi
|
||||||
|
echo "for a total of ${total}."
|
||||||
}
|
}
|
||||||
|
|
||||||
rollString="${3##* }"
|
rollString="${3##* }"
|
||||||
if ! [[ "$rollString" =~ ^[1-9][0-9]*[dD][1-9][0-9]*$ ]]; then
|
if ! [[ "$rollString" =~ ^[1-9][0-9]*[dD][1-9][0-9]*$ ]]; then
|
||||||
msg "$2" "${1}: Usage is roll #d# where # is greater than 0."
|
msg "$2" "${1}: Usage is roll #d# where # is greater than 0."
|
||||||
else
|
else
|
||||||
msg "$2" "$1:: I rolled ${rollString} and got a total of $(roll_dice ${rollString})."
|
msg "$2" "$(roll_dice ${rollString})"
|
||||||
fi
|
fi
|
||||||
|
@ -17,6 +17,7 @@ if [[ "$spinPlus" == "$message" ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
spin="${spin%[[:punct:]]}"
|
||||||
message="${message} $spin $spin $spin "
|
message="${message} $spin $spin $spin "
|
||||||
spinCount=$((RANDOM % 7 + 7))
|
spinCount=$((RANDOM % 7 + 7))
|
||||||
for i in $(seq $spinCount) ; do
|
for i in $(seq $spinCount) ; do
|
||||||
|
Loading…
Reference in New Issue
Block a user