W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-17 21:52:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update for A2 1.64 GetHit

Browse Source 
Replaced vehicle sethit/setvariable method with sethit/gethit and removed setvariable "Hit_" commands for vehicles (hit_partname can now probably be added to the setvariable filters list).

Modified object_getHit.sqf return to now provide the selection name in order to reduce redundant config lookups. Returns '[Damage, Part Name]', instead of just 'Damage'

Modified vehicle_GetHitpoints.sqf to remove incorrect hipoints from returning. Previously this script would return all hitpoints from any vehicle the current vehicle config inherited from, even if the hitpoint didn't exist in the calling vehicle. this posed a problem since getHit on an invalid part name returns Nil
This commit is contained in:
icomrade
2018-01-21 17:26:35 -05:00
parent d48c9070e8
commit f03f2454c9
19 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
View File

@@ -30,7 +30,7 @@ _sellVehicle = {
_hitpoints = DZE_myVehicle call vehicle_getHitpoints;
{
if (["Wheel",_x,false] call fnc_inString) then {
_damage = [DZE_myVehicle,_x] call object_getHit;
_damage = ([DZE_myVehicle,_x] call object_getHit) select 0;
_tireDmg = _tireDmg + _damage;
_tires = _tires + 1;
};

6
SQF/dayz_code/actions/repair.sqf
View File

@@ -34,12 +34,14 @@ if ("ItemToolbox" in items player && (_part in magazines player)) then {
// Added Nutrition-Factor for work
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
_damage = [_vehicle,_hitpoint] call object_getHit;
_hits = [_vehicle,_hitpoint] call object_getHit;
_damage = _hits select 0;
_vehicle removeAction _id;
//dont waste loot on undamaged parts
if (_damage > 0) then {
//Fix the part
_selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name");
_selection = _hits select 1;
[_vehicle, _selection, 0, true] call fnc_veh_handleRepair;
_vehicle setvelocity [0,0,1];

3
SQF/dayz_code/actions/repair_vehicle.sqf
View File

@@ -8,7 +8,8 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
{
_hitpoint = _x;
_damage = [_vehicle,_x] call object_getHit;
_hits = [_vehicle,_x] call object_getHit;
_damage = _hits select 0;
_cmpt = toArray (_x);
_cmpt set [0,20];

5
SQF/dayz_code/actions/salvage.sqf
View File

@@ -31,7 +31,8 @@ if (_hasToolbox) then {
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
//Remove melee magazines (BIS_fnc_invAdd fix)
false call dz_fn_meleeMagazines;
_damage = [_vehicle,_hitpoint] call object_getHit;
_hits = [_vehicle,_hitpoint] call object_getHit;
_damage = _hits select 0;
if (_damage < 1 && {_damage > 0}) then { //Tempfix for issue where certain hitpoints on some vehicles do not get damaged and allow infinite removal
_BreakableParts = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass","HitEngine","HitFuel","HitHRotor"];
if (_hitpoint in _BreakableParts) then {
@@ -48,7 +49,7 @@ if (_hasToolbox) then {
};
if (_isOK) then {
_selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name");
_selection = _hits select 1;
/*if ((_hitpoint == "HitEngine") or (_hitpoint == "HitFuel")) then {
[_vehicle, _selection, 0.89] call fnc_veh_handleDam;
} else {*/

4
SQF/dayz_code/actions/salvage_vehicle.sqf
View File

@@ -41,8 +41,8 @@ if (_is6WheelType) then {
{
_hitpoint = _x;
_damage = [_vehicle,_x] call object_getHit;
_hits = [_vehicle,_x] call object_getHit;
_damage = _hits select 0;
if !(_x in _RemovedPartsArray) then {
//if (_x in ["HitFuel","HitEngine"] && _damage >= 0.89) then {_damage = 1;};
_cmpt = toArray (_x);

3
SQF/dayz_code/actions/trade_any_bicycle.sqf
View File

@@ -154,11 +154,10 @@ if (_finished) then {
// total damage
_tireDmg = 0;
_damage = 0;
{
if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage;
_tireDmg = _tireDmg + (_damage select 0);
_tires = _tires + 1;
};
} count _hitpoints;

3
SQF/dayz_code/actions/trade_any_bicycle_old.sqf
View File

@@ -128,11 +128,10 @@ if (_qty >= _qty_in) then {
// total damage
_tireDmg = 0;
_damage = 0;
{
if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage;
_tireDmg = _tireDmg + (_damage select 0);
_tires = _tires + 1;
};
} count _hitpoints;

3
SQF/dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -161,11 +161,10 @@ if (_finished) then {
// total damage
_tireDmg = 0;
_damage = 0;
{
if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage;
_tireDmg = _tireDmg + (_damage select 0);
_tires = _tires + 1;
};
} count _hitpoints;

3
SQF/dayz_code/actions/trade_any_vehicle_free.sqf
View File

@@ -156,11 +156,10 @@ if (_finished) then {
// total damage
_tireDmg = 0;
_damage = 0;
{
if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage;
_tireDmg = _tireDmg + (_damage select 0);
_tires = _tires + 1;
};
} count _hitpoints;

3
SQF/dayz_code/actions/trade_any_vehicle_old.sqf
View File

@@ -136,11 +136,10 @@ if (_qty >= _qty_in) then {
// total damage
_tireDmg = 0;
_damage = 0;
{
if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage;
_tireDmg = _tireDmg + (_damage select 0);
_tires = _tires + 1;
};
} count _hitpoints;