Skip to content

Commit 6b9419b

Browse files
LocalIdentityLocalIdentity
LocalIdentity
and
LocalIdentity
authored
Fix Chaotic Might and Mjolner skills (#1111)
Chaotic Might wasn't showing up in the skill list and mjolner had the wrong mod name Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 5724a11 commit 6b9419b

File tree

6 files changed

+150
-7
lines changed

6 files changed

+150
-7
lines changed

‎src/Data/Gems.lua

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11927,6 +11927,26 @@ return {
1192711927
Tier = 0,
1192811928
naturalMaxLevel = 20,
1192911929
},
11930+
["Metadata/Items/Gems/SkillGemChaosSpearTriggerChaosInfusion"] = {
11931+
name = "Chaotic Infusion",
11932+
baseTypeName = "Chaotic Infusion",
11933+
gameId = "Metadata/Items/Gem/SkillGemChaoticInfusion",
11934+
variantId = "ChaosSpearTriggerChaosInfusion",
11935+
grantedEffectId = "ChaosSpearTriggerChaosInfusionPlayer",
11936+
tags = {
11937+
grants_active_skill = true,
11938+
attack = true,
11939+
area = true,
11940+
chaos = true,
11941+
},
11942+
gemType = "Attack",
11943+
tagString = "AoE, Chaos",
11944+
reqStr = 0,
11945+
reqDex = 0,
11946+
reqInt = 0,
11947+
Tier = 0,
11948+
naturalMaxLevel = 20,
11949+
},
1193011950
["Metadata/Items/Gems/SkillGemCastLightningSpellOnHit"] = {
1193111951
name = "Lightning Spell on Hit",
1193211952
baseTypeName = "Lightning Spell on Melee Hit",

‎src/Data/ModCache.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ c["+3 to Level of all Cast on Melee Stun Skills"]={{[1]={flags=0,keywordFlags=0,
348348
c["+3 to Level of all Cast on Minion Death Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="cast on minion death",value=3}}},nil}
349349
c["+3 to Level of all Cast on Shock Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="cast on shock",value=3}}},nil}
350350
c["+3 to Level of all Chaos Bolt Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="chaos bolt",value=3}}},nil}
351+
c["+3 to Level of all Chaotic Infusion Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="chaotic infusion",value=3}}},nil}
351352
c["+3 to Level of all Charge Infusion Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="charge infusion",value=3}}},nil}
352353
c["+3 to Level of all Charged Staff Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="charged staff",value=3}}},nil}
353354
c["+3 to Level of all Cluster Grenade Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="cluster grenade",value=3}}},nil}
@@ -779,7 +780,6 @@ c["+85 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",v
779780
c["+85 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=85}},nil}
780781
c["+86 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=86}},nil}
781782
c["+9% to all Elemental Resistances"]={{[1]={flags=0,keywordFlags=0,name="ElementalResist",type="BASE",value=9}},nil}
782-
c["+90 to all Attributes"]={{[1]={flags=0,keywordFlags=0,name="Str",type="BASE",value=90},[2]={flags=0,keywordFlags=0,name="Dex",type="BASE",value=90},[3]={flags=0,keywordFlags=0,name="Int",type="BASE",value=90},[4]={flags=0,keywordFlags=0,name="All",type="BASE",value=90}},nil}
783783
c["+90 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=90}},nil}
784784
c["+90 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=90}},nil}
785785
c["+92 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=92}},nil}
@@ -3958,6 +3958,7 @@ c["Grants Skill: Infuse Weapon"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill"
39583958
c["Grants Skill: Into the Breach"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,skillId="IntoTheBreachPlayer"}}},nil}
39593959
c["Grants Skill: Level 11 Bone Blast"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="BoneBlastPlayer"}}},nil}
39603960
c["Grants Skill: Level 11 Chaos Bolt"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="WeaponGrantedChaosboltPlayer"}}},nil}
3961+
c["Grants Skill: Level 11 Chaotic Infusion"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="ChaosSpearTriggerChaosInfusionPlayer"}}},nil}
39613962
c["Grants Skill: Level 11 Decompose"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="CorpseCloudPlayer"}}},nil}
39623963
c["Grants Skill: Level 11 Discipline"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="DisciplinePlayer"}}},nil}
39633964
c["Grants Skill: Level 11 Ember Fusillade"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="BlazingClusterPlayer"}}},nil}
@@ -3967,6 +3968,7 @@ c["Grants Skill: Level 11 Herald of Ash"]={{[1]={flags=0,keywordFlags=0,name="Ex
39673968
c["Grants Skill: Level 11 Herald of Ice"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="HeraldOfIcePlayer"}}},nil}
39683969
c["Grants Skill: Level 11 Herald of Thunder"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="HeraldOfThunderPlayer"}}},nil}
39693970
c["Grants Skill: Level 11 Lightning Bolt"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="LightningBoltPlayer"}}},nil}
3971+
c["Grants Skill: Level 11 Lightning Spell on Melee Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="MetaCastLightningSpellOnHitPlayer"}}},nil}
39703972
c["Grants Skill: Level 11 Living Bomb"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="LivingBombPlayer"}}},nil}
39713973
c["Grants Skill: Level 11 Malice"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="MalicePlayer"}}},nil}
39723974
c["Grants Skill: Level 11 Mana Drain"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="ManaDrainPlayer"}}},nil}
@@ -3981,8 +3983,7 @@ c["Grants Skill: Level 11 Spark"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill
39813983
c["Grants Skill: Level 11 Volatile Dead"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=11,skillId="VolatileDeadPlayer"}}},nil}
39823984
c["Grants Skill: Level 20 Bone Blast"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="BoneBlastPlayer"}}},nil}
39833985
c["Grants Skill: Level 20 Chaos Bolt"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="WeaponGrantedChaosboltPlayer"}}},nil}
3984-
c["Grants Skill: Level 20 Chaotic Infusion"]={nil,nil}
3985-
c["Grants Skill: Level 20 Chaotic Infusion 20% increased Attack Speed"]={nil,nil}
3986+
c["Grants Skill: Level 20 Chaotic Infusion"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="ChaosSpearTriggerChaosInfusionPlayer"}}},nil}
39863987
c["Grants Skill: Level 20 Decompose"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="CorpseCloudPlayer"}}},nil}
39873988
c["Grants Skill: Level 20 Discipline"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="DisciplinePlayer"}}},nil}
39883989
c["Grants Skill: Level 20 Ember Fusillade"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="BlazingClusterPlayer"}}},nil}
@@ -3992,8 +3993,7 @@ c["Grants Skill: Level 20 Herald of Ash"]={{[1]={flags=0,keywordFlags=0,name="Ex
39923993
c["Grants Skill: Level 20 Herald of Ice"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="HeraldOfIcePlayer"}}},nil}
39933994
c["Grants Skill: Level 20 Herald of Thunder"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="HeraldOfThunderPlayer"}}},nil}
39943995
c["Grants Skill: Level 20 Lightning Bolt"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="LightningBoltPlayer"}}},nil}
3995-
c["Grants Skill: Level 20 Lightning Spell on Hit"]={nil,nil}
3996-
c["Grants Skill: Level 20 Lightning Spell on Hit +200 Intelligence Requirement"]={nil,nil}
3996+
c["Grants Skill: Level 20 Lightning Spell on Melee Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="MetaCastLightningSpellOnHitPlayer"}}},nil}
39973997
c["Grants Skill: Level 20 Living Bomb"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="LivingBombPlayer"}}},nil}
39983998
c["Grants Skill: Level 20 Malice"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="MalicePlayer"}}},nil}
39993999
c["Grants Skill: Level 20 Mana Drain"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="ManaDrainPlayer"}}},nil}

‎src/Data/Skills/other.lua

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3146,6 +3146,122 @@ skills["MeleeMaceMacePlayer"] = {
31463146
},
31473147
}
31483148
}
3149+
skills["ChaosSpearTriggerChaosInfusionPlayer"] = {
3150+
name = "Chaotic Infusion",
3151+
baseTypeName = "Chaotic Infusion",
3152+
fromItem = true,
3153+
color = 4,
3154+
description = "Grants your weapon Infusion. Non-Melee Projectile Attacks with that weapon Consume Infusions to Infuse the first Projectile fired, causing it to explode at the end of its flight.",
3155+
skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Chaos] = true, [SkillType.Triggered] = true, [SkillType.Triggerable] = true, [SkillType.GeneratesInfusion] = true, [SkillType.NoAttackOrCastTime] = true, [SkillType.CannotConsumeCharges] = true, },
3156+
castTime = 1,
3157+
qualityStats = {
3158+
},
3159+
levels = {
3160+
[1] = { baseMultiplier = 0.5, levelRequirement = 0, },
3161+
[2] = { baseMultiplier = 0.55, levelRequirement = 3, },
3162+
[3] = { baseMultiplier = 0.61, levelRequirement = 6, },
3163+
[4] = { baseMultiplier = 0.66, levelRequirement = 10, },
3164+
[5] = { baseMultiplier = 0.72, levelRequirement = 14, },
3165+
[6] = { baseMultiplier = 0.77, levelRequirement = 18, },
3166+
[7] = { baseMultiplier = 0.83, levelRequirement = 22, },
3167+
[8] = { baseMultiplier = 0.88, levelRequirement = 26, },
3168+
[9] = { baseMultiplier = 0.93, levelRequirement = 31, },
3169+
[10] = { baseMultiplier = 0.99, levelRequirement = 36, },
3170+
[11] = { baseMultiplier = 1.05, levelRequirement = 41, },
3171+
[12] = { baseMultiplier = 1.11, levelRequirement = 46, },
3172+
[13] = { baseMultiplier = 1.17, levelRequirement = 52, },
3173+
[14] = { baseMultiplier = 1.25, levelRequirement = 58, },
3174+
[15] = { baseMultiplier = 1.32, levelRequirement = 64, },
3175+
[16] = { baseMultiplier = 1.41, levelRequirement = 66, },
3176+
[17] = { baseMultiplier = 1.5, levelRequirement = 72, },
3177+
[18] = { baseMultiplier = 1.59, levelRequirement = 78, },
3178+
[19] = { baseMultiplier = 1.7, levelRequirement = 84, },
3179+
[20] = { baseMultiplier = 1.81, levelRequirement = 90, },
3180+
[21] = { baseMultiplier = 1.93, levelRequirement = 90, },
3181+
[22] = { baseMultiplier = 2.06, levelRequirement = 90, },
3182+
[23] = { baseMultiplier = 2.2, levelRequirement = 90, },
3183+
[24] = { baseMultiplier = 2.34, levelRequirement = 90, },
3184+
[25] = { baseMultiplier = 2.5, levelRequirement = 90, },
3185+
[26] = { baseMultiplier = 2.67, levelRequirement = 90, },
3186+
[27] = { baseMultiplier = 2.84, levelRequirement = 90, },
3187+
[28] = { baseMultiplier = 3.03, levelRequirement = 90, },
3188+
[29] = { baseMultiplier = 3.24, levelRequirement = 90, },
3189+
[30] = { baseMultiplier = 3.45, levelRequirement = 90, },
3190+
[31] = { baseMultiplier = 3.68, levelRequirement = 90, },
3191+
[32] = { baseMultiplier = 3.93, levelRequirement = 90, },
3192+
[33] = { baseMultiplier = 4.19, levelRequirement = 90, },
3193+
[34] = { baseMultiplier = 4.47, levelRequirement = 90, },
3194+
[35] = { baseMultiplier = 4.76, levelRequirement = 90, },
3195+
[36] = { baseMultiplier = 5.08, levelRequirement = 90, },
3196+
[37] = { baseMultiplier = 5.42, levelRequirement = 90, },
3197+
[38] = { baseMultiplier = 5.78, levelRequirement = 90, },
3198+
[39] = { baseMultiplier = 6.17, levelRequirement = 90, },
3199+
[40] = { baseMultiplier = 6.58, levelRequirement = 90, },
3200+
},
3201+
statSets = {
3202+
[1] = {
3203+
label = "Chaotic Infusion",
3204+
incrementalEffectiveness = 0.054999999701977,
3205+
statDescriptionScope = "trigger_chaos_infusion",
3206+
baseFlags = {
3207+
attack = true,
3208+
area = true,
3209+
},
3210+
constantStats = {
3211+
{ "chance_to_be_triggered_by_chaos_spear_%", 100 },
3212+
{ "active_skill_base_area_of_effect_radius", 18 },
3213+
{ "active_skill_base_physical_damage_%_to_convert_to_chaos", 100 },
3214+
},
3215+
stats = {
3216+
"is_area_damage",
3217+
"skill_is_infusion_skill",
3218+
"cannot_consume_power_frenzy_endurance_charges",
3219+
},
3220+
levels = {
3221+
[1] = { actorLevel = 1, },
3222+
[2] = { actorLevel = 3.4519999027252, },
3223+
[3] = { actorLevel = 6.7670001983643, },
3224+
[4] = { actorLevel = 10.307999610901, },
3225+
[5] = { actorLevel = 14.074999809265, },
3226+
[6] = { actorLevel = 18.068000793457, },
3227+
[7] = { actorLevel = 22.287000656128, },
3228+
[8] = { actorLevel = 26.732000350952, },
3229+
[9] = { actorLevel = 31.40299987793, },
3230+
[10] = { actorLevel = 36.299999237061, },
3231+
[11] = { actorLevel = 41.423000335693, },
3232+
[12] = { actorLevel = 46.771999359131, },
3233+
[13] = { actorLevel = 52.34700012207, },
3234+
[14] = { actorLevel = 58.147998809814, },
3235+
[15] = { actorLevel = 64.175003051758, },
3236+
[16] = { actorLevel = 70.428001403809, },
3237+
[17] = { actorLevel = 76.906997680664, },
3238+
[18] = { actorLevel = 83.611999511719, },
3239+
[19] = { actorLevel = 90.542999267578, },
3240+
[20] = { actorLevel = 97.699996948242, },
3241+
[21] = { actorLevel = 105.08300018311, },
3242+
[22] = { actorLevel = 112.69200134277, },
3243+
[23] = { actorLevel = 120.52700042725, },
3244+
[24] = { actorLevel = 128.58799743652, },
3245+
[25] = { actorLevel = 136.875, },
3246+
[26] = { actorLevel = 145.38800048828, },
3247+
[27] = { actorLevel = 154.12699890137, },
3248+
[28] = { actorLevel = 163.09199523926, },
3249+
[29] = { actorLevel = 172.28300476074, },
3250+
[30] = { actorLevel = 181.69999694824, },
3251+
[31] = { actorLevel = 191.34300231934, },
3252+
[32] = { actorLevel = 201.21200561523, },
3253+
[33] = { actorLevel = 211.30700683594, },
3254+
[34] = { actorLevel = 221.62800598145, },
3255+
[35] = { actorLevel = 232.17500305176, },
3256+
[36] = { actorLevel = 242.94799804688, },
3257+
[37] = { actorLevel = 253.94700622559, },
3258+
[38] = { actorLevel = 265.17199707031, },
3259+
[39] = { actorLevel = 276.62298583984, },
3260+
[40] = { actorLevel = 288.29998779297, },
3261+
},
3262+
},
3263+
}
3264+
}
31493265
skills["ManifestWeaponPlayer"] = {
31503266
name = "Manifest Weapon",
31513267
baseTypeName = "Manifest Weapon",

‎src/Data/Uniques/mace.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Mjölner
3131
Torment Club
3232
League: Dawn of the Hunt
3333
Implicits: 1
34-
Grants Skill: Level (1-20) Lightning Spell on Hit
34+
Grants Skill: Level (1-20) Lightning Spell on Melee Hit
3535
+200 Intelligence Requirement
3636
+100 Strength Requirement
3737
(150-200)% increased Physical Damage

‎src/Export/Skills/other.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,13 @@ statMap = {
221221
#mods
222222
#skillEnd
223223

224+
#from item
225+
#skill ChaosSpearTriggerChaosInfusionPlayer
226+
#set ChaosSpearTriggerChaosInfusionPlayer
227+
#flags attack area
228+
#mods
229+
#skillEnd
230+
224231
#from tree
225232
#minionList ManifestWeapon
226233
#skill ManifestWeaponPlayer

‎src/Export/Uniques/mace.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Mjölner
3131
Torment Club
3232
League: Dawn of the Hunt
3333
Implicits: 1
34-
Grants Skill: Level (1-20) Lightning Spell on Hit
34+
Grants Skill: Level (1-20) Lightning Spell on Melee Hit
3535
UniqueIntelligenceRequirements2
3636
UniqueStrengthRequirements2
3737
UniqueLocalIncreasedPhysicalDamagePercent12

0 commit comments

Comments
 (0)