poi-plugin-ship-info - npm Package Compare versions

Comparing version 4.3.4 to 4.4.0

i18n/ja-JP.json

@@ -173,3 +173,11 @@ {
   "Palette": "海域パレット",
-  "None": "計画なし"
+  "None": "計画なし",
+  "Statistics": "統計",
+  "Leyte Gulf": "レイテ沖海戦",
+  "IJN Mobile Force (Ozawa)": "旧日本海軍 機動部隊本隊（小沢）",
+  "IJN First Striking First Section (Kurita)": "旧日本海軍 第一遊撃部隊 第一部隊（栗田）",
+  "IJN First Striking Second Section (Suzuki)": "旧日本海軍 第一遊撃部隊 第二部隊（鈴木）",
+  "IJN First Striking Third Section (Nishimura)": "旧日本海軍 第一遊撃部隊 第三部隊（西村）",
+  "IJN Second Striking Force (Shima)": "旧日本海軍 第二遊撃部隊（志摩）",
+  "USN Task Force 38 Fast Carrier Force": "連合軍 第 38 任務部隊"
 }

i18n/zh-CN.json

@@ -174,3 +174,11 @@ {
   "Palette": "海域调色板",
-  "None": "无计划"
+  "None": "无计划",
+  "Statistics": "统计",
+  "Leyte Gulf": "莱特湾海战",
+  "IJN Mobile Force (Ozawa)": "旧日本海军 机动部队本队（小泽）",
+  "IJN First Striking First Section (Kurita)": "旧日本海军 第一游击部队 第一部队（栗田）",
+  "IJN First Striking Second Section (Suzuki)": "旧日本海军 第一游击部队 第二部队（铃木）",
+  "IJN First Striking Third Section (Nishimura)": "旧日本海军 第一游击部队 第三部队（西村）",
+  "IJN Second Striking Force (Shima)": "旧日本海军 第一游击部队 第三部队（志摩）",
+  "USN Task Force 38 Fast Carrier Force": "美国海军 第 38 航空母舰特遣队"
 }

i18n/zh-TW.json

@@ -174,3 +174,11 @@ {
   "Palette": "海域調色板",
-  "None": "無計劃"
+  "None": "無計劃",
+  "Statistics": "統計",
+  "Leyte Gulf": "雷伊泰灣海戰",
+  "IJN Mobile Force (Ozawa)": "舊日本海軍 機動部隊本隊（小澤）",
+  "IJN First Striking First Section (Kurita)": "舊日本海軍 第一遊擊部隊 第一部隊（栗田）",
+  "IJN First Striking Second Section (Suzuki)": "舊日本海軍 第一遊擊部隊 第二部隊（鈴木）",
+  "IJN First Striking Third Section (Nishimura)": "舊日本海軍 第一遊擊部隊 第三部隊（西村）",
+  "IJN Second Striking Force (Shima)": "舊日本海軍 第一遊擊部隊 第三部隊（志摩）",
+  "USN Task Force 38 Fast Carrier Force": "美國海軍 第 38 航空母艦特遣隊"
 }

package.json

 {
   "name": "poi-plugin-ship-info",
-  "version": "4.3.4",
+  "version": "4.4.0",
   "description": "Show detailed information of all owned ship girls",
@@ -5,0 +5,0 @@ "main": "index.es",

views/selectors.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.deckPlannerShipMapSelector = exports.deckPlannerAllShipIdsSelector = exports.deckPlannerAreaSelectorFactory = exports.deckPlannerCurrentSelector = exports.shipMenuDataSelector = exports.ShipItemSelectorFactory = exports.sallyAreaSelectorFactory = exports.shipRowsSelector = exports.allShipRowsSelector = exports.shipTableDataSelectorFactory = exports.shipFleetIdSelectorFactory = exports.shipFleetIdMapSelector = exports.shipInfoConfigSelector = undefined;
+exports.sameShipMapSelector = exports.deckPlannerShipMapSelector = exports.deckPlannerAllShipIdsSelector = exports.deckPlannerAreaSelectorFactory = exports.deckPlannerCurrentSelector = exports.shipMenuDataSelector = exports.ShipItemSelectorFactory = exports.sallyAreaSelectorFactory = exports.shipRowsSelector = exports.allShipRowsSelector = exports.shipTableDataSelectorFactory = exports.shipFleetIdSelectorFactory = exports.shipFleetIdMapSelector = exports.shipInfoConfigSelector = undefined;
 
@@ -17,2 +17,4 @@ var _fastMemoize = require('fast-memoize');
 
+var _lodash2 = _interopRequireDefault(_lodash);
+
 var _fp = require('lodash/fp');
@@ -233,2 +235,3 @@
   id: ship.api_id,
+  shipId: $ship.api_id,
   typeId: $ship.api_stype,
@@ -249,2 +252,21 @@ name: $ship.api_name,
 
-const deckPlannerShipMapSelector = exports.deckPlannerShipMapSelector = (0, _reselect.createSelector)([deckPlannerCurrentSelector], current => (0, _lodash.fromPairs)((0, _lodash.flatMap)(current, (ships, areaIndex) => ships.map(id => [id, areaIndex]))));
+const deckPlannerShipMapSelector = exports.deckPlannerShipMapSelector = (0, _reselect.createSelector)([deckPlannerCurrentSelector], current => (0, _lodash.fromPairs)((0, _lodash.flatMap)(current, (ships, areaIndex) => ships.map(id => [id, areaIndex]))));
+
+const sameShipMapSelector = exports.sameShipMapSelector = (0, _reselect.createSelector)([_selectors.constSelector], ({ $ships = {} } = {}) => {
+  const sameMap = (0, _lodash2.default)($ships).map(ship => {
+    let current = ship;
+    let next = +(ship.api_aftershipid || 0);
+    let same = [ship.api_id];
+    while (!same.includes(next) && next > 0) {
+      same = [...same, next];
+      current = $ships[next] || {};
+      next = +(current.api_aftershipid || 0);
+    }
+    return [ship.api_id, same];
+  }).fromPairs().value();
+
+  (0, _lodash.each)(sameMap, ids => (0, _lodash.each)(ids, id => {
+    sameMap[id] = (0, _lodash.uniq)([...sameMap[id], ...ids, ...(0, _lodash.flatMap)(ids, s => sameMap[s])]);
+  }));
+  return sameMap;
+});

views/settings-view/index.js

@@ -47,2 +47,6 @@ 'use strict';
 
+var _statDropdown = require('./stat-dropdown');
+
+var _statDropdown2 = _interopRequireDefault(_statDropdown);
+
 var _redux = require('../redux');
@@ -145,2 +149,7 @@
             _react2.default.createElement(_plannerDropdown2.default, null)
+          ),
+          _react2.default.createElement(
+            _reactBootstrap.ButtonGroup,
+            null,
+            _react2.default.createElement(_statDropdown2.default, null)
           )
@@ -147,0 +156,0 @@ )

views/settings-view/planner-dropdown/ship-grid.js

@@ -61,3 +61,3 @@ 'use strict';
 
-const { __ } = window;
+const { __, __r } = window;
 
@@ -101,3 +101,3 @@ const ShipItem = (0, _reactRedux.connect)(state => ({
         ship.area > 0 && _react2.default.createElement(_reactFontawesome2.default, { name: 'tag' }),
-        ship.name
+        __r(ship.name)
       ),
@@ -104,0 +104,0 @@ _react2.default.createElement(

views/utils.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.hexToRGBA = exports.shipTypes = exports.reverseSuperTypeMap = exports.shipSuperTypeMap = exports.boolArrayToInt = exports.intToBoolArray = exports.getKanaSortValues = exports.katakanaToHiragana = exports.nameCompare = exports.shipInfoShape = exports.getShipInfoData = exports.getTimePerHP = undefined;
+exports.leyteFleets = exports.hexToRGBA = exports.shipTypes = exports.reverseSuperTypeMap = exports.shipSuperTypeMap = exports.boolArrayToInt = exports.intToBoolArray = exports.getKanaSortValues = exports.katakanaToHiragana = exports.nameCompare = exports.shipInfoShape = exports.getShipInfoData = exports.getTimePerHP = undefined;
 
@@ -17,6 +17,2 @@ 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; };
 
-var _fastMemoize = require('fast-memoize');
-
-var _fastMemoize2 = _interopRequireDefault(_fastMemoize);
-
 var _constants = require('./constants');
@@ -331,2 +327,69 @@
   return '';
-};
+};
+
+// http://pwencycl.kgbudge.com/L/e/Leyte_Gulf.htm
+// https://ja.wikipedia.org/wiki/レイテ沖海戦
+// _.map(names, name => _.get(_.find($ships, ship => ship.api_name.startsWith(name)), 'api_id'))
+const leyteFleets = exports.leyteFleets = [
+// 瑞鶴
+// 千代田
+// 千歳
+// 瑞鳳
+// 伊勢、日向
+// 多摩、五十鈴
+// 大淀
+// 初月、若月、秋月
+// 霜月
+// '瑞鶴', '千代田', '千歳', '瑞鳳', '伊勢', '日向', '多摩', '五十鈴', '大淀', '初月', '若月', '秋月',  '霜月'
+{
+  name: 'IJN Mobile Force (Ozawa)', // 機動部隊本隊
+  ships: [111, 103, 102, 116, 77, 87, 100, 22, 183, 423, 421]
+},
+// 愛宕、高雄、摩耶、鳥海
+// 大和、武蔵、長門
+// 妙高、羽黒
+// 能代 島風
+// 早霜、秋霜
+// 岸波、沖波、朝霜、長波
+// 浜波、藤波
+// '愛宕', '高雄', '摩耶', '鳥海', '大和', '武蔵', '長門', '妙高', '羽黒', '能代','島風', '早霜', '秋霜', '岸波', '沖波', '朝霜', '長波', '浜波', '藤波'
+{
+  name: 'IJN First Striking First Section (Kurita)', // 第一遊撃部隊 第一部隊
+  ships: [67, 66, 68, 69, 131, 143, 80, 62, 65, 138, 50, 409, 452, 425, 135, 485]
+},
+// 金剛、榛名
+// 鈴谷、熊野、利根、筑摩
+// 矢矧 浦風、磯風、雪風、浜風、清霜、野分
+// '金剛', '榛名', '鈴谷', '熊野', '利根', '筑摩', '矢矧', '浦風', '磯風', '雪風', '浜風', '清霜', '野分'
+{
+  name: 'IJN First Striking Second Section (Suzuki)', // 第一遊撃部隊 第二部隊
+  ships: [78, 79, 124, 125, 71, 72, 139, 168, 167, 20, 170, 410, 415]
+},
+// 山城、扶桑
+// 最上
+// 時雨
+// 山雲、満潮、朝雲
+// '山城', '扶桑', '最上', '時雨', '山雲', '満潮', '朝雲'
+{
+  name: 'IJN First Striking Third Section (Nishimura)', // 第一遊撃部隊 第三部隊
+  ships: [27, 26, 70, 43, 414, 97, 413]
+},
+// 那智、足柄
+// 阿武隈
+// 曙、潮、霞
+// 不知火
+// 若葉、初春、初霜
+// 青葉
+// 鬼怒
+// 浦波
+// '那智', '足柄', '阿武隈', '曙', '潮', '霞', '不知火', '若葉', '初春', '初霜', '青葉', '鬼怒', '浦波'
+{
+  name: 'IJN Second Striking Force (Shima)', // 第二遊撃部隊
+  ships: [63, 64, 114, 15, 16, 49, 18, 40, 38, 41, 61, 113, 486]
+},
+// Iowa
+// 'Iowa'
+{
+  name: 'USN Task Force 38 Fast Carrier Force', // 第38任務部隊
+  ships: [440]
+}];

No alert changes

Improved metrics

Total package byte prevSize

418735

increased by7.16%

Number of package files

68

increased by6.25%

Lines of code

5195

increased by6.52%

No dependency changes