Add some Spectres, enable library, and add calcs for reservation

src/Classes/CalcsTab.lua

@@ -104,18 +104,36 @@ local CalcsTabClass = newClass("CalcsTab", "UndoHandler", "ControlHost", "Contro
 			control = new("DropDownControl", nil, {0, 0, 160, 16}, nil, function(index, value)
 				local mainSocketGroup = self.build.skillsTab.socketGroupList[self.input.skill_number]
 				local srcInstance = mainSocketGroup.displaySkillListCalcs[mainSocketGroup.mainActiveSkillCalcs].activeEffect.srcInstance
+				-- Synchronize DropDownControl between CalcActiveSkill and skillMinionCalcs
 				if value.itemSetId then
 					srcInstance.skillMinionItemSetCalcs = value.itemSetId
+					srcInstance.skillMinionItemSet = value.itemSetId
+					if srcInstance.nameSpec:match("^Spectre:") then
+						srcInstance.nameSpec = "Spectre: ".. value.label
+					elseif srcInstance.nameSpec:match("^Companion:") then
+						srcInstance.nameSpec = "Companion: ".. value.label
+					end
 				else
 					srcInstance.skillMinionCalcs = value.minionId
+					srcInstance.skillMinion = value.minionId
+					if srcInstance.nameSpec:match("^Spectre:") then
+						srcInstance.nameSpec = "Spectre: ".. value.label
+					elseif srcInstance.nameSpec:match("^Companion:") then
+						srcInstance.nameSpec = "Companion: ".. value.label
+					end
 				end
 				self:AddUndoState()
 				self.build.buildFlag = true
 			end)
 		} },
 		{ label = "Spectre Library", flag = "spectre", { controlName = "mainSkillMinionLibrary",
 			control = new("ButtonControl", nil, {0, 0, 100, 16}, "Manage Spectres...", function()
-				self.build:OpenSpectreLibrary()
+				self.build:OpenSpectreLibrary("spectre")
+			end)
+		} },
+		{ label = "Beast Library", flag = "summonBeast", { controlName = "mainSkillBeastLibrary",
+			control = new("ButtonControl", nil, {0, 0, 100, 16}, "Manage Beasts...", function()
+			self.build:OpenSpectreLibrary("beast")
 			end)
 		} },
 		{ label = "Minion Skill", flag = "haveMinion", { controlName = "mainSkillMinionSkill",

src/Classes/GemSelectControl.lua

@@ -529,7 +529,11 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 	local grantedEffect = gemInstance.gemData.grantedEffect
 	local additionalEffects = gemInstance.gemData.additionalGrantedEffects
 
-	self.tooltip:AddLine(20, colorCodes.GEM .. grantedEffect.name)
+	if grantedEffect.name:match("^Spectre:") or grantedEffect.name:match("^Companion:") then
+		self.tooltip:AddLine(20, colorCodes.GEM .. (gemInstance.displayEffect and gemInstance.displayEffect.nameSpec or gemInstance.gemData.name))	
+	else
+		self.tooltip:AddLine(20, colorCodes.GEM .. grantedEffect.name)
+	end
 	self.tooltip:AddSeparator(10)
 	self.tooltip:AddLine(18, colorCodes.NORMAL .. gemInstance.gemData.gemType)
 	if gemInstance.gemData.tagString ~= "" then
@@ -592,9 +596,19 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
 			self.tooltip:AddLine(16, string)
 		end
 	else
+		if gemInstance.skillMinion then
+			if gemInstance.nameSpec:match("^Spectre:") then
+				grantedEffectLevel.spiritReservationFlat = data.spectres[gemInstance.skillMinion].spectreReservation
+			elseif gemInstance.nameSpec:match("^Companion:") then
+				grantedEffectLevel.spiritReservationPercent = data.spectres[gemInstance.skillMinion].companionReservation
+			end
+		end
 		if grantedEffectLevel.spiritReservationFlat then
 			self.tooltip:AddLine(16, string.format("^x7F7F7FReservation: ^7%d Spirit", grantedEffectLevel.spiritReservationFlat))
 		end
+		if grantedEffectLevel.spiritReservationPercent then
+			self.tooltip:AddLine(16, string.format("^x7F7F7FReservation: ^7%.1f%% Spirit", grantedEffectLevel.spiritReservationPercent))
+		end
 		local cost
 		for _, res in ipairs(self.costs) do
 			if grantedEffectLevel.cost and grantedEffectLevel.cost[res.Resource] then

src/Classes/ImportTab.lua

@@ -691,12 +691,47 @@ function ImportTabClass:ImportItemsAndSkills(charData)
 	local funcGetGemInstance = function(skillData)
 		local typeLine = sanitiseText(skillData.typeLine) .. (skillData.support and " Support" or "")
 		local gemId = self.build.data.gemForBaseName[typeLine:lower()]
+
+		if typeLine:match("^Spectre:") then
+			gemId = "Metadata/Items/Gems/SkillGemSummonSpectre"
+		end		
+		if typeLine:match("^Companion:") then
+			gemId = "Metadata/Items/Gems/SkillGemSummonBeast"
+		end
 
 		if gemId then
 			local gemInstance = { level = 20, quality = 0, enabled = true, enableGlobal1 = true, enableGlobal2 = true, count = 1,  gemId = gemId }
-			gemInstance.nameSpec = self.build.data.gems[gemId].name
 			gemInstance.support = skillData.support
 
+			local spectreList = data.spectres
+			if typeLine:sub(1, 8) == "Spectre:" then
+				local spectreName = typeLine:sub(10) -- gets monster name after "Spectre: "
+				for id, spectre in pairs(spectreList) do
+					if spectre.name == spectreName then
+						if not isValueInArray(self.build.spectreList, id) then
+							t_insert(self.build.spectreList, id)
+						end
+						gemInstance.skillMinion = id -- Sets imported minion in dropdown on left
+						gemInstance.skillMinionCalcs = id-- Sets imported minion in dropdown in calcs tab
+						break
+					end
+				end
+			end
+			if typeLine:sub(1, 10) == "Companion:" then
+				local companionName = typeLine:sub(12)
+				for id, spectre in pairs(spectreList) do
+					if spectre.name == companionName then
+						if not isValueInArray(self.build.beastList, id) then
+							t_insert(self.build.beastList, id)
+						end
+						gemInstance.skillMinion = id
+						gemInstance.skillMinionCalcs = id
+						break
+					end
+				end
+			end
+
+			gemInstance.nameSpec = self.build.data.gems[gemId].name
 			for _, property in pairs(skillData.properties) do
 				if property.name == "Level" then
 					gemInstance.level = tonumber(property.values[1][1]:match("%d+"))

src/Classes/MinionListControl.lua

@@ -7,28 +7,29 @@ local ipairs = ipairs
 local t_insert = table.insert
 local t_remove = table.remove
 local s_format = string.format
+local m_max = math.max
 
-local MinionListClass = newClass("MinionListControl", "ListControl", function(self, anchor, rect, data, list, dest)
+local MinionListClass = newClass("MinionListControl", "ListControl", function(self, anchor, rect, data, list, dest, label)
 	self.ListControl(anchor, rect, 16, "VERTICAL", not dest, list)
 	self.data = data
 	self.dest = dest
 	if dest then
-		self.dragTargetList = { dest }
-		self.label = "^7Available Spectres:"
-		self.controls.add = new("ButtonControl", {"BOTTOMRIGHT",self,"TOPRIGHT"}, {0, -2, 60, 18}, "Add", function()
-			self:AddSel()
-		end)
-		self.controls.add.enabled = function()
-			return self.selValue ~= nil and not isValueInArray(dest.list, self.selValue)
-		end
+    	self.dragTargetList = { dest }
+    	self.label = label or "^7Available Spectres:"
+    	self.controls.add = new("ButtonControl", {"BOTTOMRIGHT",self,"TOPRIGHT"}, {0, -2, 60, 18}, "Add", function()
+    	    self:AddSel()
+    	end)
+    	self.controls.add.enabled = function()
+        	return self.selValue ~= nil and not isValueInArray(dest.list, self.selValue)
+    	end
 	else
-		self.label = "^7Spectres in Build:"
-		self.controls.delete = new("ButtonControl", {"BOTTOMRIGHT",self,"TOPRIGHT"}, {0, -2, 60, 18}, "Remove", function()
-			self:OnSelDelete(self.selIndex, self.selValue)
-		end)
-		self.controls.delete.enabled = function()
-			return self.selValue ~= nil
-		end
+    	self.label = label or "^7Spectres in Build:"
+    	self.controls.delete = new("ButtonControl", {"BOTTOMRIGHT",self,"TOPRIGHT"}, {0, -2, 60, 18}, "Remove", function()
+    	    self:OnSelDelete(self.selIndex, self.selValue)
+    	end)
+    	self.controls.delete.enabled = function()
+    	    return self.selValue ~= nil
+    	end
 	end
 end)
 
@@ -49,6 +50,16 @@ function MinionListClass:AddValueTooltip(tooltip, index, minionId)
 	if tooltip:CheckForUpdate(minionId) then
 		local minion = self.data.minions[minionId]
 		tooltip:AddLine(18, "^7"..minion.name)
+		if #minion.spawnLocation > 0 then
+			local coloredLocations = {}
+			for _, location in ipairs(minion.spawnLocation) do
+				table.insert(coloredLocations, colorCodes.RELIC .. location)
+			end
+			tooltip:AddLine(14, s_format("^7Spawn: %s", table.concat(coloredLocations, ", ")))
+		end
+		tooltip:AddLine(14, s_format("^7Spectre Reservation: %s%d", colorCodes.SPIRIT, tostring(minion.spectreReservation)))
+		tooltip:AddLine(14, s_format("^7Companion Reservation: %s%s%%", colorCodes.SPIRIT, tostring(minion.companionReservation)))
+		tooltip:AddLine(14, "^7Category: "..minion.monsterCategory)
 		tooltip:AddLine(14, s_format("^7Life Multiplier: x%.2f", minion.life))
 		if minion.energyShield then
 			tooltip:AddLine(14, s_format("^7Energy Shield: %d%% of base Life", minion.energyShield * 100))

src/Classes/MinionSearchListControl.lua

@@ -8,12 +8,12 @@ local t_insert = table.insert
 local t_remove = table.remove
 local s_format = string.format
 
-local MinionSearchListClass = newClass("MinionSearchListControl", "MinionListControl", function(self, anchor, rect, data, list, dest)
-	self.MinionListControl(anchor, rect, data, list, dest)	
+local MinionSearchListClass = newClass("MinionSearchListControl", "MinionListControl", function(self, anchor, rect, data, list, dest, label)
+	self.MinionListControl(anchor, rect, data, list, dest, label)	
 	self.unfilteredList = copyTable(list)
 	self.isMutable = false
 
-	self.controls.searchText = new("EditControl", {"BOTTOMLEFT",self,"TOPLEFT"}, {0, -2, 128, 18}, "", "Search", "%c", 100, function(buf)
+	self.controls.searchText = new("EditControl", {"BOTTOMLEFT",self,"TOPLEFT"}, {0, -2, 148, 18}, "", "Search", "%c", 100, function(buf)
 		self:ListFilterChanged(buf, self.controls.searchModeDropDown.selIndex)
 	end, nil, nil, true)	
 

src/Classes/SkillsTab.lua

@@ -303,7 +303,9 @@ function SkillsTabClass:LoadSkill(node, skillSetId)
 			if gemData then
 				gemInstance.gemId = gemData.id
 				gemInstance.skillId = gemData.grantedEffectId
-				gemInstance.nameSpec = gemData.nameSpec
+				if gemData.nameSpec then
+					gemInstance.nameSpec = gemData.nameSpec
+				end
 			end
 		elseif child.attrib.skillId then
 			local grantedEffect = self.build.data.skills[child.attrib.skillId]
@@ -1028,7 +1030,11 @@ function SkillsTabClass:ProcessSocketGroup(socketGroup)
 			gemInstance.errMsg = nil
 			gemInstance.gemData = data.gems[gemInstance.gemId]
 			if gemInstance.gemData then
-				gemInstance.nameSpec = gemInstance.gemData.name
+				if gemInstance.nameSpec:match("^Companion:") or gemInstance.nameSpec:match("^Spectre:") then
+					gemInstance.nameSpec = gemInstance.nameSpec
+				else
+					gemInstance.nameSpec = gemInstance.gemData.name
+				end
 				gemInstance.skillId = gemInstance.gemData.grantedEffectId
 			end
 		elseif gemInstance.skillId then
@@ -1155,7 +1161,7 @@ function SkillsTabClass:AddSocketGroupTooltip(tooltip, socketGroup)
 			tooltip:AddLine(16, "^7Active Skill #" .. index .. "'s Main Minion Skill:")
 			local activeEffect = activeSkill.minion.mainSkill.effectList[1]
 			tooltip:AddLine(20, string.format("%s%s ^7%d/%d",
-				data.skillColorMap[activeEffect.grantedEffect.color],
+				data.skillColorMap[activeEffect.grantedEffect.color] or colorCodes.NORMAL,
 				activeEffect.grantedEffect.name,
 				activeEffect.level,
 				activeEffect.quality

src/Classes/Tooltip.lua

@@ -241,6 +241,6 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
 	end
 	DrawImage(nil, ttX, ttY, ttW * columns, BORDER_WIDTH) -- top border
 	DrawImage(nil, ttX, ttY + maxColumnHeight - BORDER_WIDTH, ttW * columns, BORDER_WIDTH) -- bottom border
-
+	SetDrawColor(1, 1, 1) -- Reset draw color to white as it messes with Spectre Library
 	return ttW, ttH
 end