poi-plugin-item-improvement2-beta 1.0.13 → 1.0.15

package/.idea/workspace.xml

@@ -12,10 +12,10 @@
       <change beforePath="$PROJECT_DIR$/views/selectors.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/selectors.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/starcraft/add-new-equip-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/add-new-equip-view.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/starcraft/control-panel.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/control-panel.es" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/starcraft/equip-list-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/equip-list-view.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/starcraft/equip-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/equip-view.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/starcraft/plan-modify-control.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/plan-modify-control.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/starcraft/plan-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/plan-view.es" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/starcraft/starcraft-area.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/starcraft-area.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/starcraft/utils.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/utils.es" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -47,23 +47,23 @@
   </component>
   <component name="NextEditCompletionFeaturesState">
     <decayedCancelled>
-      <entry key="MS100" value="1.8681549021543185" />
-      <entry key="MS500" value="4.67327539576689" />
-      <entry key="S2" value="6.573476345458957" />
-      <entry key="S5" value="7.313698051027662" />
-      <entry key="S10" value="7.632203805887455" />
-      <entry key="S30" value="8.254377390407504" />
-      <entry key="S60" value="10.704125077446246" />
-      <entry key="M2" value="17.18338467536373" />
-      <entry key="M5" value="33.64715599067184" />
-      <entry key="M10" value="52.18266977896091" />
-      <entry key="M15" value="64.24042381398891" />
-      <entry key="M30" value="88.9340657474914" />
-      <entry key="H1" value="123.33965082393485" />
-      <entry key="H2" value="160.54886118252298" />
-      <entry key="H4" value="189.9138316426726" />
-      <entry key="D1" value="223.12844826830144" />
-      <entry key="W1" value="229.84707341938156" />
+      <entry key="MS100" value="1.0" />
+      <entry key="MS500" value="1.0" />
+      <entry key="S2" value="1.0" />
+      <entry key="S5" value="1.0000000000440097" />
+      <entry key="S10" value="1.0000173658607443" />
+      <entry key="S30" value="1.1033700977851304" />
+      <entry key="S60" value="2.1353106976081797" />
+      <entry key="M2" value="6.945343005474441" />
+      <entry key="M5" value="32.57230674546156" />
+      <entry key="M10" value="74.73068787690221" />
+      <entry key="M15" value="106.46012906724152" />
+      <entry key="M30" value="165.36281189270642" />
+      <entry key="H1" value="226.92983606225295" />
+      <entry key="H2" value="284.53161724600875" />
+      <entry key="H4" value="328.2622516051157" />
+      <entry key="D1" value="377.35557695453997" />
+      <entry key="W1" value="387.29368684770884" />
     </decayedCancelled>
     <decayedSelected>
       <entry key="MS100" value="0.0" />
@@ -85,23 +85,23 @@
       <entry key="W1" value="0.0" />
     </decayedSelected>
     <decayedShown>
-      <entry key="MS100" value="1.815312767876859" />
-      <entry key="MS500" value="4.637799059056553" />
-      <entry key="S2" value="6.559458037889098" />
-      <entry key="S5" value="7.307318628880236" />
-      <entry key="S10" value="7.628852514034934" />
-      <entry key="S30" value="8.253176356463245" />
-      <entry key="S60" value="10.703396456007608" />
-      <entry key="M2" value="17.182862804398493" />
-      <entry key="M5" value="33.646789993127925" />
-      <entry key="M10" value="52.18239850357087" />
-      <entry key="M15" value="64.24020405438921" />
-      <entry key="M30" value="88.93391161293052" />
-      <entry key="H1" value="123.3395385628528" />
-      <entry key="H2" value="160.54878493995935" />
-      <entry key="H4" value="189.91378542487473" />
-      <entry key="D1" value="223.12843902414056" />
-      <entry key="W1" value="229.8470720540621" />
+      <entry key="MS100" value="0.9726549474122855" />
+      <entry key="MS500" value="0.9944701686732144" />
+      <entry key="S2" value="0.9986146661010289" />
+      <entry key="S5" value="0.9994456360160858" />
+      <entry key="S10" value="0.9997401398750585" />
+      <entry key="S30" value="1.1032659330938805" />
+      <entry key="S60" value="2.135198862399266" />
+      <entry key="M2" value="6.9451608804972915" />
+      <entry key="M5" value="32.57198364510173" />
+      <entry key="M10" value="74.73031181800991" />
+      <entry key="M15" value="106.45976857925676" />
+      <entry key="M30" value="165.36252748377441" />
+      <entry key="H1" value="226.92963569108224" />
+      <entry key="H2" value="284.5314880671632" />
+      <entry key="H4" value="328.26217562979866" />
+      <entry key="D1" value="377.3555621195751" />
+      <entry key="W1" value="387.2936846650219" />
     </decayedShown>
   </component>
   <component name="ProjectColorInfo">{
@@ -213,7 +213,7 @@
       <workItem from="1782110779541" duration="10000" />
       <workItem from="1782110798129" duration="16000" />
       <workItem from="1782110944618" duration="30000" />
-      <workItem from="1782223012580" duration="9770000" />
+      <workItem from="1782223012580" duration="11298000" />
     </task>
     <servers />
   </component>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-item-improvement2-beta",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "use new data source",
   "main": "index.es",
   "scripts": {

package/views/detail-row.js

@@ -25,7 +25,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const {
   __
-} = window.i18n['poi-plugin-item-improvement2-beta-beta'];
+} = window.i18n['poi-plugin-item-improvement2-beta'];
 const WEEKDAY = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 
 const isAvailableOnDay = (improvement, day) => day === -1 || (improvement.shipWeekList || []).some(shipWeek => (shipWeek.week || [])[day]);

package/views/selectors.js

@@ -109,7 +109,9 @@ const shipUniqueMapSelector = (0, _reselect.createSelector)([uniqueShipIdsSelect
 exports.shipUniqueMapSelector = shipUniqueMapSelector;
 const adjustedRemodelChainsSelector = (0, _reselect.createSelector)([remodelChainsSelector, shipUniqueMapSelector], (remodelChains, uniqueMap) => (0, _lodash.default)(uniqueMap).mapValues(uniqueId => remodelChains[uniqueId]).value());
 exports.adjustedRemodelChainsSelector = adjustedRemodelChainsSelector;
-const starCraftPlanSelector = (0, _reselect.createSelector)([_selectors.configSelector], config => _lodash.default.get(config, 'plugin.poi-plugin-starcraft.plans', {}));
+const starCraftPlanSelector = (0, _reselect.createSelector)([_selectors.configSelector], config => (0, _utils.normalizePlans)(_lodash.default.get(config, 'plugin.poi-plugin-starcraft.plans', {}), {
+  emptyAsDefault: true
+}));
 exports.starCraftPlanSelector = starCraftPlanSelector;
 const equipAvailableSelector = (0, _reselect.createSelector)([_selectors.equipsSelector], equips => (0, _lodash.default)(equips).filter({
   'api_level': 0

package/views/starcraft/equip-list-view.js

@@ -9,6 +9,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _reactBootstrap = require("react-bootstrap");
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _equipView = require("./equip-view");
 
 var _addNewEquipView = require("./add-new-equip-view");
@@ -21,7 +23,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 class EquipListView extends _react.Component {
   shouldComponentUpdate(nextProps) {
-    return this.props.viewMode !== nextProps.viewMode || !_.isEqual(this.props.equips, nextProps.equips) || !_.isEqual(this.props.plans, nextProps.plans);
+    return this.props.viewMode !== nextProps.viewMode || !_lodash.default.isEqual(this.props.equips, nextProps.equips) || !_lodash.default.isEqual(this.props.plans, nextProps.plans);
   }
 
   render() {

package/views/starcraft/equip-view.js

@@ -47,12 +47,7 @@ const EquipView = (0, _reactRedux.connect)((state, {
       enumerable: true,
       writable: true,
       value: mstId => () => {
-        (0, _utils.modifyPlans)(plans => {
-          const newPlans = _extends({}, plans);
-
-          delete newPlans[mstId];
-          return newPlans;
-        });
+        (0, _utils.removeEquipPlans)(mstId);
       }
     }), _temp;
   }

package/views/starcraft/plan-modify-control.js

@@ -13,16 +13,14 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _reactBootstrap = require("react-bootstrap");
 
-var _utils = require("./utils");
-
 var _reactNumericInput = _interopRequireDefault(require("react-numeric-input"));
 
+var _utils = require("./utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; } }
 
-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 {
   __
 } = window.i18n['poi-plugin-item-improvement2-beta']; // props:
@@ -88,26 +86,12 @@ class PlanModifyControl extends _react.Component {
         const mstId = this.props.mstId;
 
         if (action === 'add' || action === 'modify') {
-          (0, _utils.modifyPlans)(plans => {
-            const newPlans = _extends({}, plans); // it's safe to assume that plans[mstId] must exist at this point
-
-
-            newPlans[mstId] = _extends({}, plans[mstId]);
-            newPlans[mstId][star] = isInfinity ? _utils.infinityNum : planCount;
-            return newPlans;
-          });
+          (0, _utils.setEquipPlan)(mstId, star, isInfinity ? _utils.infinityNum : planCount);
           return;
         }
 
         if (action === 'remove') {
-          (0, _utils.modifyPlans)(plans => {
-            const newPlans = _extends({}, plans); // it's safe to assume that plans[mstId] must exist at this point
-
-
-            newPlans[mstId] = _extends({}, plans[mstId]);
-            delete newPlans[mstId][star];
-            return newPlans;
-          });
+          (0, _utils.removeEquipPlan)(mstId, star);
           return;
         }
 

package/views/starcraft/plan-view.js

@@ -15,8 +15,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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; } }
 
-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 {
   __
 } = window.i18n['poi-plugin-item-improvement2-beta'];
@@ -34,18 +32,7 @@ class PlanView extends _react.Component {
           mstId,
           star
         } = this.props;
-        (0, _utils.modifyPlans)(plans => {
-          const newPlans = _extends({}, plans);
-
-          newPlans[mstId] = _extends({}, plans[mstId]);
-          delete newPlans[mstId][star];
-
-          if (Object.keys(newPlans[mstId]).length === 0) {
-            delete newPlans[mstId];
-          }
-
-          return newPlans;
-        });
+        (0, _utils.removeEquipPlan)(mstId, star);
       }
     }), _temp;
   }

package/views/starcraft/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.isEquipMasterEqual = exports.starText = exports.initFirstPlan = exports.modifyPlans = exports.keyPlans = exports.PLUGIN_KEY = exports.addNewEquipPlan = exports.getStarcraftPlans = exports.infinityNum = void 0;
+exports.isEquipMasterEqual = exports.starText = exports.initFirstPlan = exports.modifyPlans = exports.keyPlans = exports.PLUGIN_KEY = exports.addNewEquipPlan = exports.removeEquipPlans = exports.removeEquipPlan = exports.setEquipPlan = exports.getStarcraftPlans = exports.normalizePlans = exports.infinityNum = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
@@ -22,44 +22,183 @@ const {
 const infinityNum = 10000;
 exports.infinityNum = infinityNum;
 
-const getStarcraftPlans = () => config.get(keyPlans, {});
+const normalizeNumberKey = value => {
+  if (typeof value === 'number') {
+    return Number.isInteger(value) ? value : null;
+  }
+
+  if (typeof value !== 'string' || !/^\d+$/.test(value)) {
+    return null;
+  }
+
+  return parseInt(value, 10);
+};
+
+const normalizePlanId = id => {
+  const parsed = normalizeNumberKey(id);
+  return parsed > 0 ? `${parsed}` : null;
+};
+
+const normalizePlanStar = star => {
+  const parsed = normalizeNumberKey(star);
+  return parsed !== null && parsed >= 0 && parsed <= 10 ? `${parsed}` : null;
+};
+
+const normalizePlanCount = count => {
+  return Number.isInteger(count) && count > 0 ? count : null;
+};
+
+const normalizeSinglePlan = (plan, {
+  emptyAsDefault = false
+} = {}) => {
+  if (!_lodash.default.isPlainObject(plan)) {
+    return null;
+  }
+
+  const normalized = {};
+  const stars = Object.keys(plan);
+
+  if (stars.length === 0 && emptyAsDefault) {
+    normalized[0] = infinityNum;
+    return normalized;
+  }
+
+  stars.forEach(star => {
+    const starKey = normalizePlanStar(star);
+    const count = normalizePlanCount(plan[star]);
+
+    if (starKey && count) {
+      normalized[starKey] = count;
+    }
+  });
+  return normalized;
+};
+
+const normalizePlans = (plans, options = {}) => {
+  const normalized = {};
+
+  if (!_lodash.default.isPlainObject(plans)) {
+    return normalized;
+  }
+
+  Object.keys(plans || {}).forEach(id => {
+    const idKey = normalizePlanId(id);
+
+    if (!idKey) {
+      return;
+    }
+
+    const plan = normalizeSinglePlan(plans[id], options);
+
+    if (plan && Object.keys(plan).length > 0) {
+      normalized[idKey] = plan;
+    }
+  });
+  return normalized;
+};
+
+exports.normalizePlans = normalizePlans;
+
+const getStarcraftPlans = () => normalizePlans(config.get(keyPlans, {}), {
+  emptyAsDefault: true
+});
 
 exports.getStarcraftPlans = getStarcraftPlans;
 
 const modifyPlans = modify => {
-  const oldPlans = config.get(keyPlans, {});
-  config.set(keyPlans, modify(oldPlans));
-}; // 新增单个装备计划
-
+  const oldPlans = getStarcraftPlans();
+  const newPlans = normalizePlans(modify(oldPlans));
+  config.set(keyPlans, newPlans);
+};
 
 exports.modifyPlans = modifyPlans;
 
-const addNewEquipPlan = id => {
-  if (!id) {
-    console.error('Invalid equipment id:', id);
+const setEquipPlan = (id, star, count) => {
+  const planId = normalizePlanId(id);
+  const planStar = normalizePlanStar(star);
+  const planCount = normalizePlanCount(count);
+
+  if (!planId || !planStar || !planCount) {
+    console.error('Invalid equipment plan:', id, star, count);
     return;
   }
 
   modifyPlans(plans => {
-    const newPlans = _extends({}, plans); // 如果这个装备没有 plan，就先创建空对象
+    const newPlans = _extends({}, plans);
+
+    newPlans[planId] = _extends({}, plans[planId] || {});
+    newPlans[planId][planStar] = planCount;
+    return newPlans;
+  });
+};
+
+exports.setEquipPlan = setEquipPlan;
+
+const removeEquipPlan = (id, star) => {
+  const planId = normalizePlanId(id);
+  const planStar = normalizePlanStar(star);
+
+  if (!planId || !planStar) {
+    console.error('Invalid equipment plan:', id, star);
+    return;
+  }
+
+  modifyPlans(plans => {
+    if (!plans[planId]) {
+      return plans;
+    }
+
+    const newPlans = _extends({}, plans);
+
+    newPlans[planId] = _extends({}, plans[planId]);
+    delete newPlans[planId][planStar];
+    return newPlans;
+  });
+};
 
+exports.removeEquipPlan = removeEquipPlan;
 
-    if (!newPlans[id]) {
-      newPlans[id] = {};
-    } // 初始化第一条 plan
+const removeEquipPlans = id => {
+  const planId = normalizePlanId(id);
 
+  if (!planId) {
+    console.error('Invalid equipment id:', id);
+    return;
+  }
 
-    initFirstPlan(newPlans, id);
+  modifyPlans(plans => {
+    const newPlans = _extends({}, plans);
+
+    delete newPlans[planId];
     return newPlans;
   });
+}; // 新增单个装备计划
+
+
+exports.removeEquipPlans = removeEquipPlans;
+
+const addNewEquipPlan = id => {
+  setEquipPlan(id, 0, infinityNum);
 }; // 通用的初始化 plan 第一条记录
 
 
 exports.addNewEquipPlan = addNewEquipPlan;
 
 const initFirstPlan = (plans, id) => {
-  if (Object.keys(plans[id]).length === 0) {
-    plans[id][0] = infinityNum;
+  const planId = normalizePlanId(id);
+
+  if (!planId) {
+    return plans;
+  }
+
+  plans[planId] = normalizeSinglePlan(plans[planId]);
+
+  if (!plans[planId]) {
+    plans[planId] = {};
+  }
+
+  if (Object.keys(plans[planId]).length === 0) {
+    plans[planId][0] = infinityNum;
   }
 
   return plans;