- Improved "Drifter" wormhole support, "system effects" added #847
- Updated `composer.json`. `exodus4d/pathfinder_esi` `v1.3.1` → `v1.3.2`
This commit is contained in:
Mark Friedrich
@@ -38,7 +38,7 @@
|
||||
"react/socket": "1.2.*",
|
||||
"react/promise-stream": "1.1.*",
|
||||
"clue/ndjson-react": "1.0.*",
|
||||
"exodus4d/pathfinder_esi": "v1.3.1"
|
||||
"exodus4d/pathfinder_esi": "v1.3.2"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-redis": "Redis can be used as cache backend."
|
||||
|
||||
166
composer.lock
generated
166
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "ad512ee5d1242b7e46b3620b1b05a2a2",
|
||||
"content-hash": "cd6689b64084cbe1bdbf74b1165fd472",
|
||||
"packages": [
|
||||
{
|
||||
"name": "cache/adapter-common",
|
||||
@@ -55,7 +55,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
}
|
||||
],
|
||||
"description": "Common classes for PSR-6 adapters",
|
||||
@@ -123,7 +123,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
}
|
||||
],
|
||||
"description": "A PSR-6 cache implementation using a php array. This implementation supports tags",
|
||||
@@ -191,7 +191,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
}
|
||||
],
|
||||
"description": "A PSR-6 cache implementation using filesystem. This implementation supports tags",
|
||||
@@ -253,7 +253,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
}
|
||||
],
|
||||
"description": "A helper trait and interface to your PSR-6 cache to support hierarchical keys.",
|
||||
@@ -311,7 +311,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
}
|
||||
],
|
||||
"description": "A decorator that makes your cache support namespaces",
|
||||
@@ -381,7 +381,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
}
|
||||
],
|
||||
"description": "A PSR-6 cache implementation using Redis (PhpRedis). This implementation supports tags",
|
||||
@@ -432,7 +432,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
},
|
||||
{
|
||||
"name": "Nicolas Grekas",
|
||||
@@ -505,7 +505,7 @@
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/nyholm"
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
}
|
||||
],
|
||||
"description": "A PSR-6 cache implementation using Void. This implementation supports tags",
|
||||
@@ -629,28 +629,30 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/lexer",
|
||||
"version": "1.0.2",
|
||||
"version": "1.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/lexer.git",
|
||||
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
|
||||
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
|
||||
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
|
||||
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea",
|
||||
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.2"
|
||||
"php": "^7.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.5"
|
||||
"doctrine/coding-standard": "^6.0",
|
||||
"phpstan/phpstan": "^0.11.8",
|
||||
"phpunit/phpunit": "^8.2"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0.x-dev"
|
||||
"dev-master": "1.1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -663,14 +665,14 @@
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Roman Borschel",
|
||||
"email": "roman@code-factory.org"
|
||||
},
|
||||
{
|
||||
"name": "Guilherme Blanco",
|
||||
"email": "guilhermeblanco@gmail.com"
|
||||
},
|
||||
{
|
||||
"name": "Roman Borschel",
|
||||
"email": "roman@code-factory.org"
|
||||
},
|
||||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"email": "schmittjoh@gmail.com"
|
||||
@@ -685,20 +687,20 @@
|
||||
"parser",
|
||||
"php"
|
||||
],
|
||||
"time": "2019-06-08T11:03:04+00:00"
|
||||
"time": "2019-07-30T19:33:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "egulias/email-validator",
|
||||
"version": "2.1.10",
|
||||
"version": "2.1.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/egulias/EmailValidator.git",
|
||||
"reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec"
|
||||
"reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec",
|
||||
"reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec",
|
||||
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23",
|
||||
"reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -717,7 +719,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.0.x-dev"
|
||||
"dev-master": "2.1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -743,7 +745,7 @@
|
||||
"validation",
|
||||
"validator"
|
||||
],
|
||||
"time": "2019-07-19T20:52:08+00:00"
|
||||
"time": "2019-08-13T17:33:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "evenement/evenement",
|
||||
@@ -790,16 +792,16 @@
|
||||
},
|
||||
{
|
||||
"name": "exodus4d/pathfinder_esi",
|
||||
"version": "v1.3.1",
|
||||
"version": "v1.3.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/exodus4d/pathfinder_esi.git",
|
||||
"reference": "392cb81f1efbd9bf69d7d943f4aefdcf3f0a617c"
|
||||
"reference": "7eecfe27bb15fab5142aceeee30e07355d660773"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/exodus4d/pathfinder_esi/zipball/392cb81f1efbd9bf69d7d943f4aefdcf3f0a617c",
|
||||
"reference": "392cb81f1efbd9bf69d7d943f4aefdcf3f0a617c",
|
||||
"url": "https://api.github.com/repos/exodus4d/pathfinder_esi/zipball/7eecfe27bb15fab5142aceeee30e07355d660773",
|
||||
"reference": "7eecfe27bb15fab5142aceeee30e07355d660773",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -825,9 +827,9 @@
|
||||
],
|
||||
"description": "ESI API library for Pathfinder",
|
||||
"support": {
|
||||
"source": "https://github.com/exodus4d/pathfinder_esi/tree/v1.3.1"
|
||||
"source": "https://github.com/exodus4d/pathfinder_esi/tree/v1.3.2"
|
||||
},
|
||||
"time": "2019-05-07T11:53:44+00:00"
|
||||
"time": "2019-10-08T10:20:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
@@ -1018,16 +1020,16 @@
|
||||
},
|
||||
{
|
||||
"name": "league/flysystem",
|
||||
"version": "1.0.53",
|
||||
"version": "1.0.55",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/flysystem.git",
|
||||
"reference": "08e12b7628f035600634a5e76d95b5eb66cea674"
|
||||
"reference": "33c91155537c6dc899eacdc54a13ac6303f156e6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/08e12b7628f035600634a5e76d95b5eb66cea674",
|
||||
"reference": "08e12b7628f035600634a5e76d95b5eb66cea674",
|
||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6",
|
||||
"reference": "33c91155537c6dc899eacdc54a13ac6303f156e6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1098,20 +1100,20 @@
|
||||
"sftp",
|
||||
"storage"
|
||||
],
|
||||
"time": "2019-06-18T20:09:29+00:00"
|
||||
"time": "2019-08-24T11:17:19+00:00"
|
||||
},
|
||||
{
|
||||
"name": "league/html-to-markdown",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/html-to-markdown.git",
|
||||
"reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1"
|
||||
"reference": "e747489191f8e9144a7270eb61f8b9516e99e413"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/250d1bf45f80d15594fb6b316df777d6d4c97ad1",
|
||||
"reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1",
|
||||
"url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e747489191f8e9144a7270eb61f8b9516e99e413",
|
||||
"reference": "e747489191f8e9144a7270eb61f8b9516e99e413",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1143,17 +1145,17 @@
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Nick Cernis",
|
||||
"email": "nick@cern.is",
|
||||
"homepage": "http://modernnerd.net",
|
||||
"role": "Original Author"
|
||||
},
|
||||
{
|
||||
"name": "Colin O'Dell",
|
||||
"email": "colinodell@gmail.com",
|
||||
"homepage": "https://www.colinodell.com",
|
||||
"role": "Lead Developer"
|
||||
},
|
||||
{
|
||||
"name": "Nick Cernis",
|
||||
"email": "nick@cern.is",
|
||||
"homepage": "http://modernnerd.net",
|
||||
"role": "Original Author"
|
||||
}
|
||||
],
|
||||
"description": "An HTML-to-markdown conversion helper for PHP",
|
||||
@@ -1162,20 +1164,20 @@
|
||||
"html",
|
||||
"markdown"
|
||||
],
|
||||
"time": "2018-12-24T17:21:44+00:00"
|
||||
"time": "2019-08-02T11:57:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "1.24.0",
|
||||
"version": "1.25.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog.git",
|
||||
"reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
|
||||
"reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
|
||||
"reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
|
||||
"reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1240,7 +1242,7 @@
|
||||
"logging",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2018-11-05T09:00:11+00:00"
|
||||
"time": "2019-09-06T13:49:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/cache",
|
||||
@@ -1912,16 +1914,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-iconv",
|
||||
"version": "v1.11.0",
|
||||
"version": "v1.12.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-iconv.git",
|
||||
"reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7"
|
||||
"reference": "685968b11e61a347c18bf25db32effa478be610f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f037ea22acfaee983e271dd9c3b8bb4150bd8ad7",
|
||||
"reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f",
|
||||
"reference": "685968b11e61a347c18bf25db32effa478be610f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1933,7 +1935,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.11-dev"
|
||||
"dev-master": "1.12-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -1967,20 +1969,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2019-02-06T07:57:58+00:00"
|
||||
"time": "2019-08-06T08:03:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-idn",
|
||||
"version": "v1.11.0",
|
||||
"version": "v1.12.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-intl-idn.git",
|
||||
"reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af"
|
||||
"reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c766e95bec706cdd89903b1eda8afab7d7a6b7af",
|
||||
"reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
|
||||
"reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1994,7 +1996,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.9-dev"
|
||||
"dev-master": "1.12-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -2010,13 +2012,13 @@
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
},
|
||||
{
|
||||
"name": "Laurent Bassin",
|
||||
"email": "laurent@bassin.info"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
|
||||
@@ -2029,20 +2031,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2019-03-04T13:44:35+00:00"
|
||||
"time": "2019-08-06T08:03:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
"version": "v1.11.0",
|
||||
"version": "v1.12.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||
"reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
|
||||
"reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
|
||||
"reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
|
||||
"reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2054,7 +2056,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.11-dev"
|
||||
"dev-master": "1.12-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -2088,20 +2090,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2019-02-06T07:57:58+00:00"
|
||||
"time": "2019-08-06T08:03:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php72",
|
||||
"version": "v1.11.0",
|
||||
"version": "v1.12.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php72.git",
|
||||
"reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
|
||||
"reference": "04ce3335667451138df4307d6a9b61565560199e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
|
||||
"reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
|
||||
"reference": "04ce3335667451138df4307d6a9b61565560199e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2110,7 +2112,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.11-dev"
|
||||
"dev-master": "1.12-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -2143,7 +2145,7 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2019-02-06T07:57:58+00:00"
|
||||
"time": "2019-08-06T08:03:45+00:00"
|
||||
}
|
||||
],
|
||||
"packages-dev": [],
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1859,9 +1859,11 @@ define([
|
||||
$.fn.addSystemEffectTooltip = function(security, effect, options){
|
||||
let effectClass = getEffectInfoForSystem(effect, 'class');
|
||||
let systemEffectData = Util.getSystemEffectData(security, effect);
|
||||
let areaId = Util.getAreaIdBySecurity(security);
|
||||
|
||||
let title = '<i class="fas fa-square fa-fw ' + effectClass + '"></i> ' +
|
||||
getEffectInfoForSystem(effect, 'name') +
|
||||
getEffectInfoForSystem(effect, 'name') + ' ' +
|
||||
'<kbd>' + Util.getSystemEffectMultiplierByAreaId(parseInt(areaId)) + 'x' + '</kbd>' +
|
||||
'<span class="pull-right ' + Util.getSecurityClassForSystem(security) + '">' + security + '</span>';
|
||||
|
||||
let content = Util.getSystemEffectTable(systemEffectData);
|
||||
|
||||
@@ -34,8 +34,8 @@ define([
|
||||
|
||||
let systemEffectData = Util.getSystemEffectData();
|
||||
|
||||
// last active (hover) table columnIndex
|
||||
let lastActiveColIndex = null;
|
||||
// last active (hover) table columnName
|
||||
let lastActiveColName = null;
|
||||
|
||||
let colCount = 0;
|
||||
for(let [effectName, effectData] of Object.entries(systemEffectData.wh)){
|
||||
@@ -59,8 +59,10 @@ define([
|
||||
let securityClass = Util.getSecurityClassForSystem(systemType);
|
||||
|
||||
if(areaId === '1'){
|
||||
rows.push( $('<tr>') );
|
||||
rows.push( $('<tr>') );
|
||||
thead.append( rows[0] );
|
||||
thead.append( rows[1] );
|
||||
|
||||
rows[0].append(
|
||||
$('<th>').html(' ' + systemEffectName).prepend(
|
||||
@@ -69,24 +71,30 @@ define([
|
||||
})
|
||||
)
|
||||
);
|
||||
|
||||
rows[1].append($('<th>'));
|
||||
}
|
||||
|
||||
rows[0].append( $('<th>', {
|
||||
class: ['text-right', 'col-xs-1', securityClass].join(' ')
|
||||
}).text( systemType ));
|
||||
}).text( systemType ).attr('data-name', systemType));
|
||||
|
||||
rows[1].append( $('<th>', {
|
||||
class: ['text-right', 'txt-color', 'txt-color-grayLight'].join(' ')
|
||||
}).text(Util.getSystemEffectMultiplierByAreaId(parseInt(areaId)) + ' x').attr('data-name', systemType));
|
||||
|
||||
for(let [i, data] of Object.entries(areaData)){
|
||||
i = parseInt(i);
|
||||
if(areaId === '1'){
|
||||
rows.push( $('<tr>') );
|
||||
tbody.append(rows[i + 1]);
|
||||
tbody.append(rows[i + 2]);
|
||||
|
||||
// add label
|
||||
rows[i + 1].append( $('<td>').text( data.effect ));
|
||||
rows[i + 2].append( $('<td>').text( data.effect ));
|
||||
}
|
||||
|
||||
|
||||
rows[i + 1].append( $('<td>', {
|
||||
rows[i + 2].append( $('<td>', {
|
||||
class: 'text-right'
|
||||
}).text( data.value ));
|
||||
}
|
||||
@@ -148,25 +156,26 @@ define([
|
||||
tableApi.tables().nodes().to$().on('mouseover', 'td', function(){
|
||||
// inside table cell -> get current hover colIndex
|
||||
let colIndex = tableApi.cell(this).index().column;
|
||||
let colName = tableApi.column(colIndex).header().dataset.name || '';
|
||||
|
||||
if(colIndex !== lastActiveColIndex){
|
||||
if(colName !== lastActiveColName){
|
||||
removeColumnHighlight();
|
||||
|
||||
lastActiveColIndex = colIndex;
|
||||
lastActiveColName = colName;
|
||||
|
||||
if(colIndex > 0){
|
||||
// active column changed -> highlight same colIndex on other tables
|
||||
if(colName.length){
|
||||
// active column changed -> highlight same colName on other tables
|
||||
let tableApis = $.fn.dataTable.tables({ visible: false, api: true })
|
||||
.tables('.' + config.systemEffectTableClass);
|
||||
|
||||
let columns = tableApis.columns(colIndex);
|
||||
let columns = tableApis.columns([colName + ':name']);
|
||||
columns.header().flatten().to$().addClass('colHighlight');
|
||||
columns.nodes().flatten().to$().addClass('colHighlight');
|
||||
}
|
||||
}
|
||||
}).on('mouseleave', function(){
|
||||
// no longer inside table
|
||||
lastActiveColIndex = null;
|
||||
lastActiveColName = null;
|
||||
removeColumnHighlight();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2146,6 +2146,13 @@ define([
|
||||
return mapModule;
|
||||
};
|
||||
|
||||
/**
|
||||
*
|
||||
* @param ariaId
|
||||
* @returns {number}
|
||||
*/
|
||||
let getSystemEffectMultiplierByAreaId = ariaId => SystemEffect.getMultiplierByAreaId(ariaId);
|
||||
|
||||
/**
|
||||
* get areaId by security string
|
||||
* areaId is required as a key for signature names
|
||||
@@ -2165,9 +2172,6 @@ define([
|
||||
case '0.0':
|
||||
areaId = 32;
|
||||
break;
|
||||
case 'SH':
|
||||
areaId = 13;
|
||||
break;
|
||||
default:
|
||||
// w-space
|
||||
for(let i = 1; i <= 18; i++){
|
||||
@@ -3499,6 +3503,7 @@ define([
|
||||
getLabelByRole: getLabelByRole,
|
||||
getMapElementFromOverlay: getMapElementFromOverlay,
|
||||
getMapModule: getMapModule,
|
||||
getSystemEffectMultiplierByAreaId: getSystemEffectMultiplierByAreaId,
|
||||
getSystemEffectData: getSystemEffectData,
|
||||
getSystemEffectTable: getSystemEffectTable,
|
||||
getSystemPlanetsTable: getSystemPlanetsTable,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1859,9 +1859,11 @@ define([
|
||||
$.fn.addSystemEffectTooltip = function(security, effect, options){
|
||||
let effectClass = getEffectInfoForSystem(effect, 'class');
|
||||
let systemEffectData = Util.getSystemEffectData(security, effect);
|
||||
let areaId = Util.getAreaIdBySecurity(security);
|
||||
|
||||
let title = '<i class="fas fa-square fa-fw ' + effectClass + '"></i> ' +
|
||||
getEffectInfoForSystem(effect, 'name') +
|
||||
getEffectInfoForSystem(effect, 'name') + ' ' +
|
||||
'<kbd>' + Util.getSystemEffectMultiplierByAreaId(parseInt(areaId)) + 'x' + '</kbd>' +
|
||||
'<span class="pull-right ' + Util.getSecurityClassForSystem(security) + '">' + security + '</span>';
|
||||
|
||||
let content = Util.getSystemEffectTable(systemEffectData);
|
||||
|
||||
@@ -34,8 +34,8 @@ define([
|
||||
|
||||
let systemEffectData = Util.getSystemEffectData();
|
||||
|
||||
// last active (hover) table columnIndex
|
||||
let lastActiveColIndex = null;
|
||||
// last active (hover) table columnName
|
||||
let lastActiveColName = null;
|
||||
|
||||
let colCount = 0;
|
||||
for(let [effectName, effectData] of Object.entries(systemEffectData.wh)){
|
||||
@@ -59,8 +59,10 @@ define([
|
||||
let securityClass = Util.getSecurityClassForSystem(systemType);
|
||||
|
||||
if(areaId === '1'){
|
||||
rows.push( $('<tr>') );
|
||||
rows.push( $('<tr>') );
|
||||
thead.append( rows[0] );
|
||||
thead.append( rows[1] );
|
||||
|
||||
rows[0].append(
|
||||
$('<th>').html(' ' + systemEffectName).prepend(
|
||||
@@ -69,24 +71,30 @@ define([
|
||||
})
|
||||
)
|
||||
);
|
||||
|
||||
rows[1].append($('<th>'));
|
||||
}
|
||||
|
||||
rows[0].append( $('<th>', {
|
||||
class: ['text-right', 'col-xs-1', securityClass].join(' ')
|
||||
}).text( systemType ));
|
||||
}).text( systemType ).attr('data-name', systemType));
|
||||
|
||||
rows[1].append( $('<th>', {
|
||||
class: ['text-right', 'txt-color', 'txt-color-grayLight'].join(' ')
|
||||
}).text(Util.getSystemEffectMultiplierByAreaId(parseInt(areaId)) + ' x').attr('data-name', systemType));
|
||||
|
||||
for(let [i, data] of Object.entries(areaData)){
|
||||
i = parseInt(i);
|
||||
if(areaId === '1'){
|
||||
rows.push( $('<tr>') );
|
||||
tbody.append(rows[i + 1]);
|
||||
tbody.append(rows[i + 2]);
|
||||
|
||||
// add label
|
||||
rows[i + 1].append( $('<td>').text( data.effect ));
|
||||
rows[i + 2].append( $('<td>').text( data.effect ));
|
||||
}
|
||||
|
||||
|
||||
rows[i + 1].append( $('<td>', {
|
||||
rows[i + 2].append( $('<td>', {
|
||||
class: 'text-right'
|
||||
}).text( data.value ));
|
||||
}
|
||||
@@ -148,25 +156,26 @@ define([
|
||||
tableApi.tables().nodes().to$().on('mouseover', 'td', function(){
|
||||
// inside table cell -> get current hover colIndex
|
||||
let colIndex = tableApi.cell(this).index().column;
|
||||
let colName = tableApi.column(colIndex).header().dataset.name || '';
|
||||
|
||||
if(colIndex !== lastActiveColIndex){
|
||||
if(colName !== lastActiveColName){
|
||||
removeColumnHighlight();
|
||||
|
||||
lastActiveColIndex = colIndex;
|
||||
lastActiveColName = colName;
|
||||
|
||||
if(colIndex > 0){
|
||||
// active column changed -> highlight same colIndex on other tables
|
||||
if(colName.length){
|
||||
// active column changed -> highlight same colName on other tables
|
||||
let tableApis = $.fn.dataTable.tables({ visible: false, api: true })
|
||||
.tables('.' + config.systemEffectTableClass);
|
||||
|
||||
let columns = tableApis.columns(colIndex);
|
||||
let columns = tableApis.columns([colName + ':name']);
|
||||
columns.header().flatten().to$().addClass('colHighlight');
|
||||
columns.nodes().flatten().to$().addClass('colHighlight');
|
||||
}
|
||||
}
|
||||
}).on('mouseleave', function(){
|
||||
// no longer inside table
|
||||
lastActiveColIndex = null;
|
||||
lastActiveColName = null;
|
||||
removeColumnHighlight();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2146,6 +2146,13 @@ define([
|
||||
return mapModule;
|
||||
};
|
||||
|
||||
/**
|
||||
*
|
||||
* @param ariaId
|
||||
* @returns {number}
|
||||
*/
|
||||
let getSystemEffectMultiplierByAreaId = ariaId => SystemEffect.getMultiplierByAreaId(ariaId);
|
||||
|
||||
/**
|
||||
* get areaId by security string
|
||||
* areaId is required as a key for signature names
|
||||
@@ -2165,9 +2172,6 @@ define([
|
||||
case '0.0':
|
||||
areaId = 32;
|
||||
break;
|
||||
case 'SH':
|
||||
areaId = 13;
|
||||
break;
|
||||
default:
|
||||
// w-space
|
||||
for(let i = 1; i <= 18; i++){
|
||||
@@ -3499,6 +3503,7 @@ define([
|
||||
getLabelByRole: getLabelByRole,
|
||||
getMapElementFromOverlay: getMapElementFromOverlay,
|
||||
getMapModule: getMapModule,
|
||||
getSystemEffectMultiplierByAreaId: getSystemEffectMultiplierByAreaId,
|
||||
getSystemEffectData: getSystemEffectData,
|
||||
getSystemEffectTable: getSystemEffectTable,
|
||||
getSystemPlanetsTable: getSystemPlanetsTable,
|
||||
|
||||
Reference in New Issue
Block a user