Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-08-25 19:04:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix Objective completion count, does not always appear in 'a single match' (follow up 69d158320a)

Browse Source
This commit is contained in:
MaikyM
2019-06-19 00:39:28 -06:00
parent 9b4681b05f
commit d0350aeb18
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FModel/Methods/ChallengeGenerator/BundleInfos.cs
View File

@@ -105,16 +105,13 @@ namespace FModel
{
string newQuest;
if (LoadLocRes.myLocRes != null && Properties.Settings.Default.IconLanguage != "English")
{
newQuest = SearchResource.getTranslatedText(questParser[x].Objectives[p].Description.Key);
}
else { newQuest = questParser[x].Objectives[p].Description.SourceString; }
long newCount = questParser[x].Objectives[p].Count;
else
newQuest = questParser[x].Objectives[p].Description.SourceString;
if (questParser[x].BAthenaMustCompleteInSingleMatch && questParser[x].ObjectiveCompletionCount > 0)
{
long newCount = questParser[x].Objectives[p].Count;
if (questParser[x].ObjectiveCompletionCount > 0)
newCount = questParser[x].ObjectiveCompletionCount;
}
bool isFortbyte = false;
var assetTypeToken = questParser[x].Rewards.Where(item => item.ItemPrimaryAssetId.PrimaryAssetType.Name == "Token").FirstOrDefault();

1
FModel/Methods/IconGenerator/ItemIcon.cs
View File

@@ -339,7 +339,6 @@ namespace FModel
if (watermark != null)
{
var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)Settings.Default.wOpacity / 100);
toDrawOn.DrawImage(ImageUtilities.ResizeImage(opacityImage, Settings.Default.wSize, Settings.Default.wSize), (522 - Settings.Default.wSize) / 2, (522 - Settings.Default.wSize) / 2, Settings.Default.wSize, Settings.Default.wSize);
}
}