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

Fire - Fix medical macros in compiled sqfc (#10147)

Browse Source 
* Fire - Fix medical macros in compiled sqfc

* Update addons/fire/functions/fnc_burnSimulation.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
This commit is contained in:
PabstMirror 2024-07-27 12:16:49 -05:00 committed by GitHub
parent b7cd72e936
commit aa6e5c30ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/fire/addon.toml
View File

@ -1,3 +0,0 @@
[tools]
pboProject_noBinConfig = true
sqfvm_skipConfigChecks = true

4
addons/fire/functions/fnc_burnSimulation.sqf
View File

@ -149,7 +149,9 @@ params ["_unit", "_instigator"];
}; };
// Keep pain around unconsciousness limit to allow for more fun interactions // Keep pain around unconsciousness limit to allow for more fun interactions
private _damageToAdd = [0.15, _intensity / BURN_MAX_INTENSITY] select (!alive _unit || {GET_PAIN_PERCEIVED(_unit) < (PAIN_UNCONSCIOUS + random 0.2)}); private _painPercieved = (0 max ((_unit getVariable [QEGVAR(medical,pain), 0]) - (_unit getVariable [QEGVAR(medical,painSuppress), 0])) min 1);
private _painUnconscious = missionNamespace getVariable [QEGVAR(medical,painUnconsciousThreshold), 0];
private _damageToAdd = [0.15, _intensity / BURN_MAX_INTENSITY] select (!alive _unit || {_painPercieved < _painUnconscious + random 0.2});
if (GETEGVAR(medical,enabled,false)) then { if (GETEGVAR(medical,enabled,false)) then {
if (!isNull _instigator) then { if (!isNull _instigator) then {

8
addons/fire/script_component.hpp
View File

@ -17,14 +17,6 @@
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#pragma hemtt flag pe23_ignore_has_include
#if __has_include("\z\ace\addons\medical_engine\script_macros_medical.hpp")
#include "\z\ace\addons\medical_engine\script_macros_medical.hpp"
#else
#define GET_PAIN_PERCEIVED(var) 0
#define PAIN_UNCONSCIOUS 1
#endif
#define FIRE_MANAGER_PFH_DELAY 0.25 #define FIRE_MANAGER_PFH_DELAY 0.25
#define FLARE_SIZE_MODIFIER 5 #define FLARE_SIZE_MODIFIER 5
#define PRONE_ROLLING_ANIMS [\ #define PRONE_ROLLING_ANIMS [\