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
12 changes: 12 additions & 0 deletions Source/Data/Achievement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ public Achievement()
/// </summary>
public string BadgeName { get; set; }

public static bool IsValidBadgeName(string badgeName)
{
if (String.IsNullOrEmpty(badgeName))
return false;
if (badgeName == "0")
return false;
if (badgeName == "00000")
return false;

return true;
}

/// <summary>
/// Gets the trigger for the achievement.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion Source/Parser/Functions/AchievementFunction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public AchievementFunction()
Parameters.Add(new VariableDefinitionExpression("modified"));
DefaultParameters["modified"] = new StringConstantExpression("");
Parameters.Add(new VariableDefinitionExpression("badge"));
DefaultParameters["badge"] = new StringConstantExpression("0");
DefaultParameters["badge"] = new StringConstantExpression("00000");

Parameters.Add(new VariableDefinitionExpression("type"));
DefaultParameters["type"] = new StringConstantExpression("");
Expand Down
77 changes: 74 additions & 3 deletions Source/ViewModels/AchievementViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
using Jamiras.Components;
using Jamiras.DataModels;
using Jamiras.Services;
using Jamiras.ViewModels;
using RATools.Data;
using RATools.Services;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;

namespace RATools.ViewModels
Expand All @@ -16,6 +18,7 @@ public AchievementViewModel(GameViewModel owner)
: base(owner)
{
CopyDefinitionToClipboardCommand = new DelegateCommand(CopyDefinitionToClipboard);
ChangeImageCommand = new DelegateCommand(ChangeImage);
}

public override string ViewerType
Expand All @@ -37,7 +40,13 @@ public override void Refresh()
else if (localAsset != null)
AchievementType = localAsset.Type;

if (String.IsNullOrEmpty(BadgeName))
if (generatedAsset != null && Achievement.IsValidBadgeName(generatedAsset.BadgeName))
BadgeName = generatedAsset.BadgeName;
else if (localAsset != null && Achievement.IsValidBadgeName(localAsset.BadgeName))
BadgeName = localAsset.BadgeName;
else if (coreAsset != null && Achievement.IsValidBadgeName(coreAsset.BadgeName))
BadgeName = coreAsset.BadgeName;
else
BadgeName = "00000";
}

Expand Down Expand Up @@ -79,14 +88,15 @@ public string TypeImage
protected override bool AreAssetSpecificPropertiesModified(AssetSourceViewModel left, AssetSourceViewModel right)
{
IsPointsModified = (left.Points.Value != right.Points.Value);
bool badgeModified = left.BadgeName != right.BadgeName;

var leftAchievement = left.Asset as Achievement;
var rightAchievement = right.Asset as Achievement;
var leftAchievementType = leftAchievement?.Type ?? AchievementType.Standard;
var rightAchievementType = rightAchievement?.Type ?? AchievementType.Standard;
IsAchievementTypeModified = leftAchievementType != rightAchievementType;

return IsPointsModified || IsAchievementTypeModified;
return IsPointsModified || IsAchievementTypeModified || badgeModified;
}

internal override IEnumerable<TriggerViewModel> BuildTriggerList(AssetSourceViewModel assetViewModel)
Expand Down Expand Up @@ -114,7 +124,7 @@ protected override void UpdateLocal(AssetBase asset, AssetBase localAsset, Strin

if (achievement != null)
{
if (String.IsNullOrEmpty(achievement.BadgeName) || achievement.BadgeName == "0")
if (!Achievement.IsValidBadgeName(achievement.BadgeName))
achievement.BadgeName = BadgeName;
}

Expand All @@ -136,6 +146,67 @@ private void CopyDefinitionToClipboard()
}
}

public DelegateCommand ChangeImageCommand { get; private set; }

private void ChangeImage()
{
var vm = new FileDialogViewModel();
vm.DialogTitle = "Select badge image";
vm.Filters["Image file"] = "*.png;*.gif;*.jpg;*.jpeg";
vm.CheckFileExists = true;

if (vm.ShowOpenFileDialog() != DialogResult.Ok)
return;

var bValid = false;
var bytes = File.ReadAllBytes(vm.FileNames[0]);
var sExtension = Path.GetExtension(vm.FileNames[0]).Substring(1).ToLower();
switch (sExtension)
{
case "png":
bValid = bytes[1] == 'P' && bytes[2] == 'N' && bytes[3] == 'G';
break;

case "gif":
bValid = bytes[0] == 'G' && bytes[1] == 'I' && bytes[2] == 'F' && bytes[3] == '8';
break;

case "jpg":
case "jpeg":
bValid = bytes[6] == 'J' && bytes[7] == 'F' && bytes[8] == 'I' && bytes[9] == 'F';
break;
}

if (!bValid)
{
MessageBoxViewModel.ShowMessage("File does not appear to be a valid " + sExtension + " image.");
return;
}

var achievement = Generated.Asset as Achievement;
if (achievement == null)
achievement = Published.Asset as Achievement;

if (achievement != null)
{
var md5 = Convert.ToHexString(System.Security.Cryptography.MD5.HashData(bytes)).ToLower();
var localFolder = Path.Combine(_owner.RACacheDirectory, "..", "Badge", "local");
if (!Directory.Exists(localFolder))
Directory.CreateDirectory(localFolder);
var localFilename = Path.Combine(localFolder, String.Format("{0}-{1}.{2}", _owner.GameId, md5, sExtension));
if (!File.Exists(localFilename))
File.Copy(vm.FileNames[0], localFilename);

achievement.BadgeName = localFilename.Substring(localFilename.LastIndexOf("local"));
if (ReferenceEquals(Generated.Asset, achievement))
Generated.BadgeName = achievement.BadgeName;
else
Published.BadgeName = achievement.BadgeName;

Refresh();
}
}

public string MeasuredTarget
{
get
Expand Down
26 changes: 7 additions & 19 deletions Source/ViewModels/AssetViewModelBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -425,14 +425,14 @@ internal string BadgeName
private static ImageSource GetBadge(ModelBase model)
{
var vm = (AssetViewModelBase)model;
if (IsValidBadgeName(vm.Generated.BadgeName))
if (Achievement.IsValidBadgeName(vm.Generated.BadgeName))
return vm.Generated.Badge;
if (IsValidBadgeName(vm.Local.BadgeName))
if (Achievement.IsValidBadgeName(vm.Local.BadgeName))
return vm.Local.Badge;
if (IsValidBadgeName(vm.Published.BadgeName))
if (Achievement.IsValidBadgeName(vm.Published.BadgeName))
return vm.Published.Badge;

if (IsValidBadgeName(vm.BadgeName))
if (Achievement.IsValidBadgeName(vm.BadgeName))
{
vm.Local.BadgeName = vm.BadgeName;
return vm.Local.Badge;
Expand All @@ -441,18 +441,6 @@ private static ImageSource GetBadge(ModelBase model)
return null;
}

private static bool IsValidBadgeName(string badgeName)
{
if (String.IsNullOrEmpty(badgeName))
return false;
if (badgeName == "0")
return false;
if (badgeName == "00000")
return false;

return true;
}

public override void Refresh()
{
var generatedAsset = Generated.Asset;
Expand Down Expand Up @@ -484,11 +472,11 @@ public override void Refresh()
else
Id = Published.Id;

if (IsValidBadgeName(Generated.BadgeName))
if (Achievement.IsValidBadgeName(Generated.BadgeName))
BadgeName = Generated.BadgeName;
else if (IsValidBadgeName(Local.BadgeName))
else if (Achievement.IsValidBadgeName(Local.BadgeName))
BadgeName = Local.BadgeName;
else if (IsValidBadgeName(Published.BadgeName))
else if (Achievement.IsValidBadgeName(Published.BadgeName))
BadgeName = Published.BadgeName;
else
BadgeName = null;
Expand Down
23 changes: 21 additions & 2 deletions Source/ViewModels/Navigation/NavigationListViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,28 @@ private void MergeGenerated(AchievementScriptInterpreter interpreter)

MergeAndPruneAssets<AchievementViewModel>(interpreter.Achievements, 10000, (vm, a) =>
{
var generatedAchievement = a as Achievement;
if (generatedAchievement != null)
{
vm.SourceLine = interpreter.GetSourceLine(generatedAchievement);

if (!Achievement.IsValidBadgeName(generatedAchievement.BadgeName))
{
var localAchievement = vm.Local.Asset as Achievement;
if (localAchievement != null && Achievement.IsValidBadgeName(localAchievement.BadgeName))
{
generatedAchievement.BadgeName = localAchievement.BadgeName;
}
else
{
var publishedAchievement = vm.Published.Asset as Achievement;
if (publishedAchievement != null && Achievement.IsValidBadgeName(publishedAchievement.BadgeName))
generatedAchievement.BadgeName = publishedAchievement.BadgeName;
}
}
}

vm.Generated.Asset = a;
if (a != null)
vm.SourceLine = interpreter.GetSourceLine((Achievement)a);
}, (vm) => vm.Generated.Asset);

MergeAndPruneAssets<LeaderboardViewModel>(interpreter.Leaderboards, 10000, (vm, a) =>
Expand Down
9 changes: 8 additions & 1 deletion Source/Views/AchievementViewer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<ContentPresenter ContentTemplate="{StaticResource assetImageTemplate}" />
<Grid>
<ContentPresenter ContentTemplate="{StaticResource assetImageTemplate}" />
<Grid.ContextMenu>
<ContextMenu>
<MenuItem Header="Change Image" Command="{Binding ChangeImageCommand}" />
</ContextMenu>
</Grid.ContextMenu>
</Grid>

<StackPanel Grid.Column="1">
<TextBlock Style="{StaticResource assetTitleStyle}" />
Expand Down
34 changes: 21 additions & 13 deletions Source/Views/AchievementsListViewer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,27 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<Image Source="{Binding Badge}" Width="64" Height="64" />
<Image Width="56" Height="56" Source="{Binding ViewerImage}">
<Image.Style>
<Style TargetType="{x:Type Image}">
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<DataTrigger Binding="{Binding Badge}" Value="{x:Null}">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
<Grid>
<Grid.ContextMenu>
<ContextMenu>
<MenuItem Header="Change Image" Command="{Binding ChangeImageCommand}" />
</ContextMenu>
</Grid.ContextMenu>

<Image Source="{Binding Badge}" Width="64" Height="64" />
<Image Width="56" Height="56" Source="{Binding ViewerImage}">
<Image.Style>
<Style TargetType="{x:Type Image}">
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<DataTrigger Binding="{Binding Badge}" Value="{x:Null}">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</Grid>

<Grid Grid.Column="1" Margin="8,0,0,0"
VerticalAlignment="Top" HorizontalAlignment="Stretch">
Expand Down
2 changes: 1 addition & 1 deletion Tests/Parser/AchievementScriptInterpreterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ public void TestDefaultParameterPassthrough()
// calling achievement() directly without a badge or id
var achievement = parser.Achievements.ElementAt(0);
Assert.That(achievement.Id, Is.EqualTo(0));
Assert.That(achievement.BadgeName, Is.EqualTo("0"));
Assert.That(achievement.BadgeName, Is.EqualTo("00000"));

// calling achievement() indirectly without a badge or id
achievement = parser.Achievements.ElementAt(1);
Expand Down
2 changes: 1 addition & 1 deletion Tests/Parser/Functions/AchievementFunctionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void TestDefinition()
Assert.That(def.DefaultParameters["modified"], Is.InstanceOf<StringConstantExpression>());
Assert.That(((StringConstantExpression)def.DefaultParameters["modified"]).Value, Is.EqualTo(""));
Assert.That(def.DefaultParameters["badge"], Is.InstanceOf<StringConstantExpression>());
Assert.That(((StringConstantExpression)def.DefaultParameters["badge"]).Value, Is.EqualTo("0"));
Assert.That(((StringConstantExpression)def.DefaultParameters["badge"]).Value, Is.EqualTo("00000"));
Assert.That(def.DefaultParameters["type"], Is.InstanceOf<StringConstantExpression>());
Assert.That(((StringConstantExpression)def.DefaultParameters["type"]).Value, Is.EqualTo(""));
Assert.That(def.DefaultParameters["set"], Is.InstanceOf<IntegerConstantExpression>());
Expand Down
Loading