From 3b9def0fa250a3a6722cc56d04b1c2fa54eebbb4 Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Fri, 11 Oct 2024 23:11:55 -0700 Subject: [PATCH 1/9] Fixes --- addons/pharma/ACE_Medical_Treatment.hpp | 8 +++ addons/pharma/XEH_PREP.hpp | 1 - addons/pharma/XEH_postInit.sqf | 1 - addons/pharma/XEH_preInit.sqf | 53 ------------------- .../pharma/functions/fnc_medicationLocal.sqf | 9 +--- .../fnc_treatmentAdvanced_AmiodaroneLocal.sqf | 1 + ...> fnc_treatmentAdvanced_KetamineLocal.sqf} | 0 7 files changed, 11 insertions(+), 62 deletions(-) rename addons/pharma/functions/{fnc_treatmentAdvanced_KetamineSedationLocal.sqf => fnc_treatmentAdvanced_KetamineLocal.sqf} (100%) diff --git a/addons/pharma/ACE_Medical_Treatment.hpp b/addons/pharma/ACE_Medical_Treatment.hpp index 87b1acf7f..1ae43eb60 100644 --- a/addons/pharma/ACE_Medical_Treatment.hpp +++ b/addons/pharma/ACE_Medical_Treatment.hpp @@ -516,6 +516,7 @@ class ACE_ADDON(Medical_Treatment) { viscosityChange = -10; onOverDose = ""; opioidRelief = 1.2; + opioidEffect = 0.17; }; class syringe_ketamine_5ml_1 { painReduce = 0.7; @@ -529,6 +530,7 @@ class ACE_ADDON(Medical_Treatment) { incompatibleMedication[] = {}; viscosityChange = 10; onOverDose = ""; + opioidEffect = 0.11; }; class syringe_nalbuphine_5ml_1 { painReduce = 0.5; @@ -684,6 +686,7 @@ class ACE_ADDON(Medical_Treatment) { viscosityChange = -10; onOverDose = ""; opioidRelief = 1.5; + opioidEffect = 0.17; }; class syringe_ketamine_5ml_3 { painReduce = 0.8; @@ -697,6 +700,7 @@ class ACE_ADDON(Medical_Treatment) { incompatibleMedication[] = {}; viscosityChange = 10; onOverDose = ""; + opioidEffect = 0.17; }; class syringe_nalbuphine_5ml_3 { painReduce = 0.6; @@ -798,6 +802,7 @@ class ACE_ADDON(Medical_Treatment) { viscosityChange = -10; onOverDose = ""; opioidRelief = 1.3; + opioidEffect = 0.17; }; class syringe_ketamine_10ml_1 { painReduce = 0.7; @@ -811,6 +816,7 @@ class ACE_ADDON(Medical_Treatment) { incompatibleMedication[] = {}; viscosityChange = 10; onOverDose = ""; + opioidEffect = 0.17; }; class syringe_nalbuphine_10ml_1 { painReduce = 0.5; @@ -852,6 +858,7 @@ class ACE_ADDON(Medical_Treatment) { viscosityChange = -10; onOverDose = ""; opioidRelief = 1.5; + opioidEffect = 0.17; }; class syringe_ketamine_10ml_3 { painReduce = 0.8; @@ -865,6 +872,7 @@ class ACE_ADDON(Medical_Treatment) { incompatibleMedication[] = {}; viscosityChange = 10; onOverDose = ""; + opioidEffect = 0.17; }; class syringe_nalbuphine_10ml_3 { painReduce = 0.6; diff --git a/addons/pharma/XEH_PREP.hpp b/addons/pharma/XEH_PREP.hpp index 05922a36c..d6c614442 100644 --- a/addons/pharma/XEH_PREP.hpp +++ b/addons/pharma/XEH_PREP.hpp @@ -49,7 +49,6 @@ PREP(treatmentAdvanced_TXALocal); PREP(vehicleCheckDialysis); PREP(prepareSyringe); PREP(checkIVType); -PREP(treatmentAdvanced_KetamineSedationLocal); PREP(ivCondition); PREP(AMSCheck); PREP(getAllMedicationsCount) \ No newline at end of file diff --git a/addons/pharma/XEH_postInit.sqf b/addons/pharma/XEH_postInit.sqf index 6aa958988..4ff370185 100644 --- a/addons/pharma/XEH_postInit.sqf +++ b/addons/pharma/XEH_postInit.sqf @@ -16,7 +16,6 @@ [QGVAR(pervitinLocal), LINKFUNC(treatmentAdvanced_PervitinLocal)] call CBA_fnc_addEventHandler; [QGVAR(pervitinPP), LINKFUNC(pervitinPP)] call CBA_fnc_addEventHandler; [QGVAR(ketamineLocal), LINKFUNC(treatmentAdvanced_KetamineLocal)] call CBA_fnc_addEventHandler; -[QGVAR(ketamineLocal), LINKFUNC(treatmentAdvanced_KetamineSedationLocal)] call CBA_fnc_addEventHandler; [QGVAR(fentanylLocal), LINKFUNC(treatmentAdvanced_FentanylLocal)] call CBA_fnc_addEventHandler; [QGVAR(caffeineLocal), LINKFUNC(treatmentAdvanced_CaffeineLocal)] call CBA_fnc_addEventHandler; diff --git a/addons/pharma/XEH_preInit.sqf b/addons/pharma/XEH_preInit.sqf index e274914c0..26d07fc25 100644 --- a/addons/pharma/XEH_preInit.sqf +++ b/addons/pharma/XEH_preInit.sqf @@ -344,24 +344,6 @@ PREP_RECOMPILE_END; true ] call CBA_Settings_fnc_init; -[ - QGVAR(chromatic_aberration_checkbox_pervitin), - "CHECKBOX", - [LLSTRING(SETTING_Chromatic_Aberration_Checkbox_Pervitin), LLSTRING(SETTING_Chromatic_Aberration_Checkbox_Pervitin_DESC)], - [CBA_SETTINGS_CAT, LSTRING(SubCategory_Pervitin)], - [true], - true -] call CBA_Settings_fnc_init; - -[ - QGVAR(chromatic_aberration_slider_pervitin), - "SLIDER", - [LLSTRING(SETTING_Chromatic_Aberration_Slider_Pervitin), LLSTRING(SETTING_Chromatic_Aberration_Slider_Pervitin_DESC)], - [CBA_SETTINGS_CAT, LSTRING(SubCategory_Pervitin)], - [0.1, 10, 1, 1], - true -] call CBA_Settings_fnc_init; - [ QGVAR(pervitinSpeed), "SLIDER", @@ -697,24 +679,6 @@ PREP_RECOMPILE_END; true ] call CBA_Settings_fnc_init; -[ - QGVAR(chromatic_aberration_checkbox_ketamine), - "CHECKBOX", - [LLSTRING(SETTING_Chromatic_Aberration_Checkbox_Ketamine), LLSTRING(SETTING_Chromatic_Aberration_Checkbox_Ketamine_DESC)], - [CBA_SETTINGS_CAT, LSTRING(SubCategory_Ketamine)], - [true], - true -] call CBA_Settings_fnc_init; - -[ - QGVAR(chromatic_aberration_slider_ketamine), - "SLIDER", - [LLSTRING(SETTING_Chromatic_Aberration_Slider_Ketamine), LLSTRING(SETTING_Chromatic_Aberration_Slider_Ketamine_DESC)], - [CBA_SETTINGS_CAT, LSTRING(SubCategory_Ketamine)], - [0.1, 10, 0.8, 1], - true -] call CBA_Settings_fnc_init; - //Fentanyl Settings Category [ QGVAR(medLvl_Fentanyl), @@ -751,23 +715,6 @@ PREP_RECOMPILE_END; [0.1, 10, 7, 1], true ] call CBA_Settings_fnc_init; -[ - QGVAR(chromatic_aberration_checkbox_fentanyl), - "CHECKBOX", - [LLSTRING(SETTING_Chromatic_Aberration_Checkbox_Fentanyl), LLSTRING(SETTING_Chromatic_Aberration_Checkbox_Fentanyl_DESC)], - [CBA_SETTINGS_CAT, LSTRING(SubCategory_Fentanyl)], - [true], - true -] call CBA_Settings_fnc_init; - -[ - QGVAR(chromatic_aberration_slider_fentanyl), - "SLIDER", - [LLSTRING(SETTING_Chromatic_Aberration_Slider_Fentanyl), LLSTRING(SETTING_Chromatic_Aberration_Slider_Fentanyl_DESC)], - [CBA_SETTINGS_CAT, LSTRING(SubCategory_Fentanyl)], - [0.1, 10, 1, 1], - true -] call CBA_Settings_fnc_init; //Nalbuphine Settings Category [ diff --git a/addons/pharma/functions/fnc_medicationLocal.sqf b/addons/pharma/functions/fnc_medicationLocal.sqf index c7fad8782..36dc0315d 100644 --- a/addons/pharma/functions/fnc_medicationLocal.sqf +++ b/addons/pharma/functions/fnc_medicationLocal.sqf @@ -42,16 +42,11 @@ if !(ACEGVAR(medical_treatment,advancedMedication)) exitWith { if !(_sedated) then { [QACEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent; }; - - [_patient, -0.15] call FUNC(alphaAction); }; case "EpinephrineIV": { private _sedated = _patient getVariable [QEGVAR(surgery,sedated), false]; if !(_sedated) then { [QACEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent; - }; - - [_patient, -0.30] call FUNC(alphaAction); }; case "Painkillers": { private _painSuppress = GET_PAIN_SUPPRESS(_patient); @@ -95,6 +90,7 @@ private _incompatibleMedication = GET_ARRAY(_medicationConfig >> "incompatibleMe private _alphaFactor = GET_NUMBER(_medicationConfig >> "alphaFactor",getNumber (_defaultConfig >> "alphaFactor")); private _maxRelief = GET_NUMBER(_medicationConfig >> "maxRelief",getNumber (_defaultConfig >> "maxRelief")); private _opioidRelief = GET_NUMBER(_medicationConfig >> "opioidRelief",getNumber (_defaultConfig >> "opioidRelief")); +private _opioidEffect = GET_NUMBER(_medicationConfig >> "opioidEffect",getNumber (_defaultConfig >> "opioidEffect")); private _heartRate = GET_HEART_RATE(_patient); private _hrIncrease = [_hrIncreaseLow, _hrIncreaseNormal, _hrIncreaseHigh] select (floor ((0 max _heartRate min 110) / 55)); @@ -111,13 +107,12 @@ if (_maxRelief > 0) then { // Adjust the medication effects and add the medication to the list TRACE_3("adjustments",_heartRateChange,_painReduce,_viscosityChange); -[_patient, _className, _timeTillMaxEffect, _timeInSystem, _heartRateChange, _painReduce, _viscosityChange] call ACEFUNC(medical_status,addMedicationAdjustment); +[_patient, _className, _timeTillMaxEffect, _timeInSystem, _heartRateChange, _painReduce, _viscosityChange, _alphaFactor, _opioidEffect] call EFUNC(vitals,addMedicationAdjustment); // Check for medication compatiblity [_patient, _className, _maxDose, _maxDoseDeviation, _incompatibleMedication] call ACEFUNC(medical_treatment,onMedicationUsage); //Change Alpha Factor -[_patient, _alphaFactor] call FUNC(alphaAction); if ([QGVAR(AMS_Enabled)] call CBA_settings_fnc_get) then { private _medicationParts = (_className splitString "_"); diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf index bc05537df..72f555905 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf @@ -14,6 +14,7 @@ * * Public: No */ +params ["_patient"]; private _random = random 3; if (_random <= 1) then { diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_KetamineSedationLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_KetamineLocal.sqf similarity index 100% rename from addons/pharma/functions/fnc_treatmentAdvanced_KetamineSedationLocal.sqf rename to addons/pharma/functions/fnc_treatmentAdvanced_KetamineLocal.sqf From 440b569f327797fe8656c1ab9113536004672446 Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Fri, 11 Oct 2024 23:19:02 -0700 Subject: [PATCH 2/9] Fix --- addons/pharma/XEH_PREP.hpp | 1 - addons/pharma/functions/fnc_medicationLocal.sqf | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/pharma/XEH_PREP.hpp b/addons/pharma/XEH_PREP.hpp index d6c614442..1d062aca7 100644 --- a/addons/pharma/XEH_PREP.hpp +++ b/addons/pharma/XEH_PREP.hpp @@ -1,4 +1,3 @@ -PREP(alphaAction); PREP(applyIV); PREP(checkIV); PREP(clotWound); diff --git a/addons/pharma/functions/fnc_medicationLocal.sqf b/addons/pharma/functions/fnc_medicationLocal.sqf index 36dc0315d..8c3286023 100644 --- a/addons/pharma/functions/fnc_medicationLocal.sqf +++ b/addons/pharma/functions/fnc_medicationLocal.sqf @@ -47,6 +47,7 @@ if !(ACEGVAR(medical_treatment,advancedMedication)) exitWith { private _sedated = _patient getVariable [QEGVAR(surgery,sedated), false]; if !(_sedated) then { [QACEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent; + }; }; case "Painkillers": { private _painSuppress = GET_PAIN_SUPPRESS(_patient); @@ -112,7 +113,6 @@ TRACE_3("adjustments",_heartRateChange,_painReduce,_viscosityChange); // Check for medication compatiblity [_patient, _className, _maxDose, _maxDoseDeviation, _incompatibleMedication] call ACEFUNC(medical_treatment,onMedicationUsage); -//Change Alpha Factor if ([QGVAR(AMS_Enabled)] call CBA_settings_fnc_get) then { private _medicationParts = (_className splitString "_"); @@ -133,9 +133,9 @@ if ([QGVAR(AMS_Enabled)] call CBA_settings_fnc_get) then { }; } else { - diag_log format ["Unexpected _className format: %1", _className]; + diag_log format ["Unexpected _className format: %1", _className]; }; - } else { +} else { if (_className in ["Lorazepam","Ketamine","EACA","TXA","Atropine","Amiodarone","Flumazenil"]) then { [format ["kat_pharma_%1Local", toLower _className], [_patient, _bodyPart], _patient] call CBA_fnc_targetEvent; @@ -144,4 +144,4 @@ if ([QGVAR(AMS_Enabled)] call CBA_settings_fnc_get) then { if (_className in ["Fentanyl","Morphine","Nalbuphine"]) then { [format ["kat_pharma_%1Local", toLower _className], [_patient, _bodyPart, _opioidRelief], _patient] call CBA_fnc_targetEvent; }; -}; \ No newline at end of file +}; From d971a2035fef1f4bd0eb787b6132c06318213338 Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Fri, 11 Oct 2024 23:39:00 -0700 Subject: [PATCH 3/9] Wee --- addons/gui/gui.hpp | 23 +++++++++++------------ addons/pharma/XEH_PREP.hpp | 1 - 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/addons/gui/gui.hpp b/addons/gui/gui.hpp index ce5b0dc26..0f3c42374 100644 --- a/addons/gui/gui.hpp +++ b/addons/gui/gui.hpp @@ -665,9 +665,9 @@ class ACE_Medical_Menu { class SyringeOpenButton: RscButton { idc = IDC_SYRINGE_OPEN; text = CSTRING(OpenSyringeMenu); - x = QUOTE(POS_X(23.7)); - y = QUOTE(POS_Y(0)); - w = QUOTE(POS_W(4.4)); + x = QUOTE(POS_X(39.6)); + y = QUOTE(POS_Y(4.9)); + w = QUOTE(POS_W(2)); h = QUOTE(POS_H(1)); colorBackgroundDisabled[] = GUI_BCG_COLOR; colorBackground[] = GUI_BCG_COLOR; @@ -703,7 +703,6 @@ class ACE_Medical_Menu { shadow = "false"; }; }; - class SyringeTypeTitle: RscStructuredText { idc = IDC_SYRINGE_TYPE_TITLE; // LOOK HERE text = CSTRING(SyringeTitleList); @@ -720,7 +719,7 @@ class ACE_Medical_Menu { font = "RobotoCondensed"; shadow = "false"; }; - }; + }; class SyringeList: RscListBox { idc = IDC_SYRINGE_TYPE_LIST; // LOOK HERE x = QUOTE(POS_X(3.8)); @@ -728,7 +727,7 @@ class ACE_Medical_Menu { w = QUOTE(POS_W(8)); h = QUOTE(POS_H(2)); show = 1; - }; + }; class MedicationTypeTitle: RscStructuredText { idc = IDC_MEDICATION_TYPE_TITLE; // LOOK HERE text = CSTRING(MedicationTitleList); @@ -744,8 +743,8 @@ class ACE_Medical_Menu { color = "#E5E5E5"; font = "RobotoCondensed"; shadow = "false"; + }; }; - }; class MedicationList: RscListBox { idc = IDC_MEDICATION_TYPE_LIST; // LOOK HERE x = QUOTE(POS_X(3.8)); @@ -753,7 +752,7 @@ class ACE_Medical_Menu { w = QUOTE(POS_W(8)); h = QUOTE(POS_H(6)); show = 1; - }; + }; class DoseTitle: RscStructuredText { idc = IDC_MEDICATION_DOSE_TITLE; // LOOK HERE text = CSTRING(DoseTitle); @@ -769,8 +768,8 @@ class ACE_Medical_Menu { color = "#E5E5E5"; font = "RobotoCondensed"; shadow = "false"; + }; }; - }; class DoseList: RscCombo { idc = IDC_MEDICATION_DOSE_COMBO; // LOOK HERE x = QUOTE(POS_X(3.8)); @@ -795,9 +794,9 @@ class ACE_Medical_Menu { { text = CSTRING(DoseHigh); value = 3; + }; }; }; - }; class PrepSyringe: RscButton { idc = IDC_MEDICATION_PREP_SYRINGE; // LOOK HERE text = CSTRING(PrepSyringe); @@ -817,7 +816,7 @@ class ACE_Medical_Menu { font = "RobotoCondensed"; shadow = "false"; }; - }; - }; + }; + }; }; }; diff --git a/addons/pharma/XEH_PREP.hpp b/addons/pharma/XEH_PREP.hpp index 1d062aca7..c93e704b2 100644 --- a/addons/pharma/XEH_PREP.hpp +++ b/addons/pharma/XEH_PREP.hpp @@ -50,4 +50,3 @@ PREP(prepareSyringe); PREP(checkIVType); PREP(ivCondition); PREP(AMSCheck); -PREP(getAllMedicationsCount) \ No newline at end of file From 4b684664c6300870fa9f5a89eeb56fb872fda9ea Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Sat, 12 Oct 2024 02:49:02 -0700 Subject: [PATCH 4/9] Blood fix --- addons/gui/gui.hpp | 4 ++-- addons/pharma/ACE_Medical_Treatment_Actions.hpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/gui/gui.hpp b/addons/gui/gui.hpp index 0f3c42374..eadc56c9f 100644 --- a/addons/gui/gui.hpp +++ b/addons/gui/gui.hpp @@ -167,7 +167,6 @@ class ACE_Medical_Menu { shadow = "true"; }; }; - }; class SYRINGEBackground: IVFlowBackground { idc = IDC_SYRINGE_BACKGROUND; // LOOK HERE x = QUOTE(POS_X(39.6)); @@ -187,6 +186,7 @@ class ACE_Medical_Menu { color = "#E5E5E5"; font = "RobotoCondensed"; shadow = "true"; + }; }; }; }; @@ -667,7 +667,7 @@ class ACE_Medical_Menu { text = CSTRING(OpenSyringeMenu); x = QUOTE(POS_X(39.6)); y = QUOTE(POS_Y(4.9)); - w = QUOTE(POS_W(2)); + w = QUOTE(POS_W(3)); h = QUOTE(POS_H(1)); colorBackgroundDisabled[] = GUI_BCG_COLOR; colorBackground[] = GUI_BCG_COLOR; diff --git a/addons/pharma/ACE_Medical_Treatment_Actions.hpp b/addons/pharma/ACE_Medical_Treatment_Actions.hpp index 8b1fcbde5..4960324bd 100644 --- a/addons/pharma/ACE_Medical_Treatment_Actions.hpp +++ b/addons/pharma/ACE_Medical_Treatment_Actions.hpp @@ -16,7 +16,7 @@ class ACE_Medical_Treatment_Actions { class BloodIV_500: BloodIV { callbackSuccess = "[_medic, _patient, _bodyPart, _className, _itemUser, _usedItem] call ace_medical_treatment_fnc_ivBag; [_patient, -400, 8] call kat_pharma_fnc_fluid;"; }; - class BloodIV_350: BloodIV { + class BloodIV_250: BloodIV { callbackSuccess = "[_medic, _patient, _bodyPart, _className, _itemUser, _usedItem] call ace_medical_treatment_fnc_ivBag; [_patient, -200, 4] call kat_pharma_fnc_fluid;"; }; class SalineIV: BloodIV { @@ -25,7 +25,7 @@ class ACE_Medical_Treatment_Actions { class SalineIV_500: SalineIV { callbackSuccess = "[_medic, _patient, _bodyPart, _className, _itemUser, _usedItem] call ace_medical_treatment_fnc_ivBag; [_patient, 350, 0] call kat_pharma_fnc_fluid;"; }; - class SalineIV_350: SalineIV { + class SalineIV_250: SalineIV { callbackSuccess = "[_medic, _patient, _bodyPart, _className, _itemUser, _usedItem] call ace_medical_treatment_fnc_ivBag; [_patient, 150, 0] call kat_pharma_fnc_fluid;"; }; class PlasmaIV: BloodIV { @@ -34,7 +34,7 @@ class ACE_Medical_Treatment_Actions { class PlasmaIV_500: PlasmaIV { callbackSuccess = "[_medic, _patient, _bodyPart, _className, _itemUser, _usedItem] call ace_medical_treatment_fnc_ivBag; [_patient, -250, 10] call kat_pharma_fnc_fluid;"; }; - class PlasmaIV_350: PlasmaIV { + class PlasmaIV_250: PlasmaIV { callbackSuccess = "[_medic, _patient, _bodyPart, _className, _itemUser, _usedItem] call ace_medical_treatment_fnc_ivBag; [_patient, -100, 5] call kat_pharma_fnc_fluid;"; }; class Epinephrine: Morphine { From abd729a1db68270cf67e176eb140799a4ca6f6f6 Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Sat, 12 Oct 2024 02:50:48 -0700 Subject: [PATCH 5/9] Weight changes --- addons/pharma/CfgWeapons.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/pharma/CfgWeapons.hpp b/addons/pharma/CfgWeapons.hpp index c182bb03f..1e0dd9c89 100644 --- a/addons/pharma/CfgWeapons.hpp +++ b/addons/pharma/CfgWeapons.hpp @@ -231,7 +231,7 @@ class CfgWeapons { descriptionShort = CSTRING(Lorazepam_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { - mass = 0.2; + mass = 0.5; }; }; class kat_flumazenil: ACE_ItemCore { @@ -242,7 +242,7 @@ class CfgWeapons { descriptionShort = CSTRING(Flumazenil_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { - mass = 0.2; + mass = 0.5; }; }; class kat_etomidate: ACE_ItemCore { @@ -253,7 +253,7 @@ class CfgWeapons { descriptionShort = CSTRING(Etomidate_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { - mass = 0.2; + mass = 0.5; }; }; class kat_epinephrineIV: ACE_ItemCore { @@ -264,7 +264,7 @@ class CfgWeapons { descriptionShort = CSTRING(EpinephrineIV_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { - mass = 0.2; + mass = 0.5; }; }; class kat_morphineIV: ACE_ItemCore { @@ -275,7 +275,7 @@ class CfgWeapons { descriptionShort = CSTRING(MorphineIV_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { - mass = 0.2; + mass = 0.5; }; }; class kat_adenosineIV: ACE_ItemCore { @@ -286,7 +286,7 @@ class CfgWeapons { descriptionShort = CSTRING(AdenosineIV_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { - mass = 0.2; + mass = 0.5; }; }; class kat_coag_sense: ACE_ItemCore { From 136257fcbd98e84bcba91ba3036b880015ed02c3 Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Sat, 12 Oct 2024 07:21:06 -0700 Subject: [PATCH 6/9] Motherforking misplaced }; --- addons/gui/gui.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/gui/gui.hpp b/addons/gui/gui.hpp index eadc56c9f..8f316b4d1 100644 --- a/addons/gui/gui.hpp +++ b/addons/gui/gui.hpp @@ -189,7 +189,6 @@ class ACE_Medical_Menu { }; }; }; - }; class controls { class IVbutton: RscButton { idc = IDC_IV_FLOW_SHOWBUTTON; // LOOK HERE @@ -665,9 +664,9 @@ class ACE_Medical_Menu { class SyringeOpenButton: RscButton { idc = IDC_SYRINGE_OPEN; text = CSTRING(OpenSyringeMenu); - x = QUOTE(POS_X(39.6)); - y = QUOTE(POS_Y(4.9)); - w = QUOTE(POS_W(3)); + x = QUOTE(POS_X(19.4)); + y = QUOTE(POS_Y(0)); + w = QUOTE(POS_W(4.4)); h = QUOTE(POS_H(1)); colorBackgroundDisabled[] = GUI_BCG_COLOR; colorBackground[] = GUI_BCG_COLOR; @@ -818,5 +817,6 @@ class ACE_Medical_Menu { }; }; }; + }; }; -}; +}; \ No newline at end of file From 984b07e99d337d0d390f241a02d953a960cf10d5 Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Sat, 12 Oct 2024 07:37:50 -0700 Subject: [PATCH 7/9] WEEE --- addons/gui/gui.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/gui/gui.hpp b/addons/gui/gui.hpp index 8f316b4d1..2c22bd343 100644 --- a/addons/gui/gui.hpp +++ b/addons/gui/gui.hpp @@ -664,7 +664,7 @@ class ACE_Medical_Menu { class SyringeOpenButton: RscButton { idc = IDC_SYRINGE_OPEN; text = CSTRING(OpenSyringeMenu); - x = QUOTE(POS_X(19.4)); + x = QUOTE(POS_X(23.6)); y = QUOTE(POS_Y(0)); w = QUOTE(POS_W(4.4)); h = QUOTE(POS_H(1)); @@ -686,7 +686,7 @@ class ACE_Medical_Menu { w = QUOTE(POS_W(9.2)); h = QUOTE(POS_H(16.5)); class controls { - class SyringeCloseButton: RscButton { + class SyringeCloseButton: RscButton { idc = IDC_SYRINGE_CLOSE; text = CSTRING(CloseMenu); x = QUOTE(POS_X(10.3)); @@ -701,7 +701,7 @@ class ACE_Medical_Menu { font = "RobotoCondensed"; shadow = "false"; }; - }; + }; class SyringeTypeTitle: RscStructuredText { idc = IDC_SYRINGE_TYPE_TITLE; // LOOK HERE text = CSTRING(SyringeTitleList); From 5dd8661c5587298258e0b33d8c39c4761a80ccce Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Sat, 12 Oct 2024 07:49:08 -0700 Subject: [PATCH 8/9] weee --- addons/gui/functions/fnc_onMenuOpen.sqf | 2 -- addons/gui/functions/fnc_openSyringeMenu.sqf | 4 ++- .../pharma/ACE_Medical_Treatment_Actions.hpp | 12 ++++---- addons/pharma/CfgWeapons.hpp | 10 +++---- addons/pharma/stringtable.xml | 28 +++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/addons/gui/functions/fnc_onMenuOpen.sqf b/addons/gui/functions/fnc_onMenuOpen.sqf index 54862ae74..3b3a1e1ad 100644 --- a/addons/gui/functions/fnc_onMenuOpen.sqf +++ b/addons/gui/functions/fnc_onMenuOpen.sqf @@ -107,8 +107,6 @@ if (ACEGVAR(medical_gui,target) == ACE_player) then { _ctrl ctrlSetText QACEPATHTOF(medical_gui,data\categories\toggle_to_self.paa); _ctrl ctrlSetTooltip ACELLSTRING(medical_gui,ToggleToSelf); }; -[] call FUNC(updateMedications); -[] call FUNC(updateSyringes); private _syringeMenuStatus = player getVariable ["SyringeMenu", false]; if (_syringeMenuStatus == true) then { [] call FUNC(openSyringeMenu); diff --git a/addons/gui/functions/fnc_openSyringeMenu.sqf b/addons/gui/functions/fnc_openSyringeMenu.sqf index e497a2ec9..4f162914c 100644 --- a/addons/gui/functions/fnc_openSyringeMenu.sqf +++ b/addons/gui/functions/fnc_openSyringeMenu.sqf @@ -1,7 +1,7 @@ #include "..\script_component.hpp" /* * Author: Cplhardcore - * opens the syringe menu + * opens the syringe menu and populates it * * Arguments: * none @@ -14,6 +14,8 @@ * * Public: No */ +[] call FUNC(updateMedications); +[] call FUNC(updateSyringes); [{player setVariable ["SyringeMenu", true]; ctrlShow [71300, true]; ctrlShow [71301, true]; diff --git a/addons/pharma/ACE_Medical_Treatment_Actions.hpp b/addons/pharma/ACE_Medical_Treatment_Actions.hpp index 4960324bd..fd576d13e 100644 --- a/addons/pharma/ACE_Medical_Treatment_Actions.hpp +++ b/addons/pharma/ACE_Medical_Treatment_Actions.hpp @@ -886,20 +886,20 @@ class ACE_Medical_Treatment_Actions { sounds[] = {}; }; class syringe_morphineIV_10ml_1: syringe_TXA_10ml_1 { - displayName = CSTRING(inject_morphine_IM_1); - displayNameProgress = CSTRING(injecting_morphine_IM_1); + displayName = CSTRING(inject_morphineIV_IM_1); + displayNameProgress = CSTRING(injecting_morphineIV_IM_1); allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"}; allowSelfTreatment = 1; medicRequired = QGVAR(medLvl_morphineIM); treatmentTime = QGVAR(treatmentTime_morphineIM); - items[] = {"kat_syringe_morphine_10ml_1"}; + items[] = {"kat_syringe_morphineIV_10ml_1"}; callbackSuccess = QFUNC(medication); sounds[] = {}; }; class syringe_morphineIV_10ml_3: syringe_morphineIV_10ml_1 { - displayName = CSTRING(inject_morphine_IM_3); - displayNameProgress = CSTRING(injecting_morphine_IM_3); - items[] = {"kat_syringe_morphine_10ml_3"}; + displayName = CSTRING(inject_morphineIV_IM_3); + displayNameProgress = CSTRING(injecting_morphineIV_IM_3); + items[] = {"kat_syringe_morphineIV_10ml_3"}; callbackSuccess = QFUNC(medication); sounds[] = {}; }; diff --git a/addons/pharma/CfgWeapons.hpp b/addons/pharma/CfgWeapons.hpp index 1e0dd9c89..bee8bb30d 100644 --- a/addons/pharma/CfgWeapons.hpp +++ b/addons/pharma/CfgWeapons.hpp @@ -324,7 +324,7 @@ class CfgWeapons { }; class kat_syringe_morphineIV_10ml_1: ACE_ItemCore { scope = 1; - displayName = CSTRING(Syringe_morphine_10_1_Display); + displayName = CSTRING(Syringe_morphineIV_10_1_Display); picture = QPATHTOF(ui\syringe_item.paa); model = "\A3\Structures_F_EPA\Items\Medical\Painkillers_F.p3d"; descriptionShort = CSTRING(Syringe_morphineIV_10_1_DescShort); @@ -731,10 +731,10 @@ class CfgWeapons { }; class kat_syringe_morphineIV_5ml_1: ACE_ItemCore { scope = 1; - displayName = CSTRING(Syringe_morphine_5_1_Display); + displayName = CSTRING(Syringe_morphineIV_5_1_Display); picture = QPATHTOF(ui\syringe_item.paa); model = "\A3\Structures_F_EPA\Items\Medical\Painkillers_F.p3d"; - descriptionShort = CSTRING(Syringe_morphine_5_1_DescShort); + descriptionShort = CSTRING(Syringe_morphineIV_5_1_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { mass = 1; @@ -742,10 +742,10 @@ class CfgWeapons { }; class kat_syringe_morphineIV_5ml_3: ACE_ItemCore { scope = 1; - displayName = CSTRING(Syringe_morphine_5_3_Display); + displayName = CSTRING(Syringe_morphineIV_5_3_Display); picture = QPATHTOF(ui\syringe_item.paa); model = "\A3\Structures_F_EPA\Items\Medical\Painkillers_F.p3d"; - descriptionShort = CSTRING(Syringe_morphine_5_3_DescShort); + descriptionShort = CSTRING(Syringe_morphineIV_5_3_DescShort); ACE_isMedicalItem = 1; class ItemInfo: CBA_MiscItem_ItemInfo { mass = 1; diff --git a/addons/pharma/stringtable.xml b/addons/pharma/stringtable.xml index ad850c693..787075945 100644 --- a/addons/pharma/stringtable.xml +++ b/addons/pharma/stringtable.xml @@ -4188,16 +4188,16 @@ 5ml Syringe loaded with 15 grams of EACA - + 5ml Syringe/10mg Morphine - + 5ml Syringe loaded with 10mg of Morphine - + 5ml Syringe/20mg Morphine - + 5ml Syringe loaded with 20mg of Morphine @@ -4236,10 +4236,10 @@ Pushing 15g EACA IV - + Pushing 10mg Morphine IV - + Pushing 20mg Morphine IV @@ -4443,10 +4443,10 @@ Inject 20mg Nalbuphine IM - + Inject 10mg Morphine IM - + Inject 20mg Morphine IM @@ -4455,10 +4455,10 @@ Injecting 2g TXA IM - + Injecting 10mg Morphine IM - + Injecting 20mg Morphine IM @@ -4482,16 +4482,16 @@ Injecting 20mg Nalbuphine IM - + 10ml Syringe/10mg Morphine - + 10ml Syringe loaded with 10mg of Morphine - + 10ml Syringe/20mg Morphine - + 10ml Syringe loaded with 20mg of Morphine From 1fc1af46934c8f739066c549480c8f58def8c6c0 Mon Sep 17 00:00:00 2001 From: Cplhardcore <135324281+Cplhardcore@users.noreply.github.com> Date: Sat, 12 Oct 2024 08:08:40 -0700 Subject: [PATCH 9/9] Update fnc_prepareSyringe.sqf --- addons/pharma/functions/fnc_prepareSyringe.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/pharma/functions/fnc_prepareSyringe.sqf b/addons/pharma/functions/fnc_prepareSyringe.sqf index 4022c2d11..77214ee8f 100644 --- a/addons/pharma/functions/fnc_prepareSyringe.sqf +++ b/addons/pharma/functions/fnc_prepareSyringe.sqf @@ -16,7 +16,7 @@ * None * * Example: - * [player, player, ["TXA", "1", "5ml"]] call kat_pharma_fnc_prepareSyringe; + * [player, ["TXA", "5ml", "1"]] call kat_pharma_fnc_prepareSyringe; * * Public: No */