diff --git a/LuaRules/Configs/area_damage_defs.lua b/LuaRules/Configs/area_damage_defs.lua index 54794545c1..00b0f56e07 100644 --- a/LuaRules/Configs/area_damage_defs.lua +++ b/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, diff --git a/LuaRules/Gadgets/awards.lua b/LuaRules/Gadgets/awards.lua index e9673b00fd..f00a06ed58 100644 --- a/LuaRules/Gadgets/awards.lua +++ b/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 diff --git a/LuaRules/Gadgets/game_lagmonitor.lua b/LuaRules/Gadgets/game_lagmonitor.lua index 3049692a88..77f83faefa 100644 --- a/LuaRules/Gadgets/game_lagmonitor.lua +++ b/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 diff --git a/LuaRules/Gadgets/unit_boolean_disable.lua b/LuaRules/Gadgets/unit_boolean_disable.lua index d0f71b4b7c..e889deab5b 100644 --- a/LuaRules/Gadgets/unit_boolean_disable.lua +++ b/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 diff --git a/LuaRules/Gadgets/unit_paralysis_damage.lua b/LuaRules/Gadgets/unit_paralysis_damage.lua index 0b2d0e3042..81dcfa8af2 100644 --- a/LuaRules/Gadgets/unit_paralysis_damage.lua +++ b/LuaRules/Gadgets/unit_paralysis_damage.lua @@ -22,11 +22,15 @@ 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. @@ -34,17 +38,19 @@ 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 diff --git a/LuaRules/Gadgets/unit_terraform.lua b/LuaRules/Gadgets/unit_terraform.lua index 34c47ef7f2..34b7f1ab21 100644 --- a/LuaRules/Gadgets/unit_terraform.lua +++ b/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 diff --git a/LuaRules/Gadgets/weapon_area_damage.lua b/LuaRules/Gadgets/weapon_area_damage.lua index 2852353714..33c5eb9513 100644 --- a/LuaRules/Gadgets/weapon_area_damage.lua +++ b/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 diff --git a/LuaRules/Gadgets/weapon_noexplode_speed_damage.lua b/LuaRules/Gadgets/weapon_noexplode_speed_damage.lua index 77af9af03a..7e4658d10d 100644 --- a/LuaRules/Gadgets/weapon_noexplode_speed_damage.lua +++ b/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 diff --git a/LuaRules/Utilities/gametype.lua b/LuaRules/Utilities/gametype.lua index b84a549531..78ff286930 100644 --- a/LuaRules/Utilities/gametype.lua +++ b/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, } diff --git a/LuaUI/Configs/burst_damages.lua b/LuaUI/Configs/burst_damages.lua index 44357a644f..911d2d6049 100644 --- a/LuaUI/Configs/burst_damages.lua +++ b/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, } diff --git a/LuaUI/Configs/integral_menu_config.lua b/LuaUI/Configs/integral_menu_config.lua index e5354841bf..18c3385d9f 100644 --- a/LuaUI/Configs/integral_menu_config.lua +++ b/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 -------------------------------------------------------------------------------- diff --git a/LuaUI/Configs/sounds_noises.lua b/LuaUI/Configs/sounds_noises.lua index c4af58bbcc..fb3431ee28 100644 --- a/LuaUI/Configs/sounds_noises.lua +++ b/LuaUI/Configs/sounds_noises.lua @@ -3,7 +3,7 @@ local VOLUME_MULT = 1.13 local volumeOverrides = { - builder_start = 1.1, + builder_start = 1, light_bot_select2 = 0.55, light_bot_select = 0.58, light_bot_move = 0.8, @@ -11,8 +11,8 @@ local volumeOverrides = { bot_move2 = 0.25, medium_bot_select = 0.52, heavy_bot_move = 0.21, - amph_move = 0.39, - amph_select = 0.3, + amph_move = 0.3, + amph_select = 0.27, crawlie_select = 0.18, spider_move = 0.18, @@ -25,18 +25,18 @@ local volumeOverrides = { vehicle_move = 0.27, vehicle_select = 0.67, - tank_move = 0.26, - tank_select = 0.37, + tank_move = 0.25, + tank_select = 0.34, light_tank_move2 = 0.37, - hovercraft_move = 0.63, + hovercraft_move = 0.59, hovercraft_select = 0.83, gunship_select = 0.31, - gunship_move2 = 0.35, - light_gunship_select = 0.28, - heavy_gunship_select = 0.2, - heavy_gunship_move = 0.78, + gunship_move2 = 0.34, + light_gunship_select = 0.26, + heavy_gunship_select = 0.19, + heavy_gunship_move = 0.77, fighter_move = 0.17, fighter_select = 0.3, @@ -49,7 +49,7 @@ local volumeOverrides = { building_select1 = 0.8, building_select2 = 0.58, - windmill = 0.48, + windmill = 0.52, fusion_select = 0.37, adv_fusion_select = 0.37, geo_select = 0.43, diff --git a/LuaUI/Widgets/dbg_wiki_export.lua b/LuaUI/Widgets/dbg_wiki_export.lua index 00a42b6091..06fd276d41 100644 --- a/LuaUI/Widgets/dbg_wiki_export.lua +++ b/LuaUI/Widgets/dbg_wiki_export.lua @@ -165,7 +165,7 @@ local function getDamages(wd) if wd.paralyzer then damw = val if stun_time == 0 then - stun_time = wd.damages.paralyzeDamageTime + stun_time = tonumber(wd.customParams.emp_paratime) end else dam = val diff --git a/LuaUI/Widgets/gui_chili_integral_menu.lua b/LuaUI/Widgets/gui_chili_integral_menu.lua index a3f58bb81d..70dad7238d 100644 --- a/LuaUI/Widgets/gui_chili_integral_menu.lua +++ b/LuaUI/Widgets/gui_chili_integral_menu.lua @@ -855,11 +855,17 @@ local function GetCmdPosParameters(cmdID) return 1, 100 end -local function GetDisplayConfig(cmdID) +local function GetDisplayConfig(cmdID, command) local displayConfig = commandDisplayConfig[cmdID] + if cmdID >= CMD_MORPH_STOP and cmdID < CMD_MORPH_STOP + 1000 then + displayConfig = commandDisplayConfig[CMD_MORPH_STOP] + end if not displayConfig then return end + if displayConfig.DynamicDisplayFunc then + displayConfig = displayConfig.DynamicDisplayFunc(cmdID, command) + end if displayConfig.useAltConfig then return displayConfig.altConfig end @@ -1167,7 +1173,7 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, local buildProgress local textBoxes = {} - local function SetImage(texture1, texture2) + local function SetImageTexture(texture1, texture2) if not image then image = Image:New { name = name .. "_image", @@ -1197,6 +1203,18 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, image:Invalidate() end + local function SetImageFromConfig(displayConfig, command, state) + if state and displayConfig then + SetImageTexture(displayConfig.texture[state]) + elseif displayConfig then + SetImageTexture(displayConfig.texture, displayConfig.tex2) + elseif command then + SetImageTexture(command.texture) + else + spEcho("Error, missing command displayConfig and command") + end + end + local function SetText(textPosition, text) if isDisabled then text = false @@ -1229,6 +1247,9 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, return end textBoxes[textPosition]:SetVisibility(newVisible) + if newVisible then + textBoxes[textPosition]:BringToFront() + end if (not newVisible) or (text == textBoxes[textPosition].caption) then return @@ -1249,7 +1270,7 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, isDisabled = newDisabled if not image then - SetImage("") + SetImageTexture("") end if isDisabled then button.backgroundColor = BUTTON_DISABLE_COLOR @@ -1278,7 +1299,7 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, end if not image then - SetImage("") + SetImageTexture("") end buildProgress = Progressbar:New{ @@ -1374,7 +1395,7 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, for _,textBox in pairs(textBoxes) do textBox:SetCaption(NO_TEXT) end - SetImage() + SetImageTexture() if not onMouseOverFun then onMouseOverFun = function () @@ -1443,21 +1464,19 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, if cmdID == newCmdID then if isStateCommand then - local displayConfig = GetDisplayConfig(cmdID) + local displayConfig = GetDisplayConfig(cmdID, command) if displayConfig then - local texture = displayConfig.texture[state] if displayConfig.stateTooltip then button.tooltip = GetButtonTooltip(displayConfig, command, state) end - SetImage(texture) + SetImageFromConfig(displayConfig, command, state) end elseif newCmdID and DYNAMIC_COMMANDS[newCmdID] then -- Reset potentially stale special weapon iamge and tooltip. -- Action is the same so hotkey does not require a reset. - local displayConfig = GetDisplayConfig(cmdID) + local displayConfig = GetDisplayConfig(cmdID, command) button.tooltip = GetButtonTooltip(displayConfig, command, state) - local texture = (displayConfig and displayConfig.texture) or command.texture - SetImage(texture) + SetImageFromConfig(displayConfig, command) end if not notGlobal then buttonsByCommand[cmdID] = externalFunctionsAndData @@ -1494,7 +1513,7 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, SetDisabled(command.disabled) end - local displayConfig = GetDisplayConfig(cmdID) + local displayConfig = GetDisplayConfig(cmdID, command) if isBuild then local ud = UnitDefs[-cmdID] @@ -1504,7 +1523,7 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, local tooltip = (buttonLayout.tooltipPrefix or "") .. ud.name button.tooltip = tooltip end - SetImage("#" .. -cmdID, (not buttonLayout.noUnitOutline) and WG.GetBuildIconFrame(UnitDefs[-cmdID])) + SetImageTexture("#" .. -cmdID, (not buttonLayout.noUnitOutline) and WG.GetBuildIconFrame(UnitDefs[-cmdID])) if buttonLayout.showCost then local cost = GetUnitCost(false, -cmdID) if cost >= 100000000 then @@ -1533,15 +1552,13 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width, if isStateCommand then if displayConfig then - local texture = displayConfig.texture[state] - SetImage(texture) + SetImageFromConfig(displayConfig, command, state) else spEcho("Error, missing command config", cmdID) end else if not isBuild then - local texture = (displayConfig and displayConfig.texture) or command.texture - SetImage(texture) + SetImageFromConfig(displayConfig, command) end -- Remove stockpile progress if not (command and DRAW_NAME_COMMANDS[command.id] and command.name) then diff --git a/LuaUI/Widgets/gui_contextmenu.lua b/LuaUI/Widgets/gui_contextmenu.lua index a506f3b4b8..21a0e46ad4 100644 --- a/LuaUI/Widgets/gui_contextmenu.lua +++ b/LuaUI/Widgets/gui_contextmenu.lua @@ -551,7 +551,7 @@ local function weapons2Table(cells, ws, unitID) if wd.paralyzer then damw = val if stun_time == 0 then - stun_time = wd.damages.paralyzeDamageTime + stun_time = tonumber(wd.customParams.emp_paratime) end else dam = val @@ -1786,7 +1786,7 @@ local function printunitinfo(ud, buttonWidth, unitID) if (weaponStats.paralyzer) then statschildren[#statschildren+1] = Label:New{ caption = numformat(damageValue) .. " (P)", textColor = colorCyan, } statschildren[#statschildren+1] = Label:New{ caption = 'Max EMP time: ', textColor = color.stats_fg, } - statschildren[#statschildren+1] = Label:New{ caption = numformat(weaponStats.damages.paralyzeDamageTime) .. "s", textColor = color.stats_fg, } + statschildren[#statschildren+1] = Label:New{ caption = numformat(wepCp.emp_paratime) .. "s", textColor = color.stats_fg, } else local damageSlow = (wepCp.timeslow_damagefactor or 0)*damageValue local damageText diff --git a/LuaUI/Widgets/snd_noises.lua b/LuaUI/Widgets/snd_noises.lua index 88c2093c63..641709478c 100644 --- a/LuaUI/Widgets/snd_noises.lua +++ b/LuaUI/Widgets/snd_noises.lua @@ -185,7 +185,7 @@ function WG.sounds_gaveOrderToUnit(unitID, isBuild) CoolNoisePlay(sounds.ok[1], options.commandSoundCooldown.value, (sounds.ok.volume or 1)*options.ordernoisevolume.value) end elseif sounds.build then - CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, options.ordernoisevolume.value) + CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, (sounds.build.volume or 1)*options.ordernoisevolume.value) end end @@ -204,7 +204,7 @@ local function PlayResponse(unitID, cmdID) CoolNoisePlay(sounds.ok[1], options.commandSoundCooldown.value, (sounds.ok.volume or 1)*options.ordernoisevolume.value) end elseif (sounds and sounds.build) then - CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, options.ordernoisevolume.value) + CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, (sounds.build.volume or 1)*options.ordernoisevolume.value) end end diff --git a/Objects3d/Detriment.s3o b/Objects3d/Detriment.s3o index bfc6e1f78c..3e83a00dfb 100644 Binary files a/Objects3d/Detriment.s3o and b/Objects3d/Detriment.s3o differ diff --git a/gamedata/modularcomms/weapons/disintegrator.lua b/gamedata/modularcomms/weapons/disintegrator.lua index 591f9d3deb..068ba60ac2 100644 --- a/gamedata/modularcomms/weapons/disintegrator.lua +++ b/gamedata/modularcomms/weapons/disintegrator.lua @@ -35,9 +35,10 @@ local weaponDef = { range = 200, reloadtime = 30, size = 6, - soundHit = [[explosion/ex_med6]], + soundHit = [[dgun_hit]], + soundHitVolume = 8.5, soundStart = [[weapon/laser/heavy_laser4]], - soundTrigger = true, + soundStartVolume = 8, turret = true, waterWeapon = true, weaponType = [[DGun]], diff --git a/gamedata/modularcomms/weapons/heatray.lua b/gamedata/modularcomms/weapons/heatray.lua index 283fbfdfdb..5b00fd0d0a 100644 --- a/gamedata/modularcomms/weapons/heatray.lua +++ b/gamedata/modularcomms/weapons/heatray.lua @@ -42,7 +42,8 @@ local weaponDef = { reloadtime = 0.1, rgbColor = [[1 0.1 0]], rgbColor2 = [[1 1 0.25]], - soundStart = [[weapon/heatray_fire]], + soundStart = [[weapon/heatray_fire7]], + soundStartVolume = 4, thickness = 3, tolerance = 5000, turret = true, diff --git a/gamedata/sounds.lua b/gamedata/sounds.lua index 4dc4aa102b..525f86ee79 100644 --- a/gamedata/sounds.lua +++ b/gamedata/sounds.lua @@ -37,12 +37,12 @@ local Sounds = { gain = 1.5, }, BladeSwing = { - file = "sounds/weapon/blade/blade_swing.wav", + file = "sounds/weapon/blade/blade_swing2.wav", pitchmod = 0.1, gainmod = 0.1, pitch = 0.8, gain = 0.9, - priority = 1, + priority = 2, }, BladeHit = { file = "sounds/weapon/blade/blade_hit.wav", @@ -64,7 +64,7 @@ local Sounds = { gain = 1.0, pitch = 1.0, priority = 0, - maxconcurrent = 4, --- some reasonable limits + maxconcurrent = 4, --- some reasonable limits (default appears to actually be 16) maxdist = nil, --- no cutoff at all (engine defaults to FLT_MAX) }, DetrimentJump = { @@ -86,6 +86,7 @@ local Sounds = { pitchmod = 0.05, gainmod = 0, gain = 2.4, + priority = 1, }, TorpedoHitVariable = { file = "sounds/explosion/wet/ex_underwater.wav", @@ -102,11 +103,19 @@ local Sounds = { pitchmod = 0.1, gainmod = 0.05, }, + SiloLaunchEmp = { + file = "sounds/weapon/missile/tacnuke_launch.wav", + gain = 1.0, + pitch = 1.0, + priority = 3, + maxconcurrent = 30, + maxdist = nil, + }, SiloLaunch = { file = "sounds/weapon/missile/tacnuke_launch.wav", gain = 1.0, pitch = 1.0, - priority = 1, + priority = 3, maxconcurrent = 30, maxdist = nil, }, @@ -122,6 +131,35 @@ local Sounds = { gainmod = 0, pitch = 0.9, }, + FirewalkerHit = { + file = "sounds/weapon/cannon/wolverine_hit.wav", + pitchmod = 0.008, + maxconcurrent = 10, --- firewalker + }, + CaptureRay = { + file = "sounds/weapon/laser/capture_ray.wav", + gainmod = 0.5, + gain = 0.6, + }, + ex_med5_flat_pitch = { + file = "sounds/explosion/ex_med5.wav", + pitchmod = 0, + }, + heavy_laser3_flat_pitch = { + file = "sounds/weapon/laser/heavy_laser3.wav", + priority = 0.5, + pitchmod = 0, + }, + gravity_fire = { + file = "sounds/weapon/gravity_fire.wav", + gainmod = 0.8, + pitchmod = 0, + }, + dgun_hit = { + file = "sounds/explosion/ex_med6.wav", + gainmod = 0.7, + pitchmod = 0, + }, }, } @@ -129,6 +167,8 @@ local Sounds = { -- Automagical sound handling -------------------------------------------------------------------------------- +local DISABLE_PITCHMOD = true + local optionOverrides = { ["weapon/missile/missile_launch_short"] = { pitchmod = 0, @@ -143,16 +183,182 @@ local optionOverrides = { }, ["weapon/cannon/plasma_fire_extra2"] = { gain = 20, - } + }, + ["weapon/laser/rapid_laser"] = { + maxconcurrent = 6, --- raptor toad detriment + gain = 1.0, + pitch = 1.0, + }, + ["weapon/laser/rapid_laser2"] = { + maxconcurrent = 8, --- gremlin hercules + gain = 1.0, + pitch = 1.0, + }, + ["weapon/cannon/brawler_emg"] = { + maxconcurrent = 5, --- toad + gain = 1.0, + pitch = 1.0, + }, + ["weapon/cannon/brawler_emg3"] = { + maxconcurrent = 5, --- nimbus + gain = 1.0, + pitch = 1.0, + }, + ["weapon/cannon/emg_hit3"] = { + maxconcurrent = 5, --- nimbus + gain = 1.0, + pitch = 1.0, + }, + ["weapon/laser/small_laser_fire2"] = { + maxconcurrent = 6, --- bandit + gain = 1.0, + pitch = 1.0, + }, + ["weapon/laser/lasercannon_hit"] = { + maxconcurrent = 6, --- hercules punisher swift bandit zephyr welder razor + gain = 1.0, + pitch = 1.0, + }, + ["weapon/laser/laser_burn8"] = { + maxconcurrent = 6, --- lotus + gain = 1.0, + pitch = 1.0, + }, + ["weapon/heatray_fire7"] = { + maxconcurrent = 7, --- scorcher + gain = 1.0, + pitch = 1.0, + }, + ["weapon/emg"] = { + maxconcurrent = 8, --- glaive + gain = 1.0, + pitch = 1.0, + }, + ["weapon/heavy_emg"] = { + maxconcurrent = 10, --- stardust, reaver + gain = 1.0, + pitch = 1.0, + }, + ["weapon/cannon/emg_hit"] = { + maxconcurrent = 6, --- stardust, reaver + gain = 1.0, + pitch = 1.0, + }, + ["weapon/laser/lasercannon_fire"] = { + maxconcurrent = 6, --- hercules zephyr welder razor + gain = 1.0, + pitch = 1.0, + }, + ["weapon/laser/mini_laser"] = { + maxconcurrent = 8, --- spicula, firefly, trisula, redback, scorpion + gain = 1.0, + pitch = 1.0, + }, + ["weapon/laser/small_laser_fire"] = { + maxconcurrent = 10, --- flea + gain = 1.0, + pitch = 1.0, + }, + ["weapon/flamethrower"] = { + maxconcurrent = 10, --- pyro dante tiamat + gain = 1.0, + pitch = 1.0, + }, + ["weapon/cannon/tremor_fire"] = { + maxconcurrent = 5, --- tremor + gain = 1.0, + pitch = 1.0, + }, + ["weapon/cannon/cannon_hit5"] = { + maxconcurrent = 10, --- tremor + gain = 1.0, + pitch = 1.0, + }, + ["weapon/cannon/wolverine_fire"] = { + maxconcurrent = 10, --- firewalker + gain = 1.0, + pitch = 1.0, + }, + +} + +local priority = { + ["weapon/laser/heavy_laser6"] = 1, + ["weapon/laser/heavy_laser3"] = 1, + ["weapon/missile/liche_fire"] = 1, + ["weapon/missile/liche_hit"] = 1, + ["explosion/ex_ultra8"] = 2, + ["explosion/mini_nuke"] = 1, --- Claymore, Skuttle, Disco Rave Party, Snitch, Detriment, Lancelet, Scylla, Eos + ["weapon/missile/emp_missile_hit"] = 1, --- Shockley, Reef, Disco Rave Party + ["explosion/ex_large4"] = 1, --- Disco Rave Party, Quake + ["weapon/aoe_aura3"] = 1, --- Zeno + ["weapon/aoe_aura2"] = 1, --- Disco Rave Party, limpet + ["weapon/missile/nalpalm_missile_hit"] = 1, --- Inferno, Disco Rave Party + ["weapon/more_lightning"] = 1, --- Imp + ["weapon/lightningbolt3"] = 1, --- Widow + ["weapon/gauss_fire"] = 1, --- Phantom + ["weapon/snipe_hit"] = 1, --- Phantom + ["weapon/lightningbolt"] = 1, --- Thunderbird } +local lowPitchMod = { + "weapon/heatray_fire", + "weapon/emg", + "explosion/burn_explode", + "weapon/bomb_drop_short", + "impacts/shotgun_impactv5", + "explosion/ex_large5", + "weapon/laser/mini_laser", +} + +local lowestPitchMod = { + "weapon/laser/pulse_laser3", +} + +local noPitchMod = { + "weapon/missile/missile_fire9_heavy", + "weapon/missile/rapid_rocket_fire2", + "weapon/cannon/wolverine_fire", + "weapon/laser/pulse_laser2", + "weapon/shotgun_firev4", + "weapon/cannon/cannon_fire4", + "weapon/missile/rapid_rocket_fire", + "weapon/small_lightning", + "explosion/ex_large4", + "weapon/gauss_fire_short", + "weapon/missile/rapid_rocket_hit", + "weapon/laser/laser_burn10", + "weapon/laser/laser_burn9", +} + +for i = 1, #noPitchMod do + optionOverrides[noPitchMod[i]] = {pitchmod = 0} +end + +for i = 1, #lowPitchMod do + optionOverrides[lowPitchMod[i]] = {pitchmod = DISABLE_PITCHMOD and 0 or 0.015} +end + +for i = 1, #lowestPitchMod do + optionOverrides[lowestPitchMod[i]] = {pitchmod = DISABLE_PITCHMOD and 0 or 0.006} +end + local defaultOpts = { - pitchmod = 0, --0.02, + pitchmod = DISABLE_PITCHMOD and 0 or 0.04, gainmod = 0, + maxconcurrent = 12, + rolloff = 1.2, } local replyOpts = { - pitchmod = 0, --0.02, + pitchmod = 0, + gainmod = 0, + rolloff = 0, +} +local explosionOpts = { + pitchmod = 0.00, gainmod = 0, + maxconcurrent = 12, + rolloff = 1.2, } local noVariation = { @@ -177,13 +383,14 @@ local function AutoAdd(subDir, generalOpts) local pathPart, ext = fullPath:match("sounds/(.*)%.(.*)") if not ignoredExtensions[ext] then local opts = optionOverrides[pathPart] or generalOpts + Spring.Echo(pathPart, opts.priority or priority[pathPart] or 0) Sounds.SoundItems[pathPart] = { file = fullPath, - rolloff = opts.rollOff, + rolloff = (opts.rolloff ~= nil and opts.rolloff) or (generalOpts and generalOpts.rolloff) or opts.rollOff, dopplerscale = opts.dopplerscale, maxdist = opts.maxdist, - maxconcurrent = opts.maxconcurrent, - priority = opts.priority, + maxconcurrent = (opts.maxconcurrent ~= nil and opts.maxconcurrent) or generalOpts.maxconcurrent, + priority = opts.priority or priority[pathPart] or 0, in3d = opts.in3d, gain = opts.gain, gainmod = opts.gainmod, @@ -196,8 +403,8 @@ end -- add sounds AutoAdd("weapon", defaultOpts) -AutoAdd("explosion", defaultOpts) AutoAdd("reply", replyOpts) +AutoAdd("explosion", explosionOpts) AutoAdd("music", noVariation) return Sounds diff --git a/gamedata/unitdef_defaults/area_damage_defs.lua b/gamedata/unitdef_defaults/area_damage_defs.lua index 0a60919bd4..0eba1f853d 100644 --- a/gamedata/unitdef_defaults/area_damage_defs.lua +++ b/gamedata/unitdef_defaults/area_damage_defs.lua @@ -3,6 +3,7 @@ local defaults = { radius = 128, duration = 20, plateau_radius = 0, + plateau_fall = 0, is_impulse = 0, range_falloff = 0.6, diff --git a/gamedata/weapondefs_post.lua b/gamedata/weapondefs_post.lua index 982b6c3c52..2b60e5112a 100644 --- a/gamedata/weapondefs_post.lua +++ b/gamedata/weapondefs_post.lua @@ -159,6 +159,24 @@ for _, weaponDef in pairs(WeaponDefs) do end end +-------------------------------------------------------------------------------- +-------------------------------------------------------------------------------- +-- +-- Allow one more second of stun so that gadgets can handle fractional seconds + +for _, weaponDef in pairs(WeaponDefs) do + if weaponDef.customparams.disarmdamagemult or weaponDef.paralyzetime then + weaponDef.customparams.overstun_time = weaponDef.customparams.overstun_time or 1 + end + if weaponDef.paralyzetime then + if not weaponDef.paralyzer then + weaponDef.customparams.extra_paratime = weaponDef.paralyzetime + end + weaponDef.customparams.emp_paratime = weaponDef.paralyzetime + weaponDef.paralyzetime = weaponDef.paralyzetime + weaponDef.customparams.overstun_time + end +end + -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- -- @@ -316,6 +334,7 @@ for name, wd in pairs (WeaponDefs) do if not cp.area_damage_radius then cp.area_damage_radius = area_damage_defaults.radius end if not cp.area_damage_duration then cp.area_damage_duration = area_damage_defaults.duration end if not cp.area_damage_plateau_radius then cp.area_damage_plateau_radius = area_damage_defaults.plateau_radius end + if not cp.area_damage_plateau_fall then cp.area_damage_plateau_fall = area_damage_defaults.plateau_fall end if not cp.area_damage_is_impulse then cp.area_damage_is_impulse = area_damage_defaults.is_impulse end if not cp.area_damage_range_falloff then cp.area_damage_range_falloff = area_damage_defaults.range_falloff end @@ -400,9 +419,6 @@ end -- ??? for _, weaponDef in pairs(WeaponDefs) do - if weaponDef.paralyzetime and not weaponDef.paralyzer then - weaponDef.customparams.extra_paratime = weaponDef.paralyzetime - end if not weaponDef.predictboost then weaponDef.predictboost = 1 end diff --git a/scripts/striderdetriment.lua b/scripts/striderdetriment.lua index 1c81432821..ee2a65a39d 100644 --- a/scripts/striderdetriment.lua +++ b/scripts/striderdetriment.lua @@ -37,7 +37,7 @@ local loadingCanister = false local previousLoad = false local canisters = { {loaded = true, body = piece('canister1'), cap = piece('cap1'), gib = piece('canister1_merged'), hor = math.cos(-0.2618), vert = math.sin(-0.2618)}, - {loaded = true, body = piece('canister2'), cap = piece('cap2'), gib = piece('canister2_merged'), hor = 1, vert = 0.05}, -- Small vert for z-fighting + {loaded = true, body = piece('canister2'), cap = piece('cap2'), gib = piece('canister2_merged'), hor = 1, vert = 0.01}, -- Small vert for z-fighting {loaded = true, body = piece('canister3'), cap = piece('cap3'), gib = piece('canister3_merged'), hor = math.cos(0.349), vert = math.sin(0.349)}, } local EXTRUDE_SPEED = 0.21 * 120 / tonumber(UnitDefs[unitDefID].customParams.jump_reload) @@ -127,10 +127,10 @@ local takeoff_explosion = 4103 --Weapon 8 -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- +local fullCap = 0.5 +local emptyCan = 23 +local emptyCap = 4.6 local function MoveCanister(num, proportion, capProp, speed) - local fullCap = 0.5 - local emptyCan = 22 - local emptyCap = 4.6 local canister = canisters[num] Move(canister.body, z_axis, (1 - proportion) * emptyCan * canister.hor, speed and speed * canister.hor) Move(canister.body, y_axis, (1 - proportion) * emptyCan * canister.vert, speed and speed * canister.vert) diff --git a/sounds/beep4.wav b/sounds/beep4.wav index e00a2fa45f..7364590f62 100644 Binary files a/sounds/beep4.wav and b/sounds/beep4.wav differ diff --git a/sounds/beep4_decrackled.wav b/sounds/beep4_decrackled.wav index 87716da534..f2c9268ad0 100644 Binary files a/sounds/beep4_decrackled.wav and b/sounds/beep4_decrackled.wav differ diff --git a/sounds/beep6.wav b/sounds/beep6.wav index 31af9a2066..7edea106e9 100644 Binary files a/sounds/beep6.wav and b/sounds/beep6.wav differ diff --git a/sounds/chickens/acid_fire.wav b/sounds/chickens/acid_fire.wav index d35e1bbaf6..9fc6bb5570 100644 Binary files a/sounds/chickens/acid_fire.wav and b/sounds/chickens/acid_fire.wav differ diff --git a/sounds/chickens/acid_hit.wav b/sounds/chickens/acid_hit.wav index 03f2c0f924..bdb78e9dac 100644 Binary files a/sounds/chickens/acid_hit.wav and b/sounds/chickens/acid_hit.wav differ diff --git a/sounds/chickens/bigchickenbreath.wav b/sounds/chickens/bigchickenbreath.wav index b1f2287dec..202b97bfb5 100644 Binary files a/sounds/chickens/bigchickenbreath.wav and b/sounds/chickens/bigchickenbreath.wav differ diff --git a/sounds/chickens/chicken.wav b/sounds/chickens/chicken.wav index faac896306..1025241e75 100644 Binary files a/sounds/chickens/chicken.wav and b/sounds/chickens/chicken.wav differ diff --git a/sounds/chickens/chickenbig.wav b/sounds/chickens/chickenbig.wav index 012586da0c..6e091cd037 100644 Binary files a/sounds/chickens/chickenbig.wav and b/sounds/chickens/chickenbig.wav differ diff --git a/sounds/chickens/chickenbig2.wav b/sounds/chickens/chickenbig2.wav index 7f6865e7f1..7a90f3b5d7 100644 Binary files a/sounds/chickens/chickenbig2.wav and b/sounds/chickens/chickenbig2.wav differ diff --git a/sounds/chickens/chickenbigdie.wav b/sounds/chickens/chickenbigdie.wav index cfe94e5ced..04dd3277ec 100644 Binary files a/sounds/chickens/chickenbigdie.wav and b/sounds/chickens/chickenbigdie.wav differ diff --git a/sounds/chickens/chickendie.wav b/sounds/chickens/chickendie.wav index 1b7d736edd..8a25156b6a 100644 Binary files a/sounds/chickens/chickendie.wav and b/sounds/chickens/chickendie.wav differ diff --git a/sounds/chickens/chickenflyer1.wav b/sounds/chickens/chickenflyer1.wav index 5b35c1aff1..77949dca90 100644 Binary files a/sounds/chickens/chickenflyer1.wav and b/sounds/chickens/chickenflyer1.wav differ diff --git a/sounds/chickens/chickenflyer2.wav b/sounds/chickens/chickenflyer2.wav index c6e5a9793d..d19aab0894 100644 Binary files a/sounds/chickens/chickenflyer2.wav and b/sounds/chickens/chickenflyer2.wav differ diff --git a/sounds/chickens/chickenflyer3.wav b/sounds/chickens/chickenflyer3.wav index f1cbb3a2e9..cd859e9d45 100644 Binary files a/sounds/chickens/chickenflyer3.wav and b/sounds/chickens/chickenflyer3.wav differ diff --git a/sounds/chickens/chickenflyerbig1.wav b/sounds/chickens/chickenflyerbig1.wav index 7a91cff4e9..6ddcdb0443 100644 Binary files a/sounds/chickens/chickenflyerbig1.wav and b/sounds/chickens/chickenflyerbig1.wav differ diff --git a/sounds/chickens/chickenflyerbig2.wav b/sounds/chickens/chickenflyerbig2.wav index 194b32b272..d62697e4a3 100644 Binary files a/sounds/chickens/chickenflyerbig2.wav and b/sounds/chickens/chickenflyerbig2.wav differ diff --git a/sounds/chickens/chickenflyerbig3.wav b/sounds/chickens/chickenflyerbig3.wav index c0be97e7f0..a3afe8f5b9 100644 Binary files a/sounds/chickens/chickenflyerbig3.wav and b/sounds/chickens/chickenflyerbig3.wav differ diff --git a/sounds/chickens/spike_fire.wav b/sounds/chickens/spike_fire.wav index 731879f90b..a5fea18008 100644 Binary files a/sounds/chickens/spike_fire.wav and b/sounds/chickens/spike_fire.wav differ diff --git a/sounds/chickens/spike_hit.wav b/sounds/chickens/spike_hit.wav index 835a1c3760..6c9fa68e96 100644 Binary files a/sounds/chickens/spike_hit.wav and b/sounds/chickens/spike_hit.wav differ diff --git a/sounds/chickens/web.wav b/sounds/chickens/web.wav index 9d8fb73230..cb104736a9 100644 Binary files a/sounds/chickens/web.wav and b/sounds/chickens/web.wav differ diff --git a/sounds/cloak.wav b/sounds/cloak.wav index db93e35712..851a216648 100644 Binary files a/sounds/cloak.wav and b/sounds/cloak.wav differ diff --git a/sounds/detriment_jump.wav b/sounds/detriment_jump.wav index e49fe68018..737ca2d7d7 100644 Binary files a/sounds/detriment_jump.wav and b/sounds/detriment_jump.wav differ diff --git a/sounds/explosion/burn_explode.wav b/sounds/explosion/burn_explode.wav index f5d6bb17f8..9258264cd3 100644 Binary files a/sounds/explosion/burn_explode.wav and b/sounds/explosion/burn_explode.wav differ diff --git a/sounds/explosion/clogger_death.wav b/sounds/explosion/clogger_death.wav index 9da8a844d8..78e53c085e 100644 Binary files a/sounds/explosion/clogger_death.wav and b/sounds/explosion/clogger_death.wav differ diff --git a/sounds/explosion/ex_burn1.wav b/sounds/explosion/ex_burn1.wav index 23ae6fdbe8..551f75538e 100644 Binary files a/sounds/explosion/ex_burn1.wav and b/sounds/explosion/ex_burn1.wav differ diff --git a/sounds/explosion/ex_large18.wav b/sounds/explosion/ex_large18.wav new file mode 100644 index 0000000000..4170dac739 Binary files /dev/null and b/sounds/explosion/ex_large18.wav differ diff --git a/sounds/explosion/ex_large19.wav b/sounds/explosion/ex_large19.wav new file mode 100644 index 0000000000..b900e4de2d Binary files /dev/null and b/sounds/explosion/ex_large19.wav differ diff --git a/sounds/explosion/ex_large4.wav b/sounds/explosion/ex_large4.wav index 8bf3296431..336eaabb45 100644 Binary files a/sounds/explosion/ex_large4.wav and b/sounds/explosion/ex_large4.wav differ diff --git a/sounds/explosion/ex_large5.wav b/sounds/explosion/ex_large5.wav index 4436095922..7cfaaa85c5 100644 Binary files a/sounds/explosion/ex_large5.wav and b/sounds/explosion/ex_large5.wav differ diff --git a/sounds/explosion/ex_large7.wav b/sounds/explosion/ex_large7.wav index b37507a330..511110ab47 100644 Binary files a/sounds/explosion/ex_large7.wav and b/sounds/explosion/ex_large7.wav differ diff --git a/sounds/explosion/ex_large8.wav b/sounds/explosion/ex_large8.wav index 67f49c579d..9b0f8c5620 100644 Binary files a/sounds/explosion/ex_large8.wav and b/sounds/explosion/ex_large8.wav differ diff --git a/sounds/explosion/ex_large9.wav b/sounds/explosion/ex_large9.wav index 48dd68093c..fceb789af9 100644 Binary files a/sounds/explosion/ex_large9.wav and b/sounds/explosion/ex_large9.wav differ diff --git a/sounds/explosion/ex_med11.wav b/sounds/explosion/ex_med11.wav index ccd369379e..1e09469c00 100644 Binary files a/sounds/explosion/ex_med11.wav and b/sounds/explosion/ex_med11.wav differ diff --git a/sounds/explosion/ex_med12.wav b/sounds/explosion/ex_med12.wav index 5fd4757563..b9c3698ca8 100644 Binary files a/sounds/explosion/ex_med12.wav and b/sounds/explosion/ex_med12.wav differ diff --git a/sounds/explosion/ex_med14.wav b/sounds/explosion/ex_med14.wav index a5d5a641ea..ba5dc2473f 100644 Binary files a/sounds/explosion/ex_med14.wav and b/sounds/explosion/ex_med14.wav differ diff --git a/sounds/explosion/ex_med17.wav b/sounds/explosion/ex_med17.wav index 53e9b78ff5..6384130518 100644 Binary files a/sounds/explosion/ex_med17.wav and b/sounds/explosion/ex_med17.wav differ diff --git a/sounds/explosion/ex_med19.wav b/sounds/explosion/ex_med19.wav new file mode 100644 index 0000000000..343f35654a Binary files /dev/null and b/sounds/explosion/ex_med19.wav differ diff --git a/sounds/explosion/ex_med3.wav b/sounds/explosion/ex_med3.wav index 8d30b275c3..a7a8bfc399 100644 Binary files a/sounds/explosion/ex_med3.wav and b/sounds/explosion/ex_med3.wav differ diff --git a/sounds/explosion/ex_med4.wav b/sounds/explosion/ex_med4.wav index 9e52842af1..aa7d81a6ff 100644 Binary files a/sounds/explosion/ex_med4.wav and b/sounds/explosion/ex_med4.wav differ diff --git a/sounds/explosion/ex_med5.wav b/sounds/explosion/ex_med5.wav index 30b1ad7f37..dda20039c4 100644 Binary files a/sounds/explosion/ex_med5.wav and b/sounds/explosion/ex_med5.wav differ diff --git a/sounds/explosion/ex_med6.wav b/sounds/explosion/ex_med6.wav index 7bc0b7e2a5..bc506e60ee 100644 Binary files a/sounds/explosion/ex_med6.wav and b/sounds/explosion/ex_med6.wav differ diff --git a/sounds/explosion/ex_small1.wav b/sounds/explosion/ex_small1.wav index f0f44ed149..e8e8a8788f 100644 Binary files a/sounds/explosion/ex_small1.wav and b/sounds/explosion/ex_small1.wav differ diff --git a/sounds/explosion/ex_small12.wav b/sounds/explosion/ex_small12.wav index 77ca53e8f6..40dbf0bf9f 100644 Binary files a/sounds/explosion/ex_small12.wav and b/sounds/explosion/ex_small12.wav differ diff --git a/sounds/explosion/ex_small14.wav b/sounds/explosion/ex_small14.wav index 6b738dd630..048a34541e 100644 Binary files a/sounds/explosion/ex_small14.wav and b/sounds/explosion/ex_small14.wav differ diff --git a/sounds/explosion/ex_small4_2.wav b/sounds/explosion/ex_small4_2.wav index 7473ab532b..aa52f5aecd 100644 Binary files a/sounds/explosion/ex_small4_2.wav and b/sounds/explosion/ex_small4_2.wav differ diff --git a/sounds/explosion/ex_ultra1.wav b/sounds/explosion/ex_ultra1.wav index 7f9a018db7..bcdd190e35 100644 Binary files a/sounds/explosion/ex_ultra1.wav and b/sounds/explosion/ex_ultra1.wav differ diff --git a/sounds/explosion/ex_ultra8.wav b/sounds/explosion/ex_ultra8.wav index 7deccd0097..5b8c972724 100644 Binary files a/sounds/explosion/ex_ultra8.wav and b/sounds/explosion/ex_ultra8.wav differ diff --git a/sounds/explosion/ex_with_debri.wav b/sounds/explosion/ex_with_debri.wav index b38c3940aa..40af4b4e5b 100644 Binary files a/sounds/explosion/ex_with_debri.wav and b/sounds/explosion/ex_with_debri.wav differ diff --git a/sounds/explosion/mini_nuke.wav b/sounds/explosion/mini_nuke.wav index 2d2ad8fe2a..d012c09ec1 100644 Binary files a/sounds/explosion/mini_nuke.wav and b/sounds/explosion/mini_nuke.wav differ diff --git a/sounds/explosion/mini_nuke_2.wav b/sounds/explosion/mini_nuke_2.wav index 5e3f100c4f..fc720b7227 100644 Binary files a/sounds/explosion/mini_nuke_2.wav and b/sounds/explosion/mini_nuke_2.wav differ diff --git a/sounds/explosion/mini_nuke_short.wav b/sounds/explosion/mini_nuke_short.wav index d030fbf616..b285280dd9 100644 Binary files a/sounds/explosion/mini_nuke_short.wav and b/sounds/explosion/mini_nuke_short.wav differ diff --git a/sounds/explosion/origin.txt b/sounds/explosion/origin.txt index b55765c307..f559f3dc23 100644 --- a/sounds/explosion/origin.txt +++ b/sounds/explosion/origin.txt @@ -72,3 +72,12 @@ ex_small15.wav Apelsinsaft (CY-BY): mini_nuke_2.wav ex_large9.wav + + +Sound Effects below provided by Soniss (https://sonniss.com/) +Source: [Game Audio GDC Bundle 2018, 2021] — freely distributed collection +License: Royalty-free for commercial and non-commercial use (per bundle license) +Notes: All sounds used under the terms provided in the original GDC Bundle download package + +ex_large18.wav - Shapeforms Audio - Sci-Fi Weapons Cyberpunk Arsenal, Olivier Girardot - Guns & Explosions +ex_large19.wav - BluezoneCorp - Detonation - Explosion \ No newline at end of file diff --git a/sounds/explosion/scan_explode.wav b/sounds/explosion/scan_explode.wav index 1c47f741b2..7f10b55fdb 100644 Binary files a/sounds/explosion/scan_explode.wav and b/sounds/explosion/scan_explode.wav differ diff --git a/sounds/explosion/small_emp_explode.wav b/sounds/explosion/small_emp_explode.wav index 1a4481f0e6..af9693b8ac 100644 Binary files a/sounds/explosion/small_emp_explode.wav and b/sounds/explosion/small_emp_explode.wav differ diff --git a/sounds/explosion/unit_explosion.wav b/sounds/explosion/unit_explosion.wav index 042d211ea3..5da4b2e1ab 100644 Binary files a/sounds/explosion/unit_explosion.wav and b/sounds/explosion/unit_explosion.wav differ diff --git a/sounds/explosion/wet/ex_underwater.wav b/sounds/explosion/wet/ex_underwater.wav index f69513228b..0434c151b8 100644 Binary files a/sounds/explosion/wet/ex_underwater.wav and b/sounds/explosion/wet/ex_underwater.wav differ diff --git a/sounds/explosion/wet/ex_underwater_pulse.wav b/sounds/explosion/wet/ex_underwater_pulse.wav index 61578a2690..4039de705e 100644 Binary files a/sounds/explosion/wet/ex_underwater_pulse.wav and b/sounds/explosion/wet/ex_underwater_pulse.wav differ diff --git a/sounds/explosion/wet/large_water_explode.wav b/sounds/explosion/wet/large_water_explode.wav index 5b6b5eeafe..23cddfaf8f 100644 Binary files a/sounds/explosion/wet/large_water_explode.wav and b/sounds/explosion/wet/large_water_explode.wav differ diff --git a/sounds/explosion/wet/splash.wav b/sounds/explosion/wet/splash.wav index 54c4ad6567..c85b9b8e49 100644 Binary files a/sounds/explosion/wet/splash.wav and b/sounds/explosion/wet/splash.wav differ diff --git a/sounds/explosion/wet/underwater_resounding_thump.wav b/sounds/explosion/wet/underwater_resounding_thump.wav index b116adc4fd..bcd40c6afd 100644 Binary files a/sounds/explosion/wet/underwater_resounding_thump.wav and b/sounds/explosion/wet/underwater_resounding_thump.wav differ diff --git a/sounds/explosion/wet/underwater_resounding_thump_short.wav b/sounds/explosion/wet/underwater_resounding_thump_short.wav index 35deaeb913..c12d6a5f25 100644 Binary files a/sounds/explosion/wet/underwater_resounding_thump_short.wav and b/sounds/explosion/wet/underwater_resounding_thump_short.wav differ diff --git a/sounds/explosion/wet/watersplash.wav b/sounds/explosion/wet/watersplash.wav index 3bfd41cfc3..7fc5928b61 100644 Binary files a/sounds/explosion/wet/watersplash.wav and b/sounds/explosion/wet/watersplash.wav differ diff --git a/sounds/explosion/wet/watersplash2.wav b/sounds/explosion/wet/watersplash2.wav index f89ba9e5db..56c39cc447 100644 Binary files a/sounds/explosion/wet/watersplash2.wav and b/sounds/explosion/wet/watersplash2.wav differ diff --git a/sounds/impacts/shotgun_impactv5.wav b/sounds/impacts/shotgun_impactv5.wav index e170343bd8..93a88b0f66 100644 Binary files a/sounds/impacts/shotgun_impactv5.wav and b/sounds/impacts/shotgun_impactv5.wav differ diff --git a/sounds/jump.wav b/sounds/jump.wav index b96b29db77..286bed2e8d 100644 Binary files a/sounds/jump.wav and b/sounds/jump.wav differ diff --git a/sounds/jump_land.wav b/sounds/jump_land.wav index 36323d6b2d..cb4cc084bb 100644 Binary files a/sounds/jump_land.wav and b/sounds/jump_land.wav differ diff --git a/sounds/krog_stomp.wav b/sounds/krog_stomp.wav index 64f64527fc..f9dacb16ce 100644 Binary files a/sounds/krog_stomp.wav and b/sounds/krog_stomp.wav differ diff --git a/sounds/marker_place.wav b/sounds/marker_place.wav index 439bb217b2..85d1f81ecd 100644 Binary files a/sounds/marker_place.wav and b/sounds/marker_place.wav differ diff --git a/sounds/message_private.wav b/sounds/message_private.wav index 7bd47e3cc0..88c3622dd6 100644 Binary files a/sounds/message_private.wav and b/sounds/message_private.wav differ diff --git a/sounds/message_team.wav b/sounds/message_team.wav index 9ca28eacdf..27000ced36 100644 Binary files a/sounds/message_team.wav and b/sounds/message_team.wav differ diff --git a/sounds/misc/blowtorch.wav b/sounds/misc/blowtorch.wav index 530a338c28..fdd96ba088 100644 Binary files a/sounds/misc/blowtorch.wav and b/sounds/misc/blowtorch.wav differ diff --git a/sounds/misc/resurrect.wav b/sounds/misc/resurrect.wav index 465dba43a3..b6585ea443 100644 Binary files a/sounds/misc/resurrect.wav and b/sounds/misc/resurrect.wav differ diff --git a/sounds/misc/teleport.wav b/sounds/misc/teleport.wav index c6e0b9a548..4bde3e09b0 100644 Binary files a/sounds/misc/teleport.wav and b/sounds/misc/teleport.wav differ diff --git a/sounds/misc/teleport2.wav b/sounds/misc/teleport2.wav index 36d0d21015..162aec2ffb 100644 Binary files a/sounds/misc/teleport2.wav and b/sounds/misc/teleport2.wav differ diff --git a/sounds/misc/teleport2_reverse.wav b/sounds/misc/teleport2_reverse.wav index 1baeef673c..89df7a7ef9 100644 Binary files a/sounds/misc/teleport2_reverse.wav and b/sounds/misc/teleport2_reverse.wav differ diff --git a/sounds/misc/teleport_alt.wav b/sounds/misc/teleport_alt.wav index 750992d8af..f51e4c0ffd 100644 Binary files a/sounds/misc/teleport_alt.wav and b/sounds/misc/teleport_alt.wav differ diff --git a/sounds/misc/teleport_loop.wav b/sounds/misc/teleport_loop.wav index ed363e0faf..239c6c3339 100644 Binary files a/sounds/misc/teleport_loop.wav and b/sounds/misc/teleport_loop.wav differ diff --git a/sounds/misc/teleport_reverse.wav b/sounds/misc/teleport_reverse.wav index 3a95a9d5ff..642e01d9d2 100644 Binary files a/sounds/misc/teleport_reverse.wav and b/sounds/misc/teleport_reverse.wav differ diff --git a/sounds/misc/zombie_1.wav b/sounds/misc/zombie_1.wav index f71ddf34ea..58df1cec23 100644 Binary files a/sounds/misc/zombie_1.wav and b/sounds/misc/zombie_1.wav differ diff --git a/sounds/misc/zombie_2.wav b/sounds/misc/zombie_2.wav index 416773f0c7..4c169b5e9e 100644 Binary files a/sounds/misc/zombie_2.wav and b/sounds/misc/zombie_2.wav differ diff --git a/sounds/misc/zombie_3.wav b/sounds/misc/zombie_3.wav index a0e0d1f5b1..2adf32f7d9 100644 Binary files a/sounds/misc/zombie_3.wav and b/sounds/misc/zombie_3.wav differ diff --git a/sounds/place_beep.wav b/sounds/place_beep.wav index 3246b94caa..b0f76d7477 100644 Binary files a/sounds/place_beep.wav and b/sounds/place_beep.wav differ diff --git a/sounds/reply/adv_fusion_select.wav b/sounds/reply/adv_fusion_select.wav index fa95fc8dd3..34cab0de96 100644 Binary files a/sounds/reply/adv_fusion_select.wav and b/sounds/reply/adv_fusion_select.wav differ diff --git a/sounds/reply/advisor/aircraft_shot_down.wav b/sounds/reply/advisor/aircraft_shot_down.wav index bb7e31122f..e314c66c39 100644 Binary files a/sounds/reply/advisor/aircraft_shot_down.wav and b/sounds/reply/advisor/aircraft_shot_down.wav differ diff --git a/sounds/reply/advisor/building_destroyed.wav b/sounds/reply/advisor/building_destroyed.wav index d5986b06d1..25b999d326 100644 Binary files a/sounds/reply/advisor/building_destroyed.wav and b/sounds/reply/advisor/building_destroyed.wav differ diff --git a/sounds/reply/advisor/command_console_activated.wav b/sounds/reply/advisor/command_console_activated.wav index efdf0c8b96..6cbe9186ef 100644 Binary files a/sounds/reply/advisor/command_console_activated.wav and b/sounds/reply/advisor/command_console_activated.wav differ diff --git a/sounds/reply/advisor/commander_lost.wav b/sounds/reply/advisor/commander_lost.wav index d00318c1f1..10996f7dde 100644 Binary files a/sounds/reply/advisor/commander_lost.wav and b/sounds/reply/advisor/commander_lost.wav differ diff --git a/sounds/reply/advisor/commander_under_attack.wav b/sounds/reply/advisor/commander_under_attack.wav index 3a93061d18..d2762a2d22 100644 Binary files a/sounds/reply/advisor/commander_under_attack.wav and b/sounds/reply/advisor/commander_under_attack.wav differ diff --git a/sounds/reply/advisor/construction_complete.wav b/sounds/reply/advisor/construction_complete.wav index 0897448cb6..53f47e72d3 100644 Binary files a/sounds/reply/advisor/construction_complete.wav and b/sounds/reply/advisor/construction_complete.wav differ diff --git a/sounds/reply/advisor/enemy_aircraft_spotted.wav b/sounds/reply/advisor/enemy_aircraft_spotted.wav index 86c84f0f8e..c9ce6a98f0 100644 Binary files a/sounds/reply/advisor/enemy_aircraft_spotted.wav and b/sounds/reply/advisor/enemy_aircraft_spotted.wav differ diff --git a/sounds/reply/advisor/enemy_nuke_spotted.wav b/sounds/reply/advisor/enemy_nuke_spotted.wav index ab96fdb8ae..7ea63b5b51 100644 Binary files a/sounds/reply/advisor/enemy_nuke_spotted.wav and b/sounds/reply/advisor/enemy_nuke_spotted.wav differ diff --git a/sounds/reply/advisor/excess_metal.wav b/sounds/reply/advisor/excess_metal.wav index 7fa68dc6cd..48cdae25a2 100644 Binary files a/sounds/reply/advisor/excess_metal.wav and b/sounds/reply/advisor/excess_metal.wav differ diff --git a/sounds/reply/advisor/factory_idle.wav b/sounds/reply/advisor/factory_idle.wav index bf0f0be992..66189ad2ae 100644 Binary files a/sounds/reply/advisor/factory_idle.wav and b/sounds/reply/advisor/factory_idle.wav differ diff --git a/sounds/reply/advisor/stall_energy.wav b/sounds/reply/advisor/stall_energy.wav index da53f50aab..1e69999359 100644 Binary files a/sounds/reply/advisor/stall_energy.wav and b/sounds/reply/advisor/stall_energy.wav differ diff --git a/sounds/reply/advisor/stall_metal.wav b/sounds/reply/advisor/stall_metal.wav index 3f595e9ee1..4a6fbba2cc 100644 Binary files a/sounds/reply/advisor/stall_metal.wav and b/sounds/reply/advisor/stall_metal.wav differ diff --git a/sounds/reply/advisor/unit_lost.wav b/sounds/reply/advisor/unit_lost.wav index 4bdfd3a461..4e9740edae 100644 Binary files a/sounds/reply/advisor/unit_lost.wav and b/sounds/reply/advisor/unit_lost.wav differ diff --git a/sounds/reply/advisor/unit_operational.wav b/sounds/reply/advisor/unit_operational.wav index 5ced905f87..9dc2aab394 100644 Binary files a/sounds/reply/advisor/unit_operational.wav and b/sounds/reply/advisor/unit_operational.wav differ diff --git a/sounds/reply/advisor/warzone_active.wav b/sounds/reply/advisor/warzone_active.wav index 6bd799bee8..c6092a40b3 100644 Binary files a/sounds/reply/advisor/warzone_active.wav and b/sounds/reply/advisor/warzone_active.wav differ diff --git a/sounds/reply/advisor/warzone_paused.wav b/sounds/reply/advisor/warzone_paused.wav index 7544397260..d975866211 100644 Binary files a/sounds/reply/advisor/warzone_paused.wav and b/sounds/reply/advisor/warzone_paused.wav differ diff --git a/sounds/reply/alarm.wav b/sounds/reply/alarm.wav index a498878472..172229d540 100644 Binary files a/sounds/reply/alarm.wav and b/sounds/reply/alarm.wav differ diff --git a/sounds/reply/amph_move.wav b/sounds/reply/amph_move.wav index a9a4b6d9fc..5168bb9a16 100644 Binary files a/sounds/reply/amph_move.wav and b/sounds/reply/amph_move.wav differ diff --git a/sounds/reply/amph_select.wav b/sounds/reply/amph_select.wav index 1ded870705..e5c0ffd873 100644 Binary files a/sounds/reply/amph_select.wav and b/sounds/reply/amph_select.wav differ diff --git a/sounds/reply/bomber_move.wav b/sounds/reply/bomber_move.wav index 49557a3190..9b1f1c10e4 100644 Binary files a/sounds/reply/bomber_move.wav and b/sounds/reply/bomber_move.wav differ diff --git a/sounds/reply/bomber_select.wav b/sounds/reply/bomber_select.wav index 6e36007e98..21cda7fa81 100644 Binary files a/sounds/reply/bomber_select.wav and b/sounds/reply/bomber_select.wav differ diff --git a/sounds/reply/bot_move.wav b/sounds/reply/bot_move.wav index c35b8cf4cc..8ef37a41c1 100644 Binary files a/sounds/reply/bot_move.wav and b/sounds/reply/bot_move.wav differ diff --git a/sounds/reply/bot_move2.wav b/sounds/reply/bot_move2.wav index 27a4597bd6..5f01376d47 100644 Binary files a/sounds/reply/bot_move2.wav and b/sounds/reply/bot_move2.wav differ diff --git a/sounds/reply/bot_select.wav b/sounds/reply/bot_select.wav index e0893f53be..1fba8a6c52 100644 Binary files a/sounds/reply/bot_select.wav and b/sounds/reply/bot_select.wav differ diff --git a/sounds/reply/builder_start.wav b/sounds/reply/builder_start.wav index 5ecf5c98fc..901c501c7a 100644 Binary files a/sounds/reply/builder_start.wav and b/sounds/reply/builder_start.wav differ diff --git a/sounds/reply/building_select1.wav b/sounds/reply/building_select1.wav index 34cd0fbac0..d3bbea4fd3 100644 Binary files a/sounds/reply/building_select1.wav and b/sounds/reply/building_select1.wav differ diff --git a/sounds/reply/building_select2.wav b/sounds/reply/building_select2.wav index 9d553cdaec..79a193645a 100644 Binary files a/sounds/reply/building_select2.wav and b/sounds/reply/building_select2.wav differ diff --git a/sounds/reply/cloaker_select.wav b/sounds/reply/cloaker_select.wav index b31f9bb8f6..e2762084ec 100644 Binary files a/sounds/reply/cloaker_select.wav and b/sounds/reply/cloaker_select.wav differ diff --git a/sounds/reply/comdying_core_1.wav b/sounds/reply/comdying_core_1.wav index d563f17776..ac18cc35bf 100644 Binary files a/sounds/reply/comdying_core_1.wav and b/sounds/reply/comdying_core_1.wav differ diff --git a/sounds/reply/crawlie_select.wav b/sounds/reply/crawlie_select.wav index 725fdf2cdd..48bc4cf97a 100644 Binary files a/sounds/reply/crawlie_select.wav and b/sounds/reply/crawlie_select.wav differ diff --git a/sounds/reply/factory_select.wav b/sounds/reply/factory_select.wav index 4c665bbbdc..30bc053710 100644 Binary files a/sounds/reply/factory_select.wav and b/sounds/reply/factory_select.wav differ diff --git a/sounds/reply/faraday_select.wav b/sounds/reply/faraday_select.wav index 685bd17e7a..fb07dd9185 100644 Binary files a/sounds/reply/faraday_select.wav and b/sounds/reply/faraday_select.wav differ diff --git a/sounds/reply/fighter_move.wav b/sounds/reply/fighter_move.wav index 75280e6d8f..ac40c43719 100644 Binary files a/sounds/reply/fighter_move.wav and b/sounds/reply/fighter_move.wav differ diff --git a/sounds/reply/fighter_select.wav b/sounds/reply/fighter_select.wav index a6ebc9ff53..1c7d4cae97 100644 Binary files a/sounds/reply/fighter_select.wav and b/sounds/reply/fighter_select.wav differ diff --git a/sounds/reply/geo_select.wav b/sounds/reply/geo_select.wav index 2513212ca9..e3c56b0cc2 100644 Binary files a/sounds/reply/geo_select.wav and b/sounds/reply/geo_select.wav differ diff --git a/sounds/reply/gunship_move.wav b/sounds/reply/gunship_move.wav index cf0f147108..a5e0dfaf86 100644 Binary files a/sounds/reply/gunship_move.wav and b/sounds/reply/gunship_move.wav differ diff --git a/sounds/reply/gunship_move2.wav b/sounds/reply/gunship_move2.wav index 51d3d0bf3f..5fb08ed6a5 100644 Binary files a/sounds/reply/gunship_move2.wav and b/sounds/reply/gunship_move2.wav differ diff --git a/sounds/reply/gunship_select.wav b/sounds/reply/gunship_select.wav index 6023ab3335..1a1b9aad35 100644 Binary files a/sounds/reply/gunship_select.wav and b/sounds/reply/gunship_select.wav differ diff --git a/sounds/reply/heavy_bot_move.wav b/sounds/reply/heavy_bot_move.wav index a50aa0d6e3..1c7c9a4f13 100644 Binary files a/sounds/reply/heavy_bot_move.wav and b/sounds/reply/heavy_bot_move.wav differ diff --git a/sounds/reply/heavy_gunship_move.wav b/sounds/reply/heavy_gunship_move.wav index f7842c76a8..254426a1b0 100644 Binary files a/sounds/reply/heavy_gunship_move.wav and b/sounds/reply/heavy_gunship_move.wav differ diff --git a/sounds/reply/heavy_gunship_select.wav b/sounds/reply/heavy_gunship_select.wav index c25205794c..e766c74552 100644 Binary files a/sounds/reply/heavy_gunship_select.wav and b/sounds/reply/heavy_gunship_select.wav differ diff --git a/sounds/reply/hovercraft_move.wav b/sounds/reply/hovercraft_move.wav index be818bf007..df7babf60d 100644 Binary files a/sounds/reply/hovercraft_move.wav and b/sounds/reply/hovercraft_move.wav differ diff --git a/sounds/reply/hovercraft_select.wav b/sounds/reply/hovercraft_select.wav index aaef22f91d..75ca737fe9 100644 Binary files a/sounds/reply/hovercraft_select.wav and b/sounds/reply/hovercraft_select.wav differ diff --git a/sounds/reply/light_bot_move.wav b/sounds/reply/light_bot_move.wav index 6d76d4c86a..de05f62347 100644 Binary files a/sounds/reply/light_bot_move.wav and b/sounds/reply/light_bot_move.wav differ diff --git a/sounds/reply/light_bot_select.wav b/sounds/reply/light_bot_select.wav index 81cb4b3b88..d477439e50 100644 Binary files a/sounds/reply/light_bot_select.wav and b/sounds/reply/light_bot_select.wav differ diff --git a/sounds/reply/light_gunship_select.wav b/sounds/reply/light_gunship_select.wav index f02b8fc2c8..4d9549a375 100644 Binary files a/sounds/reply/light_gunship_select.wav and b/sounds/reply/light_gunship_select.wav differ diff --git a/sounds/reply/light_tank_move2.wav b/sounds/reply/light_tank_move2.wav index 14a8c26f30..783e034488 100644 Binary files a/sounds/reply/light_tank_move2.wav and b/sounds/reply/light_tank_move2.wav differ diff --git a/sounds/reply/light_turret_select.wav b/sounds/reply/light_turret_select.wav index 01aabfc568..a9a9c7f38b 100644 Binary files a/sounds/reply/light_turret_select.wav and b/sounds/reply/light_turret_select.wav differ diff --git a/sounds/reply/medium_bot_select.wav b/sounds/reply/medium_bot_select.wav index 858367bdfd..b9e3da1837 100644 Binary files a/sounds/reply/medium_bot_select.wav and b/sounds/reply/medium_bot_select.wav differ diff --git a/sounds/reply/radar_select.wav b/sounds/reply/radar_select.wav index 085eeeaca5..836edf9600 100644 Binary files a/sounds/reply/radar_select.wav and b/sounds/reply/radar_select.wav differ diff --git a/sounds/reply/rumble1.wav b/sounds/reply/rumble1.wav index 116fde0255..34fc32b267 100644 Binary files a/sounds/reply/rumble1.wav and b/sounds/reply/rumble1.wav differ diff --git a/sounds/reply/rumble2.wav b/sounds/reply/rumble2.wav index 7ed50aeb74..bda7670f23 100644 Binary files a/sounds/reply/rumble2.wav and b/sounds/reply/rumble2.wav differ diff --git a/sounds/reply/shield_select.wav b/sounds/reply/shield_select.wav index 1d167cab59..7e27a47cc5 100644 Binary files a/sounds/reply/shield_select.wav and b/sounds/reply/shield_select.wav differ diff --git a/sounds/reply/silo_select.wav b/sounds/reply/silo_select.wav index aa354da552..accf00c7c9 100644 Binary files a/sounds/reply/silo_select.wav and b/sounds/reply/silo_select.wav differ diff --git a/sounds/reply/sonar_select.wav b/sounds/reply/sonar_select.wav index 5bcd9bd546..74e4855cb1 100644 Binary files a/sounds/reply/sonar_select.wav and b/sounds/reply/sonar_select.wav differ diff --git a/sounds/reply/spider_move.wav b/sounds/reply/spider_move.wav index 0a25b841cc..3050409aa4 100644 Binary files a/sounds/reply/spider_move.wav and b/sounds/reply/spider_move.wav differ diff --git a/sounds/reply/spider_select.wav b/sounds/reply/spider_select.wav index 9e50782b9d..9167f07f4b 100644 Binary files a/sounds/reply/spider_select.wav and b/sounds/reply/spider_select.wav differ diff --git a/sounds/reply/spider_select2.wav b/sounds/reply/spider_select2.wav index d93ec4e9a0..cb8f26b0c8 100644 Binary files a/sounds/reply/spider_select2.wav and b/sounds/reply/spider_select2.wav differ diff --git a/sounds/reply/spy_move.wav b/sounds/reply/spy_move.wav index 69d2e2dd4b..6f6a43a4c4 100644 Binary files a/sounds/reply/spy_move.wav and b/sounds/reply/spy_move.wav differ diff --git a/sounds/reply/spy_select.wav b/sounds/reply/spy_select.wav index e900aef938..8370dda397 100644 Binary files a/sounds/reply/spy_select.wav and b/sounds/reply/spy_select.wav differ diff --git a/sounds/reply/sub_select.wav b/sounds/reply/sub_select.wav index 4ae60b0527..8bd188907a 100644 Binary files a/sounds/reply/sub_select.wav and b/sounds/reply/sub_select.wav differ diff --git a/sounds/reply/tank_move.wav b/sounds/reply/tank_move.wav index f48c0e2d58..097de2338a 100644 Binary files a/sounds/reply/tank_move.wav and b/sounds/reply/tank_move.wav differ diff --git a/sounds/reply/tank_select.wav b/sounds/reply/tank_select.wav index f457505ce2..552f855c76 100644 Binary files a/sounds/reply/tank_select.wav and b/sounds/reply/tank_select.wav differ diff --git a/sounds/reply/teleport_select.wav b/sounds/reply/teleport_select.wav index 92a52550bc..cc8000f6c7 100644 Binary files a/sounds/reply/teleport_select.wav and b/sounds/reply/teleport_select.wav differ diff --git a/sounds/reply/turret_heavy_move.wav b/sounds/reply/turret_heavy_move.wav index 196de1824c..e79705592e 100644 Binary files a/sounds/reply/turret_heavy_move.wav and b/sounds/reply/turret_heavy_move.wav differ diff --git a/sounds/reply/turret_heavy_move2.wav b/sounds/reply/turret_heavy_move2.wav index 4076417b7d..e8056f078f 100644 Binary files a/sounds/reply/turret_heavy_move2.wav and b/sounds/reply/turret_heavy_move2.wav differ diff --git a/sounds/reply/turret_move.wav b/sounds/reply/turret_move.wav index 5786dc3e26..156cb7e1d3 100644 Binary files a/sounds/reply/turret_move.wav and b/sounds/reply/turret_move.wav differ diff --git a/sounds/reply/turret_select.wav b/sounds/reply/turret_select.wav index 934d752900..c5b999e090 100644 Binary files a/sounds/reply/turret_select.wav and b/sounds/reply/turret_select.wav differ diff --git a/sounds/reply/vehicle_move.wav b/sounds/reply/vehicle_move.wav index 1a5c09ba4c..cd726c79e3 100644 Binary files a/sounds/reply/vehicle_move.wav and b/sounds/reply/vehicle_move.wav differ diff --git a/sounds/reply/vehicle_select.wav b/sounds/reply/vehicle_select.wav index 2b9cd71b39..faeb8b007f 100644 Binary files a/sounds/reply/vehicle_select.wav and b/sounds/reply/vehicle_select.wav differ diff --git a/sounds/reply/vehicle_select2.wav b/sounds/reply/vehicle_select2.wav index 11c266c7d6..233c6f75c4 100644 Binary files a/sounds/reply/vehicle_select2.wav and b/sounds/reply/vehicle_select2.wav differ diff --git a/sounds/reply/windmill.wav b/sounds/reply/windmill.wav index 394204f2b8..3b4c835768 100644 Binary files a/sounds/reply/windmill.wav and b/sounds/reply/windmill.wav differ diff --git a/sounds/something.wav b/sounds/something.wav index dd4c9a8304..9546d1eb1f 100644 Binary files a/sounds/something.wav and b/sounds/something.wav differ diff --git a/sounds/something2.wav b/sounds/something2.wav index 757ca35abd..2817803d7b 100644 Binary files a/sounds/something2.wav and b/sounds/something2.wav differ diff --git a/sounds/sparks.wav b/sounds/sparks.wav index b2e443bee4..bada02cf85 100644 Binary files a/sounds/sparks.wav and b/sounds/sparks.wav differ diff --git a/sounds/talk.wav b/sounds/talk.wav index 118e812dfe..2c68d5e6f7 100644 Binary files a/sounds/talk.wav and b/sounds/talk.wav differ diff --git a/sounds/weapon/LightningBolt.wav b/sounds/weapon/LightningBolt.wav index b4848d6573..700ba1155f 100644 Binary files a/sounds/weapon/LightningBolt.wav and b/sounds/weapon/LightningBolt.wav differ diff --git a/sounds/weapon/aoe_aura.wav b/sounds/weapon/aoe_aura.wav index 8658c18fb2..d74137100b 100644 Binary files a/sounds/weapon/aoe_aura.wav and b/sounds/weapon/aoe_aura.wav differ diff --git a/sounds/weapon/aoe_aura2.wav b/sounds/weapon/aoe_aura2.wav index 3b969c6080..78c08baa83 100644 Binary files a/sounds/weapon/aoe_aura2.wav and b/sounds/weapon/aoe_aura2.wav differ diff --git a/sounds/weapon/aoe_aura3.wav b/sounds/weapon/aoe_aura3.wav new file mode 100644 index 0000000000..b79b58c28e Binary files /dev/null and b/sounds/weapon/aoe_aura3.wav differ diff --git a/sounds/weapon/blackhole_fire.wav b/sounds/weapon/blackhole_fire.wav index 2627507114..8a52050e10 100644 Binary files a/sounds/weapon/blackhole_fire.wav and b/sounds/weapon/blackhole_fire.wav differ diff --git a/sounds/weapon/blade/blade_hit.wav b/sounds/weapon/blade/blade_hit.wav index 8e8bf17751..2869c2be82 100644 Binary files a/sounds/weapon/blade/blade_hit.wav and b/sounds/weapon/blade/blade_hit.wav differ diff --git a/sounds/weapon/blade/blade_soft.wav b/sounds/weapon/blade/blade_soft.wav index c9a0eb11a5..0deadb1e5e 100644 Binary files a/sounds/weapon/blade/blade_soft.wav and b/sounds/weapon/blade/blade_soft.wav differ diff --git a/sounds/weapon/blade/blade_swing.wav b/sounds/weapon/blade/blade_swing.wav index 6cd46ebebd..ad8e366932 100644 Binary files a/sounds/weapon/blade/blade_swing.wav and b/sounds/weapon/blade/blade_swing.wav differ diff --git a/sounds/weapon/blade/blade_swing2.wav b/sounds/weapon/blade/blade_swing2.wav new file mode 100644 index 0000000000..0a5e58190f Binary files /dev/null and b/sounds/weapon/blade/blade_swing2.wav differ diff --git a/sounds/weapon/blade/origin.txt b/sounds/weapon/blade/origin.txt index d6fe3e4355..51329a0d0f 100644 --- a/sounds/weapon/blade/origin.txt +++ b/sounds/weapon/blade/origin.txt @@ -1,2 +1,5 @@ by Ozmium (CC-BY): blade_soft.wav + +by DavidDumaisAudio +blade_swing2.wav \ No newline at end of file diff --git a/sounds/weapon/bomb_drop.wav b/sounds/weapon/bomb_drop.wav index 77df8d157e..e920663abd 100644 Binary files a/sounds/weapon/bomb_drop.wav and b/sounds/weapon/bomb_drop.wav differ diff --git a/sounds/weapon/bomb_drop2.wav b/sounds/weapon/bomb_drop2.wav new file mode 100644 index 0000000000..c623ee6b7c Binary files /dev/null and b/sounds/weapon/bomb_drop2.wav differ diff --git a/sounds/weapon/bomb_drop_short.wav b/sounds/weapon/bomb_drop_short.wav index 4fe02d7f1b..9a95d45800 100644 Binary files a/sounds/weapon/bomb_drop_short.wav and b/sounds/weapon/bomb_drop_short.wav differ diff --git a/sounds/weapon/bomb_hit.wav b/sounds/weapon/bomb_hit.wav index fffff751bd..629f3c5d09 100644 Binary files a/sounds/weapon/bomb_hit.wav and b/sounds/weapon/bomb_hit.wav differ diff --git a/sounds/weapon/brawler_emg5.wav b/sounds/weapon/brawler_emg5.wav index b9f43716a5..e99fce2d37 100644 Binary files a/sounds/weapon/brawler_emg5.wav and b/sounds/weapon/brawler_emg5.wav differ diff --git a/sounds/weapon/brawler_emg_v2.wav b/sounds/weapon/brawler_emg_v2.wav index 06d57992ca..deb1b1071a 100644 Binary files a/sounds/weapon/brawler_emg_v2.wav and b/sounds/weapon/brawler_emg_v2.wav differ diff --git a/sounds/weapon/burn.wav b/sounds/weapon/burn.wav index 85a408cd9c..272caedd08 100644 Binary files a/sounds/weapon/burn.wav and b/sounds/weapon/burn.wav differ diff --git a/sounds/weapon/burn_mixed.wav b/sounds/weapon/burn_mixed.wav index b693d4f354..d148510c1a 100644 Binary files a/sounds/weapon/burn_mixed.wav and b/sounds/weapon/burn_mixed.wav differ diff --git a/sounds/weapon/burning.wav b/sounds/weapon/burning.wav index 25a16d50d4..e6abb3de1a 100644 Binary files a/sounds/weapon/burning.wav and b/sounds/weapon/burning.wav differ diff --git a/sounds/weapon/burning_fixed.wav b/sounds/weapon/burning_fixed.wav index 05f5b35b38..5d7056b9fd 100644 Binary files a/sounds/weapon/burning_fixed.wav and b/sounds/weapon/burning_fixed.wav differ diff --git a/sounds/weapon/cannon/Machineg_single.wav b/sounds/weapon/cannon/Machineg_single.wav index 30d5e15cb3..e45a7e0629 100644 Binary files a/sounds/weapon/cannon/Machineg_single.wav and b/sounds/weapon/cannon/Machineg_single.wav differ diff --git a/sounds/weapon/cannon/arty_hit.wav b/sounds/weapon/cannon/arty_hit.wav index 791ad3c5ff..c57e414518 100644 Binary files a/sounds/weapon/cannon/arty_hit.wav and b/sounds/weapon/cannon/arty_hit.wav differ diff --git a/sounds/weapon/cannon/badger_fire.wav b/sounds/weapon/cannon/badger_fire.wav index f4945028aa..e8cb8496b0 100644 Binary files a/sounds/weapon/cannon/badger_fire.wav and b/sounds/weapon/cannon/badger_fire.wav differ diff --git a/sounds/weapon/cannon/badger_hit.wav b/sounds/weapon/cannon/badger_hit.wav index 1e54714aa9..b249e5fe5f 100644 Binary files a/sounds/weapon/cannon/badger_hit.wav and b/sounds/weapon/cannon/badger_hit.wav differ diff --git a/sounds/weapon/cannon/big_begrtha_gun_fire.wav b/sounds/weapon/cannon/big_begrtha_gun_fire.wav index c5223571b1..95594057f0 100644 Binary files a/sounds/weapon/cannon/big_begrtha_gun_fire.wav and b/sounds/weapon/cannon/big_begrtha_gun_fire.wav differ diff --git a/sounds/weapon/cannon/big_bertha_gun_fire2.wav b/sounds/weapon/cannon/big_bertha_gun_fire2.wav new file mode 100644 index 0000000000..0076e059ea Binary files /dev/null and b/sounds/weapon/cannon/big_bertha_gun_fire2.wav differ diff --git a/sounds/weapon/cannon/brawler_emg.wav b/sounds/weapon/cannon/brawler_emg.wav index cf465f78d6..b73351f8cc 100644 Binary files a/sounds/weapon/cannon/brawler_emg.wav and b/sounds/weapon/cannon/brawler_emg.wav differ diff --git a/sounds/weapon/cannon/brawler_emg3.wav b/sounds/weapon/cannon/brawler_emg3.wav new file mode 100644 index 0000000000..a7187fda98 Binary files /dev/null and b/sounds/weapon/cannon/brawler_emg3.wav differ diff --git a/sounds/weapon/cannon/cannon_fire1.wav b/sounds/weapon/cannon/cannon_fire1.wav index 70de5c4a56..81acd5714b 100644 Binary files a/sounds/weapon/cannon/cannon_fire1.wav and b/sounds/weapon/cannon/cannon_fire1.wav differ diff --git a/sounds/weapon/cannon/cannon_fire2.wav b/sounds/weapon/cannon/cannon_fire2.wav index 484962e18f..29a4cb4e6a 100644 Binary files a/sounds/weapon/cannon/cannon_fire2.wav and b/sounds/weapon/cannon/cannon_fire2.wav differ diff --git a/sounds/weapon/cannon/cannon_fire3.wav b/sounds/weapon/cannon/cannon_fire3.wav index 9ae76a3d5c..b06a6ad79a 100644 Binary files a/sounds/weapon/cannon/cannon_fire3.wav and b/sounds/weapon/cannon/cannon_fire3.wav differ diff --git a/sounds/weapon/cannon/cannon_fire4.wav b/sounds/weapon/cannon/cannon_fire4.wav index a28f743d93..902bacf699 100644 Binary files a/sounds/weapon/cannon/cannon_fire4.wav and b/sounds/weapon/cannon/cannon_fire4.wav differ diff --git a/sounds/weapon/cannon/cannon_fire5.wav b/sounds/weapon/cannon/cannon_fire5.wav index 9e3e55063e..e525774a36 100644 Binary files a/sounds/weapon/cannon/cannon_fire5.wav and b/sounds/weapon/cannon/cannon_fire5.wav differ diff --git a/sounds/weapon/cannon/cannon_fire6.wav b/sounds/weapon/cannon/cannon_fire6.wav index ad0d78ee90..2d76172380 100644 Binary files a/sounds/weapon/cannon/cannon_fire6.wav and b/sounds/weapon/cannon/cannon_fire6.wav differ diff --git a/sounds/weapon/cannon/cannon_fire7.wav b/sounds/weapon/cannon/cannon_fire7.wav index 7dff51afc7..92e53265b1 100644 Binary files a/sounds/weapon/cannon/cannon_fire7.wav and b/sounds/weapon/cannon/cannon_fire7.wav differ diff --git a/sounds/weapon/cannon/cannon_fire8.wav b/sounds/weapon/cannon/cannon_fire8.wav index 8e7b5271be..84220e2732 100644 Binary files a/sounds/weapon/cannon/cannon_fire8.wav and b/sounds/weapon/cannon/cannon_fire8.wav differ diff --git a/sounds/weapon/cannon/cannon_fire8_deep.wav b/sounds/weapon/cannon/cannon_fire8_deep.wav index 1440996d1d..14a2d70dce 100644 Binary files a/sounds/weapon/cannon/cannon_fire8_deep.wav and b/sounds/weapon/cannon/cannon_fire8_deep.wav differ diff --git a/sounds/weapon/cannon/cannon_fire9.wav b/sounds/weapon/cannon/cannon_fire9.wav index 71d2aca7d6..a8b83a3715 100644 Binary files a/sounds/weapon/cannon/cannon_fire9.wav and b/sounds/weapon/cannon/cannon_fire9.wav differ diff --git a/sounds/weapon/cannon/cannon_hit1.wav b/sounds/weapon/cannon/cannon_hit1.wav index 4a12e66455..467530bf47 100644 Binary files a/sounds/weapon/cannon/cannon_hit1.wav and b/sounds/weapon/cannon/cannon_hit1.wav differ diff --git a/sounds/weapon/cannon/cannon_hit2.wav b/sounds/weapon/cannon/cannon_hit2.wav index 3017a3b6d1..c00bf230b7 100644 Binary files a/sounds/weapon/cannon/cannon_hit2.wav and b/sounds/weapon/cannon/cannon_hit2.wav differ diff --git a/sounds/weapon/cannon/cannon_hit3.wav b/sounds/weapon/cannon/cannon_hit3.wav index 27c2d400e4..1db79b3221 100644 Binary files a/sounds/weapon/cannon/cannon_hit3.wav and b/sounds/weapon/cannon/cannon_hit3.wav differ diff --git a/sounds/weapon/cannon/cannon_hit4.wav b/sounds/weapon/cannon/cannon_hit4.wav index 9472b3257e..77ddb88df9 100644 Binary files a/sounds/weapon/cannon/cannon_hit4.wav and b/sounds/weapon/cannon/cannon_hit4.wav differ diff --git a/sounds/weapon/cannon/cannon_hit5.wav b/sounds/weapon/cannon/cannon_hit5.wav new file mode 100644 index 0000000000..12df3e93fd Binary files /dev/null and b/sounds/weapon/cannon/cannon_hit5.wav differ diff --git a/sounds/weapon/cannon/cannon_hit6.wav b/sounds/weapon/cannon/cannon_hit6.wav new file mode 100644 index 0000000000..396119190a Binary files /dev/null and b/sounds/weapon/cannon/cannon_hit6.wav differ diff --git a/sounds/weapon/cannon/cannon_hit7.wav b/sounds/weapon/cannon/cannon_hit7.wav new file mode 100644 index 0000000000..837c56e951 Binary files /dev/null and b/sounds/weapon/cannon/cannon_hit7.wav differ diff --git a/sounds/weapon/cannon/disruption_cannon1.wav b/sounds/weapon/cannon/disruption_cannon1.wav new file mode 100644 index 0000000000..85c2f022e3 Binary files /dev/null and b/sounds/weapon/cannon/disruption_cannon1.wav differ diff --git a/sounds/weapon/cannon/earthshaker.wav b/sounds/weapon/cannon/earthshaker.wav index 06fb3f0195..d87af050db 100644 Binary files a/sounds/weapon/cannon/earthshaker.wav and b/sounds/weapon/cannon/earthshaker.wav differ diff --git a/sounds/weapon/cannon/earthshaker2.wav b/sounds/weapon/cannon/earthshaker2.wav index 1ad43c5a05..202a8e138a 100644 Binary files a/sounds/weapon/cannon/earthshaker2.wav and b/sounds/weapon/cannon/earthshaker2.wav differ diff --git a/sounds/weapon/cannon/emg_hit.wav b/sounds/weapon/cannon/emg_hit.wav index a6ef28434b..0b700f6a3d 100644 Binary files a/sounds/weapon/cannon/emg_hit.wav and b/sounds/weapon/cannon/emg_hit.wav differ diff --git a/sounds/weapon/cannon/emg_hit2.wav b/sounds/weapon/cannon/emg_hit2.wav new file mode 100644 index 0000000000..93dfe01f85 Binary files /dev/null and b/sounds/weapon/cannon/emg_hit2.wav differ diff --git a/sounds/weapon/cannon/emg_hit3.wav b/sounds/weapon/cannon/emg_hit3.wav new file mode 100644 index 0000000000..8411bdf69e Binary files /dev/null and b/sounds/weapon/cannon/emg_hit3.wav differ diff --git a/sounds/weapon/cannon/flak_fire.wav b/sounds/weapon/cannon/flak_fire.wav index 57e5d00bae..a8018c917d 100644 Binary files a/sounds/weapon/cannon/flak_fire.wav and b/sounds/weapon/cannon/flak_fire.wav differ diff --git a/sounds/weapon/cannon/flak_hit.wav b/sounds/weapon/cannon/flak_hit.wav index ac99105fd6..f9241936f7 100644 Binary files a/sounds/weapon/cannon/flak_hit.wav and b/sounds/weapon/cannon/flak_hit.wav differ diff --git a/sounds/weapon/cannon/generic_cannon.wav b/sounds/weapon/cannon/generic_cannon.wav index be2c1dbf86..87a1502309 100644 Binary files a/sounds/weapon/cannon/generic_cannon.wav and b/sounds/weapon/cannon/generic_cannon.wav differ diff --git a/sounds/weapon/cannon/generic_cannon2.wav b/sounds/weapon/cannon/generic_cannon2.wav index 3afe432554..e0743784ad 100644 Binary files a/sounds/weapon/cannon/generic_cannon2.wav and b/sounds/weapon/cannon/generic_cannon2.wav differ diff --git a/sounds/weapon/cannon/heavy_cannon.wav b/sounds/weapon/cannon/heavy_cannon.wav index 197953c08b..be8a60a19c 100644 Binary files a/sounds/weapon/cannon/heavy_cannon.wav and b/sounds/weapon/cannon/heavy_cannon.wav differ diff --git a/sounds/weapon/cannon/heavy_cannon2.wav b/sounds/weapon/cannon/heavy_cannon2.wav index bc474832c5..b1884dffdb 100644 Binary files a/sounds/weapon/cannon/heavy_cannon2.wav and b/sounds/weapon/cannon/heavy_cannon2.wav differ diff --git a/sounds/weapon/cannon/large_cannon_fire.wav b/sounds/weapon/cannon/large_cannon_fire.wav index 4ebde5ea81..6897bcf502 100644 Binary files a/sounds/weapon/cannon/large_cannon_fire.wav and b/sounds/weapon/cannon/large_cannon_fire.wav differ diff --git a/sounds/weapon/cannon/lrpc_hit.wav b/sounds/weapon/cannon/lrpc_hit.wav index 3d80dd0e1b..d23f07708c 100644 Binary files a/sounds/weapon/cannon/lrpc_hit.wav and b/sounds/weapon/cannon/lrpc_hit.wav differ diff --git a/sounds/weapon/cannon/lrpc_hit2.wav b/sounds/weapon/cannon/lrpc_hit2.wav new file mode 100644 index 0000000000..5c39e24845 Binary files /dev/null and b/sounds/weapon/cannon/lrpc_hit2.wav differ diff --git a/sounds/weapon/cannon/medplasma_fire.wav b/sounds/weapon/cannon/medplasma_fire.wav index f88a1308a4..95e2f41ad6 100644 Binary files a/sounds/weapon/cannon/medplasma_fire.wav and b/sounds/weapon/cannon/medplasma_fire.wav differ diff --git a/sounds/weapon/cannon/mini_cannon.wav b/sounds/weapon/cannon/mini_cannon.wav index 9d473d506c..5a41f26e58 100644 Binary files a/sounds/weapon/cannon/mini_cannon.wav and b/sounds/weapon/cannon/mini_cannon.wav differ diff --git a/sounds/weapon/cannon/origin.txt b/sounds/weapon/cannon/origin.txt index 5c60498024..b6fd036f47 100644 --- a/sounds/weapon/cannon/origin.txt +++ b/sounds/weapon/cannon/origin.txt @@ -68,3 +68,13 @@ shell_gun.wav Apelsinsaft (CC-BY): cannon_fire9.wav + +Sound Effects below created with sources provided by Soniss (https://sonniss.com/) +Source: [Game Audio GDC Bundle 2016, 2019, 2020] — freely distributed collection +License: Royalty-free for commercial and non-commercial use (per bundle license) +Notes: All sounds used under the terms provided in the original GDC Bundle download package + +big_bertha_gun_fire2.wav - Airborne Sound - Battlefield Howitzers +cannon_hit5.wav - Airborne Sound - Battlefield Howitzers +lrpc_hit2.wav - Rock The Speakerbox - Broken +disruption_cannon1 - SoundMorph - Future Weapons 2 \ No newline at end of file diff --git a/sounds/weapon/cannon/outlaw_gun.wav b/sounds/weapon/cannon/outlaw_gun.wav index 4210f1de25..cff849d600 100644 Binary files a/sounds/weapon/cannon/outlaw_gun.wav and b/sounds/weapon/cannon/outlaw_gun.wav differ diff --git a/sounds/weapon/cannon/pillager_fire.wav b/sounds/weapon/cannon/pillager_fire.wav index 45ed3f9b23..7d6d32cb82 100644 Binary files a/sounds/weapon/cannon/pillager_fire.wav and b/sounds/weapon/cannon/pillager_fire.wav differ diff --git a/sounds/weapon/cannon/plasma_fire.wav b/sounds/weapon/cannon/plasma_fire.wav index b3a77de2d1..2f4bd1178d 100644 Binary files a/sounds/weapon/cannon/plasma_fire.wav and b/sounds/weapon/cannon/plasma_fire.wav differ diff --git a/sounds/weapon/cannon/plasma_fire_extra.wav b/sounds/weapon/cannon/plasma_fire_extra.wav index d1ac1a87f9..c8adc9e350 100644 Binary files a/sounds/weapon/cannon/plasma_fire_extra.wav and b/sounds/weapon/cannon/plasma_fire_extra.wav differ diff --git a/sounds/weapon/cannon/plasma_fire_extra2.wav b/sounds/weapon/cannon/plasma_fire_extra2.wav index 4cf0a3df5a..3809af2f79 100644 Binary files a/sounds/weapon/cannon/plasma_fire_extra2.wav and b/sounds/weapon/cannon/plasma_fire_extra2.wav differ diff --git a/sounds/weapon/cannon/plasma_hit.wav b/sounds/weapon/cannon/plasma_hit.wav index bf1e4923dd..4d24944ff3 100644 Binary files a/sounds/weapon/cannon/plasma_hit.wav and b/sounds/weapon/cannon/plasma_hit.wav differ diff --git a/sounds/weapon/cannon/reaper_hit.wav b/sounds/weapon/cannon/reaper_hit.wav index 131dd6ca5d..6d36abe940 100644 Binary files a/sounds/weapon/cannon/reaper_hit.wav and b/sounds/weapon/cannon/reaper_hit.wav differ diff --git a/sounds/weapon/cannon/reaper_hit_boost.wav b/sounds/weapon/cannon/reaper_hit_boost.wav index 7451c109fe..6e23122127 100644 Binary files a/sounds/weapon/cannon/reaper_hit_boost.wav and b/sounds/weapon/cannon/reaper_hit_boost.wav differ diff --git a/sounds/weapon/cannon/rhino.wav b/sounds/weapon/cannon/rhino.wav index ef6780c5bf..18eed97943 100644 Binary files a/sounds/weapon/cannon/rhino.wav and b/sounds/weapon/cannon/rhino.wav differ diff --git a/sounds/weapon/cannon/rhino2.wav b/sounds/weapon/cannon/rhino2.wav index 8cc544450a..3ed3be651f 100644 Binary files a/sounds/weapon/cannon/rhino2.wav and b/sounds/weapon/cannon/rhino2.wav differ diff --git a/sounds/weapon/cannon/rhino3.wav b/sounds/weapon/cannon/rhino3.wav index a733b94de8..4d14d5f741 100644 Binary files a/sounds/weapon/cannon/rhino3.wav and b/sounds/weapon/cannon/rhino3.wav differ diff --git a/sounds/weapon/cannon/rhino4.wav b/sounds/weapon/cannon/rhino4.wav index a787f6be63..4fafcb8617 100644 Binary files a/sounds/weapon/cannon/rhino4.wav and b/sounds/weapon/cannon/rhino4.wav differ diff --git a/sounds/weapon/cannon/shell_gun.wav b/sounds/weapon/cannon/shell_gun.wav index 9cc7fadc6b..a915c835f3 100644 Binary files a/sounds/weapon/cannon/shell_gun.wav and b/sounds/weapon/cannon/shell_gun.wav differ diff --git a/sounds/weapon/cannon/small_pop.WAV b/sounds/weapon/cannon/small_pop.WAV index c41f7657a4..0392fe98a1 100644 Binary files a/sounds/weapon/cannon/small_pop.WAV and b/sounds/weapon/cannon/small_pop.WAV differ diff --git a/sounds/weapon/cannon/steam.wav b/sounds/weapon/cannon/steam.wav index d0a77bfb6e..c0a1408874 100644 Binary files a/sounds/weapon/cannon/steam.wav and b/sounds/weapon/cannon/steam.wav differ diff --git a/sounds/weapon/cannon/supergun.wav b/sounds/weapon/cannon/supergun.wav index 386c33e31a..446ad90f16 100644 Binary files a/sounds/weapon/cannon/supergun.wav and b/sounds/weapon/cannon/supergun.wav differ diff --git a/sounds/weapon/cannon/supergun_bass_boost.wav b/sounds/weapon/cannon/supergun_bass_boost.wav index 0c7d20f2ca..962de35eca 100644 Binary files a/sounds/weapon/cannon/supergun_bass_boost.wav and b/sounds/weapon/cannon/supergun_bass_boost.wav differ diff --git a/sounds/weapon/cannon/supergun_bass_boost2.wav b/sounds/weapon/cannon/supergun_bass_boost2.wav new file mode 100644 index 0000000000..41cbccac71 Binary files /dev/null and b/sounds/weapon/cannon/supergun_bass_boost2.wav differ diff --git a/sounds/weapon/cannon/tremor_fire.wav b/sounds/weapon/cannon/tremor_fire.wav index 69cdc36594..91cc9bccc1 100644 Binary files a/sounds/weapon/cannon/tremor_fire.wav and b/sounds/weapon/cannon/tremor_fire.wav differ diff --git a/sounds/weapon/cannon/wolverine_fire.wav b/sounds/weapon/cannon/wolverine_fire.wav index ba48be8b8e..ad5d599718 100644 Binary files a/sounds/weapon/cannon/wolverine_fire.wav and b/sounds/weapon/cannon/wolverine_fire.wav differ diff --git a/sounds/weapon/claw.wav b/sounds/weapon/claw.wav index d741e281a9..fa08cecea5 100644 Binary files a/sounds/weapon/claw.wav and b/sounds/weapon/claw.wav differ diff --git a/sounds/weapon/constant_electric.wav b/sounds/weapon/constant_electric.wav index f284074edd..37d42414a1 100644 Binary files a/sounds/weapon/constant_electric.wav and b/sounds/weapon/constant_electric.wav differ diff --git a/sounds/weapon/depthcharge.wav b/sounds/weapon/depthcharge.wav index b7cd1ed4f5..4d0a624be2 100644 Binary files a/sounds/weapon/depthcharge.wav and b/sounds/weapon/depthcharge.wav differ diff --git a/sounds/weapon/drp_beat.wav b/sounds/weapon/drp_beat.wav index 5930603efb..69c68b24ac 100644 Binary files a/sounds/weapon/drp_beat.wav and b/sounds/weapon/drp_beat.wav differ diff --git a/sounds/weapon/electrical_crackle.wav b/sounds/weapon/electrical_crackle.wav index 68c2cad435..0e8a74b26b 100644 Binary files a/sounds/weapon/electrical_crackle.wav and b/sounds/weapon/electrical_crackle.wav differ diff --git a/sounds/weapon/emg.wav b/sounds/weapon/emg.wav index 7b3d8d69bc..858a9db07d 100644 Binary files a/sounds/weapon/emg.wav and b/sounds/weapon/emg.wav differ diff --git a/sounds/weapon/energy_weapon1.wav b/sounds/weapon/energy_weapon1.wav new file mode 100644 index 0000000000..d5bab8b2dc Binary files /dev/null and b/sounds/weapon/energy_weapon1.wav differ diff --git a/sounds/weapon/flak_fire.wav b/sounds/weapon/flak_fire.wav index 4337a9965b..ec83d973ad 100644 Binary files a/sounds/weapon/flak_fire.wav and b/sounds/weapon/flak_fire.wav differ diff --git a/sounds/weapon/flak_fire2.wav b/sounds/weapon/flak_fire2.wav index 45f9bcc86f..4bb44b11d3 100644 Binary files a/sounds/weapon/flak_fire2.wav and b/sounds/weapon/flak_fire2.wav differ diff --git a/sounds/weapon/flak_hit.wav b/sounds/weapon/flak_hit.wav index f5125314f2..f50be5a3d8 100644 Binary files a/sounds/weapon/flak_hit.wav and b/sounds/weapon/flak_hit.wav differ diff --git a/sounds/weapon/flak_hit2.wav b/sounds/weapon/flak_hit2.wav index a7f3bae48d..380b233386 100644 Binary files a/sounds/weapon/flak_hit2.wav and b/sounds/weapon/flak_hit2.wav differ diff --git a/sounds/weapon/flamethrower.wav b/sounds/weapon/flamethrower.wav index cef5f337c4..fd84b4efdf 100644 Binary files a/sounds/weapon/flamethrower.wav and b/sounds/weapon/flamethrower.wav differ diff --git a/sounds/weapon/gauss_fire.wav b/sounds/weapon/gauss_fire.wav index 4629edca13..0b593f8ea8 100644 Binary files a/sounds/weapon/gauss_fire.wav and b/sounds/weapon/gauss_fire.wav differ diff --git a/sounds/weapon/gauss_fire2.wav b/sounds/weapon/gauss_fire2.wav new file mode 100644 index 0000000000..c33eeeb5e5 Binary files /dev/null and b/sounds/weapon/gauss_fire2.wav differ diff --git a/sounds/weapon/gauss_fire_short.wav b/sounds/weapon/gauss_fire_short.wav new file mode 100644 index 0000000000..211c336727 Binary files /dev/null and b/sounds/weapon/gauss_fire_short.wav differ diff --git a/sounds/weapon/gauss_fire_small.wav b/sounds/weapon/gauss_fire_small.wav new file mode 100644 index 0000000000..a287bce184 Binary files /dev/null and b/sounds/weapon/gauss_fire_small.wav differ diff --git a/sounds/weapon/gauss_hit.wav b/sounds/weapon/gauss_hit.wav index 3f06962890..11fddf9329 100644 Binary files a/sounds/weapon/gauss_hit.wav and b/sounds/weapon/gauss_hit.wav differ diff --git a/sounds/weapon/gauss_hit_small.wav b/sounds/weapon/gauss_hit_small.wav new file mode 100644 index 0000000000..5e7fa703e2 Binary files /dev/null and b/sounds/weapon/gauss_hit_small.wav differ diff --git a/sounds/weapon/gnat_weapon.wav b/sounds/weapon/gnat_weapon.wav index 7c3dd4ca36..80af3251cd 100644 Binary files a/sounds/weapon/gnat_weapon.wav and b/sounds/weapon/gnat_weapon.wav differ diff --git a/sounds/weapon/gravity_fire.wav b/sounds/weapon/gravity_fire.wav index 2c25cc3e07..3326ac1779 100644 Binary files a/sounds/weapon/gravity_fire.wav and b/sounds/weapon/gravity_fire.wav differ diff --git a/sounds/weapon/heatray_fire.wav b/sounds/weapon/heatray_fire.wav index aabea711e6..b70d87aaf2 100644 Binary files a/sounds/weapon/heatray_fire.wav and b/sounds/weapon/heatray_fire.wav differ diff --git a/sounds/weapon/heatray_fire1.wav b/sounds/weapon/heatray_fire1.wav index 8da3dc0fd4..10077ddc31 100644 Binary files a/sounds/weapon/heatray_fire1.wav and b/sounds/weapon/heatray_fire1.wav differ diff --git a/sounds/weapon/heatray_fire2.wav b/sounds/weapon/heatray_fire2.wav index 6c1359cdc9..41200ad5bb 100644 Binary files a/sounds/weapon/heatray_fire2.wav and b/sounds/weapon/heatray_fire2.wav differ diff --git a/sounds/weapon/heatray_fire3.wav b/sounds/weapon/heatray_fire3.wav index 9510af49c2..3f01323da6 100644 Binary files a/sounds/weapon/heatray_fire3.wav and b/sounds/weapon/heatray_fire3.wav differ diff --git a/sounds/weapon/heatray_fire4.wav b/sounds/weapon/heatray_fire4.wav index d51a660ae9..e4900a33a3 100644 Binary files a/sounds/weapon/heatray_fire4.wav and b/sounds/weapon/heatray_fire4.wav differ diff --git a/sounds/weapon/heatray_fire5.wav b/sounds/weapon/heatray_fire5.wav index 83787cc557..b3b6472361 100644 Binary files a/sounds/weapon/heatray_fire5.wav and b/sounds/weapon/heatray_fire5.wav differ diff --git a/sounds/weapon/heatray_fire6.wav b/sounds/weapon/heatray_fire6.wav new file mode 100644 index 0000000000..80cb5c41f4 Binary files /dev/null and b/sounds/weapon/heatray_fire6.wav differ diff --git a/sounds/weapon/heatray_fire7.wav b/sounds/weapon/heatray_fire7.wav new file mode 100644 index 0000000000..2b3c3e0fc2 Binary files /dev/null and b/sounds/weapon/heatray_fire7.wav differ diff --git a/sounds/weapon/heatray_loop.wav b/sounds/weapon/heatray_loop.wav index fa406494c7..d778759711 100644 Binary files a/sounds/weapon/heatray_loop.wav and b/sounds/weapon/heatray_loop.wav differ diff --git a/sounds/weapon/heavy_emg.wav b/sounds/weapon/heavy_emg.wav index 4b9250ba06..69bf535745 100644 Binary files a/sounds/weapon/heavy_emg.wav and b/sounds/weapon/heavy_emg.wav differ diff --git a/sounds/weapon/heavy_emg2.wav b/sounds/weapon/heavy_emg2.wav new file mode 100644 index 0000000000..9201377e52 Binary files /dev/null and b/sounds/weapon/heavy_emg2.wav differ diff --git a/sounds/weapon/heavy_machinegun.wav b/sounds/weapon/heavy_machinegun.wav index 3c22fe26f4..46c423e21a 100644 Binary files a/sounds/weapon/heavy_machinegun.wav and b/sounds/weapon/heavy_machinegun.wav differ diff --git a/sounds/weapon/heavy_machinegun2.wav b/sounds/weapon/heavy_machinegun2.wav new file mode 100644 index 0000000000..fce431811a Binary files /dev/null and b/sounds/weapon/heavy_machinegun2.wav differ diff --git a/sounds/weapon/hiss.wav b/sounds/weapon/hiss.wav index c3bf51a5b9..2c6e5c7897 100644 Binary files a/sounds/weapon/hiss.wav and b/sounds/weapon/hiss.wav differ diff --git a/sounds/weapon/laser/aalaser.wav b/sounds/weapon/laser/aalaser.wav index 2c75dd808a..8b0c97ff85 100644 Binary files a/sounds/weapon/laser/aalaser.wav and b/sounds/weapon/laser/aalaser.wav differ diff --git a/sounds/weapon/laser/capture_ray.wav b/sounds/weapon/laser/capture_ray.wav new file mode 100644 index 0000000000..1118f8a517 Binary files /dev/null and b/sounds/weapon/laser/capture_ray.wav differ diff --git a/sounds/weapon/laser/corehlt_fire.wav b/sounds/weapon/laser/corehlt_fire.wav index 2f30cc8d9d..281dd16f86 100644 Binary files a/sounds/weapon/laser/corehlt_fire.wav and b/sounds/weapon/laser/corehlt_fire.wav differ diff --git a/sounds/weapon/laser/corehlt_hit.wav b/sounds/weapon/laser/corehlt_hit.wav index 74e434126b..15a7553473 100644 Binary files a/sounds/weapon/laser/corehlt_hit.wav and b/sounds/weapon/laser/corehlt_hit.wav differ diff --git a/sounds/weapon/laser/heavy_laser3.wav b/sounds/weapon/laser/heavy_laser3.wav index 8706038448..1c8531bf80 100644 Binary files a/sounds/weapon/laser/heavy_laser3.wav and b/sounds/weapon/laser/heavy_laser3.wav differ diff --git a/sounds/weapon/laser/heavy_laser4.wav b/sounds/weapon/laser/heavy_laser4.wav index 2797ddc311..9fdfd3f5d5 100644 Binary files a/sounds/weapon/laser/heavy_laser4.wav and b/sounds/weapon/laser/heavy_laser4.wav differ diff --git a/sounds/weapon/laser/heavy_laser5.wav b/sounds/weapon/laser/heavy_laser5.wav index 291a46bfab..175568149f 100644 Binary files a/sounds/weapon/laser/heavy_laser5.wav and b/sounds/weapon/laser/heavy_laser5.wav differ diff --git a/sounds/weapon/laser/heavy_laser6.wav b/sounds/weapon/laser/heavy_laser6.wav index 9a36caa74b..f02ce2424e 100644 Binary files a/sounds/weapon/laser/heavy_laser6.wav and b/sounds/weapon/laser/heavy_laser6.wav differ diff --git a/sounds/weapon/laser/heavy_laser7.wav b/sounds/weapon/laser/heavy_laser7.wav new file mode 100644 index 0000000000..819e3341a8 Binary files /dev/null and b/sounds/weapon/laser/heavy_laser7.wav differ diff --git a/sounds/weapon/laser/heavy_laser8.wav b/sounds/weapon/laser/heavy_laser8.wav new file mode 100644 index 0000000000..94f3cd0890 Binary files /dev/null and b/sounds/weapon/laser/heavy_laser8.wav differ diff --git a/sounds/weapon/laser/heavylaser_fire.wav b/sounds/weapon/laser/heavylaser_fire.wav index 6a45c81887..7298698f8e 100644 Binary files a/sounds/weapon/laser/heavylaser_fire.wav and b/sounds/weapon/laser/heavylaser_fire.wav differ diff --git a/sounds/weapon/laser/heavylaser_fire2.wav b/sounds/weapon/laser/heavylaser_fire2.wav index 5ee2953919..f9ac2220ad 100644 Binary files a/sounds/weapon/laser/heavylaser_fire2.wav and b/sounds/weapon/laser/heavylaser_fire2.wav differ diff --git a/sounds/weapon/laser/laser_burn.wav b/sounds/weapon/laser/laser_burn.wav index 1076ebfd09..47717eb00c 100644 Binary files a/sounds/weapon/laser/laser_burn.wav and b/sounds/weapon/laser/laser_burn.wav differ diff --git a/sounds/weapon/laser/laser_burn10.wav b/sounds/weapon/laser/laser_burn10.wav index 0268d40e79..5ea34e691f 100644 Binary files a/sounds/weapon/laser/laser_burn10.wav and b/sounds/weapon/laser/laser_burn10.wav differ diff --git a/sounds/weapon/laser/laser_burn11.wav b/sounds/weapon/laser/laser_burn11.wav index 8bc99a5e49..bf05f0ffba 100644 Binary files a/sounds/weapon/laser/laser_burn11.wav and b/sounds/weapon/laser/laser_burn11.wav differ diff --git a/sounds/weapon/laser/laser_burn2.wav b/sounds/weapon/laser/laser_burn2.wav index 9d47951ff4..7e4da085b4 100644 Binary files a/sounds/weapon/laser/laser_burn2.wav and b/sounds/weapon/laser/laser_burn2.wav differ diff --git a/sounds/weapon/laser/laser_burn3.wav b/sounds/weapon/laser/laser_burn3.wav index 2b76e082d6..6f76f845e7 100644 Binary files a/sounds/weapon/laser/laser_burn3.wav and b/sounds/weapon/laser/laser_burn3.wav differ diff --git a/sounds/weapon/laser/laser_burn4.wav b/sounds/weapon/laser/laser_burn4.wav index 8ab126ebbf..1466cf2884 100644 Binary files a/sounds/weapon/laser/laser_burn4.wav and b/sounds/weapon/laser/laser_burn4.wav differ diff --git a/sounds/weapon/laser/laser_burn5.wav b/sounds/weapon/laser/laser_burn5.wav index 0413cb9f61..e7aca1b669 100644 Binary files a/sounds/weapon/laser/laser_burn5.wav and b/sounds/weapon/laser/laser_burn5.wav differ diff --git a/sounds/weapon/laser/laser_burn6.wav b/sounds/weapon/laser/laser_burn6.wav index cf6b5daa10..44ebec3541 100644 Binary files a/sounds/weapon/laser/laser_burn6.wav and b/sounds/weapon/laser/laser_burn6.wav differ diff --git a/sounds/weapon/laser/laser_burn7.wav b/sounds/weapon/laser/laser_burn7.wav index c86f80d479..0cb7bc8d00 100644 Binary files a/sounds/weapon/laser/laser_burn7.wav and b/sounds/weapon/laser/laser_burn7.wav differ diff --git a/sounds/weapon/laser/laser_burn8.wav b/sounds/weapon/laser/laser_burn8.wav index bcd3f5688f..eea8389723 100644 Binary files a/sounds/weapon/laser/laser_burn8.wav and b/sounds/weapon/laser/laser_burn8.wav differ diff --git a/sounds/weapon/laser/laser_burn9.wav b/sounds/weapon/laser/laser_burn9.wav index 255434529b..c809a88d5d 100644 Binary files a/sounds/weapon/laser/laser_burn9.wav and b/sounds/weapon/laser/laser_burn9.wav differ diff --git a/sounds/weapon/laser/lasercannon_fire.wav b/sounds/weapon/laser/lasercannon_fire.wav index b542d6cb4e..d56c088dc9 100644 Binary files a/sounds/weapon/laser/lasercannon_fire.wav and b/sounds/weapon/laser/lasercannon_fire.wav differ diff --git a/sounds/weapon/laser/lasercannon_hit.wav b/sounds/weapon/laser/lasercannon_hit.wav index 0e23cbe52c..47c3204871 100644 Binary files a/sounds/weapon/laser/lasercannon_hit.wav and b/sounds/weapon/laser/lasercannon_hit.wav differ diff --git a/sounds/weapon/laser/medlaser_fire.wav b/sounds/weapon/laser/medlaser_fire.wav index 96a9c79124..66c63485be 100644 Binary files a/sounds/weapon/laser/medlaser_fire.wav and b/sounds/weapon/laser/medlaser_fire.wav differ diff --git a/sounds/weapon/laser/medlaser_hit.wav b/sounds/weapon/laser/medlaser_hit.wav index 981b4b0289..8b76e49668 100644 Binary files a/sounds/weapon/laser/medlaser_hit.wav and b/sounds/weapon/laser/medlaser_hit.wav differ diff --git a/sounds/weapon/laser/mini_laser.wav b/sounds/weapon/laser/mini_laser.wav index c52697942a..aba10f4c20 100644 Binary files a/sounds/weapon/laser/mini_laser.wav and b/sounds/weapon/laser/mini_laser.wav differ diff --git a/sounds/weapon/laser/origin.txt b/sounds/weapon/laser/origin.txt index f2c5afad04..34a7754553 100644 --- a/sounds/weapon/laser/origin.txt +++ b/sounds/weapon/laser/origin.txt @@ -5,6 +5,7 @@ corehlt_hit.wav Nanoblobs: mini_laser.wav pulse_laser2.wav +capture_ray.wav Kanoba: heavylaser_fire.wav @@ -36,3 +37,14 @@ laser_fire_test1.wav - GoogleFrog pulse_laser.wav - Skorpio pulse_laser_start.wav - Skorpio + + +Sound Effects below created with sources provided by Soniss (https://sonniss.com/) +Source: [Game Audio GDC Bundle 2015, 2018, 2020, 2021-2023] — freely distributed collection +License: Royalty-free for commercial and non-commercial use (per bundle license) +Notes: All sounds used under the terms provided in the original GDC Bundle download package + +capture_ray.wav - David Dumais Audio - Sci-Fi Systems +small_laser_hit1.wav - RYK-Sounds - Laser Guns +small_laser_hit2.wav - RYK-Sounds - Laser Guns +heavy_laser7.wav - Gamemaster Audio - Silenced Gun Sounds \ No newline at end of file diff --git a/sounds/weapon/laser/pulse_laser.wav b/sounds/weapon/laser/pulse_laser.wav index 109540e6aa..2c3b2c0967 100644 Binary files a/sounds/weapon/laser/pulse_laser.wav and b/sounds/weapon/laser/pulse_laser.wav differ diff --git a/sounds/weapon/laser/pulse_laser2.wav b/sounds/weapon/laser/pulse_laser2.wav index 08f53c10fa..6aaa8eaf96 100644 Binary files a/sounds/weapon/laser/pulse_laser2.wav and b/sounds/weapon/laser/pulse_laser2.wav differ diff --git a/sounds/weapon/laser/pulse_laser3.wav b/sounds/weapon/laser/pulse_laser3.wav index 56d5ce6a69..4e9a0cdd24 100644 Binary files a/sounds/weapon/laser/pulse_laser3.wav and b/sounds/weapon/laser/pulse_laser3.wav differ diff --git a/sounds/weapon/laser/pulse_laser4.wav b/sounds/weapon/laser/pulse_laser4.wav new file mode 100644 index 0000000000..da22245b21 Binary files /dev/null and b/sounds/weapon/laser/pulse_laser4.wav differ diff --git a/sounds/weapon/laser/pulse_laser_start.wav b/sounds/weapon/laser/pulse_laser_start.wav index faa9044463..49c369cfba 100644 Binary files a/sounds/weapon/laser/pulse_laser_start.wav and b/sounds/weapon/laser/pulse_laser_start.wav differ diff --git a/sounds/weapon/laser/rapid_laser.wav b/sounds/weapon/laser/rapid_laser.wav index fd27275730..d3beb524a2 100644 Binary files a/sounds/weapon/laser/rapid_laser.wav and b/sounds/weapon/laser/rapid_laser.wav differ diff --git a/sounds/weapon/laser/rapid_laser2.wav b/sounds/weapon/laser/rapid_laser2.wav new file mode 100644 index 0000000000..c7c5119b6a Binary files /dev/null and b/sounds/weapon/laser/rapid_laser2.wav differ diff --git a/sounds/weapon/laser/small_laser_fire.wav b/sounds/weapon/laser/small_laser_fire.wav index 1682d7c2d3..33a5e11002 100644 Binary files a/sounds/weapon/laser/small_laser_fire.wav and b/sounds/weapon/laser/small_laser_fire.wav differ diff --git a/sounds/weapon/laser/small_laser_fire2.wav b/sounds/weapon/laser/small_laser_fire2.wav index bb389069ac..c177aba2a6 100644 Binary files a/sounds/weapon/laser/small_laser_fire2.wav and b/sounds/weapon/laser/small_laser_fire2.wav differ diff --git a/sounds/weapon/laser/small_laser_fire3.wav b/sounds/weapon/laser/small_laser_fire3.wav index 9a50a4e789..d37a214e59 100644 Binary files a/sounds/weapon/laser/small_laser_fire3.wav and b/sounds/weapon/laser/small_laser_fire3.wav differ diff --git a/sounds/weapon/laser/small_laser_fire4.wav b/sounds/weapon/laser/small_laser_fire4.wav index 3c2e9199a2..2a0ca93fed 100644 Binary files a/sounds/weapon/laser/small_laser_fire4.wav and b/sounds/weapon/laser/small_laser_fire4.wav differ diff --git a/sounds/weapon/laser/small_laser_hit1.wav b/sounds/weapon/laser/small_laser_hit1.wav new file mode 100644 index 0000000000..aac2f526e2 Binary files /dev/null and b/sounds/weapon/laser/small_laser_hit1.wav differ diff --git a/sounds/weapon/laser/small_laser_hit2.wav b/sounds/weapon/laser/small_laser_hit2.wav new file mode 100644 index 0000000000..4d22a2221a Binary files /dev/null and b/sounds/weapon/laser/small_laser_hit2.wav differ diff --git a/sounds/weapon/launcher.wav b/sounds/weapon/launcher.wav index a894150dea..6bc8583c0a 100644 Binary files a/sounds/weapon/launcher.wav and b/sounds/weapon/launcher.wav differ diff --git a/sounds/weapon/lightning_fire.wav b/sounds/weapon/lightning_fire.wav index e60ce30a1a..fa63889682 100644 Binary files a/sounds/weapon/lightning_fire.wav and b/sounds/weapon/lightning_fire.wav differ diff --git a/sounds/weapon/lightning_fire2.wav b/sounds/weapon/lightning_fire2.wav new file mode 100644 index 0000000000..be9f9d23e0 Binary files /dev/null and b/sounds/weapon/lightning_fire2.wav differ diff --git a/sounds/weapon/lightningbolt2.wav b/sounds/weapon/lightningbolt2.wav new file mode 100644 index 0000000000..86909b4d18 Binary files /dev/null and b/sounds/weapon/lightningbolt2.wav differ diff --git a/sounds/weapon/lightningbolt3.wav b/sounds/weapon/lightningbolt3.wav new file mode 100644 index 0000000000..c674d7d03f Binary files /dev/null and b/sounds/weapon/lightningbolt3.wav differ diff --git a/sounds/weapon/missile/banisher_fire.wav b/sounds/weapon/missile/banisher_fire.wav index a2cdade316..8a282f9ea4 100644 Binary files a/sounds/weapon/missile/banisher_fire.wav and b/sounds/weapon/missile/banisher_fire.wav differ diff --git a/sounds/weapon/missile/banisher_hit.wav b/sounds/weapon/missile/banisher_hit.wav new file mode 100644 index 0000000000..255e3eb0b4 Binary files /dev/null and b/sounds/weapon/missile/banisher_hit.wav differ diff --git a/sounds/weapon/missile/emp_missile_hit.wav b/sounds/weapon/missile/emp_missile_hit.wav index 8c5da852e1..5f28282f4c 100644 Binary files a/sounds/weapon/missile/emp_missile_hit.wav and b/sounds/weapon/missile/emp_missile_hit.wav differ diff --git a/sounds/weapon/missile/heavy_aa_fire.wav b/sounds/weapon/missile/heavy_aa_fire.wav index 3e6efcab9b..ba3b65c1cc 100644 Binary files a/sounds/weapon/missile/heavy_aa_fire.wav and b/sounds/weapon/missile/heavy_aa_fire.wav differ diff --git a/sounds/weapon/missile/heavy_aa_fire2.wav b/sounds/weapon/missile/heavy_aa_fire2.wav index 7113c1cea9..5cf76ad0da 100644 Binary files a/sounds/weapon/missile/heavy_aa_fire2.wav and b/sounds/weapon/missile/heavy_aa_fire2.wav differ diff --git a/sounds/weapon/missile/heavy_aa_hit.wav b/sounds/weapon/missile/heavy_aa_hit.wav index 02d561def0..2285dd283a 100644 Binary files a/sounds/weapon/missile/heavy_aa_hit.wav and b/sounds/weapon/missile/heavy_aa_hit.wav differ diff --git a/sounds/weapon/missile/heavymissile_launch.wav b/sounds/weapon/missile/heavymissile_launch.wav index 18a4fbc72d..1e0b496fe6 100644 Binary files a/sounds/weapon/missile/heavymissile_launch.wav and b/sounds/weapon/missile/heavymissile_launch.wav differ diff --git a/sounds/weapon/missile/large_missile_fire.wav b/sounds/weapon/missile/large_missile_fire.wav index da7a34e862..b99d7b24cc 100644 Binary files a/sounds/weapon/missile/large_missile_fire.wav and b/sounds/weapon/missile/large_missile_fire.wav differ diff --git a/sounds/weapon/missile/large_missile_fire2.wav b/sounds/weapon/missile/large_missile_fire2.wav index e800e4ef40..3f495e694f 100644 Binary files a/sounds/weapon/missile/large_missile_fire2.wav and b/sounds/weapon/missile/large_missile_fire2.wav differ diff --git a/sounds/weapon/missile/liche_fire.wav b/sounds/weapon/missile/liche_fire.wav index 424af09fda..ca1a2a3d8c 100644 Binary files a/sounds/weapon/missile/liche_fire.wav and b/sounds/weapon/missile/liche_fire.wav differ diff --git a/sounds/weapon/missile/liche_hit.wav b/sounds/weapon/missile/liche_hit.wav index b99e0a2a45..c3563667b2 100644 Binary files a/sounds/weapon/missile/liche_hit.wav and b/sounds/weapon/missile/liche_hit.wav differ diff --git a/sounds/weapon/missile/light_missile_fire.wav b/sounds/weapon/missile/light_missile_fire.wav index 6596152973..76ab89fb52 100644 Binary files a/sounds/weapon/missile/light_missile_fire.wav and b/sounds/weapon/missile/light_missile_fire.wav differ diff --git a/sounds/weapon/missile/med_aa_fire.wav b/sounds/weapon/missile/med_aa_fire.wav index 27150a5f30..d102b0139f 100644 Binary files a/sounds/weapon/missile/med_aa_fire.wav and b/sounds/weapon/missile/med_aa_fire.wav differ diff --git a/sounds/weapon/missile/med_aa_hit.wav b/sounds/weapon/missile/med_aa_hit.wav index bf169a5971..e887e52259 100644 Binary files a/sounds/weapon/missile/med_aa_hit.wav and b/sounds/weapon/missile/med_aa_hit.wav differ diff --git a/sounds/weapon/missile/med_rocket_fire.wav b/sounds/weapon/missile/med_rocket_fire.wav index b6ee266beb..7ab07c479e 100644 Binary files a/sounds/weapon/missile/med_rocket_fire.wav and b/sounds/weapon/missile/med_rocket_fire.wav differ diff --git a/sounds/weapon/missile/missile2_fire.wav b/sounds/weapon/missile/missile2_fire.wav index 965ac8bfff..09263457b8 100644 Binary files a/sounds/weapon/missile/missile2_fire.wav and b/sounds/weapon/missile/missile2_fire.wav differ diff --git a/sounds/weapon/missile/missile2_fire_bass.wav b/sounds/weapon/missile/missile2_fire_bass.wav index 581111a214..243c626fc1 100644 Binary files a/sounds/weapon/missile/missile2_fire_bass.wav and b/sounds/weapon/missile/missile2_fire_bass.wav differ diff --git a/sounds/weapon/missile/missile2_hit.wav b/sounds/weapon/missile/missile2_hit.wav index 30b1ad7f37..88056ccb1f 100644 Binary files a/sounds/weapon/missile/missile2_hit.wav and b/sounds/weapon/missile/missile2_hit.wav differ diff --git a/sounds/weapon/missile/missile_fire.wav b/sounds/weapon/missile/missile_fire.wav index 4fca5f3656..ecb7ef934e 100644 Binary files a/sounds/weapon/missile/missile_fire.wav and b/sounds/weapon/missile/missile_fire.wav differ diff --git a/sounds/weapon/missile/missile_fire10.wav b/sounds/weapon/missile/missile_fire10.wav index 708caa3ac0..1d082f65b7 100644 Binary files a/sounds/weapon/missile/missile_fire10.wav and b/sounds/weapon/missile/missile_fire10.wav differ diff --git a/sounds/weapon/missile/missile_fire11.wav b/sounds/weapon/missile/missile_fire11.wav index 248e05e249..10a561c454 100644 Binary files a/sounds/weapon/missile/missile_fire11.wav and b/sounds/weapon/missile/missile_fire11.wav differ diff --git a/sounds/weapon/missile/missile_fire12.wav b/sounds/weapon/missile/missile_fire12.wav index 5b87ce0e0c..b46329f24a 100644 Binary files a/sounds/weapon/missile/missile_fire12.wav and b/sounds/weapon/missile/missile_fire12.wav differ diff --git a/sounds/weapon/missile/missile_fire2.wav b/sounds/weapon/missile/missile_fire2.wav index 7637c98fc4..a3fe79b75c 100644 Binary files a/sounds/weapon/missile/missile_fire2.wav and b/sounds/weapon/missile/missile_fire2.wav differ diff --git a/sounds/weapon/missile/missile_fire3.wav b/sounds/weapon/missile/missile_fire3.wav index 5333f14aaf..719fea6e69 100644 Binary files a/sounds/weapon/missile/missile_fire3.wav and b/sounds/weapon/missile/missile_fire3.wav differ diff --git a/sounds/weapon/missile/missile_fire4.wav b/sounds/weapon/missile/missile_fire4.wav index 35de411424..d5464d008f 100644 Binary files a/sounds/weapon/missile/missile_fire4.wav and b/sounds/weapon/missile/missile_fire4.wav differ diff --git a/sounds/weapon/missile/missile_fire5.wav b/sounds/weapon/missile/missile_fire5.wav index 4fca5f3656..541a5ab089 100644 Binary files a/sounds/weapon/missile/missile_fire5.wav and b/sounds/weapon/missile/missile_fire5.wav differ diff --git a/sounds/weapon/missile/missile_fire6.wav b/sounds/weapon/missile/missile_fire6.wav index 395c377677..e163187df6 100644 Binary files a/sounds/weapon/missile/missile_fire6.wav and b/sounds/weapon/missile/missile_fire6.wav differ diff --git a/sounds/weapon/missile/missile_fire7.wav b/sounds/weapon/missile/missile_fire7.wav index 3f67d098dd..cc52d04c74 100644 Binary files a/sounds/weapon/missile/missile_fire7.wav and b/sounds/weapon/missile/missile_fire7.wav differ diff --git a/sounds/weapon/missile/missile_fire8.wav b/sounds/weapon/missile/missile_fire8.wav index 2ca73f8719..f7894534e2 100644 Binary files a/sounds/weapon/missile/missile_fire8.wav and b/sounds/weapon/missile/missile_fire8.wav differ diff --git a/sounds/weapon/missile/missile_fire9.wav b/sounds/weapon/missile/missile_fire9.wav index a5e0436848..6831c32993 100644 Binary files a/sounds/weapon/missile/missile_fire9.wav and b/sounds/weapon/missile/missile_fire9.wav differ diff --git a/sounds/weapon/missile/missile_fire9_heavy.wav b/sounds/weapon/missile/missile_fire9_heavy.wav index e095b8b94d..b2d32ade6f 100644 Binary files a/sounds/weapon/missile/missile_fire9_heavy.wav and b/sounds/weapon/missile/missile_fire9_heavy.wav differ diff --git a/sounds/weapon/missile/missile_launch.wav b/sounds/weapon/missile/missile_launch.wav index db4f259d68..510453fd37 100644 Binary files a/sounds/weapon/missile/missile_launch.wav and b/sounds/weapon/missile/missile_launch.wav differ diff --git a/sounds/weapon/missile/missile_launch_high.wav b/sounds/weapon/missile/missile_launch_high.wav index 19cee18cff..58be1d87e9 100644 Binary files a/sounds/weapon/missile/missile_launch_high.wav and b/sounds/weapon/missile/missile_launch_high.wav differ diff --git a/sounds/weapon/missile/missile_launch_short.wav b/sounds/weapon/missile/missile_launch_short.wav index cda88b2aaa..7cc35eafa1 100644 Binary files a/sounds/weapon/missile/missile_launch_short.wav and b/sounds/weapon/missile/missile_launch_short.wav differ diff --git a/sounds/weapon/missile/missile_small.wav b/sounds/weapon/missile/missile_small.wav index bc2a9a354a..482909544d 100644 Binary files a/sounds/weapon/missile/missile_small.wav and b/sounds/weapon/missile/missile_small.wav differ diff --git a/sounds/weapon/missile/nalpalm_missile_hit.wav b/sounds/weapon/missile/nalpalm_missile_hit.wav index 3b0820da92..28f31a344f 100644 Binary files a/sounds/weapon/missile/nalpalm_missile_hit.wav and b/sounds/weapon/missile/nalpalm_missile_hit.wav differ diff --git a/sounds/weapon/missile/origin.txt b/sounds/weapon/missile/origin.txt index 71e803e0a2..35416def93 100644 --- a/sounds/weapon/missile/origin.txt +++ b/sounds/weapon/missile/origin.txt @@ -46,3 +46,10 @@ emp_missile_hit.wav - Nanoblobs & Open LieroX vlaunch_emp_hit.wav - Nanoblobs & Open LieroX nalpalm_missile_hit.wav - Nanoblobs & Open LieroX heavymissile_launch.wav - Nanoblobs & Open LieroX + +Sound Effects below provided by Soniss (https://sonniss.com/) +Source: [Game Audio GDC Bundle 2016] — freely distributed collection +License: Royalty-free for commercial and non-commercial use (per bundle license) +Notes: All sounds used under the terms provided in the original GDC Bundle download package + +seismic_missile_hit.wav - SoundMorph - RUPTURE \ No newline at end of file diff --git a/sounds/weapon/missile/rapid_rocket_fire2.wav b/sounds/weapon/missile/rapid_rocket_fire2.wav index d29a2be93f..fdc973be16 100644 Binary files a/sounds/weapon/missile/rapid_rocket_fire2.wav and b/sounds/weapon/missile/rapid_rocket_fire2.wav differ diff --git a/sounds/weapon/missile/rapid_rocket_hit.wav b/sounds/weapon/missile/rapid_rocket_hit.wav index 6e3ae52df7..68831d7f7c 100644 Binary files a/sounds/weapon/missile/rapid_rocket_hit.wav and b/sounds/weapon/missile/rapid_rocket_hit.wav differ diff --git a/sounds/weapon/missile/rocket_fire.wav b/sounds/weapon/missile/rocket_fire.wav index b0f65681da..a6aa78a9d0 100644 Binary files a/sounds/weapon/missile/rocket_fire.wav and b/sounds/weapon/missile/rocket_fire.wav differ diff --git a/sounds/weapon/missile/rocket_fire2.wav b/sounds/weapon/missile/rocket_fire2.wav index d4c54fbe51..011b3c0360 100644 Binary files a/sounds/weapon/missile/rocket_fire2.wav and b/sounds/weapon/missile/rocket_fire2.wav differ diff --git a/sounds/weapon/missile/rocket_hit.wav b/sounds/weapon/missile/rocket_hit.wav index 2cc08a4b41..87a62990ab 100644 Binary files a/sounds/weapon/missile/rocket_hit.wav and b/sounds/weapon/missile/rocket_hit.wav differ diff --git a/sounds/weapon/missile/sabot_fire.wav b/sounds/weapon/missile/sabot_fire.wav index 82e995e2f6..c61c4d21a6 100644 Binary files a/sounds/weapon/missile/sabot_fire.wav and b/sounds/weapon/missile/sabot_fire.wav differ diff --git a/sounds/weapon/missile/sabot_fire_short.wav b/sounds/weapon/missile/sabot_fire_short.wav index cf7e1ab4e7..8d45979dc4 100644 Binary files a/sounds/weapon/missile/sabot_fire_short.wav and b/sounds/weapon/missile/sabot_fire_short.wav differ diff --git a/sounds/weapon/missile/sabot_hit.wav b/sounds/weapon/missile/sabot_hit.wav index aa7ed45979..7facdb40a3 100644 Binary files a/sounds/weapon/missile/sabot_hit.wav and b/sounds/weapon/missile/sabot_hit.wav differ diff --git a/sounds/weapon/missile/seismic_missile_hit.wav b/sounds/weapon/missile/seismic_missile_hit.wav new file mode 100644 index 0000000000..001e372b30 Binary files /dev/null and b/sounds/weapon/missile/seismic_missile_hit.wav differ diff --git a/sounds/weapon/missile/small_lightning_missile.wav b/sounds/weapon/missile/small_lightning_missile.wav index f735d70255..22d7cdfaac 100644 Binary files a/sounds/weapon/missile/small_lightning_missile.wav and b/sounds/weapon/missile/small_lightning_missile.wav differ diff --git a/sounds/weapon/missile/tacnuke_launch.wav b/sounds/weapon/missile/tacnuke_launch.wav index a91bf39929..4360be172a 100644 Binary files a/sounds/weapon/missile/tacnuke_launch.wav and b/sounds/weapon/missile/tacnuke_launch.wav differ diff --git a/sounds/weapon/missile/tacnuke_launch2.wav b/sounds/weapon/missile/tacnuke_launch2.wav index 25901c03be..8baf15cc9c 100644 Binary files a/sounds/weapon/missile/tacnuke_launch2.wav and b/sounds/weapon/missile/tacnuke_launch2.wav differ diff --git a/sounds/weapon/missile/tacnuke_launch2_trimmed.wav b/sounds/weapon/missile/tacnuke_launch2_trimmed.wav index 207965993a..9616cd041b 100644 Binary files a/sounds/weapon/missile/tacnuke_launch2_trimmed.wav and b/sounds/weapon/missile/tacnuke_launch2_trimmed.wav differ diff --git a/sounds/weapon/missile/vlaunch_emp_hit.wav b/sounds/weapon/missile/vlaunch_emp_hit.wav index dd8d156d76..2697c006f7 100644 Binary files a/sounds/weapon/missile/vlaunch_emp_hit.wav and b/sounds/weapon/missile/vlaunch_emp_hit.wav differ diff --git a/sounds/weapon/missile/vlaunch_emp_hit2.wav b/sounds/weapon/missile/vlaunch_emp_hit2.wav new file mode 100644 index 0000000000..927879208e Binary files /dev/null and b/sounds/weapon/missile/vlaunch_emp_hit2.wav differ diff --git a/sounds/weapon/missile/vlaunch_hit.wav b/sounds/weapon/missile/vlaunch_hit.wav index f5aa78d6cf..e22db87daa 100644 Binary files a/sounds/weapon/missile/vlaunch_hit.wav and b/sounds/weapon/missile/vlaunch_hit.wav differ diff --git a/sounds/weapon/missile/vlaunch_hit2.wav b/sounds/weapon/missile/vlaunch_hit2.wav new file mode 100644 index 0000000000..279cacf19b Binary files /dev/null and b/sounds/weapon/missile/vlaunch_hit2.wav differ diff --git a/sounds/weapon/more_lightning.wav b/sounds/weapon/more_lightning.wav index d6649825d2..be0f142897 100644 Binary files a/sounds/weapon/more_lightning.wav and b/sounds/weapon/more_lightning.wav differ diff --git a/sounds/weapon/more_lightning_fast.wav b/sounds/weapon/more_lightning_fast.wav index f5a35ff757..cf6c9ac7b1 100644 Binary files a/sounds/weapon/more_lightning_fast.wav and b/sounds/weapon/more_lightning_fast.wav differ diff --git a/sounds/weapon/nanosound2.wav b/sounds/weapon/nanosound2.wav index 34b47ee2ab..58110ee85d 100644 Binary files a/sounds/weapon/nanosound2.wav and b/sounds/weapon/nanosound2.wav differ diff --git a/sounds/weapon/origin.txt b/sounds/weapon/origin.txt index 7e63fb1575..21e50d7ddd 100644 --- a/sounds/weapon/origin.txt +++ b/sounds/weapon/origin.txt @@ -54,3 +54,15 @@ heatray_fire1.wav heatray_fire2.wav launcher.wav - blackhole_fire.wav (Golgotha), cloaker_select.wav (Scorched 3D) and shield_select.wav (Scorched 3D) + + +Sound Effects below created with sources provided by Soniss (https://sonniss.com/) +Source: [Game Audio GDC Bundle 2016, 2020, 2021-2023] — freely distributed collection +License: Royalty-free for commercial and non-commercial use (per bundle license) +Notes: All sounds used under the terms provided in the original GDC Bundle download package + +gauss_fire2.wav - SoundMorph - Future Weapons 2 +energy_weapon1.wav - SmartSoundFX - Futuristic +snipe_fire.wav - FLYSOUND - Mosin Nagant +snipe_hit.wav - BluezoneCorp - Detonation - Explosion, Shapeforms Audio - Sci-Fi Weapons Cyberpunk Arsenal +bomb_drop.wav - SmartSoundFX - Futuristic \ No newline at end of file diff --git a/sounds/weapon/other_lightning.wav b/sounds/weapon/other_lightning.wav index 7c3dd4ca36..ea96c603f9 100644 Binary files a/sounds/weapon/other_lightning.wav and b/sounds/weapon/other_lightning.wav differ diff --git a/sounds/weapon/quick_lightning.wav b/sounds/weapon/quick_lightning.wav index 0f2d9b9cda..8a457a79c6 100644 Binary files a/sounds/weapon/quick_lightning.wav and b/sounds/weapon/quick_lightning.wav differ diff --git a/sounds/weapon/saw.wav b/sounds/weapon/saw.wav index 3978183c0a..d832cff6cf 100644 Binary files a/sounds/weapon/saw.wav and b/sounds/weapon/saw.wav differ diff --git a/sounds/weapon/scorch.wav b/sounds/weapon/scorch.wav index 4a4353975b..8f747e50fb 100644 Binary files a/sounds/weapon/scorch.wav and b/sounds/weapon/scorch.wav differ diff --git a/sounds/weapon/sd_emgv7.wav b/sounds/weapon/sd_emgv7.wav index 34ea5a6b57..241e0cdb05 100644 Binary files a/sounds/weapon/sd_emgv7.wav and b/sounds/weapon/sd_emgv7.wav differ diff --git a/sounds/weapon/shotgun_firev4.wav b/sounds/weapon/shotgun_firev4.wav index 2989626e2c..2cfd30ab67 100644 Binary files a/sounds/weapon/shotgun_firev4.wav and b/sounds/weapon/shotgun_firev4.wav differ diff --git a/sounds/weapon/small_lightning.wav b/sounds/weapon/small_lightning.wav index 9f33f59d0d..ad5b019601 100644 Binary files a/sounds/weapon/small_lightning.wav and b/sounds/weapon/small_lightning.wav differ diff --git a/sounds/weapon/snipe_fire.wav b/sounds/weapon/snipe_fire.wav new file mode 100644 index 0000000000..d2e9821fe4 Binary files /dev/null and b/sounds/weapon/snipe_fire.wav differ diff --git a/sounds/weapon/snipe_hit.wav b/sounds/weapon/snipe_hit.wav new file mode 100644 index 0000000000..28feb79b60 Binary files /dev/null and b/sounds/weapon/snipe_hit.wav differ diff --git a/sounds/weapon/soft_crunch.wav b/sounds/weapon/soft_crunch.wav index a28a50da0d..aeb56ab051 100644 Binary files a/sounds/weapon/soft_crunch.wav and b/sounds/weapon/soft_crunch.wav differ diff --git a/sounds/weapon/sonic_blaster.wav b/sounds/weapon/sonic_blaster.wav index 944daf6129..ce82ea3d98 100644 Binary files a/sounds/weapon/sonic_blaster.wav and b/sounds/weapon/sonic_blaster.wav differ diff --git a/sounds/weapon/sonicgun.wav b/sounds/weapon/sonicgun.wav index 74f31075ac..b9da789195 100644 Binary files a/sounds/weapon/sonicgun.wav and b/sounds/weapon/sonicgun.wav differ diff --git a/sounds/weapon/sonicgun2.wav b/sounds/weapon/sonicgun2.wav index 931ac26b36..53dd440580 100644 Binary files a/sounds/weapon/sonicgun2.wav and b/sounds/weapon/sonicgun2.wav differ diff --git a/sounds/weapon/sonicgun_hit.wav b/sounds/weapon/sonicgun_hit.wav index 410403da66..3298c30906 100644 Binary files a/sounds/weapon/sonicgun_hit.wav and b/sounds/weapon/sonicgun_hit.wav differ diff --git a/sounds/weapon/torp_land.wav b/sounds/weapon/torp_land.wav index 635e45b52b..afa3d0fcb2 100644 Binary files a/sounds/weapon/torp_land.wav and b/sounds/weapon/torp_land.wav differ diff --git a/sounds/weapon/torpedo.wav b/sounds/weapon/torpedo.wav index 4083284e28..756f26972f 100644 Binary files a/sounds/weapon/torpedo.wav and b/sounds/weapon/torpedo.wav differ diff --git a/sounds/weapon/torpedofast.wav b/sounds/weapon/torpedofast.wav index 1495cd5da5..6743332815 100644 Binary files a/sounds/weapon/torpedofast.wav and b/sounds/weapon/torpedofast.wav differ diff --git a/sounds/weapon/unfa_blast_2.wav b/sounds/weapon/unfa_blast_2.wav index a8dc134f6a..457471986a 100644 Binary files a/sounds/weapon/unfa_blast_2.wav and b/sounds/weapon/unfa_blast_2.wav differ diff --git a/sounds/weapon/watershort.wav b/sounds/weapon/watershort.wav index 1ddec7da4c..bbaf4d4ee0 100644 Binary files a/sounds/weapon/watershort.wav and b/sounds/weapon/watershort.wav differ diff --git a/units/amphassault.lua b/units/amphassault.lua index fb47858115..d89e481674 100644 --- a/units/amphassault.lua +++ b/units/amphassault.lua @@ -119,8 +119,8 @@ return { amphassault = { reloadtime = 6, rgbColor = [[0 0 1]], scrollSpeed = 5, - soundStart = [[weapon/laser/heavy_laser3]], - soundStartVolume = 3, + soundStart = [[heavy_laser3_flat_pitch]], + soundStartVolume = 5, sweepfire = false, texture1 = [[largelaser]], texture2 = [[flare]], diff --git a/units/amphfloater.lua b/units/amphfloater.lua index d81ef63eb6..4eb2c8befe 100644 --- a/units/amphfloater.lua +++ b/units/amphfloater.lua @@ -107,10 +107,10 @@ return { amphfloater = { range = 450, reloadtime = 1.8, rgbcolor = [[0.9 0.1 0.9]], - soundHit = [[weapon/laser/small_laser_fire]], - soundHitVolume = 2.2, - soundStart = [[weapon/laser/small_laser_fire3]], - soundStartVolume = 3.5, + soundHit = [[weapon/laser/small_laser_hit1]], + soundHitVolume = 8, + soundStart = [[weapon/cannon/disruption_cannon1]], + soundStartVolume = 6.5, soundTrigger = true, turret = true, weaponType = [[Cannon]], @@ -148,7 +148,7 @@ return { amphfloater = { soundHit = [[weapon/laser/small_laser_fire]], soundHitVolume = 2.2, soundStart = [[weapon/laser/small_laser_fire3]], - soundStartVolume = 3.5, + soundStartVolume = 1.75, soundTrigger = true, turret = true, waterWeapon = true, diff --git a/units/amphraid.lua b/units/amphraid.lua index 8cb3c6543d..814313f206 100644 --- a/units/amphraid.lua +++ b/units/amphraid.lua @@ -145,10 +145,9 @@ return { amphraid = { projectiles = 1, range = 160, reloadtime = 2, - soundHit = [[explosion/wet/ex_underwater]], - --soundStart = [[weapon/torpedo]], - soundStartVolume = 0.7, - soundHitVolume = 0.7, + soundHit = [[TorpedoHitVariable]], + --soundStart = [[weapon/torpedo]], -- Implemented in LUS + soundHitVolume = 4.5, startVelocity = 140, tolerance = 1000, tracks = true, diff --git a/units/amphriot.lua b/units/amphriot.lua index 52cc9aa4d4..cbd71842e4 100644 --- a/units/amphriot.lua +++ b/units/amphriot.lua @@ -160,8 +160,9 @@ return { amphriot = { sizeDecay = 0, rgbColor = [[1 1 0]], soundHit = [[impacts/shotgun_impactv5]], + soundHitVolume = 1.2, soundStart = [[weapon/shotgun_firev4]], - soundStartVolume = 0.5, + soundStartVolume = 2.25, soundTrigger = true, sprayangle = 1800, stages = 20, diff --git a/units/amphsupport.lua b/units/amphsupport.lua index 55b2da8ce7..ab4b249bc2 100644 --- a/units/amphsupport.lua +++ b/units/amphsupport.lua @@ -93,6 +93,7 @@ return { amphsupport = { light_camera_height = 1400, light_color = [[0.80 0.54 0.23]], light_radius = 230, + burst = Shared.BURST_RELIABLE, }, damage = { diff --git a/units/bomberassault.lua b/units/bomberassault.lua index 6faa0b04ef..209cea4b8c 100644 --- a/units/bomberassault.lua +++ b/units/bomberassault.lua @@ -132,6 +132,7 @@ return { bomberassault = { thermite_ceg_damage = [[beamerray_angry_thermite_damage]], thermite_ceg = [[beamerray_angry_thermite]], thermite_sound = [[weapon/burning_fixed]], + thermite_sound_volume = 0.28, thermite_sound_hit = [[explosion/ex_med6]], light_color = [[2 1.7 1.1]], diff --git a/units/bomberprec.lua b/units/bomberprec.lua index 42a85cb539..b4d1529000 100644 --- a/units/bomberprec.lua +++ b/units/bomberprec.lua @@ -60,7 +60,7 @@ return { bomberprec = { }, sightDistance = 780, - speed = 234, + speed = 246, turnRadius = 300, workerTime = 0, @@ -153,6 +153,7 @@ return { bomberprec = { reloadtime = 8, smokeTrail = false, soundHit = [[weapon/bomb_hit]], + soundHitVolume = 10, soundStart = [[weapon/bomb_drop]], startVelocity = 135, tolerance = 8000, diff --git a/units/bomberriot.lua b/units/bomberriot.lua index 839ee4573d..09cf943109 100644 --- a/units/bomberriot.lua +++ b/units/bomberriot.lua @@ -55,7 +55,7 @@ return { bomberriot = { }, sightDistance = 780, - speed = 243, + speed = 231, turnRadius = 160, workerTime = 0, diff --git a/units/bomberstrike.lua b/units/bomberstrike.lua index c9439a07f2..f571fc5d3b 100644 --- a/units/bomberstrike.lua +++ b/units/bomberstrike.lua @@ -95,7 +95,7 @@ return { bomberstrike = { soundHit = [[explosion/ex_med5]], soundHitVolume = 8, soundStart = [[weapon/missile/missile_fire9_heavy]], - soundStartVolume = 7, + soundStartVolume = 6.2, startVelocity = 300, texture2 = [[lightsmoketrail]], tolerance = 4000, diff --git a/units/cloakaa.lua b/units/cloakaa.lua index 468c8c81a7..d00c9cf8f2 100644 --- a/units/cloakaa.lua +++ b/units/cloakaa.lua @@ -104,8 +104,8 @@ return { cloakaa = { range = 720, reloadtime = 0.3, rgbColor = [[0 1 1]], - soundStart = [[weapon/laser/rapid_laser]], - soundStartVolume = 4, + soundStart = [[weapon/laser/rapid_laser2]], + soundStartVolume = 4.5, thickness = 2.3, tolerance = 8192, turret = true, diff --git a/units/cloakassault.lua b/units/cloakassault.lua index 7fd9cc782a..83ce8a85bb 100644 --- a/units/cloakassault.lua +++ b/units/cloakassault.lua @@ -76,11 +76,12 @@ return { cloakassault = { craterMult = 0, customParams = { - extra_damage = 600, + extra_damage = 750, light_camera_height = 1600, light_color = [[0.85 0.85 1.2]], light_radius = 200, + burst = Shared.BURST_RELIABLE, }, cylinderTargeting = 0, @@ -103,6 +104,7 @@ return { cloakassault = { rgbColor = [[0.5 0.5 1]], soundStart = [[weapon/more_lightning_fast]], soundTrigger = true, + soundStartVolume = 7.0, sprayAngle = 900, texture1 = [[lightning]], thickness = 10, diff --git a/units/cloakskirm.lua b/units/cloakskirm.lua index bffecc691a..d42e281590 100644 --- a/units/cloakskirm.lua +++ b/units/cloakskirm.lua @@ -100,9 +100,9 @@ return { cloakskirm = { reloadtime = 3.5, smokeTrail = false, soundHit = [[weapon/missile/sabot_hit]], - soundHitVolume = 8, + soundHitVolume = 10, soundStart = [[weapon/missile/sabot_fire]], - soundStartVolume = 7, + soundStartVolume = 8, startVelocity = 200, tracks = false, turret = true, diff --git a/units/cloaksnipe.lua b/units/cloaksnipe.lua index 94fb18e08f..1792bb7bc2 100644 --- a/units/cloaksnipe.lua +++ b/units/cloaksnipe.lua @@ -111,8 +111,10 @@ return { cloaksnipe = { separation = 1.5, size = 5, sizeDecay = 0, - soundHit = [[weapon/laser/heavy_laser6]], + soundHit = [[weapon/snipe_hit]], + soundHitVolume = 10, soundStart = [[weapon/gauss_fire]], + soundStartVolume = 10, turret = true, weaponType = [[Cannon]], weaponVelocity = 850, diff --git a/units/dronecarry.lua b/units/dronecarry.lua index 59456dc3f9..092a0dff36 100644 --- a/units/dronecarry.lua +++ b/units/dronecarry.lua @@ -113,8 +113,8 @@ return { dronecarry = { reloadtime = 1/30, rgbColor = [[0 0.8 0.2]], scrollSpeed = 2.4, - soundStart = [[weapon/laser/pulse_laser2]], - soundStartVolume = 0.28, + soundStart = [[CaptureRay]], + soundStartVolume = 2.2, soundTrigger = true, sweepfire = false, texture1 = [[dosray]], diff --git a/units/empmissile.lua b/units/empmissile.lua index b83a5c077c..216dc18d82 100644 --- a/units/empmissile.lua +++ b/units/empmissile.lua @@ -91,7 +91,7 @@ return { empmissile = { reloadtime = 3, smokeTrail = false, soundHit = [[weapon/missile/emp_missile_hit]], - soundStart = [[SiloLaunch]], + soundStart = [[SiloLaunchEmp]], tolerance = 4000, tracks = false, turnrate = 12000, diff --git a/units/gunshipassault.lua b/units/gunshipassault.lua index fc79e82734..bef8e09522 100644 --- a/units/gunshipassault.lua +++ b/units/gunshipassault.lua @@ -98,6 +98,7 @@ return { gunshipassault = { smokeTrail = false, soundHit = [[weapon/missile/rapid_rocket_hit]], soundStart = [[weapon/missile/rapid_rocket_fire]], + soundStartVolume = 8.5, startVelocity = 150, tolerance = 15000, tracks = true, diff --git a/units/gunshipheavyskirm.lua b/units/gunshipheavyskirm.lua index 7abd2c947d..95b686e4eb 100644 --- a/units/gunshipheavyskirm.lua +++ b/units/gunshipheavyskirm.lua @@ -105,8 +105,10 @@ return { gunshipheavyskirm = { range = 600, reloadtime = 0.433, rgbColor = [[1 0.95 0.5]], - soundHit = [[weapon/cannon/emg_hit]], - soundStart = [[weapon/cannon/brawler_emg]], + soundHit = [[weapon/cannon/emg_hit3]], + soundHitVolume = 8, + soundStart = [[weapon/cannon/brawler_emg3]], + soundStartVolume = 9.6, sprayAngle = 1400, tolerance = 2000, turret = true, diff --git a/units/gunshipheavytrans.lua b/units/gunshipheavytrans.lua index 627e8da693..e833cd1c31 100644 --- a/units/gunshipheavytrans.lua +++ b/units/gunshipheavytrans.lua @@ -174,7 +174,7 @@ return { gunshipheavytrans = { range = 450, reloadtime = 0.4, rgbColor = [[0 1 1]], - soundStart = [[weapon/laser/rapid_laser]], + soundStart = [[weapon/laser/rapid_laser2]], soundStartVolume = 4, thickness = 2.3, tolerance = 8192, diff --git a/units/gunshipkrow.lua b/units/gunshipkrow.lua index c7c5b00939..9eac06901b 100644 --- a/units/gunshipkrow.lua +++ b/units/gunshipkrow.lua @@ -128,7 +128,7 @@ return { gunshipkrow = { rgbColor = [[0 0.6 0.9]], scrollSpeed = 2.7, soundStart = [[weapon/laser/heavylaser_fire2]], - soundStartVolume = 8.5, + soundStartVolume = 7, sweepfire = false, texture1 = [[largelaser]], texture2 = [[flare]], @@ -169,7 +169,7 @@ return { gunshipkrow = { soundHit = [[explosion/ex_med6]], soundHitVolume = 8, soundStart = [[weapon/cannon/mini_cannon]], - soundStartVolume = 2, + soundStartVolume = 3, sprayangle = 13500, turret = true, weaponType = [[Cannon]], diff --git a/units/gunshipraid.lua b/units/gunshipraid.lua index ba371b16b7..436f41b217 100644 --- a/units/gunshipraid.lua +++ b/units/gunshipraid.lua @@ -104,6 +104,7 @@ return { gunshipraid = { reloadtime = 4/30, rgbColor = [[1 0 0]], soundStart = [[weapon/laser/laser_burn9]], + soundStartVolume = 8.2, sweepfire = false, texture1 = [[largelaser]], texture2 = [[flare]], diff --git a/units/gunshipskirm.lua b/units/gunshipskirm.lua index b0ee975802..72a9325eb6 100644 --- a/units/gunshipskirm.lua +++ b/units/gunshipskirm.lua @@ -95,6 +95,7 @@ return { gunshipskirm = { smokeTrail = true, soundHit = [[explosion/ex_med11]], soundStart = [[weapon/missile/rocket_fire]], + soundStartVolume = 8.5, soundTrigger = true, startVelocity = 250, texture2 = [[purpletrail]], diff --git a/units/hoverarty.lua b/units/hoverarty.lua index f76a5dd889..3a59a6f710 100644 --- a/units/hoverarty.lua +++ b/units/hoverarty.lua @@ -103,7 +103,7 @@ return { hoverarty = { reloadtime = 23, rgbColor = [[0.25 0 1]], soundStart = [[weapon/laser/heavy_laser6]], - soundStartVolume = 15, + soundStartVolumne = 6.5, texture1 = [[largelaser]], texture2 = [[flare]], texture3 = [[flare]], diff --git a/units/hoverassault.lua b/units/hoverassault.lua index f6a01c86ff..da54f0413e 100644 --- a/units/hoverassault.lua +++ b/units/hoverassault.lua @@ -77,6 +77,7 @@ return { hoverassault = { light_camera_height = 1600, light_color = [[0.7 0.7 2.3]], light_radius = 160, + burst = Shared.BURST_RELIABLE, }, damage = { @@ -95,8 +96,10 @@ return { hoverassault = { range = 200, reloadtime = 1.2, rgbColor = [[0 0.3 1]], - soundHit = [[weapon/laser/small_laser_fire2]], - soundStart = [[weapon/laser/small_laser_fire3]], + soundHit = [[weapon/cannon/emg_hit2]], + soundHitVolume = 8, + soundStart = [[weapon/energy_weapon1]], + soundStartVolume = 10, soundTrigger = true, texture1 = [[energywave]], texture2 = [[null]], diff --git a/units/hoverheavyraid.lua b/units/hoverheavyraid.lua index 486c2a2fef..391ba68ebd 100644 --- a/units/hoverheavyraid.lua +++ b/units/hoverheavyraid.lua @@ -99,7 +99,7 @@ return { hoverheavyraid = { reloadtime = 0.4 + 1/30, rgbColor = [[0.3 0 0.4]], soundStart = [[weapon/laser/heavy_laser5]], - soundStartVolume = 3, + soundStartVolume = 2.7, soundTrigger = true, sweepfire = false, texture1 = [[largelaser]], diff --git a/units/hoverraid.lua b/units/hoverraid.lua index a0042a23cc..319873a8ee 100644 --- a/units/hoverraid.lua +++ b/units/hoverraid.lua @@ -104,11 +104,10 @@ return { hoverraid = { separation = 0.5, size = 0.8, sizeDecay = -0.1, - soundHit = [[weapon/gauss_hit]], - soundHitVolume = 2.5, - soundStart = [[weapon/gauss_fire]], - soundTrigger = true, - soundStartVolume = 2, + soundHit = [[weapon/gauss_hit_small]], + soundHitVolume = 8, + soundStart = [[weapon/gauss_fire_small]], + soundStartVolume = 10, sprayangle = 400, stages = 32, turret = true, diff --git a/units/hoverriot.lua b/units/hoverriot.lua index 0fcb48f981..81668b6bda 100644 --- a/units/hoverriot.lua +++ b/units/hoverriot.lua @@ -108,6 +108,7 @@ return { hoverriot = { reloadtime = 0.1, rgbColor = [[0 1 0]], soundStart = [[weapon/laser/laser_burn10]], + soundStartVolume = 9, soundTrigger = true, sweepfire = false, texture1 = [[largelaser]], diff --git a/units/hoverskirm.lua b/units/hoverskirm.lua index 98250eeb05..a2ca1872df 100644 --- a/units/hoverskirm.lua +++ b/units/hoverskirm.lua @@ -52,9 +52,9 @@ return { hoverskirm = { sightDistance = 484, sonarDistance = 484, - speed = 63, + speed = 66, turninplace = 0, - turnRate = 563, + turnRate = 577, workerTime = 0, weapons = { @@ -102,10 +102,10 @@ return { hoverskirm = { range = 440, reloadtime = 10, smokeTrail = true, - soundHit = [[explosion/ex_med5]], - soundHitVolume = 8, + soundHit = [[explosion/ex_med4]], + soundHitVolume = 6, soundStart = [[weapon/missile/rapid_rocket_fire2]], - soundStartVolume = 7, + soundStartVolume = 5, startVelocity = 190, texture2 = [[lightsmoketrail]], tracks = true, diff --git a/units/jumpaa.lua b/units/jumpaa.lua index 07b5462e73..9b28c0b34a 100644 --- a/units/jumpaa.lua +++ b/units/jumpaa.lua @@ -104,6 +104,7 @@ return { jumpaa = { rgbColor = [[1 0.95 0.4]], separation = 1.5, soundStart = [[weapon/cannon/brawler_emg]], + soundStartVolume = 3, stages = 10, sweepfire = false, tolerance = 8192, @@ -148,7 +149,7 @@ return { jumpaa = { reloadtime = 0.1, rgbColor = [[0 1 1]], soundStart = [[weapon/laser/rapid_laser]], - soundStartVolume = 4, + soundStartVolume = 2.5, thickness = 2.165, tolerance = 8192, turret = true, diff --git a/units/jumparty.lua b/units/jumparty.lua index b3fa20232b..f4c4b5b73e 100644 --- a/units/jumparty.lua +++ b/units/jumparty.lua @@ -110,9 +110,10 @@ return { jumparty = { reloadtime = 12, rgbColor = [[1 0.5 0.2]], size = 5, - soundHit = [[weapon/cannon/wolverine_hit]], + soundHit = [[FirewalkerHit]], + soundHitVolume = 7, soundStart = [[weapon/cannon/wolverine_fire]], - soundStartVolume = 3.2, + soundStartVolume = 1.4, sprayangle = 2500, turret = true, weaponType = [[Cannon]], diff --git a/units/jumpblackhole.lua b/units/jumpblackhole.lua index 2884b6295d..cbaa51e9e8 100644 --- a/units/jumpblackhole.lua +++ b/units/jumpblackhole.lua @@ -125,8 +125,6 @@ return { jumpblackhole = { size = 16, soundHit = [[weapon/blackhole_impact]], soundStart = [[weapon/blackhole_fire]], - soundStartVolume = 6000, - soundHitVolume = 6000, turret = true, weaponType = [[Cannon]], weaponVelocity = 550, diff --git a/units/jumpskirm.lua b/units/jumpskirm.lua index 540b036039..56673088d7 100644 --- a/units/jumpskirm.lua +++ b/units/jumpskirm.lua @@ -114,8 +114,8 @@ return { jumpskirm = { range = 420, reloadtime = 10, rgbColor = [[0.3 0 0.4]], - soundStart = [[weapon/laser/heavy_laser5]], - soundStartVolume = 3.8, + soundStart = [[weapon/laser/heavy_laser7]], + soundStartVolume = 10.0, soundTrigger = true, texture1 = [[largelaser]], texture2 = [[flare]], diff --git a/units/jumpsumo.lua b/units/jumpsumo.lua index cb71ca7aa0..3ae6eedfea 100644 --- a/units/jumpsumo.lua +++ b/units/jumpsumo.lua @@ -200,7 +200,7 @@ return { jumpsumo = { rgbColor = [[0 0 1]], rgbColor2 = [[1 0.5 1]], size = 2, - soundStart = [[weapon/gravity_fire]], + soundStart = [[gravity_fire]], soundTrigger = true, thickness = 4, tolerance = 5000, @@ -245,7 +245,7 @@ return { jumpsumo = { rgbColor = [[1 0 0]], rgbColor2 = [[1 0.5 1]], size = 2, - soundStart = [[weapon/gravity_fire]], + soundStart = [[gravity_fire]], soundTrigger = true, thickness = 4, tolerance = 5000, @@ -278,7 +278,7 @@ return { jumpsumo = { scarIndices = Shared.SCAR_SET.SUMO, soundHit = [[krog_stomp]], soundStart = [[krog_stomp]], - soundStartVolume = 3, + soundStartVolume = 5, turret = false, weaponType = [[Cannon]], weaponVelocity = 5, diff --git a/units/mahlazer.lua b/units/mahlazer.lua index 4c54ffc14e..264c6de1f7 100644 --- a/units/mahlazer.lua +++ b/units/mahlazer.lua @@ -106,7 +106,7 @@ return { mahlazer = { range = 10000, reloadtime = 20, rgbColor = [[0.25 0 1]], - soundStart = [[weapon/laser/heavy_laser4]], + soundStart = [[weapon/laser/heavy_laser8]], soundTrigger = true, texture1 = [[largelaser]], texture2 = [[none]], diff --git a/units/missileslow.lua b/units/missileslow.lua index 64de96009f..5c1efe123b 100644 --- a/units/missileslow.lua +++ b/units/missileslow.lua @@ -104,9 +104,10 @@ return { missileslow = { range = 6000, reloadtime = 10, smokeTrail = false, - soundHit = [[weapon/aoe_aura2]], - soundHitVolume = 15, - soundStart = [[SiloLaunch]], + soundHit = [[weapon/aoe_aura3]], + soundHitVolume = 8, + soundStart = [[SiloLaunchEmp]], + soundStartVolume = 7, tolerance = 4000, tracks = true, turnrate = 12000, diff --git a/units/planefighter.lua b/units/planefighter.lua index 319d1bcc53..8c181d006a 100644 --- a/units/planefighter.lua +++ b/units/planefighter.lua @@ -129,6 +129,7 @@ return { planefighter = { rgbColor = [[1 0 0]], soundHit = [[weapon/laser/lasercannon_hit]], soundStart = [[weapon/laser/small_laser_fire3]], + soundStartVolume = 3.8, soundTrigger = true, sweepfire = false, thickness = 2.85043856274785, @@ -175,6 +176,7 @@ return { planefighter = { reloadtime = 5.2, smokeTrail = true, soundHit = [[weapon/missile/rocket_hit]], + soundHitVolume = 9.2, soundStart = [[weapon/missile/missile_fire7]], startVelocity = 200, texture1 = [[flarescale01]], diff --git a/units/planeheavyfighter.lua b/units/planeheavyfighter.lua index b97fe4768f..dd02191f57 100644 --- a/units/planeheavyfighter.lua +++ b/units/planeheavyfighter.lua @@ -110,7 +110,8 @@ return { planeheavyfighter = { reloadtime = 0.1, rgbColor = [[0 1 1]], soundStart = [[weapon/laser/rapid_laser]], - soundStartVolume = 1.9, + soundTrigger = true, + soundStartVolume = 5.5, thickness = 1.95, tolerance = 8192, turret = true, diff --git a/units/planelightscout.lua b/units/planelightscout.lua index a091a96cd6..afd70dfb2b 100644 --- a/units/planelightscout.lua +++ b/units/planelightscout.lua @@ -101,7 +101,7 @@ return { planelightscout = { edgeEffectiveness = 0.4, explosionGenerator = "custom:scan_explode", soundHit = [[explosion/scan_explode]], - soundHitVolume = 4, + soundHitVolume = 10, }, } } } diff --git a/units/raveparty.lua b/units/raveparty.lua index 872ac70116..badb60e482 100644 --- a/units/raveparty.lua +++ b/units/raveparty.lua @@ -129,7 +129,9 @@ return { raveparty = { size = size, sizeDecay = sizeDecay, soundHit = [[explosion/mini_nuke]], + soundHitVolume = 8.2, soundStart = [[weapon/cannon/big_begrtha_gun_fire]], + soundStartVolume = 7, stages = stages, turret = true, weaponType = [[Cannon]], @@ -180,7 +182,9 @@ return { raveparty = { size = size, sizeDecay = sizeDecay, soundHit = [[weapon/missile/nalpalm_missile_hit]], + soundHitVolume = 7.5, soundStart = [[weapon/cannon/big_begrtha_gun_fire]], + soundStartVolume = 7, stages = stages, turret = true, weaponType = [[Cannon]], @@ -223,7 +227,9 @@ return { raveparty = { size = size, sizeDecay = sizeDecay, soundHit = [[weapon/cannon/earthshaker]], + soundHitVolume = 7.5, soundStart = [[weapon/cannon/big_begrtha_gun_fire]], + soundStartVolume = 7, stages = stages, turret = true, weaponType = [[Cannon]], @@ -269,7 +275,9 @@ return { raveparty = { size = size, sizeDecay = sizeDecay, soundHit = [[explosion/ex_large4]], + soundHitVolume = 4.0, soundStart = [[weapon/cannon/big_begrtha_gun_fire]], + soundStartVolume = 7, stages = stages, turret = true, weaponType = [[Cannon]], @@ -314,7 +322,7 @@ return { raveparty = { separation = separation, size = size, sizeDecay = sizeDecay, - soundHit = [[weapon/more_lightning]], + soundHit = [[weapon/missile/emp_missile_hit]], soundStart = [[weapon/cannon/big_begrtha_gun_fire]], stages = stages, turret = true, @@ -362,7 +370,9 @@ return { raveparty = { size = size, sizeDecay = sizeDecay, soundHit = [[weapon/aoe_aura2]], + soundHitVolume = 4, soundStart = [[weapon/cannon/big_begrtha_gun_fire]], + soundStartVolume = 7, stages = stages, turret = true, weaponType = [[Cannon]], diff --git a/units/seismic.lua b/units/seismic.lua index aa65e9cdea..0d5e3c8da1 100644 --- a/units/seismic.lua +++ b/units/seismic.lua @@ -100,7 +100,7 @@ return { seismic = { scarTtl = 45, smokeTrail = false, soundHit = [[explosion/ex_large4]], - soundStart = [[SiloLaunch]], + soundStart = [[SiloLaunchEmp]], tolerance = 4000, turnrate = 18000, waterWeapon = true, diff --git a/units/shieldassault.lua b/units/shieldassault.lua index b10829c89d..c79861fd5f 100644 --- a/units/shieldassault.lua +++ b/units/shieldassault.lua @@ -112,6 +112,7 @@ return { shieldassault = { light_camera_height = 1400, light_color = [[0.80 0.54 0.23]], light_radius = 200, + burst = Shared.BURST_RELIABLE, }, damage = { diff --git a/units/shieldfelon.lua b/units/shieldfelon.lua index f92aacd504..de91962cb8 100644 --- a/units/shieldfelon.lua +++ b/units/shieldfelon.lua @@ -123,7 +123,7 @@ return { shieldfelon = { reloadtime = 0.166, rgbColor = [[0.5 0 0.7]], soundStart = [[weapon/constant_electric]], - soundStartVolume = 9, + soundStartVolume = 9.5, soundTrigger = true, texture1 = [[corelaser]], thickness = 2, diff --git a/units/shieldraid.lua b/units/shieldraid.lua index affa30742f..9ae7a56f27 100644 --- a/units/shieldraid.lua +++ b/units/shieldraid.lua @@ -96,6 +96,7 @@ return { shieldraid = { rgbColor = [[1 0 0]], soundHit = [[weapon/laser/lasercannon_hit]], soundStart = [[weapon/laser/small_laser_fire2]], + soundStartVolume = 4.5, soundTrigger = true, thickness = 2.55, tolerance = 10000, diff --git a/units/shieldskirm.lua b/units/shieldskirm.lua index 0cedac55e3..c66602120b 100644 --- a/units/shieldskirm.lua +++ b/units/shieldskirm.lua @@ -98,7 +98,7 @@ return { shieldskirm = { soundHit = [[explosion/ex_med4]], soundHitVolume = 8, soundStart = [[weapon/missile/missile2_fire_bass]], - soundStartVolume = 7, + soundStartVolume = 9, startVelocity = 190, tracks = false, trajectoryHeight = 0.6, diff --git a/units/shiparty.lua b/units/shiparty.lua index 49dbcef5b3..656a4152a1 100644 --- a/units/shiparty.lua +++ b/units/shiparty.lua @@ -74,9 +74,9 @@ return { shiparty = { craterBoost = 1, craterMult = 2, - customParams = { - burst = Shared.BURST_RELIABLE, - }, + customParams = { + burst = Shared.BURST_RELIABLE, + }, damage = { default = 600.01, @@ -91,7 +91,8 @@ return { shiparty = { projectiles = 1, range = 1200, reloadtime = 7.3, - soundHit = [[weapon/cannon/cannon_hit2]], + soundHit = [[weapon/cannon/cannon_hit7]], + soundHitVolume = 8.5, soundStart = [[weapon/cannon/heavy_cannon]], turret = true, weaponType = [[Cannon]], diff --git a/units/shipcarrier.lua b/units/shipcarrier.lua index b22e5548b5..5744dcc1b5 100644 --- a/units/shipcarrier.lua +++ b/units/shipcarrier.lua @@ -121,7 +121,7 @@ return { shipcarrier = { reloadtime = 5, smokeTrail = true, soundHit = [[weapon/missile/emp_missile_hit]], - soundStart = [[weapon/missile/tacnuke_launch]], + soundStart = [[SiloLaunchEmp]], stockpile = true, stockpileTime = 10^5, tolerance = 4000, diff --git a/units/shipheavyarty.lua b/units/shipheavyarty.lua index 31bf4f8241..1d06915664 100644 --- a/units/shipheavyarty.lua +++ b/units/shipheavyarty.lua @@ -115,8 +115,10 @@ return { shipheavyarty = { projectiles = 1, range = 1600, reloadtime = 12.5, - soundHit = [[explosion/ex_large4]], + soundHit = [[explosion/ex_large19]], + soundHitVolume = 10, soundStart = [[explosion/ex_large5]], + soundStartVolume = 10, sprayAngle = 768, tolerance = 4096, turret = true, diff --git a/units/shipriot.lua b/units/shipriot.lua index 317424bd10..8f1ce7f8c7 100644 --- a/units/shipriot.lua +++ b/units/shipriot.lua @@ -90,8 +90,8 @@ return { shipriot = { customParams = { light_camera_height = 2000, - light_color = [[0.3 0.3 0.05]], - light_radius = 50, + light_color = [[0.1 0.1 0.015]], + light_radius = 40, }, damage = { @@ -113,8 +113,9 @@ return { shipriot = { size = 2, sizeDecay = 0, soundHit = [[impacts/shotgun_impactv5]], + soundHitVolume = 1, soundStart = [[weapon/cannon/cannon_fire4]], - soundStartVolume = 0.05, + soundStartVolume = 1.8, soundTrigger = true, sprayangle = 2500, stages = 20, diff --git a/units/shipskirm.lua b/units/shipskirm.lua index cfda6129c7..65a2802c7c 100644 --- a/units/shipskirm.lua +++ b/units/shipskirm.lua @@ -101,7 +101,7 @@ return { shipskirm = { reloadtime = 7.5, smokeTrail = false, soundHit = [[explosion/ex_med4]], - soundHitVolume = 8, + soundHitVolume = 7, soundStart = [[weapon/missile/missile2_fire_bass]], soundStartVolume = 7, startVelocity = 260, diff --git a/units/shiptorpraider.lua b/units/shiptorpraider.lua index 06e69d89d5..13fe09d8c4 100644 --- a/units/shiptorpraider.lua +++ b/units/shiptorpraider.lua @@ -104,9 +104,9 @@ return { shiptorpraider = { range = 240, reloadtime = 2.6, soundHit = [[TorpedoHitVariable]], - soundHitVolume = 2.8, + soundHitVolume = 5, soundStart = [[weapon/torp_land]], - soundStartVolume = 4, + soundStartVolume = 5.2, startVelocity = 60, tolerance = 100000, tracks = true, diff --git a/units/spiderantiheavy.lua b/units/spiderantiheavy.lua index 8243ba05fa..ab317e5987 100644 --- a/units/spiderantiheavy.lua +++ b/units/spiderantiheavy.lua @@ -91,7 +91,7 @@ return { spiderantiheavy = { range = 120, reloadtime = 35, rgbColor = [[1 1 0.25]], - soundStart = [[weapon/LightningBolt]], + soundStart = [[weapon/lightningbolt3]], soundTrigger = true, targetborder = 0.9, texture1 = [[lightning]], diff --git a/units/spiderassault.lua b/units/spiderassault.lua index c5e5d27334..0242ca9a88 100644 --- a/units/spiderassault.lua +++ b/units/spiderassault.lua @@ -77,6 +77,7 @@ return { spiderassault = { light_camera_height = 1800, light_color = [[0.80 0.54 0.23]], light_radius = 200, + burst = Shared.BURST_RELIABLE, }, damage = { diff --git a/units/spidercrabe.lua b/units/spidercrabe.lua index 5441103e8c..ea2a079375 100644 --- a/units/spidercrabe.lua +++ b/units/spidercrabe.lua @@ -102,7 +102,9 @@ return { spidercrabe = { range = 600, reloadtime = 4, soundHit = [[weapon/cannon/cannon_hit3]], + soundHitVolume = 10, soundStart = [[weapon/cannon/heavy_cannon2]], + soundStartVolume = 10, -- size = 5, -- maybe find a good size that is bigger than default turret = true, weaponType = [[Cannon]], diff --git a/units/spiderscout.lua b/units/spiderscout.lua index a050035d33..a6014f5adb 100644 --- a/units/spiderscout.lua +++ b/units/spiderscout.lua @@ -104,6 +104,7 @@ return { spiderscout = { reloadtime = 0.233, rgbColor = [[1 1 0]], soundStart = [[weapon/laser/small_laser_fire]], + soundStartVolume = 5, soundTrigger = true, thickness = 2.14476105895272, tolerance = 10000, diff --git a/units/staticarty.lua b/units/staticarty.lua index 8d7e9c9592..e438cb6577 100644 --- a/units/staticarty.lua +++ b/units/staticarty.lua @@ -93,8 +93,10 @@ return { staticarty = { mygravity = 0.1, range = 1850, reloadtime = 10, - soundHit = [[explosion/ex_large4]], + soundHit = [[explosion/ex_large18]], + soundHitVolume = 10, soundStart = [[explosion/ex_large5]], + soundStartVolume = 10, sprayangle = 1024, turret = true, weaponType = [[Cannon]], diff --git a/units/staticheavyarty.lua b/units/staticheavyarty.lua index 6e3a42f048..33c202443d 100644 --- a/units/staticheavyarty.lua +++ b/units/staticheavyarty.lua @@ -102,7 +102,9 @@ return { staticheavyarty = { range = 5600, reloadtime = 8, soundHit = [[weapon/cannon/lrpc_hit]], - soundStart = [[weapon/cannon/big_begrtha_gun_fire]], + soundHitVolume = 8, + soundStart = [[weapon/cannon/big_bertha_gun_fire2]], + soundStartVolume = 8, turret = true, weaponType = [[Cannon]], weaponVelocity = 1050, diff --git a/units/striderantiheavy.lua b/units/striderantiheavy.lua index b2a6b685eb..96c60ed55a 100644 --- a/units/striderantiheavy.lua +++ b/units/striderantiheavy.lua @@ -107,8 +107,10 @@ return { striderantiheavy = { range = 250, reloadtime = 2, size = 6, - soundHit = [[explosion/ex_med6]], + soundHit = [[dgun_hit]], + soundHitVolume = 8.5, soundStart = [[weapon/laser/heavy_laser4]], + soundStartVolume = 8, soundTrigger = true, tolerance = 10000, turret = true, diff --git a/units/striderarty.lua b/units/striderarty.lua index cdf0d36c6f..b2986c9c43 100644 --- a/units/striderarty.lua +++ b/units/striderarty.lua @@ -74,6 +74,7 @@ return { striderarty = { light_camera_height = 2500, light_color = [[0.35 0.17 0.04]], light_radius = 400, + burst = Shared.BURST_UNRELIABLE, }, damage = { diff --git a/units/striderbantha.lua b/units/striderbantha.lua index d8e4327f56..fa046024a7 100644 --- a/units/striderbantha.lua +++ b/units/striderbantha.lua @@ -2,7 +2,7 @@ return { striderbantha = { name = [[Paladin]], description = [[Ranged Support Strider]], acceleration = 0.314, - autoheal = 20, + autoheal = 10, brakeRate = 1.327, builder = false, buildPic = [[striderbantha.png]], @@ -174,7 +174,7 @@ return { striderbantha = { range = 1200, reloadtime = 30, smokeTrail = false, - soundHit = [[weapon/missile/vlaunch_emp_hit]], + soundHit = [[weapon/missile/vlaunch_emp_hit2]], soundStart = [[weapon/missile/missile_launch_high]], soundStartVolume = 5, startVelocity = 100, @@ -220,8 +220,8 @@ return { striderbantha = { range = 465, reloadtime = 1, rgbColor = [[0.5 0.5 1]], - soundStart = [[weapon/LightningBolt]], - soundStartVolume = 3.8, + soundStart = [[weapon/lightningbolt2]], + soundStartVolume = 7.5, soundTrigger = true, sprayAngle = 800, texture1 = [[lightning]], diff --git a/units/striderdante.lua b/units/striderdante.lua index 0f1a88d43d..273934a949 100644 --- a/units/striderdante.lua +++ b/units/striderdante.lua @@ -186,7 +186,8 @@ return { striderdante = { reloadtime = 0.1, rgbColor = [[1 0.1 0]], rgbColor2 = [[1 1 0.25]], - soundStart = [[weapon/heatray_fire]], + soundStart = [[weapon/heatray_fire7]], + soundStartVolume = 4, thickness = 3, tolerance = 5000, turret = true, @@ -285,6 +286,7 @@ return { striderdante = { smokeTrail = true, soundHit = [[weapon/missile/rapid_rocket_hit]], soundStart = [[weapon/missile/rapid_rocket_fire]], + soundStartVolume = 10, sprayAngle = 8000, startVelocity = 200, tolerance = 6500, diff --git a/units/striderdetriment.lua b/units/striderdetriment.lua index 35acae1183..02e15846fa 100644 --- a/units/striderdetriment.lua +++ b/units/striderdetriment.lua @@ -44,7 +44,7 @@ return { striderdetriment = { explodeAs = [[NUCLEAR_MISSILE]], footprintX = 4, footprintZ = 4, - health = 74000, + health = 76000, iconType = [[krogoth]], leaveTracks = true, maxSlope = 37, @@ -174,7 +174,9 @@ return { striderdetriment = { size = 2.0, sizeDecay = -0.1, soundHit = [[weapon/gauss_hit]], + soundHitVolume = 5, soundStart = [[weapon/gauss_fire]], + soundStartVolume = 7, sprayangle = 900, stages = 32, tolerance = 4000, @@ -217,6 +219,7 @@ return { striderdetriment = { reloadtime = 0.1, rgbColor = [[0 1 1]], soundStart = [[weapon/laser/rapid_laser]], + soundStartVolume = 5.5, thickness = 2.5, tolerance = 8192, turret = true, @@ -261,7 +264,7 @@ return { striderdetriment = { rgbColor = [[0 1 0]], scrollSpeed = 5, soundStart = [[weapon/laser/heavy_laser3]], - soundStartVolume = 2, + soundStartVolume = 3.0, sweepfire = false, texture1 = [[largelaser]], texture2 = [[flare]], @@ -318,6 +321,7 @@ return { striderdetriment = { rgbColor2 = [[0.5 0.1 0.2]], sprayAngle = 1200, soundHit = [[explosion/mini_nuke]], + soundHitVolume = 8, soundStart = [[PulseLaser]], soundTrigger = false, sweepfire = false, diff --git a/units/striderscorpion.lua b/units/striderscorpion.lua index 8691c47475..1dd332e560 100644 --- a/units/striderscorpion.lua +++ b/units/striderscorpion.lua @@ -189,6 +189,7 @@ return { striderscorpion = { reloadtime = 2, rgbColor = [[0.5 0.5 1]], soundStart = [[weapon/more_lightning_fast]], + soundStartVolume = 8, soundTrigger = true, sprayAngle = 700, texture1 = [[lightning]], diff --git a/units/subraider.lua b/units/subraider.lua index 3e7e6903dc..2b0bb6b68a 100644 --- a/units/subraider.lua +++ b/units/subraider.lua @@ -108,9 +108,9 @@ return { subraider = { reloadtime = 2.4, rgbcolor = [[0.9 0.1 0.9]], soundHit = [[explosion/wet/ex_underwater_pulse]], - soundHitVolume = 6, + soundHitVolume = 9.5, soundStart = [[weapon/torpedo]], - soundStartVolume = 6, + soundStartVolume = 6.5, startVelocity = 150, tolerance = 200, tracks = true, diff --git a/units/tacnuke.lua b/units/tacnuke.lua index 5dfbd9fc66..fdb9139f91 100644 --- a/units/tacnuke.lua +++ b/units/tacnuke.lua @@ -68,7 +68,7 @@ return { tacnuke = { customParams = { burst = Shared.BURST_RELIABLE, - lups_explodelife = 1.5, + lups_explodelife = 1.5, stats_hide_dps = 1, -- meaningless stats_hide_reload = 1, @@ -94,6 +94,7 @@ return { tacnuke = { smokeTrail = false, soundHit = [[explosion/mini_nuke]], soundStart = [[SiloLaunch]], + soundStartVolume = 10, tolerance = 4000, turnrate = 18000, weaponAcceleration = 180, diff --git a/units/tankarty.lua b/units/tankarty.lua index afcd09a8ac..e46850f84c 100644 --- a/units/tankarty.lua +++ b/units/tankarty.lua @@ -92,7 +92,9 @@ return { tankarty = { range = 1150, reloadtime = 7, soundHit = [[weapon/cannon/arty_hit]], + soundStartVolume = 10, soundStart = [[weapon/cannon/pillager_fire]], + soundStartVolume = 8.2, turret = true, weaponType = [[Cannon]], weaponVelocity = 320, diff --git a/units/tankassault.lua b/units/tankassault.lua index b31b8033cc..62d7d693ce 100644 --- a/units/tankassault.lua +++ b/units/tankassault.lua @@ -82,6 +82,10 @@ return { tankassault = { craterBoost = 0, craterMult = 0, + customParams = { + burst = Shared.BURST_RELIABLE, + }, + damage = { default = 320.1, }, diff --git a/units/tankheavyarty.lua b/units/tankheavyarty.lua index 08b294292d..67b421f8c5 100644 --- a/units/tankheavyarty.lua +++ b/units/tankheavyarty.lua @@ -108,8 +108,10 @@ return { tankheavyarty = { noSelfDamage = false, range = 1160, reloadtime = 0.333, - soundHit = [[weapon/cannon/cannon_hit2]], + soundHit = [[weapon/cannon/cannon_hit5]], + soundHitVolume = 7, soundStart = [[weapon/cannon/tremor_fire]], + soundStartVolume = 7.5, turret = true, weaponType = [[Cannon]], weaponVelocity = 420, diff --git a/units/tankheavyassault.lua b/units/tankheavyassault.lua index c58183bfa0..23cd4b3be3 100644 --- a/units/tankheavyassault.lua +++ b/units/tankheavyassault.lua @@ -104,7 +104,9 @@ return { tankheavyassault = { range = 450, reloadtime = 3.5, soundHit = [[weapon/cannon/supergun_bass_boost]], + soundHitVolume = 10, soundStart = [[weapon/cannon/rhino]], + soundStartVolume = 10, turret = true, weaponType = [[Cannon]], weaponVelocity = 270, @@ -147,7 +149,7 @@ return { tankheavyassault = { reloadtime = 2.5, rgbColor = [[0.27 0 0.36]], soundStart = [[weapon/laser/pulse_laser2]], - soundStartVolume = 15, + soundStartVolume = 9, soundTrigger = true, sweepfire = false, texture1 = [[largelaser]], diff --git a/units/tankheavyraid.lua b/units/tankheavyraid.lua index 458636d78c..8b46951f5c 100644 --- a/units/tankheavyraid.lua +++ b/units/tankheavyraid.lua @@ -106,6 +106,7 @@ return { tankheavyraid = { rgbColor = [[0.5 0.5 1]], soundStart = [[weapon/more_lightning_fast]], soundTrigger = true, + soundStartVolume = 7.0, texture1 = [[lightning]], thickness = 10, turret = true, diff --git a/units/tankriot.lua b/units/tankriot.lua index 4e24d6b283..8157e94231 100644 --- a/units/tankriot.lua +++ b/units/tankriot.lua @@ -107,8 +107,10 @@ return { tankriot = { range = 320, reloadtime = 0.3, smokeTrail = false, - soundHit = [[weapon/bomb_hit]], + soundHit = [[weapon/missile/banisher_hit]], + soundHitVolume = 10, soundStart = [[weapon/missile/banisher_fire]], + soundStartVolume = 8, startVelocity = 400, texture1 = [[flarescale01]], tolerance = 9000, diff --git a/units/turretemp.lua b/units/turretemp.lua index 45740b2b9d..479ced1d2f 100644 --- a/units/turretemp.lua +++ b/units/turretemp.lua @@ -96,7 +96,7 @@ return { turretemp = { range = 460, reloadtime = 2.9, rgbColor = [[1 1 0.25]], - soundStart = [[weapon/lightning_fire]], + soundStart = [[weapon/lightning_fire2]], soundTrigger = true, texture1 = [[lightning]], thickness = 10, diff --git a/units/turretgauss.lua b/units/turretgauss.lua index d9d8d8c8a5..49ee0a3c0b 100644 --- a/units/turretgauss.lua +++ b/units/turretgauss.lua @@ -101,10 +101,10 @@ return { turretgauss = { separation = 0.5, size = 0.8, sizeDecay = -0.1, - soundHit = [[weapon/gauss_hit]], - soundHitVolume = 3, - soundStart = [[weapon/gauss_fire]], - soundStartVolume = 2.5, + soundHit = [[weapon/gauss_hit_small]], + soundHitVolume = 8, + soundStart = [[weapon/gauss_fire_small]], + soundStartVolume = 10, stages = 32, turret = true, waterweapon = true, diff --git a/units/turretheavy.lua b/units/turretheavy.lua index db62e6acf8..4a265f37d1 100644 --- a/units/turretheavy.lua +++ b/units/turretheavy.lua @@ -123,7 +123,8 @@ return { turretheavy = { reloadtime = 0.1, rgbColor = [[1 0.1 0]], rgbColor2 = [[1 1 0.25]], - soundStart = [[weapon/heatray_fire]], + soundStart = [[weapon/heatray_fire7]], + soundStartVolume = 4, thickness = 3.95284707521047, tolerance = 10000, turret = true, @@ -161,8 +162,9 @@ return { turretheavy = { range = 650, reloadtime = 3, soundHit = [[weapon/cannon/cannon_hit4]], - --soundHitVolume = 70, + soundHitVolume = 10, soundStart = [[weapon/cannon/heavy_cannon2]], + soundStartVolume = 9, sprayangle = 768, turret = true, weaponType = [[Cannon]], diff --git a/units/turretheavylaser.lua b/units/turretheavylaser.lua index 515ae2b247..a9be2d4079 100644 --- a/units/turretheavylaser.lua +++ b/units/turretheavylaser.lua @@ -103,6 +103,7 @@ return { turretheavylaser = { rgbColor = [[0 0 1]], scrollSpeed = 5, soundStart = [[weapon/laser/heavy_laser3]], + soundStartVolume = 8.5, sweepfire = false, texture1 = [[largelaser]], texture2 = [[flare]], diff --git a/units/turretimpulse.lua b/units/turretimpulse.lua index b75aa68518..5e4e056da9 100644 --- a/units/turretimpulse.lua +++ b/units/turretimpulse.lua @@ -99,7 +99,7 @@ return { turretimpulse = { rgbColor = [[0 0 1]], rgbColor2 = [[1 0.5 1]], size = 2, - soundStart = [[weapon/gravity_fire]], + soundStart = [[gravity_fire]], soundTrigger = true, thickness = 4, tolerance = 5000, @@ -144,7 +144,7 @@ return { turretimpulse = { rgbColor = [[1 0 0]], rgbColor2 = [[1 0.5 1]], size = 2, - soundStart = [[weapon/gravity_fire]], + soundStart = [[gravity_fire]], soundTrigger = true, thickness = 4, tolerance = 5000, diff --git a/units/turretmissile.lua b/units/turretmissile.lua index f3e5abc00a..45dc61b8f6 100644 --- a/units/turretmissile.lua +++ b/units/turretmissile.lua @@ -105,6 +105,7 @@ return { turretmissile = { smokeTrail = true, soundHit = [[explosion/ex_small13]], soundStart = [[weapon/missile/missile_fire11]], + soundStartVolume = 5, startVelocity = 500, texture1 = [[flarescale01]], texture2 = [[lightsmoketrail]], diff --git a/units/vehassault.lua b/units/vehassault.lua index 6da0b17780..d313f7a584 100644 --- a/units/vehassault.lua +++ b/units/vehassault.lua @@ -82,6 +82,7 @@ return { vehassault = { customParams = { light_camera_height = 1500, + burst = Shared.BURST_RELIABLE, }, damage = { @@ -96,7 +97,7 @@ return { vehassault = { noSelfDamage = true, range = 320, reloadtime = 2, - soundHit = [[weapon/cannon/cannon_hit2]], + soundHit = [[weapon/cannon/cannon_hit6]], soundStart = [[weapon/cannon/medplasma_fire]], turret = true, weaponType = [[Cannon]], diff --git a/units/vehcapture.lua b/units/vehcapture.lua index dd23d0a84e..7e93b0bf71 100644 --- a/units/vehcapture.lua +++ b/units/vehcapture.lua @@ -102,8 +102,8 @@ return { vehcapture = { reloadtime = 1/30, rgbColor = [[0 0.8 0.2]], scrollSpeed = 2.4, - soundStart = [[weapon/laser/pulse_laser2]], - soundStartVolume = 0.5, + soundStart = [[CaptureRay]], + soundStartVolume = 4.6, soundTrigger = true, sweepfire = false, texture1 = [[dosray]], diff --git a/units/vehheavyarty.lua b/units/vehheavyarty.lua index 88fea787df..3cb20a1410 100644 --- a/units/vehheavyarty.lua +++ b/units/vehheavyarty.lua @@ -101,7 +101,7 @@ return { vehheavyarty = { range = 1500, reloadtime = 10, smokeTrail = false, - soundHit = [[weapon/missile/vlaunch_hit]], + soundHit = [[weapon/missile/vlaunch_hit2]], soundStart = [[weapon/missile/missile_launch_short]], soundStartVolume = 10, soundHitVolume = 10, diff --git a/units/vehraid.lua b/units/vehraid.lua index 9f7a6e0d00..f927fa39bb 100644 --- a/units/vehraid.lua +++ b/units/vehraid.lua @@ -115,7 +115,8 @@ return { vehraid = { reloadtime = 0.1, rgbColor = [[1 0.1 0]], rgbColor2 = [[1 1 0.25]], - soundStart = [[weapon/heatray_fire]], + soundStart = [[weapon/heatray_fire7]], + soundStartVolume = 4, thickness = 3, tolerance = 5000, turret = true, diff --git a/units/vehriot.lua b/units/vehriot.lua index 479aa74580..e1a768827a 100644 --- a/units/vehriot.lua +++ b/units/vehriot.lua @@ -107,7 +107,8 @@ return { vehriot = { reloadtime = 1.7 + 2/30, -- don't forget to tweak the high-alpha threshold at the bottom of `LuaRules/Configs/target_priority_defs.lua` soundHit = [[weapon/cannon/generic_cannon]], soundStart = [[weapon/cannon/outlaw_gun]], - soundStartVolume = 3, + soundHitVolume = 10, + soundStartVolume = 9, turret = true, weaponType = [[Cannon]], weaponVelocity = 750, diff --git a/units/vehsupport.lua b/units/vehsupport.lua index 4aa7e78edf..c85c861bb6 100644 --- a/units/vehsupport.lua +++ b/units/vehsupport.lua @@ -105,6 +105,7 @@ return { vehsupport = { reloadtime = 0.766, smokeTrail = true, soundHit = [[explosion/ex_med17]], + soundHitVolume = 8.5, soundStart = [[weapon/missile/missile_fire11]], startVelocity = 450, texture2 = [[lightsmoketrail]], diff --git a/units/zenith.lua b/units/zenith.lua index 27b477da9c..259e85babf 100644 --- a/units/zenith.lua +++ b/units/zenith.lua @@ -94,7 +94,7 @@ return { zenith = { rgbColor = [[0 0 1]], rgbColor2 = [[1 0.5 1]], size = 32, - soundStart = [[weapon/gravity_fire]], + soundStart = [[gravity_fire]], soundStartVolume = 0.15, thickness = 32, tolerance = 5000, @@ -149,7 +149,7 @@ return { zenith = { smokeTrail = true, smokePeriod = 10, smokeSize = 80, - soundHit = [[weapon/cannon/supergun_bass_boost]], + soundHit = [[weapon/cannon/supergun_bass_boost2]], startVelocity = 1500, textures = { @@ -208,7 +208,7 @@ return { zenith = { range = 8800, reloadtime = 1.2, smokeTrail = true, - soundHit = [[weapon/cannon/supergun_bass_boost]], + soundHit = [[weapon/cannon/supergun_bass_boost2]], startVelocity = 1500, textures = { @@ -268,7 +268,7 @@ return { zenith = { range = 8800, reloadtime = 1.2, smokeTrail = true, - soundHit = [[weapon/cannon/supergun_bass_boost]], + soundHit = [[weapon/cannon/supergun_bass_boost2]], startVelocity = 1500, textures = { @@ -330,7 +330,7 @@ return { zenith = { range = 8800, reloadtime = 1.2, smokeTrail = true, - soundHit = [[weapon/cannon/supergun_bass_boost]], + soundHit = [[weapon/cannon/supergun_bass_boost2]], startVelocity = 1500, textures = {