Merge pull request #357 from LunusLupus/Maintenance

Maintenance
baaron4 · Mar 21, 2019 · c4d0a7c · c4d0a7c
2 parents eae61cc + 7ab7b83
commit c4d0a7c
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 91 deletions.
diff --git a/LuckParser/Models/HtmlModels/DamageModDto.cs b/LuckParser/Models/HtmlModels/DamageModDto.cs
@@ -7,7 +7,8 @@ public class DamageModDto
     {    
         public long Id;       
         public string Name;       
-        public string Icon;       
+        public string Icon;
+        public string Tooltip;
         public bool NonMultiplier;
 
         public static List<DamageModDto> AssembleDamageModifiers(ICollection<DamageModifier> damageMods)
@@ -20,6 +21,7 @@ public static List<DamageModDto> AssembleDamageModifiers(ICollection<DamageModif
                     Id = mod.Name.GetHashCode(),
                     Name = mod.Name,
                     Icon = mod.Url,
+                    Tooltip = mod.Tooltip,
                     NonMultiplier = !mod.Multiplier
                 });
             }

diff --git a/LuckParser/Models/JsonModels/JsonLog.cs b/LuckParser/Models/JsonModels/JsonLog.cs
@@ -70,6 +70,7 @@ public DamageModDesc(DamageModifier item)
             {
                 Name = item.Name;
                 Icon = item.Url;
+                Description = item.Tooltip;
                 NonMultiplier = !item.Multiplier;
             }
 
@@ -82,6 +83,10 @@ public DamageModDesc(DamageModifier item)
             /// </summary>
             public string Icon;
             /// <summary>
+            /// Description of the damage modifier
+            /// </summary>
+            public string Description;
+            /// <summary>
             /// False if the modifier is multiplicative
             /// </summary>
             public bool NonMultiplier;

diff --git a/LuckParser/Models/ParseModels/DamageModifiers/BuffDamageModifier.cs b/LuckParser/Models/ParseModels/DamageModifiers/BuffDamageModifier.cs
@@ -12,32 +12,32 @@ public class BuffDamageModifier : DamageModifier
     {
         protected BuffsTracker BuffsChecker;
 
-        public BuffDamageModifier(Boon buff, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer) : base(buff.Name, damageSource, gainPerStack, srctype, compareType, src, buff.Link, gainComputer)
+        public BuffDamageModifier(Boon buff, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer) : base(buff.Name, tooltip, damageSource, gainPerStack, srctype, compareType, src, buff.Link, gainComputer)
         {
             BuffsChecker = new BuffsTrackerSingle(buff);
         }
 
-        public BuffDamageModifier(Boon buff, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url) : base(name, damageSource, gainPerStack, srctype, compareType, src, url, gainComputer)
+        public BuffDamageModifier(Boon buff, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url) : base(name, tooltip, damageSource, gainPerStack, srctype, compareType, src, url, gainComputer)
         {
             BuffsChecker = new BuffsTrackerSingle(buff);
         }
 
-        public BuffDamageModifier(BuffsTrackerMulti buffsChecker, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url) : base(name, damageSource, gainPerStack, srctype, compareType, src, url, ByPresence)
+        public BuffDamageModifier(BuffsTrackerMulti buffsChecker, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url) : base(name, tooltip, damageSource, gainPerStack, srctype, compareType, src, url, ByPresence)
         {
             BuffsChecker = buffsChecker;
         }
 
-        public BuffDamageModifier(Boon buff, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, DamageLogChecker dlChecker) : base(buff.Name, damageSource, gainPerStack, srctype, compareType, src, buff.Link, gainComputer, dlChecker)
+        public BuffDamageModifier(Boon buff, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, DamageLogChecker dlChecker) : base(buff.Name, tooltip, damageSource, gainPerStack, srctype, compareType, src, buff.Link, gainComputer, dlChecker)
         {
             BuffsChecker = new BuffsTrackerSingle(buff);
         }
 
-        public BuffDamageModifier(Boon buff, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url, DamageLogChecker dlChecker) : base(name, damageSource, gainPerStack, srctype, compareType, src, url, gainComputer, dlChecker)
+        public BuffDamageModifier(Boon buff, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url, DamageLogChecker dlChecker) : base(name, tooltip, damageSource, gainPerStack, srctype, compareType, src, url, gainComputer, dlChecker)
         {
             BuffsChecker = new BuffsTrackerSingle(buff);
         }
 
-        public BuffDamageModifier(BuffsTrackerMulti buffsChecker, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url, DamageLogChecker dlChecker) : base(name, damageSource, gainPerStack, srctype, compareType, src, url, ByPresence, dlChecker)
+        public BuffDamageModifier(BuffsTrackerMulti buffsChecker, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url, DamageLogChecker dlChecker) : base(name, tooltip, damageSource, gainPerStack, srctype, compareType, src, url, ByPresence, dlChecker)
         {
             BuffsChecker = buffsChecker;
         }

diff --git a/LuckParser/Models/ParseModels/DamageModifiers/BuffDamageModifierTarget.cs b/LuckParser/Models/ParseModels/DamageModifiers/BuffDamageModifierTarget.cs
@@ -11,27 +11,27 @@ namespace LuckParser.Models.ParseModels
     public class BuffDamageModifierTarget : BuffDamageModifier
     {
 
-        public BuffDamageModifierTarget(Boon buff, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer) : base(buff, damageSource, gainPerStack, srctype, compareType, src, gainComputer)
+        public BuffDamageModifierTarget(Boon buff, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer) : base(buff, tooltip, damageSource, gainPerStack, srctype, compareType, src, gainComputer)
         {
         }
 
-        public BuffDamageModifierTarget(Boon buff, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url) : base(buff, name, damageSource, gainPerStack, srctype, compareType, src, gainComputer, url)
+        public BuffDamageModifierTarget(Boon buff, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url) : base(buff, name, tooltip, damageSource, gainPerStack, srctype, compareType, src, gainComputer, url)
         {
         }
 
-        public BuffDamageModifierTarget(BuffsTrackerMulti buffsChecker, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url) : base(buffsChecker, name, damageSource, gainPerStack, srctype, compareType, src, url)
+        public BuffDamageModifierTarget(BuffsTrackerMulti buffsChecker, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url) : base(buffsChecker, name, tooltip, damageSource, gainPerStack, srctype, compareType, src, url)
         {
         }
 
-        public BuffDamageModifierTarget(Boon buff, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, DamageLogChecker dlChecker) : base(buff, damageSource, gainPerStack, srctype, compareType, src, gainComputer, dlChecker)
+        public BuffDamageModifierTarget(Boon buff, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, DamageLogChecker dlChecker) : base(buff, tooltip, damageSource, gainPerStack, srctype, compareType, src, gainComputer, dlChecker)
         {
         }
 
-        public BuffDamageModifierTarget(Boon buff, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url, DamageLogChecker dlChecker) : base(buff, name, damageSource, gainPerStack, srctype, compareType, src, gainComputer, url, dlChecker)
+        public BuffDamageModifierTarget(Boon buff, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer, string url, DamageLogChecker dlChecker) : base(buff, name, tooltip, damageSource, gainPerStack, srctype, compareType, src, gainComputer, url, dlChecker)
         {
         }
 
-        public BuffDamageModifierTarget(BuffsTrackerMulti buffsChecker, string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url, DamageLogChecker dlChecker) : base(buffsChecker, name, damageSource, gainPerStack, srctype, compareType, src, url, dlChecker)
+        public BuffDamageModifierTarget(BuffsTrackerMulti buffsChecker, string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url, DamageLogChecker dlChecker) : base(buffsChecker, name, tooltip, damageSource, gainPerStack, srctype, compareType, src, url, dlChecker)
         {
         }
 

diff --git a/LuckParser/Models/ParseModels/DamageModifiers/DamageLogDamageModifier.cs b/LuckParser/Models/ParseModels/DamageModifiers/DamageLogDamageModifier.cs
@@ -11,12 +11,12 @@ namespace LuckParser.Models.ParseModels
     public class DamageLogDamageModifier : DamageModifier
     {
 
-        public DamageLogDamageModifier(string name, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url, DamageLogChecker checker, GainComputer gainComputer) : base(name, damageSource, gainPerStack, srctype, compareType, src, url, gainComputer)
+        public DamageLogDamageModifier(string name, string tooltip, DamageSource damageSource, double gainPerStack, DamageType srctype, DamageType compareType, ModifierSource src, string url, DamageLogChecker checker, GainComputer gainComputer) : base(name, tooltip, damageSource, gainPerStack, srctype, compareType, src, url, gainComputer)
         {
             DLChecker = checker;
         }
 
-        public DamageLogDamageModifier(Boon boon, long id, DamageSource damageSource, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer) : base(boon.Name, damageSource, double.PositiveInfinity, srctype, compareType, src, boon.Link, gainComputer)
+        public DamageLogDamageModifier(Boon boon, string tooltip, long id, DamageSource damageSource, DamageType srctype, DamageType compareType, ModifierSource src, GainComputer gainComputer) : base(boon.Name, tooltip, damageSource, double.PositiveInfinity, srctype, compareType, src, boon.Link, gainComputer)
         {
             DLChecker = (dl => dl.SkillId == id);
         }