Skip to content

Commit 1ee9973

Browse files
author
LocalIdentity
committed
Merge branch 'dev' into port-unique-updater-scripts
2 parents 1da5ae3 + d0e74dd commit 1ee9973

11 files changed

Lines changed: 3915 additions & 3911 deletions

File tree

src/Data/ClusterJewels.lua

Lines changed: 301 additions & 301 deletions
Large diffs are not rendered by default.

src/Data/Crucible.lua

Lines changed: 2491 additions & 2491 deletions
Large diffs are not rendered by default.

src/Data/FlavourText.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9404,7 +9404,7 @@ return {
94049404
name = "The Sands of Time",
94059405
text = {
94069406
"A future of untold power and doom opened",
9407-
"before Zarokh in that moment. He realized",
9407+
"before Zarokh in that moment. He realised",
94089408
"there was not one Time, but many...",
94099409
},
94109410
},

src/Data/ModMaster.lua

Lines changed: 728 additions & 728 deletions
Large diffs are not rendered by default.

src/Data/QueryMods.lua

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6077,7 +6077,7 @@ return {
60776077
["specialCaseData"] = {
60786078
},
60796079
["tradeMod"] = {
6080-
["id"] = "implicit.stat_2238792070",
6080+
["id"] = "implicit.stat_744082851",
60816081
["text"] = "#% of Chaos Damage Leeched as Life",
60826082
["type"] = "implicit",
60836083
},
@@ -45910,26 +45910,27 @@ return {
4591045910
},
4591145911
["346_IncreasedCastSpeedSpellEcho"] = {
4591245912
["1HMace"] = {
45913-
["max"] = 1,
45914-
["min"] = 1,
45913+
["max"] = 20,
45914+
["min"] = 18,
4591545915
},
4591645916
["1HWeapon"] = {
45917-
["max"] = 1,
45918-
["min"] = 1,
45917+
["max"] = 20,
45918+
["min"] = 18,
4591945919
},
4592045920
["Dagger"] = {
45921-
["max"] = 1,
45922-
["min"] = 1,
45921+
["max"] = 20,
45922+
["min"] = 18,
4592345923
},
4592445924
["Wand"] = {
45925-
["max"] = 1,
45926-
["min"] = 1,
45925+
["max"] = 20,
45926+
["min"] = 18,
4592745927
},
45928+
["sign"] = "",
4592845929
["specialCaseData"] = {
4592945930
},
4593045931
["tradeMod"] = {
45931-
["id"] = "explicit.stat_725896422",
45932-
["text"] = "Socketed Gems are Supported by Level 10 Spell Echo",
45932+
["id"] = "explicit.stat_438778966",
45933+
["text"] = "Socketed Gems are Supported by Level # Spell Echo",
4593345934
["type"] = "explicit",
4593445935
},
4593545936
},
@@ -69508,7 +69509,7 @@ return {
6950869509
["specialCaseData"] = {
6950969510
},
6951069511
["tradeMod"] = {
69511-
["id"] = "implicit.stat_141810208",
69512+
["id"] = "implicit.stat_1828023575",
6951269513
["text"] = "#% of Attack Damage Leeched as Life",
6951369514
["type"] = "implicit",
6951469515
},
@@ -69578,7 +69579,7 @@ return {
6957869579
["specialCaseData"] = {
6957969580
},
6958069581
["tradeMod"] = {
69581-
["id"] = "implicit.stat_2238792070",
69582+
["id"] = "implicit.stat_744082851",
6958269583
["text"] = "#% of Chaos Damage Leeched as Life",
6958369584
["type"] = "implicit",
6958469585
},

src/Data/Skills/act_int.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8567,7 +8567,7 @@ skills["FrostblinkAltX"] = {
85678567
baseEffectiveness = 1.6200000047684,
85688568
incrementalEffectiveness = 0.047499999403954,
85698569
description = "Teleport to a location, damaging enemies in an area at both ends of the teleport. Deals higher damage to chilled enemies, then removes chill from them. Cannot be supported by Unleash.",
8570-
skillTypes = { [SkillType.Spell] = true, [SkillType.Movement] = true, [SkillType.Triggerable] = true, [SkillType.Cold] = true, [SkillType.Travel] = true, [SkillType.Area] = true, [SkillType.Triggerable] = true, [SkillType.Damage] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.DynamicCooldown] = true, },
8570+
skillTypes = { [SkillType.Spell] = true, [SkillType.Movement] = true, [SkillType.Triggerable] = true, [SkillType.Cold] = true, [SkillType.Travel] = true, [SkillType.Area] = true, [SkillType.Triggerable] = true, [SkillType.Damage] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.DynamicCooldown] = true, [SkillType.AreaSpell] = true, },
85718571
statDescriptionScope = "skill_stat_descriptions",
85728572
castTime = 0.85,
85738573
statMap = {
@@ -15597,6 +15597,7 @@ skills["RaiseZombieAltY"] = {
1559715597
"infinite_minion_duration",
1559815598
"quality_display_raise_zombie_is_gem",
1559915599
"raise_zombie_does_not_use_corpses",
15600+
"dont_replace_minion_if_level_changed",
1560015601
},
1560115602
levels = {
1560215603
[1] = { 1, levelRequirement = 1, statInterpolation = { 1, }, cost = { Mana = 6, }, },

src/Data/Skills/other.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2508,6 +2508,7 @@ skills["MistyReflection"] = {
25082508
"skill_cannot_be_knocked_back",
25092509
"skill_cannot_be_stunned",
25102510
"spell_cast_time_cannot_be_modified",
2511+
"disable_skill_repeats",
25112512
},
25122513
notMinionStat = {
25132514
"base_cooldown_speed_+%",

src/Data/Skills/spectre.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7953,7 +7953,7 @@ skills["AzmeriBasiliskShoulderMortar"] = {
79537953
{ "projectile_spread_radius", 8 },
79547954
{ "projectile_minimum_range", 15 },
79557955
{ "skill_physical_damage_%_to_convert_to_chaos", 60 },
7956-
{ "base_poison_duration_+%", 100 },
7956+
{ "active_skill_poison_duration_+%_final", 100 },
79577957
{ "base_chance_to_poison_on_hit_%", 60 },
79587958
},
79597959
stats = {
@@ -8034,7 +8034,7 @@ skills["AzmeriBasiliskDecapitateRightToLeft"] = {
80348034
},
80358035
constantStats = {
80368036
{ "skill_physical_damage_%_to_convert_to_chaos", 40 },
8037-
{ "base_poison_duration_+%", 50 },
8037+
{ "active_skill_poison_duration_+%_final", 50 },
80388038
{ "base_poison_damage_+%", 0 },
80398039
{ "base_chance_to_poison_on_hit_%", 40 },
80408040
},
@@ -8141,7 +8141,7 @@ skills["AzmeriBasiliskDualProjectileImpact"] = {
81418141
},
81428142
constantStats = {
81438143
{ "skill_physical_damage_%_to_convert_to_chaos", 40 },
8144-
{ "base_poison_duration_+%", 50 },
8144+
{ "active_skill_poison_duration_+%_final", 50 },
81458145
{ "base_chance_to_poison_on_hit_%", 60 },
81468146
},
81478147
stats = {
@@ -8197,7 +8197,7 @@ skills["AzmeriBasiliskShoulderMortar2"] = {
81978197
{ "projectile_spread_radius", 13 },
81988198
{ "projectile_minimum_range", 15 },
81998199
{ "skill_physical_damage_%_to_convert_to_chaos", 60 },
8200-
{ "base_poison_duration_+%", 100 },
8200+
{ "active_skill_poison_duration_+%_final", 100 },
82018201
{ "base_chance_to_poison_on_hit_%", 60 },
82028202
},
82038203
stats = {

src/Data/Skills/sup_str.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4409,7 +4409,7 @@ skills["TriggeredSupportPyre"] = {
44094409
name = "Call the Pyre",
44104410
baseTypeName = "Call the Pyre",
44114411
color = 1,
4412-
description = "Calls forth pillars of ashen flame. These pillars deal Fire damage in an area, and cover Enemies they hit in Ash.",
4412+
description = "Calls forth pillars of ashen flame. These pillars deal Fire damage in an area, and cover Enemies they hit in Ash. Requires a Melee Weapon or Unarmed.",
44134413
skillTypes = { [SkillType.Fire] = true, [SkillType.Area] = true, [SkillType.Attack] = true, [SkillType.Cooldown] = true, [SkillType.Triggerable] = true, [SkillType.Triggered] = true, [SkillType.InbuiltTrigger] = true, [SkillType.SkillGrantedBySupport] = true, },
44144414
weaponTypes = {
44154415
["Claw"] = true,

0 commit comments

Comments
 (0)