Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Goddess Unleashed Wording Update, Support enemies x by you have, bleeed/poison on self, used mana in last 10 seconds and distanceRamp updates #5655

Merged
merged 2 commits into from
Feb 2, 2023
Merged

Goddess Unleashed Wording Update, Support enemies x by you have, bleeed/poison on self, used mana in last 10 seconds and distanceRamp updates #5655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa7b1e8
Update various things
QuickStick123 Feb 2, 2023
80bd2e0
Fix forgetting to update to mana flask
QuickStick123 Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Data/Uniques/sword.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Adds (3-6) to (33-66) Physical Damage
Gain (66-99)% of Sword Physical Damage as Extra Fire Damage
Gain Her Blessing for 3 seconds when you Ignite an Enemy
33% chance to Blind nearby Enemies when gaining Her Blessing
Cannot be Frozen, Chilled or Ignited with Her Blessing
100% chance to Avoid being Ignited, Chilled or Frozen with Her Blessing
20% increased Attack and Movement Speed with Her Blessing
]],[[
Grelwood Shank
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,10 +758,10 @@ function calcs.offence(env, actor, activeSkill)
end
if skillFlags.projectile then
if skillModList:Flag(nil, "PointBlank") then
skillModList:NewMod("Damage", "MORE", 30, "Point Blank", bor(ModFlag.Attack, ModFlag.Projectile), { type = "DistanceRamp", ramp = {{10,1},{35,0},{150,-1}} })
skillModList:NewMod("Damage", "MORE", 30, "Point Blank", bor(ModFlag.Attack, ModFlag.Projectile), { type = "DistanceRamp", ramp = {{10,1},{35,0},{120,-1}} })
end
if skillModList:Flag(nil, "FarShot") then
skillModList:NewMod("Damage", "MORE", 100, "Far Shot", bor(ModFlag.Attack, ModFlag.Projectile), { type = "DistanceRamp", ramp = {{10, -0.2}, {35, 0}, {70, 0.6}} })
skillModList:NewMod("Damage", "MORE", 100, "Far Shot", bor(ModFlag.Attack, ModFlag.Projectile), { type = "DistanceRamp", ramp = {{10, -0.2}, {25, 0}, {70, 0.6}} })
end
if skillModList:Flag(skillCfg, "NoAdditionalProjectiles") then
output.ProjectileCount = 1
Expand Down
6 changes: 6 additions & 0 deletions src/Modules/ModParser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,13 +650,15 @@ local modNameList = {
["to cause poison"] = "PoisonChance",
["to poison on hit"] = "PoisonChance",
["poison duration"] = { "EnemyPoisonDuration" },
["poison duration on you"] = "SelfPoisonDuration",
["duration of poisons you inflict"] = { "EnemyPoisonDuration" },
["to cause bleeding"] = "BleedChance",
["to cause bleeding on hit"] = "BleedChance",
["to inflict bleeding"] = "BleedChance",
["to inflict bleeding on hit"] = "BleedChance",
["bleed duration"] = { "EnemyBleedDuration" },
["bleeding duration"] = { "EnemyBleedDuration" },
["bleed duration on you"] = "SelfBleedDuration",
-- Misc modifiers
["movement speed"] = "MovementSpeed",
["attack, cast and movement speed"] = { "Speed", "MovementSpeed" },
Expand Down Expand Up @@ -1013,6 +1015,9 @@ local preFlagList = {
["^enemies (%a+) by "] = function(cond)
return { tag = { type = "Condition", var = cond:gsub("^%a", string.upper) }, applyToEnemy = true }
end,
["^enemies (%a+) by you have "] = function(cond)
return { tag = { type = "Condition", var = cond:gsub("^%a", string.upper) }, applyToEnemy = true }
end,
["^hits against enemies (%a+) by you have "] = function(cond)
return { tag = { type = "ActorCondition", actor = "enemy", var = cond:gsub("^%a", string.upper) } }
end,
Expand Down Expand Up @@ -1353,6 +1358,7 @@ local modTagList = {
["during effect of any mana flask"] = { tag = { type = "Condition", var = "UsingManaFlask" } },
["during effect of any life flask"] = { tag = { type = "Condition", var = "UsingLifeFlask" } },
["if you've used a life flask in the past 10 seconds"] = { tag = { type = "Condition", var = "UsingLifeFlask" } },
["if you've used a mana flask in the past 10 seconds"] = { tag = { type = "Condition", var = "UsingManaFlask" } },
["during effect of any life or mana flask"] = { tag = { type = "Condition", varList = { "UsingManaFlask", "UsingLifeFlask" } } },
["while on consecrated ground"] = { tag = { type = "Condition", var = "OnConsecratedGround" } },
["on burning ground"] = { tag = { type = "Condition", var = "OnBurningGround" } },
Expand Down