diff --git a/TW5_parse_top_stats_detailed.py b/TW5_parse_top_stats_detailed.py index b184c5d..a9a588d 100644 --- a/TW5_parse_top_stats_detailed.py +++ b/TW5_parse_top_stats_detailed.py @@ -1349,7 +1349,7 @@ myprint(output, '<$reveal type="match" state="$:/state/curTab" text="Control Effects - Out">') myprint(output, '\n<>\n\n') #Control_Effects = {720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 30778: "Hunter's Mark", 738:"Vulnerability"} - Control_Effects = {736: 'Bleeding', 737: 'Burning',861: 'Confusion', 723: 'Poison', 19426: 'Torment', 720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 738: 'Vulnerability', 30778: "Hunter's Mark", 72941: 'Extirpation', "total1": "appliedCounts", "total2": "totalDuration"} + Control_Effects = {736: 'Bleeding', 737: 'Burning',861: 'Confusion', 723: 'Poison', 19426: 'Torment', 720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 738: 'Vulnerability', 30778: "Hunter's Mark", 72941: 'Extirpation', 44633:'Disenchantment', "total1": "appliedCounts", "total2": "totalDuration"} for C_E in Control_Effects: if C_E == "total2": continue @@ -1438,7 +1438,7 @@ #start Control Effects Incoming insert myprint(output, '<$reveal type="match" state="$:/state/curTab" text="Control Effects - In">') myprint(output, '\n<>\n\n') - Control_Effects = {720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 30778: "Hunter's Mark", 738:"Vulnerability", 72941: 'Extirpation'} + Control_Effects = {720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 30778: "Hunter's Mark", 738:"Vulnerability", 72941: 'Extirpation', 44633:'Disenchantment'} for C_E in Control_Effects: myprint(output, '<$button setTitle="$:/state/curControl-In" setTo="'+Control_Effects[C_E]+'" selectedClass="" class="btn btn-sm btn-dark" style="">'+Control_Effects[C_E]+' ') diff --git a/TW5_parse_top_stats_tools.py b/TW5_parse_top_stats_tools.py index dad40f1..0f92c97 100644 --- a/TW5_parse_top_stats_tools.py +++ b/TW5_parse_top_stats_tools.py @@ -3546,7 +3546,7 @@ def get_stats_from_fight_json(fight_json, config, log): #Tracking Outgoing Control Effects generated by the squad against enemy players - Control_Effects = {736: 'Bleeding', 737: 'Burning',861: 'Confusion', 723: 'Poison', 19426: 'Torment', 720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 738: 'Vulnerability', 30778: "Hunter's Mark", 72941: 'Extirpation'} + Control_Effects = {736: 'Bleeding', 737: 'Burning',861: 'Confusion', 723: 'Poison', 19426: 'Torment', 720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 738: 'Vulnerability', 30778: "Hunter's Mark", 72941: 'Extirpation', 44633:'Disenchantment'} #Control_Duration = {720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 26766: 'Slow', 27705: 'Taunt', 30778: "Hunter's Mark", 833: 'Daze', 872: 'Stun'} #Control_Intensity = {736: 'Bleeding', 737: 'Burning',861: 'Confusion', 723: 'Poison', 19426: 'Torment', 738: 'Vulnerability', 833: 'Daze', 872: 'Stun'} for item in enemy['buffs']: @@ -3854,7 +3854,7 @@ def get_stats_from_fight_json(fight_json, config, log): MOA_Casters[squadDps_name]['attempts'] += len(item['skills']) #Track Incoming Control Effects generated by the enemy against Squad Members - Control_Effects = {720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 30778: "Hunter's Mark", 738: 'Vulnerability', 72941: 'Extirpation'} + Control_Effects = {720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 30778: "Hunter's Mark", 738: 'Vulnerability', 72941: 'Extirpation', 44633:'Disenchantment'} #config.condition_ids = {720: 'Blinded', 721: 'Crippled', 722: 'Chilled', 727: 'Immobile', 742: 'Weakness', 791: 'Fear', 833: 'Daze', 872: 'Stun', 26766: 'Slow', 27705: 'Taunt', 30778: 'Hunters Mark'} for item in player['buffUptimesActive']: conditionId = int(item['id']) @@ -5665,7 +5665,7 @@ def write_to_json(overall_raid_stats, overall_squad_stats, fights, players, top_ #json_dict["profModifiers"] = {key: value for key, value in profModifiers.items()} #json_dict["modifierMap"] = {key: value for key, value in modifierMap.items()} #json_dict["total_Squad_Skill_Dmg"] = {key: value for key, value in total_Squad_Skill_Dmg.items()} - json_dict["Player_Damage_by_Skill"] = {key: value for key, value in Player_Damage_by_Skill.items()} + #json_dict["Player_Damage_by_Skill"] = {key: value for key, value in Player_Damage_by_Skill.items()} #json_dict["total_Enemy_Skill_Dmg"] = {key: value for key, value in total_Enemy_Skill_Dmg.items()} #json_dict["squadDamageMods"] = {key: value for key, value in squadDamageMods.items()} #json_dict["Plen_Bot_Logs"] = {key: value for key, value in Plen_Bot_Logs.items()}