diff --git a/module/rdd-alchimie.js b/module/rdd-alchimie.js index 6ceff48f..4fac68ac 100644 --- a/module/rdd-alchimie.js +++ b/module/rdd-alchimie.js @@ -44,20 +44,13 @@ export class RdDAlchimie { } /* -------------------------------------------- */ - static getDifficulte( aspects ) { - let aspectsArray = aspects.split('-'); - let diff = 0; - let nbDifferent = 0; - let aspectsHash = {} - for (let colconst of aspectsArray) { - if ( aspectsHash[colconst] ){ // Deja present, augmente difficultĂ© de 1 - diff -= 1; - } else { - nbDifferent++; - aspectsHash[colconst] = colconst; // Keep track - } + static getDifficulte(aspects) { + let elements = aspects.split('-'); + let composantes = elements.length; + let distincts = Object.keys(Misc.classifyFirst(elements, it => it)).length; + if (distincts == 1) { + composantes--; } - diff = diff - ((nbDifferent>1) ? nbDifferent : 0); // Ca doit marcher .... - return Math.min(0, diff); // Pour ĂȘtre sur + return Math.min(0, -composantes); } }