Client 406.

dlebansais · Jun 23, 2024 · 3357570 · 3357570
1 parent f223558
commit 3357570
Show file tree

Hide file tree

Showing 66 changed files with 743 additions and 58 deletions.
diff --git a/Pipeline/Preprocessing/JsonConverter/SkillAdvancementHintCollectionJsonConverter.cs b/Pipeline/Preprocessing/JsonConverter/SkillAdvancementHintCollectionJsonConverter.cs
@@ -46,6 +46,9 @@ private void ReadTableDictionary(SkillAdvancementHintCollection collection, ref
         if (hint.EndsWith("learn a new dance move."))
             return null;
 
+        if (hint.EndsWith("defeat a fabled dragon of yore."))
+            return null;
+
         hint = hint.Replace(" during a Full Moon,", string.Empty);
 
         string Pattern;

diff --git a/Pipeline/Preprocessing/Objects/AI/AI.cs b/Pipeline/Preprocessing/Objects/AI/AI.cs
@@ -5,6 +5,7 @@ public class AI
     public AIAbilityDictionary? Abilities { get; set; }
     public string? Comment { get; set; }
     public string? Description { get; set; }
+    public int? FlyOffset { get; set; }
     public bool? Flying { get; set; }
     public decimal? MinDelayBetweenAbilities { get; set; }
     public string? MobilityType { get; set; }

diff --git a/Pipeline/Preprocessing/Objects/Ability/PvEAbility.cs b/Pipeline/Preprocessing/Objects/Ability/PvEAbility.cs
@@ -13,7 +13,9 @@ public PvEAbility(RawPvEAbility rawPvEAbility)
         ArmorMitigationRatio = rawPvEAbility.ArmorMitigationRatio;
         ArmorSpecificDamage = rawPvEAbility.ArmorSpecificDamage;
         AttributesThatDeltaAccuracy = rawPvEAbility.AttributesThatDeltaAccuracy;
+        AttributesThatDeltaAoE = rawPvEAbility.AttributesThatDeltaAoE;
         AttributesThatDeltaDamage = rawPvEAbility.AttributesThatDeltaDamage;
+        AttributesThatDeltaDamageIfTargetIsVulnerable = rawPvEAbility.AttributesThatDeltaDamageIfTargetIsVulnerable;
         AttributesThatDeltaRage = rawPvEAbility.AttributesThatDeltaRage;
         AttributesThatDeltaRange = rawPvEAbility.AttributesThatDeltaRange;
         AttributesThatDeltaTaunt = rawPvEAbility.AttributesThatDeltaTaunt;
@@ -89,7 +91,9 @@ private static SelfPreEffect ParseSelfPreEffect(string rawSelfPreEffect)
     public int? ArmorMitigationRatio { get; set; }
     public int? ArmorSpecificDamage { get; set; }
     public string[]? AttributesThatDeltaAccuracy { get; set; }
+    public string[]? AttributesThatDeltaAoE { get; set; }
     public string[]? AttributesThatDeltaDamage { get; set; }
+    public string[]? AttributesThatDeltaDamageIfTargetIsVulnerable { get; set; }
     public string[]? AttributesThatDeltaRage { get; set; }
     public string[]? AttributesThatDeltaRange { get; set; }
     public string[]? AttributesThatDeltaTaunt { get; set; }
@@ -125,7 +129,9 @@ public RawPvEAbility ToRawPvEAbility()
         Result.ArmorMitigationRatio = ArmorMitigationRatio;
         Result.ArmorSpecificDamage = ArmorSpecificDamage;
         Result.AttributesThatDeltaAccuracy = AttributesThatDeltaAccuracy;
+        Result.AttributesThatDeltaAoE = AttributesThatDeltaAoE;
         Result.AttributesThatDeltaDamage = AttributesThatDeltaDamage;
+        Result.AttributesThatDeltaDamageIfTargetIsVulnerable = AttributesThatDeltaDamageIfTargetIsVulnerable;
         Result.AttributesThatDeltaRage = AttributesThatDeltaRage;
         Result.AttributesThatDeltaRange = AttributesThatDeltaRange;
         Result.AttributesThatDeltaTaunt = AttributesThatDeltaTaunt;

diff --git a/Pipeline/Preprocessing/Objects/Ability/RawPvEAbility.cs b/Pipeline/Preprocessing/Objects/Ability/RawPvEAbility.cs
@@ -7,7 +7,9 @@ public class RawPvEAbility
     public int? ArmorMitigationRatio { get; set; }
     public int? ArmorSpecificDamage { get; set; }
     public string[]? AttributesThatDeltaAccuracy { get; set; }
+    public string[]? AttributesThatDeltaAoE { get; set; }
     public string[]? AttributesThatDeltaDamage { get; set; }
+    public string[]? AttributesThatDeltaDamageIfTargetIsVulnerable { get; set; }
     public string[]? AttributesThatDeltaRage { get; set; }
     public string[]? AttributesThatDeltaRange { get; set; }
     public string[]? AttributesThatDeltaTaunt { get; set; }

diff --git a/Pipeline/Preprocessing/Objects/Ability/SpecialValue.cs b/Pipeline/Preprocessing/Objects/Ability/SpecialValue.cs
@@ -3,10 +3,11 @@
 public class SpecialValue
 {
     public string[]? AttributesThatDelta { get; set; }
+    public string[]? AttributesThatDeltaBase { get; set; }
     public string[]? AttributesThatMod { get; set; }
-    //public string[]? AttributesThatModBase { get; set; }
     public string? DisplayType { get; set; }
     public string? Label { get; set; }
+    public string? SkipIfThisAttributeIsZero { get; set; }
     public bool? SkipIfZero { get; set; }
     public string? Suffix { get; set; }
     public decimal? Value { get; set; }

diff --git a/Pipeline/Preprocessing/Objects/Effect/Effect.cs b/Pipeline/Preprocessing/Objects/Effect/Effect.cs
@@ -1,4 +1,6 @@
-namespace Preprocessor;
+using System.Collections.Generic;
+
+namespace Preprocessor;
 
 public class Effect
 {
@@ -9,14 +11,34 @@ public Effect(RawEffect rawEffect)
         DisplayMode = rawEffect.DisplayMode;
         Duration = Preprocessor.ToNumberOrString(rawEffect.Duration, out IsDurationNumber);
         IconId = rawEffect.IconId;
-        Keywords = rawEffect.Keywords;
+        Keywords = ParseKeywords(rawEffect.Keywords);
         Name = rawEffect.Name;
         Particle = EffectParticle.Parse(rawEffect.Particle);
         SpewText = rawEffect.SpewText;
         StackingPriority = rawEffect.StackingPriority;
         StackingType = ParseStackingType(rawEffect.StackingType);
     }
 
+    private static string[]? ParseKeywords(string[]? rawKeywords)
+    {
+        if (rawKeywords is null)
+            return null;
+
+        List<string> Result = new();
+        foreach (var Keyword in rawKeywords)
+            Result.Add(ParseKeyword(Keyword));
+
+        return Result.ToArray();
+    }
+
+    private static string ParseKeyword(string rawKeyword)
+    {
+        if (rawKeyword == "-")
+            return "Hyphen";
+        else
+            return rawKeyword;
+    }
+
     private static string? ParseDescription(string? rawDescription, string[]? rawAbilityKeywords, string? rawName, out EffectDescriptionFix effectDescriptionFix)
     {
         effectDescriptionFix = EffectDescriptionFix.None;
@@ -88,7 +110,7 @@ public RawEffect ToRawEffect()
         Result.DisplayMode = DisplayMode;
         Result.Duration = Preprocessor.FromNumberOrString(Duration, IsDurationNumber);
         Result.IconId = IconId;
-        Result.Keywords = Keywords;
+        Result.Keywords = ToRawKeywords(Keywords);
         Result.Name = Name;
         Result.Particle = EffectParticle.ToString(Particle);
         Result.SpewText = SpewText;
@@ -98,6 +120,26 @@ public RawEffect ToRawEffect()
         return Result;
     }
 
+    private static string[]? ToRawKeywords(string[]? keywords)
+    {
+        if (keywords is null)
+            return null;
+
+        List<string> Result = new();
+        foreach (var Keyword in keywords)
+            Result.Add(ToRawKeyword(Keyword));
+
+        return Result.ToArray();
+    }
+
+    private static string ToRawKeyword(string keyword)
+    {
+        if (keyword == "Hyphen")
+            return "-";
+        else
+            return keyword;
+    }
+
     private static string? ToRawDescription(string? description, EffectDescriptionFix effectDescriptionFix)
     {
         string? Result;

diff --git a/Pipeline/Preprocessing/Objects/Npc/NpcService.cs b/Pipeline/Preprocessing/Objects/Npc/NpcService.cs
@@ -33,13 +33,16 @@ public NpcService(RawNpcService rawNpcService)
     private static NpcServiceCapIncrease ParseCapIncrease(string rawCapIncrease)
     {
         string[] Splitted = rawCapIncrease.Split(':');
-        if (Splitted.Length != 2)
+        if (Splitted.Length < 2 || Splitted.Length > 3 )
             throw new PreprocessorException();
 
         if (!int.TryParse(Splitted[1], out int Value))
             throw new PreprocessorException();
 
-        NpcServiceCapIncrease Result = new() { Favor = Splitted[0], Value = Value };
+        string Favor = Splitted[0];
+        string? Purchase = Splitted.Length > 2 ? Splitted[2] : null;
+
+        NpcServiceCapIncrease Result = new() { Favor = Favor, Value = Value, Purchase = Purchase };
 
         return Result;
     }
@@ -110,7 +113,13 @@ public RawNpcService ToRawNpcService()
         List<string> Result = new();
 
         foreach (NpcServiceCapIncrease CapIncrease in npcServiceCapIncreases)
-            Result.Add($"{CapIncrease.Favor}:{CapIncrease.Value}");
+        {
+            string StringValue = $"{CapIncrease.Favor}:{CapIncrease.Value}";
+            if (CapIncrease.Purchase is not null)
+                StringValue += $":{CapIncrease.Purchase}";
+
+            Result.Add(StringValue);
+        }
 
         return Result.ToArray();
     }

diff --git a/Pipeline/Preprocessing/Objects/Npc/NpcServiceCapIncrease.cs b/Pipeline/Preprocessing/Objects/Npc/NpcServiceCapIncrease.cs
@@ -3,5 +3,6 @@
 public class NpcServiceCapIncrease
 {
     public string? Favor { get; set; }
+    public string? Purchase { get; set; }
     public int Value { get; set; }
 }
diff --git a/Pipeline/Preprocessing/Objects/PlayerTitle/PlayerTitle.cs b/Pipeline/Preprocessing/Objects/PlayerTitle/PlayerTitle.cs
@@ -6,6 +6,7 @@ public class PlayerTitle
 {
     public PlayerTitle(RawPlayerTitle rawPlayerTitle)
     {
+        AccountWide = rawPlayerTitle.AccountWide;
         Keywords = rawPlayerTitle.Keywords;
         (Title, Color, ColorFormat) = ParseTitle(rawPlayerTitle.Title);
         Tooltip = rawPlayerTitle.Tooltip;
@@ -43,6 +44,7 @@ private static (string?, string?, ColorFormat?) ParseTitle(string? rawTitle)
         return (rawTitle, null, null);
     }
 
+    public bool? AccountWide { get; set; }
     public string? Color { get; set; }
     public string[]? Keywords { get; set; }
     public string? Title { get; set; }
@@ -52,6 +54,7 @@ public RawPlayerTitle ToRawPlayerTitle()
     {
         RawPlayerTitle Result = new();
 
+        Result.AccountWide = AccountWide;
         Result.Keywords = Keywords;
         Result.Title = ToRawTitle(Title, ColorFormat);
         Result.Tooltip = Tooltip;

diff --git a/Pipeline/Preprocessing/Objects/PlayerTitle/RawPlayerTitle.cs b/Pipeline/Preprocessing/Objects/PlayerTitle/RawPlayerTitle.cs
@@ -2,6 +2,7 @@
 
 public class RawPlayerTitle
 {
+    public bool? AccountWide { get; set; }
     public string[]? Keywords { get; set; }
     public string? Title { get; set; }
     public string? Tooltip { get; set; }

diff --git a/Pipeline/Preprocessing/Objects/Quest/Quest.cs b/Pipeline/Preprocessing/Objects/Quest/Quest.cs
@@ -14,6 +14,7 @@ public Quest(RawQuest rawQuest)
         DisplayedLocation = Area.FromRawAreaName(rawQuest.DisplayedLocation, out OriginalDisplayedLocation);
         FavorNpc = rawQuest.FavorNpc;
         FollowUpQuests = rawQuest.FollowUpQuests;
+        ForceBookOnWrapUp = rawQuest.ForceBookOnWrapUp;
         GroupingName = rawQuest.GroupingName;
         InternalName = rawQuest.InternalName;
         IsAutoPreface = rawQuest.IsAutoPreface;
@@ -349,6 +350,7 @@ private static QuestReward ParseRewardEffectRaiseSkillToLevel(string levelReward
     public string? DisplayedLocation { get; set; }
     public string? FavorNpc { get; set; }
     public string[]? FollowUpQuests { get; set; }
+    public bool? ForceBookOnWrapUp { get; set; }
     public string? GroupingName { get; set; }
     public string? InternalName { get; set; }
     public bool? IsAutoPreface { get; set; }
@@ -388,6 +390,7 @@ public RawQuest ToRawQuest()
         Result.DisplayedLocation = Area.ToRawAreaName(DisplayedLocation, OriginalDisplayedLocation);
         Result.FavorNpc = FavorNpc;
         Result.FollowUpQuests = FollowUpQuests;
+        Result.ForceBookOnWrapUp = ForceBookOnWrapUp;
         Result.GroupingName = GroupingName;
         Result.InternalName = InternalName;
         Result.IsAutoPreface = IsAutoPreface;

diff --git a/Pipeline/Preprocessing/Objects/Quest/RawQuest.cs b/Pipeline/Preprocessing/Objects/Quest/RawQuest.cs
@@ -7,6 +7,7 @@ public class RawQuest
     public string? DisplayedLocation { get; set; }
     public string? FavorNpc { get; set; }
     public string[]? FollowUpQuests { get; set; }
+    public bool? ForceBookOnWrapUp { get; set; }
     public string? GroupingName { get; set; }
     public string? InternalName { get; set; }
     public bool? IsAutoPreface { get; set; }

diff --git a/Pipeline/Preprocessing/Objects/Recipe/Recipe.cs b/Pipeline/Preprocessing/Objects/Recipe/Recipe.cs
@@ -107,6 +107,8 @@ private static RecipeResultEffect ParseResultEffect(string effect)
         {
             case "ExtractTSysPower":
                 return ParseExtractTSysPower(EffectName, EffectParameter);
+            case "CraftWaxItem":
+                return ParseCraftWaxItem(EffectName, EffectParameter);
             case "RepairItemDurability":
                 return ParseRepairItemDurability(EffectName, EffectParameter);
             case "TSysCraftedEquipment":
@@ -139,6 +141,8 @@ private static RecipeResultEffect ParseResultEffect(string effect)
             case "SendItemToSaddlebag":
             case "TransmogItemAppearance":
                 return new RecipeResultEffect() { Type = EffectName };
+            case "BestowRecipeIfNotKnown":
+                return new RecipeResultEffect() { Type = EffectName, Recipe = EffectParameter };
             default:
                 return new RecipeResultEffect() { Type = "Special", Effect = EffectName };
         }
@@ -193,6 +197,21 @@ private static RecipeResultEffect ParseExtractTSysPower(string effectName, strin
         return new RecipeResultEffect() { Type = effectName, Augment = Augment, Skill = Skill, MinLevel = MinLevel, MaxLevel = MaxLevel };
     }
 
+    private static RecipeResultEffect ParseCraftWaxItem(string effectName, string effectParameter)
+    {
+        string[] Splitted = effectParameter.Split(',');
+
+        if (Splitted.Length != 4)
+            throw new PreprocessorException();
+
+        string Item = Splitted[0];
+        string PowerWaxType = Splitted[1];
+        int BoostLevel = int.Parse(Splitted[2]);
+        int MaxHitCount = int.Parse(Splitted[3]);
+
+        return new RecipeResultEffect() { Type = effectName, Item = Item, PowerWaxType = PowerWaxType, BoostLevel = BoostLevel, MaxHitCount = MaxHitCount };
+    }
+
     private static RecipeResultEffect ParseRepairItemDurability(string effectName, string effectParameter)
     {
         string[] Splitted = effectParameter.Split(',');
@@ -374,6 +393,11 @@ private static RecipeResultEffect ParseTeleport(string effectName, string effect
         return new RecipeResultEffect() { Type = effectName, AreaName = AreaName, Other = Other };
     }
 
+    private static RecipeResultEffect ParseBestowRecipeIfNotKnown(string effectName, string effectParameter)
+    {
+        return new RecipeResultEffect() { Type = effectName, Recipe = effectParameter };
+    }
+
     private static RecipeResultEffect ParseCreateMiningSurvey(string effectName, string effectParameter)
     {
         return new RecipeResultEffect() { Type = CreateMiningSurvey, Effect = effectName, Item = effectParameter };
@@ -544,6 +568,8 @@ private static string ToRawResultEffect(RecipeResultEffect effect)
                 return $"{effect.Keyword}{effect.Tier}";
             case "ExtractTSysPower":
                 return $"{effect.Type}({effect.Augment},{effect.Skill},{effect.MinLevel},{effect.MaxLevel})";
+            case "CraftWaxItem":
+                return $"{effect.Type}({effect.Item},{effect.PowerWaxType},{effect.BoostLevel},{effect.MaxHitCount})";
             case "RepairItemDurability":
                 return ToRawRepairItemDurability(effect);
             case "TSysCraftedEquipment":
@@ -574,6 +600,8 @@ private static string ToRawResultEffect(RecipeResultEffect effect)
                 return $"{effect.Type}_All_{effect.DurationInSeconds}sec";
             case "PermanentlyRaiseMaxTempestEnergy":
                 return $"{effect.Type}({effect.Delta})";
+            case "BestowRecipeIfNotKnown":
+                return $"{effect.Type}({effect.Recipe})";
             case "Special":
                 Debug.Assert(effect.Effect is not null);
                 return effect.Effect!;

diff --git a/Pipeline/Preprocessing/Objects/Recipe/RecipeResultEffect.cs b/Pipeline/Preprocessing/Objects/Recipe/RecipeResultEffect.cs
@@ -31,6 +31,7 @@ public class RecipeResultEffect
     public string? Other { get; set; }
     public int? PowerLevel { get; set; }
     public string? PowerWaxType { get; set; }
+    public string? Recipe { get; set; }
     public Time? RepairCooldown { get; set; }
     public int? RepairMaxEfficiency { get; set; }
     public int? RepairMinEfficiency { get; set; }

diff --git a/Translator/CombatParser/CombatParser.Sentences.cs b/Translator/CombatParser/CombatParser.Sentences.cs
@@ -294,6 +294,7 @@ public partial class CombatParser
         new Sentence("In the next %f second", CombatKeyword.EffectDuration),
         new Sentence("(%f second)", CombatKeyword.EffectDuration),
         new Sentence("For %f minute", CombatKeyword.EffectDurationMinute),
+        new Sentence("That restore Armor after a 6 second delay", CombatKeyword.IfRestoreArmorAfterDelay),
         new Sentence("After a %f second delay", CombatKeyword.EffectDelay),
         new Sentence("After an %f second delay", CombatKeyword.EffectDelay),
         new Sentence("After %f second", CombatKeyword.EffectDelay),
@@ -393,6 +394,7 @@ public partial class CombatParser
         new Sentence("Recover %f health", CombatKeyword.RestoreHealth),
         new Sentence("Recover %f power", CombatKeyword.RestorePower),
         new Sentence("Power Restoration %f", CombatKeyword.RestorePower),
+        new Sentence("Increased by %f of the Armor restored", CombatKeyword.MultiplyPowerRestauration),
         new Sentence("Restoration %f", CombatKeyword.RestoreHealth),
         new Sentence("You regain %f power", CombatKeyword.RestorePower),
         new Sentence("Cost no Power to cast", CombatKeyword.ZeroPowerCost),
@@ -410,6 +412,7 @@ public partial class CombatParser
         new Sentence("Max Health by %f", CombatKeyword.AddMaxHealth),
         new Sentence("%f Max Health", CombatKeyword.AddMaxHealth),
         new Sentence("%f Max Armor", CombatKeyword.AddMaxArmor),
+        new Sentence("Have %f Armor restoration", CombatKeyword.MultiplyArmorRestauration),
         new Sentence("Have %f Armor", CombatKeyword.AddMaxArmor),
         new Sentence("Attack Range is %f", CombatKeyword.AddRange),
         new Sentence("Range is %f meter", CombatKeyword.AddRange),