From 14a61e262f38505ec09fd2def2ab30dffec3f25f Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Mon, 18 Nov 2024 21:51:49 +1100 Subject: [PATCH] Fix exporter Add new datatype UInt16 Removed old dats Manually code in SkillTotem loop Update spec --- src/Data/ClusterJewels.lua | 84 +++--- src/Data/ModCache.lua | 49 +++- src/Data/QueryMods.lua | 22 +- src/Data/TimelessJewelData/LegionPassives.lua | 270 +++++++++--------- src/Export/Classes/Dat64File.lua | 7 + src/Export/Classes/DatFile.lua | 11 +- src/Export/Classes/GGPKData.lua | 13 - src/Export/Main.lua | 2 +- src/Export/Scripts/skills.lua | 2 +- src/Export/spec.lua | 79 ++--- 10 files changed, 264 insertions(+), 275 deletions(-) diff --git a/src/Data/ClusterJewels.lua b/src/Data/ClusterJewels.lua index d69cd6abad..4f323ef681 100644 --- a/src/Data/ClusterJewels.lua +++ b/src/Data/ClusterJewels.lua @@ -891,160 +891,160 @@ return { "Pitfighter", }, orbitOffsets = { - [43989] = { + [2627120085] = { [0] = 3, [1] = 5, [2] = 5, }, - [25134] = { + [2627101230] = { [0] = 0, [1] = 11, [2] = 11, }, - [30275] = { + [2627106371] = { [0] = 2, [1] = 3, [2] = 3, }, - [28650] = { + [2627104746] = { [0] = 1, [1] = 1, [2] = 1, }, - [48132] = { + [2627124228] = { [0] = 5, [1] = 9, [2] = 9, }, - [18756] = { + [2627094852] = { [0] = 4, [1] = 7, [2] = 7, }, - [55706] = { + [2627131802] = { [0] = 2, [1] = 3, }, - [26661] = { + [2627102757] = { [0] = 3, [1] = 5, }, - [13201] = { + [2627089297] = { [0] = 3, [1] = 7, }, - [40114] = { + [2627116210] = { [0] = 1, }, - [18361] = { + [2627094457] = { [0] = 2, }, - [7956] = { + [2627084052] = { [0] = 3, }, - [51233] = { + [2627127329] = { [0] = 5, [1] = 9, }, - [57194] = { + [2627133290] = { [0] = 5, [1] = 11, }, - [35853] = { + [2627111949] = { [0] = 0, [1] = 1, }, - [35313] = { + [2627111409] = { [0] = 4, }, - [44470] = { + [2627120566] = { [0] = 5, }, - [37147] = { + [2627113243] = { [0] = 0, }, - [25441] = { + [2627101537] = { [0] = 1, [1] = 1, }, - [28018] = { + [2627104114] = { [0] = 2, [1] = 3, }, - [53203] = { + [2627129299] = { [0] = 3, [1] = 5, }, - [3854] = { + [2627079950] = { [0] = 0, }, - [49951] = { + [2627126047] = { [0] = 1, }, - [22046] = { + [2627098142] = { [0] = 2, }, - [37898] = { + [2627113994] = { [0] = 5, [1] = 11, }, - [64166] = { + [2627140262] = { [0] = 1, [1] = 1, }, - [58355] = { + [2627134451] = { [0] = 2, [1] = 3, }, - [48128] = { + [2627124224] = { [0] = 5, }, - [27475] = { + [2627103571] = { [0] = 0, }, - [35070] = { + [2627111166] = { [0] = 1, }, - [35926] = { + [2627112022] = { [0] = 4, [1] = 7, }, - [33833] = { + [2627109929] = { [0] = 5, [1] = 9, }, - [50179] = { + [2627126275] = { [0] = 5, [1] = 11, }, - [36414] = { + [2627112510] = { [0] = 3, }, - [10643] = { + [2627086739] = { [0] = 4, }, - [56439] = { + [2627132535] = { [0] = 5, }, - [58194] = { + [2627134290] = { [0] = 3, [1] = 5, }, - [34013] = { + [2627110109] = { [0] = 4, [1] = 7, }, - [24452] = { + [2627100548] = { [0] = 5, [1] = 9, }, - [63754] = { + [2627139850] = { [0] = 2, }, - [54600] = { + [2627130696] = { [0] = 3, }, - [27819] = { + [2627103915] = { [0] = 4, }, }, diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index fceca7eacd..8632b8e8fc 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -137,12 +137,14 @@ c["+1 to Level of Socketed Strength Gems"]={{[1]={[1]={slotName="{SlotName}",typ c["+1 to Level of Socketed Support Gems"]={{[1]={[1]={slotName="{SlotName}",type="SocketedIn"},flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyword="support",value=1}}},nil} c["+1 to Level of Socketed Warcry Gems"]={{[1]={[1]={slotName="{SlotName}",type="SocketedIn"},flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyword="warcry",value=1}}},nil} c["+1 to Level of all Chaos Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="chaos",[2]="skill"},value=1}}},nil} +c["+1 to Level of all Chaos Spell Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="chaos",[2]="spell",[3]="skill"},value=1}}},nil} c["+1 to Level of all Cold Spell Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="cold",[2]="spell",[3]="skill"},value=1}}},nil} c["+1 to Level of all Dexterity Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="dexterity",[2]="skill"},value=1}}},nil} c["+1 to Level of all Fire Spell Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="fire",[2]="spell",[3]="skill"},value=1}}},nil} c["+1 to Level of all Intelligence Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="intelligence",[2]="skill"},value=1}}},nil} c["+1 to Level of all Lightning Spell Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="lightning",[2]="spell",[3]="skill"},value=1}}},nil} c["+1 to Level of all Minion Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="minion",[2]="skill"},value=1}}},nil} +c["+1 to Level of all Physical Spell Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="physical",[2]="spell",[3]="skill"},value=1}}},nil} c["+1 to Level of all Raise Spectre Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyword="raise spectre",value=1}}},nil} c["+1 to Level of all Raise Zombie Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyword="raise zombie",value=1}}},nil} c["+1 to Level of all Skill Gems"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keywordList={[1]="skill"},value=1}}},nil} @@ -1072,6 +1074,7 @@ c["+400 to Accuracy Rating"]={{[1]={flags=0,keywordFlags=0,name="Accuracy",type= c["+400 to Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="BASE",value=400}},nil} c["+400 to Evasion Rating"]={{[1]={flags=0,keywordFlags=0,name="Evasion",type="BASE",value=400}},nil} c["+4000 to Armour during Soul Gain Prevention"]={{[1]={[1]={type="Condition",var="SoulGainPrevention"},flags=0,keywordFlags=0,name="Armour",type="BASE",value=4000}},nil} +c["+41 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=41}},nil} c["+41% to Chaos Resistance"]={{[1]={flags=0,keywordFlags=0,name="ChaosResist",type="BASE",value=41}},nil} c["+42% to Chaos Resistance"]={{[1]={flags=0,keywordFlags=0,name="ChaosResist",type="BASE",value=42}},nil} c["+425 to Accuracy Rating"]={{[1]={flags=0,keywordFlags=0,name="Accuracy",type="BASE",value=425}},nil} @@ -1335,7 +1338,6 @@ c["+75% to Cold Resistance"]={{[1]={flags=0,keywordFlags=0,name="ColdResist",typ c["+75% to Critical Strike Multiplier during any Flask Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="CritMultiplier",type="BASE",value=75}},nil} c["+75% to Fire Resistance"]={{[1]={flags=0,keywordFlags=0,name="FireResist",type="BASE",value=75}},nil} c["+75% to Lightning Resistance"]={{[1]={flags=0,keywordFlags=0,name="LightningResist",type="BASE",value=75}},nil} -c["+77 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=77}},nil} c["+78 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=78}},nil} c["+78 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=78}},nil} c["+8 to Dexterity"]={{[1]={flags=0,keywordFlags=0,name="Dex",type="BASE",value=8}},nil} @@ -1467,6 +1469,7 @@ c["-18 Physical Damage taken from Attack Hits"]={{[1]={flags=0,keywordFlags=0,na c["-2 Physical Damage taken from Attack Hits"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromAttacks",type="BASE",value=-2}},nil} c["-2 Physical Damage taken from Attacks"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromAttacks",type="BASE",value=-2}},nil} c["-2 Prefix Modifiers allowed"]={{},nil} +c["-2 Suffix Modifiers allowed"]={{},nil} c["-2 to Accuracy Rating per Level"]={{[1]={[1]={type="Multiplier",var="Level"},flags=0,keywordFlags=0,name="Accuracy",type="BASE",value=-2}},nil} c["-2 to Level of Socketed Skill Gems per Socketed Gem"]={{[1]={[1]={slotName="{SlotName}",type="SocketedIn"},[2]={type="Multiplier",var="SocketedGemsIn{SlotName}"},flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyword="grants_active_skill",value=-2}}},nil} c["-2 to Level of Socketed Support Gems"]={{[1]={[1]={slotName="{SlotName}",type="SocketedIn"},flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyword="support",value=-2}}},nil} @@ -4711,6 +4714,7 @@ c["35% less Minimum Physical Attack Damage"]={{[1]={[1]={skillType=1,type="Skill c["35% less Physical and Chaos Damage Taken while Sane"]={{[1]={[1]={neg=true,type="Condition",var="Insane"},flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="MORE",value=-35},[2]={[1]={neg=true,type="Condition",var="Insane"},flags=0,keywordFlags=0,name="ChaosDamageTaken",type="MORE",value=-35}},nil} c["35% more Maximum Physical Attack Damage"]={{[1]={[1]={skillType=1,type="SkillType"},flags=0,keywordFlags=0,name="MaxPhysicalDamage",type="MORE",value=35}},nil} c["35% more Melee Physical Damage during effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=256,keywordFlags=0,name="PhysicalDamage",type="MORE",value=35}},nil} +c["35% reduced Duration"]={{[1]={flags=0,keywordFlags=0,name="Duration",type="INC",value=-35}},nil} c["35% reduced Elemental Damage"]={{[1]={flags=0,keywordFlags=0,name="ElementalDamage",type="INC",value=-35}},nil} c["35% reduced Mana Burn rate"]={{[1]={flags=0,keywordFlags=0,name="TinctureManaBurnRate",type="INC",value=-35}},nil} c["35% reduced Recovery rate"]={{[1]={flags=0,keywordFlags=0,name="FlaskRecoveryRate",type="INC",value=-35}},nil} @@ -5363,6 +5367,7 @@ c["50% increased Melee Damage against Bleeding Enemies"]={{[1]={[1]={actor="enem c["50% increased Movement Speed"]={{[1]={flags=0,keywordFlags=0,name="MovementSpeed",type="INC",value=50}},nil} c["50% increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamage",type="INC",value=50}},nil} c["50% increased Physical Damage taken"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="INC",value=50}},nil} +c["50% increased Prefix Modifier magnitudes"]={{}," Prefix Modifier magnitudes "} c["50% increased Projectile Attack Damage while you have at least 200 Dexterity"]={{[1]={[1]={stat="Dex",threshold=200,type="StatThreshold"},flags=1025,keywordFlags=0,name="Damage",type="INC",value=50}},nil} c["50% increased Projectile Damage"]={{[1]={flags=1024,keywordFlags=0,name="Damage",type="INC",value=50}},nil} c["50% increased Projectile Damage while in Blood Stance"]={{[1]={[1]={type="Condition",var="BloodStance"},flags=1024,keywordFlags=0,name="Damage",type="INC",value=50}},nil} @@ -5386,6 +5391,7 @@ c["50% increased Stun Duration on you"]={{[1]={flags=0,keywordFlags=0,name="Stun c["50% increased Stun Duration with Bows on Enemies"]={{[1]={flags=131076,keywordFlags=0,name="EnemyStunDuration",type="INC",value=50}},nil} c["50% increased Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="StunThreshold",type="INC",value=50}},nil} c["50% increased Stun and Block Recovery"]={{[1]={flags=0,keywordFlags=0,name="StunRecovery",type="INC",value=50}},nil} +c["50% increased Suffix Modifier magnitudes"]={{}," Suffix Modifier magnitudes "} c["50% increased Totem Duration"]={{[1]={flags=0,keywordFlags=0,name="TotemDuration",type="INC",value=50}},nil} c["50% increased Totem Life"]={{[1]={flags=0,keywordFlags=0,name="TotemLife",type="INC",value=50}},nil} c["50% increased Totem Placement speed"]={{[1]={flags=0,keywordFlags=0,name="TotemPlacementSpeed",type="INC",value=50}},nil} @@ -5572,6 +5578,7 @@ c["60% increased Area of Effect while you don't have Convergence"]={{[1]={[1]={n c["60% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC",value=60}},nil} c["60% increased Armour and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEnergyShield",type="INC",value=60}},nil} c["60% increased Armour and Evasion"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEvasion",type="INC",value=60}},nil} +c["60% increased Armour during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="Armour",type="INC",value=60}},nil} c["60% increased Aspect of the Spider Area of Effect"]={{[1]={[1]={skillName="Aspect of the Spider",type="SkillName"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=60}},nil} c["60% increased Attack Damage"]={{[1]={flags=1,keywordFlags=0,name="Damage",type="INC",value=60}},nil} c["60% increased Attack Damage while affected by Precision"]={{[1]={[1]={type="Condition",var="AffectedByPrecision"},flags=1,keywordFlags=0,name="Damage",type="INC",value=60}},nil} @@ -5668,6 +5675,9 @@ c["600% increased Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShie c["600% increased Evasion and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EvasionAndEnergyShield",type="INC",value=600}},nil} c["600% increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamage",type="INC",value=600}},nil} c["62% increased Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ChaosDamage",type="INC",value=62}},nil} +c["62% increased Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamage",type="INC",value=62}},nil} +c["62% increased Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamage",type="INC",value=62}},nil} +c["62% increased Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningDamage",type="INC",value=62}},nil} c["62% increased Spell Damage"]={{[1]={flags=2,keywordFlags=0,name="Damage",type="INC",value=62}},nil} c["63% increased Armour and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEnergyShield",type="INC",value=63}},nil} c["63% increased Critical Strike Chance"]={{[1]={flags=0,keywordFlags=0,name="CritChance",type="INC",value=63}},nil} @@ -5689,7 +5699,7 @@ c["650% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC c["66% increased Critical Strike Chance"]={{[1]={flags=0,keywordFlags=0,name="CritChance",type="INC",value=66}},nil} c["66% reduced Amount Recovered"]={{[1]={flags=0,keywordFlags=0,name="FlaskRecovery",type="INC",value=-66}},nil} c["67% chance to deal Double Damage while Focused"]={{[1]={[1]={type="Condition",var="Focused"},flags=0,keywordFlags=0,name="DoubleDamageChance",type="BASE",value=67}},nil} -c["67% increased Elemental Damage with Attack Skills"]={{[1]={flags=0,keywordFlags=65536,name="ElementalDamage",type="INC",value=67}},nil} +c["67% increased Chance to Block"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="INC",value=67}},nil} c["68% increased Global Critical Strike Chance"]={{[1]={[1]={type="Global"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=68}},nil} c["69% increased Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ChaosDamage",type="INC",value=69}},nil} c["69% increased Spell Damage"]={{[1]={flags=2,keywordFlags=0,name="Damage",type="INC",value=69}},nil} @@ -6029,7 +6039,6 @@ c["90% less Power Charge Duration"]={{[1]={flags=0,keywordFlags=0,name="PowerCha c["90% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=90}},nil} c["90% reduced Duration"]={{[1]={flags=0,keywordFlags=0,name="Duration",type="INC",value=-90}},nil} c["90% reduced Ignite Duration on Enemies"]={{[1]={flags=0,keywordFlags=0,name="EnemyIgniteDuration",type="INC",value=-90}},nil} -c["94% increased Elemental Damage with Attack Skills"]={{[1]={flags=0,keywordFlags=65536,name="ElementalDamage",type="INC",value=94}},nil} c["95% increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamage",type="INC",value=95}},nil} c["95% increased Spell Damage"]={{[1]={flags=2,keywordFlags=0,name="Damage",type="INC",value=95}},nil} c["98% increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamage",type="INC",value=98}},nil} @@ -6167,12 +6176,14 @@ c["Adds 113 to 338 Lightning Damage to Spells while Unarmed"]={{[1]={[1]={type=" c["Adds 115 to 205 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=115},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=205}},nil} c["Adds 115 to 260 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=115},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=260}},nil} c["Adds 115 to 265 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=115},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=265}},nil} +c["Adds 118 to 216 Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdMin",type="BASE",value=118},[2]={flags=0,keywordFlags=0,name="ColdMax",type="BASE",value=216}},nil} c["Adds 12 Passive Skills"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="clusterJewelNodeCount",value=12}}},nil} c["Adds 12 to 15 Cold Damage to Attacks"]={{[1]={flags=0,keywordFlags=65536,name="ColdMin",type="BASE",value=12},[2]={flags=0,keywordFlags=65536,name="ColdMax",type="BASE",value=15}},nil} c["Adds 12 to 16 Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdMin",type="BASE",value=12},[2]={flags=0,keywordFlags=0,name="ColdMax",type="BASE",value=16}},nil} c["Adds 12 to 16 Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="FireMin",type="BASE",value=12},[2]={flags=0,keywordFlags=0,name="FireMax",type="BASE",value=16}},nil} c["Adds 12 to 20 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=12},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=20}},nil} c["Adds 12 to 20 Physical Damage to Attacks"]={{[1]={flags=0,keywordFlags=65536,name="PhysicalMin",type="BASE",value=12},[2]={flags=0,keywordFlags=65536,name="PhysicalMax",type="BASE",value=20}},nil} +c["Adds 12 to 213 Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningMin",type="BASE",value=12},[2]={flags=0,keywordFlags=0,name="LightningMax",type="BASE",value=213}},nil} c["Adds 12 to 22 Fire Damage to Spells"]={{[1]={flags=0,keywordFlags=131072,name="FireMin",type="BASE",value=12},[2]={flags=0,keywordFlags=131072,name="FireMax",type="BASE",value=22}},nil} c["Adds 12 to 22 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=12},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=22}},nil} c["Adds 12 to 22 Physical Damage if you've dealt a Critical Strike Recently"]={{[1]={[1]={type="Condition",var="CritRecently"},flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=12},[2]={[1]={type="Condition",var="CritRecently"},flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=22}},nil} @@ -6204,6 +6215,7 @@ c["Adds 13 to 60 Lightning Damage to Attacks during Effect"]={{[1]={[1]={type="C c["Adds 130 to 160 Cold Damage to Spells"]={{[1]={flags=0,keywordFlags=131072,name="ColdMin",type="BASE",value=130},[2]={flags=0,keywordFlags=131072,name="ColdMax",type="BASE",value=160}},nil} c["Adds 130 to 190 Chaos Damage to Spells"]={{[1]={flags=0,keywordFlags=131072,name="ChaosMin",type="BASE",value=130},[2]={flags=0,keywordFlags=131072,name="ChaosMax",type="BASE",value=190}},nil} c["Adds 130 to 195 Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdMin",type="BASE",value=130},[2]={flags=0,keywordFlags=0,name="ColdMax",type="BASE",value=195}},nil} +c["Adds 130 to 242 Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="FireMin",type="BASE",value=130},[2]={flags=0,keywordFlags=0,name="FireMax",type="BASE",value=242}},nil} c["Adds 133 to 197 Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="FireMin",type="BASE",value=133},[2]={flags=0,keywordFlags=0,name="FireMax",type="BASE",value=197}},nil} c["Adds 135 to 360 Lightning Damage to Spells while Unarmed"]={{[1]={[1]={type="Condition",var="Unarmed"},flags=0,keywordFlags=131072,name="LightningMin",type="BASE",value=135},[2]={[1]={type="Condition",var="Unarmed"},flags=0,keywordFlags=131072,name="LightningMax",type="BASE",value=360}},nil} c["Adds 14 to 16 Physical Damage to Attacks and Spells per Siphoning Charge"]={{[1]={[1]={type="Multiplier",var="SiphoningCharge"},flags=0,keywordFlags=196608,name="PhysicalMin",type="BASE",value=14},[2]={[1]={type="Multiplier",var="SiphoningCharge"},flags=0,keywordFlags=196608,name="PhysicalMax",type="BASE",value=16}},nil} @@ -6349,6 +6361,7 @@ c["Adds 22 to 33 Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdMin",type c["Adds 22 to 35 Cold Damage to Spells and Attacks"]={{[1]={flags=0,keywordFlags=196608,name="ColdMin",type="BASE",value=22},[2]={flags=0,keywordFlags=196608,name="ColdMax",type="BASE",value=35}},nil} c["Adds 22 to 35 Fire Damage to Spells and Attacks"]={{[1]={flags=0,keywordFlags=196608,name="FireMin",type="BASE",value=22},[2]={flags=0,keywordFlags=196608,name="FireMax",type="BASE",value=35}},nil} c["Adds 22 to 37 Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ChaosMin",type="BASE",value=22},[2]={flags=0,keywordFlags=0,name="ChaosMax",type="BASE",value=37}},nil} +c["Adds 22 to 396 Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningMin",type="BASE",value=22},[2]={flags=0,keywordFlags=0,name="LightningMax",type="BASE",value=396}},nil} c["Adds 22 to 41 Fire Damage to Spells"]={{[1]={flags=0,keywordFlags=131072,name="FireMin",type="BASE",value=22},[2]={flags=0,keywordFlags=131072,name="FireMax",type="BASE",value=41}},nil} c["Adds 22 to 42 Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="FireMin",type="BASE",value=22},[2]={flags=0,keywordFlags=0,name="FireMax",type="BASE",value=42}},nil} c["Adds 22 to 44 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=22},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=44}},nil} @@ -6592,6 +6605,7 @@ c["Adds 60 to 90 Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdMin",type c["Adds 625 to 775 Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ChaosMin",type="BASE",value=625},[2]={flags=0,keywordFlags=0,name="ChaosMax",type="BASE",value=775}},nil} c["Adds 63 to 113 Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ChaosMin",type="BASE",value=63},[2]={flags=0,keywordFlags=0,name="ChaosMax",type="BASE",value=113}},nil} c["Adds 64 to 107 Fire Damage to Spells while no Life is Reserved"]={{[1]={[1]={stat="LifeReserved",threshold=0,type="StatThreshold",upper=true},flags=0,keywordFlags=131072,name="FireMin",type="BASE",value=64},[2]={[1]={stat="LifeReserved",threshold=0,type="StatThreshold",upper=true},flags=0,keywordFlags=131072,name="FireMax",type="BASE",value=107}},nil} +c["Adds 64 to 117 Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdMin",type="BASE",value=64},[2]={flags=0,keywordFlags=0,name="ColdMax",type="BASE",value=117}},nil} c["Adds 64 to 96 Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ChaosMin",type="BASE",value=64},[2]={flags=0,keywordFlags=0,name="ChaosMax",type="BASE",value=96}},nil} c["Adds 65 to 100 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=65},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=100}},nil} c["Adds 65 to 105 Chaos Damage to Spells"]={{[1]={flags=0,keywordFlags=131072,name="ChaosMin",type="BASE",value=65},[2]={flags=0,keywordFlags=131072,name="ChaosMax",type="BASE",value=105}},nil} @@ -6614,6 +6628,7 @@ c["Adds 7 to 18 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMi c["Adds 7 to 25 Physical Damage to Attacks"]={{[1]={flags=0,keywordFlags=65536,name="PhysicalMin",type="BASE",value=7},[2]={flags=0,keywordFlags=65536,name="PhysicalMax",type="BASE",value=25}},nil} c["Adds 70 to 104 Cold Damage while affected by Hatred"]={{[1]={[1]={type="Condition",var="AffectedByHatred"},flags=0,keywordFlags=0,name="ColdMin",type="BASE",value=70},[2]={[1]={type="Condition",var="AffectedByHatred"},flags=0,keywordFlags=0,name="ColdMax",type="BASE",value=104}},nil} c["Adds 70 to 105 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=70},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=105}},nil} +c["Adds 70 to 130 Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="FireMin",type="BASE",value=70},[2]={flags=0,keywordFlags=0,name="FireMax",type="BASE",value=130}},nil} c["Adds 70 to 165 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=70},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=165}},nil} c["Adds 70 to 210 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=70},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=210}},nil} c["Adds 70 to 295 Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=70},[2]={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=295}},nil} @@ -7596,9 +7611,12 @@ c["Curse Auras from Socketed Skills also affect you"]={nil,"Curse Auras from Soc c["Curse Auras from Socketed Skills also affect you Socketed Curse Gems have 50% increased Reservation Efficiency"]={nil,"Curse Auras from Socketed Skills also affect you Socketed Curse Gems have 50% increased Reservation Efficiency "} c["Curse Enemies which Hit you with a random Hex, ignoring Curse Limit"]={nil,"Curse Enemies which Hit you with a random Hex, ignoring Curse Limit "} c["Curse Enemies which Hit you with a random Hex, ignoring Curse Limit 5% chance to create Shocked Ground when Hit"]={nil,"Curse Enemies which Hit you with a random Hex, ignoring Curse Limit 5% chance to create Shocked Ground when Hit "} +c["Curse Enemies with Conductivity on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Conductivity",triggered=true}}},nil} +c["Curse Enemies with Elemental Weakness on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="ElementalWeakness",triggered=true}}},nil} c["Curse Enemies with Elemental Weakness when you Block their Spell Damage, ignoring Curse Limit"]={nil,"Curse Enemies with Elemental Weakness when you Block their Spell Damage, ignoring Curse Limit "} c["Curse Enemies with Flammability on Block"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Flammability",triggered=true}}},nil} c["Curse Enemies with Flammability on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Flammability",triggered=true}}},nil} +c["Curse Enemies with Frostbite on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Frostbite",triggered=true}}},nil} c["Curse Enemies with Punishment when you Block their Melee Damage, ignoring Curse Limit"]={nil,"Curse Enemies with Punishment when you Block their Melee Damage, ignoring Curse Limit "} c["Curse Enemies with Punishment when you Block their Melee Damage, ignoring Curse Limit Curse Enemies with Temporal Chains when you Block their Projectile Attack Damage, ignoring Curse Limit"]={nil,"Curse Enemies with Punishment when you Block their Melee Damage, ignoring Curse Limit Curse Enemies with Temporal Chains when you Block their Projectile Attack Damage, ignoring Curse Limit "} c["Curse Enemies with Socketed Hex Curse Gem on Hit"]={{},nil} @@ -7923,8 +7941,8 @@ c["Energy Shield protects Mana instead of Life"]={{[1]={flags=0,keywordFlags=0,n c["Energy Shield starts at zero"]={nil,"Energy Shield starts at zero "} c["Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield"]={nil,"Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield "} c["Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second"]={nil,"Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second "} -c["Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed at Full Life"]={nil,"Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed at Full Life "} -c["Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed at Full Life Life Leech effects Recover Energy Shield instead while on Full Life"]={nil,"Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed at Full Life Life Leech effects Recover Energy Shield instead while on Full Life "} +c["Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed when Unreserved Life is Filled"]={nil,"Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed when Unreserved Life is Filled "} +c["Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed when Unreserved Life is Filled Life Leech effects Recover Energy Shield instead while on Full Life"]={nil,"Energy Shield starts at zero Cannot Recharge or Regenerate Energy Shield Lose 5% of Energy Shield per second Life Leech effects are not removed when Unreserved Life is Filled Life Leech effects Recover Energy Shield instead while on Full Life "} c["Enfeeble can affect Hexproof Enemies"]={{[1]={[1]={skillId="Enfeeble",type="SkillId"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="ignoreHexproof",value=true}}},nil} c["Envy has no Reservation"]={{[1]={[1]={skillId="Envy",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationFlat",value=0}},[2]={[1]={skillId="Envy",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationFlat",value=0}},[3]={[1]={skillId="Envy",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationPercent",value=0}},[4]={[1]={skillId="Envy",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationPercent",value=0}}},nil} c["Eternal Youth"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Eternal Youth"}},nil} @@ -8138,7 +8156,7 @@ c["Gain 19% of Non-Chaos Damage as extra Chaos Damage"]={{[1]={flags=0,keywordFl c["Gain 2 Endurance, Frenzy or Power Charges every 6 seconds"]={{}," Endurance,or Power Charges every 6 seconds "} c["Gain 2 Endurance, Frenzy or Power Charges every 6 seconds 172% increased Physical Damage"]={{[1]={[1]={includeTransfigured=true,skillName="Frenzy",type="SkillName"},flags=0,keywordFlags=0,name="PhysicalDamage",type="BASE",value=2}}," Endurance,or Power Charges every 6 seconds 172% increased "} c["Gain 2 Endurance, Frenzy or Power Charges every 6 seconds 84% increased Spell Damage"]={{[1]={[1]={includeTransfigured=true,skillName="Frenzy",type="SkillName"},flags=2,keywordFlags=0,name="Damage",type="BASE",value=2}}," Endurance,or Power Charges every 6 seconds 84% increased "} -c["Gain 2 Endurance, Frenzy or Power Charges every 6 seconds 9% increased Attack Speed"]={{[1]={[1]={includeTransfigured=true,skillName="Frenzy",type="SkillName"},flags=1,keywordFlags=0,name="Speed",type="BASE",value=2}}," Endurance,or Power Charges every 6 seconds 9% increased "} +c["Gain 2 Endurance, Frenzy or Power Charges every 6 seconds Adds 70 to 130 Fire Damage"]={{[1]={[1]={includeTransfigured=true,skillName="Frenzy",type="SkillName"},flags=0,keywordFlags=0,name="FireDamage",type="BASE",value=2}}," Endurance,or Power Charges every 6 seconds Adds 70 to 130 "} c["Gain 2 Grasping Vines each second while stationary"]={{[1]={[1]={limit=10,limitTotal=true,type="Multiplier",var="StationarySeconds"},[2]={type="Condition",var="Stationary"},flags=0,keywordFlags=0,name="Multiplier:GraspingVinesCount",type="BASE",value=2}},nil} c["Gain 2 Mana per Enemy Hit with Attacks"]={{[1]={flags=4,keywordFlags=65536,name="ManaOnHit",type="BASE",value=2}},nil} c["Gain 2 Power Charges on Using a Warcry"]={{}," Power Charges on Using a "} @@ -8434,6 +8452,7 @@ c["Gain up to your maximum number of Frenzy and Power Charges when you gain Cat' c["Gain up to your maximum number of Frenzy and Power Charges when you gain Cat's Stealth You have Phasing while you have Cat's Stealth"]={{[1]={[1]={type="Condition",var="AffectedByCat'sStealth"},[2]={includeTransfigured=true,skillName="Frenzy",type="SkillName"},flags=0,keywordFlags=0,name="Condition:Phasing",type="FLAG",value=true}},"up to your maximum number ofand Power Charges when you gain Cat's Stealth You have "} c["Gains no Charges during Effect"]={nil,"Gains no Charges during Effect "} c["Gains no Charges during Effect 23% reduced Duration"]={nil,"Gains no Charges during Effect 23% reduced Duration "} +c["Gains no Charges during Effect 35% reduced Duration"]={nil,"Gains no Charges during Effect 35% reduced Duration "} c["Gains no Charges during Effect Creates a Smoke Cloud on Use"]={nil,"Gains no Charges during Effect Creates a Smoke Cloud on Use "} c["Gains no Charges during Effect Taunts nearby Enemies on use"]={nil,"Gains no Charges during Effect Taunts nearby Enemies on use "} c["Gains no Charges during Effect of any Overflowing Chalice Flask"]={nil,"Gains no Charges during Effect of any Overflowing Chalice Flask "} @@ -8803,7 +8822,7 @@ c["Inflict 5 additional Impales on Enemies you Impale"]={nil,"Inflict 5 addition c["Inflict 5 additional Impales on Enemies you Impale For 5 seconds after you Impale Enemies, they cannot be Impaled again, and Impales cannot be Called from them"]={nil,"Inflict 5 additional Impales on Enemies you Impale For 5 seconds after you Impale Enemies, they cannot be Impaled again, and Impales cannot be Called from them "} c["Inflict 5 additional Impales on Enemies you Impale For 5 seconds after you Impale Enemies, they cannot be Impaled again, and Impales cannot be Called from them Limited to 1 Keystone Tattoo"]={nil,"Inflict 5 additional Impales on Enemies you Impale For 5 seconds after you Impale Enemies, they cannot be Impaled again, and Impales cannot be Called from them Limited to 1 Keystone Tattoo "} c["Inflict Brittle on Enemies when you Block their Damage"]={nil,"Inflict Brittle on Enemies when you Block their Damage "} -c["Inflict Brittle on Enemies when you Block their Damage +92 to Evasion Rating"]={nil,"Inflict Brittle on Enemies when you Block their Damage +92 to Evasion Rating "} +c["Inflict Brittle on Enemies when you Block their Damage 67% increased Chance to Block"]={nil,"Inflict Brittle on Enemies when you Block their Damage 67% increased Chance to Block "} c["Inflict Decay on Enemies you Curse with Hex Skills, dealing 700 Chaos Damage per Second for 8 Seconds"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="decay",merge="MAX",value=700}}},nil} c["Inflict Fire Exposure on Hit if you've cast Flammability in the past 10 seconds"]={{[1]={[1]={type="Condition",var="SelfCastFlammability"},[2]={type="Condition",var="Effective"},flags=4,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="FireExposure",type="BASE",value=-10}}}},nil} c["Inflict Fire, Cold and Lightning Exposure on Enemies when you Suppress their Spell Damage"]={{[1]={[1]={type="Condition",var="Effective"},[2]={type="Condition",var="SuppressedRecently"},flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="FireExposure",type="BASE",value=-10}}},[2]={[1]={type="Condition",var="Effective"},[2]={type="Condition",var="SuppressedRecently"},flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ColdExposure",type="BASE",value=-10}}},[3]={[1]={type="Condition",var="Effective"},[2]={type="Condition",var="SuppressedRecently"},flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="LightningExposure",type="BASE",value=-10}}}},nil} @@ -8898,7 +8917,6 @@ c["Life Flasks gain 3 charges every 3 seconds"]={{[1]={flags=0,keywordFlags=0,na c["Life Flasks gain a Charge when you hit an Enemy, no more than once each second"]={nil,"Life Flasks gain a Charge when you hit an Enemy, no more than once each second "} c["Life Flasks used while on Low Life apply Recovery Instantly"]={{[1]={[1]={type="Condition",var="LowLife"},flags=0,keywordFlags=0,name="LifeFlaskInstantRecovery",type="BASE",value=100}},nil} c["Life Leech effects Recover Energy Shield instead while on Full Life"]={{[1]={[1]={type="Condition",var="FullLife"},[2]={type="Condition",var="LeechingLife"},flags=0,keywordFlags=0,name="ImmortalAmbition",type="FLAG",value=true}},nil} -c["Life Leech effects are not removed at Full Life"]={{[1]={flags=0,keywordFlags=0,name="CanLeechLifeOnFullLife",type="FLAG",value=true}},nil} c["Life Leech effects are not removed when Unreserved Life is Filled"]={{[1]={flags=0,keywordFlags=0,name="CanLeechLifeOnFullLife",type="FLAG",value=true}},nil} c["Life Leech from Exerted Attacks is instant"]={nil,"Life Leech from Exerted Attacks is instant "} c["Life Leech from Exerted Attacks is instant Non-Exerted Attacks deal no Damage"]={nil,"Life Leech from Exerted Attacks is instant Non-Exerted Attacks deal no Damage "} @@ -9168,6 +9186,8 @@ c["Minions deal 18% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="Minio c["Minions deal 20% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=20}}}},nil} c["Minions deal 20% increased Damage while you are affected by a Herald"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={[1]={actor="parent",type="ActorCondition",var="AffectedByHerald"},flags=0,keywordFlags=0,name="Damage",type="INC",value=20}}}},nil} c["Minions deal 20% increased Damage with Hits and Ailments against Ignited Enemies"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={[1]={actor="enemy",type="ActorCondition",var="Ignited"},flags=0,keywordFlags=786432,name="Damage",type="INC",value=20}}}},nil} +c["Minions deal 26% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=26}}}},nil} +c["Minions deal 28% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=28}}}},nil} c["Minions deal 30 to 63 additional Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ColdMin",type="BASE",value=30}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ColdMax",type="BASE",value=63}}}},nil} c["Minions deal 30% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=30}}}},nil} c["Minions deal 30% increased Damage if you've used a Minion Skill Recently"]={{[1]={[1]={type="Condition",var="UsedMinionSkillRecently"},flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=30}}}},nil} @@ -9181,9 +9201,12 @@ c["Minions deal 48 to 72 additional Physical Damage"]={{[1]={flags=0,keywordFlag c["Minions deal 50% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=50}}}},nil} c["Minions deal 51 to 78 additional Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="PhysicalMin",type="BASE",value=51}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="PhysicalMax",type="BASE",value=78}}}},nil} c["Minions deal 60% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=60}}}},nil} +c["Minions deal 62% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=62}}}},nil} c["Minions deal 70% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=70}}}},nil} c["Minions deal 70% increased Damage if you've Hit Recently"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={[1]={type="Condition",var="HitRecently"},flags=0,keywordFlags=0,name="Damage",type="INC",value=70}}}},nil} +c["Minions deal 77% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=77}}}},nil} c["Minions deal 8 to 16 Added Attack Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=65536,name="PhysicalMin",type="BASE",value=8}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=65536,name="PhysicalMax",type="BASE",value=16}}}},nil} +c["Minions deal 8% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=8}}}},nil} c["Minions deal 80% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=80}}}},nil} c["Minions deal 9 to 15 additional Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ColdMin",type="BASE",value=9}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ColdMax",type="BASE",value=15}}}},nil} c["Minions deal no Non-Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DealNoPhysical",type="FLAG",value=true}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DealNoLightning",type="FLAG",value=true}}},[3]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DealNoFire",type="FLAG",value=true}}},[4]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DealNoChaos",type="FLAG",value=true}}}},nil} @@ -9208,6 +9231,7 @@ c["Minions have +11% Chance to Block Spell Damage"]={{[1]={flags=0,keywordFlags= c["Minions have +12% Chance to Block Attack Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="BlockChance",type="BASE",value=12}}}},nil} c["Minions have +12% Chance to Block Spell Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="SpellBlockChance",type="BASE",value=12}}}},nil} c["Minions have +13% to Chaos Resistance"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ChaosResist",type="BASE",value=13}}}},nil} +c["Minions have +13% to all Elemental Resistances"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ElementalResist",type="BASE",value=13}}}},nil} c["Minions have +15% to Critical Strike Multiplier"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="CritMultiplier",type="BASE",value=15}}}},nil} c["Minions have +15% to all Elemental Resistances"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ElementalResist",type="BASE",value=15}}}},nil} c["Minions have +17% to Chaos Resistance"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ChaosResist",type="BASE",value=17}}}},nil} @@ -9305,6 +9329,7 @@ c["Minions have 5% chance to Taunt on Hit with Attacks"]={{}," to Taunt with At c["Minions have 5% chance to Taunt on Hit with Attacks Your Minions spread Caustic Ground on Death, dealing 20% of their maximum Life as Chaos Damage per second"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=4,keywordFlags=0,name="Life",type="BASE",value=5}}}}," to Taunt with Attacks Your Minions spread Caustic Ground on Death, dealing 20% of their as Chaos Damage per second "} c["Minions have 5% chance to deal Double Damage while they are on Full Life"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={[1]={type="Condition",var="FullLife"},flags=0,keywordFlags=0,name="DoubleDamageChance",type="BASE",value=5}}}},nil} c["Minions have 5% increased maximum Life"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Life",type="INC",value=5}}}},nil} +c["Minions have 50% increased Critical Strike Chance"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="CritChance",type="INC",value=50}}}},nil} c["Minions have 50% increased Critical Strike Chance per Maximum Power Charge you have"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={[1]={actor="parent",type="Multiplier",var="PowerChargeMax"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=50}}}},nil} c["Minions have 50% increased Movement Speed"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="MovementSpeed",type="INC",value=50}}}},nil} c["Minions have 6% chance to deal Double Damage"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DoubleDamageChance",type="BASE",value=6}}}},nil} @@ -9325,6 +9350,7 @@ c["Minions have 8% increased Movement Speed"]={{[1]={flags=0,keywordFlags=0,name c["Minions have 8% increased maximum Life"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Life",type="INC",value=8}}}},nil} c["Minions have 80% increased Flask Effect Duration"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="FlaskDuration",type="INC",value=80}}}},nil} c["Minions have 80% increased maximum Life"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Life",type="INC",value=80}}}},nil} +c["Minions have 9% increased Attack and Cast Speed"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Speed",type="INC",value=9}}}},nil} c["Minions have 90% increased Movement Speed"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="MovementSpeed",type="INC",value=90}}}},nil} c["Minions have Unholy Might"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Condition:CanWither",type="FLAG",value=true}}}},nil} c["Minions have a 12% chance to Impale on Hit with Attacks"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ImpaleChance",type="BASE",value=12}}}},nil} @@ -9740,6 +9766,7 @@ c["Recover 4% of Energy Shield on Kill"]={{[1]={[1]={percent=4,stat="EnergyShiel c["Recover 4% of Life on Kill"]={{[1]={[1]={percent=4,stat="Life",type="PercentStat"},flags=0,keywordFlags=0,name="LifeOnKill",type="BASE",value=1}},nil} c["Recover 4% of Life per Endurance Charge on use"]={nil,"Recover 4% of Life per Endurance Charge on use "} c["Recover 4% of Life per Endurance Charge on use Lose all Endurance Charges on use"]={nil,"Recover 4% of Life per Endurance Charge on use Lose all Endurance Charges on use "} +c["Recover 4% of Life when you Block"]={{[1]={[1]={percent=4,stat="Life",type="PercentStat"},flags=0,keywordFlags=0,name="LifeOnBlock",type="BASE",value=1}},nil} c["Recover 4% of Life when you use a Flask"]={nil,"Recover 4% of Life when you use a Flask "} c["Recover 40% of Mana and Energy Shield when you Focus"]={nil,"Recover 40% of Mana and Energy Shield when you Focus "} c["Recover 40% of Mana and Energy Shield when you Focus +35 to Strength"]={nil,"Recover 40% of Mana and Energy Shield when you Focus +35 to Strength "} @@ -10402,12 +10429,12 @@ c["Sacrifice 4% of your Life when you Use or Trigger a Spell Skill Sacrifice 10% c["Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell"]={nil,"Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell "} c["Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell Sacrifice 25% of Life to gain that much Energy Shield when you Cast a Spell"]={nil,"Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell Sacrifice 25% of Life to gain that much Energy Shield when you Cast a Spell "} c["Sap Enemies when you Block their Damage"]={nil,"Sap Enemies when you Block their Damage "} -c["Sap Enemies when you Block their Damage +69 to maximum Energy Shield"]={nil,"Sap Enemies when you Block their Damage +69 to maximum Energy Shield "} +c["Sap Enemies when you Block their Damage 67% increased Chance to Block"]={nil,"Sap Enemies when you Block their Damage 67% increased Chance to Block "} c["Scion: +25 to All Attributes"]={{[1]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Str",type="BASE",value=25},[2]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Dex",type="BASE",value=25},[3]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Int",type="BASE",value=25},[4]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="All",type="BASE",value=25}},nil} c["Scion: 30% increased Damage"]={{[1]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Damage",type="INC",value=30}},nil} c["Scorch Enemies in Close Range when you Block"]={{[1]={flags=0,keywordFlags=0,name="EnemyScorchChance",type="BASE",value=100}},nil} c["Scorch Enemies when you Block their Damage"]={nil,"Scorch Enemies when you Block their Damage "} -c["Scorch Enemies when you Block their Damage +92 to Armour"]={nil,"Scorch Enemies when you Block their Damage +92 to Armour "} +c["Scorch Enemies when you Block their Damage 67% increased Chance to Block"]={nil,"Scorch Enemies when you Block their Damage 67% increased Chance to Block "} c["Secrets of Suffering"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Secrets of Suffering"}},nil} c["Sentinels of Purity deal 100% increased Damage"]={{[1]={[1]={skillName="Herald of Purity",type="SkillName"},flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=100}}}},nil} c["Shadow: +0.5% to Critical Strike Chance"]={{[1]={[1]={type="Condition",var="ConnectedToShadowStart"},flags=0,keywordFlags=0,name="CritChance",type="BASE",value=0.5}},nil} @@ -11220,7 +11247,7 @@ c["Transfiguration of Mind"]={{[1]={flags=0,keywordFlags=0,name="Transfiguration c["Transfiguration of Soul"]={{[1]={flags=0,keywordFlags=0,name="TransfigurationOfSoul",type="FLAG",value=true}},nil} c["Trap Damage Penetrates 4% Elemental Resistances"]={{[1]={flags=0,keywordFlags=4096,name="ElementalPenetration",type="BASE",value=4}},nil} c["Trap Skills have 25% increased Skill Effect Duration"]={nil,"Trap Skills have 25% increased Skill Effect Duration "} -c["Trap Skills have 25% increased Skill Effect Duration +24 to Armour"]={nil,"Trap Skills have 25% increased Skill Effect Duration +24 to Armour "} +c["Trap Skills have 25% increased Skill Effect Duration +8% chance to Suppress Spell Damage"]={nil,"Trap Skills have 25% increased Skill Effect Duration +8% chance to Suppress Spell Damage "} c["Traps and Mines deal 5 to 15 additional Physical Damage"]={{[1]={flags=0,keywordFlags=12288,name="PhysicalMin",type="BASE",value=5},[2]={flags=0,keywordFlags=12288,name="PhysicalMax",type="BASE",value=15}},nil} c["Traps and Mines have a 25% chance to Poison on Hit"]={{[1]={flags=0,keywordFlags=12288,name="PoisonChance",type="BASE",value=25}},nil} c["Traps cannot be Damaged"]={nil,"Traps cannot be Damaged "} diff --git a/src/Data/QueryMods.lua b/src/Data/QueryMods.lua index 407452971d..4de165dbbf 100644 --- a/src/Data/QueryMods.lua +++ b/src/Data/QueryMods.lua @@ -54857,24 +54857,26 @@ return { }, }, ["786_FlaskDispellsPoison"] = { + ["sign"] = "", ["specialCaseData"] = { }, ["tradeMod"] = { - ["id"] = "explicit.stat_3596333054", - ["text"] = "Grants Immunity to Poison for 4 seconds if used while Poisoned", + ["id"] = "explicit.stat_542375676", + ["text"] = "Grants Immunity to Poison for # seconds if used while Poisoned", ["type"] = "explicit", }, }, ["787_FlaskPoisonImmunity"] = { ["Flask"] = { - ["max"] = 1, - ["min"] = 1, + ["max"] = 17, + ["min"] = 6, }, + ["sign"] = "", ["specialCaseData"] = { }, ["tradeMod"] = { - ["id"] = "explicit.stat_3596333054", - ["text"] = "Grants Immunity to Poison for 4 seconds if used while Poisoned", + ["id"] = "explicit.stat_542375676", + ["text"] = "Grants Immunity to Poison for # seconds if used while Poisoned", ["type"] = "explicit", }, }, @@ -55155,7 +55157,7 @@ return { ["specialCaseData"] = { }, ["tradeMod"] = { - ["id"] = "explicit.stat_1053326368", + ["id"] = "explicit.stat_1619168299", ["text"] = "#% chance to Avoid being Chilled during Effect", ["type"] = "explicit", }, @@ -55169,7 +55171,7 @@ return { ["specialCaseData"] = { }, ["tradeMod"] = { - ["id"] = "explicit.stat_2872815301", + ["id"] = "explicit.stat_475518267", ["text"] = "#% chance to Avoid being Frozen during Effect", ["type"] = "explicit", }, @@ -55223,7 +55225,7 @@ return { ["specialCaseData"] = { }, ["tradeMod"] = { - ["id"] = "explicit.stat_335507772", + ["id"] = "explicit.stat_2094299742", ["text"] = "+# to maximum Fortification", ["type"] = "explicit", }, @@ -55237,7 +55239,7 @@ return { ["specialCaseData"] = { }, ["tradeMod"] = { - ["id"] = "explicit.stat_335507772", + ["id"] = "explicit.stat_2094299742", ["text"] = "+# to maximum Fortification", ["type"] = "explicit", }, diff --git a/src/Data/TimelessJewelData/LegionPassives.lua b/src/Data/TimelessJewelData/LegionPassives.lua index c803d254e4..bbcb916e8c 100644 --- a/src/Data/TimelessJewelData/LegionPassives.lua +++ b/src/Data/TimelessJewelData/LegionPassives.lua @@ -368,7 +368,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79440, + ["oidx"] = 79420, ["g"] = 1000000000, }, [6] = { @@ -407,7 +407,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 97049, + ["oidx"] = 69885, ["g"] = 1000000000, }, [7] = { @@ -446,7 +446,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 33869, + ["oidx"] = 59010, ["g"] = 1000000000, }, [8] = { @@ -485,7 +485,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20074, + ["oidx"] = 75322, ["g"] = 1000000000, }, [9] = { @@ -524,7 +524,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29349, + ["oidx"] = 8097, ["g"] = 1000000000, }, [10] = { @@ -563,7 +563,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 39254, + ["oidx"] = 66110, ["g"] = 1000000000, }, [11] = { @@ -602,7 +602,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 74833, + ["oidx"] = 33933, ["g"] = 1000000000, }, [12] = { @@ -641,7 +641,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56253, + ["oidx"] = 73573, ["g"] = 1000000000, }, [13] = { @@ -680,7 +680,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82715, + ["oidx"] = 42668, ["g"] = 1000000000, }, [14] = { @@ -719,7 +719,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 52436, + ["oidx"] = 56859, ["g"] = 1000000000, }, [15] = { @@ -758,7 +758,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2468, + ["oidx"] = 11446, ["g"] = 1000000000, }, [16] = { @@ -797,7 +797,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 30208, + ["oidx"] = 5489, ["g"] = 1000000000, }, [17] = { @@ -836,7 +836,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29546, + ["oidx"] = 97416, ["g"] = 1000000000, }, [18] = { @@ -875,7 +875,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20764, + ["oidx"] = 70539, ["g"] = 1000000000, }, [19] = { @@ -914,7 +914,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 7170, + ["oidx"] = 17595, ["g"] = 1000000000, }, [20] = { @@ -953,7 +953,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 95734, + ["oidx"] = 97479, ["g"] = 1000000000, }, [21] = { @@ -992,7 +992,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 81354, + ["oidx"] = 27693, ["g"] = 1000000000, }, [22] = { @@ -1031,7 +1031,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 78304, + ["oidx"] = 35409, ["g"] = 1000000000, }, [23] = { @@ -1070,7 +1070,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 15373, + ["oidx"] = 47236, ["g"] = 1000000000, }, [24] = { @@ -1109,7 +1109,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27792, + ["oidx"] = 67900, ["g"] = 1000000000, }, [25] = { @@ -1148,7 +1148,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27192, + ["oidx"] = 57514, ["g"] = 1000000000, }, [26] = { @@ -1187,7 +1187,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 45680, + ["oidx"] = 79693, ["g"] = 1000000000, }, [27] = { @@ -1226,7 +1226,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79160, + ["oidx"] = 45174, ["g"] = 1000000000, }, [28] = { @@ -1265,7 +1265,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64617, + ["oidx"] = 18201, ["g"] = 1000000000, }, [29] = { @@ -1304,7 +1304,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27124, + ["oidx"] = 65999, ["g"] = 1000000000, }, [30] = { @@ -1343,7 +1343,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82620, + ["oidx"] = 21117, ["g"] = 1000000000, }, [31] = { @@ -1382,7 +1382,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 84022, + ["oidx"] = 59672, ["g"] = 1000000000, }, [32] = { @@ -1421,7 +1421,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 37694, + ["oidx"] = 14411, ["g"] = 1000000000, }, [33] = { @@ -1460,7 +1460,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 88895, + ["oidx"] = 82991, ["g"] = 1000000000, }, [34] = { @@ -1499,7 +1499,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 78681, + ["oidx"] = 58330, ["g"] = 1000000000, }, [35] = { @@ -1538,7 +1538,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55867, + ["oidx"] = 2479, ["g"] = 1000000000, }, [36] = { @@ -1577,7 +1577,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79194, + ["oidx"] = 83640, ["g"] = 1000000000, }, [37] = { @@ -1616,7 +1616,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1855, + ["oidx"] = 4960, ["g"] = 1000000000, }, [38] = { @@ -1655,7 +1655,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55548, + ["oidx"] = 82957, ["g"] = 1000000000, }, [39] = { @@ -1694,7 +1694,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 87796, + ["oidx"] = 62650, ["g"] = 1000000000, }, [40] = { @@ -1733,7 +1733,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29714, + ["oidx"] = 82675, ["g"] = 1000000000, }, [41] = { @@ -1772,7 +1772,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 51555, + ["oidx"] = 18075, ["g"] = 1000000000, }, [42] = { @@ -1811,7 +1811,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 60518, + ["oidx"] = 25548, ["g"] = 1000000000, }, [43] = { @@ -1859,7 +1859,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 32845, + ["oidx"] = 92114, ["g"] = 1000000000, }, [44] = { @@ -1907,7 +1907,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 40214, + ["oidx"] = 31696, ["g"] = 1000000000, }, [45] = { @@ -1955,7 +1955,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 87392, + ["oidx"] = 7855, ["g"] = 1000000000, }, [46] = { @@ -2003,7 +2003,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 88901, + ["oidx"] = 35484, ["g"] = 1000000000, }, [47] = { @@ -2051,7 +2051,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1088, + ["oidx"] = 92100, ["g"] = 1000000000, }, [48] = { @@ -2099,7 +2099,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 25300, + ["oidx"] = 2503, ["g"] = 1000000000, }, [49] = { @@ -2147,7 +2147,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5536, + ["oidx"] = 67692, ["g"] = 1000000000, }, [50] = { @@ -2195,7 +2195,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 40288, + ["oidx"] = 74451, ["g"] = 1000000000, }, [51] = { @@ -2243,7 +2243,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 50505, + ["oidx"] = 55329, ["g"] = 1000000000, }, [52] = { @@ -2291,7 +2291,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 94233, + ["oidx"] = 11777, ["g"] = 1000000000, }, [53] = { @@ -2339,7 +2339,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 33401, + ["oidx"] = 13357, ["g"] = 1000000000, }, [54] = { @@ -2387,7 +2387,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 93327, + ["oidx"] = 3316, ["g"] = 1000000000, }, [55] = { @@ -2435,7 +2435,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 14140, + ["oidx"] = 49930, ["g"] = 1000000000, }, [56] = { @@ -2483,7 +2483,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55075, + ["oidx"] = 68927, ["g"] = 1000000000, }, [57] = { @@ -2531,7 +2531,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5174, + ["oidx"] = 50654, ["g"] = 1000000000, }, [58] = { @@ -2579,7 +2579,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29868, + ["oidx"] = 85555, ["g"] = 1000000000, }, [59] = { @@ -2627,7 +2627,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64578, + ["oidx"] = 13953, ["g"] = 1000000000, }, [60] = { @@ -2675,7 +2675,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 81826, + ["oidx"] = 29305, ["g"] = 1000000000, }, [61] = { @@ -2723,7 +2723,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 90899, + ["oidx"] = 87752, ["g"] = 1000000000, }, [62] = { @@ -2771,7 +2771,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 57536, + ["oidx"] = 76549, ["g"] = 1000000000, }, [63] = { @@ -2819,7 +2819,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55389, + ["oidx"] = 69557, ["g"] = 1000000000, }, [64] = { @@ -2867,7 +2867,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 93616, + ["oidx"] = 64898, ["g"] = 1000000000, }, [65] = { @@ -2915,7 +2915,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 99322, + ["oidx"] = 83885, ["g"] = 1000000000, }, [66] = { @@ -2963,7 +2963,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79942, + ["oidx"] = 1049, ["g"] = 1000000000, }, [67] = { @@ -3011,7 +3011,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 23145, + ["oidx"] = 5394, ["g"] = 1000000000, }, [68] = { @@ -3059,7 +3059,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 33128, + ["oidx"] = 76907, ["g"] = 1000000000, }, [69] = { @@ -3107,7 +3107,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 39249, + ["oidx"] = 40498, ["g"] = 1000000000, }, [70] = { @@ -3155,7 +3155,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 35273, + ["oidx"] = 95964, ["g"] = 1000000000, }, [71] = { @@ -3203,7 +3203,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 28021, + ["oidx"] = 98699, ["g"] = 1000000000, }, [72] = { @@ -3251,7 +3251,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 19644, + ["oidx"] = 38490, ["g"] = 1000000000, }, [73] = { @@ -3299,7 +3299,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 21331, + ["oidx"] = 29481, ["g"] = 1000000000, }, [74] = { @@ -3347,7 +3347,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 99442, + ["oidx"] = 27195, ["g"] = 1000000000, }, [75] = { @@ -3395,7 +3395,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2420, + ["oidx"] = 88478, ["g"] = 1000000000, }, [76] = { @@ -3443,7 +3443,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20860, + ["oidx"] = 95624, ["g"] = 1000000000, }, [77] = { @@ -3473,7 +3473,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 48261, + ["oidx"] = 59351, ["g"] = 1000000000, }, [78] = { @@ -3503,7 +3503,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 6017, + ["oidx"] = 75827, ["g"] = 1000000000, }, [79] = { @@ -4028,7 +4028,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 50410, + ["oidx"] = 6194, ["g"] = 1000000000, }, [92] = { @@ -4067,7 +4067,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 44196, + ["oidx"] = 36277, ["g"] = 1000000000, }, [93] = { @@ -4106,7 +4106,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20341, + ["oidx"] = 64088, ["g"] = 1000000000, }, [94] = { @@ -4145,7 +4145,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 54200, + ["oidx"] = 94707, ["g"] = 1000000000, }, [95] = { @@ -4184,7 +4184,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2450, + ["oidx"] = 74973, ["g"] = 1000000000, }, [96] = { @@ -4223,7 +4223,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 91756, + ["oidx"] = 10172, ["g"] = 1000000000, }, [97] = { @@ -4262,7 +4262,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1205, + ["oidx"] = 17606, ["g"] = 1000000000, }, [98] = { @@ -4301,7 +4301,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 69797, + ["oidx"] = 5178, ["g"] = 1000000000, }, [99] = { @@ -4340,7 +4340,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 50579, + ["oidx"] = 22257, ["g"] = 1000000000, }, [100] = { @@ -4379,7 +4379,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 93563, + ["oidx"] = 14760, ["g"] = 1000000000, }, [101] = { @@ -4418,7 +4418,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 18807, + ["oidx"] = 42889, ["g"] = 1000000000, }, [102] = { @@ -4457,7 +4457,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 81217, + ["oidx"] = 60270, ["g"] = 1000000000, }, [103] = { @@ -4496,7 +4496,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 91332, + ["oidx"] = 27127, ["g"] = 1000000000, }, [104] = { @@ -4535,7 +4535,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 65329, + ["oidx"] = 82503, ["g"] = 1000000000, }, [105] = { @@ -4574,7 +4574,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 31284, + ["oidx"] = 28525, ["g"] = 1000000000, }, [106] = { @@ -4766,7 +4766,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 10883, + ["oidx"] = 20196, ["g"] = 1000000000, }, [111] = { @@ -4805,7 +4805,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 17069, + ["oidx"] = 14977, ["g"] = 1000000000, }, [112] = { @@ -4844,7 +4844,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 823, + ["oidx"] = 76777, ["g"] = 1000000000, }, [113] = { @@ -4883,7 +4883,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 84913, + ["oidx"] = 5183, ["g"] = 1000000000, }, [114] = { @@ -4922,7 +4922,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 21216, + ["oidx"] = 80316, ["g"] = 1000000000, }, [115] = { @@ -4961,7 +4961,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27467, + ["oidx"] = 68905, ["g"] = 1000000000, }, [116] = { @@ -5000,7 +5000,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 4261, + ["oidx"] = 14480, ["g"] = 1000000000, }, [117] = { @@ -5039,7 +5039,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 72550, + ["oidx"] = 93682, ["g"] = 1000000000, }, [118] = { @@ -5078,7 +5078,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 37140, + ["oidx"] = 80835, ["g"] = 1000000000, }, [119] = { @@ -5117,7 +5117,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 66288, + ["oidx"] = 38654, ["g"] = 1000000000, }, [120] = { @@ -5156,7 +5156,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64997, + ["oidx"] = 79623, ["g"] = 1000000000, }, [121] = { @@ -5195,7 +5195,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 41353, + ["oidx"] = 6774, ["g"] = 1000000000, }, [122] = { @@ -5234,7 +5234,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67352, + ["oidx"] = 68329, ["g"] = 1000000000, }, [123] = { @@ -5273,7 +5273,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 57033, + ["oidx"] = 52806, ["g"] = 1000000000, }, [124] = { @@ -5312,7 +5312,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 4248, + ["oidx"] = 79878, ["g"] = 1000000000, }, [125] = { @@ -5351,7 +5351,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67444, + ["oidx"] = 7265, ["g"] = 1000000000, }, [126] = { @@ -5390,7 +5390,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 7065, + ["oidx"] = 51502, ["g"] = 1000000000, }, [127] = { @@ -5429,7 +5429,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 69156, + ["oidx"] = 69709, ["g"] = 1000000000, }, [128] = { @@ -5468,7 +5468,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 95243, + ["oidx"] = 54984, ["g"] = 1000000000, }, [129] = { @@ -5507,7 +5507,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 11898, + ["oidx"] = 9731, ["g"] = 1000000000, }, [130] = { @@ -5546,7 +5546,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56195, + ["oidx"] = 65124, ["g"] = 1000000000, }, [131] = { @@ -5585,7 +5585,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 21068, + ["oidx"] = 7309, ["g"] = 1000000000, }, [132] = { @@ -5624,7 +5624,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 59069, + ["oidx"] = 19927, ["g"] = 1000000000, }, [133] = { @@ -5663,7 +5663,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 78292, + ["oidx"] = 80563, ["g"] = 1000000000, }, [134] = { @@ -5702,7 +5702,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 28934, + ["oidx"] = 68382, ["g"] = 1000000000, }, [135] = { @@ -5741,7 +5741,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 11897, + ["oidx"] = 99311, ["g"] = 1000000000, }, [136] = { @@ -5780,7 +5780,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 31734, + ["oidx"] = 67225, ["g"] = 1000000000, }, [137] = { @@ -5819,7 +5819,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 65592, + ["oidx"] = 82524, ["g"] = 1000000000, }, [138] = { @@ -5858,7 +5858,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67482, + ["oidx"] = 98014, ["g"] = 1000000000, }, [139] = { @@ -5897,7 +5897,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 9669, + ["oidx"] = 36656, ["g"] = 1000000000, }, [140] = { @@ -5945,7 +5945,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 47823, + ["oidx"] = 36158, ["g"] = 1000000000, }, [141] = { @@ -5984,7 +5984,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 74980, + ["oidx"] = 94297, ["g"] = 1000000000, }, [142] = { @@ -6023,7 +6023,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 10189, + ["oidx"] = 94732, ["g"] = 1000000000, }, [143] = { @@ -6062,7 +6062,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27945, + ["oidx"] = 81833, ["g"] = 1000000000, }, [144] = { @@ -6101,7 +6101,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 47171, + ["oidx"] = 86198, ["g"] = 1000000000, }, [145] = { @@ -6140,7 +6140,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1000, + ["oidx"] = 67997, ["g"] = 1000000000, }, [146] = { @@ -6179,7 +6179,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29863, + ["oidx"] = 65414, ["g"] = 1000000000, }, [147] = { @@ -6218,7 +6218,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 38723, + ["oidx"] = 54300, ["g"] = 1000000000, }, [148] = { @@ -6257,7 +6257,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56838, + ["oidx"] = 88577, ["g"] = 1000000000, }, [149] = { @@ -6296,7 +6296,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 60021, + ["oidx"] = 40681, ["g"] = 1000000000, }, [150] = { @@ -6335,7 +6335,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55198, + ["oidx"] = 5337, ["g"] = 1000000000, }, [151] = { @@ -6374,7 +6374,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 32616, + ["oidx"] = 35290, ["g"] = 1000000000, }, [152] = { @@ -6413,7 +6413,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 49588, + ["oidx"] = 1685, ["g"] = 1000000000, }, [153] = { @@ -6452,7 +6452,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 41934, + ["oidx"] = 9588, ["g"] = 1000000000, }, [154] = { @@ -6491,7 +6491,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 22560, + ["oidx"] = 56816, ["g"] = 1000000000, }, [155] = { @@ -6530,7 +6530,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 45308, + ["oidx"] = 66099, ["g"] = 1000000000, }, }, diff --git a/src/Export/Classes/Dat64File.lua b/src/Export/Classes/Dat64File.lua index 4c52187fb6..927b2a8963 100644 --- a/src/Export/Classes/Dat64File.lua +++ b/src/Export/Classes/Dat64File.lua @@ -21,6 +21,13 @@ local dataTypes = { return bytesToInt(b, o) end, }, + UInt16 = { + size = 2, + read = function(b, o, d) + if o > #b - 1 then return 1337 end + return bytesToUInt(b, o) + end, + }, UInt = { size = 4, read = function(b, o, d) diff --git a/src/Export/Classes/DatFile.lua b/src/Export/Classes/DatFile.lua index 77b2de9d90..a4426e9e39 100644 --- a/src/Export/Classes/DatFile.lua +++ b/src/Export/Classes/DatFile.lua @@ -21,8 +21,15 @@ local dataTypes = { return bytesToInt(b, o) end, }, - UInt = { - size = 4, + UInt16 = { + size = 2, + read = function(b, o, d) + if o > #b - 1 then return 1337 end + return bytesToUInt(b, o) + end, + }, + UInt = { + size = 4, read = function(b, o, d) if o > #b - 3 then return 1337 end return bytesToUInt(b, o) diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua index 41c19c28b1..d571dcc975 100644 --- a/src/Export/Classes/GGPKData.lua +++ b/src/Export/Classes/GGPKData.lua @@ -138,7 +138,6 @@ end function GGPKClass:GetNeededFiles() local datFiles = { "Data/Stats.dat", - "Data/StatSemantics.dat", "Data/VirtualStatContextFlags.dat", "Data/BaseItemTypes.dat", "Data/WeaponTypes.dat", @@ -148,7 +147,6 @@ function GGPKClass:GetNeededFiles() "Data/ComponentCharges.dat", "Data/ComponentAttributeRequirements.dat", "Data/PassiveSkills.dat", - "Data/PassiveSkillTypes.dat", "Data/PassiveSkillStatCategories.dat", "Data/PassiveSkillMasteryGroups.dat", "Data/PassiveSkillMasteryEffects.dat", @@ -159,14 +157,10 @@ function GGPKClass:GetNeededFiles() "Data/PassiveTreeExpansionSpecialSkills.dat", "Data/Mods.dat", "Data/ModType.dat", - "Data/ModDomains.dat", - "Data/ModGenerationType.dat", "Data/ModFamily.dat", - "Data/ModAuraFlags.dat", "Data/ModSellPriceTypes.dat", "Data/ModEffectStats.dat", "Data/ActiveSkills.dat", - "Data/ActiveSkillTargetTypes.dat", "Data/ActiveSkillType.dat", "Data/AlternateSkillTargetingBehaviours.dat", "Data/Ascendancy.dat", @@ -174,17 +168,13 @@ function GGPKClass:GetNeededFiles() "Data/FlavourText.dat", "Data/Words.dat", "Data/ItemClasses.dat", - "Data/SkillTotems.dat", "Data/SkillTotemVariations.dat", - "Data/SkillMines.dat", "Data/Essences.dat", "Data/EssenceType.dat", "Data/Characters.dat", "Data/BuffDefinitions.dat", - "Data/BuffCategories.dat", "Data/BuffTemplates.dat", "Data/BuffVisuals.dat", - "Data/BuffVisualSets.dat", "Data/BuffVisualSetEntries.dat", "Data/BuffVisualsArtVariations.dat", "Data/BuffVisualOrbs.dat", @@ -207,7 +197,6 @@ function GGPKClass:GetNeededFiles() "Data/GrantedEffectsPerLevel.dat", "Data/ItemExperiencePerLevel.dat", "Data/EffectivenessCostConstants.dat", - "Data/StatInterpolationTypes.dat", "Data/Tags.dat", "Data/GemTags.dat", "Data/ItemVisualIdentity.dat", @@ -218,7 +207,6 @@ function GGPKClass:GetNeededFiles() "Data/AlternatePassiveSkills.dat", "Data/AlternateTreeVersions.dat", "Data/GrantedEffectQualityStats.dat", - "Data/GrantedEffectGroups.dat", "Data/AegisVariations.dat", "Data/CostTypes.dat", "Data/PassiveJewelRadii.dat", @@ -273,7 +261,6 @@ function GGPKClass:GetNeededFiles() "Data/Commands.dat", "Data/ModEquivalencies.dat", "Data/InfluenceTags.dat", - "Data/InfluenceTypes.dat", "Data/leaguenames.dat" } local txtFiles = { diff --git a/src/Export/Main.lua b/src/Export/Main.lua index dc744d625f..61e652c1ff 100644 --- a/src/Export/Main.lua +++ b/src/Export/Main.lua @@ -151,7 +151,7 @@ function main:Init() return self.ggpk.txt[name] end - self.typeDrop = { "Bool", "Int", "UInt", "Interval", "Float", "String", "Enum", "ShortKey", "Key" } + self.typeDrop = { "Bool", "Int", "UInt16", "UInt", "Interval", "Float", "String", "Enum", "ShortKey", "Key" } self.colList = { } diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua index c63661df93..e340203078 100644 --- a/src/Export/Scripts/skills.lua +++ b/src/Export/Scripts/skills.lua @@ -341,7 +341,7 @@ directiveTable.skill = function(state, args, out) out:write('\t},\n') end out:write('\tstatDescriptionScope = "', skillStatScope[granted.ActiveSkill.Id] or "skill_stat_descriptions", '",\n') - if granted.ActiveSkill.SkillTotem <= dat("SkillTotems").rowCount then + if granted.ActiveSkill.SkillTotem <= 21 then out:write('\tskillTotemId = ', granted.ActiveSkill.SkillTotem, ',\n') end out:write('\tcastTime = ', granted.CastTime / 1000, ',\n') diff --git a/src/Export/spec.lua b/src/Export/spec.lua index 47341472d6..8bd07afb61 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -218,7 +218,7 @@ return { [14]={ list=false, name="SkillTotem", - refTo="SkillTotems", + refTo="", type="Int", width=80 }, @@ -335,8 +335,6 @@ return { width=150 } }, - activeskilltargettypes={ - }, activeskilltype={ [1]={ list=false, @@ -572,9 +570,9 @@ return { [4]={ list=true, name="StatsKeys", - refTo="", - type="UInt", - width=80 + refTo="Stats", + type="Key", + width=200 }, [5]={ list=false, @@ -701,7 +699,7 @@ return { list=false, name="ConquerorIndex", refTo="", - type="UInt", + type="Int", width=90 }, [14]={ @@ -729,21 +727,21 @@ return { list=true, name="AchievementItemsKeys", refTo="", - type="UInt", + type="Key", width=150 }, [18]={ list=false, name="ConquerorVersion", refTo="", - type="UInt", + type="Int", width=150 }, [19]={ list=false, name="ConquerorSpawnWeight", refTo="", - type="UInt", + type="Int", width=150 } }, @@ -874,7 +872,7 @@ return { list=false, name="NotableReplacementSpawnWeight ", refTo="", - type="UInt", + type="Int", width=200 } }, @@ -1959,8 +1957,6 @@ return { }, breachstoneupgrades={ }, - buffcategories={ - }, buffdefinitions={ [1]={ list=false, @@ -2818,8 +2814,6 @@ return { width=80 } }, - buffvisualsets={ - }, characteraudioevents={ }, charactereventtextaudio={ @@ -4120,7 +4114,7 @@ return { list=false, name="Unknown23", refTo="", - type="UInt", + type="Int", width=100 }, [25]={ @@ -4824,8 +4818,6 @@ return { }, grandmasters={ }, - grantedeffectgroups={ - }, grantedeffectqualitystats={ [1]={ list=false, @@ -4927,7 +4919,7 @@ return { name="Hash", refTo="", type="UInt", - width=50 + width=80 }, [10]={ list=true, @@ -5165,28 +5157,28 @@ return { list=false, name="ManaReservationFlat", refTo="", - type="UInt", + type="Int", width=150 }, [18]={ list=false, name="ManaReservationPercent", refTo="", - type="UInt", + type="Int", width=150 }, [19]={ list=false, name="LifeReservationFlat", refTo="", - type="UInt", + type="Int", width=150 }, [20]={ list=false, name="LifeReservationPercent", refTo="", - type="UInt", + type="Int", width=150 }, [21]={ @@ -5658,16 +5650,6 @@ return { width=150 } }, - influencetypes={ - [1]={ - enumBase=0, - list=false, - name="Name", - refTo="", - type="String", - width=150 - } - }, invasionmonstergroups={ }, invasionmonsterrestrictions={ @@ -6811,10 +6793,6 @@ return { }, missiontransitiontiles={ }, - modauraflags={ - }, - moddomains={ - }, modeffectstats={ [1]={ list=false, @@ -6912,8 +6890,6 @@ return { width=200 } }, - modgenerationtype={ - }, mods={ [1]={ list=false, @@ -6926,7 +6902,7 @@ return { list=false, name="Hash", refTo="", - type="UInt", + type="UInt16", width=60 }, [3]={ @@ -9334,7 +9310,7 @@ return { list=false, name="PassiveSkillNodeId", refTo="", - type="Int", + type="UInt16", width=100 }, [9]={ @@ -9682,15 +9658,6 @@ return { }, passiveskilltreeuiart={ }, - passiveskilltypes={ - [1]={ - list=false, - name="Name", - refTo="", - type="String", - width=150 - } - }, passivetreeexpansionjewels={ [1]={ list=false, @@ -10635,8 +10602,6 @@ return { width=600 } }, - skillmines={ - }, skillminevariations={ }, skillmorphdisplay={ @@ -10647,14 +10612,12 @@ return { }, skillsurgeeffects={ }, - skilltotems={ - }, skilltotemvariations={ [1]={ list=false, name="SkillTotem", - refTo="SkillTotems", - type="Enum", + refTo="", + type="Int", width=60 }, [2]={ @@ -10753,8 +10716,6 @@ return { }, statdescriptionfunctions={ }, - statinterpolationtypes={ - }, stats={ [1]={ list=false, @@ -10906,8 +10867,6 @@ return { width=150 } }, - statsemantics={ - }, statsets={ }, statsfromskillstats={