anna
/
HUDManager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mark old conditions as obsolete and add migration

This commit is contained in:
Zacharie Day 2020-09-02 19:36:55 -04:00 committed by Anna
parent 819ba7cf45
commit e24b9649c7
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
HudSwap/PluginConfig.cs
View File

@ -40,17 +40,20 @@ namespace HudSwap {
public Guid roleplayingLayout = Guid.Empty;
#pragma warning restore CA1051 // Do not declare visible instance fields
[Obsolete("Superceded by HudConditionMatches")]
public Dictionary<Status, Guid> StatusLayouts { get; } = new Dictionary<Status, Guid>();
[Obsolete("Superceded by HudConditionMatches")]
public Dictionary<string, Guid> JobLayouts { get; } = new Dictionary<string, Guid>();
[Obsolete("Superceded by HudConditionMatches")]
public bool HighPriorityJobs { get; set; } = false;
[Obsolete("Superceded by HudConditionMatches")]
public bool JobsCombatOnly { get; set; } = false;
[Obsolete("Use Layouts2 instead")]
public Dictionary<Guid, Tuple<string, byte[]>> Layouts { get; } = new Dictionary<Guid, Tuple<string, byte[]>>();
public Dictionary<Guid, Layout> Layouts2 { get; } = new Dictionary<Guid, Layout>();
public List<HudConditionMatch> HudConditionMatches = new List<HudConditionMatch>();
public List<HudConditionMatch> HudConditionMatches { get; } = new List<HudConditionMatch>();
public void Initialize(DalamudPluginInterface pluginInterface) {
this.pi = pluginInterface;
@ -106,6 +109,29 @@ namespace HudSwap {
}
this.Layouts.Clear();
}
if (this.JobLayouts.Count != 0) {
foreach (var jobLayout in JobLayouts)
this.HudConditionMatches.Add(new HudConditionMatch() {
ClassJob = jobLayout.Key,
Status = JobsCombatOnly ? Status.InCombat : default,
LayoutId = jobLayout.Value
});
JobLayouts.Clear();
}
if (this.StatusLayouts.Count != 0) {
foreach (var statusLayout in StatusLayouts) {
var match = new HudConditionMatch() {Status = statusLayout.Key, LayoutId = statusLayout.Value};
if (HighPriorityJobs)
this.HudConditionMatches.Add(match);
else
this.HudConditionMatches.Insert(0, match);
}
StatusLayouts.Clear();
}
#pragma warning restore 618
}
}

2
HudSwap/PluginUI.cs
View File

@ -40,8 +40,6 @@ namespace HudSwap {
private string renameName = "";
private Guid selectedLayout = Guid.Empty;
private string jobFilter = "";
private int editingConditionIndex = -1;
private HudConditionMatch editingCondition;