Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-26 05:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Common/Hearing - Small cleanup / sort (#10733)

Browse Source 
* Common/Hearing - Small cleanup / sort

* stop the bleeeeding

* actually stop the bleeeding

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
This commit is contained in:
PabstMirror
2025-02-08 16:59:46 -06:00
committed by GitHub
parent a6befd75ae
commit d06d71ee22
6 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/common/XEH_postInit.sqf
View File

@ -377,11 +377,7 @@ GVAR(OldIsCamera) = false;
// Update vehicle audio attenuation when player vehicle changes
GVAR(playerVehAttenuation) = 1;
["vehicle", {
params ["_player", "_vehicle"];
TRACE_2("vehicle change",_player,_vehicle);
_this call FUNC(updatePlayerVehAttenuation);
}, true] call CBA_fnc_addPlayerEventHandler;
["vehicle", LINKFUNC(updatePlayerVehAttenuation), true] call CBA_fnc_addPlayerEventHandler;
["turret", LINKFUNC(updatePlayerVehAttenuation), false] call CBA_fnc_addPlayerEventHandler;
// Add event handler for UAV control change

1
addons/common/functions/fnc_updatePlayerVehAttenuation.sqf
View File

@ -24,6 +24,7 @@ private _newAttenuation = 1;
if (ACE_player != _vehicle) then {
private _vehicleConfig = configOf _vehicle;
private _turretPath = _vehicle unitTurret ACE_player;
TRACE_2("vehicle change",typeOf _vehicle,_turretPath);
private _effectType = getText (_vehicleConfig >> "attenuationEffectType");
if (_turretPath isNotEqualTo []) then {

12
addons/field_rations/stringtable.xml
View File

@ -881,23 +881,23 @@
</Key>
<Key ID="STR_ACE_Field_Rations_NearDepletedConsequence_DisplayName">
<English>Consequence of extreme thirst/hunger (over 85%)</English>
<German>Folge von extremen Durst/Hunger (über 85%)</German>
<Italian>Conseguenze di sete/fame estrema (oltre 85%)</Italian>
<French>Conséquences d'une soif ou d'une faim extrême (plus de 85 %)</French>
<Italian>Conseguenze di sete/fame estrema (oltre 85%)</Italian>
<German>Folge von extremen Durst/Hunger (über 85%)</German>
<Korean>극심한 허기 및 갈증으로 인한 증상 (85% 이상)</Korean>
</Key>
<Key ID="STR_ACE_Field_Rations_NearDepletedConsequence_Pain">
<English>Pain</English>
<German>Schmerzen</German>
<Italian>Dolore</Italian>
<French>Douleur</French>
<Italian>Dolore</Italian>
<German>Schmerzen</German>
<Korean>고통</Korean>
</Key>
<Key ID="STR_ACE_Field_Rations_NearDepletedConsequence_Unconsciousness">
<English>Fainting</English>
<German>Ohnmacht</German>
<Italian>Svenimenti</Italian>
<French>Évanouissement</French>
<Italian>Svenimenti</Italian>
<German>Ohnmacht</German>
<Korean>기절</Korean>
</Key>
<Key ID="STR_ACE_Field_Rations_NoWaterRemaining">

2
addons/medical_status/functions/fnc_updateWoundBloodLoss.sqf
View File

@ -25,7 +25,7 @@ private _bodyPartBleeding = [0,0,0,0,0,0];
if (_tourniquets select _partIndex == 0) then {
private _partBleeding = 0;
{
_x params ["", "_amountOf", "_bleeeding"];
_x params ["", "_amountOf", "_bleeding"];
_partBleeding = _partBleeding + (_amountOf * _bleeding);
} forEach _y;
_bodyPartBleeding set [_partIndex, _partBleeding];

64
addons/medical_treatment/stringtable.xml
View File

@ -4499,16 +4499,6 @@
<Japanese>自動注射器の所要時間</Japanese>
<Chinesesimp>自动注射器治疗时间</Chinesesimp>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedAutoinjector_Description">
<English>Time, in seconds, required for a unit exceeding required training level to administer medication using an autoinjector.</English>
<Korean>필요한 의료 레벨 이상인 유닛이 자동주사기로 약물을 투여하는 데 걸리는 시간(초)입니다.</Korean>
<French>Temps, en secondes, nécessaire à une unité dépassant le niveau de formation requis pour administrer un médicament à l'aide d'un auto-injecteur.</French>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedAutoinjector_DisplayName">
<English>Skilled Autoinjector Treatment Time</English>
<Korean>숙련도에 따른 자동주사기 투여 시간</Korean>
<French>Temps d'administration de l'auto-injecteur en fonction du niveau de compétence</French>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeBodyBag_Description">
<English>Time, in seconds, required to put a patient in a body bag.</English>
<French>Définit le temps nécessaire à la mise en housse d'un corps (en secondes).</French>
@ -4635,16 +4625,6 @@
<Japanese>点滴の所要時間</Japanese>
<Chinesesimp>静脉输液袋治疗时间</Chinesesimp>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedIV_Description">
<English>Time, in seconds, required for a unit exceeding required training level to administer an IV bag.</English>
<Korean>필요한 의료 레벨 이상인 유닛이 수액용기로 수액을 투여하는 데 걸리는 시간(초)입니다.</Korean>
<French>Temps, en secondes, nécessaire à une unité dépassant le niveau de formation requis pour administrer une poche de perfusion.</French>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedIV_DisplayName">
<English>Skilled IV Bag Treatment Time</English>
<Korean>숙련도에 따른 수액용기 투여 시간</Korean>
<French>Temps de traitement des poches IV par un personnel qualifié</French>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSplint_Description">
<English>Time, in seconds, required to apply a splint.</English>
<French>Définit le temps nécessaire à l'application d'une attelle (en secondes).</French>
@ -4671,16 +4651,6 @@
<Japanese>添え木の所要時間</Japanese>
<Chinesesimp>夹板治疗时间</Chinesesimp>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedSplint_Description">
<English>Time, in seconds, required for a unit exceeding required training level to apply a splint.</English>
<Korean>필요한 의료 레벨 이상인 유닛이 부목을 적용하는 데 걸리는 시간(초)입니다.</Korean>
<French>Temps, en secondes, nécessaire à une unité dépassant le niveau de formation requis pour poser une attelle.</French>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedSplint_DisplayName">
<English>Skilled Splint Treatment Time</English>
<Korean>숙련도에 따른 부목 적용 시간</Korean>
<French>Temps de pose de l'attelle en fonction du niveau de compétence</French>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTourniquet_Description">
<English>Time, in seconds, required to apply/remove a tourniquet.</English>
<French>Définit le temps nécessaire à l'application ou au retrait d'un garrot (en secondes).</French>
@ -4707,15 +4677,45 @@
<Japanese>止血帯の所要時間</Japanese>
<Chinesesimp>止血带治疗时间</Chinesesimp>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedAutoinjector_Description">
<English>Time, in seconds, required for a unit exceeding required training level to administer medication using an autoinjector.</English>
<French>Temps, en secondes, nécessaire à une unité dépassant le niveau de formation requis pour administrer un médicament à l'aide d'un auto-injecteur.</French>
<Korean>필요한 의료 레벨 이상인 유닛이 자동주사기로 약물을 투여하는 데 걸리는 시간(초)입니다.</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedAutoinjector_DisplayName">
<English>Skilled Autoinjector Treatment Time</English>
<French>Temps d'administration de l'auto-injecteur en fonction du niveau de compétence</French>
<Korean>숙련도에 따른 자동주사기 투여 시간</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedIV_Description">
<English>Time, in seconds, required for a unit exceeding required training level to administer an IV bag.</English>
<French>Temps, en secondes, nécessaire à une unité dépassant le niveau de formation requis pour administrer une poche de perfusion.</French>
<Korean>필요한 의료 레벨 이상인 유닛이 수액용기로 수액을 투여하는 데 걸리는 시간(초)입니다.</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedIV_DisplayName">
<English>Skilled IV Bag Treatment Time</English>
<French>Temps de traitement des poches IV par un personnel qualifié</French>
<Korean>숙련도에 따른 수액용기 투여 시간</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedSplint_Description">
<English>Time, in seconds, required for a unit exceeding required training level to apply a splint.</English>
<French>Temps, en secondes, nécessaire à une unité dépassant le niveau de formation requis pour poser une attelle.</French>
<Korean>필요한 의료 레벨 이상인 유닛이 부목을 적용하는 데 걸리는 시간(초)입니다.</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedSplint_DisplayName">
<English>Skilled Splint Treatment Time</English>
<French>Temps de pose de l'attelle en fonction du niveau de compétence</French>
<Korean>숙련도에 따른 부목 적용 시간</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedTourniquet_Description">
<English>Time, in seconds, required for a unit exceeding required training level to apply or remove a tourniquet.</English>
<Korean>필요한 의료 레벨 이상인 유닛이 지혈대를 묶거나 제거하는 데 걸리는 시간(초)입니다.</Korean>
<French>Temps, en secondes, nécessaire à une unité dépassant le niveau de formation requis pour poser ou retirer un garrot.</French>
<Korean>필요한 의료 레벨 이상인 유닛이 지혈대를 묶거나 제거하는 데 걸리는 시간(초)입니다.</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTrainedTourniquet_DisplayName">
<English>Skilled Tourniquet Treatment Time</English>
<Korean>숙련도에 따른 지혈대 적용 시간</Korean>
<French>Temps d'application du garrot en fonction de la compétence</French>
<Korean>숙련도에 따른 지혈대 적용 시간</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TriageCard_NoEntry">
<English>No entries on this triage card.</English>

4
addons/overpressure/XEH_postInit.sqf
View File

@ -12,9 +12,9 @@
if (GVAR(overpressureDistanceCoefficient) > 0 || {GVAR(backblastDistanceCoefficient) > 0}) then {
["ace_firedPlayerVehicle", { //IGNORE_PRIVATE_WARNING ["_weapon"];
if (getNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(backblast)) == 1) then {
_this call FUNC(firedEHBB);
call FUNC(firedEHBB);
} else {
_this call FUNC(firedEHOP);
call FUNC(firedEHOP);
};
}] call CBA_fnc_addEventHandler;
};