Skip to content

Fix revive without eachframe #7

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
Dystopian wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix revive without eachframe #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
311e66d
Revert "Fixed wrong namespace"
Dystopian Apr 19, 2024
5a6809b
Revert "Added Frametimer"
Dystopian Apr 19, 2024
9f7cdfd
Revert "Improved: All hit events triggering an inconscious state are …
Dystopian Apr 19, 2024
93d679a
Fix multiple deaths
Dystopian Apr 19, 2024
c5b4a8c
Fix Teamkill Report
Dystopian Apr 20, 2024
4b4f5bc
Cleanup params
Dystopian Apr 20, 2024
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
22 changes: 13 additions & 9 deletions functions/Revive/fn_HandleDamage.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
//params["_unit","_bodyPart","_amountOfDamage","_killer","_projectile","_context"];
params ["_unit", "_bodyPart", "_amountOfDamage", "_killer", "_projectile", "_hitIndex", "_instigator", "_hitPoint", "_directHit", "_context"];


if (alive _unit
&& {_amountOfDamage >= 1}
&& {!(_unit getVariable ["AT_Revive_isUnconscious",false])}
&& {_bodyPart in ["","head","face_hub","head_hit","neck","spine1","spine2","spine3","pelvis","body"]}
) then {
if (_unit getVariable ["AT_Revive_isUnconscious", false]) then {
_amountOfDamage = 0;
if(count (missionNamespace getVariable ["AT_Revive_setUnconscious", []]) == 0) then {
missionNamespace setvariable ["AT_Revive_setUnconscious",[_unit, _killer,_projectile,0]];
} else {
if (alive _unit
&& {_amountOfDamage >= 1}
&& {_bodyPart in ["","head","face_hub","head_hit","neck","spine1","spine2","spine3","pelvis","body"]}
) then {
_unit setVariable ["AT_Revive_isUnconscious", true, true];
_amountOfDamage = 0;
_unit setDamage 0;
_unit allowDamage false;
[_unit, _killer, _projectile] call ATR_FNC_BroadcastKill;
[_unit] call ATR_FNC_Unconscious;
};
};

_amountOfDamage;
18 changes: 0 additions & 18 deletions functions/Revive/fn_ReviveInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,6 @@ if(isNil("AT_Revive_MinRepawnTime")) then {
AT_Revive_MinRepawnTime = getMissionConfigValue ["ATR_minRespawnTime", 10];
};
AT_Revive_Debug = false;
if(isNil("AT_Revive_FrameEH")) then {
AT_Revive_FrameEH = addMissionEventHandler ["EachFrame", {
if(count(missionNamespace getvariable ["AT_Revive_setUnconscious",[]])>0) then {
AT_Revive_setUnconscious params["_unit","_killer","_projectile","_frametimer"];
if(_frametimer>=3) then {
missionNamespace setvariable ["AT_Revive_setUnconscious",[]];
_unit setDamage 0;
_unit allowDamage false;
_unit setVariable ["AT_Revive_isUnconscious", true, true];
[_unit] spawn ATR_FNC_Unconscious;
[_unit, _killer, _projectile] spawn ATR_FNC_BroadcastKill;
} else {
missionNamespace setvariable ["AT_Revive_setUnconscious",[_unit,_killer,_projectile,_frametimer+1]];
};
};
}];
};

[] spawn
{
waitUntil {!isNull player};
Expand Down