experienceMultiplier for Spectre Reservation

Author: Blitz54

src/Data/Minions.lua

@@ -22,6 +22,7 @@ minions["RaisedZombie"] = {
 	accuracy = 1,
 	weaponType1 = "One Handed Axe",
 	limit = "ActiveZombieLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMeleeStep",
 	},
@@ -45,6 +46,7 @@ minions["SummonedRagingSpirit"] = {
 	attackRange = 12,
 	accuracy = 1,
 	limit = "ActiveRagingSpiritLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMeleeStep",
 	},
@@ -69,6 +71,7 @@ minions["RaisedSkeletonSniper"] = {
 	accuracy = 1,
 	weaponType1 = "Bow",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMeleeBow",
 		"GasShotSkeletonSniperMinion",
@@ -95,6 +98,7 @@ minions["RaisedSkeletonBrute"] = {
 	accuracy = 1,
 	weaponType1 = "Two Handed Mace",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMeleeStep",
 		"BoneshatterBruteMinion",
@@ -121,6 +125,7 @@ minions["RaisedSkeletonStormMage"] = {
 	accuracy = 1,
 	weaponType1 = "Staff",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"ArcSkeletonMageMinion",
 		"DeathStormSkeletonStormMageMinion",
@@ -147,6 +152,7 @@ minions["RaisedSkeletonFrostMage"] = {
 	accuracy = 1,
 	weaponType1 = "None",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"FrostBoltSkeletonMageMinion",
 		"IceBombSkeletonMageMinion",
@@ -173,6 +179,7 @@ minions["RaisedSkeletonCleric"] = {
 	accuracy = 1,
 	weaponType1 = "One Handed Mace",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"HealSkeletonClericMinion",
 		"ResurrectSkeletonClericMinion",
@@ -200,6 +207,7 @@ minions["RaisedSkeletonArsonist"] = {
 	accuracy = 1,
 	weaponType1 = "None",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"FireBombSkeletonMinion",
 		"DestructiveLinkSkeletonBombadierMinion",
@@ -227,6 +235,7 @@ minions["RaisedSkeletonReaver"] = {
 	weaponType1 = "One Handed Axe",
 	weaponType2 = "One Handed Axe",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMeleeStep",
 		"EnrageSkeletonReaverMinion",
@@ -254,6 +263,7 @@ minions["RaisedSkeletonWarriors"] = {
 	weaponType1 = "One Handed Sword",
 	weaponType2 = "Shield",
 	limit = "ActiveSkeletonLimit",
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMeleeStep",
 	},
@@ -280,6 +290,7 @@ minions["SummonedHellhound"] = {
 	attackTime = 0.75,
 	attackRange = 10,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMelee",
 	},
@@ -303,6 +314,7 @@ minions["AncestralSpiritTurtle"] = {
 	attackTime = 1,
 	attackRange = 15,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"ABTTTortoiseTotemBubble",
@@ -330,6 +342,7 @@ minions["AncestralSpiritHulk"] = {
 	attackTime = 1,
 	attackRange = 14,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"DTTAncestralJadeHulkLeapSlam",
@@ -357,6 +370,7 @@ minions["AncestralSpiritCaster"] = {
 	attackTime = 1,
 	attackRange = 14,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"MPSAncestralTotemSpiritSoulCasterProjectile",
@@ -384,6 +398,7 @@ minions["AncestralSpiritWarhorn"] = {
 	attackTime = 1,
 	attackRange = 27,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"EGTotemSpiritJadeHornBlow",
@@ -407,6 +422,7 @@ minions["UnearthBoneConstruct"] = {
 	attackTime = 1.06,
 	attackRange = 12,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMelee",
 	},
@@ -431,6 +447,7 @@ minions["SummonedRhoa"] = {
 	attackTime = 1.23,
 	attackRange = 16,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMelee",
 	},
@@ -454,6 +471,7 @@ minions["ManifestWeapon"] = {
 	attackTime = 1,
 	attackRange = 10,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MinionMelee",
 		"GAAnimateWeaponMaceSlam",

src/Data/Spectres.lua

@@ -23,6 +23,7 @@ minions["Metadata/Monsters/LeagueHellscape/PaleFaction/HellscapePaleElite1_"] =
 	attackRange = 9,
 	accuracy = 1,
 	weaponType1 = "None",
+	experienceMultiplier = 2.35,
 	skillList = {
 		"TBHellscapePaleLightningBoltSpammableLeft",
 		"TBHellscapePaleLightningBoltSpammableRight",
@@ -50,6 +51,7 @@ minions["Metadata/Monsters/LeagueHellscape/PaleFaction/HellscapePaleElite2__"] =
 	attackRange = 18,
 	accuracy = 1,
 	weaponType1 = "None",
+	experienceMultiplier = 2.25,
 	skillList = {
 		"DTTHellscapeStabbySkyStab",
 		"DTTHellscapeStabWeb",
@@ -82,6 +84,7 @@ minions["Metadata/Monsters/GoreCharger/GoreCharger"] = {
 	attackTime = 1.065,
 	attackRange = 13,
 	accuracy = 1,
+	experienceMultiplier = 1.7,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"GoreChargerCharge",
@@ -106,6 +109,7 @@ minions["Metadata/Monsters/Sanctified/Monstrosity/SanctifiedMonstrosity"] = {
 	attackTime = 1.5,
 	attackRange = 28,
 	accuracy = 1,
+	experienceMultiplier = 3.5,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"MPWCleansedMonstrosityRailgun",
@@ -132,6 +136,7 @@ minions["Metadata/Monsters/BoneCultists/BoneCultists_Beast/BoneCultistBeast"] =
 	attackTime = 1.665,
 	attackRange = 19,
 	accuracy = 1,
+	experienceMultiplier = 2.5,
 	skillList = {
 		"MeleeAtAnimationSpeedComboTEMP",
 		"CultistBeastSunder",
@@ -140,7 +145,7 @@ minions["Metadata/Monsters/BoneCultists/BoneCultists_Beast/BoneCultistBeast"] =
 	},
 }
 
--- Filthy Firstborn
+-- Filthy First-born
 minions["Metadata/Monsters/Cenobite/CenobiteBloater/CenobiteBloater"] = {
 	name = "Filthy First-born",
 	monsterTags = { "allows_inc_aoe", "humanoid", "melee", "monster_has_on_death_mechanic", "MonsterBlunt_onhit_audio", "no_minion_revival", "not_dex", "not_int", "physical_affinity", "red_blood", "very_slow_movement", },
@@ -157,6 +162,7 @@ minions["Metadata/Monsters/Cenobite/CenobiteBloater/CenobiteBloater"] = {
 	attackRange = 14,
 	accuracy = 1,
 	weaponType1 = "Two Handed Mace",
+	experienceMultiplier = 2.5,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"GSCenobiteBloaterOnDeath",
@@ -182,6 +188,7 @@ minions["Metadata/Monsters/TwoheadedTitan/TwoHeadedTitan"] = {
 	attackTime = 1.5,
 	attackRange = 20,
 	accuracy = 1,
+	experienceMultiplier = 2.5,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"GATwoHeadedTitanSlam",
@@ -207,6 +214,7 @@ minions["Metadata/Monsters/EtchedBeetles/MediumEtchedBeetleArmouredDull"] = {
 	attackTime = 1.5,
 	attackRange = 12,
 	accuracy = 1,
+	experienceMultiplier = 1.5,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"GAMediumBeetleChargedSunder",
@@ -232,6 +240,7 @@ minions["Metadata/Monsters/VaalConstructs/Sentinel/VaalConstructSentinel"] = {
 	attackTime = 1.5,
 	attackRange = 13,
 	accuracy = 1,
+	experienceMultiplier = 2.5,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"GAVaalConstructSentinelGroundSlam",
@@ -262,6 +271,7 @@ minions["Metadata/Monsters/TerracottaGuardians/TerracottaGuardianSceptre"] = {
 	attackRange = 12,
 	accuracy = 1,
 	weaponType1 = "One Handed Mace",
+	experienceMultiplier = 1.1,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"EGTerracottaTransitionSideways",
@@ -270,6 +280,29 @@ minions["Metadata/Monsters/TerracottaGuardians/TerracottaGuardianSceptre"] = {
 	modList = {
 	},
 }
+minions["Metadata/Monsters/TerracottaGuardians/TerracottaGuardianSceptreAmbush__"] = {
+	name = "Terracotta Soldier",
+	monsterTags = { "1HBluntMetal_onhit_audio", "construct", "melee", "not_dex", "not_int", "physical_affinity", "very_slow_movement", },
+	life = 0.99,
+	baseDamageIgnoresAttackSpeed = true,
+	armour = 0.5,
+	fireResist = 0,
+	coldResist = 30,
+	lightningResist = 0,
+	chaosResist = 0,
+	damage = 0.88,
+	damageSpread = 0.2,
+	attackTime = 1.17,
+	attackRange = 12,
+	accuracy = 1,
+	weaponType1 = "One Handed Mace",
+	experienceMultiplier = 0.22,
+	skillList = {
+		"MeleeAtAnimationSpeed",
+	},
+	modList = {
+	},
+}
 
 -- Quadrilla
 minions["Metadata/Monsters/Quadrilla/Quadrilla"] = {
@@ -287,6 +320,7 @@ minions["Metadata/Monsters/Quadrilla/Quadrilla"] = {
 	attackTime = 1.995,
 	attackRange = 21,
 	accuracy = 1,
+	experienceMultiplier = 2,
 	skillList = {
 		"GAQuadrillaSunder",
 		"EAAQuadrillaThrow",
@@ -317,6 +351,7 @@ minions["Metadata/Monsters/VaalMonsters/Living/VaalGuardMortarLiving"] = {
 	attackTime = 1.5,
 	attackRange = 10,
 	accuracy = 1,
+	experienceMultiplier = 1,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"MMSVaalGuardGrenade",
@@ -345,6 +380,7 @@ minions["Metadata/Monsters/VaalMonsters/Living/BloodPriests/VaalBloodPriestMale"
 	attackRange = 12,
 	accuracy = 1,
 	weaponType1 = "Dagger",
+	experienceMultiplier = 2,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"VaalBloodPriestExsanguinate",
@@ -374,6 +410,7 @@ minions["Metadata/Monsters/VaalMonsters/Living/BloodPriests/VaalBloodPriestFemal
 	attackRange = 12,
 	accuracy = 1,
 	weaponType1 = "Dagger",
+	experienceMultiplier = 2,
 	skillList = {
 		"MeleeAtAnimationSpeed",
 		"VaalBloodPriestSoulrend",

src/Export/Minions/Spectres.txt

@@ -35,6 +35,7 @@ local minions, mod, flag = ...
 
 --Terracotta Soldier
 #spectre Metadata/Monsters/TerracottaGuardians/TerracottaGuardianSceptre
+#spectre Metadata/Monsters/TerracottaGuardians/TerracottaGuardianSceptreAmbush__
 
 -- Quadrilla
 #spectre Metadata/Monsters/Quadrilla/Quadrilla

src/Export/Scripts/minions.lua

@@ -153,6 +153,9 @@ directiveTable.emit = function(state, args, out)
 	if state.limit then
 		out:write('\tlimit = "', state.limit, '",\n')
 	end
+	if monsterVariety.ExperienceMultiplier then
+		out:write('\texperienceMultiplier = ', (monsterVariety.ExperienceMultiplier / 100), ',\n')
+	end
 	out:write('\tskillList = {\n')
 	for _, grantedEffect in ipairs(monsterVariety.GrantedEffects) do
 		out:write('\t\t"', grantedEffect.Id, '",\n')

src/Modules/CalcActiveSkill.lua

@@ -551,7 +551,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 			end
 			if level.spiritReservationFlat then
 				skillModList:NewMod("ExtraSpirit", "BASE", level.spiritReservationFlat, skillEffect.grantedEffect.modSource)
-			end	
+			end
 			-- Handle multiple triggers situation and if triggered by a trigger skill save a reference to the trigger.
 			local match = skillEffect.grantedEffect.addSkillTypes and (not skillFlags.disable)
 			if match and skillEffect.grantedEffect.isTrigger then

src/Modules/CalcDefence.lua

@@ -234,7 +234,13 @@ function calcs.doActorLifeManaSpiritReservation(actor)
 					local minionFreeSpiritCount = skillModList:Sum("BASE", skillCfg, "MinionFreeSpiritCount")
 					values.reservedFlat = values.reservedFlat * mult * m_max(activeSkillCount - minionFreeSpiritCount, 0)
 				end
-				
+				if activeSkill.skillCfg.skillName == "Spectre: {0} " then
+					local xpMult = 1
+					if activeSkill.minion and activeSkill.minion.minionData and activeSkill.minion.minionData.experienceMultiplier then
+						xpMult = activeSkill.minion.minionData.experienceMultiplier
+					end
+					values.reservedFlat = round(values.reservedFlat * mult * m_max(xpMult, 0) / 10) * 10
+				end
 				if activeSkill.skillTypes[SkillType.IsBlasphemy] and activeSkill.activeEffect.srcInstance.supportEffect and activeSkill.activeEffect.srcInstance.supportEffect.isSupporting then
 					-- Sadly no better way to get key/val table element count in lua.
 					local instances = 0