W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove rtitleText in fillBloodBag.sqf

Browse Source 
Not necessary to inform recipient and prevents two messages on screen at
once for instigator.

Classic bloodbag system is now added in vanilla too.

Vanilla commits:

cb71d926ed

bee9bd1638
This commit is contained in:
ebayShopper
2017-03-19 16:35:17 -04:00
parent 9324deffaf
commit 53158a11ed
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
View File

@@ -389,21 +389,4 @@ class ItemHotwireKit: CA_Magazine {
picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa"; picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa";
descriptionShort = $STR_EPOCH_HOTWIREKIT_DESC; descriptionShort = $STR_EPOCH_HOTWIREKIT_DESC;
weight = 2; weight = 2;
}; };
class ItemBloodbag: CA_Magazine
{
scope = public;
count = 1;
type = 256;
displayName = "$STR_EQUIP_NAME_16";
model = "\dayz_equip\models\bloodbag.p3d";
picture = "\dayz_equip\textures\equip_bloodbag_ca.paa";
descriptionShort = "$STR_EQUIP_DESC_16";
class ItemActions {
class use {
text = $STR_EPOCH_BLOODBAG_ACTION;
script = "spawn player_useMeds;";
};
};
};

18
SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp
View File

@@ -204,3 +204,21 @@ class emptyBloodBag : CA_Magazine
}; };
}; };
}; };
//Classic blood bag
class ItemBloodbag: CA_Magazine
{
scope = public;
count = 1;
type = 256;
displayName = "$STR_EQUIP_NAME_16";
model = "\dayz_equip\models\bloodbag.p3d";
picture = "\dayz_equip\textures\equip_bloodbag_ca.paa";
descriptionShort = "$STR_EQUIP_DESC_16";
class ItemActions {
class use {
text = $STR_BLD_use;
script = "spawn player_useMeds;";
};
};
};

6
SQF/dayz_code/medical/fillBloodBag.sqf
View File

@@ -46,7 +46,7 @@ while {r_doLoop and (_i < 25)} do {
if (_isMedic and !_started) then { if (_isMedic and !_started) then {
player removeMagazine "emptyBloodBag"; player removeMagazine "emptyBloodBag";
localize "str_actions_medical_transfusion_start" call dayz_rollingMessages; localize "str_actions_medical_transfusion_start" call dayz_rollingMessages;
[player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_start","PLAIN DOWN"] call RE; //[player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_start","PLAIN DOWN"] call RE;
_started = true; _started = true;
}; };
@@ -69,7 +69,7 @@ while {r_doLoop and (_i < 25)} do {
if ((_blood <= _bloodAfter) or (_i == 25)) then { if ((_blood <= _bloodAfter) or (_i == 25)) then {
localize "str_actions_medical_bagDone" call dayz_rollingMessages; localize "str_actions_medical_bagDone" call dayz_rollingMessages;
[player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_bagDone","PLAIN DOWN"] call RE; //[player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_bagDone","PLAIN DOWN"] call RE;
//_victim setVariable ["USEC_BloodQty", _bloodAfter, true]; //_victim setVariable ["USEC_BloodQty", _bloodAfter, true];
r_doLoop = false; r_doLoop = false;
_complete = true; _complete = true;
@@ -81,7 +81,7 @@ while {r_doLoop and (_i < 25)} do {
r_doLoop = false; r_doLoop = false;
r_interrupt = true; r_interrupt = true;
localize "str_actions_medical_bagInterrupted" call dayz_rollingMessages; localize "str_actions_medical_bagInterrupted" call dayz_rollingMessages;
[player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_bagInterrupted","PLAIN DOWN"] call RE; //[player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_bagInterrupted","PLAIN DOWN"] call RE;
}; };
}; };

5
SQF/dayz_code/stringtable.xml
View File

@@ -14462,11 +14462,6 @@
<German>Kann ein Fahrzeug temporär aufschließen und starten. Klappt nicht immer und kann nur ein Mal verwendet werden.</German> <German>Kann ein Fahrzeug temporär aufschließen und starten. Klappt nicht immer und kann nur ein Mal verwendet werden.</German>
<Russian>Используется для временного взлома и запуска транспорта, присутствует шанс неудачи и расходуется при использовании.</Russian> <Russian>Используется для временного взлома и запуска транспорта, присутствует шанс неудачи и расходуется при использовании.</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_BLOODBAG_ACTION">
<English>Self transfusion</English>
<German>Selbst-Transfusion</German>
<Russian>Перелить себе</Russian>
</Key>
<Key ID="STR_EPOCH_KILOOFHEMP"> <Key ID="STR_EPOCH_KILOOFHEMP">
<English>Kilo of Hemp</English> <English>Kilo of Hemp</English>
<German>Kilo Hanf</German> <German>Kilo Hanf</German>