Set 2 Finishes

jtborn · Nov 7, 2019 · ef13546 · ef13546
1 parent 198ceff
commit ef13546
Show file tree

Hide file tree

Showing 49 changed files with 2,352 additions and 2,163 deletions.
diff --git a/Images/berserker_axe.png b/Images/berserker_axe.png
diff --git a/Images/champs/Aatrox-Icon.png b/Images/champs/Aatrox-Icon.png
diff --git a/Images/champs/Ashe-Icon.png b/Images/champs/Ashe-Icon.png
diff --git a/Images/champs/Diana-Icon.PNG b/Images/champs/Diana-Icon.PNG
diff --git a/Images/champs/DrMundo-Icon.png b/Images/champs/DrMundo-Icon.png
diff --git a/Images/champs/Ezreal-Icon.png b/Images/champs/Ezreal-Icon.png
diff --git a/Images/champs/Ivern-Icon.png b/Images/champs/Ivern-Icon.png
diff --git a/Images/champs/Jax-Icon.PNG b/Images/champs/Jax-Icon.PNG
diff --git a/Images/champs/KhaZix-Icon.png b/Images/champs/KhaZix-Icon.png
diff --git a/Images/champs/Kindred-Icon.png b/Images/champs/Kindred-Icon.png
diff --git a/Images/champs/KogMaw-Icon.png b/Images/champs/KogMaw-Icon.png
diff --git a/Images/champs/LeBlanc-Icon.PNG b/Images/champs/LeBlanc-Icon.PNG
diff --git a/Images/champs/Lux-Icon.PNG b/Images/champs/Lux-Icon.PNG
diff --git a/Images/champs/Malphite-Icon.png b/Images/champs/Malphite-Icon.png
diff --git a/Images/champs/Malzahar-Icon.png b/Images/champs/Malzahar-Icon.png
diff --git a/Images/champs/MasterYi-Icon.png b/Images/champs/MasterYi-Icon.png
diff --git a/Images/champs/Nami-Icon.PNG b/Images/champs/Nami-Icon.PNG
diff --git a/Images/champs/Nasus-Icon.PNG b/Images/champs/Nasus-Icon.PNG
diff --git a/Images/champs/Nautilus-Icon.png b/Images/champs/Nautilus-Icon.png
diff --git a/Images/champs/Nocturne-Icon.png b/Images/champs/Nocturne-Icon.png
diff --git a/Images/champs/Olaf-Icon.png b/Images/champs/Olaf-Icon.png
diff --git a/Images/champs/Ornn-Icon.PNG b/Images/champs/Ornn-Icon.PNG
diff --git a/Images/champs/Qiyana-Icon.PNG b/Images/champs/Qiyana-Icon.PNG
diff --git a/Images/champs/RekSai-Icon.png b/Images/champs/RekSai-Icon.png
diff --git a/Images/champs/Sion-Icon.png b/Images/champs/Sion-Icon.png
diff --git a/Images/champs/Soraka-Icon.png b/Images/champs/Soraka-Icon.png
diff --git a/Images/champs/Syndra-Icon.PNG b/Images/champs/Syndra-Icon.PNG
diff --git a/Images/champs/Thresh-Icon.png b/Images/champs/Thresh-Icon.png
diff --git a/Images/champs/Twitch-Icon.png b/Images/champs/Twitch-Icon.png
diff --git a/Images/champs/Vladimir-Icon.png b/Images/champs/Vladimir-Icon.png
diff --git a/Images/champs/Warwick-Icon.png b/Images/champs/Warwick-Icon.png
diff --git a/Images/champs/Yorick-Icon.PNG b/Images/champs/Yorick-Icon.PNG
diff --git a/Images/champs/Zed-Icon.png b/Images/champs/Zed-Icon.png
diff --git a/Images/cstyle/items/berserker_axe.png b/Images/cstyle/items/berserker_axe.png
diff --git a/Images/cstyle/items/inferno_cinder.png b/Images/cstyle/items/inferno_cinder.png
diff --git a/Images/cstyle/items/mages_cap.png b/Images/cstyle/items/mages_cap.png
diff --git a/Images/cstyle/items/talisman_of_light.png b/Images/cstyle/items/talisman_of_light.png
diff --git a/Images/cstyle/items/wardens_mail.png b/Images/cstyle/items/wardens_mail.png
diff --git a/Images/inferno_cinder.png b/Images/inferno_cinder.png
diff --git a/Images/mages_cap.png b/Images/mages_cap.png
diff --git a/Images/talisman_of_light.png b/Images/talisman_of_light.png
diff --git a/Images/wardens_mail.png b/Images/wardens_mail.png
diff --git a/Resource/ClassOrigins.xaml b/Resource/ClassOrigins.xaml
@@ -514,7 +514,7 @@
                 <TextBlock Text="4" Grid.Row="18" Grid.Column="4" FontSize="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontWeight="Bold"></TextBlock>
 
                 <Image Source="pack://application:,,,/Images/champs/Nami-Icon.png" Grid.Row="18" Grid.Column="5"></Image>
-                <TextBlock Text="5" Grid.Row="18" Grid.Column="4" FontSize="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontWeight="Bold"></TextBlock>
+                <TextBlock Text="5" Grid.Row="18" Grid.Column="5" FontSize="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontWeight="Bold"></TextBlock>
 
                 <!-- Phantom -->
 
@@ -594,7 +594,7 @@
                 <Image Source="pack://application:,,,/Images/champs/Twitch-Icon.png" Grid.Row="20" Grid.Column="3"></Image>
                 <TextBlock Text="4" Grid.Row="20" Grid.Column="3" FontSize="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontWeight="Bold"></TextBlock>
 
-                <Image Source="pack://application:,,,/Images/champs/Singed-Icon.png" Grid.Row="20" Grid.Column="3"></Image>
+                <Image Source="pack://application:,,,/Images/champs/Singed-Icon.png" Grid.Row="20" Grid.Column="4"></Image>
                 <TextBlock Text="5" Grid.Row="20" Grid.Column="4" FontSize="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontWeight="Bold"></TextBlock>
 
                 <!-- Robot -->

diff --git a/Resource/Items.xaml b/Resource/Items.xaml
diff --git a/Resource/ItemsBuilder.xaml b/Resource/ItemsBuilder.xaml
diff --git a/Resource/Localization/ItemStrings_en-US.xaml b/Resource/Localization/ItemStrings_en-US.xaml
@@ -6,6 +6,9 @@
     <!--Item Descriptions-->
     <!-- Spatula Items -->
     <!--/////////////////-->
+    <!--Berserker Axe-->
+    <s:String x:Key="BerserkerAxe" xml:space="preserve">Berserker Axe</s:String>
+    <s:String x:Key="BerserkerAxe1" xml:space="preserve">&#10;Wearer is also a Berserker</s:String>
     <!--Blade of the Ruined King-->
     <s:String x:Key="BOTRK" xml:space="preserve">Blade of the Ruined King</s:String>
     <s:String x:Key="BOTRK1" xml:space="preserve">&#10;Wearer is also a Blademaster</s:String>
@@ -18,15 +21,27 @@
     <!--Frozen Mallet-->
     <s:String x:Key="FrozenMallet" xml:space="preserve">Frozen Mallet</s:String>
     <s:String x:Key="FrozenMallet1" xml:space="preserve">&#10;Wearer is also a Glacial</s:String>
+    <!--Inferno Cinder-->
+    <s:String x:Key="InfernoCinder" xml:space="preserve">Inferno Cinder</s:String>
+    <s:String x:Key="InfernoCinder1" xml:space="preserve">&#10;Wearer is also an Inferno</s:String>
     <!--Knight's Vow-->
     <s:String x:Key="KnightsVow" xml:space="preserve">Knight's Vow</s:String>
     <s:String x:Key="KnightsVow1" xml:space="preserve">&#10;Wearer is also a Knight</s:String>
+    <!--Mage's Cap-->
+    <s:String x:Key="MagesCap" xml:space="preserve">Mage's Cap</s:String>
+    <s:String x:Key="MagesCap1" xml:space="preserve">&#10;Wearer is also a Mage</s:String>
     <!--Mittens-->
     <s:String x:Key="Mittens" xml:space="preserve">Mittens</s:String>
     <s:String x:Key="Mittens1" xml:space="preserve">&#10;Wearer is also a Yordle</s:String>
     <!--Runaan's Hurricane-->
     <s:String x:Key="RunaansHurricane" xml:space="preserve">Runaan's Hurricane</s:String>
     <s:String x:Key="RunaansHurricane1" xml:space="preserve">&#10;Attacks hit 1 additional enemy and deal 75% damage, applying on-hit effects</s:String>
+    <!--Talisman Of Light-->
+    <s:String x:Key="TalismanOfLight" xml:space="preserve">Talisman Of Light</s:String>
+    <s:String x:Key="TalismanOfLight1" xml:space="preserve">&#10;Wearer is also a Light</s:String>
+    <!--Warden's Mail-->
+    <s:String x:Key="WardensMail" xml:space="preserve">Warden's Mail</s:String>
+    <s:String x:Key="WardensMail1" xml:space="preserve">&#10;Wearer is also a Warden</s:String>
     <!--Youmuu's Ghostblade-->
     <s:String x:Key="YoumuusGhostblade" xml:space="preserve">Youmuu's Ghostblade</s:String>
     <s:String x:Key="YoumuusGhostblade1" xml:space="preserve">&#10;Wearer is also an Assassin</s:String>

diff --git a/Resource/Localization/ItemStrings_zh-CN.xaml b/Resource/Localization/ItemStrings_zh-CN.xaml
diff --git a/Resource/Localization/ItemStrings_zh-CN.xaml.bak b/Resource/Localization/ItemStrings_zh-CN.xaml.bak
diff --git a/TFT Overlay.csproj b/TFT Overlay.csproj
@@ -644,6 +644,50 @@
   <ItemGroup>
     <Resource Include="Images\classes\Assassin.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\champs\Diana-Icon.PNG" />
+    <Resource Include="Images\champs\Jax-Icon.PNG" />
+    <Resource Include="Images\champs\LeBlanc-Icon.PNG" />
+    <Resource Include="Images\champs\Lux-Icon.PNG" />
+    <Resource Include="Images\champs\Nami-Icon.PNG" />
+    <Resource Include="Images\champs\Nasus-Icon.PNG" />
+    <Resource Include="Images\champs\Nocturne-Icon.png" />
+    <Resource Include="Images\champs\Ornn-Icon.PNG" />
+    <Resource Include="Images\champs\Qiyana-Icon.PNG" />
+    <Resource Include="Images\champs\Syndra-Icon.PNG" />
+    <Resource Include="Images\champs\Yorick-Icon.PNG" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\champs\Nautilus-Icon.png" />
+    <Resource Include="Images\champs\Sion-Icon.png" />
+    <Resource Include="Images\champs\Thresh-Icon.png" />
+    <Resource Include="Images\champs\Vladimir-Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\champs\Ivern-Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\champs\Malphite-Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\berserker_axe.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\champs\Olaf-Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\inferno_cinder.png" />
+    <Resource Include="Images\mages_cap.png" />
+    <Resource Include="Images\talisman_of_light.png" />
+    <Resource Include="Images\wardens_mail.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\cstyle\items\berserker_axe.png" />
+    <Resource Include="Images\cstyle\items\inferno_cinder.png" />
+    <Resource Include="Images\cstyle\items\mages_cap.png" />
+    <Resource Include="Images\cstyle\items\talisman_of_light.png" />
+    <Resource Include="Images\cstyle\items\wardens_mail.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('packages\Fody.4.2.1\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">