poi-plugin-ship-info
Advanced tools
Comparing version 4.6.4 to 4.6.5
{ | ||
"name": "poi-plugin-ship-info", | ||
"version": "4.6.4", | ||
"version": "4.6.5", | ||
"description": "Show detailed information of all owned ship girls", | ||
@@ -5,0 +5,0 @@ "main": "index.es", |
@@ -47,4 +47,3 @@ 'use strict'; | ||
try { | ||
require('poi-plugin-translator').pluginDidLoad // eslint-disable-line global-require | ||
(); | ||
require('poi-plugin-translator').pluginDidLoad(); // eslint-disable-line global-require | ||
} catch (error) { | ||
@@ -55,4 +54,4 @@ console.warn(error); | ||
window.__ = i18n.__.bind(i18n); | ||
window.__r = i18n.resources.__.bind(i18n.resources // eslint-disable-line no-underscore-dangle | ||
);document.title = window.__('Ship Girls Info' | ||
window.__r = i18n.resources.__.bind(i18n.resources); // eslint-disable-line no-underscore-dangle | ||
document.title = window.__('Ship Girls Info'); | ||
@@ -74,3 +73,3 @@ // // augment font size with poi zoom level | ||
// remember window size | ||
);window.shipInfoWindow = _electron.remote.getCurrentWindow(); | ||
window.shipInfoWindow = _electron.remote.getCurrentWindow(); | ||
window.shipInfoContents = _electron.remote.getCurrentWebContents(); | ||
@@ -77,0 +76,0 @@ |
@@ -255,7 +255,7 @@ 'use strict'; | ||
const beforeShipMapSelector = (0, _reselect.createSelector)([ourShipsSelector], $ships => (0, _lodash2.default)($ships).filter(ship => +(ship.api_aftershipid || 0) > 0).map(ship => [ship.api_aftershipid, ship.api_id]).fromPairs().value() | ||
const beforeShipMapSelector = (0, _reselect.createSelector)([ourShipsSelector], $ships => (0, _lodash2.default)($ships).filter(ship => +(ship.api_aftershipid || 0) > 0).map(ship => [ship.api_aftershipid, ship.api_id]).fromPairs().value()); | ||
// the chain starts from each ship, thus incomplete if the ship is not the starting one | ||
// the adjustedRemodelChainsSelector will return complete chains for all ships | ||
);const remodelChainsSelector = (0, _reselect.createSelector)([ourShipsSelector], $ships => (0, _lodash2.default)($ships).mapValues(({ api_id: shipId }) => { | ||
const remodelChainsSelector = (0, _reselect.createSelector)([ourShipsSelector], $ships => (0, _lodash2.default)($ships).mapValues(({ api_id: shipId }) => { | ||
let current = $ships[shipId]; | ||
@@ -262,0 +262,0 @@ let next = +(current.api_aftershipid || 0); |
@@ -80,5 +80,5 @@ 'use strict'; | ||
this.onSelect = (eventKey = this.state.query) => { | ||
const settings = (0, _lodash.get)(this.props.bookmarks, eventKey, {} | ||
const settings = (0, _lodash.get)(this.props.bookmarks, eventKey, {}); | ||
// comvert old settings to new | ||
);if ('shipTypeChecked' in settings) { | ||
if ('shipTypeChecked' in settings) { | ||
settings.shipTypes = (0, _utils.boolArrayToInt)(settings.shipTypeChecked); | ||
@@ -142,4 +142,4 @@ } | ||
const result = query.length > 0 ? Object.entries(this.fuse.search(query)).map(([key, value]) => value // eslint-disable-line no-unused-vars | ||
).map(value => value.name) : Object.keys(this.props.bookmarks); | ||
const result = query.length > 0 ? Object.entries(this.fuse.search(query)).map(([key, value]) => value) // eslint-disable-line no-unused-vars | ||
.map(value => value.name) : Object.keys(this.props.bookmarks); | ||
return _react2.default.createElement( | ||
@@ -146,0 +146,0 @@ 'ul', |
@@ -50,6 +50,6 @@ 'use strict'; | ||
const defaultChecked = Array(mapname.length + 1).fill(true); | ||
let checked = (0, _lodash.get)(state.config, 'plugin.ShipInfo.sallyAreaChecked', defaultChecked | ||
let checked = (0, _lodash.get)(state.config, 'plugin.ShipInfo.sallyAreaChecked', defaultChecked); | ||
// reset config values if updated | ||
);checked = mapname.length + 1 === checked.length ? checked : defaultChecked; | ||
checked = mapname.length + 1 === checked.length ? checked : defaultChecked; | ||
const checkedAll = checked.reduce((a, b) => a && b, true); | ||
@@ -56,0 +56,0 @@ |
@@ -177,3 +177,3 @@ 'use strict'; | ||
this.updateWindowSize(); | ||
window.addEventListener('resize', this.updateWindowSize | ||
window.addEventListener('resize', this.updateWindowSize); | ||
// console.log(document.querySelectorAll('.ReactVirtualized__Grid')) | ||
@@ -183,11 +183,9 @@ // document.querySelectorAll('.ReactVirtualized__Grid').forEach((target) => { | ||
// }) | ||
); | ||
}; | ||
this.componentWillUnmount = () => { | ||
window.removeListener('resize', this.updateWindowSize | ||
window.removeListener('resize', this.updateWindowSize); | ||
// document.querySelectorAll('.ReactVirtualized__Grid').forEach((target) => { | ||
// target.removeEventListener('scroll', this.handleScroll) | ||
// }) | ||
); | ||
}; | ||
@@ -194,0 +192,0 @@ |
@@ -6,3 +6,3 @@ 'use strict'; | ||
}); | ||
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; | ||
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.checkDaihatsu = exports.getTimePerHP = undefined; | ||
@@ -40,2 +40,30 @@ 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; }; | ||
// check if ship can equip daihatsu | ||
const checkDaihatsu = exports.checkDaihatsu = $ship => { | ||
// AV=16, LHA=17, AO=22 | ||
if ([16, 17, 22].includes($ship.api_stype)) { | ||
return true; | ||
} | ||
// excluding Akitsushima(445) and Hayasui(352) | ||
if ([445, 460].includes($ship.api_id)) { | ||
return false; | ||
} | ||
// Abukuma Kai 2 = 200, Kinu Kai 2 = 487 | ||
// Satsuki Kai 2 = 418 , Mutsuki Kai 2 = 434, Kisaragi Kai 2 = 435 | ||
// Kasumi Kai 2 = 464, Kasumi Kai 2 B = 470, Ooshio Kai 2 = 199, | ||
// Asashio Kai 2 D = 468, Arashio Kai 2 = 490, Michishio Kai 2 = 489 | ||
// Verniy = 147, Kawakaze Kai 2 = 469 | ||
// Nagato Kai 2 = 541 | ||
// Yura Kai 2 = 488 | ||
// Fumitsuki Kai 2 = 548 | ||
// Tama Kai 2 = 547 | ||
if ([200, 487, 418, 434, 435, 464, 470, 199, 468, 490, 489, 147, 469, 541, 488, 548, 547].includes($ship.api_id)) { | ||
return true; | ||
} | ||
return false; | ||
}; | ||
const getShipInfoData = exports.getShipInfoData = (ship, $ship, equips, $shipTypes, fleetIdMap, rawValue = false, repairs = []) => { | ||
@@ -120,26 +148,4 @@ const shipInfo = { | ||
// check if ship can equip daihatsu | ||
let daihatsu = false; | ||
// AV=16, LHA=17, AO=22 | ||
if ([16, 17, 22].includes($ship.api_stype)) { | ||
daihatsu = true; | ||
} | ||
const daihatsu = checkDaihatsu($ship); | ||
// excluding Akitsushima(445) and Hayasui(352) | ||
if ([445, 460].includes($ship.api_id)) { | ||
daihatsu = false; | ||
} | ||
// Abukuma Kai 2 = 200, Kinu Kai 2 = 487 | ||
// Satsuki Kai 2 = 418 , Mutsuki Kai 2 = 434, Kisaragi Kai 2 = 435 | ||
// Kasumi Kai 2 = 464, Kasumi Kai 2 B = 470, Ooshio Kai 2 = 199, | ||
// Asashio Kai 2 D = 468, Arashio Kai 2 = 490, Michishio Kai 2 = 489 | ||
// Verniy = 147, Kawakaze Kai 2 = 469 | ||
// Nagato Kai 2 = 541 | ||
// Yura Kai 2 = 488 | ||
// Fumitsuki Kai 2 = 548 | ||
if ([200, 487, 418, 434, 435, 464, 470, 199, 468, 490, 489, 147, 469, 541, 488, 548].includes($ship.api_id)) { | ||
daihatsu = true; | ||
} | ||
return _extends({}, shipInfo, { | ||
@@ -238,3 +244,3 @@ karyokuNow, | ||
const getKanaSortValues = exports.getKanaSortValues = str => katakanaToHiragana(str).split('').map(s => s.charCodeAt() | ||
const getKanaSortValues = exports.getKanaSortValues = str => katakanaToHiragana(str).split('').map(s => s.charCodeAt()); | ||
@@ -245,3 +251,3 @@ // following function is used to convert betweern array of booleans and int | ||
// [true, false, false] => [true, true, false, false] => '1100' => 12 | ||
);const intToBoolArray = exports.intToBoolArray = (int = 0) => { | ||
const intToBoolArray = exports.intToBoolArray = (int = 0) => { | ||
const boolArray = int.toString(2).split('').map(s => !!+s); | ||
@@ -248,0 +254,0 @@ boolArray.shift(); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
573210
8598