Skip to content

Commit

Permalink
Add Divine orb.
Browse files Browse the repository at this point in the history
  • Loading branch information
C1rdec committed Jan 3, 2020
1 parent 7b6363c commit 06b7899
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 1 deletion.
Binary file added src/Lurker.UI/Assets/Divine.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/Lurker.UI/Lurker.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Regal.png" />
<Resource Include="Assets\Divine.png" />
<Content Include="Svg.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>Svg.cs</LastGenOutput>
Expand Down
2 changes: 1 addition & 1 deletion src/Lurker.UI/ViewModels/TradeOfferViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public void MainAction()
/// </summary>
private void Sold()
{
this._keyboardHelper.Whisper(this.PlayerName, "Sold.");
this._keyboardHelper.Whisper(this.PlayerName, "Sold");
this.RemoveFromTradebar();
}

Expand Down
7 changes: 7 additions & 0 deletions src/Lurker.UI/Views/TradeOfferView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@
Visibility="{Binding CurrencyType,
Converter={Converters:CurrencyTypeConverter},
ConverterParameter={x:Static Models:CurrencyType.Regal}}"/>
<Image Grid.RowSpan="3"
Source="/Assets/Divine.png"
Height="{Binding ActualHeight, ElementName=MainAction}"
Width="{Binding ActualWidth, ElementName=MainAction}"
Visibility="{Binding CurrencyType,
Converter={Converters:CurrencyTypeConverter},
ConverterParameter={x:Static Models:CurrencyType.Divine}}"/>
<TextBlock TextTrimming="CharacterEllipsis"
HorizontalAlignment="Right"
Foreground="White"
Expand Down
1 change: 1 addition & 0 deletions src/Lurker/Helpers/CurrencyTypeParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public static class CurrencyTypeParser
{ CurrencyType.Alchemy, new string[]{ "alch", "alchemy", "orb of alchemy" } },
{ CurrencyType.Vaal, new string[]{ "vaal", "vaal orb" } },
{ CurrencyType.Regal, new string[]{ "regal", "regal orb" } },
{ CurrencyType.Divine, new string[]{ "divine", "divine orb" } },
};

/// <summary>
Expand Down
2 changes: 2 additions & 0 deletions src/Lurker/Models/CurrencyType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ public enum CurrencyType
Chromatic,

Regal,

Divine,
}
}

0 comments on commit 06b7899

Please sign in to comment.