poi-plugin-koushu-rate 2.0.13 → 2.0.14

package/index.js

@@ -2837,6 +2837,7 @@ class StrongPage extends React.Component {
       if (n >= 10) return "max"
       return "+" + String(n)
     }
+    const demandMap = {}
     for (const row of rows || []) {
       const sel = (selection || {})[row.id] || { selected: true, target: "max", qty: 1 }
       const qty = Math.max(1, Math.min(99, Math.round(Number(sel.qty) || 1)))
@@ -2845,32 +2846,49 @@ class StrongPage extends React.Component {
       const displayRow = evoUpgrade
         ? Object.assign({}, row, { id: row.id + ":evo:" + evoUpgrade.upgrade_id, name: evoUpgrade.targetName, category: evoUpgrade.targetCategory || row.category })
         : row
-      const invId = evoUpgrade ? String(evoUpgrade.upgrade_id) : row.id
+      const targetEquipId = evoUpgrade ? String(evoUpgrade.upgrade_id) : row.id
       const targetLevelValue = evoUpgrade ? 0 : (sel.target === "max" ? 10 : 6)
-      const targetLevel = levelText(targetLevelValue)
-      const inv = (inventoryByEquip || {})[invId]
-      const levels = []
+      const bucket = demandMap[targetEquipId] || (demandMap[targetEquipId] = { equipId: targetEquipId, displayRow, demands: {} })
+      bucket.demands[String(targetLevelValue)] = (bucket.demands[String(targetLevelValue)] || 0) + qty
+    }
+    for (const bucket of Object.values(demandMap)) {
+      const inv = (inventoryByEquip || {})[bucket.equipId]
+      const inventoryLevels = []
       if (inv && inv.levels) {
         for (const level of Object.keys(inv.levels)) {
           const count = Math.max(0, Math.round(Number(inv.levels[level]) || 0))
-          if (count > 0) levels.push({ level: Number(level), count })
+          if (count > 0) inventoryLevels.push({ level: Number(level), count })
         }
-        levels.sort((a, b) => b.level - a.level)
+        inventoryLevels.sort((a, b) => b.level - a.level)
       }
-      const rowEntries = []
-      if (levels.length === 0) {
-        rowEntries.push({ key: displayRow.id + ":none", row: displayRow, targetLevel, targetLevelValue, inventoryLevel: null, stock: inventoryLoaded ? 0 : null, notFound: true })
-      } else {
-        for (const lv of levels) rowEntries.push({ key: displayRow.id + ":" + String(lv.level), row: displayRow, targetLevel, targetLevelValue, inventoryLevel: lv.level, stock: lv.count })
+      const remaining = {}
+      for (const lv of inventoryLevels) remaining[String(lv.level)] = lv.count
+      const targetLevels = Object.keys(bucket.demands).map(Number).sort((a, b) => b - a)
+      const allocation = {}
+      const shortfall = {}
+      for (const tl of targetLevels) {
+        let need = bucket.demands[String(tl)] || 0
+        for (const lv of inventoryLevels) {
+          if (need <= 0) break
+          const avail = remaining[String(lv.level)] || 0
+          if (avail <= 0) continue
+          const take = Math.min(need, avail)
+          const key = String(tl) + "|" + String(lv.level)
+          const alloc = allocation[key] || (allocation[key] = { targetLevelValue: tl, inventoryLevel: lv.level, qty: 0, stock: 0 })
+          alloc.qty += take
+          alloc.stock += take
+          remaining[String(lv.level)] = avail - take
+          need -= take
+        }
+        if (need > 0) shortfall[String(tl)] = need
       }
-      const base = Math.floor(qty / rowEntries.length)
-      let remainder = qty % rowEntries.length
-      for (const item of rowEntries) {
-        item.qty = base + (remainder > 0 ? 1 : 0)
-        if (remainder > 0) remainder -= 1
+      for (const key of Object.keys(allocation)) {
+        const alloc = allocation[key]
+        entries.push({ key: bucket.equipId + ":" + key, row: bucket.displayRow, targetLevel: levelText(alloc.targetLevelValue), targetLevelValue: alloc.targetLevelValue, qty: alloc.qty, inventoryLevel: alloc.inventoryLevel, stock: alloc.stock })
       }
-      for (const item of rowEntries) {
-        if (item.qty > 0) entries.push(item)
+      for (const tl of Object.keys(shortfall)) {
+        const value = Number(tl)
+        entries.push({ key: bucket.equipId + ":short:" + tl, row: bucket.displayRow, targetLevel: levelText(value), targetLevelValue: value, qty: shortfall[tl], inventoryLevel: null, stock: inventoryLoaded ? 0 : null, notFound: true })
       }
     }
     for (const item of entries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-koushu-rate",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "全装备改修资材计算与推荐",
   "main": "index.js",
   "files": [