@blizzhackers/d2data 2.7.4 → 2.7.6

package/compile.js

@@ -461,6 +461,8 @@ const moncountest = require('./json/moncountest.json');
 let monpopulation = {};
 
 [0, 1, 2].forEach((diff) => {
+  let uniqueCount = 3.5 + diff;
+  let champCount = 3;
   let s = _s(diff);
   full.levels.forEach((level) => {
     let l = (key) => level[key] || 0;
@@ -478,20 +480,38 @@ let monpopulation = {};
         bosses = full.monstats.filter((mon) => mon.areaId == level.Id),
         acount = (moncountest[level.Id] && moncountest[level.Id][diff]) || 0,
         scount = supers.reduce((total, sup) => {
+          let mon = full.monstats[sup.Class];
+
           return (
             total +
             1 +
             diff +
-            ((sup["MinGrp"] || 0) + (sup["MaxGrp"] || 0)) / 2
+            avg(
+              (sup["MinGrp"] || 0),
+              (sup["MaxGrp"] || 0)
+            ) +
+            avg(
+              (mon["PartyMin"] || 0),
+              (mon["PartyMax"] || 0)
+            )
           );
         }, 0),
         bcount = bosses.reduce((total, mon) => {
           return (
-            total + 1 + +((mon["MinGrp"] || 0) + (mon["MaxGrp"] || 0)) / 2
+            total +
+            1 +
+            avg(
+              (mon["MinGrp"] || 0),
+              (mon["MaxGrp"] || 0)
+            ) +
+            avg(
+              (mon["PartyMin"] || 0),
+              (mon["PartyMax"] || 0)
+            )
           );
         }, 0),
-        ucount = avg(l(s("MonUMin")), l(s("MonUMax"))) * 0.8 * 5.5,
-        ccount = avg(l(s("MonUMin")), l(s("MonUMax"))) * 0.2 * 3,
+        ucount = avg(l(s("MonUMin")), l(s("MonUMax"))) * 0.2 * uniqueCount,
+        ccount = avg(l(s("MonUMin")), l(s("MonUMax"))) * 0.8 * champCount,
         count = acount - ucount - ccount - scount - bcount;
 
       if (count > 0) {
@@ -517,8 +537,8 @@ let monpopulation = {};
         forEachMonster(level, diff, (mon, mlvl, type) => {
           let mult = [
             count / totalpackssize,
-            ccount / 3 / udiv,
-            ucount / 5.5 / udiv,
+            ccount / champCount / udiv,
+            ucount / uniqueCount / udiv,
           ][type];
           monpopulation[level.Id][['normal', 'champion', 'unique'][type]][mon.Id] = monpopulation[level.Id][['normal', 'champion', 'unique'][type]][mon.Id] || {
             "mlvl": 0,
@@ -544,9 +564,12 @@ let monpopulation = {};
           "packCount(N)": 0,
           "mlvl(H)": 0,
           "packCount(H)": 0,
+          "hasStaticLevel": false,
         };
+
         monpopulation[level.Id]['superunique'][sup.Superunique][s('mlvl')] = mlvl;
         monpopulation[level.Id]['superunique'][sup.Superunique][s('packCount')] = sup.hcIdx === 19 ? 1 / 7 : 1;
+        monpopulation[level.Id]['superunique'][sup.Superunique].hasStaticLevel = Boolean(mon.boss);
       });
 
       bosses.forEach((mon) => {
@@ -559,9 +582,11 @@ let monpopulation = {};
           "packCount(N)": 0,
           "mlvl(H)": 0,
           "packCount(H)": 0,
+          "hasStaticLevel": false,
         };
         monpopulation[level.Id]['boss'][mon.Id][s('mlvl')] = mlvl;
         monpopulation[level.Id]['boss'][mon.Id][s('packCount')] = 1;
+        monpopulation[level.Id]['boss'][mon.Id].hasStaticLevel = Boolean(mon.boss);
       });
     }
   });