From 4b0213d456ebba76bfba83d9ffc5437ae07b0f0e Mon Sep 17 00:00:00 2001 From: soneill Date: Mon, 12 Jul 2021 11:27:37 +1200 Subject: [PATCH] Adds Pochven as system class T --- app/Controller/Api/Setup.php | 3 ++- app/Model/Pathfinder/SystemModel.php | 1 + app/Model/Universe/AbstractUniverseModel.php | 2 ++ js/app/conf/signature_type.js | 26 +++++++++++++++----- js/app/init.js | 3 +++ js/app/util.js | 3 +++ 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/app/Controller/Api/Setup.php b/app/Controller/Api/Setup.php index 31f85c78..872c87e9 100644 --- a/app/Controller/Api/Setup.php +++ b/app/Controller/Api/Setup.php @@ -363,7 +363,8 @@ class Setup extends Controller\Controller { ':regionIdJove3' => 10000004, ':ns' => '0.0', ':ls' => 'L', - ':hs' => 'H' + ':hs' => 'H', + ':tr' => 'T' ]; if($length){ diff --git a/app/Model/Pathfinder/SystemModel.php b/app/Model/Pathfinder/SystemModel.php index 8cb9f7c9..ac5818d6 100644 --- a/app/Model/Pathfinder/SystemModel.php +++ b/app/Model/Pathfinder/SystemModel.php @@ -788,6 +788,7 @@ class SystemModel extends AbstractMapTrackingModel { case 'H': case 'L': case '0.0': + case 'T': $typeId = 2; // k-space break; case 'A': diff --git a/app/Model/Universe/AbstractUniverseModel.php b/app/Model/Universe/AbstractUniverseModel.php index cc5c3a9a..3c8d5120 100644 --- a/app/Model/Universe/AbstractUniverseModel.php +++ b/app/Model/Universe/AbstractUniverseModel.php @@ -185,6 +185,8 @@ abstract class AbstractUniverseModel extends AbstractModel { $security = 'L'; }elseif($id == 9){ $security = '0.0'; + }elseif($id == 25){ + $security = 'T'; } return $security; diff --git a/js/app/conf/signature_type.js b/js/app/conf/signature_type.js index 333fe5a0..d5a13553 100644 --- a/js/app/conf/signature_type.js +++ b/js/app/conf/signature_type.js @@ -6,7 +6,7 @@ * proofed, signature names (copy & paste from scanning window) */ -define([], () => { + define([], () => { 'use strict'; // signature sources @@ -380,7 +380,8 @@ define([], () => { 7: 'B274 - H', 8: 'A239 - L', 9: 'E545 - 0.0', - 10: 'F135 - C12 Thera' + 10: 'F135 - C12 Thera', + 11: 'F216 - T Pochven' }; // all k-space exits are static or K162 @@ -394,7 +395,8 @@ define([], () => { 7: 'D845 - H', 8: 'U210 - L', 9: 'K346 - 0.0', - 10: 'F135 - C12 Thera' + 10: 'F135 - C12 Thera', + 11: 'F216 - T Pochven' }; // no *wandering* w-space -> w-space @@ -483,7 +485,8 @@ define([], () => { 7: 'A641 - H', 8: 'R051 - L', 9: 'V283 - 0.0', - 10: 'T458 - C12 Thera' + 10: 'T458 - C12 Thera', + 11: 'C729 - T Pochven' }; let lsWH = { @@ -496,7 +499,8 @@ define([], () => { 7: 'B449 - H', 8: 'N944 - L', 9: 'S199 - 0.0', - 10: 'M164 - C12 Thera' + 10: 'M164 - C12 Thera', + 11: 'C729 - T Pochven' }; let nullWH = { @@ -509,7 +513,14 @@ define([], () => { 7: 'B449 - H', 8: 'N944 - L', 9: 'S199 - 0.0', - 10: 'L031 - C12 Thera' + 10: 'L031 - C12 Thera', + 11: 'C729 - T Pochven', + 12: 'U372 - T Pochven' + }; + + let pochWH = { + 1: 'R081 - C4', + 2: 'X450 - 0.0' }; // ================================================================================================================ @@ -607,6 +618,9 @@ define([], () => { }, 32: { // 0.0 5: nullWH + }, + 33: { // Pochven + 5: pochWH } } }; diff --git a/js/app/init.js b/js/app/init.js index 39ba7ce0..868bdfe9 100644 --- a/js/app/init.js +++ b/js/app/init.js @@ -236,6 +236,9 @@ define([], () => { 'L': { class: 'pf-system-sec-lowSec' }, + 'T': { + class: 'pf-system-sec-triglav' + }, '0.0': { class: 'pf-system-sec-nullSec' }, diff --git a/js/app/util.js b/js/app/util.js index 3306d51f..6fc4f76e 100644 --- a/js/app/util.js +++ b/js/app/util.js @@ -2375,6 +2375,9 @@ define([ case '0.0': areaId = 32; break; + case 'T': + areaId = 33; + break; default: // w-space for(let i = 1; i <= 18; i++){