Sound Balance #3

LuaRules/Configs/area_damage_defs.lua

@@ -20,6 +20,7 @@ for id, data in pairs(WeaponDefs) do
 				damage = tonumber(cp.area_damage_dps)*damageUpdateRate/30,
 				radius = tonumber(cp.area_damage_radius),
 				plateauRadius = tonumber(cp.area_damage_plateau_radius),
+				plateauFall = tonumber(cp.area_damage_plateau_fall),
 				impulse = (cp.area_damage_is_impulse == "1"),
 				slow = (cp.area_damage_is_slow == "1"),
 				duration = tonumber(cp.area_damage_duration) * 30,

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/game_lagmonitor.lua

@@ -46,6 +46,7 @@ local spGiveOrderToUnitArray  = Spring.GiveOrderToUnitArray
 local spGetUnitCurrentCommand = Spring.GetUnitCurrentCommand
 
 local useAfkDetection = (Spring.GetModOptions().enablelagmonitor == "on") or (Spring.GetModOptions().enablelagmonitor ~= "off" and not Spring.Utilities.Gametype.isCoop())
+local allowPlayerInactivity = not Spring.Utilities.Gametype.isFullCommshare()
 local MERGE_SHARE = tonumber(Spring.GetModOptions().mergeresourceshare or 0.5) or 0.5
 
 include("LuaRules/Configs/constants.lua")
@@ -249,6 +250,10 @@ local function UpdateTeamActivity(teamID)
 				resourceShare = resourceShare + 1
 			end
 		end
+	elseif not allowPlayerInactivity then
+		if resourceShare == 0 then
+			resourceShare = 1
+		end
 	end
 
 	if resourceShare > 0 and teamResourceShare[teamID] == 0 then

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.damages.paralyzeDamageTime or wd.customParams.extra_paratime
-		paraWeapons[wid] = paraTime * FRAMES_PER_SECOND
+		local paraTime = wd.paralyzer and wd.customParams.emp_paratime or wd.customParams.extra_paratime
+		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,9 +234,9 @@ 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,29 +22,35 @@ 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
 
 local normalDamageMult = {}
 local wantedWeaponList = {}
 local paraTime = {}
 local overstunDamageMult = {}
+local overstunTime = {}
 -- Note that having EMP damage decay N times faster when above 100% is mathematically
 -- equivalent multiplying all incoming EMP damage above 100% by of 1/N.
 
 for wdid = 1, #WeaponDefs do
 	local wd = WeaponDefs[wdid]
 	if wd.paralyzer then
 		wantedWeaponList[#wantedWeaponList + 1] = wdid
+		paraTime[wdid] = math.max(1, wd.customParams.emp_paratime)
 	else
 		local rawDamage = tonumber(wd.customParams.raw_damage or 0)
 		if wd.customParams and wd.customParams.extra_damage and rawDamage > 0 then
 			normalDamageMult[wdid] = wd.customParams.extra_damage/rawDamage
-
 			-- engine rounds down, but paratime 0 means real damage
 			paraTime[wdid] = math.max(1, wd.customParams.extra_paratime)
-
 			wantedWeaponList[#wantedWeaponList + 1] = wdid
 		end
 	end
+	if wd.customParams and wd.customParams.overstun_time then
+		overstunTime[wdid] = tonumber(wd.customParams.overstun_time)
+	end
 	if wd.customParams and wd.customParams.overstun_damage_mult then
 		overstunDamageMult[wdid] = tonumber(wd.customParams.overstun_damage_mult)
 	end
@@ -58,27 +64,45 @@ function gadget:UnitDamaged_GetWantedWeaponDef()
 	return wantedWeaponList
 end
 
-function gadget:UnitPreDamaged(unitID, unitDefID, unitTeam, damage, paralyzer,
+local function GetStunDamage(weaponDefID, damage, health, maxHealth, paralyzeDamage)
+	if not (weaponDefID and overstunDamageMult[weaponDefID]) then
+		return damage*maxHealth/health
+	end
+
+	local rawDamage = damage*maxHealth/health
+	if maxHealth <= paralyzeDamage then
+		--Spring.Echo("Above", rawDamage*overstunDamageMult[weaponDefID])
+		return rawDamage*overstunDamageMult[weaponDefID]
+	end
+	local damageGap = (maxHealth - paralyzeDamage)
+	if rawDamage <= damageGap then
+		--Spring.Echo("damageGap", maxHealth, paralyzeDamage, damageGap, rawDamage)
+		return rawDamage
+	end
+	--Spring.Echo("Partial", maxHealth, paralyzeDamage, damageGap, rawDamage, damageGap + (rawDamage - damageGap)*overstunDamageMult[weaponDefID])
+	return damageGap + (rawDamage - damageGap)*overstunDamageMult[weaponDefID]
+end
+
+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.
-			if not (weaponDefID and overstunDamageMult[weaponDefID]) then
-				return damage*maxHealth/health
+			if GG.Awards and GG.Awards.AddAwardPoints then
+				local cost_emped = (rawDamage / maxHealth) * GetUnitCost(unitID)
+				GG.Awards.AddAwardPoints('emp', attackerTeam, cost_emped)
 			end
-
-			local rawDamage = damage*maxHealth/health
-			if maxHealth <= paralyzeDamage then
-				--Spring.Echo("Above", rawDamage*overstunDamageMult[weaponDefID])
-				return rawDamage*overstunDamageMult[weaponDefID]
+			local damage = GetStunDamage(weaponDefID, rawDamage, health, maxHealth, paralyzeDamage)
+			if overstunTime[weaponDefID] > 0 then
+				-- 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 = math.min(damage, (maxTime/DECAY_SECONDS + 1)*maxHealth - paralyzeDamage)
 			end
-			local damageGap = (maxHealth - paralyzeDamage)
-			if rawDamage <= damageGap then
-				--Spring.Echo("damageGap", maxHealth, paralyzeDamage, damageGap, rawDamage)
-				return rawDamage
-			end
-			--Spring.Echo("Partial", maxHealth, paralyzeDamage, damageGap, rawDamage, damageGap + (rawDamage - damageGap)*overstunDamageMult[weaponDefID])
-			return damageGap + (rawDamage - damageGap)*overstunDamageMult[weaponDefID]
+			--Spring.Echo("damage", damage, ((damage + paralyzeDamage)/maxHealth - 1) * DECAY_SECONDS, paralyzeDamage, WeaponDefs[weaponDefID].damages.paralyzeDamageTime, math.random())
+			return damage
 		end
 	end
 
@@ -88,13 +112,11 @@ end
 function gadget:UnitDamaged(unitID, unitDefID, unitTeam, damage, paralyzer, weaponDefID, attackerID)
 	local mult = normalDamageMult[weaponDefID]
 	if mult and not paralyzer then
-
 		-- Don't apply armour twice.
 		local armored, armorMult = spGetUnitArmored(unitID)
 		if armored then
 			mult = mult/armorMult
 		end
-
-		spAddUnitDamage(unitID, mult*damage, paraTime[weaponDefID], attackerID, weaponDefID)
+		spAddUnitDamage(unitID, mult*damage, paraTime[weaponDefID] + overstunTime[weaponDefID], attackerID, weaponDefID)
 	end
 end

LuaRules/Gadgets/unit_terraform.lua

@@ -59,6 +59,7 @@ local spCreateUnit          = Spring.CreateUnit
 local spDestroyUnit         = Spring.DestroyUnit
 local spGetAllyTeamList     = Spring.GetAllyTeamList
 local spSetUnitLosMask      = Spring.SetUnitLosMask
+local spSetUnitLosState     = Spring.SetUnitLosState
 local spGetTeamInfo         = Spring.GetTeamInfo
 local spGetUnitHealth       = Spring.GetUnitHealth
 local spSetUnitHealth       = Spring.SetUnitHealth
@@ -571,7 +572,8 @@ local function SetInivisbleToEnemy(unitID, team)
 	for i=1, #allyTeamList do
 		local allyID = allyTeamList[i]
 		if allyID ~= unitAllyTeam then
-			spSetUnitLosMask(unitID, allyID, {los=true, radar=true, prevLos=true, contRadar=true } )
+			spSetUnitLosState(unitID, allyID, 0)
+			spSetUnitLosMask(unitID, allyID, 15)
 		end
 	end
 end
@@ -3624,7 +3626,7 @@ end
 --------------------------------------------------------------------------------
 
 function gadget:UnitGiven(unitID, unitDefID, teamID, oldTeamID)
-	if unitID and unitDefID and teamID and terraformUnitDefIDs[unitDefID] then
+	if unitID and unitDefID and teamID and terraunitDefID == unitDefID then
 		SetInivisbleToEnemy(unitID, teamID)
 	end
 end

LuaRules/Gadgets/weapon_area_damage.lua

@@ -72,6 +72,7 @@ local function RegisterLuaDamageArea(weaponID, px, py, pz, ownerID, teamID)
 	explosionList[explosionCount] = {
 		radius = weaponInfo[weaponID].radius,
 		plateauRadius = weaponInfo[weaponID].plateauRadius,
+		plateauFall = weaponInfo[weaponID].plateauFall,
 		damage = weaponDamage,
 		teamID = teamID,
 		impulse = weaponInfo[weaponID].impulse,
@@ -132,10 +133,13 @@ local function HandleDamageArea(data, f)
 					if data.rangeFall ~= 0 and distance > data.plateauRadius then
 						damage = damage - damage*data.rangeFall*(distance - data.plateauRadius)/(data.radius - data.plateauRadius)
 					end
+					if data.plateauFall and data.plateauFall ~= 0 and distance < data.plateauRadius then
+						damage = damage - damage*data.plateauFall*(data.plateauRadius - distance)/data.plateauRadius
+					end
 					if data.impulse then
 						GG.AddGadgetImpulse(u, pos.x - ux, pos.y - uy, pos.z - uz, damage, false, true, false, {0.22,0.7,1})
 						GG.SetUnitFallDamageImmunity(u, f + 10)
-						GG.DoAirDrag(u, damage)
+						GG.DoAirDrag(u, damage*2)
 					elseif data.slow then
 						GG.addSlowDamage(u, damage, false, data.teamID)
 					else

LuaRules/Gadgets/weapon_noexplode_speed_damage.lua

@@ -40,6 +40,7 @@ for i = 1,#WeaponDefs do
 			initialCeg = wcp.thermite_ceg_initial,
 			damageCeg = wcp.thermite_ceg_damage,
 			sound = wcp.thermite_sound,
+			volume = tonumber(wcp.thermite_sound_volume) or 1,
 			hitSound = wcp.thermite_sound_hit,
 		}
 		if wcp.thermite_dps_start and wcp.thermite_dps_end then
@@ -277,7 +278,7 @@ local function UpdateProjectile(proID, proData, index, frame)
 			proData.resetNextFrame = false
 			if def.sound then
 				if (not proData.nextSoundFrame) or proData.nextSoundFrame < frame then
-					Spring.PlaySoundFile(def.sound, 3.5*(math.random()*0.5 + 0.5) + 0.3*proData.damageMod + (proData.hasDamaged and 4 or 0), px, py, pz, 'sfx')
+					Spring.PlaySoundFile(def.sound, def.volume * (3.5*(math.random()*0.5 + 0.5) + 0.3*proData.damageMod + (proData.hasDamaged and 4 or 0)), px, py, pz, 'sfx')
 					proData.nextSoundFrame = frame + 28 + math.random()*5 - 0.2*proData.damageMod
 				end
 			end

LuaRules/Utilities/gametype.lua

@@ -1,9 +1,11 @@
 local teamCount
-local is1v1, isTeams, isBigTeams, isSmallTeams, isChickens, isCoop, isFFA, isTeamFFA, isSandbox, isPlanetWars, isSoloTeams = false, false, false, false, false, false, false, false, false, false, false
+local is1v1, isTeams, isBigTeams, isSmallTeams, isChickens, isCoop = false, false, false, false, false, false
+local isFFA, isTeamFFA, isSandbox, isPlanetWars, isSoloTeams, isFullCommshare = false, false, false, false, false, false
 do
 	local gaiaAllyTeamID = select(6, Spring.GetTeamInfo(Spring.GetGaiaTeamID(), false))
 	local allyTeamList = Spring.GetAllyTeamList()
 	local actualAllyTeamList = {}
+	local teamsWithHumans = {}
 	local allyTeamsWithHumans = {}
 
 	isSoloTeams = true
@@ -15,6 +17,7 @@ do
 			for j = 1, #teamList do
 				if not select (4, Spring.GetTeamInfo(teamList[j], false)) then
 					humanExists = true
+					teamsWithHumans[#teamsWithHumans + 1] = teamList[j]
 				end
 				local luaAI = Spring.GetTeamLuaAI(teamList[j])
 				if luaAI and luaAI:find("Chicken") then
@@ -65,6 +68,7 @@ do
 	if #allyTeamsWithHumans == 1 then
 		isCoop = true
 	end
+	isFullCommshare = (#teamsWithHumans == 1)
 
 	if Spring.GetModOptions().planet then
 		isPlanetWars = true
@@ -76,16 +80,17 @@ function Spring.Utilities.GetTeamCount()
 end
 
 Spring.Utilities.Gametype = {
-	is1v1        = function () return is1v1        end,
-	isTeams      = function () return isTeams      end,
-	isBigTeams   = function () return isBigTeams   end,
-	isSmallTeams = function () return isSmallTeams end,
-	isChickens   = function () return isChickens   end,
-	isCoop       = function () return isCoop       end,
-	isTeamFFA    = function () return isTeamFFA    end,
-	isFFA        = function () return isFFA        end,
-	isSandbox    = function () return isSandbox    end,
-	isPlanetWars = function () return isPlanetWars end,
-	isSoloTeams  = function () return isSoloTeams  end,
-	IsSinglePlayer = function () return isSoloTeams or isSandbox end,
+	is1v1            = function () return is1v1           end,
+	isTeams          = function () return isTeams         end,
+	isBigTeams       = function () return isBigTeams      end,
+	isSmallTeams     = function () return isSmallTeams    end,
+	isChickens       = function () return isChickens      end,
+	isCoop           = function () return isCoop          end,
+	isTeamFFA        = function () return isTeamFFA       end,
+	isFFA            = function () return isFFA           end,
+	isSandbox        = function () return isSandbox       end,
+	isPlanetWars     = function () return isPlanetWars    end,
+	isSoloTeams      = function () return isSoloTeams     end,
+	isFullCommshare  = function () return isFullCommshare end,
+	IsSinglePlayer   = function () return isSoloTeams or isSandbox end,
 }

LuaUI/Configs/burst_damages.lua

@@ -6,11 +6,7 @@
 local NORMAL = 1
 local AA = 2
 local EMP_OR_DISARM = 3
-
-local burstDefs = {}
-Shared = burstDefs -- unitdefs_pre expects it as a global
-VFS.Include("gamedata/unitdefs_pre.lua", nil, VFS.GAME)
-Shared = nil
+local SHARED = VFS.Include("gamedata/unitdefs_pre.lua", nil, VFS.GAME)
 
 local function processWeapon(weaponDef, targetCats)
 	local cp = weaponDef.customParams
@@ -22,7 +18,7 @@ local function processWeapon(weaponDef, targetCats)
 	local rawDamage = cp.stats_damage * projectiles
 	local burstDef = {
 		damage = tonumber(cp.stats_burst_damage) or math.floor(rawDamage + 0.5), -- units often do extra .1 damage which would result in ugliness for 10+ units
-		unreliable = (cp.burst == burstDefs.BURST_UNRELIABLE),
+		unreliable = (cp.burst == SHARED.BURST_UNRELIABLE),
 		class = (weaponDef.paralyzer or cp.disarmdamagemult) and EMP_OR_DISARM or NORMAL,
 	}
 

LuaUI/Configs/integral_menu_config.lua

@@ -102,7 +102,13 @@ local commandDisplayConfig = {
 	[CMD_GBCANCEL] = { texture = imageDir .. 'Bold/stopbuild.png'},
 
 	[CMD_RECALL_DRONES] = {texture = imageDir .. 'Bold/recall_drones.png'},
-
+
+	[CMD_MORPH_STOP] = {
+		DynamicDisplayFunc = function (cmdID, command)
+			return {texture = imageDir .. 'Bold/cancel.png', tex2 = command.texture}
+		end
+	},
+
 	-- states
 	[CMD_WANT_ONOFF] = {
 		texture = {imageDir .. 'states/off.png', imageDir .. 'states/on.png'},
@@ -643,7 +649,12 @@ end
 local modCommands = VFS.Include("LuaRules/Configs/modCommandsDefs.lua")
 for i = 1, #modCommands do
 	local cmd = modCommands[i]
-	commandDisplayConfig[cmd.cmdID] = {tooltip = cmd.tooltip, texture = cmd.image, stateTooltip = cmd.stateTooltip}
+	commandDisplayConfig[cmd.cmdID] = {
+		tooltip = cmd.tooltip,
+		texture = cmd.image,
+		stateTooltip = cmd.stateTooltip,
+		DynamicDisplayFunc = cmd.DynamicDisplayFunc,
+	}
 end
 
 --------------------------------------------------------------------------------