Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix

Browse Source
This commit is contained in:
ulteq 2015-06-10 12:59:11 +02:00
commit 8bb3dbbaf6
13 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/kestrel4500/data/Kestrel4500.rvmat
View File

@ -5,8 +5,8 @@ ambient[] = {1,1,1,1};
diffuse[] = {1,1,1,1};
forcedDiffuse[] = {0,0,0,0};
emmisive[] = {0,0,0,1};
specular[] = {1,1,1,1};
specularPower = 0;
specular[] = {0.3,0.3,0.3,1};
specularPower = 50;
PixelShaderID = "Super";
VertexShaderID = "Super";
class Stage1 {
@ -50,7 +50,7 @@ class Stage4 {
};
};
class Stage5 {
texture = "#(argb,8,8,3)color(0,0,0,0,0)";
texture = "#(argb,8,8,3)color(0,0.6,1,1,SMDI)";
uvSource = "tex";
class uvTransform {
aside[] = {1,0,0};

8
addons/medical/XEH_postInit.sqf
View File

@ -6,9 +6,9 @@ GVAR(heartBeatSounds_Fast) = ["ACE_heartbeat_fast_1", "ACE_heartbeat_fast_2", "A
GVAR(heartBeatSounds_Normal) = ["ACE_heartbeat_norm_1", "ACE_heartbeat_norm_2"];
GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
["medical_propagateWound", FUNC(onPropagateWound)] call ace_common_fnc_addEventHandler;
["medical_woundUpdateRequest", FUNC(onWoundUpdateRequest)] call ace_common_fnc_addEventHandler;
["interactMenuClosed", {[objNull, false] call FUNC(displayPatientInformation); }] call ace_common_fnc_addEventHandler;
["medical_propagateWound", FUNC(onPropagateWound)] call EFUNC(common,addEventHandler);
["medical_woundUpdateRequest", FUNC(onWoundUpdateRequest)] call EFUNC(common,addEventHandler);
["interactMenuClosed", {[objNull, false] call FUNC(displayPatientInformation); }] call EFUNC(common,addEventHandler);
["medical_onUnconscious", {
if (local (_this select 0)) then {
@ -30,7 +30,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
if (!isNil "acre_api_fnc_setGlobalVolume") then { [1] call acre_api_fnc_setGlobalVolume; };
};
};
}] call ace_common_fnc_addEventHandler;
}] call EFUNC(common,addEventHandler);
// Initialize all effects

11
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
View File

@ -33,22 +33,23 @@ if ([_caller] call FUNC(isMedic)) then {
} else {
if (_bloodPressureHigh > 20) then {
_output = LSTRING(Check_Bloodpressure_Output_2);
_logOutPut = localize LSTRING(Check_Bloodpressure_Low);
_logOutPut = LSTRING(Check_Bloodpressure_Low);
if (_bloodPressureHigh > 100) then {
_output = LSTRING(Check_Bloodpressure_Output_3);
_logOutPut = localize LSTRING(Check_Bloodpressure_Normal);
_logOutPut = LSTRING(Check_Bloodpressure_Normal);
if (_bloodPressureHigh > 160) then {
_output = LSTRING(Check_Bloodpressure_Output_4);
_logOutPut = localize LSTRING(Check_Bloodpressure_High);
_logOutPut = LSTRING(Check_Bloodpressure_High);
};
};
} else {
if (random(10) > 3) then {
_output = LSTRING(Check_Bloodpressure_Output_5);
_logOutPut = localize LSTRING(Check_Bloodpressure_NoBloodpressure);
_logOutPut = LSTRING(Check_Bloodpressure_NoBloodpressure);
} else {
_output = LSTRING(Check_Bloodpressure_Output_6);
//Fail to find pressure, no logoutput
};
};
};
@ -56,5 +57,5 @@ if ([_caller] call FUNC(isMedic)) then {
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then {
[_target,"activity", localize LSTRING(Check_Bloodpressure_Log), [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog);
[_target,"activity", LSTRING(Check_Bloodpressure_Log), [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog);
};

10
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
View File

@ -24,7 +24,7 @@ if (!alive _unit) then {
_heartRate = 0;
};
_heartRateOutput = LSTRING(Check_Pulse_Output_5);
_logOutPut = localize LSTRING(Check_Pulse_None);
_logOutPut = LSTRING(Check_Pulse_None);
if (_heartRate > 1.0) then {
if ([_caller] call FUNC(isMedic)) then {
@ -33,14 +33,14 @@ if (_heartRate > 1.0) then {
} else {
// non medical personel will only find a pulse/HR
_heartRateOutput = LSTRING(Check_Pulse_Output_2);
_logOutPut = localize LSTRING(Check_Pulse_Weak);
_logOutPut = LSTRING(Check_Pulse_Weak);
if (_heartRate > 60) then {
if (_heartRate > 100) then {
_heartRateOutput = LSTRING(Check_Pulse_Output_3);
_logOutPut = localize LSTRING(Check_Pulse_Strong);
_logOutPut = LSTRING(Check_Pulse_Strong);
} else {
_heartRateOutput = LSTRING(Check_Pulse_Output_4);
_logOutPut = localize LSTRING(Check_Pulse_Normal);
_logOutPut = LSTRING(Check_Pulse_Normal);
};
};
};
@ -49,5 +49,5 @@ if (_heartRate > 1.0) then {
["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then {
[_unit,"activity", localize LSTRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog);
[_unit,"activity", LSTRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog);
};

2
addons/medical/functions/fnc_addHeartRateAdjustment.sqf
View File

@ -25,4 +25,4 @@ _callBack = [_this, 3, {}, [{}]] call BIS_fnc_Param;
_adjustment = _unit getvariable [QGVAR(heartRateAdjustments), []];
_adjustment pushback [_value, _time, _callBack];
_unit setvariable [QGVAR(heartRateAdjustments), _adjustment ];
["Medical_onHeartRateAdjustmentAdded", [_unit, _value, _time]] call ace_common_fnc_localEvent;
["Medical_onHeartRateAdjustmentAdded", [_unit, _value, _time]] call EFUNC(common,localEvent);

2
addons/medical/functions/fnc_addToLog.sqf
View File

@ -47,7 +47,7 @@ if (count _log >= 8) then {
_log pushback [_message,_moment,_type, _arguments];
_unit setvariable [_logVarName, _log, true];
["medical_onLogEntryAdded", [_unit, _type, _message, _arguments]] call ace_common_fnc_localEvent;
["medical_onLogEntryAdded", [_unit, _type, _message, _arguments]] call EFUNC(common,localEvent);
_logs = _unit getvariable [QGVAR(allLogs), []];
if !(_logVarName in _logs) then {

2
addons/medical/functions/fnc_addToTriageCard.sqf
View File

@ -42,4 +42,4 @@ if (!_inList) then {
_log pushback [_newItem, 1, ACE_time];
};
_unit setvariable [QGVAR(triageCard), _log, true];
["Medical_onItemAddedToTriageCard", [_unit, _newItem, _amount]] call ace_common_fnc_localEvent;
["Medical_onItemAddedToTriageCard", [_unit, _newItem, _amount]] call EFUNC(common,localEvent);

2
addons/medical/functions/fnc_handleDamage_caching.sqf
View File

@ -50,7 +50,7 @@ if (((velocity _unit) select 2 < -5) && {(vehicle _unit == _unit)}) then {
_unit setVariable [QGVAR(isFalling), True];
};
if (_unit getVariable [QGVAR(isFalling), false] && {!(_selectionName in ["", "leg_l", "leg_r"])}) exitWith {};
if (_unit getVariable [QGVAR(isFalling), false] && {!(_selectionName in ["", "leg_l", "leg_r"])}) exitWith {0};
if (_unit getVariable [QGVAR(isFalling), false]) then {
_newDamage = _newDamage * 0.7;
};

2
addons/medical/functions/fnc_setCardiacArrest.sqf
View File

@ -21,7 +21,7 @@ if (_unit getvariable [QGVAR(inCardiacArrest),false]) exitwith {};
_unit setvariable [QGVAR(inCardiacArrest), true,true];
_unit setvariable [QGVAR(heartRate), 0];
["Medical_onEnteredCardiacArrest", [_unit]] call ace_common_fnc_localEvent;
["Medical_onEnteredCardiacArrest", [_unit]] call EFUNC(common,localEvent);
[_unit, true] call FUNC(setUnconscious);
_timeInCardiacArrest = 120 + round(random(600));

7
addons/medical/stringtable.xml
View File

@ -1585,6 +1585,13 @@
<Czech>%1 zkontroloval srdeční tep: %2</Czech>
<Portuguese>%1 verificou a frequência cardíaca: %2</Portuguese>
</Key>
<Key ID="STR_ACE_Medical_Check_Pulse_None">
<English>None</English>
<Russian>Нет</Russian>
<Polish>Żadna</Polish>
<Spanish>Nada</Spanish>
<German>Keine</German>
</Key>
<Key ID="STR_ACE_Medical_Check_Pulse_Weak">
<English>Weak</English>
<German>Schwach</German>

2
addons/sandbag/CfgVehicles.hpp
View File

@ -6,7 +6,7 @@ class CfgVehicles {
displayName = CSTRING(DeploySandbag);
condition = QUOTE(call FUNC(canDeploy));
statement = QUOTE(call FUNC(deploy));
exceptions[] = {"isNotSwimming", "isNotInside"};
exceptions[] = {"isNotSwimming"};
showDisabled = 1;
priority = 4;
icon = PATHTOF(UI\icon_sandbag_ca.paa);

1
addons/spottingscope/CfgVehicles.hpp
View File

@ -11,7 +11,6 @@ class CfgVehicles {
showDisabled = 0;
priority = 2;
icon = PATHTOF(UI\w_spottingscope_ca.paa);
exceptions[] = {"isNotInside"};
};
};
};

1
addons/tripod/CfgVehicles.hpp
View File

@ -11,7 +11,6 @@ class CfgVehicles {
showDisabled = 0;
priority = 2;
icon = PATHTOF(UI\w_sniper_tripod_ca.paa);
exceptions[] = {"isNotInside"};
};
};
};