Skip to content

Commit 4259362

Browse files
author
LocalIdentity
committed
Merge branch 'dev' into new-uniques-3.28
2 parents 9c711e0 + f4a5c8a commit 4259362

87 files changed

Lines changed: 429254 additions & 77 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fix_ascendancy_positions.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def __sub__(self, other: Point2D) -> Point2D:
3939
"Trickster": Point2D(10200, -3700),
4040
"Saboteur": Point2D(10200, -2200),
4141
"Ascendant": Point2D(-7800, 7200),
42+
"Reliquarian": Point2D(-7800, 8900),
4243
"Warden": Point2D(8250, 8350),
4344
"Primalist": Point2D(7200, 9400),
4445
"Warlock": Point2D(9300, 7300),
@@ -52,6 +53,7 @@ def __sub__(self, other: Point2D) -> Point2D:
5253
"KingInTheMists": Point2D(3750, 12000),
5354
"Olroth": Point2D(5250, 12000),
5455
"Oshabi": Point2D(6750, 12000),
56+
"Necromantic": Point2D(8250, 12000),
5557
}
5658
EXTRA_NODES = {
5759
"Necromancer": [{"Node": {"name": "Nine Lives", "icon": "Art/2DArt/SkillIcons/passives/Ascendants/Int.png", "isNotable": True, "skill" : 27602},

‎src/Classes/ImportTab.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ function ImportTabClass:BuildCharacterList(league)
542542
elseif (charClass == "Juggernaut" or charClass == "Berserker" or charClass == "Chieftain" or
543543
charClass == "Antiquarian" or charClass == "Behemoth" or charClass == "Ancestral Commander") then
544544
classColor = colorCodes["MARAUDER"]
545-
elseif (charClass == "Ascendant" or charClass == "Scavenger") then
545+
elseif (charClass == "Ascendant" or charClass == "Reliquarian" or charClass == "Scavenger") then
546546
classColor = colorCodes["SCION"]
547547
end
548548
end

‎src/Classes/PassiveTree.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,9 +531,9 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
531531
end
532532
else
533533
node.type = "Normal"
534-
if (node.ascendancyName == "Ascendant" and not node.isMultipleChoiceOption and not node.dn:find("Dexterity")
534+
if ((node.ascendancyName == "Ascendant" and not node.isMultipleChoiceOption and not node.dn:find("Dexterity")
535535
and not node.dn:find("Intelligence") and not node.dn:find("Strength") and not node.dn:find("Passive"))
536-
or (node.isMultipleChoiceOption and node.ascendancyName) then
536+
or (node.isMultipleChoiceOption and node.ascendancyName)) and node.ascendancyName ~= "Reliquarian" then
537537
local className = self.ascendNameMap[node.ascendancyName].class.name
538538
self.ascendancyMap[node.dn:lower()] = node
539539
if not self.classNotables[className] then

‎src/Classes/TreeTab.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ local TreeTabClass = newClass("TreeTab", "ControlHost", function(self, build)
173173
}
174174
t_insert(self.treeVersions, value)
175175
end
176-
self.controls.versionText = new("LabelControl", { "LEFT", self.controls.reset, "RIGHT" }, { 8, 0, 0, 16 }, "Version:")
176+
self.controls.versionText = new("LabelControl", { "LEFT", self.controls.reset, "RIGHT" }, { 8, 0, 0, 16 }, "^7Version:")
177177
self.controls.versionSelect = new("DropDownControl", { "LEFT", self.controls.versionText, "RIGHT" }, { 8, 0, 100, 20 }, self.treeVersions, function(index, selected)
178178
if selected.value ~= self.build.spec.treeVersion then
179179
self:OpenVersionConvertPopup(selected.value, true)
@@ -1019,7 +1019,7 @@ function TreeTabClass:OpenMasteryPopup(node, viewPort)
10191019
main:ClosePopup()
10201020
end)
10211021
controls.effect = new("PassiveMasteryControl", {"TOPLEFT",nil,"TOPLEFT"}, {6, 25, 0, passiveMasteryControlHeight}, effects, self, node, controls.save)
1022-
main:OpenPopup(controls.effect.width + 12, controls.effect.height + 60, node.name, controls)
1022+
main:OpenPopup(controls.effect.width + 12, controls.effect.height + 60, node.name, controls, nil, nil, "close")
10231023
end
10241024
end
10251025

‎src/Data/ModCache.lua‎

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

‎src/Data/Skills/act_int.lua‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17706,7 +17706,10 @@ skills["StormBurst"] = {
1770617706
},
1770717707
{
1770817708
name = "Max Channelled Orbs"
17709-
}
17709+
},
17710+
{
17711+
name = "Max Duration Explode"
17712+
},
1771017713
},
1771117714
preDamageFunc = function(activeSkill, output)
1771217715
if activeSkill.skillPart == 2 then
@@ -17715,6 +17718,10 @@ skills["StormBurst"] = {
1771517718
local jumpPeriod = activeSkill.skillData.repeatFrequency * 10
1771617719
-- additional 1 tick upon spawn of orb
1771717720
activeSkill.skillData.dpsMultiplier = (activeSkill.skillData.dpsMultiplier or 1) * (1 + math.floor(duration * 10 / jumpPeriod))
17721+
elseif activeSkill.skillPart == 3 then
17722+
local remainingJumps = math.floor((activeSkill.skillData.duration * output.DurationMod + 0.001) / activeSkill.skillData.repeatFrequency)
17723+
-- Tested in-game and the skill grants more damage only after you have at least 0.8s duration
17724+
activeSkill.skillModList:NewMod("Damage", "MORE", math.max(activeSkill.skillData.remainingDurationDamage * remainingJumps - 100, 0), "Skill:StormBurst")
1771817725
end
1771917726
end,
1772017727
statMap = {
@@ -17723,6 +17730,7 @@ skills["StormBurst"] = {
1772317730
div = 1000,
1772417731
},
1772517732
["storm_burst_new_damage_+%_final_per_remaining_teleport_zap"] = {
17733+
skill("remainingDurationDamage", nil),
1772617734
},
1772717735
},
1772817736
baseFlags = {

‎src/Export/Classes/GGPKData.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ function GGPKClass:GetNeededFiles()
170170
"Data/FlavourText.dat",
171171
"Data/Words.dat",
172172
"Data/ItemClasses.dat",
173+
"Data/ItemStances.dat",
173174
"Data/SkillTotemVariations.dat",
174175
"Data/Essences.dat",
175176
"Data/EssenceType.dat",
@@ -265,6 +266,8 @@ function GGPKClass:GetNeededFiles()
265266
"Data/MercenarySupports.dat",
266267
"Data/MercenaryWieldableTypes.dat",
267268
"Data/SkillArtVariations.dat",
269+
"Data/Melee.dat",
270+
"Data/Animation.dat",
268271
"Data/MiscAnimated.dat",
269272
"Data/MiscAnimatedArtVariations.dat",
270273
"Data/MiscBeamsArtVariations.dat",

‎src/Export/Skills/act_int.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3832,7 +3832,10 @@ local skills, mod, flag, skill = ...
38323832
},
38333833
{
38343834
name = "Max Channelled Orbs"
3835-
}
3835+
},
3836+
{
3837+
name = "Max Duration Explode"
3838+
},
38363839
},
38373840
preDamageFunc = function(activeSkill, output)
38383841
if activeSkill.skillPart == 2 then
@@ -3841,6 +3844,10 @@ local skills, mod, flag, skill = ...
38413844
local jumpPeriod = activeSkill.skillData.repeatFrequency * 10
38423845
-- additional 1 tick upon spawn of orb
38433846
activeSkill.skillData.dpsMultiplier = (activeSkill.skillData.dpsMultiplier or 1) * (1 + math.floor(duration * 10 / jumpPeriod))
3847+
elseif activeSkill.skillPart == 3 then
3848+
local remainingJumps = math.floor((activeSkill.skillData.duration * output.DurationMod + 0.001) / activeSkill.skillData.repeatFrequency)
3849+
-- Tested in-game and the skill grants more damage only after you have at least 0.8s duration
3850+
activeSkill.skillModList:NewMod("Damage", "MORE", math.max(activeSkill.skillData.remainingDurationDamage * remainingJumps - 100, 0), "Skill:StormBurst")
38443851
end
38453852
end,
38463853
statMap = {
@@ -3849,6 +3856,7 @@ local skills, mod, flag, skill = ...
38493856
div = 1000,
38503857
},
38513858
["storm_burst_new_damage_+%_final_per_remaining_teleport_zap"] = {
3859+
skill("remainingDurationDamage", nil),
38523860
},
38533861
},
38543862
#baseMod skill("radius", 16)

‎src/Export/spec.lua‎

Lines changed: 192 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,84 @@ return {
956956
name="Id",
957957
refTo="",
958958
type="String",
959+
width=210
960+
},
961+
[2]={
962+
list=false,
963+
name="",
964+
refTo="",
965+
type="Bool",
966+
width=50
967+
},
968+
[3]={
969+
list=false,
970+
name="",
971+
refTo="",
972+
type="Bool",
973+
width=50
974+
},
975+
[4]={
976+
list=false,
977+
name="",
978+
refTo="",
979+
type="Bool",
980+
width=40
981+
},
982+
[5]={
983+
list=false,
984+
name="Mainhand",
985+
refTo="Animation",
986+
type="ShortKey",
987+
width=150
988+
},
989+
[6]={
990+
list=false,
991+
name="Offhand",
992+
refTo="Animation",
993+
type="ShortKey",
994+
width=150
995+
},
996+
[7]={
997+
list=false,
998+
name="",
999+
refTo="",
1000+
type="Bool",
1001+
width=50
1002+
},
1003+
[8]={
1004+
list=false,
1005+
name="VariationStat",
1006+
refTo="Stats",
1007+
type="Key",
1008+
width=150
1009+
},
1010+
[9]={
1011+
list=false,
1012+
name="AnimationStart",
1013+
refTo="Animation",
1014+
type="ShortKey",
1015+
width=150
1016+
},
1017+
[10]={
1018+
list=false,
1019+
name="",
1020+
refTo="",
1021+
type="Bool",
1022+
width=50
1023+
},
1024+
[11]={
1025+
list=false,
1026+
name="AnimationEnd",
1027+
refTo="Animation",
1028+
type="ShortKey",
9591029
width=150
1030+
},
1031+
[12]={
1032+
list=true,
1033+
name="",
1034+
refTo="",
1035+
type="Int",
1036+
width=100
9601037
}
9611038
},
9621039
applydamagefunctions={
@@ -5648,7 +5725,7 @@ return {
56485725
name="Animation",
56495726
refTo="Animation",
56505727
type="Key",
5651-
width=100
5728+
width=210
56525729
},
56535730
[19]={
56545731
list=false,
@@ -6494,7 +6571,7 @@ return {
64946571
name="ItemStance",
64956572
refTo="ItemStances",
64966573
type="Key",
6497-
width=90
6574+
width=160
64986575
},
64996576
[20]={
65006577
list=false,
@@ -6662,6 +6739,13 @@ return {
66626739
itemshoptype={
66636740
},
66646741
itemstances={
6742+
[1]={
6743+
list=false,
6744+
name="Id",
6745+
refTo="",
6746+
type="String",
6747+
width=150
6748+
}
66656749
},
66666750
itemsynthesiscorruptedmods={
66676751
[1]={
@@ -7329,6 +7413,104 @@ return {
73297413
}
73307414
},
73317415
melee={
7416+
[1]={
7417+
list=false,
7418+
name="ActiveSkill",
7419+
refTo="ActiveSkills",
7420+
type="Key",
7421+
width=150
7422+
},
7423+
[2]={
7424+
list=false,
7425+
name="",
7426+
refTo="",
7427+
type="Int",
7428+
width=150
7429+
},
7430+
[3]={
7431+
list=false,
7432+
name="MiscAnimated",
7433+
refTo="MiscAnimated",
7434+
type="Key",
7435+
width=150
7436+
},
7437+
[4]={
7438+
list=false,
7439+
name="MeleeTrails1",
7440+
refTo="MeleeTrails",
7441+
type="Key",
7442+
width=150
7443+
},
7444+
[5]={
7445+
list=false,
7446+
name="MeleeTrails2",
7447+
refTo="MeleeTrails",
7448+
type="Key",
7449+
width=150
7450+
},
7451+
[6]={
7452+
list=false,
7453+
name="MeleeTrails3",
7454+
refTo="MeleeTrails",
7455+
type="Key",
7456+
width=150
7457+
},
7458+
[7]={
7459+
list=false,
7460+
name="MeleeTrails4",
7461+
refTo="MeleeTrails",
7462+
type="Key",
7463+
width=150
7464+
},
7465+
[8]={
7466+
list=false,
7467+
name="MeleeTrails5",
7468+
refTo="MeleeTrails",
7469+
type="Key",
7470+
width=150
7471+
},
7472+
[9]={
7473+
list=false,
7474+
name="MeleeTrails6",
7475+
refTo="MeleeTrails",
7476+
type="Key",
7477+
width=150
7478+
},
7479+
[10]={
7480+
list=false,
7481+
name="MeleeTrails7",
7482+
refTo="MeleeTrails",
7483+
type="Key",
7484+
width=150
7485+
},
7486+
[11]={
7487+
list=false,
7488+
name="",
7489+
refTo="",
7490+
type="Bool",
7491+
width=150
7492+
},
7493+
[12]={
7494+
list=false,
7495+
name="SurgeEPK",
7496+
refTo="",
7497+
type="String",
7498+
width=150
7499+
},
7500+
[13]={
7501+
list=false,
7502+
name="",
7503+
refTo="",
7504+
type="String",
7505+
width=150
7506+
},
7507+
[14]={
7508+
list=false,
7509+
name="",
7510+
refTo="",
7511+
type="String",
7512+
width=150
7513+
}
73327514
},
73337515
meleetrails={
73347516
},
@@ -8079,7 +8261,7 @@ return {
80798261
width=250
80808262
},
80818263
[2]={
8082-
list=false,
8264+
list=true,
80838265
name="MiscAnimated",
80848266
refTo="MiscAnimated",
80858267
type="Key",
@@ -12289,6 +12471,13 @@ return {
1228912471
refTo="GrantedEffects",
1229012472
type="Key",
1229112473
width=200
12474+
},
12475+
[14]={
12476+
list=true,
12477+
name="",
12478+
refTo="",
12479+
type="Key",
12480+
width=150
1229212481
}
1229312482
},
1229412483
skillgeminfo={

0 commit comments

Comments
 (0)