@blizzhackers/d2data 2.5.2 → 2.6.0

package/json/cubemain.json

@@ -2048,7 +2048,8 @@
  "151": {
   "description": "1 Ral Rune + 1 Sol Rune + 1 Perfect Emerald + 1 Normal Set Weapon -> Exceptional Set Weapon",
   "enabled": 1,
-  "ladder": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "version": 100,
   "numinputs": 4,
   "input 1": "\"weap,bas,set\"",
@@ -2064,7 +2065,8 @@
  "152": {
   "description": "1 Tal Rune + 1 Shael Rune + 1 Perfect Diamond + 1 Normal Set Armor -> Exceptional Set Armor",
   "enabled": 1,
-  "ladder": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "version": 100,
   "numinputs": 4,
   "input 1": "\"armo,bas,set\"",
@@ -2080,7 +2082,8 @@
  "153": {
   "description": "1 Lum Rune + 1 Pul Rune + 1 Perfect Emerald + 1 Exceptional Set Weapon -> Elite Set Weapon",
   "enabled": 1,
-  "ladder": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "version": 100,
   "numinputs": 4,
   "input 1": "\"weap,exc,set\"",
@@ -2096,7 +2099,8 @@
  "154": {
   "description": "1 Ko Rune + 1 Lem Rune + 1 Perfect Diamond + 1 Exceptional Set Armor -> Elite Set Armor",
   "enabled": 1,
-  "ladder": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "version": 100,
   "numinputs": 4,
   "input 1": "\"armo,exc,set\"",

package/json/itemstatcost.json

@@ -1129,6 +1129,21 @@
   "advdisplay": 2,
   "lineNumber": 153
  },
+ "item_charge_noconsume": {
+  "Stat": "item_charge_noconsume",
+  "*ID": 200,
+  "Send Bits": 7,
+  "Add": 106,
+  "Multiply": 256,
+  "Save Bits": 7,
+  "Save Add": 0,
+  "descpriority": 159,
+  "descfunc": 19,
+  "descstrpos": "ModStr6k",
+  "descstrneg": "ModStr6k",
+  "advdisplay": 2,
+  "lineNumber": 200
+ },
  "item_charged_skill": {
   "Stat": "item_charged_skill",
   "*ID": 204,
@@ -5419,13 +5434,6 @@
   "1.09-Save Add": 0,
   "lineNumber": 84
  },
- "unused200": {
-  "Stat": "unused200",
-  "*ID": 200,
-  "1.09-Save Bits": 21,
-  "1.09-Save Add": 0,
-  "lineNumber": 200
- },
  "unused202": {
   "Stat": "unused202",
   "*ID": 202,

package/json/levelgroups.json

@@ -136,7 +136,7 @@
   "Name": "Act 1 - Pit",
   "Id": 12,
   "*StringName": "Pit",
-  "GroupName": "Pit",
+  "GroupName": "Act 1 Pit",
   "lineNumber": 12
  },
  "Act 1 - Stony Field": {

package/json/missiles.json

@@ -3227,6 +3227,7 @@
   "AlwaysExplode": 1,
   "Trans": 1,
   "HitShift": 8,
+  "ApplyMastery": 1,
   "EType": "frze",
   "EMin": 1,
   "MinELev1": 0,
@@ -5730,6 +5731,7 @@
   "Trans": 1,
   "ResultFlags": 4,
   "HitShift": 8,
+  "ApplyMastery": 1,
   "EType": "ltng",
   "EMin": 1,
   "MinELev1": 0,
@@ -5777,6 +5779,7 @@
   "Trans": 1,
   "ResultFlags": 4,
   "HitShift": 8,
+  "ApplyMastery": 1,
   "EType": "ltng",
   "EMin": 1,
   "MinELev1": 0,
@@ -9006,6 +9009,7 @@
   "CanSlow": 1,
   "Trans": 1,
   "HitShift": 3,
+  "ApplyMastery": 1,
   "EType": "fire",
   "EMin": 6,
   "MinELev1": 5,
@@ -18398,6 +18402,7 @@
   "Trans": 1,
   "ResultFlags": 4,
   "HitShift": 8,
+  "ApplyMastery": 1,
   "EType": "ltng",
   "EMin": 1,
   "MinELev1": 0,
@@ -18456,6 +18461,7 @@
   "Trans": 1,
   "ResultFlags": 4,
   "HitShift": 8,
+  "ApplyMastery": 1,
   "EType": "cold",
   "EMin": 16,
   "MinELev1": 4,
@@ -18505,6 +18511,7 @@
   "ResultFlags": 5,
   "HitFlags": 2,
   "HitShift": 8,
+  "ApplyMastery": 1,
   "EType": "fire",
   "EMin": 20,
   "MinELev1": 10,
@@ -18562,6 +18569,7 @@
   "AlwaysExplode": 1,
   "Trans": 1,
   "HitShift": 8,
+  "ApplyMastery": 1,
   "NumDirections": 1,
   "TravelSound": "sorceress_meteor",
   "SubMissile1": "royalstrikemeteor",
@@ -18628,6 +18636,7 @@
   "Size": 2,
   "Trans": 1,
   "HitShift": 3,
+  "ApplyMastery": 1,
   "EType": "fire",
   "EMin": 6,
   "MinELev1": 5,
@@ -20414,7 +20423,7 @@
   "Pierce": 1,
   "ResultFlags": 4,
   "HitShift": 8,
-  "SrcDamage": 96,
+  "SrcDamage": 128,
   "HitClass": 10,
   "NumDirections": 32,
   "TravelSound": "amazon_multi_arrow_1",
@@ -20452,7 +20461,7 @@
   "Pierce": 1,
   "ResultFlags": 4,
   "HitShift": 8,
-  "SrcDamage": 96,
+  "SrcDamage": 128,
   "HitClass": 10,
   "NumDirections": 32,
   "TravelSound": "weapon_xbow_1",

package/json/properties.json

@@ -660,6 +660,17 @@
   "*Max": "Max %",
   "lineNumber": 87
  },
+ "charge-noconsume": {
+  "code": "charge-noconsume",
+  "*Enabled": 1,
+  "func1": 1,
+  "stat1": "item_charge_noconsume",
+  "*Tooltip": "+#% chance for finishing moves to not consume charges",
+  "*Min": "Min %",
+  "*Max": "Max %",
+  "expansion": 1,
+  "lineNumber": 276
+ },
  "charged": {
   "code": "charged",
   "*Enabled": 1,

package/json/runes.json

@@ -262,6 +262,34 @@
   "*Rune Name": "Broken Promise",
   "lineNumber": 11
  },
+ "Bulwark": {
+  "Name": "Runeword179",
+  "*Rune Name": "Bulwark",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "helm",
+  "*RunesUsed": "ShaelIoSol",
+  "Rune1": "r13",
+  "Rune2": "r16",
+  "Rune3": "r12",
+  "T1Code1": "hp%",
+  "T1Min1": 5,
+  "T1Max1": 5,
+  "T1Code2": "ac%",
+  "T1Min2": 75,
+  "T1Max2": 100,
+  "T1Code3": "red-dmg%",
+  "T1Min3": 10,
+  "T1Max3": 15,
+  "T1Code4": "regen",
+  "T1Min4": 30,
+  "T1Max4": 30,
+  "T1Code5": "lifesteal",
+  "T1Min5": 4,
+  "T1Max5": 6,
+  "lineNumber": 177
+ },
  "Call to Arms": {
   "Name": "Runeword13",
   "*Rune Name": "Call to Arms",
@@ -413,6 +441,35 @@
   "T1Max7": 17,
   "lineNumber": 16
  },
+ "Cure": {
+  "Name": "Runeword178",
+  "*Rune Name": "Cure",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "helm",
+  "*RunesUsed": "ShaelIoTal",
+  "Rune1": "r13",
+  "Rune2": "r16",
+  "Rune3": "r07",
+  "T1Code1": "hp%",
+  "T1Min1": 5,
+  "T1Max1": 5,
+  "T1Code2": "ac%",
+  "T1Min2": 75,
+  "T1Max2": 100,
+  "T1Code3": "res-pois",
+  "T1Min3": 10,
+  "T1Max3": 30,
+  "T1Code4": "res-pois-len",
+  "T1Min4": 50,
+  "T1Max4": 50,
+  "T1Code5": "aura",
+  "T1Param5": "Cleansing",
+  "T1Min5": 1,
+  "T1Max5": 1,
+  "lineNumber": 176
+ },
  "Darkness": {
   "Name": "Runeword18",
   "*Rune Name": "Darkness",
@@ -952,7 +1009,8 @@
   "Name": "Runeword40",
   "*Rune Name": "Flickering Flame",
   "complete": 1,
-  "server": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "*Patch Release": "D2R Ladder 1",
   "itype1": "helm",
   "*RunesUsed": "NefPulVex",
@@ -1130,6 +1188,31 @@
   "T1Max7": 15,
   "lineNumber": 46
  },
+ "Ground": {
+  "Name": "Runeword175",
+  "*Rune Name": "Ground",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "helm",
+  "*RunesUsed": "ShaelIoOrt",
+  "Rune1": "r13",
+  "Rune2": "r16",
+  "Rune3": "r09",
+  "T1Code1": "hp%",
+  "T1Min1": 5,
+  "T1Max1": 5,
+  "T1Code2": "ac%",
+  "T1Min2": 75,
+  "T1Max2": 100,
+  "T1Code3": "res-ltng",
+  "T1Min3": 10,
+  "T1Max3": 30,
+  "T1Code4": "abs-ltng%",
+  "T1Min4": 10,
+  "T1Max4": 15,
+  "lineNumber": 173
+ },
  "Hand of Justice": {
   "Name": "Runeword48",
   "*Rune Name": "Hand of Justice",
@@ -1246,6 +1329,34 @@
   "T1Max7": 14,
   "lineNumber": 50
  },
+ "Hearth": {
+  "Name": "Runeword177",
+  "*Rune Name": "Hearth",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "helm",
+  "*RunesUsed": "ShaelIoThul",
+  "Rune1": "r13",
+  "Rune2": "r16",
+  "Rune3": "r10",
+  "T1Code1": "hp%",
+  "T1Min1": 5,
+  "T1Max1": 5,
+  "T1Code2": "ac%",
+  "T1Min2": 75,
+  "T1Max2": 100,
+  "T1Code3": "res-cold",
+  "T1Min3": 10,
+  "T1Max3": 30,
+  "T1Code4": "abs-cold%",
+  "T1Min4": 10,
+  "T1Max4": 15,
+  "T1Code5": "nofreeze",
+  "T1Min5": 1,
+  "T1Max5": 1,
+  "lineNumber": 175
+ },
  "Heaven's Will": {
   "Name": "Runeword52",
   "*Rune Name": "Heaven's Will",
@@ -1334,6 +1445,62 @@
   "*Rune Name": "Hunger",
   "lineNumber": 57
  },
+ "Hustle (armor)": {
+  "Name": "Runeword171",
+  "*Rune Name": "Hustle (armor)",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "tors",
+  "*RunesUsed": "ShaelKoEld",
+  "Rune1": "r13",
+  "Rune2": "r18",
+  "Rune3": "r02",
+  "T1Code1": "move2",
+  "T1Min1": 65,
+  "T1Max1": 65,
+  "T1Code2": "stamdrain",
+  "T1Min2": 35,
+  "T1Max2": 35,
+  "T1Code3": "swing2",
+  "T1Min3": 40,
+  "T1Max3": 40,
+  "T1Code4": "res-all",
+  "T1Min4": 10,
+  "T1Max4": 10,
+  "T1Code5": "oskill",
+  "T1Param5": "Evade",
+  "T1Min5": 6,
+  "T1Max5": 6,
+  "lineNumber": 169
+ },
+ "Hustle (weapon)": {
+  "Name": "Runeword172",
+  "*Rune Name": "Hustle (weapon)",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "weap",
+  "*RunesUsed": "ShaelKoEld",
+  "Rune1": "r13",
+  "Rune2": "r18",
+  "Rune3": "r02",
+  "T1Code1": "hit-skill",
+  "T1Param1": "Quickness",
+  "T1Min1": 5,
+  "T1Max1": 1,
+  "T1Code2": "swing2",
+  "T1Min2": 10,
+  "T1Max2": 10,
+  "T1Code3": "dmg%",
+  "T1Min3": 180,
+  "T1Max3": 200,
+  "T1Code4": "aura",
+  "T1Param4": "Fanaticism",
+  "T1Min4": 1,
+  "T1Max4": 1,
+  "lineNumber": 170
+ },
  "Ice": {
   "Name": "Runeword59",
   "*Rune Name": "Ice",
@@ -1830,11 +1997,46 @@
   "T1Max7": 2,
   "lineNumber": 81
  },
+ "Metamorphosis": {
+  "Name": "Runeword174",
+  "*Rune Name": "Metamorphosis",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "helm",
+  "*RunesUsed": "IoChamFal",
+  "Rune1": "r16",
+  "Rune2": "r32",
+  "Rune3": "r19",
+  "T1Code1": "hit-skill",
+  "T1Param1": "Mark of the Bear",
+  "T1Min1": 100,
+  "T1Max1": 1,
+  "T1Code2": "hit-skill",
+  "T1Param2": "Mark of the Wolf",
+  "T1Min2": 100,
+  "T1Max2": 1,
+  "T1Code3": "skilltab",
+  "T1Param3": 16,
+  "T1Min3": 5,
+  "T1Max3": 5,
+  "T1Code4": "ac%",
+  "T1Min4": 50,
+  "T1Max4": 80,
+  "T1Code5": "res-all",
+  "T1Min5": 10,
+  "T1Max5": 10,
+  "T1Code6": "crush",
+  "T1Min6": 25,
+  "T1Max6": 25,
+  "lineNumber": 172
+ },
  "Mist": {
   "Name": "Runeword84",
   "*Rune Name": "Mist",
   "complete": 1,
-  "server": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "*Patch Release": "D2R Ladder 1",
   "itype1": "miss",
   "*RunesUsed": "ChamShaelGulThulIth",
@@ -1869,6 +2071,41 @@
   "*Rune Name": "Morning",
   "lineNumber": 83
  },
+ "Mosaic": {
+  "Name": "Runeword173",
+  "*Rune Name": "Mosaic",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "h2h",
+  "*RunesUsed": "MalGulAmn",
+  "Rune1": "r23",
+  "Rune2": "r25",
+  "Rune3": "r11",
+  "T1Code1": "skilltab",
+  "T1Param1": 20,
+  "T1Min1": 2,
+  "T1Max1": 2,
+  "T1Code2": "charge-noconsume",
+  "T1Min2": 50,
+  "T1Max2": 50,
+  "T1Code3": "swing2",
+  "T1Min3": 20,
+  "T1Max3": 20,
+  "T1Code4": "dmg%",
+  "T1Min4": 200,
+  "T1Max4": 250,
+  "T1Code5": "extra-fire",
+  "T1Min5": 8,
+  "T1Max5": 15,
+  "T1Code6": "extra-cold",
+  "T1Min6": 8,
+  "T1Max6": 15,
+  "T1Code7": "extra-ltng",
+  "T1Min7": 8,
+  "T1Max7": 15,
+  "lineNumber": 171
+ },
  "Mystery": {
   "Name": "Runeword86",
   "*Rune Name": "Mystery",
@@ -2025,7 +2262,8 @@
   "Name": "Runeword94",
   "*Rune Name": "Obsession",
   "complete": 1,
-  "server": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "*Patch Release": "D2R Ladder 1",
   "itype1": "staf",
   "*RunesUsed": "ZodIstLemLumIoNef",
@@ -2105,7 +2343,8 @@
   "Name": "Runeword97",
   "*Rune Name": "Pattern",
   "complete": 1,
-  "server": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "*Patch Release": "D2R Ladder 1",
   "itype1": "h2h",
   "*RunesUsed": "TalOrtThul",
@@ -2229,7 +2468,8 @@
   "Name": "Runeword106",
   "*Rune Name": "Plague",
   "complete": 1,
-  "server": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "*Patch Release": "D2R Ladder 1",
   "itype1": "swor",
   "itype2": "knif",
@@ -2850,6 +3090,31 @@
   "T1Max4": 25,
   "lineNumber": 137
  },
+ "Temper": {
+  "Name": "Runeword176",
+  "*Rune Name": "Temper",
+  "complete": 1,
+  "firstLadderSeason": 3,
+  "*Patch Release": "D2R Ladder 3",
+  "itype1": "helm",
+  "*RunesUsed": "ShaelIoRal",
+  "Rune1": "r13",
+  "Rune2": "r16",
+  "Rune3": "r08",
+  "T1Code1": "hp%",
+  "T1Min1": 5,
+  "T1Max1": 5,
+  "T1Code2": "ac%",
+  "T1Min2": 75,
+  "T1Max2": 100,
+  "T1Code3": "res-fire",
+  "T1Min3": 10,
+  "T1Max3": 30,
+  "T1Code4": "abs-fire%",
+  "T1Min4": 10,
+  "T1Max4": 15,
+  "lineNumber": 174
+ },
  "Tempest": {
   "Name": "Runeword140",
   "*Rune Name": "Tempest",
@@ -2930,7 +3195,8 @@
   "Name": "Runeword151",
   "*Rune Name": "Unbending Will",
   "complete": 1,
-  "server": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "*Patch Release": "D2R Ladder 1",
   "itype1": "swor",
   "*RunesUsed": "FalIoIthEldElHel",
@@ -3169,7 +3435,8 @@
   "Name": "Runeword165",
   "*Rune Name": "Wisdom",
   "complete": 1,
-  "server": 1,
+  "firstLadderSeason": 1,
+  "lastLadderSeason": 2,
   "*Patch Release": "D2R Ladder 1",
   "itype1": "helm",
   "*RunesUsed": "PulIthEld",

package/json/skilldesc.json

@@ -280,7 +280,7 @@
   "desccalca2": "\"min(24,ln12)\"",
   "dsc2line1": 74,
   "dsc2texta1": "WeapDamsk",
-  "dsc2calca1": "96*100/128",
+  "dsc2calca1": "(96*100/128)+(skill('Guided Arrow'.blvl)*par4)",
   "dsc3line1": 40,
   "dsc3texta1": "Sksyn",
   "dsc3textb1": "skillname12",
@@ -7541,5 +7541,51 @@
   "str short": "SkillDescCubeLoot",
   "str long": "SkillDescCubeLoot",
   "str alt": "SkillNameCubeLoot"
+ },
+ "230": {
+  "skilldesc": "mark of the bear",
+  "SkillPage": 0,
+  "SkillRow": 0,
+  "SkillColumn": 0,
+  "ListRow": 0,
+  "IconCel": 2,
+  "str name": "SkillnameMetamorphosisBear",
+  "str short": "SkillnameMetamorphosisBear",
+  "str long": "SkillnameMetamorphosisBear",
+  "str alt": "SkillnameMetamorphosisBear",
+  "descline1": 74,
+  "desctexta1": "ModStr2uPercent",
+  "desccalca1": "par2",
+  "descline2": 74,
+  "desctexta2": "ModStr6l",
+  "desccalca2": "par1",
+  "descline3": 12,
+  "desctexta3": "StrSkill0",
+  "desccalca3": "len",
+  "item proc text": "SkillItemMetamorphosisBear",
+  "item proc descline count": 3
+ },
+ "231": {
+  "skilldesc": "mark of the wolf",
+  "SkillPage": 0,
+  "SkillRow": 0,
+  "SkillColumn": 0,
+  "ListRow": 0,
+  "IconCel": 2,
+  "str name": "SkillnameMetamorphosisWolf",
+  "str short": "SkillnameMetamorphosisWolf",
+  "str long": "SkillnameMetamorphosisWolf",
+  "str alt": "SkillnameMetamorphosisWolf",
+  "descline1": 74,
+  "desctexta1": "ModStr2g",
+  "desccalca1": "par2",
+  "descline2": 74,
+  "desctexta2": "ModStr4c",
+  "desccalca2": "par1",
+  "descline3": 12,
+  "desctexta3": "StrSkill0",
+  "desccalca3": "len",
+  "item proc text": "SkillItemMetamorphosisWolf",
+  "item proc descline count": 3
  }
 }

package/json/skills.json

@@ -537,7 +537,8 @@
   "*calc2 desc": "Missile Activation Frame",
   "calc3": 2,
   "*calc3 desc": "# of missiles that can trigger item modifier events",
-  "calc4": "skill('Guided Arrow'.blvl) * par4",
+  "calc5": "skill('Guided Arrow'.blvl) * par4",
+  "*calc5 desc": "% Damage Synergy",
   "Param1": 2,
   "*Param1 Description": "# of Missiles created baseline",
   "Param2": 1,
@@ -4874,7 +4875,7 @@
   "passivestat8": "item_pierce_poison_immunity",
   "passivecalc8": "stat('item_pierce_poison_immunity'.accr)",
   "passivestat9": "item_pierce_damage_immunity",
-  "passivestat92": "stat('item_pierce_damage_immunity'.accr)",
+  "passivecalc9": "stat('item_pierce_damage_immunity'.accr)",
   "passivestat10": "item_pierce_magic_immunity",
   "passivecalc10": "stat('item_pierce_magic_immunity'.accr)",
   "summon": "IronGolem",
@@ -11556,6 +11557,8 @@
   "*calc3 desc": "# of missiles that can trigger item modifier events",
   "calc4": "ln12",
   "*calc4 desc": "Stun Length",
+  "calc5": 0,
+  "*calc5 desc": "% Damage Synergy",
   "Param1": 40,
   "*Param1 Description": "Stun Length baseline",
   "Param2": 15,
@@ -12524,6 +12527,7 @@
   "seqtrans": "SC",
   "monanim": "SC",
   "UseAttackRate": 1,
+  "ItemEffect": 1,
   "reqlevel": 6,
   "maxlvl": 20,
   "reqskill1": "Claw Mastery",
@@ -12704,8 +12708,10 @@
   "charclass": "ass",
   "skilldesc": "charged bolt sentry",
   "srvdofunc": 45,
-  "passivestat1": "item_pierce_lightning_immunity",
-  "passivecalc1": "stat('item_pierce_lightning_immunity'.accr)",
+  "passivestat1": "item_pierce_light_immunity",
+  "passivecalc1": "stat('item_pierce_light_immunity'.accr)",
+  "passivestat2": "passive_ltng_pierce",
+  "passivecalc2": "stat('passive_ltng_pierce'.accr)",
   "summon": "chargeboltsentry",
   "pettype": "assassintrap",
   "petmax": 5,
@@ -12782,6 +12788,8 @@
   "srvdofunc": 45,
   "passivestat1": "item_pierce_fire_immunity",
   "passivecalc1": "stat('item_pierce_fire_immunity'.accr)",
+  "passivestat2": "passive_fire_pierce",
+  "passivecalc2": "stat('passive_fire_pierce'.accr)",
   "summon": "wakeofdestruction",
   "pettype": "assassintrap",
   "petmax": 5,
@@ -13151,7 +13159,7 @@
   "passivestat8": "item_pierce_poison_immunity",
   "passivecalc8": "stat('item_pierce_poison_immunity'.accr)",
   "passivestat9": "item_pierce_damage_immunity",
-  "passivestat92": "stat('item_pierce_damage_immunity'.accr)",
+  "passivecalc9": "stat('item_pierce_damage_immunity'.accr)",
   "summon": "shadowwarrior",
   "pettype": "shadowwarrior",
   "petmax": 1,
@@ -13343,8 +13351,10 @@
   "charclass": "ass",
   "skilldesc": "lightning sentry",
   "srvdofunc": 45,
-  "passivestat1": "item_pierce_lightning_immunity",
-  "passivecalc1": "stat('item_pierce_lightning_immunity'.accr)",
+  "passivestat1": "item_pierce_light_immunity",
+  "passivecalc1": "stat('item_pierce_light_immunity'.accr)",
+  "passivestat2": "passive_ltng_pierce",
+  "passivecalc2": "stat('passive_ltng_pierce'.accr)",
   "summon": "lightningsentry",
   "pettype": "assassintrap",
   "petmax": 5,
@@ -13409,6 +13419,8 @@
   "srvdofunc": 45,
   "passivestat1": "item_pierce_fire_immunity",
   "passivecalc1": "stat('item_pierce_fire_immunity'.accr)",
+  "passivestat2": "passive_fire_pierce",
+  "passivecalc2": "stat('passive_fire_pierce'.accr)",
   "summon": "infernosentry",
   "pettype": "assassintrap",
   "petmax": 5,
@@ -13698,6 +13710,16 @@
   "charclass": "ass",
   "skilldesc": "death sentry",
   "srvdofunc": 45,
+  "passivestat1": "item_pierce_light_immunity",
+  "passivecalc1": "stat('item_pierce_light_immunity'.accr)",
+  "passivestat2": "item_pierce_fire_immunity",
+  "passivecalc2": "stat('item_pierce_fire_immunity'.accr)",
+  "passivestat3": "item_pierce_damage_immunity",
+  "passivecalc3": "stat('item_pierce_damage_immunity'.accr)",
+  "passivestat4": "passive_ltng_pierce",
+  "passivecalc4": "stat('passive_ltng_pierce'.accr)",
+  "passivestat5": "passive_fire_pierce",
+  "passivecalc5": "stat('passive_fire_pierce'.accr)",
   "summon": "deathsentry",
   "pettype": "assassintrap",
   "petmax": 5,
@@ -13908,7 +13930,7 @@
   "passivestat8": "item_pierce_poison_immunity",
   "passivecalc8": "stat('item_pierce_poison_immunity'.accr)",
   "passivestat9": "item_pierce_damage_immunity",
-  "passivestat92": "stat('item_pierce_damage_immunity'.accr)",
+  "passivecalc9": "stat('item_pierce_damage_immunity'.accr)",
   "summon": "shadowmaster",
   "pettype": "shadowwarrior",
   "petmax": 1,
@@ -14035,12 +14057,6 @@
   "*Id": 281,
   "srvdofunc": 125,
   "srvmissilea": "wake of destruction maker",
-  "passivestat1": "item_pierce_lightning_immunity",
-  "passivecalc1": "stat('item_pierce_lightning_immunity'.accr)",
-  "passivestat2": "item_pierce_fire_immunity",
-  "passivecalc2": "stat('item_pierce_fire_immunity'.accr)",
-  "passivestat3": "item_pierce_damage_immunity",
-  "passivecalc3": "stat('item_pierce_damage_immunity'.accr)",
   "cltdofunc": 70,
   "cltmissilea": "wake of destruction maker",
   "enhanceable": 1,
@@ -16826,5 +16842,65 @@
   "InGame": 1,
   "cost add": 0,
   "lineNumber": 370
+ },
+ "371": {
+  "skill": "Mark of the Bear",
+  "*Id": 371,
+  "skilldesc": "mark of the bear",
+  "srvdofunc": 18,
+  "aurastate": "markbear",
+  "auralencalc": 4500,
+  "aurastat1": "attackrate",
+  "aurastatcalc1": "par1",
+  "aurastat2": "damageresist",
+  "aurastatcalc2": "par2",
+  "attackrank": 0,
+  "UseAttackRate": 1,
+  "ItemEffect": 1,
+  "ItemUseRestrict": 1,
+  "reqlevel": 1,
+  "restrict": 2,
+  "State1": "bear",
+  "leftskill": 0,
+  "rightskill": 0,
+  "Param1": 25,
+  "*Param1 Description": "Attack Speed %",
+  "Param2": 20,
+  "*Param2 Description": "Damage Resist %",
+  "InGame": 1,
+  "HitShift": 8,
+  "cost mult": 256,
+  "cost add": 1000,
+  "lineNumber": 371
+ },
+ "372": {
+  "skill": "Mark of the Wolf",
+  "*Id": 372,
+  "skilldesc": "mark of the wolf",
+  "srvdofunc": 18,
+  "aurastate": "markwolf",
+  "auralencalc": 4500,
+  "aurastat1": "item_tohit_percent",
+  "aurastatcalc1": "par1",
+  "aurastat2": "item_maxhp_percent",
+  "aurastatcalc2": "par2",
+  "attackrank": 0,
+  "UseAttackRate": 1,
+  "ItemEffect": 1,
+  "ItemUseRestrict": 1,
+  "reqlevel": 1,
+  "restrict": 2,
+  "State1": "wolf",
+  "leftskill": 0,
+  "rightskill": 0,
+  "Param1": 30,
+  "*Param1 Description": "Attack Rating %",
+  "Param2": 40,
+  "*Param2 Description": "Life %",
+  "InGame": 1,
+  "HitShift": 8,
+  "cost mult": 256,
+  "cost add": 1000,
+  "lineNumber": 372
  }
 }

package/json/states.json

@@ -272,6 +272,7 @@
  "coldmastery": {
   "state": "coldmastery",
   "*ID": 73,
+  "sunder-res-reduce": 1,
   "lineNumber": 73
  },
  "concentrate": {
@@ -834,6 +835,23 @@
   "*ID": 106,
   "lineNumber": 106
  },
+ "markbear": {
+  "state": "markbear",
+  "*ID": 190,
+  "group": 4,
+  "noclear": 1,
+  "overlay1": "bloodlust_state",
+  "lineNumber": 190
+ },
+ "markwolf": {
+  "state": "markwolf",
+  "*ID": 191,
+  "group": 5,
+  "attblue": 1,
+  "noclear": 1,
+  "overlay1": "impregnated",
+  "lineNumber": 191
+ },
  "maul": {
   "state": "maul",
   "*ID": 117,
@@ -1453,6 +1471,7 @@
   "overlay1": "curseterror",
   "castoverlay": "curse_hit",
   "onsound": "necromancer_taint",
+  "sunderfull": 1,
   "lineNumber": 56
  },
  "thawing": {

package/json/tcprecalc.json

@@ -18986,32 +18986,32 @@
  },
  "Sunder Charms": {
   "droprate": {
-   "1": 1,
-   "2": 1,
-   "3": 1,
-   "4": 1,
-   "5": 1,
-   "6": 1,
-   "7": 1,
-   "8": 1
-  },
-  "droprateRoot": {
-   "1": 1,
-   "2": 1,
-   "3": 1,
-   "4": 1,
-   "5": 1,
-   "6": 1,
-   "7": 1,
-   "8": 1
-  },
-  "counts": {
-   "Cold Rupture": 0.16666666666666666,
-   "Flame Rift": 0.16666666666666666,
-   "Crack of the Heavens": 0.16666666666666666,
-   "Rotting Fissure": 0.16666666666666666,
-   "Bone Break": 0.16666666666666666,
-   "Black Cleft": 0.16666666666666666
+   "1": 0.004208333333333333,
+   "2": 0.0083991683991684,
+   "3": 0.012573135814764097,
+   "4": 0.016727393176548526,
+   "5": 0.020867768595041324,
+   "6": 0.02498762988619495,
+   "7": 0.029089861751152073,
+   "8": 0.03318002628120893
+  },
+  "droprateRoot": {
+   "1": 0.004208333333333333,
+   "2": 0.0083991683991684,
+   "3": 0.012573135814764097,
+   "4": 0.016727393176548526,
+   "5": 0.020867768595041324,
+   "6": 0.02498762988619495,
+   "7": 0.029089861751152073,
+   "8": 0.03318002628120893
+  },
+  "counts": {
+   "Cold Rupture": 0.297029702970297,
+   "Flame Rift": 0.297029702970297,
+   "Crack of the Heavens": 0.19801980198019803,
+   "Rotting Fissure": 0.1188118811881188,
+   "Bone Break": 0.0594059405940594,
+   "Black Cleft": 0.0297029702970297
   }
  },
  "Andariel": {
@@ -19491,7 +19491,7 @@
    "8": 0.8571428571428571
   },
   "counts": {
-   "Act 5 (H) Equip C": 5.782608695652174,
+   "Act 5 (H) Equip A": 5.782608695652174,
    "Act 5 (H) Good": 0.9130434782608695,
    "tes": 0.30434782608695654
   }
@@ -20092,7 +20092,7 @@
   },
   "counts": {
    "\"gld,mul=2048\"": 1.54,
-   "Act 5 (H) Equip C": 2.66,
+   "Act 5 (H) Equip B": 2.66,
    "Act 5 (H) Junk": 2.1,
    "Act 5 (H) Good": 0.42,
    "tes": 0.28
@@ -20121,7 +20121,7 @@
   },
   "counts": {
    "\"gld,mul=2048\"": 1.54,
-   "Act 5 (H) Equip D": 2.66,
+   "Act 5 (H) Equip C": 2.66,
    "Act 5 (H) Junk": 2.1,
    "Act 5 (H) Good": 0.42,
    "tes": 0.28
@@ -22930,7 +22930,7 @@
   },
   "counts": {
    "Act 4 Uitem B": 1,
-   "Act 4 Melee B": 2
+   "Act 4 Melee A": 2
   }
  },
  "Griswold Desecrated C": {
@@ -22956,7 +22956,7 @@
   },
   "counts": {
    "Act 3 (N) Uitem A": 1,
-   "Act 3 (N) Melee C": 2
+   "Act 2 (N) Melee B": 2
   }
  },
  "Griswold (N)": {
@@ -23060,7 +23060,7 @@
   },
   "counts": {
    "Act 3 (H) Uitem C": 1,
-   "Act 3 (H) Melee C": 2
+   "Act 3 (H) Melee B": 2
   }
  },
  "Griswold (H)": {
@@ -23113,7 +23113,7 @@
   "counts": {
    "Sunder Charms": 1,
    "Act 4 (H) Uitem B": 1,
-   "Act 4 (H) Melee B": 2
+   "Act 4 (H) Melee A": 2
   }
  },
  "Griswold (H) Desecrated B": {
@@ -23140,7 +23140,7 @@
   "counts": {
    "Sunder Charms": 1,
    "Act 5 (H) Uitem A": 1,
-   "Act 5 (H) Melee A": 2
+   "Act 4 (H) Melee B": 2
   }
  },
  "Griswold (H) Desecrated C": {
@@ -23167,7 +23167,7 @@
   "counts": {
    "Sunder Charms": 1,
    "Act 5 (H) Uitem B": 1,
-   "Act 5 (H) Melee B": 2
+   "Act 5 (H) Melee A": 2
   }
  },
  "Griswold (H) Desecrated D": {
@@ -23194,7 +23194,7 @@
   "counts": {
    "Sunder Charms": 1,
    "Act 5 (H) Uitem C": 1,
-   "Act 5 (H) Melee C": 2
+   "Act 5 (H) Melee B": 2
   }
  },
  "Cow": {
@@ -23724,7 +23724,7 @@
    "Haphesto Item (H) Desecrated A": 1
   }
  },
- "Haphesto (H) Desecrated A [dup]": {
+ "Haphesto (H) Desecrated B": {
   "droprate": {
    "1": 1,
    "2": 1,
@@ -23747,10 +23747,10 @@
   },
   "counts": {
    "Sunder Charms": 1,
-   "Haphesto Item (H) Desecrated A": 1
+   "Haphesto Item (H) Desecrated B": 1
   }
  },
- "Haphesto (H) Desecrated A [dup] [dup]": {
+ "Haphesto (H) Desecrated C": {
   "droprate": {
    "1": 1,
    "2": 1,
@@ -23773,7 +23773,7 @@
   },
   "counts": {
    "Sunder Charms": 1,
-   "Haphesto Item (H) Desecrated A": 1
+   "Haphesto Item (H) Desecrated C": 1
   }
  },
  "Nihlathak": {
@@ -25107,7 +25107,7 @@
   },
   "counts": {
    "Sunder Charms": 1,
-   "Act 4 (H) Uitem C": 1,
+   "Act 4 (H) Uitem B": 1,
    "Act 4 (H) Melee B": 2
   }
  },

package/json/treasureclassex.json

@@ -13610,7 +13610,7 @@
   "Rare": 1024,
   "Magic": 1024,
   "NoDrop": 19,
-  "Item1": "Act 5 (H) Equip C",
+  "Item1": "Act 5 (H) Equip A",
   "Prob1": 19,
   "Item2": "Act 5 (H) Good",
   "Prob2": 3,
@@ -15694,7 +15694,7 @@
   "NoDrop": 19,
   "Item1": "\"gld,mul=2048\"",
   "Prob1": 11,
-  "Item2": "Act 5 (H) Equip C",
+  "Item2": "Act 5 (H) Equip B",
   "Prob2": 19,
   "Item3": "Act 5 (H) Junk",
   "Prob3": 15,
@@ -15715,7 +15715,7 @@
   "NoDrop": 19,
   "Item1": "\"gld,mul=2048\"",
   "Prob1": 11,
-  "Item2": "Act 5 (H) Equip D",
+  "Item2": "Act 5 (H) Equip C",
   "Prob2": 19,
   "Item3": "Act 5 (H) Junk",
   "Prob3": 15,
@@ -16256,7 +16256,7 @@
   "Prob1": 1,
   "Item2": "Act 4 (H) Uitem B",
   "Prob2": 1,
-  "Item3": "Act 4 (H) Melee B",
+  "Item3": "Act 4 (H) Melee A",
   "Prob3": 2,
   "lineNumber": 818
  },
@@ -16270,7 +16270,7 @@
   "Prob1": 1,
   "Item2": "Act 5 (H) Uitem A",
   "Prob2": 1,
-  "Item3": "Act 5 (H) Melee A",
+  "Item3": "Act 4 (H) Melee B",
   "Prob3": 2,
   "lineNumber": 819
  },
@@ -16284,7 +16284,7 @@
   "Prob1": 1,
   "Item2": "Act 5 (H) Uitem B",
   "Prob2": 1,
-  "Item3": "Act 5 (H) Melee B",
+  "Item3": "Act 5 (H) Melee A",
   "Prob3": 2,
   "lineNumber": 820
  },
@@ -16298,7 +16298,7 @@
   "Prob1": 1,
   "Item2": "Act 5 (H) Uitem C",
   "Prob2": 1,
-  "Item3": "Act 5 (H) Melee C",
+  "Item3": "Act 5 (H) Melee B",
   "Prob3": 2,
   "lineNumber": 821
  },
@@ -16344,7 +16344,7 @@
   "NoDrop": 0,
   "Item1": "Act 3 (H) Uitem C",
   "Prob1": 1,
-  "Item2": "Act 3 (H) Melee C",
+  "Item2": "Act 3 (H) Melee B",
   "Prob2": 2,
   "lineNumber": 816
  },
@@ -16368,7 +16368,7 @@
   "NoDrop": 0,
   "Item1": "Act 4 Uitem B",
   "Prob1": 1,
-  "Item2": "Act 4 Melee B",
+  "Item2": "Act 4 Melee A",
   "Prob2": 2,
   "lineNumber": 811
  },
@@ -16380,7 +16380,7 @@
   "NoDrop": 0,
   "Item1": "Act 3 (N) Uitem A",
   "Prob1": 1,
-  "Item2": "Act 3 (N) Melee C",
+  "Item2": "Act 2 (N) Melee B",
   "Prob2": 2,
   "lineNumber": 812
  },
@@ -16434,27 +16434,27 @@
   "Prob2": 1,
   "lineNumber": 840
  },
- "Haphesto (H) Desecrated A [dup]": {
-  "Treasure Class": "Haphesto (H) Desecrated A",
+ "Haphesto (H) Desecrated B": {
+  "Treasure Class": "Haphesto (H) Desecrated B",
   "group": 27,
   "level": 93,
   "Picks": -2,
   "NoDrop": 0,
   "Item1": "Sunder Charms",
   "Prob1": 1,
-  "Item2": "Haphesto Item (H) Desecrated A",
+  "Item2": "Haphesto Item (H) Desecrated B",
   "Prob2": 1,
   "lineNumber": 841
  },
- "Haphesto (H) Desecrated A [dup] [dup]": {
-  "Treasure Class": "Haphesto (H) Desecrated A",
+ "Haphesto (H) Desecrated C": {
+  "Treasure Class": "Haphesto (H) Desecrated C",
   "group": 27,
   "level": 96,
   "Picks": -2,
   "NoDrop": 0,
   "Item1": "Sunder Charms",
   "Prob1": 1,
-  "Item2": "Haphesto Item (H) Desecrated A",
+  "Item2": "Haphesto Item (H) Desecrated C",
   "Prob2": 1,
   "lineNumber": 842
  },
@@ -18726,7 +18726,7 @@
   "NoDrop": 0,
   "Item1": "Sunder Charms",
   "Prob1": 1,
-  "Item2": "Act 4 (H) Uitem C",
+  "Item2": "Act 4 (H) Uitem B",
   "Prob2": 1,
   "Item3": "Act 4 (H) Melee B",
   "Prob3": 2,
@@ -19272,22 +19272,24 @@
  "Sunder Charms": {
   "Treasure Class": "Sunder Charms",
   "Picks": 1,
-  "NoDrop": 0,
+  "NoDrop": 23899,
   "Item1": "Cold Rupture",
-  "Prob1": 1,
+  "Prob1": 30,
   "Item2": "Flame Rift",
-  "Prob2": 1,
+  "Prob2": 30,
   "Item3": "Crack of the Heavens",
-  "Prob3": 1,
+  "Prob3": 20,
   "Item4": "Rotting Fissure",
-  "Prob4": 1,
+  "Prob4": 12,
   "Item5": "Bone Break",
-  "Prob5": 1,
+  "Prob5": 6,
   "Item6": "Black Cleft",
-  "Prob6": 1,
-  "ladder": 1,
+  "Prob6": 3,
+  "firstLadderSeason": 2,
+  "lastLadderSeason": 2,
+  "noAlwaysSpawn": 1,
   "lineNumber": 669,
-  "*ItemProbTotal": 6
+  "*ItemProbTotal": 101
  },
  "Swarm 1": {
   "Treasure Class": "Swarm 1",

package/json/treasureclassgroupsex.json

@@ -857,8 +857,8 @@
   "66": "Haphesto (N) Desecrated B",
   "73": "Haphesto (N) Desecrated C",
   "88": "Haphesto (H) Desecrated A",
-  "93": "Haphesto (H) Desecrated A [dup]",
-  "96": "Haphesto (H) Desecrated A [dup] [dup]",
+  "93": "Haphesto (H) Desecrated B",
+  "96": "Haphesto (H) Desecrated C",
   "length": 97
  },
  "28": {

package/json/uniqueitems.json

@@ -14172,7 +14172,8 @@
   "index": "Cold Rupture",
   "*ID": 401,
   "version": 100,
-  "ladder": 1,
+  "firstLadderSeason": 2,
+  "lastLadderSeason": 2,
   "rarity": 1,
   "lvl": 69,
   "lvl req": 75,
@@ -14195,7 +14196,8 @@
   "index": "Flame Rift",
   "*ID": 402,
   "version": 100,
-  "ladder": 1,
+  "firstLadderSeason": 2,
+  "lastLadderSeason": 2,
   "rarity": 1,
   "lvl": 69,
   "lvl req": 75,
@@ -14218,7 +14220,8 @@
   "index": "Crack of the Heavens",
   "*ID": 403,
   "version": 100,
-  "ladder": 1,
+  "firstLadderSeason": 2,
+  "lastLadderSeason": 2,
   "rarity": 1,
   "lvl": 69,
   "lvl req": 75,
@@ -14241,7 +14244,8 @@
   "index": "Rotting Fissure",
   "*ID": 404,
   "version": 100,
-  "ladder": 1,
+  "firstLadderSeason": 2,
+  "lastLadderSeason": 2,
   "rarity": 1,
   "lvl": 69,
   "lvl req": 75,
@@ -14264,7 +14268,8 @@
   "index": "Bone Break",
   "*ID": 405,
   "version": 100,
-  "ladder": 1,
+  "firstLadderSeason": 2,
+  "lastLadderSeason": 2,
   "rarity": 1,
   "lvl": 69,
   "lvl req": 75,
@@ -14287,7 +14292,8 @@
   "index": "Black Cleft",
   "*ID": 406,
   "version": 100,
-  "ladder": 1,
+  "firstLadderSeason": 2,
+  "lastLadderSeason": 2,
   "rarity": 1,
   "lvl": 69,
   "lvl req": 75,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blizzhackers/d2data",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "description": "",
   "main": "compile.js",
   "scripts": {