Merge pull request #60 from EliphasNUIT/maintenance

Emergency PR - fixed massive performance regression and some more optims
baaron4 · Jun 24, 2018 · 26f53a1 · 26f53a1
2 parents a58935e + 984192f
commit 26f53a1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/LuckParser/Controllers/HTMLBuilder.cs b/LuckParser/Controllers/HTMLBuilder.cs
@@ -1225,7 +1225,7 @@ private void CreateGenSelfTable(StreamWriter sw, List<Boon> list_to_use, string
                         Dictionary<int, Statistics.FinalBoonUptime> uptimes = statistics.selfBoons[player][phase_index];
 
                         Dictionary<int, string> rates = new Dictionary<int, string>();
-                        foreach (Boon boon in Boon.getAllBuffList())
+                        foreach (Boon boon in list_to_use)
                         {
                             string rate = "0";
 
@@ -1283,7 +1283,7 @@ private void CreateGenGroupTable(StreamWriter sw, List<Boon> list_to_use, string
                             statistics.groupBoons[player][phase_index];
 
                         Dictionary<int, string> rates = new Dictionary<int, string>();
-                        foreach (Boon boon in Boon.getAllBuffList())
+                        foreach (Boon boon in list_to_use)
                         {
                             string rate = "0";
 
@@ -1339,7 +1339,7 @@ private void CreateGenOGroupTable(StreamWriter sw, List<Boon> list_to_use, strin
                             statistics.offGroupBoons[player][phase_index];
 
                         Dictionary<int, string> rates = new Dictionary<int, string>();
-                        foreach (Boon boon in Boon.getAllBuffList())
+                        foreach (Boon boon in list_to_use)
                         {
                             string rate = "0";
 
@@ -1396,7 +1396,7 @@ private void CreateGenSquadTable(StreamWriter sw, List<Boon> list_to_use, string
                             statistics.squadBoons[player][phase_index];
 
                         Dictionary<int, string> rates = new Dictionary<int, string>();
-                        foreach (Boon boon in Boon.getAllBuffList())
+                        foreach (Boon boon in list_to_use)
                         {
                             string rate = "0";
 

diff --git a/LuckParser/Controllers/Parser.cs b/LuckParser/Controllers/Parser.cs
@@ -341,7 +341,7 @@ private void fillMissingData(MemoryStream stream)
                 foreach (AgentItem a in agent_data.getAllAgentsList())
                 {
                     // a hack for buggy golem logs
-                    if (a.getID() == 19603 && golem_mode)
+                    if (golem_mode && a.getID() == 19603)
                     {
                         redirection = a.getAgent();
                     }

diff --git a/LuckParser/Controllers/StatisticsCalculator.cs b/LuckParser/Controllers/StatisticsCalculator.cs
@@ -450,7 +450,7 @@ private void calculateSupport()
             Dictionary<int, Statistics.FinalBoonUptime> final =
                 new Dictionary<int, Statistics.FinalBoonUptime>();
 
-            foreach (Boon boon in Boon.getAllBuffList())
+            foreach (Boon boon in to_track)
             {
                 long totalGeneration = 0;
                 long totalOverstack = 0;

diff --git a/LuckParser/Models/ParseModels/Players/Player.cs b/LuckParser/Models/ParseModels/Players/Player.cs
@@ -141,7 +141,7 @@ private void EstimateWeapons(ParsedLog log)
                 }
                 if (apiskill != null && cl.getTime() > swappedTime)
                 {
-                    if (apiskill.type == "Weapon" && apiskill.professions.Count() > 0 && apiskill.categories == null)
+                    if (apiskill.type == "Weapon" && apiskill.professions.Count() > 0 && (apiskill.categories == null || (apiskill.categories.Count() == 1 && apiskill.categories[0] == "Phantasm")))
                     {
                         if (apiskill.weapon_type == "Greatsword" || apiskill.weapon_type == "Staff" || apiskill.weapon_type == "Rifle" || apiskill.weapon_type == "Longbow" || apiskill.weapon_type == "Shortbow" || apiskill.weapon_type == "Hammer")
                         {