Knight buff as well as the EMP buff.

 * EMP damage 600 -> 750

Implemented overstun for disarm and for the disarm-emp interaction.
Removed the missing health multiplier from EMP award. Eg a unit shooting at a unit on 5% health would be awarded 20x the emp damage.

Author: GoogleFrog

LuaRules/Gadgets/awards.lua

@@ -428,9 +428,8 @@ function gadget:UnitDamaged(unitID, unitDefID, unitTeam, damage, paralyzer, weap
 	local costdamage = (damage / maxHP) * GetUnitCost(unitID, unitDefID)
 
 	if not spAreTeamsAllied(attackerTeam, unitTeam) then
-		if paralyzer then
-			AddAwardPoints( 'emp', attackerTeam, costdamage )
-		elseif attackerDefID then
+		if attackerDefID and not paralyzer then
+			-- Paralysis gadget adds emp award
 			if unitDefID == chickenflyerqueenDefID or unitDefID == chickenlandqueenDefID then
 				AddAwardPoints( 'heart', attackerTeam, damage )
 			end

LuaRules/Gadgets/unit_boolean_disable.lua

@@ -41,11 +41,15 @@ for wid = 1, #WeaponDefs do
 			damageMult = wcp.disarmdamagemult,
 			normalDamage = 1 - (wcp.disarmdamageonly or 0),
 			disarmTimer = wcp.disarmtimer*FRAMES_PER_SECOND,
+			overstunTime = wcp.overstun_time*FRAMES_PER_SECOND,
 		}
 		wantedWeaponList[#wantedWeaponList + 1] = wid
 	elseif wd.paralyzer or wd.customParams.extra_damage then
 		local paraTime = wd.paralyzer and wd.customParams.emp_paratime or wd.customParams.extra_paratime
-		paraWeapons[wid] = paraTime * FRAMES_PER_SECOND
+		paraWeapons[wid] = {
+			empTime = paraTime * FRAMES_PER_SECOND,
+			overstunTime = wcp.overstun_time*FRAMES_PER_SECOND,
+		}
 		wantedWeaponList[#wantedWeaponList + 1] = wid
 	end
 	if wd.customParams and wd.customParams.overstun_damage_mult then
@@ -128,7 +132,7 @@ local function moveUnitID(unitID, byFrame, byUnitID, frame, extraParamFrames)
 	Spring.SetUnitRulesParam(unitID, "disarmframe", frame + extraParamFrames, LOS_ACCESS)
 end
 
-local function addParalysisDamageToUnit(unitID, damage, pTime, overstunMult)
+local function addParalysisDamageToUnit(unitID, damage, pTime, overstunTime, overstunMult)
 	local health, maxHealth, paralyzeDamage = Spring.GetUnitHealth(unitID)
 	if partialUnitID[unitID] then -- if the unit is partially paralysed
 		local extraTime = math.floor(damage/health*DECAY_FRAMES) -- time that the damage would add
@@ -152,6 +156,10 @@ local function addParalysisDamageToUnit(unitID, damage, pTime, overstunMult)
 		local newPara = paraUnitID[unitID].frameID
 		if (not pTime) or pTime > newPara - f then -- if the para time on the unit is less than this weapons para timer
 			newPara = newPara + extraTime
+			if overstunTime and overstunTime > 0 then
+				-- Overstun allows units to extend the stun near their stun threshold, usally by 1 second.
+				pTime = math.max(pTime, math.min(pTime, paraUnitID[unitID].frameID - f) + overstunTime)
+			end
 			if pTime and pTime < newPara - f then -- prevent going over para time
 				newPara = math.floor(pTime) + f
 			end
@@ -214,7 +222,7 @@ function gadget:UnitPreDamaged(unitID, unitDefID, unitTeam, damage, paralyzer,
 
 	if disarmWeapons[weaponDefID] then
 		local def = disarmWeapons[weaponDefID]
-		addParalysisDamageToUnit(unitID, damage*def.damageMult, def.disarmTimer, overstunDamageMult[weaponDefID])
+		addParalysisDamageToUnit(unitID, damage*def.damageMult, def.disarmTimer, def.overstunTime, overstunDamageMult[weaponDefID])
 
 		if GG.Awards and GG.Awards.AddAwardPoints then
 			local _, maxHP = Spring.GetUnitHealth(unitID)
@@ -226,7 +234,8 @@ function gadget:UnitPreDamaged(unitID, unitDefID, unitTeam, damage, paralyzer,
 	end
 
 	if paralyzer and (partialUnitID[unitID] or paraUnitID[unitID]) then
-		addParalysisDamageToUnit(unitID, damage, paraWeapons[weaponDefID], overstunDamageMult[weaponDefID])
+		local def = paraWeapons[weaponDefID]
+		addParalysisDamageToUnit(unitID, damage, def.empTime, def.overstunTime, overstunDamageMult[weaponDefID])
 	end
 	return damage
 end

LuaRules/Gadgets/unit_paralysis_damage.lua

@@ -22,6 +22,7 @@ end
 local spGetUnitHealth    = Spring.GetUnitHealth
 local spGetUnitArmored   = Spring.GetUnitArmored
 local spAddUnitDamage    = Spring.AddUnitDamage
+local GetUnitCost        = Spring.Utilities.GetUnitCost
 
 local DECAY_SECONDS = 40 -- how long it takes to decay 100% para to 0
 
@@ -82,21 +83,25 @@ local function GetStunDamage(weaponDefID, damage, health, maxHealth, paralyzeDam
 	return damageGap + (rawDamage - damageGap)*overstunDamageMult[weaponDefID]
 end
 
-function gadget:UnitPreDamaged(unitID, unitDefID, unitTeam, damage, paralyzer,
+function gadget:UnitPreDamaged(unitID, unitDefID, unitTeam, rawDamage, paralyzer,
                                weaponDefID, attackerID, attackerDefID, attackerTeam)
 	if paralyzer then -- the weapon deals paralysis damage
 		local health, maxHealth, paralyzeDamage = spGetUnitHealth(unitID)
 		if health and maxHealth and health > 0 then -- taking no chances.
-			local damage = GetStunDamage(weaponDefID, damage, health, maxHealth, paralyzeDamage)
+			if GG.Awards and GG.Awards.AddAwardPoints then
+				local cost_emped = (rawDamage / maxHealth) * GetUnitCost(unitID)
+				GG.Awards.AddAwardPoints('emp', attackerTeam, cost_emped)
+			end
+			local damage = GetStunDamage(weaponDefID, rawDamage, health, maxHealth, paralyzeDamage)
 			if overstunTime[weaponDefID] > 0 then
-				-- Overstun allows units to stun for an addition time (usually 1 second) if the current stun time on the unit is within that range.
+				-- Overstun allows units to extend the stun near their stun threshold, usally by 1 second.
 				local currentStunTime = (paralyzeDamage/maxHealth - 1) * DECAY_SECONDS
 				local maxTime = math.max(paraTime[weaponDefID], math.min(paraTime[weaponDefID], currentStunTime) + overstunTime[weaponDefID])
 				-- Solve the following for damage to limit damage by stun time:
 				--   stun time = ((damage + paralyzeDamage)/maxHealth - 1) * DECAY_SECONDS
-				damage = (maxTime/DECAY_SECONDS + 1)*maxHealth - paralyzeDamage
+				damage = math.min(damage, (maxTime/DECAY_SECONDS + 1)*maxHealth - paralyzeDamage)
 			end
-			--Spring.Echo("damage", damage, ((damage + paralyzeDamage)/maxHealth - 1) * DECAY_SECONDS, paralyzeDamage, math.random())
+			--Spring.Echo("damage", damage, ((damage + paralyzeDamage)/maxHealth - 1) * DECAY_SECONDS, paralyzeDamage, WeaponDefs[weaponDefID].damages.paralyzeDamageTime, math.random())
 			return damage
 		end
 	end

units/cloakassault.lua

@@ -76,7 +76,7 @@ return { cloakassault = {
       craterMult              = 0,
 
       customParams            = {
-        extra_damage = 600,
+        extra_damage = 750,
 
         light_camera_height = 1600,
         light_color = [[0.85 0.85 1.2]],