Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@Triky313
Triky313 committed Jan 13, 2023
2 parents 8bfe54d + 6e044f5 commit ccd1b32
Show file tree
Hide file tree
Showing 11 changed files with 4,962 additions and 7,321 deletions.
4 changes: 2 additions & 2 deletions src/StatisticsAnalysisTool/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<value>ItemSpriteToJournal.json</value>
</setting>
<setting name="DefaultItemsJsonSourceUrl" serializeAs="String">
<value>https://raw.githubusercontent.com/broderickhyman/ao-bin-dumps/master/items.json</value>
<value>https://raw.githubusercontent.com/ao-data/ao-bin-dumps/master/items.json</value>
</setting>
<setting name="ItemsJsonFileName" serializeAs="String">
<value>Items.json</value>
Expand Down Expand Up @@ -213,7 +213,7 @@
<value>https://www.paypal.com/donate/?hosted_button_id=N6T3CWXYNGHKC</value>
</setting>
<setting name="DefaultItemListSourceUrl" serializeAs="String">
<value>https://raw.githubusercontent.com/broderickhyman/ao-bin-dumps/master/formatted/items.json</value>
<value>https://raw.githubusercontent.com/ao-data/ao-bin-dumps/master/formatted/items.json</value>
</setting>
<setting name="AutoUpdateConfigUrl" serializeAs="String">
<value>https://raw.githubusercontent.com/Triky313/AlbionOnline-StatisticsAnalysis/main/src/StatisticsAnalysisTool/ao-update-check.xml</value>
Expand Down
109 changes: 54 additions & 55 deletions src/StatisticsAnalysisTool/Common/UserSettings/SettingsObject.cs
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,59 @@
using StatisticsAnalysisTool.Models;
using System.Collections.Generic;

namespace StatisticsAnalysisTool.Common.UserSettings
namespace StatisticsAnalysisTool.Common.UserSettings;

public class SettingsObject
{
public class SettingsObject
{
public string CurrentLanguageCultureName { get; set; } = "en-US";
public int RefreshRate { get; set; } = 10000;
public string MainTrackingCharacterName { get; set; }
public int UpdateItemListByDays { get; set; } = 7;
public int UpdateItemsJsonByDays { get; set; } = 7;
public string ItemListSourceUrl { get; set; } = "https://raw.githubusercontent.com/broderickhyman/ao-bin-dumps/master/formatted/items.json";
public string ItemsJsonSourceUrl { get; set; } = "https://raw.githubusercontent.com/broderickhyman/ao-bin-dumps/master/items.json";
public bool IsOpenItemWindowInNewWindowChecked { get; set; } = true;
public bool IsInfoWindowShownOnStart { get; set; } = true;
public string SelectedAlertSound { get; set; }
public string CityPricesApiUrl { get; set; } = "https://www.albion-online-data.com/api/v2/stats/prices/";
public string CityPricesHistoryApiUrl { get; set; } = "https://www.albion-online-data.com/api/v2/stats/history/";
public string GoldStatsApiUrl { get; set; } = "https://www.albion-online-data.com/api/v2/stats/Gold";
public double MainWindowHeight { get; set; } = 100;
public double MainWindowWidth { get; set; } = 100;
public bool MainWindowMaximized { get; set; }
public bool IsTrackingResetByMapChangeActive { get; set; }
public bool IsMainTrackerFilterSilver { get; set; }
public bool IsMainTrackerFilterFame { get; set; }
public bool IsMainTrackerFilterFaction { get; set; }
public bool IsMainTrackerFilterSeasonPoints { get; set; }
public bool IsMainTrackerFilterEquipmentLoot { get; set; }
public bool IsMainTrackerFilterConsumableLoot { get; set; }
public bool IsMainTrackerFilterSimpleLoot { get; set; }
public bool IsMainTrackerFilterUnknownLoot { get; set; }
public bool IsMainTrackerFilterKill { get; set; }
public bool IsDamageMeterTrackingActive { get; set; } = true;
public bool IsTrackingPartyLootOnly { get; set; }
public bool IsTrackingSilver { get; set; }
public bool IsTrackingFame { get; set; }
public bool IsTrackingMobLoot { get; set; }
public bool IsLootLoggerSaveReminderActive { get; set; }
public bool IsSuggestPreReleaseUpdatesActive { get; set; }
public bool IsLootFromMobShown { get; set; }
public double MailMonitoringGridSplitterPosition { get; set; } = 125;
public double DungeonsGridSplitterPosition { get; set; } = 125;
public double StorageHistoryGridSplitterPosition { get; set; } = 125;
public double DamageMeterGridSplitterPosition { get; set; } = 125;
public bool ShortDamageMeterToClipboard { get; set; }
public bool IsMailMonitoringActive { get; set; } = true;
public bool IgnoreMailsWithZeroValues { get; set; } = false;
public int DeleteMailsOlderThanSpecifiedDays { get; set; } = 0;
public bool IsSnapshotAfterMapChangeActive { get; set; } = false;
public bool IsDamageMeterResetByMapChangeActive { get; set; } = false;
public bool IsDamageMeterResetBeforeCombatActive { get; set; } = false;
public double MailMonitoringMarketTaxRate { get; set; } = 4;
public double MailMonitoringMarketTaxSetupRate { get; set; } = 2.5;
public bool IsDungeonClosedSoundActive { get; set; } = false;
public int ItemWindowMainTabQualitySelection { get; set; }
public int ItemWindowHistoryTabQualitySelection { get; set; }
public List<MainTabLocationFilterSettingsObject> ItemWindowMainTabLocationFilters { get; set; } = new();
}
public string CurrentLanguageCultureName { get; set; } = "en-US";
public int RefreshRate { get; set; } = 10000;
public string MainTrackingCharacterName { get; set; }
public int UpdateItemListByDays { get; set; } = 7;
public int UpdateItemsJsonByDays { get; set; } = 7;
public string ItemListSourceUrl { get; set; } = "https://raw.githubusercontent.com/ao-data/ao-bin-dumps/master/formatted/items.json";
public string ItemsJsonSourceUrl { get; set; } = "https://raw.githubusercontent.com/ao-data/ao-bin-dumps/master/items.json";
public bool IsOpenItemWindowInNewWindowChecked { get; set; } = true;
public bool IsInfoWindowShownOnStart { get; set; } = true;
public string SelectedAlertSound { get; set; }
public string CityPricesApiUrl { get; set; } = "https://www.albion-online-data.com/api/v2/stats/prices/";
public string CityPricesHistoryApiUrl { get; set; } = "https://www.albion-online-data.com/api/v2/stats/history/";
public string GoldStatsApiUrl { get; set; } = "https://www.albion-online-data.com/api/v2/stats/Gold";
public double MainWindowHeight { get; set; } = 100;
public double MainWindowWidth { get; set; } = 100;
public bool MainWindowMaximized { get; set; }
public bool IsTrackingResetByMapChangeActive { get; set; }
public bool IsMainTrackerFilterSilver { get; set; }
public bool IsMainTrackerFilterFame { get; set; }
public bool IsMainTrackerFilterFaction { get; set; }
public bool IsMainTrackerFilterSeasonPoints { get; set; }
public bool IsMainTrackerFilterEquipmentLoot { get; set; }
public bool IsMainTrackerFilterConsumableLoot { get; set; }
public bool IsMainTrackerFilterSimpleLoot { get; set; }
public bool IsMainTrackerFilterUnknownLoot { get; set; }
public bool IsMainTrackerFilterKill { get; set; }
public bool IsDamageMeterTrackingActive { get; set; } = true;
public bool IsTrackingPartyLootOnly { get; set; }
public bool IsTrackingSilver { get; set; }
public bool IsTrackingFame { get; set; }
public bool IsTrackingMobLoot { get; set; }
public bool IsLootLoggerSaveReminderActive { get; set; }
public bool IsSuggestPreReleaseUpdatesActive { get; set; }
public bool IsLootFromMobShown { get; set; }
public double MailMonitoringGridSplitterPosition { get; set; } = 125;
public double DungeonsGridSplitterPosition { get; set; } = 125;
public double StorageHistoryGridSplitterPosition { get; set; } = 125;
public double DamageMeterGridSplitterPosition { get; set; } = 125;
public bool ShortDamageMeterToClipboard { get; set; }
public bool IsMailMonitoringActive { get; set; } = true;
public bool IgnoreMailsWithZeroValues { get; set; } = false;
public int DeleteMailsOlderThanSpecifiedDays { get; set; } = 0;
public bool IsSnapshotAfterMapChangeActive { get; set; } = false;
public bool IsDamageMeterResetByMapChangeActive { get; set; } = false;
public bool IsDamageMeterResetBeforeCombatActive { get; set; } = false;
public double MailMonitoringMarketTaxRate { get; set; } = 4;
public double MailMonitoringMarketTaxSetupRate { get; set; } = 2.5;
public bool IsDungeonClosedSoundActive { get; set; } = false;
public int ItemWindowMainTabQualitySelection { get; set; }
public int ItemWindowHistoryTabQualitySelection { get; set; }
public List<MainTabLocationFilterSettingsObject> ItemWindowMainTabLocationFilters { get; set; } = new();
}
Loading

0 comments on commit ccd1b32

Please sign in to comment.