Merge remote-tracking branch 'origin/dev'

2016-09-05 13:21:36 +10:00
parent 4fad6c636f 741d8e1f8f
commit 0b54ce9069
6 changed files with 85 additions and 36 deletions
--- a/Data/New.lua
+++ b/Data/New.lua
@@ -91,19 +91,26 @@ Requires Level 69, 82 Dex, 42 Int
 You have Phasing if you've Killed Recently
 Projectiles Pierce while Phasing
 ]],[[
-Kitava's Thirst
+Kitava's Thirst 
 Zealot Helmet
+Armour: (177–187)
+Energy Shield: (53–56)
 Requires Level 44, 50 Str, 50 Int
 15% reduced Cast Speed
-72% increased Armour and Energy Shield
-+34 to maximum Mana
-30% chance to Cast Socketed Skills when you use a Skill that costs at least 100 Mana
+(70–80)% increased Armour and Energy Shield
+(30–50) to maximum Mana
+30% chance to Cast Socketed Spells when 
+you Spend at least 100 Mana to Use a Skill
 ]],[[
-Kondo's Pride
+Kondo's Pride 
 Ezomyte Blade
+Two Handed Sword
+Physical Damage: (226–418 to 256–475)
+Critical Strike Chance: 5.00%
+Attacks per Second: 1.25
 Requires Level 61, 113 Str, 113 Dex
 18% increased Accuracy Rating
-308% increased Physical Damage
+(270–320)% increased Physical Damage
 0.6% of Physical Attack Damage Leeched as Life
 50% increased Melee Damage against Bleeding Enemies
 Cannot Leech Life from Critical Strikes
@@ -139,9 +146,12 @@ Spells have an additional Projectile
 Brain Rattler 
 Meatgrinder
 Two Handed Mace
+Physical Damage: (143–437 to 163–487)
+Critical Strike Chance: 5.00%
+Attacks per Second: 1.25
 Requires Level 63, 212 Str
 20% increased Stun Duration on Enemies
-Adds 99 to 327 Physical Damage
+Adds (80–100) to (320–370) Physical Damage
 50% of Physical Damage Converted to Lightning Damage
 15% chance to Shock
 10% chance to Cause Monsters to Flee
@@ -170,15 +180,15 @@ Take 100 Fire Damage when you Ignite an Enemy
 Cospri's Malice 
 Jewelled Foil
 One Handed Sword
-Elemental Damage: (81–191)
+Elemental Damage: (80–160 to 100–200)
 Critical Strike Chance: 5.50%
-Attacks per Second: (1.75)
-Requires Level 68, 212 Dex, (257) Int
+Attacks per Second: (1.73–1.82)
+Requires Level 68, 212 Dex, 257 Int
 +30% to Global Critical Strike Multiplier
 No Physical Damage
-Adds 81 to 191 Cold Damage
-Adds 58 to 95 Cold Damage to Spells
-9% increased Attack Speed
+Adds (80–100) to (160–200) Cold Damage
+Adds (40–60) to (90–110) Cold Damage to Spells
+(8–14)% increased Attack Speed
 +257 Intelligence Requirement
 60% increased Critical Strike Chance against Chilled Enemies
 Cast a Socketed Cold Skill on Melee Critical Strike
@@ -186,21 +196,21 @@ Cast a Socketed Cold Skill on Melee Critical Strike
 The Scourge 
 Terror Claw
 Claw
-Physical Damage: (53–172)
+Physical Damage: (50–165 to 59–180)
 Critical Strike Chance: 6.30%
-Attacks per Second: 1.72
+Attacks per Second: (1.65–1.73)
 Requires Level 70, 113 Dex, 113 Int
 2% of Physical Attack Damage Leeched as Life
-Adds 38 to 118 Physical Damage
-15% increased Attack Speed
-Minions have 10% increased Attack Speed
+Adds (35–44) to (105–120) Physical Damage
+(10–15)% increased Attack Speed
+Minions have (10-15)% increased Attack Speed
 10% Chance to Summon a Spectral Wolf on Kill
 Increases and Reductions to Minion Damage also affects You
-70% increased Minion Damage you have Hit Recently
+70% increased Minion Damage if you have Hit Recently
 ]],[[
 Unending Hunger 
 Cobalt Jewel
-Minions have 8% increased Radius of Area Skills
+Minions have (5-8)% increased Radius of Area Skills
 20% chance for Spectres to gain Soul Eater on Kill for 30 seconds
 with 50 Intelligence from Allocated Passives in Radius
 ]],[[
@@ -208,7 +218,7 @@ The Warden's Brand
 Iron Ring
 Requires Level 30
 Adds 1 to 4 Physical Damage to Attacks
-Adds (8–15 to 31–45) Physical Damage to Attacks
+Adds (5–15) to (25–50) Physical Damage to Attacks
 30% reduced Attack Speed
 15% chance to gain a Frenzy Charge when you Stun an Enemy
 ]],[[
@@ -230,5 +240,33 @@ Requires Level 38
 +(20 to 30)% to Fire Resistance
 -40% to Cold Resistance
 Stun Threshold is based on Energy Shield instead of Life
+]],[[
+Shaper's Touch 
+Crusader Gloves
+Armour: (194)
+Energy Shield: (57)
+Requires Level 66, 51 Str, 51 Int
+(85)% increased Armour and Energy Shield
+2 Accuracy Rating per 2 Intelligence
+1 Life per 4 Dexterity
+1 Mana per 4 Strength
+1% increased Energy Shield per 10 Strength
+1% increased Evasion Rating per 10 Intelligence
+1% increased Melee Physical Damage per 10 Dexterity
+]],[[
+Starforge 
+Infernal Sword
+Two Handed Sword
+Physical Damage: (285–590 to 342–708)
+Critical Strike Chance: 5.00%
+Attacks per Second: (1.31–1.35)
+Requires Level 67, 113 Str, 113 Dex
+30% increased Accuracy Rating
+(400–500)% increased Physical Damage
+(5–8)% increased Attack Speed
+(90–100) to maximum Life
+20% increased Area of Effect for Attacks
+Deal no Elemental Damage
+Your Physical Damage can Shock
 ]]
 }
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -557,8 +557,8 @@ end
 -- This function:
 -- 1. Merges modifiers for all items, optionally replacing one item
 -- 2. Builds a list of jewels with radius functions
-- 3. Builds modifier lists for all active skills
-- 4. Merges modifiers for all allocated passive nodes
+-- 3. Merges modifiers for all allocated passive nodes
+-- 4. Builds modifier lists for all active skills
 local function mergeMainMods(env, repSlotName, repItem)
 	local build = env.build

@@ -611,6 +611,10 @@ local function mergeMainMods(env, repSlotName, repItem)
 	end
 	mod_dbMergeList(env.modDB, env.itemModList)

+	-- Build and merge modifiers for allocated passives
+	env.specModList = buildNodeModList(env, build.spec.allocNodes, true)
+	mod_dbMergeList(env.modDB, env.specModList)
+
 	-- Build skill modifier lists
 	env.auxSkills = { }
 	for _, skill in pairs(env.skills) do
@@ -618,10 +622,6 @@ local function mergeMainMods(env, repSlotName, repItem)
 			buildSkillModList(env, skill)
 		end
 	end
-
-	-- Build and merge modifiers for allocated passives
-	env.specModList = buildNodeModList(env, build.spec.allocNodes, true)
-	mod_dbMergeList(env.modDB, env.specModList)
 end

 -- Prepare environment for calculations
@@ -1599,6 +1599,9 @@ local function performCalcs(env, output)
 		if canDeal.lightning and not getMiscVal(modDB, nil, "lightningCannotShock", false) then
 			sourceDmg = sourceDmg + output.total_lightningAvg
 		end
+		if canDeal.physical and getMiscVal(modDB, nil, "physicalCanShock", false) then
+			sourceDmg = sourceDmg + output.total_physicalAvg
+		end
 		if canDeal.fire and getMiscVal(modDB, nil, "fireCanShock", false) then
 			sourceDmg = sourceDmg + output.total_fireAvg
 		end
--- a/Modules/ModParser.lua
+++ b/Modules/ModParser.lua
@@ -234,12 +234,13 @@ local namespaceList = {
 	-- Skill types
 	["spell"] = "spell_",
 	["for spells"] = "spell_",
-	["melee"] = "melee_",
-	["with weapons"] = "weapon_",
-	["weapon"] = "weapon_",
-	["with poison"] = "poison_",
 	["with attacks"] = "attack_",
+	["for attacks"] = "attack_",
+	["weapon"] = "weapon_",
+	["with weapons"] = "weapon_",
+	["melee"] = "melee_",
 	["with melee attacks"] = "melee_",
+	["with poison"] = "poison_",
 	["projectile"] = "projectile_",
 	["area"] = "aoe_",
 	["mine"] = "mine_",
@@ -388,6 +389,7 @@ local specialModList = {
 	["cannot be ignited"] = { avoidIgnite = 100 },
 	["cannot evade enemy attacks"] = { cannotEvade = true },
 	["deal no physical damage"] = { dealNophysical = true },
+	["deal no elemental damage"] = { dealNolightning = true, dealNocold = true, dealNofire = true },
 	["your critical strikes do not deal extra damage"] = { noCritMult = true },
 	["iron will"] = { ironWill = true },
 	["adds an additional arrow"] = { attack_projectileCount = 1 },
@@ -420,6 +422,7 @@ local specialModList = {
 	["your lightning damage can freeze but not shock"] = { lightningCanFreeze = true, lightningCannotShock = true },
 	["your chaos damage can shock"] = { chaosCanShock = true },
 	["your physical damage can chill"] = { physicalCanChill = true },
+	["your physical damage can shock"] = { physicalCanShock = true },
 	["your chaos damage poisons enemies"] = { poisonChance = 100 },
 	["melee attacks cause bleeding"] = { melee_bleedChance = 100 },
 	["melee attacks poison on hit"] = { melee_poisonChance = 100 },	
--- a/README.md
+++ b/README.md
@@ -48,6 +48,9 @@ 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.0.24 - 2016/09/05
+ * Added/updated more 2.4.0 uniques
+
 ### 1.0.23 - 2016/09/03
 * Added templates for all of the new item bases (except Two-Toned Boots, because they break things)
 * Added a few more 2.4.0 uniques and added modifier ranges to some of the existing ones
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,5 @@
+VERSION[1.0.24][2016/09/05]
+ * Added/updated more 2.4.0 uniques
 VERSION[1.0.23][2016/09/03]
 * Added templates for all of the new item bases (except Two-Toned Boots, because they break things)
 * Added a few more 2.4.0 uniques and added modifier ranges to some of the existing ones
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.0.23"/>
+	<Version number="1.0.24"/>
 	<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="7ebf2b5d0d580e334023fa2ae23cc36b8d4c6f9c" name="Launch.lua" part="program"/>
 	<File sha1="cb07c8d4819eb81df9e98ab9039e0c9adf74c150" name="UpdateCheck.lua" part="program"/>
 	<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
-	<File sha1="92a72b246b8f46dadb84bf070ef83f31ae57e26a" name="changelog.txt" part="program"/>
+	<File sha1="1515bf5c45cb4ff6a3aa6e103871c2af4fd3c51e" name="changelog.txt" part="program"/>
 	<File sha1="aef7145f378d0a1d5dc6f5f2d3c08d2a1b6ef264" name="Classes/BuildListControl.lua" part="program"/>
 	<File sha1="34fdf53db3b3231ce446749227e178847b982771" name="Classes/ButtonControl.lua" part="program"/>
 	<File sha1="ffe8c54a8006cb7acc34ba5c6e50772081a0a694" name="Classes/CalcsTab.lua" part="program"/>
@@ -38,16 +38,16 @@
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="e7964ce5353a63baf04f4c38e7a1c0e9e82cc7dc" name="Modules/Build.lua" part="program"/>
 	<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="5892bbef78030566795a5dcc57a7ab76d907fae4" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="f3f4a8909da5545eacca84c6cfc4eb2d1c4cce13" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="d4439a94dda4c3d3aa23ac123ba378a35174e425" name="Modules/CalcsView.lua" part="program"/>
 	<File sha1="3fd280d8abfa60264495daad42f8ccaa92cdcd46" name="Modules/Common.lua" part="program"/>
 	<File sha1="cb25bd581587ba5b35f77ca7b245334be1e5186a" name="Modules/Data.lua" part="program"/>
 	<File sha1="6de97695b61787194e6241af8cc4da5943476a70" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="a465ad94e34ec555f549e7addfb4a9771ec58f3c" name="Modules/Main.lua" part="program"/>
-	<File sha1="cb621fc34c5166edc8222bdb8553e448bdb883a3" name="Modules/ModParser.lua" part="program"/>
+	<File sha1="ef98a3a67e3019fdaa12862ba233db2088871843" name="Modules/ModParser.lua" part="program"/>
 	<File sha1="bc49ce1b5e15da40476a9c99c4c690b323c0e7ad" name="Modules/ModTools.lua" part="program"/>
 	<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>
-	<File sha1="b719a527fafc58a478002c4261b5f7e950d3a646" name="Data/New.lua" part="program"/>
+	<File sha1="6fa99572906ac8e5f83cf5714a25abdc5c141d31" name="Data/New.lua" part="program"/>
 	<File sha1="ff7f59651abe103cbacda138210e4e2f6b35f0c2" name="Data/Rares.lua" part="program"/>
 	<File sha1="ce2d294cf8e25a8ea400bdf50e19bb09f52dc430" name="Data/Gems/act_dex.lua" part="program"/>
 	<File sha1="49850b6619f1274eb10116cbeae60aba52c5ff51" name="Data/Gems/act_int.lua" part="program"/>