poi-plugin-remodel-assistant 1.2.3-beta.2 → 1.2.3-beta.4

package/assets/main.css

@@ -5731,17 +5731,6 @@
   font-size: var(--improvement-font-caption);
 }
 
-@media (max-width: 820px) {
-  #item-improvement .decision-equipment-row.is-compact:not(.is-workbench) .decision-equipment-meta {
-    display: flex;
-  }
-
-  #item-improvement .decision-equipment-row.is-compact:not(.is-workbench)
-    .decision-equipment-meta .decision-pill:not(.decision-owned-count-pill) {
-    display: none;
-  }
-}
-
 /* React-Bootstrap mounts category dialogs outside #item-improvement. */
 .decision-category-filter-dialog .decision-category-filter-guide {
   display: grid;
@@ -11074,6 +11063,12 @@ body.decision-modal-is-dragging * {
   gap: 6px;
 }
 
+#item-improvement .decision-equipment-plan-ownership {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
 #item-improvement .decision-equipment-plan-row {
   display: grid;
   grid-template-columns: minmax(96px, auto) minmax(0, 1fr) auto;

package/i18n/en-US.json

@@ -1500,5 +1500,7 @@
   "diagnostics.The bundle contains inventory and plugin settings. Review it before sharing.": "The bundle contains inventory and plugin settings. Review it before sharing.",
   "diagnostics.The diagnostic bundle could not be exported": "The diagnostic bundle could not be exported.",
   "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 chain terminal"
+  "equipment.Upgrade chain terminal": "Upgrade endpoint",
+  "equipment.Improvement route": "Improvement route",
+  "equipment.Improvement endpoint": "Improvement endpoint"
 }

package/i18n/ja-JP.json

@@ -1500,5 +1500,7 @@
   "diagnostics.The bundle contains inventory and plugin settings. Review it before sharing.": "診断パッケージには所持データとプラグイン設定が含まれます。共有前に内容を確認してください。",
   "diagnostics.The diagnostic bundle could not be exported": "診断パッケージを書き出せませんでした。",
   "diagnostics.Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences": "計画、ルート選択、装備割り当て、低優先装備、UI設定を含む標準プラグインバックアップ",
-  "equipment.Upgrade chain terminal": "改修チェーン終端"
+  "equipment.Upgrade chain terminal": "改修終点",
+  "equipment.Improvement route": "改修ルート",
+  "equipment.Improvement endpoint": "改修終点"
 }

package/i18n/zh-CN.json

@@ -1500,5 +1500,7 @@
   "diagnostics.The bundle contains inventory and plugin settings. Review it before sharing.": "诊断包包含库存数据和插件设置，分享前请确认内容。",
   "diagnostics.The diagnostic bundle could not be exported": "无法导出诊断包。",
   "diagnostics.Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences": "插件标准备份，包含计划、路线选择、装备分配、低优先装备和界面设置",
-  "equipment.Upgrade chain terminal": "改修链末端"
+  "equipment.Upgrade chain terminal": "改修终点",
+  "equipment.Improvement route": "改修路线",
+  "equipment.Improvement endpoint": "改修终点"
 }

package/i18n/zh-TW.json

@@ -1500,5 +1500,7 @@
   "diagnostics.The bundle contains inventory and plugin settings. Review it before sharing.": "診斷包包含庫存資料與外掛設定，分享前請確認內容。",
   "diagnostics.The diagnostic bundle could not be exported": "無法匯出診斷包。",
   "diagnostics.Canonical plugin backup with plans, route choices, assignments, blacklist, and UI preferences": "外掛標準備份，包含計畫、路線選擇、裝備分配、低優先裝備與介面設定",
-  "equipment.Upgrade chain terminal": "改修鏈末端"
+  "equipment.Upgrade chain terminal": "改修終點",
+  "equipment.Improvement route": "改修路線",
+  "equipment.Improvement endpoint": "改修終點"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-remodel-assistant",
-  "version": "1.2.3-beta.2",
+  "version": "1.2.3-beta.4",
   "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

@@ -127,7 +127,11 @@ class EquipmentPlanSection extends _react.default.Component {
       title: __('Plans')
     }, _react.default.createElement("section", {
       className: "decision-workbench-detail-section decision-equipment-plan-section"
-    }, rows.length > 0 ? _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("div", {
+    }, _react.default.createElement("div", {
+      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", {
       className: "decision-equipment-plan-list-actions"
     }, _react.default.createElement(_reactBootstrap.Button, {
       bsSize: "xsmall",

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

@@ -185,7 +185,6 @@ class EquipmentList extends _react.Component {
       selectedId,
       onSelect,
       emptyText,
-      showOwnedCount,
       variant,
       masterEquips,
       equipLevels,
@@ -304,9 +303,7 @@ class EquipmentList extends _react.Component {
       }, _react.default.createElement("span", {
         className: "glyphicon glyphicon-ok",
         "aria-hidden": "true"
-      }), __('Route selected')), showOwnedCount && _react.default.createElement("span", {
-        className: "decision-pill decision-owned-count-pill"
-      }, __('Owned count %d').replace('%d', item.ownedCount))));
+      }), __('Route selected'))));
     }), (!items || items.length === 0) && _react.default.createElement("div", {
       className: "decision-empty-state"
     }, emptyText));
@@ -325,7 +322,6 @@ Object.defineProperty(EquipmentList, "propTypes", {
     locateKey: _propTypes.default.string,
     onSelect: _propTypes.default.func.isRequired,
     emptyText: _propTypes.default.string.isRequired,
-    showOwnedCount: _propTypes.default.bool,
     variant: _propTypes.default.oneOf(['default', 'compact', 'workbench']),
     masterEquips: _propTypes.default.object,
     equipLevels: _propTypes.default.object,
@@ -340,7 +336,6 @@ Object.defineProperty(EquipmentList, "defaultProps", {
   value: {
     selectedId: null,
     locateKey: '',
-    showOwnedCount: false,
     variant: 'default',
     masterEquips: {},
     equipLevels: {},

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

@@ -161,8 +161,8 @@ class EquipmentWorkspace extends _react.Component {
     }, _react.default.createElement("div", {
       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 capability')
-    }, _react.default.createElement(_filterControls.FilterButtonGroup, null, [[_equipmentWorkspaceModel.UPGRADE_STATUSES.ALL, __('All equipment')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.TERMINAL, __('Upgrade chain terminal')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.EVOLVABLE, __('Evolvable')], [_equipmentWorkspaceModel.UPGRADE_STATUSES.IMPROVABLE, __('Improvable')]].map(([value, label]) => this.renderToggle(upgradeStatus === value, label, () => this.setState({
+      label: __('Improvement route')
+    }, _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')
@@ -216,7 +216,6 @@ class EquipmentWorkspace extends _react.Component {
       locateKey: locateKey,
       onSelect: onSelect,
       emptyText: __('No matching equipment'),
-      showOwnedCount: true,
       variant: "compact",
       masterEquips: masterEquips,
       masterUseitems: masterUseitems

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',
-  IMPROVABLE: 'improvable'
+  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.IMPROVABLE) {
-    return item.hasImprovement && !item.hasEvolution;
+  if (status === UPGRADE_STATUSES.TERMINAL) {
+    return !item.hasEvolution && (item.hasImprovement || item.terminalEvolutionTarget);
   }
 
+  if (status === UPGRADE_STATUSES.EVOLVABLE) return item.hasEvolution;
   return true;
 };