poi-plugin-remodel-assistant 1.2.3-beta.3 → 1.2.3-beta.5

package/i18n/en-US.json

@@ -1502,6 +1502,5 @@
   "diagnostics.Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences": "Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences",
   "equipment.Upgrade chain terminal": "Upgrade endpoint",
   "equipment.Improvement route": "Improvement route",
-  "equipment.Improvement endpoint": "Improvement endpoint",
-  "equipment.Standalone improvement": "Standalone improvement"
+  "equipment.Improvement endpoint": "Improvement endpoint"
 }

package/i18n/ja-JP.json

@@ -1502,6 +1502,5 @@
   "diagnostics.Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences": "計画、ルート選択、装備割り当て、低優先装備、UI設定を含む標準プラグインバックアップ",
   "equipment.Upgrade chain terminal": "改修終点",
   "equipment.Improvement route": "改修ルート",
-  "equipment.Improvement endpoint": "改修終点",
-  "equipment.Standalone improvement": "単独改修"
+  "equipment.Improvement endpoint": "改修終点"
 }

package/i18n/zh-CN.json

@@ -1502,6 +1502,5 @@
   "diagnostics.Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences": "插件标准备份，包含计划、路线选择、装备分配、低优先装备和界面设置",
   "equipment.Upgrade chain terminal": "改修终点",
   "equipment.Improvement route": "改修路线",
-  "equipment.Improvement endpoint": "改修终点",
-  "equipment.Standalone improvement": "独立改修"
+  "equipment.Improvement endpoint": "改修终点"
 }

package/i18n/zh-TW.json

@@ -1502,6 +1502,5 @@
   "diagnostics.Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences": "外掛標準備份，包含計畫、路線選擇、裝備分配、低優先裝備與介面設定",
   "equipment.Upgrade chain terminal": "改修終點",
   "equipment.Improvement route": "改修路線",
-  "equipment.Improvement endpoint": "改修終點",
-  "equipment.Standalone improvement": "獨立改修"
+  "equipment.Improvement endpoint": "改修終點"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-remodel-assistant",
-  "version": "1.2.3-beta.3",
+  "version": "1.2.3-beta.5",
   "description": "View enhanced KanColle improvement data, manage improvement plans, and receive improvement recommendations.",
   "main": "index.js",
   "author": {

package/views/new-interface/equipment/components/equipment-detail.js

@@ -41,6 +41,8 @@ var _materialInventoryDomain = require("../../shared/domain/material-inventory-d
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 const {
   __: translate
 } = window.i18n[_pluginMeta.PLUGIN_ID];
@@ -49,6 +51,16 @@ const __ = (key, ...args) => translate(`equipment.${key}`, ...args);
 
 const localizedName = name => window.i18n.resources.__(name || '');
 
+const ownedLevelSummary = levels => {
+  const counts = (levels || []).reduce((result, level) => {
+    const key = Number(level) || 0;
+    return _extends({}, result, {
+      [key]: (result[key] || 0) + 1
+    });
+  }, {});
+  return Object.keys(counts).map(Number).sort((left, right) => left - right).map(level => `${(0, _planStorage.starText)(level)} ×${counts[level]}`);
+};
+
 const startSpecText = (row, masterEquips) => {
   const equipmentId = Number(row && row.startEquipmentId) || 0;
   const level = Number(row && row.startLevel);
@@ -120,6 +132,7 @@ class EquipmentPlanSection extends _react.default.Component {
     } = this.state;
     const rows = (0, _planManagementDomain.buildPlanOccurrenceDisplayRows)(item);
     const allowed = item.planPolicy ? item.planPolicy.allowedStars || [] : [];
+    const ownedSummary = ownedLevelSummary(item.levels);
     const canAdd = allowed.includes(Number(star)) && (0, _planStorage.isValidPlanAddCount)(Number(count));
     return _react.default.createElement(_detailPlugin.DetailPlugin, {
       pluginKey: "equipment-plans",
@@ -131,7 +144,7 @@ class EquipmentPlanSection extends _react.default.Component {
       className: "decision-equipment-plan-ownership"
     }, _react.default.createElement("span", {
       className: "decision-pill decision-owned-count-pill"
-    }, __('Owned count %d').replace('%d', Number(item.ownedCount) || 0))), rows.length > 0 ? _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("div", {
+    }, ownedSummary.length > 0 ? ownedSummary.join(' / ') : __('Owned count %d').replace('%d', 0))), rows.length > 0 ? _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("div", {
       className: "decision-equipment-plan-list-actions"
     }, _react.default.createElement(_reactBootstrap.Button, {
       bsSize: "xsmall",

package/views/new-interface/equipment/components/equipment-workspace.js

@@ -162,7 +162,7 @@ class EquipmentWorkspace extends _react.Component {
       className: "decision-filter-buttons decision-weekday-buttons"
     }, WEEKDAY_KEYS.map((key, day) => this.renderToggle(selectedDays.includes(day), __(key), () => this.handleDay(day), key)))), _react.default.createElement(_filterControls.FilterRow, {
       label: __('Improvement route')
-    }, _react.default.createElement(_filterControls.FilterButtonGroup, null, [[_equipmentWorkspaceModel.UPGRADE_STATUSES.ALL, __('All equipment')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.TERMINAL, __('Improvement endpoint')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.INDEPENDENT, __('Standalone improvement')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.EVOLVABLE, __('Evolvable')]].map(([value, label]) => this.renderToggle(upgradeStatus === value, label, () => this.setState({
+    }, _react.default.createElement(_filterControls.FilterButtonGroup, null, [[_equipmentWorkspaceModel.UPGRADE_STATUSES.ALL, __('All equipment')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.TERMINAL, __('Improvement endpoint')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.EVOLVABLE, __('Evolvable')]].map(([value, label]) => this.renderToggle(upgradeStatus === value, label, () => this.setState({
       upgradeStatus: value
     }), value)))), _react.default.createElement(_filterControls.FilterRow, {
       label: __('Sort by')

package/views/new-interface/equipment/model/equipment-workspace-model.js

@@ -30,8 +30,7 @@ exports.AVAILABILITY_MODES = AVAILABILITY_MODES;
 const UPGRADE_STATUSES = {
   ALL: 'all',
   TERMINAL: 'terminal',
-  EVOLVABLE: 'evolvable',
-  INDEPENDENT: 'independent'
+  EVOLVABLE: 'evolvable'
 };
 exports.UPGRADE_STATUSES = UPGRADE_STATUSES;
 const EQUIPMENT_SORT_MODES = {
@@ -74,13 +73,11 @@ const matchesPlanStatus = (item, status) => {
 };
 
 const matchesUpgradeStatus = (item, status) => {
-  if (status === UPGRADE_STATUSES.TERMINAL) return Boolean(item.terminalEvolutionTarget);
-  if (status === UPGRADE_STATUSES.EVOLVABLE) return item.hasEvolution;
-
-  if (status === UPGRADE_STATUSES.INDEPENDENT) {
-    return item.hasImprovement && !item.hasEvolution && !item.terminalEvolutionTarget;
+  if (status === UPGRADE_STATUSES.TERMINAL) {
+    return !item.hasEvolution && (item.hasImprovement || item.terminalEvolutionTarget);
   }
 
+  if (status === UPGRADE_STATUSES.EVOLVABLE) return item.hasEvolution;
   return true;
 };