Skip to content

Pharma - Change advanced treatments to use Medication function instead of duplicating it #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NikkoJT wants to merge 1 commit into
base: dev-Tomcat
Choose a base branch
from
Open

Pharma - Change advanced treatments to use Medication function instead of duplicating it #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions addons/pharma/functions/fnc_treatmentAdvanced_CWMP.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,5 @@

params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];

[_patient, _classname] call ACEFUNC(medical_treatment,addToTriageCard);
[_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog);

[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
_this call FUNC(medication);
[_patient] call EFUNC(circulation,wrongBloodTreatment);
5 changes: 1 addition & 4 deletions addons/pharma/functions/fnc_treatmentAdvanced_Caffeine.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,5 @@

params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];

[_patient, _classname] call ACEFUNC(medical_treatment,addToTriageCard);
[_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog);

[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
_this call FUNC(medication);
[QGVAR(caffeineLocal), _patient, _patient] call CBA_fnc_targetEvent;
5 changes: 1 addition & 4 deletions addons/pharma/functions/fnc_treatmentAdvanced_Carbonate.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,5 @@

params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];

[_patient, _classname] call ACEFUNC(medical_treatment,addToTriageCard);
[_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog);

[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
_this call FUNC(medication);
[QGVAR(carbonateLocal), [_medic, _patient], _patient] call CBA_fnc_targetEvent;
5 changes: 1 addition & 4 deletions addons/pharma/functions/fnc_treatmentAdvanced_Naloxone.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,5 @@

params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];

[_patient, _usedItem] call ACEFUNC(medical_treatment,addToTriageCard);
[_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), getText (configFile >> "CfgWeapons" >> _usedItem >> "displayName")]] call ACEFUNC(medical_treatment,addToLog);

[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
_this call FUNC(medication);
[QGVAR(naloxoneLocal), _patient, _patient] call CBA_fnc_targetEvent;
5 changes: 1 addition & 4 deletions addons/pharma/functions/fnc_treatmentAdvanced_Penthrox.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,4 @@

params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];

[_patient, _classname] call ACEFUNC(medical_treatment,addToTriageCard);
[_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), LLSTRING(Penthrox_Display)]] call ACEFUNC(medical_treatment,addToLog);

[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
_this call FUNC(medication);
5 changes: 1 addition & 4 deletions addons/pharma/functions/fnc_treatmentAdvanced_Pervitin.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,5 @@

params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];

[_patient, _classname] call ACEFUNC(medical_treatment,addToTriageCard);
[_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog);

[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
_this call FUNC(medication);
[QGVAR(pervitinLocal), _patient, _patient] call CBA_fnc_targetEvent;
Loading