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

Reorganised module and settings #809

Browse Source
This commit is contained in:
Glowbal 2015-04-25 22:20:28 +02:00
parent 3aab1f782c
commit 11d86248a7
8 changed files with 123 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/medical/ACE_Settings.hpp
View File

@ -59,6 +59,10 @@ class ACE_Settings {
typeName = "BOOL";
value = 0;
};
class GVAR(enableRevive) {
typeName = "BOOL";
value = 0;
};
class GVAR(maxReviveTime) {
typeName = "SCALAR";
value = 120;

155
addons/medical/CfgVehicles.hpp
View File

@ -37,47 +37,38 @@ class CfgVehicles {
};
};
};
class enableFor {
displayName = "Enabled for";
description = "Select what units the medical system will be enabled for (Adv only)";
class medicSetting {
displayName = "Medics setting";
description = "What is the level of detail prefered for medics?";
typeName = "NUMBER";
class values {
class playableUnits {
name = "Players only.";
class disable {
name = "Disable medics";
value = 0;
};
class normal {
name = "Normal";
value = 1;
default = 1;
};
class playableUnitsAndAI {
name = "Players and AI";
value = 1;
class full {
name = "Advanced";
value = 2;
};
};
};
// TODO Disabled until the features are implemented
/*class enableAirway {
displayName = "Enable Airway";
description = "Enable Advanced medical Airway (Adv only)";
typeName = "BOOL";
defaultValue = 0;
};
class enableFractures {
displayName = "Enable Fractures";
description = "Enable Advanced medical Fractures (Adv only)";
typeName = "BOOL";
defaultValue = 0;
};*/
class enableAdvancedWounds {
displayName = "Enable Advanced wounds";
description = "Allow reopening of bandaged wounds? (Adv only)";
typeName = "BOOL";
defaultValue = 0;
};
class enableVehicleCrashes {
displayName = "Vehicle Crashes";
description = "Do units take damage from a vehicle crash?";
class allowLitterCreation {
displayName = "Enable Litter";
description = "Enable litter being created upon treatment";
typeName = "BOOL";
defaultValue = 1;
};
class litterCleanUpDelay {
displayName = "Life time of litter objects";
description = "How long should litter objects stay? In seconds. -1 is forever.";
typeName = "NUMBER";
defaultValue = 1800;
};
class enableScreams {
displayName = "Enable Screams";
description = "Enable screaming by injuried units";
@ -141,80 +132,58 @@ class CfgVehicles {
};
};
class ACE_moduleTreatmentSettings: ACE_Module {
class ACE_moduleAdvancedMedicalSettings: ACE_Module {
scope = 2;
displayName = "Treatment Settings [ACE]";
displayName = "Advanced Medical Settings [ACE]";
icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa));
category = "ACE_medical";
function = QUOTE(FUNC(moduleTreatmentConfiguration));
function = QUOTE(FUNC(moduleAdvancedMedicalSettings));
functionPriority = 10;
isGlobal = 2;
isTriggerActivated = 0;
isDisposable = 0;
author = "$STR_ACE_Common_ACETeam";
class Arguments {
class medicSetting {
displayName = "Medics setting";
description = "What is the level of detail prefered for medics?";
class enableFor {
displayName = "Enabled for";
description = "Select what units the advanced medical system will be enabled for";
typeName = "NUMBER";
class values {
class disable {
name = "Disable medics";
class playableUnits {
name = "Players only.";
value = 0;
};
class normal {
name = "Normal";
value = 1;
default = 1;
};
class full {
name = "Advanced";
value = 2;
class playableUnitsAndAI {
name = "Players and AI";
value = 1;
};
};
};
class maxReviveTime {
displayName = "Max Revive time";
description = "Max amount of seconds a unit can spend in revive state";
typeName = "NUMBER";
defaultValue = 120;
class enableAdvancedWounds {
displayName = "Enable Advanced wounds";
description = "Allow reopening of bandaged wounds?";
typeName = "BOOL";
defaultValue = 0;
};
class amountOfReviveLives {
displayName = "Max Revive lives";
description = "Max amount of lives a unit. 0 or -1 is disabled.";
typeName = "NUMBER";
defaultValue = -1;
};
class enableOverdosing {
displayName = "Enable Overdosing";
description = "Enable overdosing of medications";
class enableVehicleCrashes {
displayName = "Vehicle Crashes";
description = "Do units take damage from a vehicle crash?";
typeName = "BOOL";
defaultValue = 1;
};
class allowLitterCreation {
displayName = "Enable Litter";
description = "Enable litter being created upon treatment";
typeName = "BOOL";
defaultValue = 1;
};
class litterCleanUpDelay {
displayName = "Life time of litter objects";
description = "How long should litter objects stay? In seconds. -1 is forever.";
typeName = "NUMBER";
defaultValue = 1800;
};
class medicSetting_PAK {
displayName = "Allow PAK (Adv)";
displayName = "Allow PAK";
description = "Who can use the PAK for full heal?";
typeName = "NUMBER";
class values {
class anyone { name = "Anyone"; value = 0; };
class Medic { name = "Medics only"; value = 1; default = 1; };
class Special { name = "Doctors only (Adv)"; value = 2; };
class Special { name = "Doctors only"; value = 2; };
};
};
class consumeItem_PAK {
displayName = "Remove PAK on use (Adv)";
displayName = "Remove PAK on use";
description = "Should PAK be removed on usage?";
typeName = "NUMBER";
class values {
@ -223,7 +192,7 @@ class CfgVehicles {
};
};
class useLocation_PAK {
displayName = "Locations PAK (Adv)";
displayName = "Locations PAK";
description = "Where can the personal aid kit be used?";
typeName = "NUMBER";
class values {
@ -254,6 +223,42 @@ class CfgVehicles {
};
};
class ACE_moduleReviveSettings: ACE_Module {
scope = 2;
displayName = "Revive Settings [ACE]";
icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa));
category = "ACE_medical";
function = QUOTE(DFUNC(moduleReviveSettings));
functionPriority = 1;
isGlobal = 1;
isTriggerActivated = 0;
author = "$STR_ACE_Common_ACETeam";
class Arguments {
class enableRevive {
displayName = "Enable Revive";
description = "Enable a basic revive system";
typeName = "BOOL";
defaultValue = 0;
};
class maxReviveTime {
displayName = "Max Revive time";
description = "Max amount of seconds a unit can spend in revive state";
typeName = "NUMBER";
defaultValue = 120;
};
class amountOfReviveLives {
displayName = "Max Revive lives";
description = "Max amount of lives a unit. 0 or -1 is disabled.";
typeName = "NUMBER";
defaultValue = -1;
};
};
class ModuleDescription {
description = "Provides a medical system for both players and AI.";
sync[] = {};
};
};
class ACE_moduleAssignMedicRoles: Module_F {
scope = 2;
displayName = "Set Medic Class [ACE]";

3
addons/medical/XEH_preInit.sqf
View File

@ -92,10 +92,11 @@ PREP(displayPatientInformation);
PREP(displayTriageCard);
PREP(dropDownTriageCard);
PREP(moduleMedicalSettings);
PREP(moduleAdvancedMedicalSettings);
PREP(moduleReviveSettings);
PREP(moduleAssignMedicRoles);
PREP(moduleAssignMedicalVehicle);
PREP(moduleAssignMedicalFacility);
PREP(moduleTreatmentConfiguration);
PREP(copyDeadBody);
PREP(requestWoundSync);
PREP(unconsciousPFH);

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

@ -76,7 +76,7 @@ if (GVAR(level) >= 2) then {
};
[_unit] call FUNC(addToInjuredCollection);
if ((_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith {
if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)])) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith {
if (vehicle _unit != _unit and {damage _vehicle >= 1}) then {
// @todo
// [_unit] call FUNC(unload);

11
addons/medical/functions/fnc_moduleTreatmentConfiguration.sqf → addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
View File

@ -22,12 +22,11 @@ _activated = _this select 2;
if !(_activated) exitWith {};
[_logic, QGVAR(medicSetting), "medicSetting"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(maxReviveTime), "maxReviveTime"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(amountOfReviveLives), "amountOfReviveLives"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableOverdosing), "enableOverdosing"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(allowLitterCreation), "allowLitterCreation"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(litterCleanUpDelay), "litterCleanUpDelay"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableFor), "enableFor"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableAdvancedWounds), "enableAdvancedWounds"] call EFUNC(common,readSettingFromModule);
// TODO disabled until implemented
// [_logic, QGVAR(enableAirway), "enableAirway"] call EFUNC(common,readSettingFromModule);
// [_logic, QGVAR(enableFractures), "enableFractures"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(medicSetting_PAK), "medicSetting_PAK"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(medicSetting_SurgicalKit), "medicSetting_SurgicalKit"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(consumeItem_PAK), "consumeItem_PAK"] call EFUNC(common,readSettingFromModule);

8
addons/medical/functions/fnc_moduleMedicalSettings.sqf
View File

@ -23,11 +23,9 @@ _activated = _this select 2;
if !(_activated) exitWith {};
[_logic, QGVAR(level), "level"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableFor), "enableFor"] call EFUNC(common,readSettingFromModule);
// TODO disabled until implemented
// [_logic, QGVAR(enableAirway), "enableAirway"] call EFUNC(common,readSettingFromModule);
// [_logic, QGVAR(enableFractures), "enableFractures"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableAdvancedWounds), "enableAdvancedWounds"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(medicSetting), "medicSetting"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(allowLitterCreation), "allowLitterCreation"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(litterCleanUpDelay), "litterCleanUpDelay"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableScreams), "enableScreams"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(playerDamageThreshold), "playerDamageThreshold"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule);

27
addons/medical/functions/fnc_moduleReviveSettings.sqf Normal file
View File

@ -0,0 +1,27 @@
/*
* Author: Glowbal
* Module for adjusting the medical revive settings
*
* Arguments:
* 0: The module logic <LOGIC>
* 1: units <ARRAY>
* 2: activated <BOOL>
*
* Return Value:
* None <NIL>
*
* Public: No
*/
#include "script_component.hpp"
private ["_logic", "_units", "_activated"];
_logic = _this select 0;
_units = _this select 1;
_activated = _this select 2;
if !(_activated) exitWith {};
[_logic, QGVAR(maxReviveTime), "maxReviveTime"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(amountOfReviveLives), "amountOfReviveLives"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableRevive), "enableRevive"] call EFUNC(common,readSettingFromModule);

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

@ -26,7 +26,7 @@ if (!local _unit) exitwith {
false;
};
if ((_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) && !_force) exitwith {
if ((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) && !_force) exitwith {
if (_unit getvariable [QGVAR(inReviveState), false]) exitwith {
if (GVAR(amountOfReviveLives) > 0) then {
_lifesLeft = _unit getvariable[QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives)];