From f6ceb2e4a0b85fe4dfc03b17673c2ecefc0c7921 Mon Sep 17 00:00:00 2001
From: Mark Friedrich <exodus4d@users.noreply.github.com>
Date: Tue, 8 Oct 2019 18:36:20 +0200
Subject: [PATCH] - New Combat signatures added to "Drifter" WHs

---
 app/main/lib/db/Pool.php                    |  4 +-
 js/app/conf/signature_type.js               | 45 +++++++++++++++++++++
 public/js/v1.5.4/app/conf/signature_type.js | 45 +++++++++++++++++++++
 public/templates/ui/notice.html             |  6 +--
 4 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/app/main/lib/db/Pool.php b/app/main/lib/db/Pool.php
index a3cbd545..2a415f92 100644
--- a/app/main/lib/db/Pool.php
+++ b/app/main/lib/db/Pool.php
@@ -110,8 +110,8 @@ class Pool extends \Prefab {
                 $schema = new Schema($db);
                 if(!in_array($newDbName, $schema->getDatabases())){
                     $db->exec("CREATE DATABASE IF NOT EXISTS 
-                        `" . $newDbName . "` DEFAULT CHARACTER SET utf8 
-                        COLLATE utf8_general_ci;");
+                        `" . $newDbName . "` DEFAULT CHARACTER SET utf8mb4 
+                        COLLATE utf8mb4_unicode_ci;");
                     $db->exec("USE `" . $newDbName . "`");
 
                     // check if DB create was successful
diff --git a/js/app/conf/signature_type.js b/js/app/conf/signature_type.js
index 0e0727f5..108da68b 100644
--- a/js/app/conf/signature_type.js
+++ b/js/app/conf/signature_type.js
@@ -383,6 +383,51 @@ define(['jquery'], ($) => {
                     30: 'K346 - 0.0',
                     31: 'Z060 - 0.0'
                 }
+            },
+            14: {   // Drifter Sentinel WH
+                1: {    // Combat
+                    1: 'Monolith',
+                    2: 'Wormhole in Rock Circle',
+                    3: 'Opposing Spatial Rifts',
+                    4: 'Sleeper Enclave Debris',
+                    5: 'Crystal Resource'
+                }
+            },
+            15: {   // Drifter Barbican WH
+                1: {    // Combat
+                    1: 'Wrecked Ships',
+                    2: 'Unstable Wormhole',
+                    3: 'Spatial Rift',
+                    4: 'Heavily Guarded Spatial Rift',
+                    5: 'Crystals'
+                }
+            },
+            16: {   // Drifter Vidette WH
+                1: {    // Combat
+                    1: 'Ship Graveyard',
+                    2: 'Sleeper Engineering Station',
+                    3: 'Spatial Rift',
+                    4: 'Sleeper Enclave in Coral Rock',
+                    5: 'Crystals and Stone Circle'
+                }
+            },
+            17: {   // Drifter Conflux WH
+                1: {    // Combat
+                    1: 'Monolith',
+                    2: 'Caged Wormhole',
+                    3: 'Rock Formation and Wormhole',
+                    4: 'Particle Acceleration Array',
+                    5: 'Guarded Asteroid Station'
+                }
+            },
+            18: {   // Drifter Redoubt WH
+                1: {    // Combat
+                    1: 'Ship Graveyard',
+                    2: 'Caged Wormhole',
+                    3: 'Spatial Rift Generator',
+                    4: 'Sleeper Enclave',
+                    5: 'Hollow Asteroid'
+                }
             }
         }, // system type (k-space)
         2:  {
diff --git a/public/js/v1.5.4/app/conf/signature_type.js b/public/js/v1.5.4/app/conf/signature_type.js
index 0e0727f5..108da68b 100644
--- a/public/js/v1.5.4/app/conf/signature_type.js
+++ b/public/js/v1.5.4/app/conf/signature_type.js
@@ -383,6 +383,51 @@ define(['jquery'], ($) => {
                     30: 'K346 - 0.0',
                     31: 'Z060 - 0.0'
                 }
+            },
+            14: {   // Drifter Sentinel WH
+                1: {    // Combat
+                    1: 'Monolith',
+                    2: 'Wormhole in Rock Circle',
+                    3: 'Opposing Spatial Rifts',
+                    4: 'Sleeper Enclave Debris',
+                    5: 'Crystal Resource'
+                }
+            },
+            15: {   // Drifter Barbican WH
+                1: {    // Combat
+                    1: 'Wrecked Ships',
+                    2: 'Unstable Wormhole',
+                    3: 'Spatial Rift',
+                    4: 'Heavily Guarded Spatial Rift',
+                    5: 'Crystals'
+                }
+            },
+            16: {   // Drifter Vidette WH
+                1: {    // Combat
+                    1: 'Ship Graveyard',
+                    2: 'Sleeper Engineering Station',
+                    3: 'Spatial Rift',
+                    4: 'Sleeper Enclave in Coral Rock',
+                    5: 'Crystals and Stone Circle'
+                }
+            },
+            17: {   // Drifter Conflux WH
+                1: {    // Combat
+                    1: 'Monolith',
+                    2: 'Caged Wormhole',
+                    3: 'Rock Formation and Wormhole',
+                    4: 'Particle Acceleration Array',
+                    5: 'Guarded Asteroid Station'
+                }
+            },
+            18: {   // Drifter Redoubt WH
+                1: {    // Combat
+                    1: 'Ship Graveyard',
+                    2: 'Caged Wormhole',
+                    3: 'Spatial Rift Generator',
+                    4: 'Sleeper Enclave',
+                    5: 'Hollow Asteroid'
+                }
             }
         }, // system type (k-space)
         2:  {
diff --git a/public/templates/ui/notice.html b/public/templates/ui/notice.html
index e6665873..c212dabe 100644
--- a/public/templates/ui/notice.html
+++ b/public/templates/ui/notice.html
@@ -10,13 +10,13 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <ul class="list-unstyled text-left">
-                                <li><i class="fas fa-fw fa-angle-right"></i>Fixed duplicated wormhole jump logs <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/822" rel="noopener">#822</a></li>
-                                <li><i class="fas fa-fw fa-angle-right"></i>Fixed issue where systems can not be delete <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/820" rel="noopener">#820</a></li>
+                                <li><i class="fas fa-fw fa-angle-right"></i>Data for NPC stations added <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/858" rel="noopener">#858</a></li>
+                                <li><i class="fas fa-fw fa-angle-right"></i>"Sovereignty" and "Faction warfare" data added <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/853" rel="noopener">#853</a></li>
                             </ul>
                         </div>
                         <div class="col-sm-6">
                             <ul class="list-unstyled text-left">
-                                <li><i class="fas fa-fw fa-angle-right"></i>Fixed "empty system body" shows <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/823" rel="noopener">#823</a></li>
+                                <li><i class="fas fa-fw fa-angle-right"></i>New preview for "signature table" updates <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/803" rel="noopener">#803</a></li>
                                 <li><i class="fas fa-fw fa-angle-double-right"></i>Many more improvements/fixes. Complete <a href="javascript:void(0)" class="pf-navbar-version-info">changelog</a></li>
                             </ul>
                         </div>