overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
Openarl
2016-12-30 22:36:27 +10:00
parent 84e4b0d49f 536e2b548f
commit 32b986cada
12 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Classes/ConfigTab.lua
View File

@@ -40,6 +40,15 @@ local varList = {
{ var = "conditionOnConsecratedGround", type = "check", label = "Are you on Consecrated Ground?", apply = function(val, modList, enemyModList)
modList:NewMod("Misc", "LIST", { type = "Condition", var = "OnConsecratedGround" }, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionIgnited", type = "check", label = "Are you Ignited?", apply = function(val, modList, enemyModList)
modList:NewMod("Misc", "LIST", { type = "Condition", var = "PlayerIgnited" }, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionFrozen", type = "check", label = "Are you Frozen?", apply = function(val, modList, enemyModList)
modList:NewMod("Misc", "LIST", { type = "Condition", var = "PlayerFrozen" }, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionShocked", type = "check", label = "Are you Shocked?", apply = function(val, modList, enemyModList)
modList:NewMod("Misc", "LIST", { type = "Condition", var = "PlayerShocked" }, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionHitRecently", type = "check", label = "Have you Hit Recently?", tooltip = "You will automatically be considered to have Hit Recently if your main skill is self-cast,\nbut you can use this option to force it if necessary.", apply = function(val, modList, enemyModList)
modList:NewMod("Misc", "LIST", { type = "Condition", var = "HitRecently" }, "Config", { type = "Condition", var = "Combat" })
end },

2
Data/Gems/act_int.lua
View File

@@ -806,7 +806,7 @@ gems["Discharge"] = {
skill("damageEffectiveness", 1.5),
skill("critChance", 7),
--"skill_override_pvp_scaling_time_ms" = 1400
--"triggered_discharge_damage_+%_final" = -35
mod("Damage", "MORE", -35, ModFlag.Spell, 0, { type = "Condition", var = "SkillIsTriggered" }), --"triggered_discharge_damage_+%_final" = -35
skill("showAverage", true), --"base_skill_show_average_damage_instead_of_dps" = ?
--"is_area_damage" = ?
},

6
Data/Gems/other.lua
View File

@@ -105,7 +105,7 @@ gems["Abberath's Fury"] = {
mod("EnemyIgniteChance", "BASE", 10), --"base_chance_to_ignite_%" = 10
--"cast_on_gain_skill" = ?
--"cannot_knockback" = ?
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
--"is_area_damage" = ?
--"skill_can_add_multiple_charges_per_action" = ?
},
@@ -131,7 +131,7 @@ gems["Bone Nova"] = {
--"attack_trigger_on_killing_bleeding_enemy_%" = 100
--"monster_projectile_variation" = 15
--"projectiles_nova" = ?
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
--"base_is_projectile" = ?
flag("CannotBleed"), --"cannot_cause_bleeding" = ?
},
@@ -268,7 +268,7 @@ gems["Lightning Bolt"] = {
skill("critChance", 6),
--"cast_on_crit_%" = 100
--"is_area_damage" = ?
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
},
qualityMods = {
},

4
Data/Gems/sup_dex.lua
View File

@@ -171,7 +171,7 @@ gems["Cast On Critical Strike"] = {
baseMods = {
mod("ManaCost", "MORE", 40),
--"cast_linked_spells_on_attack_crit_%" = 100
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
skill("showAverage", true, { type = "SkillType", skillType = 36 }),
},
qualityMods = {
@@ -224,7 +224,7 @@ gems["Cast on Death"] = {
excludeSkillTypes = { 9, 37, 41, 30, 44, },
baseMods = {
--"cast_on_death_%" = 100
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
--"spell_only_castable_on_death" = ?
skill("showAverage", true), --"base_skill_show_average_damage_instead_of_dps" = ?
},

4
Data/Gems/sup_int.lua
View File

@@ -169,7 +169,7 @@ gems["Cast when Stunned"] = {
addSkillTypes = { 42, },
excludeSkillTypes = { 37, 41, 30, 44, },
baseMods = {
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
skill("showAverage", true), --"base_skill_show_average_damage_instead_of_dps" = ?
},
qualityMods = {
@@ -222,7 +222,7 @@ gems["Cast while Channelling"] = {
excludeSkillTypes = { 30, },
baseMods = {
mod("ManaCost", "MORE", 40),
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
},
qualityMods = {
mod("Damage", "INC", 0.5, 0, 0, nil), --"damage_+%" = 0.5

4
Data/Gems/sup_str.lua
View File

@@ -170,7 +170,7 @@ gems["Cast on Melee Kill"] = {
baseMods = {
mod("ManaCost", "MORE", 40),
--"cast_linked_spells_on_melee_kill_%" = 100
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
},
qualityMods = {
mod("Damage", "INC", 0.5, 0, 0, nil), --"damage_+%" = 0.5
@@ -222,7 +222,7 @@ gems["Cast when Damage Taken"] = {
excludeSkillTypes = { 37, 41, 30, 44, },
baseMods = {
--"cast_on_damage_taken_%" = 100
--"spell_uncastable_if_triggerable" = ?
skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
skill("showAverage", true), --"base_skill_show_average_damage_instead_of_dps" = ?
},
qualityMods = {

2
Modules/Calcs.lua
View File

@@ -1624,6 +1624,8 @@ local function performCalcs(env)
end
end
env.modDB.conditions["SkillIsTriggered"] = skillData.triggered
-- Add addition stat bonuses
if modDB:Sum("FLAG", nil, "IronGrip") then
modDB:NewMod("PhysicalDamage", "INC", strDmgBonus, "Strength", bor(ModFlag.Attack, ModFlag.Projectile))

2
Modules/ItemTools.lua
View File

@@ -462,7 +462,7 @@ function itemLib.buildItemModList(item)
end
end
end
if item.name == "Tabula Rasa, Simple Robe" then
if item.name == "Tabula Rasa, Simple Robe" or item.name == "Skin of the Loyal, Simple Robe" or item.name == "Skin of the Lords, Simple Robe" then
-- Hack to remove the energy shield
t_insert(baseList, { name = "Misc", type = "LIST", value = { type = "ArmourData", key = "EnergyShield" }, flags = 0, keywordFlags = 0, tagList = { } })
end

3
Modules/ModParser.lua
View File

@@ -366,6 +366,9 @@ local modTagList = {
["while using a flask"] = { tag = { type = "Condition", var = "UsingFlask" } },
["during flask effect"] = { tag = { type = "Condition", var = "UsingFlask" } },
["while on consecrated ground"] = { tag = { type = "Condition", var = "OnConsecratedGround" } },
["while ignited"] = { tag = { type = "Condition", var = "PlayerIgnited" } },
["while frozen"] = { tag = { type = "Condition", var = "PlayerFrozen" } },
["while shocked"] = { tag = { type = "Condition", var = "PlayerShocked" } },
["if you have hit recently"] = { tag = { type = "Condition", var = "HitRecently" } },
["if you've crit recently"] = { tag = { type = "Condition", var = "CritRecently" } },
["if you've dealt a critical strike recently"] = { tag = { type = "Condition", var = "CritRecently" } },

5
README.md
View File

@@ -48,6 +48,11 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png)
## Changelog
### 1.2.30 - 2016/12/30
* Added options to the Configuration tab for "Are you Ignited/Frozen/Shocked"
* Discharge's damage penalty when triggered will now apply correctly
* Skin of the Loyal and Skin of the Lords' Energy Shield values are now correctly removed
### 1.2.29 - 2016/12/26
* Added an "Enemy is Hindered" option to the Configuration tab
* Added a "Crit Chance is Lucky" option to the Configuration tab

4
changelog.txt
View File

@@ -1,3 +1,7 @@
VERSION[1.2.30][2016/12/30]
* Added options to the Configuration tab for "Are you Ignited/Frozen/Shocked"
* Discharge's damage penalty when triggered will now apply correctly
* Skin of the Loyal and Skin of the Lords' Energy Shield values are now correctly removed
VERSION[1.2.29][2016/12/26]
* Added an "Enemy is Hindered" option to the Configuration tab
* Added a "Crit Chance is Lucky" option to the Configuration tab

22
manifest.xml
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.2.29"/>
<Version number="1.2.30"/>
<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
<File sha1="46a39bc720b0339359fe598ea2828a9a43ecbcea" name="Launch.lua" part="program"/>
<File sha1="d8e42beeb38baabcc197d658e4c0af33419eeff3" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="639a4f97f0b43af46eaaa2c808b5ac972a9d1f65" name="changelog.txt" part="program"/>
<File sha1="0dd4ab5c5e77bf987b3d98c61283a0df064fec79" name="changelog.txt" part="program"/>
<File sha1="231a4fe264d84294427edacbf3e29ec4b301712e" name="Classes/BuildListControl.lua" part="program"/>
<File sha1="47c28993f5653955c9e76714775d87ac22b077da" name="Classes/ButtonControl.lua" part="program"/>
<File sha1="5a4b4930533a97f4d87231a6024b7f48ff0bad89" name="Classes/CalcBreakdownControl.lua" part="program"/>
<File sha1="23171916fa590c5344b17e67bd8d378574922388" name="Classes/CalcSectionControl.lua" part="program"/>
<File sha1="0256fbb994946900a82b45ec4108a94643bd0c91" name="Classes/CalcsTab.lua" part="program"/>
<File sha1="5d30e33c23cabf22917c02eb7df1963a5a27cb6a" name="Classes/CheckBoxControl.lua" part="program"/>
<File sha1="91275538a59bcce5ea5fc65b666b19b45036e9a4" name="Classes/ConfigTab.lua" part="program"/>
<File sha1="f7549ef19056c9607a5392a465740cec452cc806" name="Classes/ConfigTab.lua" part="program"/>
<File sha1="bbb08f183746d6ec023e2bd08fb7a89d365381da" name="Classes/Control.lua" part="program"/>
<File sha1="ae55fe1093e727872bc01cc94fa987395f944313" name="Classes/ControlHost.lua" part="program"/>
<File sha1="3e1ac525cb454844527ee3c586ed21b9e2b0446b" name="Classes/DropDownControl.lua" part="program"/>
@@ -44,25 +44,25 @@
<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
<File sha1="acb2b28aaf4acfa4c7d0801a26672e1fedc752c8" name="Modules/Build.lua" part="program"/>
<File sha1="8a07fe01c53b785ebb6256236e781fbaabd36c0e" name="Modules/BuildList.lua" part="program"/>
<File sha1="2c8414e058239db1a8e37c38d5901be521eb1fcf" name="Modules/Calcs.lua" part="program"/>
<File sha1="92689a93c2c16597f832d6676fa6d5d551296092" name="Modules/Calcs.lua" part="program"/>
<File sha1="5f4cb49ac9956007505e8ed599918946c2daf0e0" name="Modules/CalcSections.lua" part="program"/>
<File sha1="0f9df7b91a548b008693102854b108693205309c" name="Modules/Common.lua" part="program"/>
<File sha1="2b393e960721c36dc4c99645a507d7232cbd6f0e" name="Modules/Data.lua" part="program"/>
<File sha1="96b7b7c46896daee375be295cd27e4bb9f213203" name="Modules/ItemTools.lua" part="program"/>
<File sha1="786d2dfd1fde410d5319d55b04878c44c26307cf" name="Modules/ItemTools.lua" part="program"/>
<File sha1="6165a0baf0c7d1cb6adf9bef68bfa9d9d3ad67ec" name="Modules/Main.lua" part="program"/>
<File sha1="f8a54d766aefa0268cabb7d17e4729d9ec639111" name="Modules/ModParser.lua" part="program"/>
<File sha1="cebe63239de84f5bc76372bdf4aae9b9e23dd622" name="Modules/ModParser.lua" part="program"/>
<File sha1="5f93a9d8f58e0d5990a1f84e1ab1d53fbd35fb56" name="Modules/ModTools.lua" part="program"/>
<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>
<File sha1="9a320bfe629b1cf3f14fc77fbbf2508d0a5b2841" name="Assets/small_ring.png" part="program"/>
<File sha1="24596d013ecc9170990670c4e02f1b38c326db9e" name="Data/New.lua" part="program"/>
<File sha1="dc2595dd73bab52832752e096398e51c10c48cfe" name="Data/Rares.lua" part="program"/>
<File sha1="d74215f5f768cd3ef5a778b8d8dcf83611c1d98f" name="Data/Gems/act_dex.lua" part="program"/>
<File sha1="70e0589dc2370e5431c041e6e35e8c94558d3983" name="Data/Gems/act_int.lua" part="program"/>
<File sha1="8abf13452b80746049bcc555dfc3d1aa43c0010c" name="Data/Gems/act_int.lua" part="program"/>
<File sha1="79343ddf8c2ff5b0e4f73e5ff83bce5d8222a4af" name="Data/Gems/act_str.lua" part="program"/>
<File sha1="05201b4e14ff50dbc887e7cca37f1d476fb931aa" name="Data/Gems/other.lua" part="program"/>
<File sha1="ec8fa8cca83525bd1a879377084de8f4d50fac30" name="Data/Gems/sup_dex.lua" part="program"/>
<File sha1="b8b44d4186785907344f88170aff70d4e8f366ff" name="Data/Gems/sup_int.lua" part="program"/>
<File sha1="9d7d4d58b9f6204897b8aee8e6bb32ac7659bc6e" name="Data/Gems/sup_str.lua" part="program"/>
<File sha1="fb08097a2a2d5065d98e70a080e1025e85eb3e4c" name="Data/Gems/other.lua" part="program"/>
<File sha1="56d472af3b6da1de572670c06530be247d29d61a" name="Data/Gems/sup_dex.lua" part="program"/>
<File sha1="f7eb18bfadfc93937b42cf57fc1f293190ae3006" name="Data/Gems/sup_int.lua" part="program"/>
<File sha1="95f3fe03e166a2bb5e66af35981435bec3fd19fa" name="Data/Gems/sup_str.lua" part="program"/>
<File sha1="48d916e1cf089c292b2c614805f80ce85cff55d9" name="Data/Bases/amulet.lua" part="program"/>
<File sha1="78410a8a3ee33ad331fee2abd83e235fe5b702f6" name="Data/Bases/axe.lua" part="program"/>
<File sha1="48b7831da9941b9d8f296d0b094bcb19d2f33f5e" name="Data/Bases/belt.lua" part="program"/>