Skip to content

Commit b74c08f

Browse files
author
LocalIdentity
committed
Update spec + mod cache + query mods
Add spec for activeskillrequirements Updated spec for: * activeskills * damagecalculationtypes
1 parent cafd931 commit b74c08f

File tree

4 files changed

+84
-31
lines changed

4 files changed

+84
-31
lines changed

‎src/Data/ModCache.lua

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,6 @@ c["+85 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",v
779779
c["+85 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=85}},nil}
780780
c["+86 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=86}},nil}
781781
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}
783782
c["+90 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=90}},nil}
784783
c["+90 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=90}},nil}
785784
c["+92 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=92}},nil}
@@ -3593,6 +3592,8 @@ c["Charms use no Charges"]={{[1]={flags=0,keywordFlags=0,name="CharmsUseNoCharge
35933592
c["Cold Damage from Hits Contributes to Ignite Chance and Magnitude instead of Chill Magnitude or Freeze Buildup"]={nil,"Cold Damage from Hits Contributes to Ignite Chance and Magnitude instead of Chill Magnitude or Freeze Buildup "}
35943593
c["Cold Damage from Hits Contributes to Ignite Chance and Magnitude instead of Chill Magnitude or Freeze Buildup Lightning Damage from Hits Contributes to Freeze Buildup instead of Shock Chance"]={nil,"Cold Damage from Hits Contributes to Ignite Chance and Magnitude instead of Chill Magnitude or Freeze Buildup Lightning Damage from Hits Contributes to Freeze Buildup instead of Shock Chance "}
35953594
c["Cold Exposure you inflict lowers Total Cold Resistance by an extra 5%"]={{[1]={flags=0,keywordFlags=0,name="ExtraColdExposure",type="BASE",value=-5}},nil}
3595+
c["Cold Resistance is unaffected by Area Penalties"]={nil,"Cold Resistance is unaffected by Area Penalties "}
3596+
c["Cold Resistance is unaffected by Area Penalties Fire Resistance is unaffected by Area Penalties"]={nil,"Cold Resistance is unaffected by Area Penalties Fire Resistance is unaffected by Area Penalties "}
35963597
c["Companions deal 12% increased Damage"]={{[1]={[1]={skillType=198,type="SkillType"},flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=12}}}},nil}
35973598
c["Companions gain your Dexterity"]={nil,"Companions gain your Dexterity "}
35983599
c["Companions gain your Dexterity +15 to Dexterity"]={nil,"Companions gain your Dexterity +15 to Dexterity "}
@@ -3813,6 +3814,8 @@ c["Final Repeat of Spells has 40% increased Area of Effect"]={{[1]={[1]={neg=tru
38133814
c["Fire Damage from Hits Contributes to Shock Chance instead of Ignite Chance and Magnitude"]={nil,"Fire Damage from Hits Contributes to Shock Chance instead of Ignite Chance and Magnitude "}
38143815
c["Fire Damage from Hits Contributes to Shock Chance instead of Ignite Chance and Magnitude Cold Damage from Hits Contributes to Ignite Chance and Magnitude instead of Chill Magnitude or Freeze Buildup"]={nil,"Fire Damage from Hits Contributes to Shock Chance instead of Ignite Chance and Magnitude Cold Damage from Hits Contributes to Ignite Chance and Magnitude instead of Chill Magnitude or Freeze Buildup "}
38153816
c["Fire Exposure you inflict lowers Total Fire Resistance by an extra 5%"]={{[1]={flags=0,keywordFlags=0,name="ExtraFireExposure",type="BASE",value=-5}},nil}
3817+
c["Fire Resistance is unaffected by Area Penalties"]={nil,"Fire Resistance is unaffected by Area Penalties "}
3818+
c["Fire Resistance is unaffected by Area Penalties Lightning Resistance is unaffected by Area Penalties"]={nil,"Fire Resistance is unaffected by Area Penalties Lightning Resistance is unaffected by Area Penalties "}
38163819
c["Flasks gain 0.17 charges per Second"]={{[1]={flags=0,keywordFlags=0,name="FlaskChargesGenerated",type="BASE",value=0.17}},nil}
38173820
c["Forks Critical Hits"]={nil,"Forks Critical Hits "}
38183821
c["Forks Critical Hits 10% of Skill Mana Costs Converted to Life Costs"]={nil,"Forks Critical Hits 10% of Skill Mana Costs Converted to Life Costs "}
@@ -4343,6 +4346,7 @@ c["Passives in radius of Blood Magic can be Allocated without being connected to
43434346
c["Passives in radius of Bulwark can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="bulwark"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="bulwark",value=true}}},nil}
43444347
c["Passives in radius of Chaos Inoculation can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="chaos inoculation"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="chaos inoculation",value=true}}},nil}
43454348
c["Passives in radius of Conduit can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="conduit"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="conduit",value=true}}},nil}
4349+
c["Passives in radius of Crimson Assault can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="crimson assault"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="crimson assault",value=true}}},nil}
43464350
c["Passives in radius of Dance with Death can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="dance with death"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="dance with death",value=true}}},nil}
43474351
c["Passives in radius of Eldritch Battery can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="eldritch battery"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="eldritch battery",value=true}}},nil}
43484352
c["Passives in radius of Elemental Equilibrium can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="elemental equilibrium"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="elemental equilibrium",value=true}}},nil}
@@ -4357,6 +4361,7 @@ c["Passives in radius of Oasis can be Allocated without being connected to your
43574361
c["Passives in radius of Pain Attunement can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="pain attunement"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="pain attunement",value=true}}},nil}
43584362
c["Passives in radius of Resolute Technique can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="resolute technique"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="resolute technique",value=true}}},nil}
43594363
c["Passives in radius of Resonance can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="resonance"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="resonance",value=true}}},nil}
4364+
c["Passives in radius of Trusted Kinship can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="trusted kinship"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="trusted kinship",value=true}}},nil}
43604365
c["Passives in radius of Unwavering Stance can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="unwavering stance"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="unwavering stance",value=true}}},nil}
43614366
c["Passives in radius of Vaal Pact can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="vaal pact"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="vaal pact",value=true}}},nil}
43624367
c["Passives in radius of Whispers of Doom can be Allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="fromNothingKeystone",value="whispers of doom"}},[2]={flags=0,keywordFlags=0,name="FromNothingKeystones",type="LIST",value={key="whispers of doom",value=true}}},nil}
@@ -4366,6 +4371,23 @@ c["Persistent Buffs have 50% less Reservation"]={{[1]={[1]={skillType=139,type="
43664371
c["Physical Damage Reduction from Armour is based on your combined Armour and Evasion Rating"]={{[1]={flags=0,keywordFlags=0,name="EvasionAddsToPdr",type="FLAG",value=true}},nil}
43674372
c["Physical Damage is Pinning"]={nil,"Physical Damage is Pinning "}
43684373
c["Pinned enemies cannot perform actions"]={nil,"Pinned enemies cannot perform actions "}
4374+
c["Possessed by Spirit Of The Bear for 20 seconds on use"]={nil,"Possessed by Spirit Of The Bear for 20 seconds on use "}
4375+
c["Possessed by Spirit Of The Bear for 20 seconds on use Possessed by Spirit Of The Boar for 20 seconds on use"]={nil,"Possessed by Spirit Of The Bear for 20 seconds on use Possessed by Spirit Of The Boar for 20 seconds on use "}
4376+
c["Possessed by Spirit Of The Boar for 20 seconds on use"]={nil,"Possessed by Spirit Of The Boar for 20 seconds on use "}
4377+
c["Possessed by Spirit Of The Boar for 20 seconds on use Possessed by Spirit Of The Cat for 20 seconds on use"]={nil,"Possessed by Spirit Of The Boar for 20 seconds on use Possessed by Spirit Of The Cat for 20 seconds on use "}
4378+
c["Possessed by Spirit Of The Cat for 20 seconds on use"]={nil,"Possessed by Spirit Of The Cat for 20 seconds on use "}
4379+
c["Possessed by Spirit Of The Cat for 20 seconds on use Possessed by Spirit Of The Owl for 20 seconds on use"]={nil,"Possessed by Spirit Of The Cat for 20 seconds on use Possessed by Spirit Of The Owl for 20 seconds on use "}
4380+
c["Possessed by Spirit Of The Owl for 20 seconds on use"]={nil,"Possessed by Spirit Of The Owl for 20 seconds on use "}
4381+
c["Possessed by Spirit Of The Owl for 20 seconds on use Possessed by Spirit Of The Ox for 20 seconds on use"]={nil,"Possessed by Spirit Of The Owl for 20 seconds on use Possessed by Spirit Of The Ox for 20 seconds on use "}
4382+
c["Possessed by Spirit Of The Ox for 20 seconds on use"]={nil,"Possessed by Spirit Of The Ox for 20 seconds on use "}
4383+
c["Possessed by Spirit Of The Ox for 20 seconds on use Possessed by Spirit Of The Primate for 20 seconds on use"]={nil,"Possessed by Spirit Of The Ox for 20 seconds on use Possessed by Spirit Of The Primate for 20 seconds on use "}
4384+
c["Possessed by Spirit Of The Primate for 20 seconds on use"]={nil,"Possessed by Spirit Of The Primate for 20 seconds on use "}
4385+
c["Possessed by Spirit Of The Primate for 20 seconds on use Possessed by Spirit Of The Serpent for 20 seconds on use"]={nil,"Possessed by Spirit Of The Primate for 20 seconds on use Possessed by Spirit Of The Serpent for 20 seconds on use "}
4386+
c["Possessed by Spirit Of The Serpent for 20 seconds on use"]={nil,"Possessed by Spirit Of The Serpent for 20 seconds on use "}
4387+
c["Possessed by Spirit Of The Serpent for 20 seconds on use Possessed by Spirit Of The Stag for 20 seconds on use"]={nil,"Possessed by Spirit Of The Serpent for 20 seconds on use Possessed by Spirit Of The Stag for 20 seconds on use "}
4388+
c["Possessed by Spirit Of The Stag for 20 seconds on use"]={nil,"Possessed by Spirit Of The Stag for 20 seconds on use "}
4389+
c["Possessed by Spirit Of The Stag for 20 seconds on use Possessed by Spirit Of The Wolf for 20 seconds on use"]={nil,"Possessed by Spirit Of The Stag for 20 seconds on use Possessed by Spirit Of The Wolf for 20 seconds on use "}
4390+
c["Possessed by Spirit Of The Wolf for 20 seconds on use"]={nil,"Possessed by Spirit Of The Wolf for 20 seconds on use "}
43694391
c["Presence Gain 50% of Damage as Fire Damage"]={nil,"Presence Gain 50% of Damage as Fire Damage "}
43704392
c["Presence Radius is doubled"]={nil,"Presence Radius is doubled "}
43714393
c["Projectile Damage builds Pin"]={nil,"Projectile Damage builds Pin "}
@@ -4565,6 +4587,8 @@ c["Unlimited number of Summoned Totems Totems reserve 100 Spirit each"]={nil,"Un
45654587
c["Unwavering Stance"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Unwavering Stance"}},nil}
45664588
c["Unwithered enemies are Withered for 8 seconds when they enter your Presence"]={nil,"Unwithered enemies are Withered for 8 seconds when they enter your Presence "}
45674589
c["Unwithered enemies are Withered for 8 seconds when they enter your Presence 20% increased Effect of Withered"]={nil,"Unwithered enemies are Withered for 8 seconds when they enter your Presence 20% increased Effect of Withered "}
4590+
c["Used when you Kill a Rare or Unique Enemy"]={nil,"Used when you Kill a Rare or Unique Enemy "}
4591+
c["Used when you Kill a Rare or Unique Enemy Possessed by Spirit Of The Bear for 20 seconds on use"]={nil,"Used when you Kill a Rare or Unique Enemy Possessed by Spirit Of The Bear for 20 seconds on use "}
45684592
c["Used when you are affected by a Slow"]={nil,"Used when you are affected by a Slow "}
45694593
c["Used when you are affected by a Slow Grants Onslaught during effect"]={nil,"Used when you are affected by a Slow Grants Onslaught during effect "}
45704594
c["Used when you become Frozen"]={nil,"Used when you become Frozen "}

‎src/Data/QueryMods.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13366,7 +13366,7 @@ return {
1336613366
["overrideModLinePlural"] = "+# Charm Slots",
1336713367
},
1336813368
["tradeMod"] = {
13369-
["id"] = "explicit.stat_554899692",
13369+
["id"] = "explicit.stat_2582079000",
1337013370
["text"] = "# Charm Slot",
1337113371
["type"] = "explicit",
1337213372
},

‎src/Export/Classes/GGPKData.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ function GGPKClass:GetNeededFiles()
304304
"Data/PassiveNodeUIArtOverride.dat",
305305
"Data/PlayerMinionIntrinsicStats.dat",
306306
"Data/MonsterCategories.dat",
307+
"Data/ActiveSkillRequirements.dat",
307308
}
308309
local csdFiles = {
309310
"^Metadata/StatDescriptions/specific_skill_stat_descriptions/\\w+.csd$",

‎src/Export/spec.lua

Lines changed: 57 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -142,38 +142,38 @@ return {
142142
activeskillrequirements={
143143
[1]={
144144
list=false,
145-
name="",
146-
refTo="",
145+
name="Id",
146+
refTo="GrantedEffects",
147147
type="Key",
148-
width=230
148+
width=180
149149
},
150150
[2]={
151151
list=false,
152-
name="",
153-
refTo="",
152+
name="BuffDefinition",
153+
refTo="buffdefinitions",
154154
type="Key",
155-
width=350
155+
width=300
156156
},
157157
[3]={
158158
list=false,
159159
name="",
160160
refTo="",
161-
type="Int",
162-
width=150
161+
type="Bool",
162+
width=80
163163
},
164164
[4]={
165165
list=false,
166166
name="",
167167
refTo="",
168168
type="Int",
169-
width=150
169+
width=50
170170
},
171171
[5]={
172172
list=false,
173173
name="",
174174
refTo="",
175-
type="Bool",
176-
width=150
175+
type="Key",
176+
width=50
177177
},
178178
[6]={
179179
list=false,
@@ -183,11 +183,39 @@ return {
183183
width=50
184184
},
185185
[7]={
186+
list=false,
187+
name="StatRequrement",
188+
refTo="Stats",
189+
type="Key",
190+
width=300
191+
},
192+
[8]={
186193
list=false,
187194
name="",
188195
refTo="",
189-
type="Key",
190-
width=50
196+
type="Bool",
197+
width=80
198+
},
199+
[9]={
200+
list=false,
201+
name="",
202+
refTo="",
203+
type="Int",
204+
width=150
205+
},
206+
[10]={
207+
list=false,
208+
name="",
209+
refTo="",
210+
type="Bool",
211+
width=80
212+
},
213+
[11]={
214+
list=false,
215+
name="",
216+
refTo="",
217+
type="Bool",
218+
width=80
191219
}
192220
},
193221
activeskills={
@@ -294,14 +322,14 @@ return {
294322
name="SkillSpecificStat",
295323
refTo="Stats",
296324
type="Key",
297-
width=1800
325+
width=250
298326
},
299327
[16]={
300328
list=true,
301329
name="GenericStat",
302330
refTo="Stats",
303331
type="Key",
304-
width=1420
332+
width=250
305333
},
306334
[17]={
307335
list=true,
@@ -364,7 +392,7 @@ return {
364392
name="StatContextFlags",
365393
refTo="VirtualStatContextFlags",
366394
type="Key",
367-
width=200
395+
width=150
368396
},
369397
[26]={
370398
list=false,
@@ -417,15 +445,15 @@ return {
417445
},
418446
[33]={
419447
list=false,
420-
name="SummonID?",
421-
refTo="",
448+
name="MinionType",
449+
refTo="MinionType",
422450
type="Key",
423451
width=150
424452
},
425453
[34]={
426454
list=false,
427-
name="",
428-
refTo="",
455+
name="SecondaryAudio",
456+
refTo="CharacterAudioEvents",
429457
type="Key",
430458
width=150
431459
},
@@ -438,10 +466,10 @@ return {
438466
},
439467
[36]={
440468
list=false,
441-
name="",
469+
name="ShortDescription",
442470
refTo="",
443471
type="String",
444-
width=150
472+
width=540
445473
},
446474
[37]={
447475
list=false,
@@ -4966,8 +4994,8 @@ return {
49664994
},
49674995
[30]={
49684996
list=false,
4969-
name="",
4970-
refTo="",
4997+
name="VirtualStatFlag",
4998+
refTo="VirtualStatContextFlags",
49714999
type="Key",
49725000
width=200
49735001
},
@@ -4980,7 +5008,7 @@ return {
49805008
},
49815009
[32]={
49825010
list=false,
4983-
name="",
5011+
name="IsAttack",
49845012
refTo="",
49855013
type="Bool",
49865014
width=80
@@ -5001,14 +5029,14 @@ return {
50015029
},
50025030
[35]={
50035031
list=false,
5004-
name="",
5005-
refTo="",
5032+
name="FakeHitType",
5033+
refTo="DamageCalculationTypes",
50065034
type="ShortKey",
50075035
width=320
50085036
},
50095037
[36]={
50105038
list=false,
5011-
name="",
5039+
name="IsFakeHit",
50125040
refTo="",
50135041
type="Bool",
50145042
width=150
@@ -8438,7 +8466,7 @@ return {
84388466
name="",
84398467
refTo="",
84408468
type="Key",
8441-
width=70
8469+
width=100
84428470
}
84438471
},
84448472
miniqueststates={

0 commit comments

Comments
 (0)