Skip to content

Commit

Permalink
removed attack types
Browse files Browse the repository at this point in the history
  • Loading branch information
FreedomFaighter committed Oct 24, 2023
1 parent 6c22d18 commit 9fb0d0c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
4 changes: 3 additions & 1 deletion EverQuestDPSPlugin/EverQuestDPSPluginPartial2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public partial class EverQuestDPSPlugin : IEverQuestDPSPlugin
SettingsSerializer xmlSettings;
readonly object varianceChkBxLockObject = new object(), nonMatchChkBxLockObject = new object();
readonly string PluginSettingsFileName = $"Config{Path.DirectorySeparatorChar}ACT_EverQuest_English_Parser.config.xml";
readonly string attackTypes = "backstab|throw|pierce|gore|crush|slash|hit|kick|slam|bash|shoot|strike|bite|grab|punch|scratch|rake|swipe|claw|maul|smash|frenzies|frenzy";

#endregion

internal DateTime ParseDateTime(String timeStamp)
Expand All @@ -53,7 +55,7 @@ internal void PopulateRegexNonCombat()

private void PopulateRegexCombat()
{
String MeleeAttack = @"(?<attacker>.+) (?<attackType>" + $@"{EverQuestDPSPluginResource.attackTypes}" + @")(|s|es|bed) (?<victim>.+) for (?<damageAmount>[\d]+) (?:(?:point)(?:s|)) of damage.(?:\s\((?<damageSpecial>.+)\)){0,1}";
String MeleeAttack = @"(?<attacker>.+) (?<attackType>" + $@"{attackTypes}" + @")(|s|es|bed) (?<victim>.+) for (?<damageAmount>[\d]+) (?:(?:point)(?:s|)) of damage.(?:\s\((?<damageSpecial>.+)\)){0,1}";
String Evasion = @"(?<attacker>.*) tries to (?<attackType>\S+) (?:(?<victim>(.+)), but \1) (?:(?<evasionType>" + $@"{EverQuestDPSPluginResource.evasionTypes}" + @"))(?:\swith (your|his|hers|its) (shield|staff)){0,1}!(?:[\s][\(](?<evasionSpecial>.+)[\)]){0,1}";
ActGlobals.oFormEncounterLogs.LogTypeToColorMapping.Clear();
regexTupleList.Add(new Tuple<Color, Regex>(Color.Red, new Regex(RegexString(MeleeAttack), RegexOptions.Compiled)));
Expand Down
9 changes: 0 additions & 9 deletions EverQuestDPSPlugin/EverQuestDPSPluginResource.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions EverQuestDPSPlugin/EverQuestDPSPluginResource.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="attackTypes" xml:space="preserve">
<value>backstab|throw|pierce|gore|crush|slash|hit|kick|slam|bash|shoot|strike|bite|grab|punch|scratch|rake|swipe|claw|maul|smash|frenzy</value>
</data>
<data name="Banestrike" xml:space="preserve">
<value>(?&lt;attacker&gt;.+) hit(|s) (?&lt;victim&gt;.+) for (?&lt;baneDamage&gt;[\d]+) points of (?&lt;typeOfDamage&gt;.+) by Banestrike (?&lt;baneAbilityRank&gt;.+\.)(?:\s\((?&lt;baneSpecial&gt;.+)\)){0,1}</value>
</data>
Expand Down

0 comments on commit 9fb0d0c

Please sign in to comment.