From 8f7c02be35afd3c77bf64decfeb9fb89f4737794 Mon Sep 17 00:00:00 2001 From: Dillon Skaggs Date: Tue, 20 Feb 2024 01:24:00 -0600 Subject: [PATCH] feat(audio): batch 17 of native updates (#1012) * feat(audio): batch 17 of native updates * Update SetPedVoiceFull.md Document what `SetPedVoiceFull` does, internally. --------- Co-authored-by: ammonia-cfx <38232208+4mmonium@users.noreply.github.com> --- AUDIO/N_0x149aee66f0cb3a99.md | 15 --------------- AUDIO/N_0x1b7abe26cbcbf8c7.md | 16 ---------------- AUDIO/N_0x33e3c6c6f2f0b506.md | 17 ----------------- AUDIO/N_0x6fddad856e36988a.md | 18 ------------------ AUDIO/N_0xda07819e452ffe8f.md | 14 -------------- AUDIO/SetPedIsDrunk.md | 19 +++---------------- AUDIO/SetPedRaceAndVoiceGroup.md | 17 +++++++++++++++++ AUDIO/SetPedScream.md | 18 ------------------ AUDIO/SetPedVoiceFull.md | 16 ++++++++++++++++ AUDIO/SetPedWallDensity.md | 19 +++++++++++++++++++ AUDIO/SetPlayerAngry.md | 7 ++++--- AUDIO/SetPlayerVehicleAlarmAudioActive.md | 16 ++++++++++++++++ AUDIO/SetPortalSettingsOverride.md | 15 +++------------ AUDIO/SetPositionForNullConvPed.md | 18 ++++++++++++++++++ ...itionedPlayerVehicleRadioEmitterEnabled.md | 14 ++++++++++++++ AUDIO/SetRadioAutoUnfreeze.md | 2 +- 16 files changed, 111 insertions(+), 130 deletions(-) delete mode 100644 AUDIO/N_0x149aee66f0cb3a99.md delete mode 100644 AUDIO/N_0x1b7abe26cbcbf8c7.md delete mode 100644 AUDIO/N_0x33e3c6c6f2f0b506.md delete mode 100644 AUDIO/N_0x6fddad856e36988a.md delete mode 100644 AUDIO/N_0xda07819e452ffe8f.md create mode 100644 AUDIO/SetPedRaceAndVoiceGroup.md delete mode 100644 AUDIO/SetPedScream.md create mode 100644 AUDIO/SetPedVoiceFull.md create mode 100644 AUDIO/SetPedWallDensity.md create mode 100644 AUDIO/SetPlayerVehicleAlarmAudioActive.md create mode 100644 AUDIO/SetPositionForNullConvPed.md create mode 100644 AUDIO/SetPositionedPlayerVehicleRadioEmitterEnabled.md diff --git a/AUDIO/N_0x149aee66f0cb3a99.md b/AUDIO/N_0x149aee66f0cb3a99.md deleted file mode 100644 index 96224337a..000000000 --- a/AUDIO/N_0x149aee66f0cb3a99.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -ns: AUDIO ---- -## _0x149AEE66F0CB3A99 - -```c -// 0x149AEE66F0CB3A99 0xE64F97A0 -void _0x149AEE66F0CB3A99(float p0, float p1); -``` - - -## Parameters -* **p0**: -* **p1**: - diff --git a/AUDIO/N_0x1b7abe26cbcbf8c7.md b/AUDIO/N_0x1b7abe26cbcbf8c7.md deleted file mode 100644 index 8fbd421eb..000000000 --- a/AUDIO/N_0x1b7abe26cbcbf8c7.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -ns: AUDIO ---- -## _0x1B7ABE26CBCBF8C7 - -```c -// 0x1B7ABE26CBCBF8C7 -void _0x1B7ABE26CBCBF8C7(Ped ped, Any p1, Any p2); -``` - - -## Parameters -* **ped**: -* **p1**: -* **p2**: - diff --git a/AUDIO/N_0x33e3c6c6f2f0b506.md b/AUDIO/N_0x33e3c6c6f2f0b506.md deleted file mode 100644 index 46003100d..000000000 --- a/AUDIO/N_0x33e3c6c6f2f0b506.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -ns: AUDIO ---- -## _0x33E3C6C6F2F0B506 - -```c -// 0x33E3C6C6F2F0B506 0x73C6F979 -void _0x33E3C6C6F2F0B506(Any p0, float p1, float p2, float p3); -``` - - -## Parameters -* **p0**: -* **p1**: -* **p2**: -* **p3**: - diff --git a/AUDIO/N_0x6fddad856e36988a.md b/AUDIO/N_0x6fddad856e36988a.md deleted file mode 100644 index db9bf049f..000000000 --- a/AUDIO/N_0x6fddad856e36988a.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -ns: AUDIO ---- -## _0x6FDDAD856E36988A - -```c -// 0x6FDDAD856E36988A 0x934BE749 -void _0x6FDDAD856E36988A(Vehicle vehicle, BOOL toggle); -``` - -``` -SET_P* -``` - -## Parameters -* **vehicle**: -* **toggle**: - diff --git a/AUDIO/N_0xda07819e452ffe8f.md b/AUDIO/N_0xda07819e452ffe8f.md deleted file mode 100644 index d9e24089f..000000000 --- a/AUDIO/N_0xda07819e452ffe8f.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -ns: AUDIO ---- -## _0xDA07819E452FFE8F - -```c -// 0xDA07819E452FFE8F -void _0xDA07819E452FFE8F(Any p0); -``` - - -## Parameters -* **p0**: - diff --git a/AUDIO/SetPedIsDrunk.md b/AUDIO/SetPedIsDrunk.md index d5d080a5b..b75c16003 100644 --- a/AUDIO/SetPedIsDrunk.md +++ b/AUDIO/SetPedIsDrunk.md @@ -8,22 +8,9 @@ ns: AUDIO void SET_PED_IS_DRUNK(Ped ped, BOOL toggle); ``` -``` -Sets the ped drunk sounds. Only works with PLAYER_PED_ID -==================================================== -As mentioned above, this only sets the drunk sound to ped/player. -To give the Ped a drunk effect with drunk walking animation try using SET_PED_MOVEMENT_CLIPSET -Below is an example -if (!Function.Call(Hash.HAS_ANIM_SET_LOADED, "move_m@drunk@verydrunk")) - { - Function.Call(Hash.REQUEST_ANIM_SET, "move_m@drunk@verydrunk"); - } - Function.Call(Hash.SET_PED_MOVEMENT_CLIPSET, Ped.Handle, "move_m@drunk@verydrunk", 0x3E800000); -And to stop the effect use -RESET_PED_MOVEMENT_CLIPSET -``` +Sets the ped so they sound drunk ## Parameters -* **ped**: -* **toggle**: +* **ped**: +* **toggle**: diff --git a/AUDIO/SetPedRaceAndVoiceGroup.md b/AUDIO/SetPedRaceAndVoiceGroup.md new file mode 100644 index 000000000..0fc7eb2aa --- /dev/null +++ b/AUDIO/SetPedRaceAndVoiceGroup.md @@ -0,0 +1,17 @@ +--- +ns: AUDIO +aliases: ["0x1B7ABE26CBCBF8C7"] +--- +## SET_PED_RACE_AND_VOICE_GROUP + +```c +// 0x1B7ABE26CBCBF8C7 +void SET_PED_RACE_AND_VOICE_GROUP(Ped ped, int pedRace, int pvgHash); +``` + + +## Parameters +* **ped**: +* **pedRace**: +* **pvgHash**: PedVoiceGroup hash, defaults to 0 + diff --git a/AUDIO/SetPedScream.md b/AUDIO/SetPedScream.md deleted file mode 100644 index 6853938df..000000000 --- a/AUDIO/SetPedScream.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -ns: AUDIO -aliases: ["0x40CF0D12D142A9E8"] ---- -## _SET_PED_SCREAM - -```c -// 0x40CF0D12D142A9E8 -void _SET_PED_SCREAM(Ped ped); -``` - -``` -Assigns some ambient voice to the ped. -``` - -## Parameters -* **ped**: - diff --git a/AUDIO/SetPedVoiceFull.md b/AUDIO/SetPedVoiceFull.md new file mode 100644 index 000000000..b5a52a37c --- /dev/null +++ b/AUDIO/SetPedVoiceFull.md @@ -0,0 +1,16 @@ +--- +ns: AUDIO +aliases: ["0x40CF0D12D142A9E8", "_SET_PED_SCREAM"] +--- +## SET_PED_VOICE_FULL + +```c +// 0x40CF0D12D142A9E8 +void SET_PED_VOICE_FULL(Ped ped); +``` + +Calls the same internal function [`_SET_PED_VOICE_GROUP`](#_0x7CDC8C3B89F661B3) calls, but passes `voiceGroupHash` (defined as a parameter in the referenced native) as `0`. + +## Parameters +* **ped**: + diff --git a/AUDIO/SetPedWallDensity.md b/AUDIO/SetPedWallDensity.md new file mode 100644 index 000000000..597348148 --- /dev/null +++ b/AUDIO/SetPedWallDensity.md @@ -0,0 +1,19 @@ +--- +ns: AUDIO +aliases: ["0x149AEE66F0CB3A99"] +--- +## SET_PED_WALLA_DENSITY + +```c +// 0x149AEE66F0CB3A99 0xE64F97A0 +void SET_PED_WALLA_DENSITY(float density, float applyValue); +``` + +Overrides the calculated ped density that is used to modulate the ambient ped walla sounds (in exteriors only) + +If you want to use this for interiors, use [SET_PED_INTERIOR_WALLA_DENSITY](#_0x8BF907833BE275DE) + +## Parameters +* **density**: desired walla density +* **applyValue**: how much the desired density affects the actual one + diff --git a/AUDIO/SetPlayerAngry.md b/AUDIO/SetPlayerAngry.md index 20fabfd40..bd39d593e 100644 --- a/AUDIO/SetPlayerAngry.md +++ b/AUDIO/SetPlayerAngry.md @@ -5,11 +5,12 @@ ns: AUDIO ```c // 0xEA241BB04110F091 0x782CA58D -void SET_PLAYER_ANGRY(Ped ped, BOOL toggle); +void SET_PLAYER_ANGRY(Ped ped, BOOL isAngry); ``` +Sets a player ped to use his ANGRY speech contexts ## Parameters -* **ped**: -* **toggle**: +* **ped**: +* **isAngry**: diff --git a/AUDIO/SetPlayerVehicleAlarmAudioActive.md b/AUDIO/SetPlayerVehicleAlarmAudioActive.md new file mode 100644 index 000000000..5875203a5 --- /dev/null +++ b/AUDIO/SetPlayerVehicleAlarmAudioActive.md @@ -0,0 +1,16 @@ +--- +ns: AUDIO +aliases: ["0x6FDDAD856E36988A"] +--- +## SET_PLAYER_VEHICLE_ALARM_AUDIO_ACTIVE + +```c +// 0x6FDDAD856E36988A 0x934BE749 +void SET_PLAYER_VEHICLE_ALARM_AUDIO_ACTIVE(Vehicle vehicle, BOOL active); +``` + +Enable player vehicle specific alarm disarm/arm sound triggering + +## Parameters +* **vehicle**: +* **active**: diff --git a/AUDIO/SetPortalSettingsOverride.md b/AUDIO/SetPortalSettingsOverride.md index 61f85fe02..dd3b661b7 100644 --- a/AUDIO/SetPortalSettingsOverride.md +++ b/AUDIO/SetPortalSettingsOverride.md @@ -6,19 +6,10 @@ aliases: ["0x044DBAD7A7FA2BE5"] ```c // 0x044DBAD7A7FA2BE5 0x8AD670EC -void SET_PORTAL_SETTINGS_OVERRIDE(char* p0, char* p1); -``` - -``` -Found in the b617d scripts, duplicates removed: -AUDIO::_044DBAD7A7FA2BE5("V_CARSHOWROOM_PS_WINDOW_UNBROKEN", "V_CARSHOWROOM_PS_WINDOW_BROKEN"); - AUDIO::_044DBAD7A7FA2BE5("V_CIA_PS_WINDOW_UNBROKEN", "V_CIA_PS_WINDOW_BROKEN"); - AUDIO::_044DBAD7A7FA2BE5("V_DLC_HEIST_APARTMENT_DOOR_CLOSED", "V_DLC_HEIST_APARTMENT_DOOR_OPEN"); - AUDIO::_044DBAD7A7FA2BE5("V_FINALEBANK_PS_VAULT_INTACT", "V_FINALEBANK_PS_VAULT_BLOWN"); - AUDIO::_044DBAD7A7FA2BE5("V_MICHAEL_PS_BATHROOM_WITH_WINDOW", "V_MICHAEL_PS_BATHROOM_WITHOUT_WINDOW"); +void SET_PORTAL_SETTINGS_OVERRIDE(char* oldPortalSettingsName, char* newPortalSettingsName); ``` ## Parameters -* **p0**: -* **p1**: +* **oldPortalSettingsName**: +* **newPortalSettingsName**: diff --git a/AUDIO/SetPositionForNullConvPed.md b/AUDIO/SetPositionForNullConvPed.md new file mode 100644 index 000000000..14495dee5 --- /dev/null +++ b/AUDIO/SetPositionForNullConvPed.md @@ -0,0 +1,18 @@ +--- +ns: AUDIO +aliases: ["0x33E3C6C6F2F0B506"] +--- +## SET_POSITION_FOR_NULL_CONV_PED + +```c +// 0x33E3C6C6F2F0B506 0x73C6F979 +void SET_POSITION_FOR_NULL_CONV_PED(int speakerConversationIndex, float x, float y, float z); +``` + + +## Parameters +* **speakerConversationIndex**: +* **x**: +* **y**: +* **z**: + diff --git a/AUDIO/SetPositionedPlayerVehicleRadioEmitterEnabled.md b/AUDIO/SetPositionedPlayerVehicleRadioEmitterEnabled.md new file mode 100644 index 000000000..7b3f87216 --- /dev/null +++ b/AUDIO/SetPositionedPlayerVehicleRadioEmitterEnabled.md @@ -0,0 +1,14 @@ +--- +ns: AUDIO +aliases: ["0xDA07819E452FFE8F"] +--- +## SET_POSITIONED_PLAYER_VEHICLE_RADIO_EMITTER_ENABLED + +```c +// 0xDA07819E452FFE8F +void SET_POSITIONED_PLAYER_VEHICLE_RADIO_EMITTER_ENABLED(cs_type(Any) BOOL enabled); +``` + + +## Parameters +* **enabled**: enables/disables a positioned emitter for the player vehicle radio diff --git a/AUDIO/SetRadioAutoUnfreeze.md b/AUDIO/SetRadioAutoUnfreeze.md index 5793e8d1a..798e85866 100644 --- a/AUDIO/SetRadioAutoUnfreeze.md +++ b/AUDIO/SetRadioAutoUnfreeze.md @@ -10,5 +10,5 @@ void SET_RADIO_AUTO_UNFREEZE(BOOL toggle); ## Parameters -* **toggle**: +* **toggle**: if true the radio will automatically unfreeze as soon as the player gets in a vehicle