Skip to content

Commit 09b86b2

Browse files
RegisleRegisle
authored
Merge pull request #2 from PathOfBuildingCommunity/dev
Dev
2 parents e4bcc21 + b5a8431 commit 09b86b2

File tree

17 files changed

+145
-67
lines changed

17 files changed

+145
-67
lines changed

‎Classes/Item.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ function ItemClass:ParseRaw(raw)
226226
else
227227
t_insert(self.variantList, specVal)
228228
end
229+
elseif specName == "Requires Level" then
230+
self.requirements.level = tonumber(specVal)
229231
elseif specName == "Requires" then
230232
self.requirements.level = tonumber(specVal:match("Level (%d+)"))
231233
elseif specName == "Level" then

‎Classes/ItemSlotControl.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ function ItemSlotClass:Draw(viewPort)
123123
self:DrawControls(viewPort)
124124
if not main.popups[1] and self.nodeId and (self.dropped or (self:IsMouseOver() and (self.otherDragSource or not self.itemsTab.selControl))) then
125125
SetDrawLayer(nil, 15)
126-
local viewerX = x + width + 5
127-
local viewerY = m_min(y, viewPort.y + viewPort.height - 304)
126+
local viewerX = x
127+
local viewerY = m_min(y - 300 - 5, viewPort.y + viewPort.height - 304)
128128
SetDrawColor(1, 1, 1)
129129
DrawImage(nil, viewerX, viewerY, 304, 304)
130130
local viewer = self.itemsTab.socketViewer

‎Data/3_0/SkillStatMap.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,9 +1163,9 @@ return {
11631163
["non_curse_aura_effect_+%"] = {
11641164
mod("AuraEffect", "INC", nil),
11651165
},
1166-
-- Sigil
1166+
-- Brand
11671167
["sigil_attached_target_damage_+%_final"] = {
1168-
mod("Damage", "MORE", nil, 0, 0, { type = "Condition", var = "BrandAttachedToEnemy" }),
1168+
mod("Damage", "MORE", nil, 0, 0, { type = "MultiplierThreshold", var = "BrandsAttachedToEnemy", threshold = 1 }),
11691169
},
11701170
-- Banner
11711171
["banner_buff_effect_+%_per_stage"] = {

‎Data/3_0/Skills/act_int.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ skills["CataclysmSigil"] = {
261261
spell = true,
262262
area = true,
263263
duration = true,
264+
brand = true,
264265
},
265266
baseMods = {
266267
skill("radius", 18),
@@ -6382,6 +6383,7 @@ skills["ConduitSigil"] = {
63826383
spell = true,
63836384
area = true,
63846385
duration = true,
6386+
brand = true,
63856387
},
63866388
baseMods = {
63876389
},

‎Data/3_0/Skills/act_str.lua‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1973,6 +1973,11 @@ skills["GroundSlam"] = {
19731973
},
19741974
statDescriptionScope = "skill_stat_descriptions",
19751975
castTime = 1,
1976+
statMap = {
1977+
["groundslam_damage_to_close_targets_+%_final"] = {
1978+
mod("Damage", "MORE", nil, 0, 0, { type = "Condition", var = "AtCloseRange" })
1979+
},
1980+
},
19761981
baseFlags = {
19771982
attack = true,
19781983
melee = true,
@@ -2054,6 +2059,11 @@ skills["VaalGroundSlam"] = {
20542059
},
20552060
statDescriptionScope = "skill_stat_descriptions",
20562061
castTime = 1,
2062+
statMap = {
2063+
["groundslam_damage_to_close_targets_+%_final"] = {
2064+
mod("Damage", "MORE", nil, 0, 0, { type = "Condition", var = "AtCloseRange" })
2065+
},
2066+
},
20572067
baseFlags = {
20582068
attack = true,
20592069
melee = true,
@@ -3547,7 +3557,7 @@ skills["RallyingCry"] = {
35473557
mod("Damage", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }),
35483558
},
35493559
["inspiring_cry_damage_+%_per_one_hundred_nearby_enemies"] = {
3550-
mod("Damage", "INC", nil, 0, 0, { type = "Multiplier", var = "NearbyEnemy" }, { type = "GlobalEffect", effectType = "Buff" }),
3560+
mod("Damage", "INC", nil, 0, 0, { type = "Multiplier", var = "WarcryNearbyEnemies" }, { type = "GlobalEffect", effectType = "Buff" }),
35513561
div = 100,
35523562
},
35533563
["base_mana_regeneration_rate_per_minute"] = {

‎Data/3_0/Skills/other.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ skills["CatsStealthTriggeredIntimidatingCry"] = {
393393
mod("Speed", "INC", nil, ModFlag.Attack, 0, { type = "GlobalEffect", effectType = "Buff" }),
394394
},
395395
["intimidating_cry_attack_speed_+%_per_100_enemies"] = {
396-
mod("Speed", "INC", nil, ModFlag.Attack, 0, { type = "Multiplier", var = "NearbyEnemy" }, { type = "GlobalEffect", effectType = "Buff" }),
396+
mod("Speed", "INC", nil, ModFlag.Attack, 0, { type = "Multiplier", var = "WarcryNearbyEnemies" }, { type = "GlobalEffect", effectType = "Buff" }),
397397
div = 100,
398398
},
399399
},

‎Data/New.lua‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,19 @@ Banners you are carrying gain 1 Stage on Melee Hit, up to 5 per second
2525
War Banner has 147% increased Adrenaline duration
2626
Dread Banner has 141% increased Fortify duration
2727
]],
28-
28+
[[
29+
Profane Proxy
30+
Unset Ring
31+
Sockets: G
32+
LevelReq: 52
33+
Implicits: 1
34+
Has 1 Socket
35+
+3 to Level of Socketed Curse Gems
36+
+28% To Cold Resistance
37+
+20% To Lightning Resistance
38+
Left Ring Slot: Your Chilling Skitterbot's Aura Applies Socketed Curse Instead
39+
Right Ring Slot: Your Shocking Skitterbot's Aura Applies Socketed Curse Instead
40+
]],
2941

3042
-- Reworked
3143

‎Export/Skills/act_int.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ local skills, mod, flag, skill = ...
3232
#mods
3333

3434
#skill CataclysmSigil
35-
#flags spell area duration
35+
#flags spell area duration brand
3636
preDamageFunc = function(activeSkill, output)
3737
activeSkill.skillData.hitTimeOverride = activeSkill.skillData.repeatFrequency / (1 + activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed", "BrandActivationFrequency") / 100)
3838
end,
@@ -1034,7 +1034,7 @@ local skills, mod, flag, skill = ...
10341034
#mods
10351035

10361036
#skill ConduitSigil
1037-
#flags spell area duration
1037+
#flags spell area duration brand
10381038
preDamageFunc = function(activeSkill, output)
10391039
activeSkill.skillData.hitTimeOverride = activeSkill.skillData.repeatFrequency / (1 + activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed", "BrandActivationFrequency") / 100)
10401040
end,

‎Export/Skills/act_str.txt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,21 @@ local skills, mod, flag, skill = ...
315315

316316
#skill GroundSlam
317317
#flags attack melee area
318+
statMap = {
319+
["groundslam_damage_to_close_targets_+%_final"] = {
320+
mod("Damage", "MORE", nil, 0, 0, { type = "Condition", var = "AtCloseRange" })
321+
},
322+
},
318323
#baseMod skill("radius", 35)
319324
#mods
320325

321326
#skill VaalGroundSlam
322327
#flags attack melee area
328+
statMap = {
329+
["groundslam_damage_to_close_targets_+%_final"] = {
330+
mod("Damage", "MORE", nil, 0, 0, { type = "Condition", var = "AtCloseRange" })
331+
},
332+
},
323333
#mods
324334

325335
#skill HeavyStrike
@@ -556,7 +566,7 @@ local skills, mod, flag, skill = ...
556566
mod("Damage", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }),
557567
},
558568
["inspiring_cry_damage_+%_per_one_hundred_nearby_enemies"] = {
559-
mod("Damage", "INC", nil, 0, 0, { type = "Multiplier", var = "NearbyEnemy" }, { type = "GlobalEffect", effectType = "Buff" }),
569+
mod("Damage", "INC", nil, 0, 0, { type = "Multiplier", var = "WarcryNearbyEnemies" }, { type = "GlobalEffect", effectType = "Buff" }),
560570
div = 100,
561571
},
562572
["base_mana_regeneration_rate_per_minute"] = {

‎Export/Skills/other.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ local skills, mod, flag, skill = ...
103103
mod("Speed", "INC", nil, ModFlag.Attack, 0, { type = "GlobalEffect", effectType = "Buff" }),
104104
},
105105
["intimidating_cry_attack_speed_+%_per_100_enemies"] = {
106-
mod("Speed", "INC", nil, ModFlag.Attack, 0, { type = "Multiplier", var = "NearbyEnemy" }, { type = "GlobalEffect", effectType = "Buff" }),
106+
mod("Speed", "INC", nil, ModFlag.Attack, 0, { type = "Multiplier", var = "WarcryNearbyEnemies" }, { type = "GlobalEffect", effectType = "Buff" }),
107107
div = 100,
108108
},
109109
},

0 commit comments

Comments
 (0)