diff --git a/Lemegeton/Content/Radar.cs b/Lemegeton/Content/Radar.cs index d232ae7..46b0461 100644 --- a/Lemegeton/Content/Radar.cs +++ b/Lemegeton/Content/Radar.cs @@ -435,6 +435,7 @@ public enum EntryTypeEnum ARank, BRank, RareAnimal, + FateSpecial, } public ObjectKind Kind { get; set; } @@ -689,6 +690,10 @@ public override void RenderEditor(string path) public bool IncludeIslandRare { get; set; } = true; [AttributeOrderNumber(1031)] public Vector4 RareAnimalColor { get; set; } = new Vector4(1.0f, 1.0f, 0.0f, 1.0f); + [AttributeOrderNumber(1040)] + public bool IncludeFateSpecial { get; set; } = true; + [AttributeOrderNumber(1041)] + public Vector4 FateSpecialColor { get; set; } = new Vector4(1.0f, 0.0f, 1.0f, 1.0f); [AttributeOrderNumber(2000)] public AlertEditor LookFor { get; set; } @@ -1188,6 +1193,14 @@ public override void RenderEditor(string path) new Entry() { Type = Entry.EntryTypeEnum.BRank, Kind = ObjectKind.BattleNpc, NameId = 10636 }, }; + private List _defaultsFateSpecial = new List() + { + // the Forlorn + new Entry() { Type = Entry.EntryTypeEnum.FateSpecial, Kind = ObjectKind.BattleNpc, NameId = 6738 }, + // Forlorn maiden + new Entry() { Type = Entry.EntryTypeEnum.FateSpecial, Kind = ObjectKind.BattleNpc, NameId = 6737 }, + }; + private Dictionary _seen = new Dictionary(); private Dictionary _firstSeen = new Dictionary(); private DateTime _loaded; @@ -1245,6 +1258,9 @@ private void SawEntry(GameObject go, Entry e, DateTime run) case Entry.EntryTypeEnum.RareAnimal: mycol = RareAnimalColor; break; + case Entry.EntryTypeEnum.FateSpecial: + mycol = FateSpecialColor; + break; } string name = String.Format("{0}", go.Name.ToString()); if (IncludeHP == true) @@ -1424,6 +1440,14 @@ protected override bool ExecutionImplementation() } lookup[ObjectKind.BattleNpc].AddRange(_defaultsIsland); } + if (IncludeFateSpecial == true) + { + if (lookup.ContainsKey(ObjectKind.BattleNpc) == false) + { + lookup[ObjectKind.BattleNpc] = new List(); + } + lookup[ObjectKind.BattleNpc].AddRange(_defaultsFateSpecial); + } foreach (GameObject go in _state.ot) { if (lookup.ContainsKey(go.ObjectKind) == false) diff --git a/Lemegeton/Language/Chinese.cs b/Lemegeton/Language/Chinese.cs index 022d683..a301d2a 100644 --- a/Lemegeton/Language/Chinese.cs +++ b/Lemegeton/Language/Chinese.cs @@ -14,11 +14,16 @@ internal class Chinese : Core.Language public Chinese(State st) : base(st) { + #region 1.0.4.7 + //AddEntry("Changelog/1.0.4.7", " Radar/Finder can now point out special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/IncludeFateSpecial", "Include special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/FateSpecialColor", "Special FATE target highlight color"); + #endregion #region 1.0.4.6 //AddEntry("Changelog/1.0.4.6", " small fix to M2s Alarm Pheromones angles"); #endregion #region 1.0.4.5 - //AddEntry("Changelog/1.0.4.3", " added indicator for M2s Alarm Pheromones"); + //AddEntry("Changelog/1.0.4.5", " added indicator for M2s Alarm Pheromones"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees", "(M2s) Alarm Pheromones indicator"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Enabled", "Enabled"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Test", "Test through the center"); diff --git a/Lemegeton/Language/Danish.cs b/Lemegeton/Language/Danish.cs index df0f999..c3be5cc 100644 --- a/Lemegeton/Language/Danish.cs +++ b/Lemegeton/Language/Danish.cs @@ -14,11 +14,16 @@ internal class Danish : Core.Language public Danish(State st) : base(st) { + #region 1.0.4.7 + //AddEntry("Changelog/1.0.4.7", " Radar/Finder can now point out special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/IncludeFateSpecial", "Include special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/FateSpecialColor", "Special FATE target highlight color"); + #endregion #region 1.0.4.6 //AddEntry("Changelog/1.0.4.6", " small fix to M2s Alarm Pheromones angles"); #endregion #region 1.0.4.5 - //AddEntry("Changelog/1.0.4.3", " added indicator for M2s Alarm Pheromones"); + //AddEntry("Changelog/1.0.4.5", " added indicator for M2s Alarm Pheromones"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees", "(M2s) Alarm Pheromones indicator"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Enabled", "Enabled"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Test", "Test through the center"); diff --git a/Lemegeton/Language/English.cs b/Lemegeton/Language/English.cs index cc30711..4c353bc 100644 --- a/Lemegeton/Language/English.cs +++ b/Lemegeton/Language/English.cs @@ -14,6 +14,11 @@ internal class English : Core.Language public English(State st) : base(st) { + #region 1.0.4.7 + AddEntry("Changelog/1.0.4.7", " Radar/Finder can now point out special FATE targets"); + AddEntry("Content/Miscellaneous/Radar/AlertFinder/IncludeFateSpecial", "Include special FATE targets"); + AddEntry("Content/Miscellaneous/Radar/AlertFinder/FateSpecialColor", "Special FATE target highlight color"); + #endregion #region 1.0.4.6 AddEntry("Changelog/1.0.4.6", " small fix to M2s Alarm Pheromones angles"); #endregion diff --git a/Lemegeton/Language/French.cs b/Lemegeton/Language/French.cs index 787dbde..e419410 100644 --- a/Lemegeton/Language/French.cs +++ b/Lemegeton/Language/French.cs @@ -14,11 +14,16 @@ internal class French : Core.Language public French(State st) : base(st) { + #region 1.0.4.7 + //AddEntry("Changelog/1.0.4.7", " Radar/Finder can now point out special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/IncludeFateSpecial", "Include special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/FateSpecialColor", "Special FATE target highlight color"); + #endregion #region 1.0.4.6 //AddEntry("Changelog/1.0.4.6", " small fix to M2s Alarm Pheromones angles"); #endregion #region 1.0.4.5 - //AddEntry("Changelog/1.0.4.3", " added indicator for M2s Alarm Pheromones"); + //AddEntry("Changelog/1.0.4.5", " added indicator for M2s Alarm Pheromones"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees", "(M2s) Alarm Pheromones indicator"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Enabled", "Enabled"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Test", "Test through the center"); diff --git a/Lemegeton/Language/German.cs b/Lemegeton/Language/German.cs index f4f65b2..00ed5de 100644 --- a/Lemegeton/Language/German.cs +++ b/Lemegeton/Language/German.cs @@ -14,11 +14,16 @@ internal class German : Core.Language public German(State st) : base(st) { + #region 1.0.4.7 + //AddEntry("Changelog/1.0.4.7", " Radar/Finder can now point out special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/IncludeFateSpecial", "Include special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/FateSpecialColor", "Special FATE target highlight color"); + #endregion #region 1.0.4.6 //AddEntry("Changelog/1.0.4.6", " small fix to M2s Alarm Pheromones angles"); #endregion #region 1.0.4.5 - //AddEntry("Changelog/1.0.4.3", " added indicator for M2s Alarm Pheromones"); + //AddEntry("Changelog/1.0.4.5", " added indicator for M2s Alarm Pheromones"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees", "(M2s) Alarm Pheromones indicator"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Enabled", "Enabled"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Test", "Test through the center"); diff --git a/Lemegeton/Language/Japanese.cs b/Lemegeton/Language/Japanese.cs index 08caced..d006881 100644 --- a/Lemegeton/Language/Japanese.cs +++ b/Lemegeton/Language/Japanese.cs @@ -14,11 +14,16 @@ internal class Japanese : Core.Language public Japanese(State st) : base(st) { + #region 1.0.4.7 + //AddEntry("Changelog/1.0.4.7", " Radar/Finder can now point out special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/IncludeFateSpecial", "Include special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/FateSpecialColor", "Special FATE target highlight color"); + #endregion #region 1.0.4.6 //AddEntry("Changelog/1.0.4.6", " small fix to M2s Alarm Pheromones angles"); #endregion #region 1.0.4.5 - //AddEntry("Changelog/1.0.4.3", " added indicator for M2s Alarm Pheromones"); + //AddEntry("Changelog/1.0.4.5", " added indicator for M2s Alarm Pheromones"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees", "(M2s) Alarm Pheromones indicator"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Enabled", "Enabled"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Test", "Test through the center"); diff --git a/Lemegeton/Language/Korean.cs b/Lemegeton/Language/Korean.cs index 72ff8db..e04d544 100644 --- a/Lemegeton/Language/Korean.cs +++ b/Lemegeton/Language/Korean.cs @@ -14,11 +14,16 @@ internal class Korean : Core.Language public Korean(State st) : base(st) { + #region 1.0.4.7 + //AddEntry("Changelog/1.0.4.7", " Radar/Finder can now point out special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/IncludeFateSpecial", "Include special FATE targets"); + //AddEntry("Content/Miscellaneous/Radar/AlertFinder/FateSpecialColor", "Special FATE target highlight color"); + #endregion #region 1.0.4.6 //AddEntry("Changelog/1.0.4.6", " small fix to M2s Alarm Pheromones angles"); #endregion #region 1.0.4.5 - //AddEntry("Changelog/1.0.4.3", " added indicator for M2s Alarm Pheromones"); + //AddEntry("Changelog/1.0.4.5", " added indicator for M2s Alarm Pheromones"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees", "(M2s) Alarm Pheromones indicator"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Enabled", "Enabled"); //AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Groupbees/Test", "Test through the center"); diff --git a/Lemegeton/Plugin.cs b/Lemegeton/Plugin.cs index 22855b3..fdbf994 100644 --- a/Lemegeton/Plugin.cs +++ b/Lemegeton/Plugin.cs @@ -56,7 +56,7 @@ public sealed class Plugin : IDalamudPlugin #else public string Name => "Lemegeton"; #endif - public string Version = "1.0.4.6"; + public string Version = "1.0.4.7"; internal class Downloadable { @@ -85,6 +85,7 @@ internal class ActionTypeItem new Tuple(new System.Version("1.0.4.4"), "Changelog/1.0.4.4"), new Tuple(new System.Version("1.0.4.5"), "Changelog/1.0.4.5"), new Tuple(new System.Version("1.0.4.6"), "Changelog/1.0.4.6"), + new Tuple(new System.Version("1.0.4.7"), "Changelog/1.0.4.7"), }; internal List ChangeLogVersions = null;