poi-plugin-milk 1.0.5 → 1.0.6

package/.idea/workspace.xml

@@ -41,7 +41,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="factor.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="factor.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/parts/factor.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="0">
@@ -64,8 +64,8 @@
       <file leaf-file-name="zh-CN.json" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="41">
-              <caret line="1" column="28" lean-forward="false" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
+            <state relative-caret-position="943">
+              <caret line="23" column="1" lean-forward="true" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" />
               <folding />
             </state>
           </provider>
@@ -84,7 +84,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="package.json" pinned="false" current-in-tab="true">
+      <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/package.json">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="82">
@@ -124,10 +124,10 @@
       <find>HP</find>
       <find>inRepair</find>
       <find>timeElapsed</find>
-      <find>49</find>
-      <find>49a</find>
-      <find>poi-util-transpile</find>
       <find>repairId</find>
+      <find>poi-util-transpile</find>
+      <find>49a</find>
+      <find>49</find>
     </findStrings>
   </component>
   <component name="IdeDocumentHistory">
@@ -137,8 +137,8 @@
         <option value="$PROJECT_DIR$/parts/fleet-list.js" />
         <option value="$PROJECT_DIR$/parts/ship-row.js" />
         <option value="$PROJECT_DIR$/index.js" />
-        <option value="$PROJECT_DIR$/i18n/zh-CN.json" />
         <option value="$PROJECT_DIR$/package.json" />
+        <option value="$PROJECT_DIR$/i18n/zh-CN.json" />
       </list>
     </option>
   </component>
@@ -262,12 +262,12 @@
       <option name="presentableId" value="Default" />
       <updated>1764751942683</updated>
       <workItem from="1764751943836" duration="336000" />
-      <workItem from="1764814660477" duration="9279000" />
+      <workItem from="1764814660477" duration="9930000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9615000" />
+    <option name="totallyTimeSpent" value="10266000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="140" y="22" width="3700" height="2138" extended-state="0" />
@@ -362,26 +362,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/parts/factor.js">
+    <entry file="file://$PROJECT_DIR$/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="4264">
+          <caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/parts/functions.js">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="973">
-          <caret line="58" column="56" lean-forward="false" selection-start-line="58" selection-start-column="56" selection-end-line="58" selection-end-column="56" />
+        <state relative-caret-position="82">
+          <caret line="2" column="19" lean-forward="false" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
+    <entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5995">
-          <caret line="124" column="51" lean-forward="false" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
+        <state relative-caret-position="943">
+          <caret line="23" column="1" lean-forward="true" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" />
           <folding />
         </state>
       </provider>
@@ -394,26 +394,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/index.js">
+    <entry file="file://$PROJECT_DIR$/parts/functions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4264">
-          <caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
+        <state relative-caret-position="973">
+          <caret line="58" column="56" lean-forward="false" selection-start-line="58" selection-start-column="56" selection-end-line="58" selection-end-column="56" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
+    <entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="41">
-          <caret line="1" column="28" lean-forward="false" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
+        <state relative-caret-position="-5995">
+          <caret line="124" column="51" lean-forward="false" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
+    <entry file="file://$PROJECT_DIR$/parts/factor.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="82">
-          <caret line="2" column="19" lean-forward="false" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>

package/i18n/zh-CN.json

@@ -1,5 +1,5 @@
 {
-  "Anchorage repair": "修理和喂奶",
+  "Anchorage repair": "修理&喂奶",
   "Akashi not flagship": "明石不是旗舰/野崎不是旗舰二舰",
   "Not ready": "未就绪",
   "Capacity: %s": "可修理数量: %s",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-milk",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Anchorage repair plugin for poi",
   "main": "index.es",
   "repository": {

package/C/357/200/272UsersAdministratorAppDataRoamingpoipluginsnode_modulespoi-plugin-anchorage-repair

@@ -1,226 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.switchPluginPath = exports.reactClass = undefined;
-
-var _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; };
-
-// Import selectors defined in poi
-
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _reactRedux = require('react-redux');
-
-var _reselect = require('reselect');
-
-var _lodash = require('lodash');
-
-var _lodash2 = _interopRequireDefault(_lodash);
-
-var _path = require('path');
-
-var _reactBootstrap = require('react-bootstrap');
-
-var _selectors = require('views/utils/selectors');
-
-var _functions = require('./parts/functions');
-
-var _fleetList = require('./parts/fleet-list');
-
-var _fleetList2 = _interopRequireDefault(_fleetList);
-
-var _candidates = require('./parts/candidates');
-
-var _candidates2 = _interopRequireDefault(_candidates);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const { i18n, getStore } = window;
-const __ = i18n['poi-plugin-anchorage-repair'].__.bind(i18n['poi-plugin-anchorage-repair']);
-
-const AKASHI_ID = [182, 187]; // akashi and kai ID in $ships
-const SRF_ID = 86; // Ship Repair Facility ID in $slotitems
-
-
-// check a fleet status, returns information related to anchorage repair
-const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
-  const pickKey = ['api_id', 'api_ship_id', 'api_lv', 'api_nowhp', 'api_maxhp', 'api_ndock_time'];
-
-  let canRepair = false;
-  let akashiFlagship = false;
-  let repairCount = 0;
-  const inExpedition = _lodash2.default.get(fleet, 'api_mission.0') && true;
-  const flagShipInRepair = _lodash2.default.includes(repairId, _lodash2.default.get(fleet, 'api_ship.0', -1));
-  const flagship = ships[_lodash2.default.get(fleet, 'api_ship.0', -1)];
-
-  if (flagship != null) {
-    akashiFlagship = _lodash2.default.includes(AKASHI_ID, flagship.api_ship_id);
-    repairCount = _lodash2.default.filter(flagship.api_slot, item => _lodash2.default.get(equips, `${item}.api_slotitem_id`, -1) === SRF_ID).length;
-    repairCount += akashiFlagship ? 2 : 0;
-  }
-
-  canRepair = akashiFlagship && !inExpedition && !flagShipInRepair;
-
-  const repairDetail = _lodash2.default.map(_lodash2.default.filter(fleet.api_ship, shipId => shipId > 0), (shipId, index) => {
-    if (shipId === -1) return false; // break, LODASH ONLY
-
-    const ship = _lodash2.default.pick(ships[shipId], pickKey);
-
-    const constShip = _lodash2.default.pick($ships[ship.api_ship_id], ['api_name', 'api_stype']);
-
-    return _extends({}, ship, constShip, {
-      estimate: (0, _functions.akashiEstimate)(ship),
-      timePerHP: (0, _functions.getTimePerHP)(ship.api_lv, constShip.api_stype),
-      inRepair: _lodash2.default.includes(repairId, ship.api_id),
-      availableSRF: index < repairCount
-    });
-  });
-
-  var repairStatus = 0
-  if(canRepair){
-    repairStatus = 1;
-  }else{
-    var flagshipid = _lodash2.default.get(fleet, 'api_ship.0', -1)
-    var secondshipid = _lodash2.default.get(fleet, 'api_ship.0', -1)
-    if(flagshipid==996||flagshipid==1002||secondshipid==996||secondshipid==1002){
-      repairStatus = 2;
-    }
-  }
-
-  return {
-    api_id: fleet.api_id || -1,
-    shipId: fleet.api_ship || [],
-    canRepair,
-    akashiFlagship,
-    inExpedition,
-    flagShipInRepair,
-    repairCount,
-    repairDetail
-  };
-};
-
-// selectors
-
-const repairIdSelector = (0, _reselect.createSelector)([_selectors.repairsSelector], repair => _lodash2.default.map(repair, dock => dock.api_ship_id));
-
-const constShipsSelector = state => state.const.$ships || {};
-
-const fleetsAkashiSelector = (0, _reselect.createSelector)([constShipsSelector, _selectors.fleetsSelector, _selectors.shipsSelector, _selectors.equipsSelector, repairIdSelector], ($ships, fleets, ships, equips, repairId) => ({ fleets: _lodash2.default.map(fleets, fleet => fleetAkashiConv(fleet, $ships, ships, equips, repairId)) })
-
-// React
-
-);const reactClass = exports.reactClass = (0, _reactRedux.connect)((0, _selectors.createDeepCompareArraySelector)([fleetsAkashiSelector, _selectors.miscSelector], (data, { canNotify }) => _extends({}, data, {
-  canNotify
-})))(class PluginAnchorageRepair extends _react.Component {
-
-  constructor(props) {
-    super(props);
-
-    this.handleSelectTab = key => {
-      this.setState({ activeTab: key });
-    };
-
-    this.handleSort = index => () => {
-      this.setState({
-        sortIndex: index
-      });
-    };
-
-    this.state = {
-      activeTab: 1,
-      sortIndex: 0
-    };
-  }
-
-  render() {
-    return _react2.default.createElement(
-      'div',
-      { id: 'anchorage-repair' },
-      _react2.default.createElement('link', { rel: 'stylesheet', href: (0, _path.join)(__dirname, 'assets', 'style.css') }),
-      _react2.default.createElement(
-        _reactBootstrap.Tabs,
-        { activeKey: this.state.activeTab, onSelect: this.handleSelectTab, id: 'anchorage-tabs' },
-        _lodash2.default.map(this.props.fleets, (fleet, index) => _react2.default.createElement(
-          _reactBootstrap.Tab,
-          {
-            eventKey: fleet.api_id,
-            title: fleet.api_id,
-            key: `anchorage-tab-${index}`,
-            tabClassName: fleet.canRepair ? 'can-repair' : ''
-          },
-          _react2.default.createElement(_fleetList2.default, { fleet: fleet })
-        )),
-        _react2.default.createElement(
-          _reactBootstrap.Tab,
-          {
-            className: 'candidate-pane',
-            eventKey: -1,
-            title: __('Candidates')
-          },
-          _react2.default.createElement(_candidates2.default, { handleSort: this.handleSort, sortIndex: this.state.sortIndex })
-        )
-      )
-    );
-  }
-}
-
-/*
-
-   The following APIs are called in order when a fleet returns from expedition:
-
-   - api_req_mission/result
-   - api_port/port
-
-   As anchorage repair pops up conditionally on the latter one,
-   it also prevents other plugins' auto-switch mechanism on
-   tracking api_req_mission/result calls.
-
-   The problem is solved by applying a lock upon expedition returns
-   and ignoring the immediately followed api_port/port call.
-
- */
-);let expedReturnLock = null;
-const clearExpedReturnLock = () => {
-  if (expedReturnLock !== null) {
-    clearTimeout(expedReturnLock);
-    expedReturnLock = null;
-  }
-};
-
-const switchPluginPath = exports.switchPluginPath = [{
-  path: '/kcsapi/api_port/port',
-  valid: () => {
-    if (expedReturnLock !== null) {
-      /*
-         this is the immediately followed api_port/port call
-         after an expedition returning event.
-       */
-      clearExpedReturnLock();
-      return false;
-    }
-
-    const { fleets = [], ships = {}, equips = {}, repairs = [] } = getStore('info') || {};
-    const $ships = getStore('const.$ships');
-    const repairId = repairs.map(dock => dock.api_ship_id);
-
-    const result = fleets.map(fleet => fleetAkashiConv(fleet, $ships, ships, equips, repairId));
-    return result.some(fleet => fleet.canRepair && fleet.repairDetail.some(ship => ship.estimate > 0));
-  }
-}, {
-  path: '/kcsapi/api_req_mission/result',
-  valid: () => {
-    clearExpedReturnLock();
-    expedReturnLock = setTimeout(clearExpedReturnLock,
-    /*
-       allow a window of 5 secnds before the lock
-       clears itself
-     */
-    5000);
-    return false;
-  }
-}];

package/C/357/200/272UsersAdministratorAppDataRoamingpoipluginsnode_modulespoi-plugin-anchorage-repairindex2.js

@@ -1,226 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.switchPluginPath = exports.reactClass = undefined;
-
-var _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; };
-
-// Import selectors defined in poi
-
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _reactRedux = require('react-redux');
-
-var _reselect = require('reselect');
-
-var _lodash = require('lodash');
-
-var _lodash2 = _interopRequireDefault(_lodash);
-
-var _path = require('path');
-
-var _reactBootstrap = require('react-bootstrap');
-
-var _selectors = require('views/utils/selectors');
-
-var _functions = require('./parts/functions');
-
-var _fleetList = require('./parts/fleet-list');
-
-var _fleetList2 = _interopRequireDefault(_fleetList);
-
-var _candidates = require('./parts/candidates');
-
-var _candidates2 = _interopRequireDefault(_candidates);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const { i18n, getStore } = window;
-const __ = i18n['poi-plugin-anchorage-repair'].__.bind(i18n['poi-plugin-anchorage-repair']);
-
-const AKASHI_ID = [182, 187]; // akashi and kai ID in $ships
-const SRF_ID = 86; // Ship Repair Facility ID in $slotitems
-
-
-// check a fleet status, returns information related to anchorage repair
-const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
-  const pickKey = ['api_id', 'api_ship_id', 'api_lv', 'api_nowhp', 'api_maxhp', 'api_ndock_time'];
-
-  let canRepair = false;
-  let akashiFlagship = false;
-  let repairCount = 0;
-  const inExpedition = _lodash2.default.get(fleet, 'api_mission.0') && true;
-  const flagShipInRepair = _lodash2.default.includes(repairId, _lodash2.default.get(fleet, 'api_ship.0', -1));
-  const flagship = ships[_lodash2.default.get(fleet, 'api_ship.0', -1)];
-
-  if (flagship != null) {
-    akashiFlagship = _lodash2.default.includes(AKASHI_ID, flagship.api_ship_id);
-    repairCount = _lodash2.default.filter(flagship.api_slot, item => _lodash2.default.get(equips, `${item}.api_slotitem_id`, -1) === SRF_ID).length;
-    repairCount += akashiFlagship ? 2 : 0;
-  }
-
-  canRepair = akashiFlagship && !inExpedition && !flagShipInRepair;
-
-  const repairDetail = _lodash2.default.map(_lodash2.default.filter(fleet.api_ship, shipId => shipId > 0), (shipId, index) => {
-    if (shipId === -1) return false; // break, LODASH ONLY
-
-    const ship = _lodash2.default.pick(ships[shipId], pickKey);
-
-    const constShip = _lodash2.default.pick($ships[ship.api_ship_id], ['api_name', 'api_stype']);
-
-    return _extends({}, ship, constShip, {
-      estimate: (0, _functions.akashiEstimate)(ship),
-      timePerHP: (0, _functions.getTimePerHP)(ship.api_lv, constShip.api_stype),
-      inRepair: _lodash2.default.includes(repairId, ship.api_id),
-      availableSRF: index < repairCount
-    });
-  });
-
-  var repairStatus = 0
-  if(canRepair){
-    repairStatus = 1;
-  }else{
-    var flagshipid = _lodash2.default.get(fleet, 'api_ship.0', -1)
-    var secondshipid = _lodash2.default.get(fleet, 'api_ship.0', -1)
-    if(flagshipid==996||flagshipid==1002||secondshipid==996||secondshipid==1002){
-      repairStatus = 2;
-    }
-  }
-
-  return {
-    api_id: fleet.api_id || -1,
-    shipId: fleet.api_ship || [],
-    canRepair,
-    akashiFlagship,
-    inExpedition,
-    flagShipInRepair,
-    repairCount,
-    repairDetail
-  };
-};
-
-// selectors
-
-const repairIdSelector = (0, _reselect.createSelector)([_selectors.repairsSelector], repair => _lodash2.default.map(repair, dock => dock.api_ship_id));
-
-const constShipsSelector = state => state.const.$ships || {};
-
-const fleetsAkashiSelector = (0, _reselect.createSelector)([constShipsSelector, _selectors.fleetsSelector, _selectors.shipsSelector, _selectors.equipsSelector, repairIdSelector], ($ships, fleets, ships, equips, repairId) => ({ fleets: _lodash2.default.map(fleets, fleet => fleetAkashiConv(fleet, $ships, ships, equips, repairId)) })
-
-// React
-
-);const reactClass = exports.reactClass = (0, _reactRedux.connect)((0, _selectors.createDeepCompareArraySelector)([fleetsAkashiSelector, _selectors.miscSelector], (data, { canNotify }) => _extends({}, data, {
-  canNotify
-})))(class PluginAnchorageRepair extends _react.Component {
-
-  constructor(props) {
-    super(props);
-
-    this.handleSelectTab = key => {
-      this.setState({ activeTab: key });
-    };
-
-    this.handleSort = index => () => {
-      this.setState({
-        sortIndex: index
-      });
-    };
-
-    this.state = {
-      activeTab: 1,
-      sortIndex: 0
-    };
-  }
-
-  render() {
-    return _react2.default.createElement(
-      'div',
-      { id: 'anchorage-repair' },
-      _react2.default.createElement('link', { rel: 'stylesheet', href: (0, _path.join)(__dirname, 'assets', 'style.css') }),
-      _react2.default.createElement(
-        _reactBootstrap.Tabs,
-        { activeKey: this.state.activeTab, onSelect: this.handleSelectTab, id: 'anchorage-tabs' },
-        _lodash2.default.map(this.props.fleets, (fleet, index) => _react2.default.createElement(
-          _reactBootstrap.Tab,
-          {
-            eventKey: fleet.api_id,
-            title: fleet.api_id,
-            key: `anchorage-tab-${index}`,
-            tabClassName: fleet.canRepair ? 'can-repair' : ''
-          },
-          _react2.default.createElement(_fleetList2.default, { fleet: fleet })
-        )),
-        _react2.default.createElement(
-          _reactBootstrap.Tab,
-          {
-            className: 'candidate-pane',
-            eventKey: -1,
-            title: __('Candidates')
-          },
-          _react2.default.createElement(_candidates2.default, { handleSort: this.handleSort, sortIndex: this.state.sortIndex })
-        )
-      )
-    );
-  }
-}
-
-/*
-
-   The following APIs are called in order when a fleet returns from expedition:
-
-   - api_req_mission/result
-   - api_port/port
-
-   As anchorage repair pops up conditionally on the latter one,
-   it also prevents other plugins' auto-switch mechanism on
-   tracking api_req_mission/result calls.
-
-   The problem is solved by applying a lock upon expedition returns
-   and ignoring the immediately followed api_port/port call.
-
- */
-);let expedReturnLock = null;
-const clearExpedReturnLock = () => {
-  if (expedReturnLock !== null) {
-    clearTimeout(expedReturnLock);
-    expedReturnLock = null;
-  }
-};
-
-const switchPluginPath = exports.switchPluginPath = [{
-  path: '/kcsapi/api_port/port',
-  valid: () => {
-    if (expedReturnLock !== null) {
-      /*
-         this is the immediately followed api_port/port call
-         after an expedition returning event.
-       */
-      clearExpedReturnLock();
-      return false;
-    }
-
-    const { fleets = [], ships = {}, equips = {}, repairs = [] } = getStore('info') || {};
-    const $ships = getStore('const.$ships');
-    const repairId = repairs.map(dock => dock.api_ship_id);
-
-    const result = fleets.map(fleet => fleetAkashiConv(fleet, $ships, ships, equips, repairId));
-    return result.some(fleet => fleet.canRepair && fleet.repairDetail.some(ship => ship.estimate > 0));
-  }
-}, {
-  path: '/kcsapi/api_req_mission/result',
-  valid: () => {
-    clearExpedReturnLock();
-    expedReturnLock = setTimeout(clearExpedReturnLock,
-    /*
-       allow a window of 5 secnds before the lock
-       clears itself
-     */
-    5000);
-    return false;
-  }
-}];