handle having an initial config correctly
This commit is contained in:
parent
02e2faf58f
commit
6e88e96cda
|
@ -170,10 +170,10 @@ export const handleGroup = (
|
||||||
rollTotal: resultFlags[idx].dropped ? prev.rollTotal : prev.rollTotal + cur.rollTotal,
|
rollTotal: resultFlags[idx].dropped ? prev.rollTotal : prev.rollTotal + cur.rollTotal,
|
||||||
rollPreFormat: '',
|
rollPreFormat: '',
|
||||||
rollPostFormat: '',
|
rollPostFormat: '',
|
||||||
rollDetails: `${prev.rollDetails}, ${applyFlags(cur.rollDetails, resultFlags[idx])}`,
|
rollDetails: `${prev.rollDetails}${prev.rollDetails ? ', ' : ''}${applyFlags(cur.rollDetails, resultFlags[idx])}`,
|
||||||
containsCrit: resultFlags[idx].dropped ? prev.containsCrit : prev.containsCrit || cur.containsCrit,
|
containsCrit: resultFlags[idx].dropped ? prev.containsCrit : prev.containsCrit || cur.containsCrit,
|
||||||
containsFail: resultFlags[idx].dropped ? prev.containsFail : prev.containsFail || cur.containsFail,
|
containsFail: resultFlags[idx].dropped ? prev.containsFail : prev.containsFail || cur.containsFail,
|
||||||
initConfig: `${prev.initConfig}, ${cur.initConfig}`,
|
initConfig: `${prev.initConfig}${prev.initConfig ? ', ' : ''}${cur.initConfig}`,
|
||||||
isComplex: prev.isComplex || cur.isComplex,
|
isComplex: prev.isComplex || cur.isComplex,
|
||||||
}),
|
}),
|
||||||
{
|
{
|
||||||
|
@ -210,10 +210,10 @@ export const handleGroup = (
|
||||||
rollTotal: prev.rollTotal + cur.rollTotal,
|
rollTotal: prev.rollTotal + cur.rollTotal,
|
||||||
rollPreFormat: '',
|
rollPreFormat: '',
|
||||||
rollPostFormat: '',
|
rollPostFormat: '',
|
||||||
rollDetails: `${prev.rollDetails} + ${cur.rollDetails}`,
|
rollDetails: `${prev.rollDetails}${prev.rollDetails ? ' + ' : ''}${cur.rollDetails}`,
|
||||||
containsCrit: prev.containsCrit || cur.containsCrit,
|
containsCrit: prev.containsCrit || cur.containsCrit,
|
||||||
containsFail: prev.containsFail || cur.containsFail,
|
containsFail: prev.containsFail || cur.containsFail,
|
||||||
initConfig: `${prev.initConfig}, ${cur.initConfig}`,
|
initConfig: `${prev.initConfig}${prev.initConfig ? ', ' : ''}${cur.initConfig}`,
|
||||||
isComplex: prev.isComplex || cur.isComplex,
|
isComplex: prev.isComplex || cur.isComplex,
|
||||||
}),
|
}),
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue