Skip to content

Commit

Permalink
Add Adenosine to replace atropine #1573
Browse files Browse the repository at this point in the history
  • Loading branch information
@thojkooi
thojkooi committed Feb 7, 2016
1 parent 39cf113 commit bfd90cd
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 4 deletions.
29 changes: 29 additions & 0 deletions addons/medical/ACE_Medical_Actions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,13 @@ class ACE_ArmLeft {
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Adenosine);
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Adenosine')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Adenosine')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Atropine')] call DFUNC(canTreatCached));
Expand Down Expand Up @@ -404,6 +411,14 @@ class ACE_ArmRight {
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};

class Adenosine: Morphine {
displayName = CSTRING(Inject_Adenosine);
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Adenosine')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Adenosine')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Atropine')] call DFUNC(canTreatCached));
Expand Down Expand Up @@ -558,6 +573,13 @@ class ACE_LegLeft {
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Adenosine')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Adenosine')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Atropine')] call DFUNC(canTreatCached));
Expand Down Expand Up @@ -699,6 +721,13 @@ class ACE_LegRight {
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Adenosine')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Adenosine')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Atropine')] call DFUNC(canTreatCached));
Expand Down
28 changes: 28 additions & 0 deletions addons/medical/ACE_Medical_SelfActions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,13 @@ class Medical {
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Morphine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Adenosine')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Adenosine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Atropine')] call DFUNC(canTreatCached));
Expand Down Expand Up @@ -302,6 +309,13 @@ class Medical {
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Morphine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Adenosine')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Adenosine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Atropine')] call DFUNC(canTreatCached));
Expand Down Expand Up @@ -399,6 +413,13 @@ class Medical {
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Morphine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Adenosine')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Adenosine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Atropine')] call DFUNC(canTreatCached));
Expand Down Expand Up @@ -484,6 +505,13 @@ class Medical {
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Morphine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Adenosine')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Adenosine')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Atropine')] call DFUNC(canTreatCached));
Expand Down
21 changes: 18 additions & 3 deletions addons/medical/ACE_Medical_Treatments.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,12 @@ class ACE_Medical_Actions {
animationCaller = "AinvPknlMstpSnonWnonDnon_medic1";
litter[] = { {"All", "", {"ACE_MedicalLitter_morphine"}} };
};
class Adenosine: Morphine {
displayName = CSTRING(Inject_Adenosine);
displayNameProgress = CSTRING(Injecting_Adenosine);
items[] = {"ACE_adenosine"};
litter[] = { {"All", "", {"ACE_MedicalLitter_adenosine"}} };
};
class Atropine: Morphine {
displayName = CSTRING(Inject_Atropine);
displayNameProgress = CSTRING(Injecting_Atropine);
Expand Down Expand Up @@ -1370,11 +1376,20 @@ class ACE_Medical_Advanced {
maxDose = 10;
inCompatableMedication[] = {};
};
class Adenosine {
painReduce = 0;
hrIncreaseLow[] = {-7, -10, 15};
hrIncreaseNormal[] = {-15, -30, 20};
hrIncreaseHigh[] = {-15, -35, 10};
timeInSystem = 120;
maxDose = 6;
inCompatableMedication[] = {};
};
class Atropine {
painReduce = 0;
hrIncreaseLow[] = {-5, -7, 15};
hrIncreaseNormal[] = {-10, -30, 20};
hrIncreaseHigh[] = {-10, -20, 10};
hrIncreaseLow[] = {-2, -5, 15};
hrIncreaseNormal[] = {-10, -15, 20};
hrIncreaseHigh[] = {-5, -20, 10};
timeInSystem = 120;
maxDose = 6;
inCompatableMedication[] = {};
Expand Down
14 changes: 14 additions & 0 deletions addons/medical/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,9 @@ class CfgVehicles {
class ACE_MedicalLitter_gloves: ACE_MedicalLitterBase {
model = QUOTE(PATHTOF(data\littergeneric_gloves.p3d));
};
class ACE_MedicalLitter_adenosine: ACE_MedicalLitterBase {
model = QUOTE(PATHTOF(data\littergeneric_adenosine.p3d));
};
class ACE_MedicalLitter_atropine: ACE_MedicalLitterBase {
model = QUOTE(PATHTOF(data\littergeneric_atropine.p3d));
};
Expand Down Expand Up @@ -723,6 +726,16 @@ class CfgVehicles {
MACRO_ADDITEM(ACE_morphine,1);
};
};
class ACE_adenosineItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Adenosine_Display);
author = ECSTRING(common,ACETeam);
vehicleClass = "Items";
class TransportItems {
MACRO_ADDITEM(ACE_adenosine,1);
};
};
class ACE_atropineItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
Expand Down Expand Up @@ -841,6 +854,7 @@ class CfgVehicles {
MACRO_ADDITEM(ACE_elasticBandage,25);
MACRO_ADDITEM(ACE_tourniquet,15);
MACRO_ADDITEM(ACE_morphine,15);
MACRO_ADDITEM(ACE_adenosine,15);
MACRO_ADDITEM(ACE_atropine,15);
MACRO_ADDITEM(ACE_epinephrine,15);
MACRO_ADDITEM(ACE_plasmaIV,7);
Expand Down
12 changes: 11 additions & 1 deletion addons/medical/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@ class CfgWeapons {
mass = 1;
};
};
class ACE_adenosine: ACE_ItemCore {
scope = 2;
displayName = CSTRING(Adenosine_Display);
picture = QUOTE(PATHTOF(ui\items\adenosine_x_ca.paa));
model = QUOTE(PATHTOF(data\adenosine.p3d));
descriptionShort = CSTRING(adenosine_Desc_Short);
descriptionUse = CSTRING(adenosine_Desc_Use);
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_atropine: ACE_ItemCore {
scope = 2;
displayName = CSTRING(Atropine_Display);
Expand All @@ -84,7 +95,6 @@ class CfgWeapons {
descriptionUse = CSTRING(Atropine_Desc_Use);
class ItemInfo: InventoryItem_Base_F {
mass = 1;

};
};
class ACE_epinephrine: ACE_ItemCore {
Expand Down
Binary file added addons/medical/data/adenosine.p3d
View file
Binary file not shown.
Binary file added addons/medical/data/littergeneric_adenosine.p3d
View file
Binary file not shown.
15 changes: 15 additions & 0 deletions addons/medical/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
<Portuguese>O nível de detalhe de sujeira determina o número de itens que irão aparecer no cliente. Quantidades excessivas em áreas locais podem aumentar o lag do FPS, então esta é uma opção somente para o cliente.</Portuguese>
<Czech>Počet zobrazených předmětů po použití zdravotnického materiálu ovlivňuje počet objektů, které budou zobrazeny klientovi v místě použití zdravotnického materiálu. Vyšší množství objektů může způsobovat poklesy FPS a proto je toto nastavení čistě na klientovi.</Czech>
</Key>
<Key ID="STR_ACE_Medical_Inject_Adenosine">
<English>Inject Adenosine</English>
</Key>
<Key ID="STR_ACE_Medical_Inject_Atropine">
<English>Inject Atropine</English>
<German>Atropin injizieren</German>
Expand Down Expand Up @@ -241,6 +244,9 @@
<Portuguese>Injetando Epinefrina ...</Portuguese>
<Italian>Inietto l'epinefrina ...</Italian>
</Key>
<Key ID="STR_ACE_Medical_Injecting_Adenosine">
<English>Injecting Adenosine ...</English>
</Key>
<Key ID="STR_ACE_Medical_Injecting_Atropine">
<English>Injecting Atropine ...</English>
<German>Atropin injizieren ...</German>
Expand Down Expand Up @@ -949,6 +955,15 @@
<Portuguese>Um analgésico usado para combater dores moderadas e fortes.</Portuguese>
<Czech>Analgetikum slouží k tlumení středně těžkých a těžkých bolestí</Czech>
</Key>
<Key ID="STR_ACE_Medical_Atropine_Display">
<English>Adenosine autoinjector</English>
</Key>
<Key ID="STR_ACE_Medical_Adenosine_Desc_Short">
<English>Used to counter effects of Epinephrine</English>
</Key>
<Key ID="STR_ACE_Medical_Adenosine_Desc_Use">
<English>A drug used to counter the effects of Epinephrine</English>
</Key>
<Key ID="STR_ACE_Medical_Atropine_Display">
<English>Atropine autoinjector</English>
<Russian>Атропин в пневмошприце</Russian>
Expand Down
Binary file added addons/medical/ui/items/adenosine_x_ca.paa
View file
Binary file not shown.

0 comments on commit bfd90cd

Please sign in to comment.