Update Minions and Spectres (#1236)

* Check imported spectres for failed checks

* Export minions and remove spectres that were disabled, and fix spec

* Fix worldarea exports

* More Spectres

* Readd stupid ancestral minions

* Fix world area decription

* New ugly spectre GPT formula.  Probably wrong, but its accurate so far from what i checked

* PROPER Spectre reservation calc

* Hungry Wolf

* Fix spec

* Second Rotted Rat version

* Find matching spectre reservation for spectres like Rotted Rat and Terracotta Soldier

* Merge current dev

* Add back Ancestral Spirits

GGG pls fix

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: Blitz54

src/Classes/ImportTab.lua

@@ -705,8 +705,17 @@ function ImportTabClass:ImportItemsAndSkills(charData)
 			local spectreList = data.spectres
 			if typeLine:sub(1, 8) == "Spectre:" then
 				local spectreName = typeLine:sub(10) -- gets monster name after "Spectre: "
+				for _, property in pairs(skillData.properties) do
+					if property.name == "Reservation" and property.values and property.values[1] and property.values[1][1] then
+						-- Example: "42 [Spirit]"
+						local reservationValue = property.values[1][1]:match("(%d+)")
+						if reservationValue then
+							gemInstance.reservation = tonumber(reservationValue)
+						end
+					end
+				end
 				for id, spectre in pairs(spectreList) do
-					if spectre.name == spectreName then
+					if spectre.name == spectreName and gemInstance.reservation == spectre.spectreReservation then
 						if not isValueInArray(self.build.spectreList, id) then
 							t_insert(self.build.spectreList, id)
 						end
@@ -718,8 +727,17 @@ function ImportTabClass:ImportItemsAndSkills(charData)
 			end
 			if typeLine:sub(1, 10) == "Companion:" then
 				local companionName = typeLine:sub(12)
+				for _, property in pairs(skillData.properties) do
+					if property.name == "Reservation" and property.values and property.values[1] and property.values[1][1] then
+						-- Example: "42.3% [Spirit]"
+						local companionReservation = property.values[1][1]:match("([%d%.]+)%%?")
+						if companionReservation then
+							gemInstance.companionReservation = tonumber(companionReservation)
+						end
+					end
+				end
 				for id, spectre in pairs(spectreList) do
-					if spectre.name == companionName then
+					if spectre.name == companionName and gemInstance.companionReservation == spectre.companionReservation then
 						if not isValueInArray(self.build.beastList, id) then
 							t_insert(self.build.beastList, id)
 						end

src/Data/Minions.lua

@@ -122,6 +122,7 @@ minions["RaisedSkeletonBrute"] = {
 	skillList = {
 		"MinionMeleeStep",
 		"BoneshatterBruteMinion",
+		"ShatteringRoarSkeletalBruteMinion",
 	},
 	modList = {
 		-- MonsterNoDropsOrExperience [monster_no_drops_or_experience = 1]
@@ -185,7 +186,7 @@ minions["RaisedSkeletonFrostMage"] = {
 	},
 	skillList = {
 		"FrostBoltSkeletonMageMinion",
-		"IceBombSkeletonMageMinion",
+		"IceArmourSkeletonMageMinion",
 	},
 	modList = {
 		-- MonsterNoDropsOrExperience [monster_no_drops_or_experience = 1]
@@ -505,6 +506,8 @@ minions["UnearthBoneConstruct"] = {
 	},
 	skillList = {
 		"MinionMelee",
+		"DATTBoneConstructPlayerSummoned",
+		"GABoneConstructPlayerSummoned",
 	},
 	modList = {
 		-- MonsterNoDropsOrExperience [monster_no_drops_or_experience = 1]
@@ -586,6 +589,7 @@ minions["RavenousSwarm"] = {
 	damageSpread = 0.3,
 	attackTime = 1,
 	attackRange = 1,
+	accuracy = 1,
 	baseMovementSpeed = 24,
 	spectreReservation = 50,
 	companionReservation = 30,
@@ -611,6 +615,7 @@ minions["LivingLightning"] = {
 	damageSpread = 0.8,
 	attackTime = 1,
 	attackRange = 20,
+	accuracy = 1,
 	baseMovementSpeed = 97,
 	spectreReservation = 50,
 	companionReservation = 30,