From 7dfc8dd6bf33aa69eb32704638bd27e40f6840c2 Mon Sep 17 00:00:00 2001 From: Ambroise Garel <47314805+akaAgar@users.noreply.github.com> Date: Fri, 25 Jul 2025 12:03:07 +0200 Subject: [PATCH] Merged "rifle!" and "missile away!" radio messages --- ...tLaunchRifle.ogg => Radio-pilotLaunchRifle1.ogg} | Bin ...aunchMissile.ogg => Radio-pilotLaunchRifle2.ogg} | Bin Script/Library/RadioMessages.lua | 3 +-- Script/The Universal Mission/AmbientRadio.lua | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) rename Media/{Radio-pilotLaunchRifle.ogg => Radio-pilotLaunchRifle1.ogg} (100%) rename Media/{Radio-pilotLaunchMissile.ogg => Radio-pilotLaunchRifle2.ogg} (100%) diff --git a/Media/Radio-pilotLaunchRifle.ogg b/Media/Radio-pilotLaunchRifle1.ogg similarity index 100% rename from Media/Radio-pilotLaunchRifle.ogg rename to Media/Radio-pilotLaunchRifle1.ogg diff --git a/Media/Radio-pilotLaunchMissile.ogg b/Media/Radio-pilotLaunchRifle2.ogg similarity index 100% rename from Media/Radio-pilotLaunchMissile.ogg rename to Media/Radio-pilotLaunchRifle2.ogg diff --git a/Script/Library/RadioMessages.lua b/Script/Library/RadioMessages.lua index 87382cf..9c83824 100644 --- a/Script/Library/RadioMessages.lua +++ b/Script/Library/RadioMessages.lua @@ -61,9 +61,8 @@ Library.radioMessages = { pilotLaunchFox2 = "Fox 2!", pilotLaunchFox3 = "Fox 3!", pilotLaunchMagnum = "Magnum!", - pilotLaunchMissile = "Missile away!", pilotLaunchPickle = { "Pickle!", "Bomb away!" }, - pilotLaunchRifle = "Rifle!", + pilotLaunchRifle = { "Rifle!", "Missile away!"}, pilotLaunchRocket = "Rockets!", pilotWarningAAA = { "Heads up, I'm seeing tracers. AAA fire.", "AAA lighting up, stay high.", "Flight, we've got heavy flak incoming, break!", "AAA tracer fire, they've got our range, don't stay straight!", "AAA's hot under us. Stay fast, don't linger!" }, diff --git a/Script/The Universal Mission/AmbientRadio.lua b/Script/The Universal Mission/AmbientRadio.lua index d6c34b2..678967e 100644 --- a/Script/The Universal Mission/AmbientRadio.lua +++ b/Script/The Universal Mission/AmbientRadio.lua @@ -335,7 +335,7 @@ do elseif weaponDesc.guidance == Weapon.GuidanceType.RADAR_SEMI_ACTIVE then doAmbientChatter("pilotLaunchFox1", nil, event.initiator:getCallsign(), 1) else - doAmbientChatter("pilotLaunchMissile", nil, event.initiator:getCallsign(), 1) + doAmbientChatter("pilotLaunchRifle", nil, event.initiator:getCallsign(), 1) end elseif weaponDesc.missileCategory == Weapon.MissileCategory.ANTI_SHIP or weaponDesc.typeName == "weapons.missiles.AGM_84D" then doAmbientChatter("pilotLaunchBruiser", nil, event.initiator:getCallsign(), 1)