- new combat sites or Thera added
- new frigate wormhole options added for C13 shattered wormholes
This commit is contained in:
Mark Friedrich
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -102,7 +102,7 @@ define(['jquery'], ($) => {
|
||||
4: 'M609 - C4',
|
||||
5: 'L614 - C5',
|
||||
6: 'S804 - C6',
|
||||
7: 'F353 - Thera'
|
||||
7: 'F353 - C12 Thera'
|
||||
},
|
||||
6: { // ORE
|
||||
1: 'Ordinary Perimeter Deposit', //*
|
||||
@@ -146,7 +146,7 @@ define(['jquery'], ($) => {
|
||||
4: 'Y683 - C4',
|
||||
5: 'N062 - C5',
|
||||
6: 'R474 - C6',
|
||||
7: 'F135 - Thera'
|
||||
7: 'F135 - C12 Thera'
|
||||
},
|
||||
6: { // ORE
|
||||
1: 'Ordinary Perimeter Deposit', //*
|
||||
@@ -192,7 +192,7 @@ define(['jquery'], ($) => {
|
||||
4: 'T405 - C4',
|
||||
5: 'N770 - C5',
|
||||
6: 'A982 - C6',
|
||||
7: 'F135 - Thera'
|
||||
7: 'F135 - C12 Thera'
|
||||
},
|
||||
6: { // ORE
|
||||
1: 'Ordinary Perimeter Deposit', //*
|
||||
@@ -341,6 +341,14 @@ define(['jquery'], ($) => {
|
||||
1: 'Superior Blood Raider Covert Research Facility' //*
|
||||
}
|
||||
},
|
||||
12: { // Thera wormhole
|
||||
1: { // Combat
|
||||
1: 'Epicenter',
|
||||
2: 'Expedition Command Outpost Wreck',
|
||||
3: 'Planetary Colonization Office Wreck',
|
||||
4: 'Testing Facilities'
|
||||
}
|
||||
},
|
||||
13: { // Shattered Wormholes
|
||||
5: { // Wormhole (some of them are static)
|
||||
1: 'P060 - C1',
|
||||
@@ -378,7 +386,7 @@ define(['jquery'], ($) => {
|
||||
}
|
||||
}, // system type (k-space)
|
||||
2: {
|
||||
10: { // High Sec
|
||||
30: { // High Sec
|
||||
5: { // Wormhole
|
||||
1: 'Z971 - C1',
|
||||
2: 'R943 - C2',
|
||||
@@ -389,10 +397,10 @@ define(['jquery'], ($) => {
|
||||
7: 'A641 - H',
|
||||
8: 'R051 - L',
|
||||
9: 'V283 - 0.0',
|
||||
10: 'T458 - Thera'
|
||||
10: 'T458 - C12 Thera'
|
||||
}
|
||||
},
|
||||
11: { // Low Sec
|
||||
31: { // Low Sec
|
||||
5: { // Wormhole
|
||||
1: 'Z971 - C1',
|
||||
2: 'R943 - C2',
|
||||
@@ -403,10 +411,10 @@ define(['jquery'], ($) => {
|
||||
7: 'B449 - H',
|
||||
8: 'N944 - L',
|
||||
9: 'S199 - 0.0',
|
||||
10: 'M164 - Thera'
|
||||
10: 'M164 - C12 Thera'
|
||||
}
|
||||
},
|
||||
12: { // 0.0
|
||||
32: { // 0.0
|
||||
5: { // Wormhole
|
||||
1: 'Z971 - C1',
|
||||
2: 'R943 - C2',
|
||||
@@ -417,7 +425,7 @@ define(['jquery'], ($) => {
|
||||
7: 'B449 - H',
|
||||
8: 'N944 - L',
|
||||
9: 'S199 - 0.0',
|
||||
10: 'L031 - Thera'
|
||||
10: 'L031 - C12 Thera'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,7 +202,7 @@ define(['jquery'], ($) => {
|
||||
},
|
||||
// system security
|
||||
systemSecurity: {
|
||||
security: {
|
||||
'security': {
|
||||
class: 'pf-system-sec'
|
||||
},
|
||||
'A': {
|
||||
@@ -220,23 +220,26 @@ define(['jquery'], ($) => {
|
||||
'0.0': {
|
||||
class: 'pf-system-sec-nullSec'
|
||||
},
|
||||
'C6': {
|
||||
class: 'pf-system-sec-high'
|
||||
},
|
||||
'C5': {
|
||||
class: 'pf-system-sec-high'
|
||||
},
|
||||
'C4': {
|
||||
class: 'pf-system-sec-mid'
|
||||
},
|
||||
'C3': {
|
||||
class: 'pf-system-sec-mid'
|
||||
'C1': {
|
||||
class: 'pf-system-sec-low'
|
||||
},
|
||||
'C2': {
|
||||
class: 'pf-system-sec-low'
|
||||
},
|
||||
'C1': {
|
||||
class: 'pf-system-sec-low'
|
||||
'C3': {
|
||||
class: 'pf-system-sec-mid'
|
||||
},
|
||||
'C4': {
|
||||
class: 'pf-system-sec-mid'
|
||||
},
|
||||
'C5': {
|
||||
class: 'pf-system-sec-high'
|
||||
},
|
||||
'C6': {
|
||||
class: 'pf-system-sec-high'
|
||||
},
|
||||
'C12': {
|
||||
class: 'pf-system-sec-special'
|
||||
}
|
||||
},
|
||||
// true sec
|
||||
@@ -486,36 +489,6 @@ define(['jquery'], ($) => {
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
},
|
||||
10: { // High Sec
|
||||
1: 'E004 - C1',
|
||||
2: 'L005 - C2',
|
||||
3: 'Z006 - C3',
|
||||
4: 'M001 - C4',
|
||||
5: 'C008 - C5',
|
||||
6: 'G008 - C6',
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
},
|
||||
11: { // Low Sec
|
||||
1: 'E004 - C1',
|
||||
2: 'L005 - C2',
|
||||
3: 'Z006 - C3',
|
||||
4: 'M001 - C4',
|
||||
5: 'C008 - C5',
|
||||
6: 'G008 - C6',
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
},
|
||||
12: { // 0.0
|
||||
1: 'E004 - C1',
|
||||
2: 'L005 - C2',
|
||||
3: 'Z006 - C3',
|
||||
4: 'M001 - C4',
|
||||
5: 'C008 - C5',
|
||||
6: 'G008 - C6',
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
},
|
||||
13: { // Shattered Wormholes (some of them are static)
|
||||
1: 'E004 - C1',
|
||||
2: 'L005 - C2',
|
||||
@@ -525,6 +498,36 @@ define(['jquery'], ($) => {
|
||||
6: 'G008 - C6',
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
},
|
||||
30: { // High Sec
|
||||
1: 'E004 - C1',
|
||||
2: 'L005 - C2',
|
||||
3: 'Z006 - C3',
|
||||
4: 'M001 - C4',
|
||||
5: 'C008 - C5',
|
||||
6: 'G008 - C6',
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
},
|
||||
31: { // Low Sec
|
||||
1: 'E004 - C1',
|
||||
2: 'L005 - C2',
|
||||
3: 'Z006 - C3',
|
||||
4: 'M001 - C4',
|
||||
5: 'C008 - C5',
|
||||
6: 'G008 - C6',
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
},
|
||||
32: { // 0.0
|
||||
1: 'E004 - C1',
|
||||
2: 'L005 - C2',
|
||||
3: 'Z006 - C3',
|
||||
4: 'M001 - C4',
|
||||
5: 'C008 - C5',
|
||||
6: 'G008 - C6',
|
||||
7: 'Q003 - 0.0',
|
||||
8: 'A009 - C13'
|
||||
}
|
||||
},
|
||||
// incoming wormholes
|
||||
@@ -535,7 +538,7 @@ define(['jquery'], ($) => {
|
||||
4: 'K162 - H',
|
||||
5: 'K162 - L',
|
||||
6: 'K162 - 0.0',
|
||||
7: 'K162 - Thera'
|
||||
7: 'K162 - C12 Thera'
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
@@ -85,7 +85,7 @@ define([
|
||||
let markup = '';
|
||||
if(parts.length === 2){
|
||||
// wormhole data -> 2 columns
|
||||
let securityClass = Util.getSecurityClassForSystem(parts[1].length > 3 ? parts[1].substring(0, 2) : parts[1]);
|
||||
let securityClass = Util.getSecurityClassForSystem(getSystemSecurityFromLabel(parts[1]));
|
||||
markup += '<span>' + parts[0] + '</span> ';
|
||||
markup += '<i class="fas fa-long-arrow-alt-right txt-color txt-color-grayLight"></i>';
|
||||
markup += '<span class="' + securityClass + ' ' + Util.config.popoverTriggerClass + ' ' + Util.config.helpDefaultClass +
|
||||
@@ -118,7 +118,7 @@ define([
|
||||
let parts = data.text.split(' - ');
|
||||
if(parts.length === 2){
|
||||
// wormhole data -> 2 columns
|
||||
let securityClass = Util.getSecurityClassForSystem(parts[1].length > 3 ? parts[1].substring(0, 2) : parts[1]);
|
||||
let securityClass = Util.getSecurityClassForSystem(getSystemSecurityFromLabel(parts[1]));
|
||||
|
||||
switch(formatType){
|
||||
case 'wormhole':
|
||||
@@ -182,6 +182,21 @@ define([
|
||||
return $(markup);
|
||||
};
|
||||
|
||||
/**
|
||||
* try to parse a security label into security name
|
||||
* -> "C1/2/3 (unknown)" -> C1
|
||||
* "C3" -> C3
|
||||
* "H" -> H
|
||||
* "0.0" -> 0.0
|
||||
* "C12 Thera" -> C12
|
||||
* @param security
|
||||
* @returns {string}
|
||||
*/
|
||||
let getSystemSecurityFromLabel = security => {
|
||||
let matches = security.match(/^(\w+\.?\w?)/i);
|
||||
return matches ? matches[1] : '';
|
||||
};
|
||||
|
||||
/**
|
||||
* init a select element as "select2" for map selection
|
||||
*/
|
||||
|
||||
@@ -1844,21 +1844,20 @@ define([
|
||||
let areaId = 0;
|
||||
switch(security){
|
||||
case 'H':
|
||||
areaId = 10;
|
||||
areaId = 30;
|
||||
break;
|
||||
case 'L':
|
||||
areaId = 11;
|
||||
areaId = 31;
|
||||
break;
|
||||
case '0.0':
|
||||
areaId = 12;
|
||||
areaId = 32;
|
||||
break;
|
||||
case 'SH':
|
||||
case 'C13':
|
||||
areaId = 13;
|
||||
break;
|
||||
default:
|
||||
// w-space
|
||||
for(let i = 1; i <= 6; i++){
|
||||
for(let i = 1; i <= 18; i++){
|
||||
if(security === 'C' + i){
|
||||
areaId = i;
|
||||
break;
|
||||
|
||||
@@ -130,18 +130,99 @@
|
||||
Any <em>"K-space"</em> system in <em>"New Eden"</em> has a fixed <em>"Security status"</em> between <samp>-1.0</samp> and <samp>+1.0</samp>.
|
||||
<em>"W-space"</em> systems always have a Security status of <samp>-1.0</samp>.
|
||||
They can be distinguished into <em>"Classes"</em> [C1 - C6].<br>
|
||||
The label color of the system indicates the <em>"Security Status"</em>.
|
||||
The label color of a system indicates the <em>"Security Status"</em>.
|
||||
</p>
|
||||
<ul style="list-style: none; margin-left: 10px">
|
||||
<li><span class="pf-system-sec-highSec">H</span> high security system<small> (<samp>1.0 - 0.5</samp>)</small></li>
|
||||
<li><span class="pf-system-sec-lowSec">L</span> low security system<small> (<samp>0.4 - 0.1</samp>)</small></li>
|
||||
<li><span class="pf-system-sec-nullSec">0.0</span> null security system<small> (<samp>0.0 - -1.0</samp>)</small></li>
|
||||
<li><span class="pf-system-sec-high">C6, C5</span> high class wormhole<small> (<samp>-1.0</samp>)</small></li>
|
||||
<li><span class="pf-system-sec-mid">C4, C3</span> mid class wormhole<small> (<samp>-1.0</samp>)</small></li>
|
||||
<li><span class="pf-system-sec-low">C2, C1</span> low class wormhole<small> (<samp>-1.0</samp>)</small></li>
|
||||
<li><span class="pf-system-sec-unknown">SH</span> shattered wormhole<small> (<samp>-1.0</samp>)</small></li>
|
||||
<li><span class="pf-system-sec-abyssal">A</span> abyss system<small> (<samp>-1.0</samp>)</small></li>
|
||||
</ul>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-6 col-md-4">
|
||||
<table class="table table-condensed" style="font-size: 12px">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="col-sm-2 text-center">k-space</td>
|
||||
<td></td>
|
||||
<td class="col-sm-3 text-right">security</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-highSec">H</td>
|
||||
<td>High security system</td>
|
||||
<td class="text-right">
|
||||
<samp class="pf-system-security-1-0">1.0</samp><samp> - </samp><samp class="pf-system-security-0-5">0.5</samp>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-lowSec">L</td>
|
||||
<td>Low security system</td>
|
||||
<td class="text-right">
|
||||
<samp class="pf-system-security-0-4">0.4</samp><samp> - </samp><samp class="pf-system-security-0-1">0.1</samp>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-nullSec">0.0</td>
|
||||
<td>Null security system</td>
|
||||
<td class="text-right">
|
||||
<samp class="pf-system-security-0-0">0.0</samp><samp> - </samp><samp class="pf-system-security-0-0">-1.0</samp>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-sm-6 col-md-4">
|
||||
<table class="table table-condensed" style="font-size: 12px">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="col-sm-2 text-center">w-space</td>
|
||||
<td></td>
|
||||
<td class="col-sm-3 text-right">security</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-low">C1, C2</td>
|
||||
<td>Low class wormhole</td>
|
||||
<td class="text-right"><samp class="pf-system-security-0-0">-1.0</samp></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-mid">C3, C4</td>
|
||||
<td>Mid class wormhole</td>
|
||||
<td class="text-right"><samp class="pf-system-security-0-0">-1.0</samp></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-high">C5, C6</td>
|
||||
<td>High class wormhole</td>
|
||||
<td class="text-right"><samp class="pf-system-security-0-0">-1.0</samp></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-sm-6 col-md-4">
|
||||
<table class="table table-condensed" style="font-size: 12px">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="col-sm-2 text-center">w-space</td>
|
||||
<td></td>
|
||||
<td class="col-sm-3 text-right">security</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-special">C12</td>
|
||||
<td>Thera class wormhole</td>
|
||||
<td class="text-right"><samp class="pf-system-security-0-0">-1.0</samp></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-unknown">SH</td>
|
||||
<td>Shattered wormhole</td>
|
||||
<td class="text-right"><samp class="pf-system-security-0-0">-1.0</samp></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-center pf-system-sec-abyssal">A</td>
|
||||
<td>Abyss system</td>
|
||||
<td class="text-right"><samp class="pf-system-security-0-0">-1.0</samp></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4 id="pf-manual-scrollspy-anchor-system-status">System status</h4>
|
||||
<p>
|
||||
The border color indicates the current status of a system.<br>
|
||||
|
||||
Reference in New Issue
Block a user