Merge pull request #223 from WolfgangKurz/NightFighterIcon

Update new icon
Grabacr07 · Oct 17, 2017 · 38d2dca · 38d2dca
2 parents 931a8b8 + b2d3956
commit 38d2dca
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 5 deletions.
diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing"
 					xmlns:controls="clr-namespace:Grabacr07.KanColleViewer.Controls">
@@ -790,7 +790,7 @@
 				</Setter>
 			</Trigger>
 			<Trigger Property="Type"
-					 Value="LandBasedFighter">
+					 Value="InterceptorFighter">
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
@@ -943,6 +943,68 @@
 					</Setter.Value>
 				</Setter>
 			</Trigger>
+			<Trigger Property="Type"
+					 Value="LandBasedFighter">
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
+							<Viewbox>
+								<Grid>
+									<Path Data="M699,293 L652,300 620,314 581,288 551,285 548,299 578,319 578,335 570,336 556,315 548,319 560,336 556,354 569,362 580,391 589,386 579,364 600,364 613,350 648,379 672,391 681,371 662,348 727,316&#xD;&#xA;737,304 751,307 761,317 783,312 755,291 764,258 746,252 735,284 711,275 699,277 z"
+										  Fill="#FF9AEEA8"
+										  HorizontalAlignment="Left"
+										  Height="139"
+										  Stretch="Uniform"
+										  VerticalAlignment="Top"
+										  Width="235" />
+									<ed:RegularPolygon PointCount="6"
+													   InnerRadius="1"
+													   Stretch="Fill"
+													   Stroke="Black"
+													   StrokeThickness="2"
+													   Fill="#FF9AEEA8"
+													   Width="126"
+													   Height="146"
+													   HorizontalAlignment="Left"
+													   VerticalAlignment="Top"
+													   Margin="91.033,50.606,0,0" />
+								</Grid>
+							</Viewbox>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+			<Trigger Property="Type"
+					 Value="NightFighter">
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
+							<Viewbox>
+								<Grid>
+									<Path Data="M699,293 L652,300 620,314 581,288 551,285 548,299 578,319 578,335 570,336 556,315 548,319 560,336 556,354 569,362 580,391 589,386 579,364 600,364 613,350 648,379 672,391 681,371 662,348 727,316&#xD;&#xA;737,304 751,307 761,317 783,312 755,291 764,258 746,252 735,284 711,275 699,277 z"
+										  Fill="#FF39B74E"
+										  HorizontalAlignment="Left"
+										  Height="139"
+										  Stretch="Uniform"
+										  VerticalAlignment="Top"
+										  Width="235" />
+									<ed:RegularPolygon PointCount="6"
+													   InnerRadius="1"
+													   Stretch="Fill"
+													   Stroke="Black"
+													   StrokeThickness="2"
+													   Fill="#FF827DB0"
+													   Width="126"
+													   Height="146"
+													   HorizontalAlignment="Left"
+													   VerticalAlignment="Top"
+													   Margin="91.033,50.606,0,0" />
+								</Grid>
+							</Viewbox>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
 		</Style.Triggers>
 	</Style>
 

diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -56,7 +56,7 @@ public enum SlotItemIconType
 		ReconPlane = 9,
 
 		/// <summary>
-		/// 水上機。
+		/// 水上爆撃機, 水上偵察機。
 		/// </summary>
 		ReconSeaplane = 10,
 
@@ -198,7 +198,7 @@ public enum SlotItemIconType
 		/// <summary>
 		/// 局地戦闘機。
 		/// </summary>
-		LandBasedFighter = 38,
+		InterceptorFighter = 38,
 
 		/// <summary>
 		/// 噴式戦闘爆撃機
@@ -224,5 +224,15 @@ public enum SlotItemIconType
 		/// 水上戦闘機
 		/// </summary>
 		SeaplaneFighter = 43,
+
+		/// <summary>
+		/// 陸軍戦闘機
+		/// </summary>
+		LandBasedFighter = 44,
+
+		/// <summary>
+		/// 夜間戦闘機
+		/// </summary>
+		NightFighter = 45,
 	}
 }