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

Remove source object from Humanity hit network send

Browse Source 
Source object is always player and not needed anymore after 8ea21a2
This commit is contained in:
ebaydayz
2016-10-02 13:25:55 -04:00
parent 9fd2f2270b
commit 4509902822
11 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/fn_damageHandler.sqf
View File

@@ -116,7 +116,7 @@ if (_unit == player) then {
private ["_source","_humanityHit"]; private ["_source","_humanityHit"];
_source = _this select 0; _source = _this select 0;
_humanityHit = _this select 1; _humanityHit = _this select 1;
PVDZ_send = [_source,"Humanity",[_source,_humanityHit,30]]; PVDZ_send = [_source,"Humanity",[_humanityHit,30]];
publicVariableServer "PVDZ_send"; publicVariableServer "PVDZ_send";
}; };
}; };

2
SQF/dayz_code/compile/player_death.sqf
View File

@@ -95,7 +95,7 @@ if (count _array > 0) then {
_humanityHit = -(2000 - _myKills); _humanityHit = -(2000 - _myKills);
_kills = _source getVariable ["humanKills",0]; _kills = _source getVariable ["humanKills",0];
_source setVariable ["humanKills",(_kills + 1),true]; _source setVariable ["humanKills",(_kills + 1),true];
PVDZ_send = [_source,"Humanity",[_source,_humanityHit,300]]; PVDZ_send = [_source,"Humanity",[_humanityHit,300]];
publicVariableServer "PVDZ_send"; publicVariableServer "PVDZ_send";
} else { } else {
//i'm "guilty" - kill me as bandit //i'm "guilty" - kill me as bandit

7
SQF/dayz_code/compile/player_humanityChange.sqf
View File

@@ -1,7 +1,6 @@
private ["_object","_change","_wait","_humanity","_model","_isMen","_isMenH","_isMenB","_isWomen","_isWomenH","_isWomenB"]; private ["_change","_wait","_humanity","_model","_isMen","_isMenH","_isMenB","_isWomen","_isWomenH","_isWomenB"];
_object = _this select 0; _change = _this select 0;
_change = _this select 1; _wait = _this select 1;
_wait = if (count _this > 2) then { _this select 2 } else { 0 };
_humanity = (player getVariable["humanity",0]) + _change; _humanity = (player getVariable["humanity",0]) + _change;
player setVariable["humanity",_humanity,true]; player setVariable["humanity",_humanity,true];

2
SQF/dayz_code/medical/antibiotics.sqf
View File

@@ -45,7 +45,7 @@ if (_hasAntibiotics) then {
publicVariableServer "PVDZ_send"; publicVariableServer "PVDZ_send";
//Give humnaity for good deeds //Give humnaity for good deeds
[player,20] call player_humanityChange; [20,0] call player_humanityChange;
_msg = "str_actions_medical_gave_antibiotics"; _msg = "str_actions_medical_gave_antibiotics";
}; };

2
SQF/dayz_code/medical/bandage.sqf
View File

@@ -55,7 +55,7 @@ if (_finished) then {
} else { } else {
PVDZ_send = [_unit,"Bandage",[_unit,player]]; PVDZ_send = [_unit,"Bandage",[_unit,player]];
publicVariableServer "PVDZ_send"; publicVariableServer "PVDZ_send";
[player,20] call player_humanityChange; [20,0] call player_humanityChange;
}; };
} else { } else {
r_interrupt = false; r_interrupt = false;

2
SQF/dayz_code/medical/brokeBones.sqf
View File

@@ -51,7 +51,7 @@ if (_finished) then {
//Give humanity reward to player giving the morphine to another player. //Give humanity reward to player giving the morphine to another player.
if (_item in ["ItemMorphine"]) then { if (_item in ["ItemMorphine"]) then {
[player,50] call player_humanityChange; [50,0] call player_humanityChange;
}; };
}; };

2
SQF/dayz_code/medical/epinephrine.sqf
View File

@@ -14,7 +14,7 @@ if (!_isDead) then {
uiSleep 5; uiSleep 5;
//give humanity //give humanity
[player,25] call player_humanityChange; [25,0] call player_humanityChange;
PVDZ_send = [_unit,"Epinephrine",[_unit,player,"ItemEpinephrine"]]; PVDZ_send = [_unit,"Epinephrine",[_unit,player,"ItemEpinephrine"]];
publicVariableServer "PVDZ_send"; publicVariableServer "PVDZ_send";

2
SQF/dayz_code/medical/morphine.sqf
View File

@@ -46,7 +46,7 @@ if ((_unit == player) or (vehicle player != player)) then {
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf"; _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf";
} else { } else {
//PVCDZ_plr_Humanity = [player,50]; //PVCDZ_plr_Humanity = [player,50];
[player,50] call player_humanityChange; [50,0] call player_humanityChange;
}; };
//["PVCDZ_hlt_Morphine",[_unit,player]] call broadcastRpcCallAll; //["PVCDZ_hlt_Morphine",[_unit,player]] call broadcastRpcCallAll;

2
SQF/dayz_code/medical/painkiller.sqf
View File

@@ -16,7 +16,7 @@ if ((_unit == player) or (vehicle player != player)) then {
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf"; _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf";
} else { } else {
//PVCDZ_plr_Humanity = [player,20]; //PVCDZ_plr_Humanity = [player,20];
[player,20] call player_humanityChange; [20,0] call player_humanityChange;
}; };
player removeMagazine "ItemPainkiller"; player removeMagazine "ItemPainkiller";

2
SQF/dayz_code/medical/transfusion.sqf
View File

@@ -194,7 +194,7 @@ while {r_doLoop} do {
localize "str_actions_medical_transfusion_successful" call dayz_rollingMessages; localize "str_actions_medical_transfusion_successful" call dayz_rollingMessages;
//see Note 1 //see Note 1
//[player,_unit,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_successful","PLAIN DOWN"] call RE; //[player,_unit,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_successful","PLAIN DOWN"] call RE;
if (!_badBag and _bagFound) then { [player,_humanityAwarded] call player_humanityChange; }; if (!_badBag and _bagFound) then { [_humanityAwarded,0] call player_humanityChange; };
r_doLoop = false; r_doLoop = false;
}; };

6
SQF/dayz_code/system/player_spawn_2.sqf
View File

@@ -23,7 +23,7 @@ _timerMonitor = diag_ticktime;
player setVariable ["temperature",dayz_temperatur,true]; player setVariable ["temperature",dayz_temperatur,true];
player setVariable["friendlies",DZE_Friends,true]; player setVariable["friendlies",DZE_Friends,true];
[player,0] call player_humanityChange; [0,0] call player_humanityChange;
//player addMagazine "Hatchet_swing"; //player addMagazine "Hatchet_swing";
//player addWeapon "MeleeHatchet"; //player addWeapon "MeleeHatchet";
@@ -79,7 +79,7 @@ while {1 == 1} do {
_humanity = player getVariable ["humanity",0]; _humanity = player getVariable ["humanity",0];
if (_humanity < 1 or _forceHumanity) then { if (_humanity < 1 or _forceHumanity) then {
if (vehicle player != player) then { if (vehicle player != player) then {
[player, round(_timeOut / 10)] call player_humanityChange; [round(_timeOut / 10),0] call player_humanityChange;
_forceHumanity = false; _forceHumanity = false;
} else { } else {
_humanity = _humanity + round(_timeOut / 10); _humanity = _humanity + round(_timeOut / 10);
@@ -93,7 +93,7 @@ while {1 == 1} do {
/* /*
if ((Dayz_loginCompleted) && (diag_tickTime < 25)) then { if ((Dayz_loginCompleted) && (diag_tickTime < 25)) then {
[player,0] call player_humanityChange; [0,0] call player_humanityChange;
diag_log ("Running"); diag_log ("Running");
_timer10 = diag_Ticktime; _timer10 = diag_Ticktime;