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

Remove medkit (#6473)

Browse Source 
Due to be replaced by an alternative treatment option such as a split
This commit is contained in:
Thomas Kooi 2018-07-26 18:14:11 +02:00 committed by SilentSpike
parent 9349179213
commit e22f35da37
16 changed files with 0 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/medical/ACE_Settings.hpp
View File

@ -153,14 +153,6 @@ class ACE_Settings {
value = 0;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(medicSetting_Medkit) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_medicSetting_Medkit_DisplayName);
description = CSTRING(MedicalSettings_medicSetting_Medkit_Description);
typeName = "SCALAR";
value = 0;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(medicSetting_PAK) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_medicSetting_PAK_DisplayName);
@ -177,14 +169,6 @@ class ACE_Settings {
value = 0;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(consumeItem_Medkit) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_consumeItem_Medkit_DisplayName);
description = CSTRING(MedicalSettings_consumeItem_Medkit_Description);
typeName = "SCALAR";
value = 1;
values[] = {"No", "Yes"};
};
class GVAR(consumeItem_PAK) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_consumeItem_PAK_DisplayName);
@ -209,14 +193,6 @@ class ACE_Settings {
value = 0;
values[] = {ECSTRING(common,Anywhere), ECSTRING(common,Vehicle), CSTRING(MedicalSettings_facility), CSTRING(MedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)};
};
class GVAR(useLocation_Medkit) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_useLocation_Medkit_DisplayName);
description = CSTRING(MedicalSettings_useLocation_Medkit_Description);
typeName = "SCALAR";
value = 0;
values[] = {ECSTRING(common,Anywhere), ECSTRING(common,Vehicle), CSTRING(MedicalSettings_facility), CSTRING(MedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)};
};
class GVAR(useLocation_PAK) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_useLocation_PAK_DisplayName);
@ -233,14 +209,6 @@ class ACE_Settings {
value = 0;
values[] = {ECSTRING(common,Anywhere), ECSTRING(common,Vehicle), CSTRING(MedicalSettings_facility), CSTRING(MedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)};
};
class GVAR(remainingDamage_Medkit) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_remainingDamage_Medkit_DisplayName);
description = CSTRING(MedicalSettings_remainingDamage_Medkit_Description);
typeName = "SCALAR";
value = 0.0;
sliderSettings[] = {0, 1, 0.1, 2};
};
class GVAR(allowUnconsciousAnimationOnTreatment) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_allowUnconsciousAnimationOnTreatment_DisplayName);

70
addons/medical/CfgVehicles.hpp
View File

@ -182,26 +182,6 @@ class CfgVehicles {
};
};
};
class medicSetting_Medkit {
displayName = CSTRING(MedicalSettings_medicSetting_Medkit_DisplayName);
description = CSTRING(MedicalSettings_medicSetting_Medkit_Description);
typeName = "SCALAR";
class values {
class anyone {
name = CSTRING(MedicalSettings_anyone);
value = 0;
default = 1;
};
class onlymedics {
name = CSTRING(MedicalSettings_Medic);
value = 1;
};
class onlydoctors {
name = CSTRING(MedicalSettings_Special);
value = 2;
};
};
};
class medicSetting_PAK {
displayName = CSTRING(MedicalSettings_medicSetting_PAK_DisplayName);
description = CSTRING(MedicalSettings_medicSetting_PAK_Description);
@ -242,22 +222,6 @@ class CfgVehicles {
};
};
};
class consumeItem_Medkit {
displayName = CSTRING(MedicalSettings_consumeItem_Medkit_DisplayName);
description = CSTRING(MedicalSettings_consumeItem_Medkit_Description);
typeName = "SCALAR";
class values {
class no {
name = ECSTRING(common,No);
value = 0;
};
class yes {
name = ECSTRING(common,Yes);
value = 1;
default = 1;
};
};
};
class consumeItem_PAK {
displayName = CSTRING(MedicalSettings_consumeItem_PAK_DisplayName);
description = CSTRING(MedicalSettings_consumeItem_PAK_Description);
@ -318,34 +282,6 @@ class CfgVehicles {
};
};
};
class useLocation_Medkit {
displayName = CSTRING(MedicalSettings_useLocation_Medkit_DisplayName);
description = CSTRING(MedicalSettings_useLocation_Medkit_Description);
typeName = "SCALAR";
class values {
class anywhere {
name = ECSTRING(common,Anywhere);
value = 0;
default = 1;
};
class vehicle {
name = ECSTRING(common,Vehicle);
value = 1;
};
class facility {
name = CSTRING(MedicalSettings_facility);
value = 2;
};
class vehicleAndFacility {
name = CSTRING(MedicalSettings_vehicleAndFacility);
value = 3;
};
class disabled {
name = ECSTRING(common,Disabled);
value = 4;
};
};
};
class useLocation_PAK {
displayName = CSTRING(MedicalSettings_useLocation_PAK_DisplayName);
description = CSTRING(MedicalSettings_useLocation_PAK_Description);
@ -402,12 +338,6 @@ class CfgVehicles {
};
};
};
class remainingDamage_Medkit {
displayName = CSTRING(MedicalSettings_remainingDamage_Medkit_DisplayName);
description = CSTRING(MedicalSettings_remainingDamage_Medkit_Description);
typeName = "SCALAR";
defaultValue = 0.1;
};
class allowUnconsciousAnimationOnTreatment {
displayName = CSTRING(MedicalSettings_allowUnconsciousAnimationOnTreatment_DisplayName);
description = CSTRING(MedicalSettings_allowUnconsciousAnimationOnTreatment_Description);

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

@ -41,18 +41,14 @@ if !(_activated) exitWith {};
[_logic, QGVAR(cardiacArrestTime), "cardiacArrestTime"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(medicSetting_PainVisualization), "painVisualization"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(medicSetting_Epi), "medicSetting_Epi"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(medicSetting_Medkit), "medicSetting_Medkit"] 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_Medkit), "consumeItem_Medkit"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(consumeItem_PAK), "consumeItem_PAK"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(consumeItem_SurgicalKit), "consumeItem_SurgicalKit"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(useLocation_Epi), "useLocation_Epi"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(useLocation_Medkit), "useLocation_Medkit"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(useLocation_PAK), "useLocation_PAK"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(useLocation_SurgicalKit), "useLocation_SurgicalKit"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(remainingDamage_Medkit), "remainingDamage_Medkit"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(allowUnconsciousAnimationOnTreatment), "allowUnconsciousAnimationOnTreatment"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(menuTypeStyle), "menuTypeStyle"] call EFUNC(common,readSettingFromModule);

30
addons/medical/stringtable.xml
View File

@ -725,15 +725,6 @@
<Key ID="STR_ACE_Medical_MedicalSettings_medicSetting_Epi_Description">
<English>Who can use Epinephrine?</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_medicSetting_Medkit_DisplayName">
<English>Allow Medkit</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_medicSetting_Medkit_Description">
<English>Who can use the Medkit for partial heal?</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_medicSetting_PAK_DisplayName">
<English>Who can use the Medkit for partial heal?</English>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_medicSetting_basicEpi_Description">
<English>Who can use Epinephrine for full heal? (Basic medical only)</English>
<German>Wer darf Epiniphrin zur vollständigen Heilung benutzen? (Standard Sanitätseinstellungen)</German>
@ -829,12 +820,6 @@
<Chinesesimp>只限军医</Chinesesimp>
<Chinese>只限軍醫</Chinese>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_consumeItem_Medkit_DisplayName">
<English>Remove Medkit on use</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_consumeItem_Medkit_Description">
<English>Should Medkit be removed on usage?</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_consumeItem_PAK_DisplayName">
<English>Remove PAK on use</English>
<Russian>Удалять аптечки после использования</Russian>
@ -885,15 +870,6 @@
<Key ID="STR_ACE_Medical_BasicMedicalSettings_useLocation_Epi_Description">
<English>Where can the Epinephrine be used?</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_useLocation_Medkit_DisplayName">
<English>Locations Medkit</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_useLocation_Medkit_Description">
<English>Where can the Medkit be used?</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_useLocation_PAK_DisplayName">
<English>Where can the Medkit be used?</English>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_useLocation_basicEpi_Description">
<English>Where can the Epinephrine be used? (Basic Medical)</English>
@ -1102,12 +1078,6 @@
<Chinesesimp>定义手术包可被使用的地方?</Chinesesimp>
<Chinese>定義手術包可被使用的地方?</Chinese>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_remainingDamage_Medkit_DisplayName">
<English>Remaining Damage</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_remainingDamage_Medkit_Description">
<English>Remaining damage on Medkit usage (increases with every use)?</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_useCondition_SurgicalKit_DisplayName">
<English>Condition Surgical Kit (Adv)</English>
<German>Beding. für d. Operationskasten (erw.)</German>

1
addons/medical_status/functions/fnc_initUnit.sqf
View File

@ -51,7 +51,6 @@ _unit setVariable [VAR_UNCON, false, true];
_unit setVariable [QEGVAR(medical,tourniquets), [0,0,0,0,0,0], true];
_unit setVariable [QEGVAR(medical,occludedMedications), nil, true]; //Delayed Medications (from tourniquets)
_unit setVariable [QEGVAR(medical,ivBags), nil, true];
_unit setVariable [QEGVAR(medical,partialHealCounter), 0, true];
// triage card and logs
_unit setVariable [QEGVAR(medical,triageLevel), 0, true];

9
addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
View File

@ -301,13 +301,4 @@ class GVAR(Actions) {
{"All", "_bloodLossOnBodyPart <= 0", {"ACE_MedicalLitter_clean"}}
};
};
class MedKit: PersonalAidKit {
displayName = CSTRING(Use_Med_Kit);
items[] = {"ACE_medKit"};
treatmentLocations[] = {QEGVAR(medical,useLocation_MedKit)};
requiredMedic = QEGVAR(medical,medicSetting_MedKit);
treatmentTime = QUOTE(_target call FUNC(HealTimeMedkit));
callbackSuccess = QFUNC(treatmentPartialHeal);
itemConsumed = QEGVAR(medical,consumeItem_MedKit);
};
};

7
addons/medical_treatment/ACE_Settings.hpp
View File

@ -30,13 +30,6 @@ class ACE_Settings {
typeName = "BOOL";
value = 1;
};
class EGVAR(medical,MedkitTime) {
category = ECSTRING(medical,Category_Medical);
displayName = CSTRING(MedkitTime);
description = CSTRING(MedkitTime_Description);
typeName = "SCALAR";
value = 0;
};
class EGVAR(medical,PAKTime) {
category = ECSTRING(medical,Category_Medical);
displayName = CSTRING(PAKTime);

11
addons/medical_treatment/CfgVehicles.hpp
View File

@ -198,16 +198,6 @@ class CfgVehicles {
MACRO_ADDITEM(ACE_quikclot,1);
};
};
class ACE_medKitItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Med_Kit_Display);
author = ECSTRING(common,ACETeam);
vehicleClass = "Items";
class TransportItems {
MACRO_ADDITEM(ACE_medKit,1);
};
};
class ACE_personalAidKitItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
@ -316,7 +306,6 @@ class CfgVehicles {
MACRO_ADDITEM(ACE_bloodIV_500,7);
MACRO_ADDITEM(ACE_bloodIV_250,7);
MACRO_ADDITEM(ACE_quikClot,20);
MACRO_ADDITEM(ACE_medKit,20);
MACRO_ADDITEM(ACE_personalAidKit,3);
MACRO_ADDITEM(ACE_surgicalKit,2);
MACRO_ADDITEM(ACE_bodyBag,5);

10
addons/medical_treatment/CfgWeapons.hpp
View File

@ -221,16 +221,6 @@ class CfgWeapons {
mass = 2;
};
};
class ACE_medKit: ACE_ItemCore {
scope = 2;
displayName = CSTRING(Med_Kit_Display);
picture = QPATHTOF(ui\items\personal_aid_kit_x_ca.paa); // todo: new picture
descriptionShort = CSTRING(Med_Kit_Desc_Short);
descriptionUse = CSTRING(Med_Kit_Desc_Use);
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10;
};
};
class ACE_personalAidKit: ACE_ItemCore {
scope = 2;
author = ECSTRING(common,ACETeam);

3
addons/medical_treatment/XEH_PREP.hpp
View File

@ -31,8 +31,6 @@ PREP(treatmentIV);
PREP(treatmentIVLocal);
PREP(treatmentMedication);
PREP(treatmentMedicationLocal);
PREP(treatmentPartialHeal);
PREP(treatmentPartialHealLocal);
PREP(treatmentSurgicalKit_onProgress);
PREP(treatmentTourniquet);
PREP(treatmentTourniquetLocal);
@ -51,7 +49,6 @@ PREP(getTriageStatus);
PREP(handleBandageOpening);
PREP(hasTourniquetAppliedTo);
PREP(healTime);
PREP(HealTimeMedkit);
PREP(isInMedicalFacility);
PREP(isInMedicalVehicle);
PREP(isMedic);

1
addons/medical_treatment/XEH_postInit.sqf
View File

@ -15,7 +15,6 @@ if (isServer) then {
[QGVAR(treatmentMedicationLocal), FUNC(treatmentMedicationLocal)] call CBA_fnc_addEventHandler;
[QGVAR(treatmentIVLocal), FUNC(treatmentIVLocal)] call CBA_fnc_addEventHandler;
[QGVAR(treatmentCPRLocal), FUNC(treatmentCPRLocal)] call CBA_fnc_addEventHandler;
[QGVAR(treatmentPartialHealLocal), FUNC(treatmentPartialHealLocal)] call CBA_fnc_addEventHandler;
[QGVAR(treatmentFullHealLocal), FUNC(treatmentFullHealLocal)] call CBA_fnc_addEventHandler;
// action events

31
addons/medical_treatment/functions/fnc_HealTimeMedkit.sqf
View File

@ -1,31 +0,0 @@
/*
* Author: Ruthberg, Arcanum
* Calculates the personal aid kit treatment time based on amount of damage to heal
*
* Arguments:
* unit <OBJECT>
*
* Return Value:
* treatment time <NUMBER>
*
* Example:
* [_target] call ace_medical_treatment_fnc_HealTimeMedkit
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit"];
private _totalDamage = 0;
private _treatTime = 0;
{
_totalDamage = _totalDamage + _x;
} forEach (_unit getVariable [QEGVAR(medical,bodyPartDamage), []]);
if (EGVAR(medical,MedkitTime) > 0) then {
_treatTime = EGVAR(medical,MedkitTime);
} else {
_treatTime = 10 max (_totalDamage * 5) min 180;
};
_treatTime

1
addons/medical_treatment/functions/fnc_treatmentFullHealLocal.sqf
View File

@ -54,7 +54,6 @@ _target setVariable [VAR_IS_BLEEDING, false, true];
_target setVariable [VAR_IN_PAIN, false, true];
_target setVariable [VAR_PAIN_SUPP, 0, true];
_target setVariable [VAR_PAIN_SUPP_ADJ, [], true];
_target setVariable [QGVAR(partialHealCounter), 0, true];
// medication
private _allUsedMedication = _target getVariable [QEGVAR(medical,allUsedMedication), []];

23
addons/medical_treatment/functions/fnc_treatmentPartialHeal.sqf
View File

@ -1,23 +0,0 @@
/*
* Author: Glowbal
* Partial heal treatment
*
* Arguments:
* 0: The medic <OBJECT>
* 1: The patient <OBJECT>
* 2: Body part <STRING>
* 3: Treatment class name <STRING>
* 4: Item <STRING>
*
* Return Value:
* Succesful treatment started <BOOL>
*
* Public: Yes
*/
#include "script_component.hpp"
params ["_caller", "_target"];
[QGVAR(treatmentPartialHealLocal), [_caller, _target], _target] call CBA_fnc_targetEvent;
true

41
addons/medical_treatment/functions/fnc_treatmentPartialHealLocal.sqf
View File

@ -1,41 +0,0 @@
/*
* Author: Glowbal
* Handles partial heal of a patient.
*
* Arguments:
* 0: The medic <OBJECT>
* 1: The patient <OBJECT>
*
* Return Value:
* Succesful treatment started <BOOL>
*
* Public: No
*/
#include "script_component.hpp"
params ["_caller", "_target"];
if (!alive _target) exitWith {};
private _partialHealCounter = _target getVariable [QGVAR(partialHealCounter), 0];
_partialHealCounter = _partialHealCounter + 1;
_target setVariable [QGVAR(partialHealCounter), _partialHealCounter, true];
private _healingPower = (0 max (1 - EGVAR(medical,remainingDamage_Medkit)) min 1) ^ _partialHealCounter;
private _damageRemainder = 1 - _healingPower;
private _bodyPartDamage = _target getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]];
_bodyPartDamage = _bodyPartDamage apply {
(_x min _damageRemainder)
};
_target setVariable [QEGVAR(medical,bodyPartDamage), _bodyPartDamage, true];
if ((_bodyPartDamage select 4) < 0.3 && {(_bodyPartDamage select 5) < 0.3}) then {
[_target, false] call EFUNC(medical_engine,setLimping);
};
// Resetting damage
_target setDamage 0;
[_target, "activity", ELSTRING(medical_treatment,Activity_partialHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);
[_target, "activity_view", ELSTRING(medical_treatment,Activity_partialHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); // TODO expand message

21
addons/medical_treatment/stringtable.xml
View File

@ -284,12 +284,6 @@
<Key ID="STR_ACE_Medical_treatment_PAKTime_Description">
<English>How long should PAK take to apply ? Use 0 for default (based on damage)</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_MedkitTime">
<English>How long should Medkit take to apply ?</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_MedkitTime_Description">
<English>How long should Medkit take to apply ? Use 0 for default (based on damage)</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Bandage_Basic_Display">
<English>Bandage (Basic)</English>
<German>Bandage (Einfach)</German>
@ -959,18 +953,6 @@
<Chinesesimp>包含止血粉成分的止血绷带, 可用于止血</Chinesesimp>
<Chinese>包含止血粉成分的止血繃帶, 可用於止血</Chinese>
</Key>
<Key ID="STR_ACE_Medical_treatment_Med_Kit_Display">
<English>Medkit</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Med_Kit_Desc_Short">
<English>...</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Med_Kit_Desc_Use">
<English>...</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Use_Med_Kit">
<English>Use Medkit</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Aid_Kit_Display">
<English>Personal Aid Kit</English>
<Russian>Аптечка</Russian>
@ -3104,9 +3086,6 @@
<Chinesesimp>%1 已经绑上止血带</Chinesesimp>
<Chinese>%1 已經綁上止血帶</Chinese>
</Key>
<Key ID="STR_ACE_Medical_treatment_Activity_partialHeal">
<English>%1 used Medkit</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Activity_fullHeal">
<English>%1 used Personal Aid Kit</English>
<German>%1 hat das eigene Erste-Hilfe-Set verwendet</German>