diff --git a/LuckParser/Controllers/Controller1.cs b/LuckParser/Controllers/Controller1.cs index 5ab3d1bd8..7230d735d 100644 --- a/LuckParser/Controllers/Controller1.cs +++ b/LuckParser/Controllers/Controller1.cs @@ -1138,7 +1138,7 @@ private void setMechData() { mech_data.AddItem(new MechanicLog((long)((pnt.X - boss_data.getFirstAware()) / 1000f), 0, "DEAD", 0, p, mech_data.GetPLoltyShape("DEAD"))); } List dls = p.getDamageTakenLogs(boss_data, combat_data.getCombatList(), agent_data, mech_data); - //damage taken + //Player hit by skill 3 MechanicLog prevMech = null; foreach (DamageLog dLog in dls) { @@ -1167,7 +1167,7 @@ private void setMechData() { } } } - //Gainign Buff mech + //Player gain buff 0,7 foreach (CombatItem c in combat_data.getCombatList().Where(x=>x.isBuffremove().getID() == 0 &&x.isStateChange().getID() == 0)) { if (p.getInstid() == c.getDstInstid()) @@ -1175,22 +1175,34 @@ private void setMechData() { if (c.isBuff() == 1 && c.getValue() > 0 && c.isBuffremove().getID() == 0 && c.getResult().getID() < 3) { String name = skill_data.getName(c.getSkillID()); + //buff on player 0 foreach (Mechanic mech in getMechData().GetMechList(boss_data.getID()).Where(x => x.GetMechType() == 0)) { if (c.getSkillID() == mech.GetSkill()) { + //dst player mech_data.AddItem(new MechanicLog((long)((c.getTime() - boss_data.getFirstAware())/1000f), c.getSkillID(), mech.GetName(), c.getValue(), p, mech.GetPlotly())); break; } } + //player on player 7 + foreach (Mechanic mech in getMechData().GetMechList(boss_data.getID()).Where(x => x.GetMechType() == 7)) + { + if (c.getSkillID() == mech.GetSkill()) + { + //dst player + mech_data.AddItem(new MechanicLog((long)((c.getTime() - boss_data.getFirstAware()) / 1000f), c.getSkillID(), mech.GetName(), c.getValue(), p, mech.GetPlotly())); + //src player + mech_data.AddItem(new MechanicLog((long)((c.getTime() - boss_data.getFirstAware()) / 1000f), c.getSkillID(), mech.GetName(), c.getValue(), p_list.FirstOrDefault(i=>i.getInstid() == c.getSrcInstid()), mech.GetPlotly())); + break; + } + } } } } } - //int stop = 0; - } //Generate HTML--------------------------------------------------------------------------------------------------------------------------------------------------------- //Methods that make it easier to create Javascript graphs diff --git a/LuckParser/Models/ParseModels/Mechanic.cs b/LuckParser/Models/ParseModels/Mechanic.cs index a9a1f1e3e..8f522ef94 100644 --- a/LuckParser/Models/ParseModels/Mechanic.cs +++ b/LuckParser/Models/ParseModels/Mechanic.cs @@ -15,12 +15,13 @@ public class Mechanic private string altname; private int mechType; //0 boon on player - //1 boon on boss - //2 skill by player + //1 boon on boss X + //2 skill by player X //3 skill on player - //4 enemy boon stripped - //5 spawn check - //6 boss cast (check finished) + //4 enemy boon stripped X + //5 spawn check X + //6 boss cast (check finished) X + //7 player on player private ushort bossid; private string plotlyShape; diff --git a/LuckParser/Models/ParseModels/MechanicData.cs b/LuckParser/Models/ParseModels/MechanicData.cs index fed60f2a0..72d042e6e 100644 --- a/LuckParser/Models/ParseModels/MechanicData.cs +++ b/LuckParser/Models/ParseModels/MechanicData.cs @@ -181,7 +181,7 @@ public List GetMechList(int bossid) { globalMechList.Add(new Mechanic(47646, "Arcing Affliction", 0, 19450, "symbol:'hexagon',color:'rgb(250,0,0)',", "Arcing Affliction DMG"));//Buff or dmg? globalMechList.Add(new Mechanic(48121, "Arcing Affliction", 3, 19450, "symbol:'circle',color:'rgb(250,0,0)',", "Arcing Affliction"));//Buff or dmg? globalMechList.Add(new Mechanic(47476, "Residual Affliction", 0, 19450, "symbol:'square',color:'rgb(0,0,250)',", "Bomb CD")); - globalMechList.Add(new Mechanic(47335, "Soul Shackle", 0, 19450, "symbol:'diamond',color:'rgb(0,0,250)',", "Shackle"));//4 calls probably this one + globalMechList.Add(new Mechanic(47335, "Soul Shackle", 7, 19450, "symbol:'diamond',color:'rgb(0,0,250)',", "Shackle"));//4 calls probably this one globalMechList.Add(new Mechanic(48752, "Cull", 3, 19450, "symbol:'diamond',color:'rgb(0,150,0)',", "Crack")); globalMechList.Add(new Mechanic(48760, "Putrid Bomb", 3, 19450, "symbol:'circle',color:'rgb(0,75,0)',", "Mark")); @@ -218,104 +218,6 @@ public string GetPLoltyShape(string mechName) } } - //public List GetMechanicNameList() { - // List mlist = new List(); - // //VG - // mlist.Add("Magic Pulse");//damage from red orb - // mlist.Add("Unstable Magic Spike");//hit by blue tp - // mlist.Add("Distributed Magic");//hit by green aoe - // // mlist.Add("");//failed green aoe - // mlist.Add("Pylon Attunement: Red");//3 pylon atunments - // mlist.Add("Pylon Attunement: Blue");//3 pylon atunments - // mlist.Add("Pylon Attunement: Green");//3 pylon atunments - // //gors - // mlist.Add("Spectral Impact");//slam - // // mlist.Add("");//black - // mlist.Add("Spectral Darkness");//orb buff - // mlist.Add("Ghastly Prison");//egg - // mlist.Add("Spirited Fusion");//ate spirits - // //sabetha - // mlist.Add("Shell-Shocked");//canon launcher - // mlist.Add("Sapper Bomb");//green bomb - // mlist.Add("Time Bomb");//timedbomb - // // mlist.Add("");//killed turret - // mlist.Add("Flak Shot");//flak - // //sloth - // mlist.Add("Halitosis");//flame breath - // mlist.Add("Spore Release");//shake - // mlist.Add("Tantrum");//tantrum - // mlist.Add("Volatile Poison");//Poisin activatable - // mlist.Add("Magic Transformation");//be slub - // mlist.Add("Nauseated");//cant slub - // //matt - // mlist.Add("Blood Fueled");//damage increase - // mlist.Add("Blood Shield");//bubble - // mlist.Add("Unbalanced");//too many stacks of rain - // mlist.Add("Oppressive Gaze");//hadokin - // mlist.Add("Unstable Blood Magic");//activatable drop - // mlist.Add("Corruption ");//sacrifice - // //kc - // // mlist.Add(""); //hit construct core - // mlist.Add("Fixated");//fixated by dude - // mlist.Add("Hail of Fury");//debris - // mlist.Add("Insidious Projection");//merge - // mlist.Add("Phantasmal Blades");// - // mlist.Add("Tower Drop"); - // //xera - // mlist.Add("Derangement"); - // // mlist.Add("");//red field - // // mlist.Add("");//red orb - // mlist.Add("Intervention");//spec action key - // // mlist.Add("");//teleport - // //cairn - // mlist.Add("Displacement");//blue tp - // mlist.Add("Energy Surge");//leap - // mlist.Add("Shared Agony");//red aoe buff - // mlist.Add("Spatial Manipulation");//failed green - // mlist.Add("Orbital Sweep");//sweep - // mlist.Add("Meteor Swarm");//hit by proj - // //mo - // mlist.Add("Corporal Punishment");//Jade Scout - // mlist.Add("Claim");//claim buff - // mlist.Add("Dispel");//claim buff - // //mlist.Add("Protect");//protect buff - // //sam - // // mlist.Add("");//merge aoe - // mlist.Add("Effigy Pulse");//spear - // mlist.Add("Fixate: Guldhem"); - // mlist.Add("Fixate: Rigom"); - // mlist.Add("Fixate: Samarog"); - // mlist.Add("Inevitab;e Betrayal");//merge dmg - // mlist.Add("Prisoner Sweep");//3 swipes - // mlist.Add("Shockwave"); - // mlist.Add("Slam"); - // // mlist.Add("");//small merge aoe - // mlist.Add("Spear Impact");//spear spawning - // mlist.Add("Brutalize");//target of cc - // //deiimos - // mlist.Add("Annihilate");//knockback - // mlist.Add("Chosen by Eye of Janthir"); - // mlist.Add("Rapid Decay");//black oil - // // mlist.Add("");//tp from drunkard - // // mlist.Add("");//bon currupt from thief - // mlist.Add("Mind Crush");//aoe wiper - // mlist.Add("Tear Instability");//got tear - // mlist.Add("Teleport");//to demonic realm - // mlist.Add("Weak Minded");//blocked mincrush - // //horror - // mlist.Add("Death Bloom");//cones - // mlist.Add("Vortex Slash");//dodge aoe - // mlist.Add("Spinning Slash");//syth - // //dhuum - // mlist.Add("Arcing Affliction");//getting bomb - // mlist.Add("Residual Affliction");//bomb cd - // mlist.Add("Cataclysmic Cycle");//pulled in by cone - // mlist.Add("Greater Death Mark");//dip - // mlist.Add("Putrid Bomb");//bomb - // mlist.Add("Soul Shackle");//shackle - // mlist.Add("Mortal Coil");//orbs - // mlist.Add("Fractured Spirit");//cant do orbs again - // return mlist; - //} + } }