Add new Spectres from Act4 and Interlude (#1369)

* Twilight Order Soldier

* Coconut Crab

* Guardian Turtle

* Quill Crab

* Caustic Crab

* Vile Vulture

* Twilight Order Officer

* Gargantuan Wasp

* Drowned Monsters

* Pirates

* Rest of Spectres, will pick away at skills later

* Shattering Roar + Ice Armour

Skills that were changed in 0.3

* Some skills

* More skills

* More skills 2

* Fix Warstaff not working for spectres?

---------

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

Author: Blitz54

src/Data/Global.lua

@@ -243,6 +243,7 @@ ModFlag.Fishing =	 0x0000000002000000
 ModFlag.Crossbow =	 0x0000000004000000
 ModFlag.Flail =		 0x0000000008000000
 ModFlag.Spear =		 0x0000000010000000
+ModFlag.Warstaff =	 0x0000000020000000
 -- Weapon classes
 ModFlag.WeaponMelee =0x0000000100000000
 ModFlag.WeaponRanged=0x0000000200000000

src/Data/Minions.lua

@@ -645,7 +645,7 @@ minions["ManifestWeapon"] = {
 
 minions["RavenousSwarm"] = {
 	name = "Ravenous Swarm",
-	monsterTags = { "slow_movement", "Unarmed_onhit_audio", },
+	monsterTags = { "beast", "slow_movement", "Unarmed_onhit_audio", },
 	life = 0.7,
 	baseDamageIgnoresAttackSpeed = true,
 	fireResist = 0,
@@ -660,6 +660,7 @@ minions["RavenousSwarm"] = {
 	baseMovementSpeed = 24,
 	spectreReservation = 50,
 	companionReservation = 30,
+	monsterCategory = "Beast",
 	spawnLocation = {
 	},
 	skillList = {

src/Data/SkillStatMap.lua

@@ -1211,6 +1211,9 @@ return {
 ["base_chance_to_shock_%"] = {
 	mod("EnemyShockChance", "BASE", nil),
 },
+["shock_chance_+%"] = {
+	mod("EnemyShockChance", "INC", nil),
+},
 ["active_skill_shock_chance_+%_final"] = {
 	mod("EnemyShockChance", "MORE", nil),
 },

src/Data/Skills/minion.lua

@@ -302,6 +302,88 @@ skills["BoneshatterBruteMinion"] = {
 		},
 	}
 }
+skills["ShatteringRoarSkeletalBruteMinion"] = {
+	name = "Shattering Roar",
+	hidden = true,
+	description = "Command a Skeletal Brute to use a Warcry, Intimidating nearby enemies and Consuming Freeze on enemies and allies to deal damage in an Area around them.",
+	skillTypes = { [SkillType.Warcry] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Cold] = true, [SkillType.Damage] = true, [SkillType.Cooldown] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Nova] = true, [SkillType.Minion] = true, },
+	castTime = 1,
+	qualityStats = {
+	},
+	levels = {
+		[1] = { critChance = 12, storedUses = 1, levelRequirement = 0, cooldown = 8, },
+	},
+	statSets = {
+		[1] = {
+			label = "Shattering Roar",
+			baseEffectiveness = 1.5,
+			incrementalEffectiveness = 0.25,
+			damageIncrementalEffectiveness = 0.034499999135733,
+			statDescriptionScope = "brute_warcry",
+			baseFlags = {
+				hit = true,
+				duration = true,
+				warcry = true,
+			},
+			constantStats = {
+				{ "base_skill_effect_duration", 4000 },
+				{ "active_skill_base_area_of_effect_radius", 40 },
+				{ "active_skill_base_secondary_area_of_effect_radius", 24 },
+			},
+			stats = {
+				"secondary_minimum_base_cold_damage",
+				"secondary_maximum_base_cold_damage",
+				"is_commandable_skill",
+			},
+			notMinionStat = {
+				"secondary_minimum_base_cold_damage",
+				"secondary_maximum_base_cold_damage",
+			},
+			levels = {
+				[1] = { 5, 7, statInterpolation = { 1, 1, }, actorLevel = 1, },
+				[2] = { 8, 12, statInterpolation = { 1, 1, }, actorLevel = 3.4519999027252, },
+				[3] = { 14, 21, statInterpolation = { 1, 1, }, actorLevel = 6.7670001983643, },
+				[4] = { 21, 32, statInterpolation = { 1, 1, }, actorLevel = 10.307999610901, },
+				[5] = { 31, 47, statInterpolation = { 1, 1, }, actorLevel = 14.074999809265, },
+				[6] = { 44, 66, statInterpolation = { 1, 1, }, actorLevel = 18.068000793457, },
+				[7] = { 61, 91, statInterpolation = { 1, 1, }, actorLevel = 22.287000656128, },
+				[8] = { 83, 124, statInterpolation = { 1, 1, }, actorLevel = 26.732000350952, },
+				[9] = { 112, 169, statInterpolation = { 1, 1, }, actorLevel = 31.40299987793, },
+				[10] = { 152, 228, statInterpolation = { 1, 1, }, actorLevel = 36.299999237061, },
+				[11] = { 204, 306, statInterpolation = { 1, 1, }, actorLevel = 41.423000335693, },
+				[12] = { 274, 411, statInterpolation = { 1, 1, }, actorLevel = 46.771999359131, },
+				[13] = { 368, 552, statInterpolation = { 1, 1, }, actorLevel = 52.34700012207, },
+				[14] = { 495, 743, statInterpolation = { 1, 1, }, actorLevel = 58.147998809814, },
+				[15] = { 667, 1001, statInterpolation = { 1, 1, }, actorLevel = 64.175003051758, },
+				[16] = { 902, 1353, statInterpolation = { 1, 1, }, actorLevel = 70.428001403809, },
+				[17] = { 1223, 1834, statInterpolation = { 1, 1, }, actorLevel = 76.906997680664, },
+				[18] = { 1664, 2495, statInterpolation = { 1, 1, }, actorLevel = 83.611999511719, },
+				[19] = { 2273, 3409, statInterpolation = { 1, 1, }, actorLevel = 90.542999267578, },
+				[20] = { 3119, 4678, statInterpolation = { 1, 1, }, actorLevel = 97.699996948242, },
+				[21] = { 4300, 6450, statInterpolation = { 1, 1, }, actorLevel = 105.08300018311, },
+				[22] = { 5958, 8937, statInterpolation = { 1, 1, }, actorLevel = 112.69200134277, },
+				[23] = { 8298, 12447, statInterpolation = { 1, 1, }, actorLevel = 120.52700042725, },
+				[24] = { 11619, 17429, statInterpolation = { 1, 1, }, actorLevel = 128.58799743652, },
+				[25] = { 16360, 24540, statInterpolation = { 1, 1, }, actorLevel = 136.875, },
+				[26] = { 23165, 34748, statInterpolation = { 1, 1, }, actorLevel = 145.38800048828, },
+				[27] = { 32993, 49490, statInterpolation = { 1, 1, }, actorLevel = 154.12699890137, },
+				[28] = { 47269, 70904, statInterpolation = { 1, 1, }, actorLevel = 163.09199523926, },
+				[29] = { 68133, 102200, statInterpolation = { 1, 1, }, actorLevel = 172.28300476074, },
+				[30] = { 98810, 148216, statInterpolation = { 1, 1, }, actorLevel = 181.69999694824, },
+				[31] = { 144195, 216293, statInterpolation = { 1, 1, }, actorLevel = 191.34300231934, },
+				[32] = { 211757, 317636, statInterpolation = { 1, 1, }, actorLevel = 201.21200561523, },
+				[33] = { 312967, 469450, statInterpolation = { 1, 1, }, actorLevel = 211.30700683594, },
+				[34] = { 465542, 698314, statInterpolation = { 1, 1, }, actorLevel = 221.62800598145, },
+				[35] = { 697026, 1045539, statInterpolation = { 1, 1, }, actorLevel = 232.17500305176, },
+				[36] = { 1050492, 1575738, statInterpolation = { 1, 1, }, actorLevel = 242.94799804688, },
+				[37] = { 1593726, 2390589, statInterpolation = { 1, 1, }, actorLevel = 253.94700622559, },
+				[38] = { 2434072, 3651108, statInterpolation = { 1, 1, }, actorLevel = 265.17199707031, },
+				[39] = { 3742586, 5613879, statInterpolation = { 1, 1, }, actorLevel = 276.62298583984, },
+				[40] = { 5793584, 8690377, statInterpolation = { 1, 1, }, actorLevel = 288.29998779297, },
+			},
+		},
+	}
+}
 skills["ArcSkeletonMageMinion"] = {
 	name = "Arc",
 	hidden = true,
@@ -475,47 +557,79 @@ skills["FrostBoltSkeletonMageMinion"] = {
 		},
 	}
 }
-skills["IceBombSkeletonMageMinion"] = {
-	name = "Ice Bomb",
+skills["IceArmourSkeletonMageMinion"] = {
+	name = "Ice Armour",
 	hidden = true,
-	description = "Crystallises the air into icy shards that explode outwards when they hit the ground.",
-	skillTypes = { [SkillType.Spell] = true, [SkillType.Duration] = true, [SkillType.Cold] = true, [SkillType.Minion] = true, [SkillType.Damage] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Area] = true, [SkillType.AreaSpell] = true, [SkillType.Cascadable] = true, },
-	castTime = 1.25,
+	description = "Command a Skeletal Frost Mage to target a location or Minion and apply Ice Armour to Minions in an area, reducing damage taken from Hits, causing damage to enemies that Hit them, and counting as Frozen for other effects.",
+	skillTypes = { [SkillType.Buff] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Minion] = true, [SkillType.AreaSpell] = true, },
+	castTime = 1,
 	qualityStats = {
 	},
 	levels = {
-		[1] = { critChance = 12, storedUses = 1, levelRequirement = 0, cooldown = 8, },
+		[1] = { storedUses = 1, levelRequirement = 0, cooldown = 12, },
 	},
 	statSets = {
 		[1] = {
-			label = "Ice Bomb",
-			baseEffectiveness = 5,
+			label = "Ice Armour",
+			baseEffectiveness = 0.85000002384186,
 			incrementalEffectiveness = 0.25,
-			damageIncrementalEffectiveness = 0.041499998420477,
-			statDescriptionScope = "ice_bomb",
+			damageIncrementalEffectiveness = 0.034499999135733,
+			statDescriptionScope = "apply_rimeshield",
 			baseFlags = {
 				spell = true,
 				duration = true,
 			},
 			constantStats = {
-				{ "active_skill_base_area_of_effect_radius", 26 },
-				{ "active_skill_chill_effect_+%_final", 100 },
+				{ "active_skill_base_area_of_effect_radius", 40 },
+				{ "base_skill_effect_duration", 6000 },
+				{ "rime_damage_taken_+%_final", -40 },
 			},
 			stats = {
-				"spell_minimum_base_cold_damage",
-				"spell_maximum_base_cold_damage",
+				"spell_minimum_added_cold_damage",
+				"spell_maximum_added_cold_damage",
 				"is_commandable_skill",
-				"skill_cannot_be_frozen",
-				"skill_cannot_be_electrocuted",
-				"skill_cannot_be_knocked_back",
-				"skill_cannot_be_stunned",
-			},
-			notMinionStat = {
-				"spell_minimum_base_cold_damage",
-				"spell_maximum_base_cold_damage",
 			},
 			levels = {
-				[1] = { 0.80000001192093, 1.2000000476837, statInterpolation = { 3, 3, }, actorLevel = 1, },
+				[1] = { 3, 4, statInterpolation = { 1, 1, }, actorLevel = 1, },
+				[2] = { 5, 7, statInterpolation = { 1, 1, }, actorLevel = 3.4519999027252, },
+				[3] = { 8, 12, statInterpolation = { 1, 1, }, actorLevel = 6.7670001983643, },
+				[4] = { 12, 18, statInterpolation = { 1, 1, }, actorLevel = 10.307999610901, },
+				[5] = { 18, 26, statInterpolation = { 1, 1, }, actorLevel = 14.074999809265, },
+				[6] = { 25, 37, statInterpolation = { 1, 1, }, actorLevel = 18.068000793457, },
+				[7] = { 34, 52, statInterpolation = { 1, 1, }, actorLevel = 22.287000656128, },
+				[8] = { 47, 71, statInterpolation = { 1, 1, }, actorLevel = 26.732000350952, },
+				[9] = { 64, 96, statInterpolation = { 1, 1, }, actorLevel = 31.40299987793, },
+				[10] = { 86, 129, statInterpolation = { 1, 1, }, actorLevel = 36.299999237061, },
+				[11] = { 116, 173, statInterpolation = { 1, 1, }, actorLevel = 41.423000335693, },
+				[12] = { 155, 233, statInterpolation = { 1, 1, }, actorLevel = 46.771999359131, },
+				[13] = { 209, 313, statInterpolation = { 1, 1, }, actorLevel = 52.34700012207, },
+				[14] = { 281, 421, statInterpolation = { 1, 1, }, actorLevel = 58.147998809814, },
+				[15] = { 378, 567, statInterpolation = { 1, 1, }, actorLevel = 64.175003051758, },
+				[16] = { 511, 767, statInterpolation = { 1, 1, }, actorLevel = 70.428001403809, },
+				[17] = { 693, 1039, statInterpolation = { 1, 1, }, actorLevel = 76.906997680664, },
+				[18] = { 943, 1414, statInterpolation = { 1, 1, }, actorLevel = 83.611999511719, },
+				[19] = { 1288, 1932, statInterpolation = { 1, 1, }, actorLevel = 90.542999267578, },
+				[20] = { 1767, 2651, statInterpolation = { 1, 1, }, actorLevel = 97.699996948242, },
+				[21] = { 2437, 3655, statInterpolation = { 1, 1, }, actorLevel = 105.08300018311, },
+				[22] = { 3376, 5064, statInterpolation = { 1, 1, }, actorLevel = 112.69200134277, },
+				[23] = { 4702, 7054, statInterpolation = { 1, 1, }, actorLevel = 120.52700042725, },
+				[24] = { 6584, 9877, statInterpolation = { 1, 1, }, actorLevel = 128.58799743652, },
+				[25] = { 9271, 13906, statInterpolation = { 1, 1, }, actorLevel = 136.875, },
+				[26] = { 13127, 19691, statInterpolation = { 1, 1, }, actorLevel = 145.38800048828, },
+				[27] = { 18696, 28044, statInterpolation = { 1, 1, }, actorLevel = 154.12699890137, },
+				[28] = { 26786, 40179, statInterpolation = { 1, 1, }, actorLevel = 163.09199523926, },
+				[29] = { 38609, 57913, statInterpolation = { 1, 1, }, actorLevel = 172.28300476074, },
+				[30] = { 55993, 83989, statInterpolation = { 1, 1, }, actorLevel = 181.69999694824, },
+				[31] = { 81711, 122566, statInterpolation = { 1, 1, }, actorLevel = 191.34300231934, },
+				[32] = { 119996, 179994, statInterpolation = { 1, 1, }, actorLevel = 201.21200561523, },
+				[33] = { 177348, 266022, statInterpolation = { 1, 1, }, actorLevel = 211.30700683594, },
+				[34] = { 263807, 395711, statInterpolation = { 1, 1, }, actorLevel = 221.62800598145, },
+				[35] = { 394981, 592472, statInterpolation = { 1, 1, }, actorLevel = 232.17500305176, },
+				[36] = { 595279, 892918, statInterpolation = { 1, 1, }, actorLevel = 242.94799804688, },
+				[37] = { 903112, 1354667, statInterpolation = { 1, 1, }, actorLevel = 253.94700622559, },
+				[38] = { 1379307, 2068961, statInterpolation = { 1, 1, }, actorLevel = 265.17199707031, },
+				[39] = { 2120799, 3181198, statInterpolation = { 1, 1, }, actorLevel = 276.62298583984, },
+				[40] = { 3283031, 4924547, statInterpolation = { 1, 1, }, actorLevel = 288.29998779297, },
 			},
 		},
 	}