Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ private void UpdateIcon()
EquipmentIconType.JetBomberKeiun => "Assets/Equipment/JetFightingBomberKeiun.png",
EquipmentIconType.JetBomberKikka => "Assets/Equipment/JetFightingBomberKikka.png",
EquipmentIconType.JetBomberHo229 => "Assets/Equipment/JetFightingBomberHo229.png",
EquipmentIconType.JetFighterShinden => "Assets/Equipment/JetFighterShinden.png",
EquipmentIconType.TransportMaterial => "Assets/Equipment/TransportMaterials.png",
EquipmentIconType.SubmarineEquipment => "Assets/Equipment/SubmarineEquipment.png",
EquipmentIconType.SeaplaneFighter => "Assets/Equipment/SeaplaneFighter.png",
Expand Down
3 changes: 3 additions & 0 deletions ElectronicObserver.Core/Properties/EquipmentIconType.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,7 @@
<data name="Unknown" xml:space="preserve">
<value>Unknown</value>
</data>
<data name="JetFighterShinden" xml:space="preserve">
<value>Jet Fighter Shinden</value>
</data>
</root>
3 changes: 3 additions & 0 deletions ElectronicObserver.Core/Properties/EquipmentIconType.resx
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,7 @@
<data name="Unknown" xml:space="preserve">
<value>不明</value>
</data>
<data name="JetFighterShinden" xml:space="preserve">
<value>噴式艦上戦闘機(震電)</value>
</data>
</root>
3 changes: 3 additions & 0 deletions ElectronicObserver.Core/Types/EquipmentIconType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ public enum EquipmentIconType
/// <summary></summary>
JetBomberHo229 = 59,

/// <summary></summary>
JetFighterShinden = 60,

Locked,
Unknown,
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public static class EquipmentIconTypeExtensions
EquipmentIconType.LandBasedFighterJet => Properties.EquipmentIconType.LandBasedFighterJet,
EquipmentIconType.LandBasedFighterShinden => Properties.EquipmentIconType.LandBasedFighter,
EquipmentIconType.JetBomberHo229 => Properties.EquipmentIconType.JetBomberHo229,
EquipmentIconType.JetFighterShinden => Properties.EquipmentIconType.JetFighterShinden,
EquipmentIconType.Locked => Properties.EquipmentIconType.Locked,
_ => Properties.EquipmentIconType.Unknown,
};
Expand Down
Binary file modified ElectronicObserver/Assets.zip
Binary file not shown.
1 change: 1 addition & 0 deletions ElectronicObserver/Common/EquipmentIcon.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<markup:Case Label="{x:Static electronicObserverTypes:EquipmentIconType.LandBasedFighterShinden}" Value="{StaticResource EquipmentIconType.LandBasedFighterShinden}" />
<markup:Case Label="{x:Static electronicObserverTypes:EquipmentIconType.NightBomber}" Value="{StaticResource EquipmentIconType.NightBomber}" />
<markup:Case Label="{x:Static electronicObserverTypes:EquipmentIconType.JetBomberHo229}" Value="{StaticResource EquipmentIconType.JetBomberHo229}" />
<markup:Case Label="{x:Static electronicObserverTypes:EquipmentIconType.JetFighterShinden}" Value="{StaticResource EquipmentIconType.JetFighterShinden}" />
<markup:Case Value="{StaticResource EquipmentIconType.Unknown}" />
</markup:Switch>
</Image.Source>
Expand Down
1 change: 1 addition & 0 deletions ElectronicObserver/Icons.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<BitmapImage x:Key="EquipmentIconType.JetBomberKeiun" UriSource="pack://siteoforigin:,,,/Assets/Equipment/JetFightingBomberKeiun.png" />
<BitmapImage x:Key="EquipmentIconType.JetBomberKikka" UriSource="pack://siteoforigin:,,,/Assets/Equipment/JetFightingBomberKikka.png" />
<BitmapImage x:Key="EquipmentIconType.JetBomberHo229" UriSource="pack://siteoforigin:,,,/Assets/Equipment/JetFightingBomberHo229.png" />
<BitmapImage x:Key="EquipmentIconType.JetFighterShinden" UriSource="pack://siteoforigin:,,,/Assets/Equipment/JetFighterShinden.png" />
<BitmapImage x:Key="EquipmentIconType.TransportMaterial" UriSource="pack://siteoforigin:,,,/Assets/Equipment/TransportMaterials.png" />
<BitmapImage x:Key="EquipmentIconType.SubmarineEquipment" UriSource="pack://siteoforigin:,,,/Assets/Equipment/SubmarineEquipment.png" />
<BitmapImage x:Key="EquipmentIconType.SeaplaneFighter" UriSource="pack://siteoforigin:,,,/Assets/Equipment/SeaplaneFighter.png" />
Expand Down
2 changes: 2 additions & 0 deletions ElectronicObserver/Resource/ResourceManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public enum EquipmentContent
LandBasedFighterShinden,
NightBomber,
JetBomberHo229 = 59,
JetFighterShinden = 60,
Locked,
Unknown,
}
Expand Down Expand Up @@ -355,6 +356,7 @@ private void LoadFromArchive(string path)
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/LandBasedFighterShinden.png", "Equipment_LandBasedFighterShinden");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/NightBomber.png", "Equipment_NightBomber");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/JetFightingBomberHo229.png", "JetBomberHo229");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/JetFighterShinden.png", "JetFighterShinden");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/Locked.png", "Equipment_Locked");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/Unknown.png", "Equipment_Unknown");
}
Expand Down