diff --git a/FModel/Methods/ChallengeGenerator/BundleInfos.cs b/FModel/Methods/ChallengeGenerator/BundleInfos.cs index 64aabce3..5f3e2863 100644 --- a/FModel/Methods/ChallengeGenerator/BundleInfos.cs +++ b/FModel/Methods/ChallengeGenerator/BundleInfos.cs @@ -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(); diff --git a/FModel/Methods/IconGenerator/ItemIcon.cs b/FModel/Methods/IconGenerator/ItemIcon.cs index 57dd3510..67f4b507 100644 --- a/FModel/Methods/IconGenerator/ItemIcon.cs +++ b/FModel/Methods/IconGenerator/ItemIcon.cs @@ -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); } }