Zkill Colour, out of region systems slightly darker

Slazanger · Dec 28, 2018 · 872dd81 · 872dd81
1 parent a4abd52
commit 872dd81
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -763,7 +763,7 @@ private void AddRegionsToUniverse()
         private void AddDataToUniverse()
         {
             Brush SysOutlineBrush = new SolidColorBrush(MapConf.ActiveColourScheme.SystemOutlineColour);
-            Brush TheraBrush = new SolidColorBrush(MapConf.ActiveColourScheme.TheraEntranceSystem);
+            Brush TheraBrush = new SolidColorBrush(MapConf.ActiveColourScheme.TheraEntranceRegion);
             Brush CharacterBrush = new SolidColorBrush(MapConf.ActiveColourScheme.CharacterHighlightColour);
 
             foreach (EVEData.MapRegion mr in EVEManager.Regions)

diff --git a/MapColours.cs b/MapColours.cs
@@ -110,6 +110,11 @@ public class MapColours
         [DisplayName("Thera Entrance (System)")]
         public Color TheraEntranceSystem { get; set; }
 
+        [Category("Zkill")]
+        [DisplayName("Data Overlay")]
+        public Color ZKillDataOverlay{ get; set; }
+
+
 
         static public Color GetSecStatusColour(double secStatus, bool GradeTrueSec)
         {

diff --git a/MapConfig.cs b/MapConfig.cs
@@ -364,7 +364,9 @@ public void SetDefaultColours()
             defaultColours.InRegionSystemTextColour = Color.FromRgb(0, 0, 0);
             defaultColours.OutRegionSystemColour = Color.FromRgb(218, 165, 32);
             defaultColours.OutRegionSystemTextColour = Color.FromRgb(0, 0, 0);
-            defaultColours.MapBackgroundColour = Color.FromRgb(104, 104, 117);
+
+
+            defaultColours.MapBackgroundColour = (Color)ColorConverter.ConvertFromString("#5E615E");
             defaultColours.ESIOverlayColour = Color.FromRgb(188, 143, 143);
             defaultColours.IntelOverlayColour = Color.FromRgb(178, 34, 34);
             defaultColours.NormalGateColour = Color.FromRgb(255, 248, 220);
@@ -384,6 +386,8 @@ public void SetDefaultColours()
             defaultColours.TheraEntranceRegion = Colors.YellowGreen;
             defaultColours.TheraEntranceSystem = Colors.YellowGreen;
 
+            defaultColours.ZKillDataOverlay = Colors.Purple;
+
 
 
 
@@ -419,6 +423,7 @@ public void SetDefaultColours()
             blueColours.TheraEntranceRegion = Colors.YellowGreen;
             blueColours.TheraEntranceSystem = Colors.YellowGreen;
 
+            blueColours.ZKillDataOverlay = Colors.Purple;
 
 
             MapColours.Add(blueColours);
@@ -452,6 +457,8 @@ public void SetDefaultColours()
             greyAndRed.TheraEntranceRegion = Colors.YellowGreen;
             greyAndRed.TheraEntranceSystem = Colors.YellowGreen;
 
+            greyAndRed.ZKillDataOverlay = Colors.Purple;
+
 
             MapColours.Add(greyAndRed);
 
@@ -484,6 +491,7 @@ public void SetDefaultColours()
             dark.TheraEntranceRegion = Colors.YellowGreen;
             dark.TheraEntranceSystem = Colors.YellowGreen;
 
+            dark.ZKillDataOverlay = Colors.Purple;
 
             MapColours.Add(dark);
 
@@ -516,6 +524,8 @@ public void SetDefaultColours()
             lateNight.TheraEntranceRegion = Colors.YellowGreen;
             lateNight.TheraEntranceSystem = Colors.YellowGreen;
 
+            lateNight.ZKillDataOverlay = Colors.Purple;
+
             MapColours.Add(lateNight);
 
             ActiveColourScheme = defaultColours;

diff --git a/RegionControl.xaml b/RegionControl.xaml
@@ -70,7 +70,7 @@
 
             <Label x:Name="BridgeInfoL1" HorizontalContentAlignment="Left" HorizontalAlignment="Right" Margin="0,0,25,188" VerticalAlignment="Bottom" FontSize="14" Panel.ZIndex="50" FontWeight="Bold" RenderTransformOrigin="-4.3,7.3" />
             <Label x:Name="BridgeInfoL2" HorizontalContentAlignment="Left" HorizontalAlignment="Right" Margin="0,0,25,168" VerticalAlignment="Bottom" FontSize="14" Panel.ZIndex="50" FontWeight="Bold" RenderTransformOrigin="-4.3,7.3" />
-
+            <Border BorderThickness="3" BorderBrush="Black" CornerRadius="4"/>
             <Border BorderThickness="2" BorderBrush="Black" Background="#FF232223" Width="190" Height="140" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20" CornerRadius="4" Panel.ZIndex="111" Grid.Row="1"  Visibility="{Binding Path=MapConf.ShowToolBox, Converter={StaticResource BoolToVis},  diag:PresentationTraceSources.TraceLevel=High}" >
                 <Canvas x:Name="ToolBoxCanvas">
                     <Grid Canvas.Left="0" Canvas.Top="2" Width="210" >

diff --git a/RegionControl.xaml.cs b/RegionControl.xaml.cs
@@ -607,9 +607,11 @@ private void AddSystemsToMap()
 
             Color bgd = MapConf.ActiveColourScheme.MapBackgroundColour;
 
-            bgd.R =(byte)(0.7 * bgd.R);
-            bgd.G = (byte)(0.7 * bgd.G);
-            bgd.B = (byte)(0.7 * bgd.B);
+            float darkenFactor = 0.9f;
+
+            bgd.R =(byte)(darkenFactor * bgd.R);
+            bgd.G = (byte)(darkenFactor * bgd.G);
+            bgd.B = (byte)(darkenFactor * bgd.B);
 
             Brush MapBackgroundBrushDarkend = new SolidColorBrush(bgd);
 
@@ -1084,9 +1086,10 @@ private void AddSystemsToMap()
                     Canvas.SetTop(sysRegionText, system.LayoutY + regionMarkerOffset);
                     Canvas.SetZIndex(sysRegionText, SYSTEM_Z_INDEX);
 
+                    MainCanvas.Children.Add(sysRegionText);
 
 
-                    /*
+
                     Polygon poly = new Polygon();
 
                     foreach (Point p in system.CellPoints)
@@ -1103,8 +1106,7 @@ private void AddSystemsToMap()
                     poly.StrokeLineJoin = PenLineJoin.Round;
                     MainCanvas.Children.Add(poly);
 
-                    MainCanvas.Children.Add(sysRegionText);
-                    */
+
                 }
             }
 
@@ -1613,7 +1615,7 @@ private void AddDataToMap()
 
 
             SolidColorBrush infoColour = new SolidColorBrush(DataColor);
-            SolidColorBrush zkbColour = new SolidColorBrush(Colors.Purple);
+            SolidColorBrush zkbColour = new SolidColorBrush(MapConf.ActiveColourScheme.ZKillDataOverlay);
 
             SolidColorBrush infoLargeColour = new SolidColorBrush(DataLargeColor);
             SolidColorBrush infoVulnerable = new SolidColorBrush(MapConf.ActiveColourScheme.SOVStructureVunerableColour);
@@ -2039,7 +2041,18 @@ private void SysContexMenuItemCopy_Click(object sender, RoutedEventArgs e)
             {
                 if (eveSys != null)
                 {
-                    Clipboard.SetText(eveSys.Name);
+                    bool CopyWithMeta = true;
+                    if(CopyWithMeta)
+                    {
+                        Clipboard.SetText($"<url=showinfo:5//{eveSys.ActualSystem.ID}>{eveSys.Name}</url>");
+                    }
+                    else
+                    {
+                        Clipboard.SetText(eveSys.Name);
+                    }
+
+
+
                 }
             }
             catch { }