|
|
@ -404,7 +404,7 @@ OS.karada = function (body) {
|
|
|
|
return output;
|
|
|
|
return output;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var dice_re = /(#tea|#dame|#tutturu|#muri|#flip|#when|#du|#pyu|#pcount|#test|#sleep|#janken|#8ball|#imfey|#\?(?:\[(?:\w,*)+\])?|#\d{0,2}d\d{1,4}(?:[+-]\d{1,4})?)/i;
|
|
|
|
var dice_re = /(#tea|#dame|#tutturu|#muri|#flip|#when|#du|#fun|#fcount|#test|#sleep|#janken|#8ball|#imfey|#\?(?:\[(?:\w,*)+\])?|#\d{0,2}d\d{1,4}(?:[+-]\d{1,4})?)/i;
|
|
|
|
exports.dice_re = dice_re;
|
|
|
|
exports.dice_re = dice_re;
|
|
|
|
|
|
|
|
|
|
|
|
var WHEN = [
|
|
|
|
var WHEN = [
|
|
|
@ -482,7 +482,7 @@ function parse_dice(frag)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return {n:1, faces: j};
|
|
|
|
return {n:1, faces: j};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (frag == '#pyu' || frag == '#pcount' || frag == '#du')
|
|
|
|
if (frag == '#fun' || frag == '#fcount' || frag == '#du')
|
|
|
|
return {n: 1, faces: 2};
|
|
|
|
return {n: 1, faces: 2};
|
|
|
|
if (frag == '#tea')
|
|
|
|
if (frag == '#tea')
|
|
|
|
return {n: 1, faces: 2};
|
|
|
|
return {n: 1, faces: 2};
|
|
|
@ -556,8 +556,8 @@ function readable_dice(bit, d) {
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return '#du (Try asking again)';
|
|
|
|
return '#du (Try asking again)';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (bit == '#pyu')
|
|
|
|
if (bit == '#fun')
|
|
|
|
return '#pyu (' + d[0]+ ')';
|
|
|
|
return '#fun (' + d[0]+ ')';
|
|
|
|
if (bit == '#pcount')
|
|
|
|
if (bit == '#pcount')
|
|
|
|
return '#pcount (' + d[0] + ')';
|
|
|
|
return '#pcount (' + d[0] + ')';
|
|
|
|
if (bit == '#tea')
|
|
|
|
if (bit == '#tea')
|
|
|
|