From 8f31c411e035a3651bdf73c7d3c2cb557d3c6536 Mon Sep 17 00:00:00 2001 From: Daniel Tralamazza Date: Sat, 14 Mar 2020 20:00:08 +0100 Subject: [PATCH] Added 3.10 changes --- Data/3_0/Gems.lua | 3 +- Data/3_0/Skills/act_dex.lua | 92 ++++++++++++++++++------------------- Export/Skills/act_dex.txt | 4 +- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/Data/3_0/Gems.lua b/Data/3_0/Gems.lua index f9a2fe94f..1a769e9ac 100644 --- a/Data/3_0/Gems.lua +++ b/Data/3_0/Gems.lua @@ -3176,8 +3176,9 @@ return { duration = true, minion = true, spell = true, + physical = true, }, - tagString = "Duration, Minion, Spell", + tagString = "Duration, Minion, Spell, Physical", reqStr = 0, reqDex = 60, reqInt = 40, diff --git a/Data/3_0/Skills/act_dex.lua b/Data/3_0/Skills/act_dex.lua index fa679fd22..ab2d270d7 100644 --- a/Data/3_0/Skills/act_dex.lua +++ b/Data/3_0/Skills/act_dex.lua @@ -10,10 +10,10 @@ skills["AnimateWeapon"] = { name = "Animate Weapon", color = 2, description = "Animates a melee weapon to fight by your side. You cannot animate unidentified weapons.", - skillTypes = { [SkillType.Triggerable] = true, [SkillType.Duration] = true, [SkillType.Minion] = true, [SkillType.CreateMinion] = true, [SkillType.Spell] = true, [SkillType.SkillCanTotem] = true, [SkillType.CreatesMinion] = true, }, + skillTypes = { [SkillType.Triggerable] = true, [SkillType.Duration] = true, [SkillType.Minion] = true, [SkillType.CreateMinion] = true, [SkillType.Spell] = true, [SkillType.SkillCanTotem] = true, [SkillType.CreatesMinion] = true, [SkillType.PhysicalSkill] = true, }, minionSkillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.AttackCanRepeat] = true, [SkillType.Type54] = true, [SkillType.SkillCanVolley] = true, [SkillType.Type56] = true, }, statDescriptionScope = "minion_spell_skill_stat_descriptions", - castTime = 0.8, + castTime = 0.6, minionHasItemSet = true, minionUses = { ["Weapon 1"] = true, @@ -28,8 +28,8 @@ skills["AnimateWeapon"] = { ["active_skill_damage_+%_final"] = { mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), }, - ["attack_speed_+%"] = { - mod("MinionModifier", "LIST", { mod = mod("Speed", "INC", nil, ModFlag.Attack) }), + ["active_skill_attack_speed_+%_final"] = { + mod("MinionModifier", "LIST", { mod = mod("Speed", "MORE", nil, ModFlag.Attack) }), }, ["attack_minimum_added_physical_damage"] = { mod("MinionModifier", "LIST", { mod = mod("PhysicalMin", "BASE", nil, 0, KeywordFlag.Attack) }), @@ -46,59 +46,59 @@ skills["AnimateWeapon"] = { baseMods = { }, qualityStats = { - { "base_movement_velocity_+%", 2 }, + { "base_movement_velocity_+%", 1 }, }, stats = { "emerge_speed_+%", "animate_item_maximum_level_requirement", "active_skill_damage_+%_final", - "attack_speed_+%", + "active_skill_attack_speed_+%_final", "base_skill_effect_duration", "attack_minimum_added_physical_damage", "attack_maximum_added_physical_damage", "number_of_animated_weapons_allowed", }, levels = { - [1] = { 0, 9, 0, 0, 37500, 4, 6, 50, manaCost = 7, levelRequirement = 4, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [2] = { 0, 11, 8, 2, 37500, 5, 8, 50, manaCost = 8, levelRequirement = 6, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [3] = { 0, 14, 16, 4, 37500, 7, 10, 50, manaCost = 9, levelRequirement = 9, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [4] = { 0, 18, 24, 6, 37500, 8, 12, 50, manaCost = 9, levelRequirement = 12, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [5] = { 0, 22, 32, 8, 37500, 10, 15, 50, manaCost = 11, levelRequirement = 16, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [6] = { 0, 26, 40, 10, 37500, 12, 18, 50, manaCost = 12, levelRequirement = 20, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [7] = { 0, 31, 48, 12, 37500, 14, 21, 50, manaCost = 13, levelRequirement = 24, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [8] = { 0, 35, 56, 14, 37500, 17, 25, 50, manaCost = 14, levelRequirement = 28, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [9] = { 0, 40, 64, 16, 37500, 19, 29, 50, manaCost = 15, levelRequirement = 32, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [10] = { 0, 44, 72, 18, 37500, 22, 34, 50, manaCost = 16, levelRequirement = 36, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [11] = { 0, 49, 80, 20, 37500, 24, 37, 50, manaCost = 18, levelRequirement = 40, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [12] = { 0, 53, 88, 22, 37500, 26, 39, 50, manaCost = 19, levelRequirement = 44, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [13] = { 0, 58, 96, 24, 37500, 28, 41, 50, manaCost = 20, levelRequirement = 48, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [14] = { 0, 62, 104, 26, 37500, 29, 44, 50, manaCost = 21, levelRequirement = 52, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [15] = { 0, 66, 112, 28, 37500, 31, 46, 50, manaCost = 22, levelRequirement = 55, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [16] = { 0, 70, 120, 30, 37500, 32, 49, 50, manaCost = 23, levelRequirement = 58, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [17] = { 0, 74, 128, 32, 37500, 34, 51, 50, manaCost = 24, levelRequirement = 61, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [18] = { 0, 78, 136, 34, 37500, 36, 53, 50, manaCost = 25, levelRequirement = 64, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [19] = { 0, 82, 144, 36, 37500, 37, 55, 50, manaCost = 25, levelRequirement = 67, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [20] = { 0, 100, 152, 38, 37500, 38, 56, 50, manaCost = 26, levelRequirement = 70, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [21] = { 0, 100, 160, 40, 37500, 39, 58, 50, manaCost = 27, levelRequirement = 72, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [22] = { 0, 100, 168, 42, 37500, 40, 60, 50, manaCost = 27, levelRequirement = 74, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [23] = { 0, 100, 176, 44, 37500, 41, 61, 50, manaCost = 28, levelRequirement = 76, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [24] = { 0, 100, 184, 46, 37500, 42, 63, 50, manaCost = 29, levelRequirement = 78, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [25] = { 0, 100, 192, 48, 37500, 43, 64, 50, manaCost = 29, levelRequirement = 80, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [26] = { 0, 100, 200, 50, 37500, 44, 66, 50, manaCost = 30, levelRequirement = 82, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [27] = { 0, 100, 208, 52, 37500, 45, 67, 50, manaCost = 30, levelRequirement = 84, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [28] = { 0, 100, 216, 54, 37500, 46, 69, 50, manaCost = 31, levelRequirement = 86, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [29] = { 0, 100, 224, 56, 37500, 47, 71, 50, manaCost = 32, levelRequirement = 88, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [30] = { 0, 100, 232, 58, 37500, 48, 72, 50, manaCost = 32, levelRequirement = 90, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [31] = { 0, 100, 236, 59, 37500, 48, 73, 50, manaCost = 32, levelRequirement = 91, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [32] = { 0, 100, 240, 60, 37500, 49, 74, 50, manaCost = 33, levelRequirement = 92, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [33] = { 0, 100, 244, 61, 37500, 49, 75, 50, manaCost = 33, levelRequirement = 93, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [34] = { 0, 100, 248, 62, 37500, 50, 76, 50, manaCost = 33, levelRequirement = 94, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [35] = { 0, 100, 252, 63, 37500, 50, 76, 50, manaCost = 34, levelRequirement = 95, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [36] = { 0, 100, 256, 64, 37500, 51, 77, 50, manaCost = 34, levelRequirement = 96, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [37] = { 0, 100, 260, 65, 37500, 51, 78, 50, manaCost = 34, levelRequirement = 97, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [38] = { 0, 100, 264, 66, 37500, 52, 78, 50, manaCost = 34, levelRequirement = 98, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [39] = { 0, 100, 268, 67, 37500, 52, 79, 50, manaCost = 35, levelRequirement = 99, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, - [40] = { 0, 100, 272, 68, 37500, 53, 80, 50, manaCost = 35, levelRequirement = 100, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [1] = { 0, 9, 0, 10, 40000, 5, 8, 5, manaCost = 4, levelRequirement = 4, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [2] = { 0, 11, 8, 12, 40000, 6, 11, 5, manaCost = 4, levelRequirement = 6, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [3] = { 0, 14, 16, 14, 40000, 10, 15, 6, manaCost = 4, levelRequirement = 9, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [4] = { 0, 18, 24, 16, 40000, 13, 18, 6, manaCost = 4, levelRequirement = 12, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [5] = { 0, 22, 32, 18, 40000, 17, 25, 7, manaCost = 5, levelRequirement = 16, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [6] = { 0, 26, 40, 20, 40000, 21, 32, 7, manaCost = 6, levelRequirement = 20, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [7] = { 0, 31, 48, 22, 40000, 26, 38, 8, manaCost = 6, levelRequirement = 24, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [8] = { 0, 35, 56, 24, 40000, 32, 47, 8, manaCost = 7, levelRequirement = 28, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [9] = { 0, 40, 64, 26, 40000, 39, 57, 9, manaCost = 7, levelRequirement = 32, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [10] = { 0, 44, 72, 28, 40000, 48, 72, 9, manaCost = 8, levelRequirement = 36, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [11] = { 0, 49, 80, 30, 40000, 53, 81, 10, manaCost = 8, levelRequirement = 40, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [12] = { 0, 53, 88, 32, 40000, 61, 91, 10, manaCost = 9, levelRequirement = 44, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [13] = { 0, 58, 96, 34, 40000, 68, 99, 11, manaCost = 9, levelRequirement = 48, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [14] = { 0, 62, 104, 36, 40000, 73, 112, 11, manaCost = 10, levelRequirement = 52, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [15] = { 0, 66, 112, 38, 40000, 83, 124, 12, manaCost = 10, levelRequirement = 55, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [16] = { 0, 70, 120, 40, 40000, 89, 136, 12, manaCost = 11, levelRequirement = 58, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [17] = { 0, 74, 128, 42, 40000, 99, 148, 13, manaCost = 11, levelRequirement = 61, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [18] = { 0, 78, 136, 44, 40000, 108, 159, 13, manaCost = 12, levelRequirement = 64, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [19] = { 0, 82, 144, 46, 40000, 115, 173, 14, manaCost = 12, levelRequirement = 67, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [20] = { 0, 100, 152, 48, 40000, 126, 184, 14, manaCost = 12, levelRequirement = 70, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [21] = { 0, 100, 160, 50, 40000, 130, 190, 15, manaCost = 13, levelRequirement = 72, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [22] = { 0, 100, 168, 52, 40000, 134, 196, 15, manaCost = 13, levelRequirement = 74, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [23] = { 0, 100, 176, 54, 40000, 138, 202, 16, manaCost = 13, levelRequirement = 76, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [24] = { 0, 100, 184, 56, 40000, 142, 208, 16, manaCost = 13, levelRequirement = 78, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [25] = { 0, 100, 192, 58, 40000, 146, 214, 17, manaCost = 14, levelRequirement = 80, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [26] = { 0, 100, 200, 60, 40000, 150, 220, 17, manaCost = 14, levelRequirement = 82, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [27] = { 0, 100, 208, 62, 40000, 155, 227, 18, manaCost = 14, levelRequirement = 84, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [28] = { 0, 100, 216, 64, 40000, 160, 234, 18, manaCost = 14, levelRequirement = 86, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [29] = { 0, 100, 224, 66, 40000, 165, 241, 19, manaCost = 15, levelRequirement = 88, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [30] = { 0, 100, 232, 68, 40000, 170, 248, 19, manaCost = 15, levelRequirement = 90, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [31] = { 0, 100, 236, 69, 40000, 175, 255, 20, manaCost = 15, levelRequirement = 91, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [32] = { 0, 100, 240, 70, 40000, 180, 263, 20, manaCost = 15, levelRequirement = 92, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [33] = { 0, 100, 244, 71, 40000, 185, 271, 21, manaCost = 15, levelRequirement = 93, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [34] = { 0, 100, 248, 72, 40000, 191, 279, 21, manaCost = 16, levelRequirement = 94, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [35] = { 0, 100, 252, 73, 40000, 197, 287, 22, manaCost = 16, levelRequirement = 95, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [36] = { 0, 100, 256, 74, 40000, 203, 296, 22, manaCost = 16, levelRequirement = 96, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [37] = { 0, 100, 260, 75, 40000, 209, 305, 23, manaCost = 16, levelRequirement = 97, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [38] = { 0, 100, 264, 76, 40000, 215, 314, 23, manaCost = 16, levelRequirement = 98, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [39] = { 0, 100, 268, 77, 40000, 221, 323, 24, manaCost = 16, levelRequirement = 99, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, + [40] = { 0, 100, 272, 78, 40000, 228, 333, 24, manaCost = 16, levelRequirement = 100, statInterpolation = { 1, 1, 1, 1, 1, 1, 1, 1, }, }, }, } skills["ArcticArmour"] = { diff --git a/Export/Skills/act_dex.txt b/Export/Skills/act_dex.txt index 3f68b1262..1f5ffb484 100644 --- a/Export/Skills/act_dex.txt +++ b/Export/Skills/act_dex.txt @@ -21,8 +21,8 @@ local skills, mod, flag, skill = ... ["active_skill_damage_+%_final"] = { mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), }, - ["attack_speed_+%"] = { - mod("MinionModifier", "LIST", { mod = mod("Speed", "INC", nil, ModFlag.Attack) }), + ["active_skill_attack_speed_+%_final"] = { + mod("MinionModifier", "LIST", { mod = mod("Speed", "MORE", nil, ModFlag.Attack) }), }, ["attack_minimum_added_physical_damage"] = { mod("MinionModifier", "LIST", { mod = mod("PhysicalMin", "BASE", nil, 0, KeywordFlag.Attack) }),