Skip to content

Commit

Permalink
More Set 2 Updates
Browse files Browse the repository at this point in the history
Updated item values, synergy stat values, CN lang updates, changed Cursed Blade recipe to Runaan's Hurricane, adjusted player damage formula and re-roll % chance stats
  • Loading branch information
jtborn committed Nov 8, 2019
1 parent d9bf2e5 commit 05efb88
Show file tree
Hide file tree
Showing 11 changed files with 2,130 additions and 2,091 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
- [Click Here for instructions](https://github.com/jtborn/TFT-Overlay/blob/master/Localization.md)

## Version History
- **11.07.2019**
- [2.2.1](https://github.com/jtborn/TFT-Overlay/releases/tag/V2.2.1)
- Further set 2 updates for item/synergy stats
- CN language updates

- **11.06.2019**
- [2.2.0](https://github.com/jtborn/TFT-Overlay/releases/tag/V2.2.0)
- Set 2 updates
Expand Down
422 changes: 211 additions & 211 deletions Resource/Charts.xaml

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Resource/Items.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@
<Run Text="{DynamicResource PhantomDancer1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
</TextBlock>

<!-- Cursed Blade -->
<!-- Runaans -->
<Rectangle Grid.Row="10" Grid.Column="3" Width="8" Height="38" Fill="#C8AA6D"></Rectangle>
<Image Grid.Row="10" Grid.Column="2" Source="pack://application:,,,/Images/cstyle/items/Cape.png" />
<Image Grid.Row="10" Grid.Column="4" Source="pack://application:,,,/Images/cstyle/items/cursed_blade.png" />
<TextBlock Grid.Row="10" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource CursedBlade}" Foreground="LightGoldenrodYellow" FontSize="14" FontWeight="Bold">
<Run Text="{DynamicResource CursedBlade1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
<Image Grid.Row="10" Grid.Column="4" Source="pack://application:,,,/Images/cstyle/items/runaans_hurricane.png" />
<TextBlock Grid.Row="10" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource RunaansHurricane}" Foreground="LightGoldenrodYellow" FontSize="14" FontWeight="Bold">
<Run Text="{DynamicResource RunaansHurricane1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
</TextBlock>

<!-- Titanic Hydra -->
Expand Down Expand Up @@ -613,12 +613,12 @@
<Run Text="{DynamicResource Bloodthirster1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
</TextBlock>

<!-- Cursed Blade -->
<!-- Runaan's Hurricane -->
<Rectangle Grid.Row="2" Grid.Column="3" Width="8" Height="38" Fill="#C8AA6D"></Rectangle>
<Image Grid.Row="2" Grid.Column="2" Source="pack://application:,,,/Images/cstyle/items/Bow.png" />
<Image Grid.Row="2" Grid.Column="4" Source="pack://application:,,,/Images/cstyle/items/cursed_blade.png" />
<TextBlock Grid.Row="2" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource CursedBlade}" Foreground="LightGoldenrodYellow" FontSize="14" FontWeight="Bold">
<Run Text="{DynamicResource CursedBlade1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
<Image Grid.Row="2" Grid.Column="4" Source="pack://application:,,,/Images/cstyle/items/runaans_hurricane.png" />
<TextBlock Grid.Row="2" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource RunaansHurricane}" Foreground="LightGoldenrodYellow" FontSize="14" FontWeight="Bold">
<Run Text="{DynamicResource RunaansHurricane1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
</TextBlock>

<!-- Ionic Spark -->
Expand Down
10 changes: 5 additions & 5 deletions Resource/ItemsBuilder.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,13 @@
</Image.ToolTip>
</Image>
</Border>
<Border x:Name="CursedBlade" Grid.Row="4" Grid.Column="17" utilities:AttachedControls.RelatedControl="{x:Reference CursedBlade}" >
<Image Source="../Images/cursed_blade.png" Style="{StaticResource ImageStyle}">
<Border x:Name="RunaansHurricane" Grid.Row="4" Grid.Column="17" utilities:AttachedControls.RelatedControl="{x:Reference RunaansHurricane}" >
<Image Source="../Images/runaans_hurricane.png" Style="{StaticResource ImageStyle}">
<Image.ToolTip>
<ToolTip BorderBrush="LightGoldenrodYellow" BorderThickness="1" Background="Black" Placement="Top">
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontSize="14" FontWeight="Bold">
<Run Text="{DynamicResource CursedBlade}"/>
<Run Text="{DynamicResource CursedBlade1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
<Run Text="{DynamicResource RunaansHurricane}"/>
<Run Text="{DynamicResource RunaansHurricane1}" FontStyle="Italic" FontSize="12" FontWeight="Normal"/>
</TextBlock>
</ToolTip>
</Image.ToolTip>
Expand Down Expand Up @@ -786,7 +786,7 @@
<Condition Binding="{Binding ElementName=RecurveBowCounter, Path=Value, Converter={x:Static utilities:IsEqualOrGreaterThanConverter.Instance}, ConverterParameter=1}" Value="True" />
<Condition Binding="{Binding ElementName=NegatronCounter, Path=Value, Converter={x:Static utilities:IsEqualOrGreaterThanConverter.Instance}, ConverterParameter=1}" Value="True" />
</MultiDataTrigger.Conditions>
<Setter TargetName="CursedBlade" Property="Style" Value="{StaticResource ButtonBorder}"/>
<Setter TargetName="RunaansHurricane" Property="Style" Value="{StaticResource ButtonBorder}"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
Expand Down
Loading

0 comments on commit 05efb88

Please sign in to comment.