poi-plugin-leveling-plan 0.0.4 → 0.0.5

package/assets/main.css

@@ -178,6 +178,71 @@
   position: relative;
 }
 
+#leveling-plan .map-selector-trigger {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  min-height: 32px;
+  padding: 2px 4px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  cursor: pointer;
+  background: #fff;
+}
+
+#leveling-plan .map-selector-trigger:hover {
+  border-color: #137cbd;
+}
+
+.bp5-dark #leveling-plan .map-selector-trigger {
+  background: #30404d;
+  border-color: #5f6b7c;
+}
+
+.bp5-dark #leveling-plan .map-selector-trigger:hover {
+  border-color: #137cbd;
+}
+
+#leveling-plan .map-selector-trigger-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  flex: 1;
+}
+
+#leveling-plan .map-selector-trigger-placeholder {
+  flex: 1;
+  padding: 0 4px;
+  color: #aaa;
+  font-size: 13px;
+}
+
+#leveling-plan .map-selector-popover-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 8px;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+.bp5-dark #leveling-plan .map-selector-popover-header {
+  border-bottom-color: #404854;
+}
+
+#leveling-plan .map-selector-popover-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: #333;
+}
+
+.bp5-dark #leveling-plan .map-selector-popover-title {
+  color: #ddd;
+}
+
+#leveling-plan .map-selector-popover-search {
+  padding: 4px 8px;
+}
+
 #leveling-plan .map-selector-dropdown {
   max-height: 200px;
   overflow-y: auto;
@@ -539,3 +604,10 @@
   object-fit: contain;
   vertical-align: middle;
 }
+
+/* 养殖计划行分隔线 */
+#leveling-plan .farming-divider {
+  height: 0;
+  border-top: 1px solid rgba(128, 128, 128, 0.2);
+  margin: 2px 0;
+}

package/i18n/en-US.json

@@ -52,5 +52,13 @@
   "Sample Count": "Sample Count",
   "Currently Used": "Currently Used",
   "Samples Insufficient": "Samples Insufficient",
-  "No personal data": "No personal data"
+  "No personal data": "No personal data",
+  "Farming": "Farming",
+  "Add Farming Plan": "Add Farming Plan",
+  "Edit Farming Plan": "Edit Farming Plan",
+  "Ship Type": "Ship Type",
+  "No farming plans yet": "No farming plans yet",
+  "Below target": "Below target",
+  "ships": "ships",
+  "All ships have reached the target level": "All ships have reached the target level"
 }

package/i18n/ja-JP.json

@@ -52,5 +52,13 @@
   "Sample Count": "サンプル数",
   "Currently Used": "現在使用中",
   "Samples Insufficient": "サンプル不足",
-  "No personal data": "個人データなし"
+  "No personal data": "個人データなし",
+  "Farming": "養殖",
+  "Add Farming Plan": "養殖計画を追加",
+  "Edit Farming Plan": "養殖計画を編集",
+  "Ship Type": "艦種",
+  "No farming plans yet": "養殖計画がありません",
+  "Below target": "未達成",
+  "ships": "隻",
+  "All ships have reached the target level": "全隻目標レベル達成"
 }

package/i18n/zh-CN.json

@@ -52,5 +52,13 @@
   "Sample Count": "样本数",
   "Currently Used": "当前使用",
   "Samples Insufficient": "样本不足",
-  "No personal data": "无个人数据"
+  "No personal data": "无个人数据",
+  "Farming": "养殖",
+  "Add Farming Plan": "添加养殖计划",
+  "Edit Farming Plan": "编辑养殖计划",
+  "Ship Type": "船型",
+  "No farming plans yet": "暂无养殖计划",
+  "Below target": "未达标",
+  "ships": "艘",
+  "All ships have reached the target level": "所有船只已达标"
 }

package/i18n/zh-TW.json

@@ -52,5 +52,13 @@
   "Sample Count": "樣本數",
   "Currently Used": "當前使用",
   "Samples Insufficient": "樣本不足",
-  "No personal data": "無個人數據"
+  "No personal data": "無個人數據",
+  "Farming": "養殖",
+  "Add Farming Plan": "新增養殖計劃",
+  "Edit Farming Plan": "編輯養殖計劃",
+  "Ship Type": "艦種",
+  "No farming plans yet": "暫無養殖計劃",
+  "Below target": "未達標",
+  "ships": "艘",
+  "All ships have reached the target level": "所有船隻已達標"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-leveling-plan",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Leveling plan plugin for poi",
   "main": "index.js",
   "keywords": [

package/utils/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.searchOptions = exports.catMap = exports.expClass = exports.bonusExpScaleNonFlagship = exports.bonusExpScaleFlagship = exports.expPercent = exports.expLevel = exports.shipCat = exports.frequentMaps = exports.EXP_BY_POI_DB = exports.MAX_LEVEL = exports.exp = void 0;
+exports.searchOptions = exports.catMap = exports.expClass = exports.bonusExpScaleNonFlagship = exports.bonusExpScaleFlagship = exports.expPercent = exports.expLevel = exports.shipCat = exports.frequentMaps = exports.WORLD_NAMES = exports.EXP_BY_POI_DB = exports.MAX_LEVEL = exports.exp = void 0;
 // 等级经验表（1-185级）
 // 数据来源：poi-plugin-exp-calc
 const exp = {
@@ -229,10 +229,21 @@ const EXP_BY_POI_DB = {
   64: 236,
   65: 242,
   71: 220,
-  72: 213 // 常用练级海图
+  72: 213 // 世界名称映射
 
 };
 exports.EXP_BY_POI_DB = EXP_BY_POI_DB;
+const WORLD_NAMES = {
+  1: '鎮守府海域',
+  2: '南西諸島海域',
+  3: '北方海域',
+  4: '西方海域',
+  5: '南方海域',
+  6: '中部海域',
+  7: '南西海域' // 常用练级海图
+
+};
+exports.WORLD_NAMES = WORLD_NAMES;
 const frequentMaps = [15, 21, 22, 42, 52, 53, 71]; // 舰种分类
 
 exports.frequentMaps = frequentMaps;

package/utils/plan-helpers.js

@@ -28,8 +28,9 @@ exports.generatePlanId = generatePlanId;
 
 const validatePlan = (plan, ship = null) => {
   const errors = [];
+  const isFarming = plan.type === 'farming';
 
-  if (!plan.shipId) {
+  if (!isFarming && !plan.shipId) {
     errors.push('shipId is required');
   }
 
@@ -41,7 +42,7 @@ const validatePlan = (plan, ship = null) => {
     errors.push('targetLevel must be between 1 and 185');
   }
 
-  if (ship && plan.targetLevel <= ship.api_lv) {
+  if (!isFarming && ship && plan.targetLevel <= ship.api_lv) {
     errors.push('targetLevel must be greater than current level');
   }
 
@@ -171,12 +172,7 @@ const shouldAutoComplete = (plan, ship) => {
 exports.shouldAutoComplete = shouldAutoComplete;
 
 const formatMapName = mapId => {
-  if (!mapId || typeof mapId !== 'string') return ''; // '53' -> '5-3'
-
-  if (mapId.length === 2) {
-    return `${mapId[0]}-${mapId[1]}`;
-  } // '11' -> '1-1'
-
+  if (!mapId || typeof mapId !== 'string') return '';
 
   if (mapId.length === 2) {
     return `${mapId[0]}-${mapId[1]}`;
@@ -197,21 +193,29 @@ const formatMapName = mapId => {
 
 exports.formatMapName = formatMapName;
 
-const createPlan = (shipId, shipMasterId, startLevel, targetLevel, maps, notes = '') => {
+const createPlan = (shipId, shipMasterId, startLevel, targetLevel, maps, notes = '', type = 'normal') => {
   const now = Date.now();
-  return {
+  const base = {
     id: generatePlanId(),
-    shipId,
     shipMasterId,
-    startLevel,
     targetLevel,
     maps,
     notes,
-    completed: false,
-    completedAt: null,
+    type,
     createdAt: now,
     updatedAt: now
   };
+
+  if (type === 'farming') {
+    return base;
+  }
+
+  return _extends({}, base, {
+    shipId,
+    startLevel,
+    completed: false,
+    completedAt: null
+  });
 };
 /**
  * 更新计划对象

package/utils/selectors.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.shipMenuDataSelector = exports.completedPlanDetailsSelector = exports.activePlanDetailsSelector = exports.allPlanDetailsSelector = exports.planByShipIdSelectorFactory = exports.completedPlansSelector = exports.activePlansSelector = exports.plansArraySelector = exports.planSettingsSelector = exports.plansSelector = exports.personalStatsSelector = exports.calcSortieCount = exports.calcExpToLevel = exports.shipsByTypeSelector = exports.shipsByIdSelector = exports.shipsWithDetailsSelector = exports.mapsWithExpSelector = exports.mapExpSelector = exports.expTableSelector = exports.remodelLevelSelector = exports.adjustedRemodelChainsSelector = exports.shipUniqueMapSelector = exports.uniqueShipIdsSelector = exports.materialsSelector = exports.resourcesSelector = exports.ourShipsSelector = exports.$mapsSelector = exports.$shipsSelector = void 0;
+exports.farmingPlanDetailsSelector = exports.farmingPlansSelector = exports.farmingShipLookupSelector = exports.masterShipMenuDataSelector = exports.shipMenuDataSelector = exports.completedPlanDetailsSelector = exports.activePlanDetailsSelector = exports.allPlanDetailsSelector = exports.planByShipIdSelectorFactory = exports.completedPlansSelector = exports.activePlansSelector = exports.normalPlansArraySelector = exports.plansArraySelector = exports.planSettingsSelector = exports.plansSelector = exports.personalStatsSelector = exports.calcSortieCount = exports.calcExpToLevel = exports.shipsByTypeSelector = exports.shipsByIdSelector = exports.shipsWithDetailsSelector = exports.mapsWithExpSelector = exports.mapExpSelector = exports.expTableSelector = exports.remodelLevelSelector = exports.adjustedRemodelChainsSelector = exports.shipUniqueMapSelector = exports.uniqueShipIdsSelector = exports.materialsSelector = exports.resourcesSelector = exports.ourShipsSelector = exports.$mapsSelector = exports.$shipsSelector = void 0;
 
 var _reselect = require("reselect");
 
@@ -219,13 +219,16 @@ const planSettingsSelector = (0, _reselect.createSelector)([state => state.confi
 })); // 所有计划（数组，按创建时间倒序）
 
 exports.planSettingsSelector = planSettingsSelector;
-const plansArraySelector = (0, _reselect.createSelector)([plansSelector], plans => (0, _lodash.default)(plans).values().orderBy(['createdAt'], ['desc']).value()); // 未完成的计划
+const plansArraySelector = (0, _reselect.createSelector)([plansSelector], plans => (0, _lodash.default)(plans).values().orderBy(['createdAt'], ['desc']).value()); // 所有正常计划（非养殖）
 
 exports.plansArraySelector = plansArraySelector;
-const activePlansSelector = (0, _reselect.createSelector)([plansArraySelector], plans => plans.filter(plan => !plan.completed)); // 已完成的计划
+const normalPlansArraySelector = (0, _reselect.createSelector)([plansArraySelector], plans => plans.filter(plan => plan.type !== 'farming')); // 未完成的计划
+
+exports.normalPlansArraySelector = normalPlansArraySelector;
+const activePlansSelector = (0, _reselect.createSelector)([normalPlansArraySelector], plans => plans.filter(plan => !plan.completed)); // 已完成的计划
 
 exports.activePlansSelector = activePlansSelector;
-const completedPlansSelector = (0, _reselect.createSelector)([plansArraySelector], plans => plans.filter(plan => plan.completed)); // // 根据计划ID获取计划详情（带计算数据）
+const completedPlansSelector = (0, _reselect.createSelector)([normalPlansArraySelector], plans => plans.filter(plan => plan.completed)); // // 根据计划ID获取计划详情（带计算数据）
 // export const planDetailSelectorFactory = planId => createSelector(
 //   [plansSelector, ourShipsSelector, $shipsSelector, personalStatsSelector, planSettingsSelector],
 //   (plans, ships, $ships, personalStats, settings) => {
@@ -248,7 +251,7 @@ const planByShipIdSelectorFactory = shipId => (0, _reselect.createSelector)([pla
 
 
 exports.planByShipIdSelectorFactory = planByShipIdSelectorFactory;
-const allPlanDetailsSelector = (0, _reselect.createSelector)([plansArraySelector, ourShipsSelector, $shipsSelector, personalStatsSelector, planSettingsSelector], (plans, ships, $ships, personalStats, settings) => {
+const allPlanDetailsSelector = (0, _reselect.createSelector)([normalPlansArraySelector, ourShipsSelector, $shipsSelector, personalStatsSelector, planSettingsSelector], (plans, ships, $ships, personalStats, settings) => {
   return plans.map(plan => {
     try {
       const ship = _lodash.default.find(ships, s => s.api_id === plan.shipId);
@@ -297,5 +300,101 @@ const shipMenuDataSelector = (0, _reselect.createSelector)([ourShipsSelector, $s
       api_stype: $ship.api_stype
     };
   }).filter(Boolean).value();
+}); // ============ 8. 养殖计划 Selectors ============
+// 船型选择器数据（用于养殖模式的舰船选择器）
+
+exports.shipMenuDataSelector = shipMenuDataSelector;
+const masterShipMenuDataSelector = (0, _reselect.createSelector)([uniqueShipIdsSelector, $shipsSelector], (uniqueIds, $ships) => {
+  return (0, _lodash.default)(uniqueIds).map(id => {
+    const $ship = $ships[id];
+    if (!$ship) return null;
+    const stype = Number($ship.api_stype);
+    if (!stype || stype > 22) return null;
+    return {
+      api_id: id,
+      api_name: $ship.api_name,
+      api_yomi: $ship.api_yomi || $ship.api_name,
+      api_stype: stype
+    };
+  }).filter(Boolean).sortBy(['api_name']).value();
+}); // 舰船 masterId 到改造链起点的映射缓存
+
+exports.masterShipMenuDataSelector = masterShipMenuDataSelector;
+const farmingShipLookupSelector = (0, _reselect.createSelector)([shipUniqueMapSelector], shipUniqueMap => shipUniqueMap); // 养殖计划（type === 'farming'）
+
+exports.farmingShipLookupSelector = farmingShipLookupSelector;
+const farmingPlansSelector = (0, _reselect.createSelector)([plansSelector], plans => (0, _lodash.default)(plans).filter(plan => plan.type === 'farming').values().orderBy(['createdAt'], ['desc']).value()); // 养殖计划详情
+
+exports.farmingPlansSelector = farmingPlansSelector;
+const farmingPlanDetailsSelector = (0, _reselect.createSelector)([farmingPlansSelector, ourShipsSelector, $shipsSelector, personalStatsSelector, planSettingsSelector, shipUniqueMapSelector], (plans, ourShips, $ships, personalStats, settings, shipUniqueMap) => {
+  const {
+    defaultRank = 0,
+    defaultIsFlagship = true,
+    defaultIsMVP = false
+  } = settings;
+  return plans.map(plan => {
+    try {
+      const targetLv = plan.targetLevel;
+      const shipUniqueId = plan.shipMasterId;
+      const $baseShip = $ships[shipUniqueId];
+      if (!$baseShip) return null; // 筛选该改造链下所有低于目标等级的实例
+
+      const instances = (0, _lodash.default)(ourShips).map(ship => {
+        var _ship$api_exp2;
+
+        const instanceUniqueId = shipUniqueMap[ship.api_ship_id];
+        if (instanceUniqueId !== shipUniqueId) return null;
+        if (ship.api_lv >= targetLv) return null;
+        const currentLv = ship.api_lv;
+        const currentExp = ((_ship$api_exp2 = ship.api_exp) === null || _ship$api_exp2 === void 0 ? void 0 : _ship$api_exp2[0]) || 0;
+        const targetTotalExp = _constants.exp[targetLv] || 0;
+        const startExp = 0;
+        const requiredExp = targetTotalExp - currentExp;
+        const progress = targetTotalExp > 0 ? Math.min(100.0, 100.0 * (currentExp / targetTotalExp)) : 0;
+        const mapDetails = (plan.maps || []).map(mapId => {
+          const mapExpData = (0, _expCalculator.getMapExp)(mapId, personalStats, 30);
+          const expPerSortie = (0, _expCalculator.calcBattleExp)(mapExpData.exp, defaultRank, defaultIsFlagship, defaultIsMVP);
+          const sortiesNeeded = (0, _expCalculator.calcSortiesNeeded)(requiredExp, mapExpData.exp, defaultRank, defaultIsFlagship, defaultIsMVP);
+          return {
+            mapId,
+            mapName: (0, _planHelpers.formatMapName)(mapId),
+            mapExp: mapExpData.exp,
+            mapExpSource: mapExpData.source,
+            mapExpCount: mapExpData.count,
+            expPerSortie,
+            sortiesNeeded
+          };
+        });
+        return {
+          shipId: ship.api_id,
+          currentLv,
+          currentExp,
+          requiredExp,
+          progress,
+          mapDetails
+        };
+      }).filter(Boolean).orderBy(['currentLv'], ['desc']).value();
+      const totalInstancesOwned = (0, _lodash.default)(ourShips).filter(s => shipUniqueMap[s.api_ship_id] === shipUniqueId).size();
+      const totalInstancesBelowTarget = instances.length;
+      return {
+        id: plan.id,
+        type: 'farming',
+        shipMasterId: shipUniqueId,
+        shipName: $baseShip.api_name,
+        $baseShip,
+        targetLv,
+        maps: plan.maps,
+        notes: plan.notes || '',
+        instances,
+        totalInstancesOwned,
+        totalInstancesBelowTarget,
+        createdAt: plan.createdAt,
+        updatedAt: plan.updatedAt
+      };
+    } catch (error) {
+      console.error('[LevelingPlan] Error calculating farming plan detail:', plan.id, error);
+      return null;
+    }
+  }).filter(Boolean);
 });
-exports.shipMenuDataSelector = shipMenuDataSelector;
+exports.farmingPlanDetailsSelector = farmingPlanDetailsSelector;

package/views/components/farming-plan-list.js

@@ -0,0 +1,50 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactRedux = require("react-redux");
+
+var _planItem = require("./plan-item");
+
+var _selectors = require("../../utils/selectors");
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+
+const {
+  __
+} = window.i18n['poi-plugin-leveling-plan'];
+
+class FarmingPlanList extends _react.Component {
+  render() {
+    const {
+      plans,
+      onEdit,
+      onDelete
+    } = this.props;
+    return _react.default.createElement("div", {
+      className: "plan-list"
+    }, _react.default.createElement("div", {
+      className: "plan-list-content"
+    }, plans.length === 0 ? _react.default.createElement("div", {
+      className: "empty-message"
+    }, __('No farming plans yet')) : plans.map(plan => _react.default.createElement(_planItem.FarmingPlanItem, {
+      key: plan.id,
+      planDetail: plan,
+      onEdit: () => onEdit(plan.id),
+      onDelete: () => onDelete(plan.id)
+    }))));
+  }
+
+}
+
+const mapStateToProps = state => ({
+  plans: (0, _selectors.farmingPlanDetailsSelector)(state)
+});
+
+var _default = (0, _reactRedux.connect)(mapStateToProps)(FarmingPlanList);
+
+exports.default = _default;
+module.exports = exports["default"];