0.981 + 1.7.6.1 CE

+ Increased raise horde distance to 65m.
+ decreased raise horde action timer to 7 seconds.
+ sync with 1.7.6.1 CE
This commit is contained in:
vbawol
2013-02-26 20:05:35 -06:00
parent 52461f4a52
commit 3c9df28ead
319 changed files with 5267 additions and 1695 deletions

View File

@@ -34,14 +34,17 @@ while {r_doLoop} do {
r_doLoop = false;
if (_finished) then {
["usecBandage",[_unit,player]] call broadcastRpcCallAll;
//["usecBandage",[_unit,player]] call broadcastRpcCallAll;
usecBandage = [_unit,player];
publicVariable "usecBandage";
if (_unit == player) then {
//Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medBandaged.sqf";
dayz_sourceBleeding = objNull;
} else {
["dayzHumanity",[player,20]] call dayzHumanity_code;
//dayzHumanity = [player,20];
[player,20] call player_humanityChange;
};
{_unit setVariable[_x,false,true];} forEach USEC_woundHit;

View File

@@ -24,7 +24,9 @@ sleep 2;
//unconscious unit assumes dragging posture
//public EH
["norrnRaDrag",_dragee] call broadcastRpcCallAll;
//["norrnRaDrag",_dragee] call broadcastRpcCallAll;
norrnRaDrag = [_dragee];
publicVariable "norrnRaDrag";
_dragee attachto [_unit,[0.1, 1.01, 0]];
sleep 0.02;

View File

@@ -12,7 +12,9 @@ if (!_isDead) then {
_unit setVariable ["NORRN_unconscious", false, true];
_unit setVariable ["USEC_isCardiac",false,true];
sleep 5;
["usecEpi",[_unit,player,"ItemEpinephrine"]] call broadcastRpcCallAll;
//["usecEpi",[_unit,player,"ItemEpinephrine"]] call broadcastRpcCallAll;
usecEpi = [_unit,player,"ItemEpinephrine"];
publicVariable "usecEpi";
};
r_action = false;

View File

@@ -51,6 +51,13 @@ while {true} do {
[] spawn fnc_usec_playerBleed; //publicizes the blood value at regular intervals
[] spawn fnc_med_publicBlood;
};
//Handle player infection
if ((r_player_infected) and (!r_player_handler)) then {
r_player_handler = true;
sleep 1;
[] spawn fnc_med_publicBlood;
};
//Add player actions
[] call fnc_usec_damageActions;

View File

@@ -20,7 +20,9 @@ if ((_vcl emptyPositions "cargo") > 0) then
_dragger switchMove "";
_wounded setVariable ["NORRN_LoadVcl", _vcl, true];
sleep 1;
["norrnRLact",_wounded] call broadcastRpcCallAll;
//["norrnRLact",_wounded] call broadcastRpcCallAll;
norrnRLact = [_wounded];
publicVariable "norrnRLact";
player removeAction NORRN_dropAction;
}else{

View File

@@ -14,7 +14,9 @@ _wounded setVariable ["NORRN_unit_dragged", true, true];
_wounded assignAsCargo _vcl;
_wounded moveInCargo _vcl;
sleep 1;
["norrnRALW",_wounded] call broadcastRpcCallAll;
//["norrnRALW",_wounded] call broadcastRpcCallAll;
norrnRALW = [_wounded];
publicVariable "norrnRALW";
if (local _wounded) then
{

View File

@@ -16,7 +16,9 @@ _wounded setVariable ["NORRN_unit_dragged", true, true];
_wounded assignAsCargo _vcl;
_wounded moveInCargo _vcl;
sleep 1;
["norrnRALW",_wounded] call broadcastRpcCallAll;
//["norrnRALW",_wounded] call broadcastRpcCallAll;
norrnRALW = [_wounded];
publicVariable "norrnRALW";
if (local _wounded) then
{

View File

@@ -38,12 +38,15 @@ if (_finished) then {
//Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf";
} else {
["dayzHumanity",[player,50]] call dayzHumanity_code;
//dayzHumanity = [player,50];
[player,50] call player_humanityChange;
};
player removeMagazine "ItemMorphine";
["usecMorphine",[_unit,player]] call broadcastRpcCallAll;
//["usecMorphine",[_unit,player]] call broadcastRpcCallAll;
usecMorphine = [_unit,player];
publicVariable "usecMorphine";
} else {
r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE;

View File

@@ -15,11 +15,14 @@ if (_unit == player) then {
//Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf";
} else {
["dayzHumanity",[player,20]] call dayzHumanity_code;
//dayzHumanity = [player,20];
[player,20] call player_humanityChange;
};
player removeMagazine "ItemPainkiller";
sleep 1;
//clear the healed player's vision
["usecPainK",[_unit,player]] call broadcastRpcCallAll;
//["usecPainK",[_unit,player]] call broadcastRpcCallAll;
usecPainK = [_unit,player];
publicVariable "usecPainK";

View File

@@ -17,7 +17,7 @@ if (_unit == player) then {
if (_TransfusionInfection) then {
r_player_infected = true;
player setVariable["USEC_infected",true];
player setVariable["USEC_infected",true,true];
};
//Ensure Control is visible

View File

@@ -119,7 +119,7 @@ fnc_usec_self_removeActions = {
};
fnc_med_publicBlood = {
while {r_player_injured and r_player_blood > 0} do {
while {(r_player_injured or r_player_infected) and r_player_blood > 0} do {
player setVariable["USEC_BloodQty",r_player_blood,true];
player setVariable["medForceUpdate",true];
sleep 5;

View File

@@ -41,9 +41,12 @@ if (_finished) then {
_unit setVariable["LastTransfusion",time,true];
_unit setVariable["USEC_lowBlood",false,true];
player removeMagazine "ItemBloodbag";
["usecTransfuse",[_unit,player]] call broadcastRpcCallAll;
//["usecTransfuse",[_unit,player]] call broadcastRpcCallAll;
usecTransfuse = [_unit,player];
publicVariable "usecTransfuse";
["dayzHumanity",[player,250]] call dayzHumanity_code;
//dayzHumanity = [player,250];
[player,250] call player_humanityChange;
} else {
r_interrupt = false;
player switchMove "";