Merge remote-tracking branch 'origin/dev' into dev

src/Data/SkillStatMap.lua

@@ -154,10 +154,10 @@ return {
 	mod("BuffEffect", "INC", nil)
 },
 ["base_skill_reserve_life_instead_of_mana"] = {
-	flag("SkillBloodMagic"),
+	flag("BloodMagicReserved"),
 },
 ["base_skill_cost_life_instead_of_mana"] = {
-	flag("SkillBloodMagic"),
+	flag("BloodMagicCost"),
 },
 ["base_active_skill_totem_level"] = {
 	skill("totemLevel", nil),

src/Data/Skills/other.lua

@@ -2851,9 +2851,6 @@ skills["VampiricIcon"] = {
 		["vampiric_icon_bleeding_damage_+%_final"] = {
 			mod("Damage", "MORE", nil, 0, KeywordFlag.Bleed, { type = "GlobalEffect", effectType = "Buff" }),
 		},
-		["base_use_life_in_place_of_mana"] = {
-			flag("SkillBloodMagic"),
-		},
 	},
 	baseFlags = {
 		spell = true,

src/Export/Skills/other.txt

@@ -726,9 +726,6 @@ local skills, mod, flag, skill = ...
 		["vampiric_icon_bleeding_damage_+%_final"] = {
 			mod("Damage", "MORE", nil, 0, KeywordFlag.Bleed, { type = "GlobalEffect", effectType = "Buff" }),
 		},
-		["base_use_life_in_place_of_mana"] = {
-			flag("SkillBloodMagic"),
-		},
 	},
 #mods 
 

src/Modules/CalcPerform.lua

@@ -1334,7 +1334,7 @@ function calcs.perform(env, avoidCache)
 			pool.Mana.basePercent = activeSkill.skillData.manaReservationPercent or activeSkill.activeEffect.grantedEffectLevel.manaReservationPercent or 0
 			pool.Life.baseFlat = activeSkill.skillData.lifeReservationFlat or activeSkill.activeEffect.grantedEffectLevel.lifeReservationFlat or 0
 			pool.Life.basePercent = activeSkill.skillData.lifeReservationPercent or activeSkill.activeEffect.grantedEffectLevel.lifeReservationPercent or 0
-			if skillModList:Flag(skillCfg, "BloodMagic", "SkillBloodMagic") then
+			if skillModList:Flag(skillCfg, "BloodMagicReserved") then
 				pool.Life.baseFlat = pool.Life.baseFlat + pool.Mana.baseFlat
 				pool.Mana.baseFlat = 0
 				pool.Life.basePercent = pool.Life.basePercent + pool.Mana.basePercent

src/Modules/ModParser.lua

@@ -1386,8 +1386,8 @@ local specialModList = {
 	} end,
 	["removes all mana%. spend life instead of mana for skills"] = { mod("Mana", "MORE", -100), flag("BloodMagic") },
 	["removes all mana"] = { mod("Mana", "MORE", -100) },
-	["skills cost life instead of mana"] = { flag("BloodMagic") },
-	["skills reserve life instead of mana"] = { },
+	["skills cost life instead of mana"] = { flag("BloodMagicCost") },
+	["skills reserve life instead of mana"] = { flag("BloodMagicReserved") },
 	["spend life instead of mana for effects of skills"] = { },
 	["skills cost %+(%d+) rage"] = function(num) return { mod("RageCostBase", "BASE", num) } end,
 	["enemies you hit with elemental damage temporarily get (%+%d+)%% resistance to those elements and (%-%d+)%% resistance to other elements"] = function(plus, _, minus)